* Changed up shuttle calls to make the round convert to survival.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Added CosCult state checking.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* typo
* Fix nuke ops test
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Cleaned up old borg spawns since they can choose a chassis now. Moved and/or renamed some nyano assets in the DV namespace
* Neat new MARK feature
* Mapper input
* Applied objectively-bad YAML property ordering
* Allulalo: finally finishing the ancient raptor species project (#3504)
* well, it loads
* sprite's
* names + starting on displacements
* more displacements
* displacements
* left hand only
* displacements
* yup
* ooa
* inhand displacements
* blood
* accent
* iv bags
* placeholder clarification
* Revert "iv bags"
This reverts commit c2aa504eab8d0673604b33e0ccaf79b406979da6.
* whitespace
* adds tooshortforUI and removes the damage modifier set
* speechsounds
* typing indicator
* basic customisation
* guidebook 1
* fixed full
* markings, displacements, speech verb
* displacement fixes
* trailing newlines
* spelling moment
* brute damage sprites and blood fix
* guidebook iteration
* injection melee + ethanotoxin + guidebook rewrite
* guidebook
* guidebook
* nitpicks + roundstart
---------
Co-authored-by: starlighthowls <starlighthowls7@gmail.com>
Co-authored-by: mqole <anactualpanacea@gmail.com>
* Allulalo tooshotforui bugfix (#3598)
* yay
* p[leebnmar
* oops
* Allulalo Markings (#3602)
* eye markings and two tails
* more
* almost got ya
* yup
* wings yay
* thank you landshark for my life btw
* still needs loc files
* Update allulalo.ftl
* I lost so much progress to git bullshit
* and who can forget dear rat boy
* touch up speech indicator at yesters request
---------
Co-authored-by: starlighthowls <starlighthowls7@gmail.com>
* Allulalo Roundstart (#3621)
* yup
* shock blanket + pleebnar fixes
* yuuup (#3655)
* Allulalo fix pass 1 (#3661)
* what if I did it all in one commit like a total moron
* yup
* untuch
* i love you spriting tool
* my birdsty
* Update allulalo.yml
* Update Species.xml
* let allulalo use holopads. (#3669)
* adds a white list for the too small component to add specific allowed entities. e.g holopads
* imp comment
* i love forgetting white space!!!!
---------
Co-authored-by: sev7ves <soapedzone@gmail.com>
Co-authored-by: beck <163376292+widgetbeck@users.noreply.github.com>
* fix (#3693)
* I need to learn to not do everything in one commit (#3750)
* mime on again (#4243)
* Small fix
* Add them to our accentless trait
* Add unable to wield system
* Fix too short for UI using old blacklist methods
* Fix duplicated localization line
* Add heavyweight drunk comp (might merge this with lightweight later)
* Why was this even added
* Revert "Add unable to wield system"
This reverts commit cbe3a10fc7.
* Revert "Fix too short for UI using old blacklist methods"
This reverts commit 833743f029.
* add TooShortForUIComponent (#3495)
* add TooShortForUIComponent
* correct documentation
* incomplete documentation
* add UnableToWieldComponent (#3496)
* Fixing this again I am dumb I cherrypicked things in the wrong order
* WHY WAS THIS EVEN ADDED THERE'S NO SPRITE EVEN ON IMPSTATION???
* Port Allulalos to Nubody
* Fix for Allulalo chems doing nothing
* Add allulalo to the guidebook species list
* Restore some accidentally deleted effects and comments
* Fix typo that made allu blood 10x more alcoholic than normal
* Delete random misplaced sprites from cherrypicking
* More of the random sprites removal (this time from the meta)
* Add missing allulalo flavor
* Removed some nonexistant fields from the species
* Add unisex cough/sneeze, comment out Wuhey and Ungh emotes
* Fix guidebook not using loc string
* I THINK this fixes that test error and it doesn't seem to break anything either so let's try
* Remove unsupported unshaded shader from eyes
* Ok last one didn't work (sorry for trial and error)
* Removed mention of HARMPACKs and Tether Guns from the guidebook.
* Blacklist allulalos from random humanoid spawns
* Add missing allulalo gulp sound
* Carriable in 1 hand allulalos, fix carrying system blocking both hands always
* Remove DV comments
---------
Co-authored-by: Kip <32859367+kipdotnet@users.noreply.github.com>
Co-authored-by: starlighthowls <starlighthowls7@gmail.com>
Co-authored-by: mqole <anactualpanacea@gmail.com>
Co-authored-by: sev7ves <58966116+sev7ves@users.noreply.github.com>
Co-authored-by: sev7ves <soapedzone@gmail.com>
Co-authored-by: beck <163376292+widgetbeck@users.noreply.github.com>
Co-authored-by: Yesteryear <208338078+yesteryuri@users.noreply.github.com>
* Added L93 and SKL93
* Made SKL93 Available via Syndicate Uplink for 8 TC. Comes with 10 Shots of AP and a .45 Magnum ammo box
* Made L93 available through salvage.
* Made L93 available via Logistics crate.
Cowboy crate can be bought for 7600. It contains two L93's and two Inspectors. Along side 4 boxes of .45 Magnum and two hats.
* Update licenses
* Remove AP from Syndie SKL93 Bundle, Buff Firerate
* Update sprites to make lever darker on icon
* Brought back AP SKL93.
Made L93 Shoot at 2.5 ROF
Increased price of SKL93 Bundle
Added cowboy hat for SKL93 bundle
* Clean up changes to fit coding style and convention.
Fixed armory.yml's prototype properties ordering. Other Fills may be affected
* it breathes
* probably okay
* Create station-report.ftl
thing miwssing
* IAA store update
* guidebook
* update on things
* revert robusttoolbox
* make it fit into folders and clipboards
* update on the styling of paper
* pickable borg subtypes but better (#706)
* borg subtype fixes I Forgot To Push (#790)
* update borg subtypes to an entity prototype based approach from SL (#884)
https: //github.com/cosmatic-drift-14/cosmatic-drift/pull/884
Co-Authored-By: lunarcomets <140772713+lunarcomets@users.noreply.github.com>
* Minor Build Error Tweak
Should be ready to add more chassis now!
* Yippee Yahoo
Handpicked some chassis sprites from AL/SL PR which are from Paradise :D
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Clean up + Comments
* CR made me sprite at gunpoint
Also switched standard and generic files for consistency and such
* the spaces were bothering me + comments
---------
Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Fixed crew monitor and gave it buttons instead of trying to figure out which map to display.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Fixes messageId console errors
Replaced paper.yml HydroCo's notices in the paper-misc.ftl file and moved the [bold] to the last line to prevent error messages in the console
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Pool-Themed Decorations: Lounge Chairs, Umbrellas, Tiles, Swim Rings, and Pool Water (#2071)
<!-- Guidelines:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
<!-- NOTE: All code submitted to this repository is ALWAYS licensed
under the AGPL-3.0-or-later license.
The REUSE Specification headers or separate .license files indicate a
secondary license (e.g., MPL or MIT) solely to facilitate
integration for projects that do not use the AGPL license. This
secondary license does not replace the fact that AGPL-3.0-or-later
remains the primary and binding license.
Uncomment and modify the following line if you wish to change the
license from the default of AGPL.-->
<!--- LICENSE: AGPL -->
<!-- What did you change? -->
This PR adds a bunch of, well, mapper toys basically, but normal players
can obtain them too. They are:
- Pool tile and dark pool tile; obtainable via the cutter machine.
- Pool water; unobtainable without mapping/admin tools, but it's 1%
chlorine.
- Lounge chairs, constructed with steel and cloth. Deconstructible with
a screwdriver.
- Beach umbrellas, constructed with rods and cloth. Deconstructible with
a screwdriver.
- Swim rings, which can be ordered from Logistics. They're sort of like
the emergency comfort units (pillows), but they're inflatable rings and
you can pick them up.
<!-- Discuss how this would affect game balance or explain why it was
changed. Link any relevant discussions or issues. -->
These assets are needed for an upcoming map I'm making and I'm giving
them to the community early out of the kindness of my heart
<!-- Summary of code changes for easier review. -->
All YML and sprites babyyy
- Entity prototypes for chairs, umbrellas, pool water, swim rings, and
the pool tile stack items
- Some construction graphs
- A cargo product
- A floor definition
- Recipes for the tile cutter
Pool water IS drinkable because it's extremely funny. Keep in mind that
50u of pool water will only give you like 2 poison damage
<!-- Attach media if the PR makes ingame changes (clothing, items,
features, etc).
Small fixes/refactors are exempt. Media may be used in SS14 progress
reports with credit. -->
Preview of the stuff:
<img width="713" height="541" alt="image"
src="https://github.com/user-attachments/assets/42f1acc8-cc83-4356-a8e0-3c715245d120"
/>
<img width="697" height="666" alt="image"
src="https://github.com/user-attachments/assets/8597017a-9d03-4419-80c5-cf475f3206d1"
/>
sorry i forgot the pink ring
<img width="253" height="179" alt="image"
src="https://github.com/user-attachments/assets/7f738f8e-42b4-4ee4-aa75-9f08b67ded0c"
/>
sorry i forgot the white chair
<img width="206" height="140" alt="image"
src="https://github.com/user-attachments/assets/6fabe541-4821-4e88-8d64-a99f463c5253"
/>
Cargo:
<img width="633" height="461" alt="image"
src="https://github.com/user-attachments/assets/b8ae9b89-4d2f-4326-9814-d000d5e88809"
/>
Crafting menu:
<img width="266" height="454" alt="image"
src="https://github.com/user-attachments/assets/cc480ee6-0e0d-4055-93c3-e5a1c4e0687c"
/>
<img width="409" height="211" alt="image"
src="https://github.com/user-attachments/assets/41970a43-1ba8-4898-a96c-deb87a05a409"
/>
<img width="409" height="211" alt="image"
src="https://github.com/user-attachments/assets/ffc00874-e330-49eb-8aba-972c6d223a3a"
/>
Pool water:
<img width="680" height="463" alt="image"
src="https://github.com/user-attachments/assets/9abc48b0-8358-46de-89ef-41fc64989787"
/>
<!-- Confirm the following by placing an X in the brackets [X]: -->
- [x] I have read and am following the [Pull Request and Changelog
Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
- [x] I have added media to this PR or it does not require an ingame
showcase.
- [x] I have tested any changes or additions.
- [x] I can confirm this PR contains no AI-generated content, and did
not use any AI-generated content.
<!-- You should understand that not following the above may get your PR
closed at maintainer’s discretion -->
<!-- List any breaking changes, including namespaces, public
class/method/field changes, prototype renames; and provide instructions
for fixing them.
This will be posted in #codebase-changes. -->
Nope
**Changelog**
<!-- Add a Changelog entry to make players aware of new features or
changes that could affect gameplay.
Make sure to read the guidelines and take this Changelog template out of
the comment block in order for it to show up.
Changelog must have a 🆑 symbol, so the bot recognizes the changes and
adds them to the game's changelog. -->
🆑
- add: 13 colors of lounge chairs can be constructed out of steel and
cloth.
- add: 8 colors of beach umbrellas can be constructed out of rods and
cloth.
- add: Pool tile (and dark pool tile) can be produced at the cutter
machine.
- add: Logistics can now order a crate of bulk swim rings, in 11
possible colors!
- add: For mappers (and admins): there is a new "pool water" entity that
is a nice green-cyan color and contains about 1% chlorine.
---------
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
* Remove Umbrella + Fixes from Port
* Pool Ring Additions
* Buff Fishing Vendor
* grr
* its no longer 2am
---------
Co-authored-by: portfiend <109661617+portfiend@users.noreply.github.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
* init
new disks are in. can be spawned or printed. no weights or correctly bound techs yet.
* tweak textures and naming
* make tech disks respect their tier and discipline
* make tech console respect tier weight
* yml fixes (forgo a million things)
* meow :3 reworked to use GenericVisualizer
* moved staticPrice comp to shared to support different pricing per tier
* unhardcoded prices; tweaked log messages
* cleanup
* a few fixes
* updated pricing to match weights
* lowering prices I forgor how many of them science can print
* what
* t3 texture, logger, factory
* move PriceCalculationEvent & EstimatedPriceCalculationEvent to shared
* remove static price comp; use EntProtoId for disk proto
* moved staticPrice comp back to server
* cleanup: price event, visualizer enums & yml
* ummove PriceCalculationEvent
* ummove PriceCalculationEvent attempt #2
* more unmoving
* fixes
* predict onExamine
* review changes
* small cleanup
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* YAMLs your ion laws
* forgot some weights
* this should be it
* comments and DAGD
* improved testing
* addressing review (part 1 out of 2)
* still part 1 :gosomnia:
* part 2
* refactor the refactor
* loc error fluffs
* address review
* weh
* cleanup
* oops
* fix
* more cleaning
* forgot to remove old thing
* prediction
* fix
# Conflicts:
# Content.Server/Silicons/Laws/IonStormSystem.cs
* - rework a bunch of cargo orders to not send a crate with just one thing
- instead sends the item, wrapped
- add ability for cargo orders to wrap the item ordered in parcel wrap
- cargo order name and descriptions are now localization strings, but still 99.99% of the time just get that info from the entity they're spawning
- small refactor to how cargo orders move around in cargo code so that the actual order proto is kept around longer
- small rework to certain restock cargo orders to halve the cost and number of items received in one order
* oop
* Suffering
* Arbitrary containers for cargo products
* I ran the tests locally and they passed, github please rerun :)
* massage Slarti's work into this.
Mainly by taking the API wrapping ability out back with the rifle q-q
* testfail fake
* wow `_applyingState` is useful, I wonder where I should've been using that in other PRs before :^)
* pr comments
* tfw the hook doesn't update the submodule
* Update Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
Co-authored-by: āda <ss.adasts@gmail.com>
* PR comments
* fixies
* Update Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
* Update Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
* fix wrapped parcel entity name + audio
* Actually read PR comments
* Apply suggestions from code review
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
---------
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
* init
* port hostiles to hordes, fakeout horde
* cleaning, docs
* i may be blind sometimes
* i may be even blinder
* remove friendly announcements
* fuck it
* i love microbalancing
* review
* review
* review p2
* Update Resources/Prototypes/GameRules/pests.yml
Co-authored-by: SnappingOpossum <snappingopossum@outlook.com>
* review + powercreep
* lower the times to account for the gamerule delay
* review
* review
* fuck this return actually
* fial
---------
Co-authored-by: SnappingOpossum <snappingopossum@outlook.com>
# Conflicts:
# Resources/Prototypes/GameRules/pests.yml
* verb category
* voltage toggle comp
* move stuff
* add simple prototype
* implement verb action
* switch expression
* fixed the node not updating
* charge the battery
* fixed battery not charging
* spawn on battery level system
* finally works
* swap commentary position
* can only anchor the extractor on the station
* popup message for trying to anchor outside of station
* default placement for unanchored version
* ops
* fix body type
* commentary
* update visuals of power consumer
* add custom sprite
* fix light layer not changing
* xenoborg circuit
* fix xenoborg circuit
* add tag
* add hand to hold xenoborg circuits
* move to material
* add xenoborg circuit material
* add recipe to mothership core
* add a hand to hold circuits to the mothership core
* to not confuse
* update
* ops
* another ops
* update mothership
* update guidebook
* update values
* more info
* fix stack
* can store xenoborg circuits
* description
* also update description
* circuit -> crytal
* not modified from anything
* update description
* Revert "update mothership"
This reverts commit 84974c56afadac2a99ed2a166244a668d83fff48.
* update empty label
* small update to sprite
* not necessary code
* remove empty line
* color
* make it explode when destroyed
* change values
* update sprite
* update sprite
* make it eletrified
* flavor text
* simplify to only use charge
* subscribe to event
* new line
* remove popup
* no need for the setter
* no longer networked
* feedback popups
* Minor tweaks
* better to understand
* better now?
---------
Co-authored-by: beck-thompson <beck314159@hotmail.com>
* Added Emp interaction with Bar Sign
There was already content for emp bar sign but no support for it.
This adds the interaction with emps to make bar signs EmpDisabled.
* Emp BarSigns stylistic change
* Fixed redundant bar signs
Fixes the extra bar sign popups bug introduced in #42364
* Block bar sign UI when emped
* Revert "Fixed redundant bar signs"
This reverts commit 23168bb503bcf267ac553eff9ac9674bf28adb4b.
* Add two varieties of steel vertical slat tiles
* Add dark and white variants of vertical slat tiles
* Add dirt decals
* Add vertical overlay decals
* Add single and double vertical slat decals
* Add steel, dark and white horizontal slat tiles
* Improve single vert slat decals
* Add horizontal slat dirt decals
* Add horizontal slat tile objects
* Add horizontal tile cutter recipe
* Add horizontal slat overlay decals
* Fix inconsistent tile naming
* Add horizontal single and double slat decals
* Fix incorrect slat decal
* Fix two off-color pixels on dark slat tiles
* Change slat tile naming
* Add single-slat overlays
* Smooth tile borders and normalize palette
* Update decals to match tile changes
* Update attributions
* Add missing stack locale lines
* Fix and clean up merged file
* Change slat footstep sounds to be consistent with other steel tiles
As far as I can tell, regular steel tiles use FootstepFloor, (except when
they don't,) and Dark and White variants use FootstepTile.
* Fix confusing merge conflict mismerge
* Remove merge conflict cruft
I have no idea how I missed that.
* Add tile stack prototypes
* Fix slat tile stack localization string refs
* Fix slat tile prototype indentation
* Remove tiles that are identical under rotation
* fix yaml header convention
* Parent slat tiles to common steel tile parent
* Whitespace fix
* Un-de-normalize prototype field ordering
* Fix whitespace
* Re-fix indentation
For some reason, I un-fixed this a little while back. No idea why.
---------
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
* revert of the revert
* tests
* changes
* more fun
* test
* ccvvvar
* works but bad
* now its better
* more fixes
* more cleanup
* cleaning
* last fixes before move to glasses activ
* x
* glasses only
* working
* fix toolbox
* cleanup
* ThermalByte added
* small fix
* small optimalisations
* float bux fix
* comments add
* more comments
* more comments
* last fix
* revert cvar delete
* wrong blue shades
* cvar refactor
* Update Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* Update Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* tweak to TryGetTemperature comment
* Factors are now const
* renames
* Interface for ThermalByte
* admin button
* cleanup
* sandoboxenabled
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* tesloose alert
* forgot to remove this when I removed naming the unlocker
* and these too...
* migrate to Entity<T> and clarify emitter lines
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* fixed vox tail marking and suitslot layer order
* explained marking
* now it's hideable
* Revert "now it's hideable"
This reverts commit ab799b088739b3d986a5158f51b44f9c770e6e3e.
* re-order one more time for correct parity with the previous system
* Switch button for gas filter power
* Switch button for gas mixer power
* Switch button for gas pump power
* Switch button for thermomachine power
* Switch button for space heater power
* Remove redundant switch labels
* Make fax tell where the fax is from
* make the line shorter
* localization
* fix fax machine not knowing where the fax is from
* fix popup saying PeerSelector
* name is now get from the known fax list
* shorter to fit in more papers
* send the sender not the destination
* add time to info displayed
* nuke [ViewVariables(VVAccess.ReadWrite)]
* update submodule
* use RoundDuration() instead
* ops, this was needed
pathetic meowmeow
Vanessaandpre-commit-ci[bot]
Pixel
Cepelinas1
Coryn
Tobias Berger
slarticodefastandArtisticRoomba
salarua
Vladislav Suchkovandslarticodefast
ScarKy0
Velken
Crude Oil
UpAndLeavesandScarKy0
Hitlinemoss
Samukaandbeck-thompson
OrbitSystem07
SlamBamActionman
Patrik Caes-Sayrs
PgrihaandScarKy0
Aearo-DeepwaterandErrant
InsoPLandArtisticRoomba
kosticia
SuperandArtisticRoomba
John
Minemoder5000
Absotively