Ed
dc47bb2283
Merge remote-tracking branch 'upstream/stable' into ed-15-10-2024-upstream
...
# Conflicts:
# Content.Server/Station/Systems/StationSpawningSystem.cs
2024-10-15 15:25:44 +03:00
Ed
d259191d3d
Cargo system ( #487 )
...
* simple storeship arriving
* pupu
* ship cycling
* buy positions prototypes
* i hate UI
* PriceControl
* second tab ui
* baloon! pallets!
* update shop in town
* setup billboard timer
* split to sell and buy categories
* renaming gaming
* actually selling
* fix infinity selling
* improve timer
* move description too rigt part UI
* bar selling
* iron cabinet
* purge currency categories
* remove town balance, add money box
* special proposal, FTLImmune anchor
* fix UI
* remove tests buying
* Update CP14StoreWindow.xaml.cs
* currency converter
* currency clean up
* Update CP14CargoSystem.cs
* clean up part 2
* rider petpet
* coins audio
* coin improvment
* Update coins.yml
* translate
* more coins roundstart
* Update wallet.yml
* Update wallet.yml
* generate coin problem fix
* refactor proto reading
* fixes
* huh
* shuttle logshit fix, add to tavern map
* Update CP14StationTravelingStoreShipTargetComponent.cs
2024-10-15 15:22:06 +03:00
mubururu_
6654e00411
organ sprite touch-ups ( #32762 )
...
* does work?
* fix
* shrunk organs to normal size of small
* made brains and liver look better
* made stomach slightly less bright
* unique sprite for diona lungs + inhands
* unique sprite for vox lungs + inhands
2024-10-14 13:32:32 +02:00
ScarKy0
5be82d2a7f
Cyborg module action icons ( #32505 )
...
* Init
* added jani and medical
* + sci and service modules
* + syndi modules
* fixing up
* geiger counter stuff
2024-10-14 18:05:40 +11:00
TeaMaki
076c692878
Warden Hat Texture Change ( #32253 )
2024-10-14 00:36:56 +02:00
SlamBamActionman
9bf7c44585
Add poster about the SSD term ( #32736 )
...
* moff
* Attribution
2024-10-13 22:25:49 +11:00
Nim
40959cf422
fix resp ( #488 )
2024-10-13 02:09:41 +03:00
KingFroozy
214a20da8e
Changes to CE's suits ( #29850 )
...
* Changes to ce sprites
* Adjustments
* More changes i guess
* Love life, get skirt
* Bitlessdark
* fkingforcepush
* upd №?
2024-10-12 21:13:39 +02:00
Nim
a6fc5e6ace
Rabbit ( #486 )
...
* rabbit
* meat
* гладить
* тоже гладить
2024-10-12 20:01:13 +03:00
Ed
b9df2a495a
some blacksmith bandage ( #483 )
...
* anvil
* iron and copper ore walls + procedural cave update
* vladimirs rocks
* furnace
* Revert "furnace"
This reverts commit f378e4fb85b2c6a193fcdc6d70b10e3ab164999291c226d18d3c3a87c25e7fb44b4908891c3ba0aa4f2eaef6c19d7e042ddf
2024-10-09 13:40:06 +03:00
beck-thompson
384ff7e8f6
Add pumpkin pie! ( #32623 )
...
* first commit
* Licence fix
* rosysyntax licence change (permission granted!)
* simplify
* Better wording
2024-10-09 10:29:41 +11:00
Ed
d2c5aa74b4
Ritualizm ( #474 )
...
* ritual cucumber setup
* entities requirements
* try graph???
* Revert "try graph???"
This reverts commit c90c6353cb
2024-10-06 18:04:18 +03:00
Арт
867efe8b5b
Add flowers to loadout ( #32097 )
...
* Add_Poppy&Lily
* Add_FlowerWreath
* Add_Headflowers
Sprites, meta, prototype
* Id_Changes
* Changes
* Update_Sprite
* Desc_Change
* Scale_Change
* Sprite_Scaling
2024-10-06 14:48:49 +02:00
Nim
98c921aa94
Zombie and old lamp ( #467 )
...
* zombie
* fix
* spawner fix
* license
* woman parts
* male parts
* 122
* 123
* 124
* HideSpawnMenu
* damn
* requested
* fixxxx
* gooo
2024-10-04 21:24:17 +03:00
Nim
21ea4290a5
Paintings ( #479 )
...
* oppa
* fix
* Update Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/meta.json
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2024-10-04 21:18:01 +03:00
Ed
35baaacbce
Blue amanita flower, mana potions! ( #478 )
...
* merge bloodgrass and red flowers
* delete sprites
* add blue amanita sprites
* restruct alchemy reactions folders
* mana heal and damage reagent
* add gatherable to worldgen
* fixes
* Update sewing_table.yml
* Update Alchemy.xml
* Update Alchemy.xml
* Update migration.yml
2024-10-04 19:19:13 +03:00
Ed
ab1e071fdf
Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream
...
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
2024-10-03 17:34:08 +03:00
Flareguy
4ad4fd42b1
Steel tile variantization fix ( #32596 )
...
steel tile variantization fix
2024-10-02 14:14:44 +02:00
lzk
c55e311c7e
Cleanup pins.yml ( #32593 )
...
* Cleanup pins.yml
* oh my
* forgor
2024-10-02 13:23:32 +02:00
lzk
edc83b2fab
cleanup and fix dinky star ( #32594 )
...
* cleanup dinky star
* fix
* oh
2024-10-02 12:53:19 +02:00
ArchRBX
dd12ac1f8a
MedTek Cartridge ( #32450 )
...
* initial commit
* adds cartridge to cmo's locker
* tidies up yml, adds default scanner sound, makes it so the silent property silences the scanner sound too
* fixes ert medic pda not having it preinstalled
* adds attribution
* removes redundant dependencies
* fix agent pda
---------
Co-authored-by: archrbx <punk.gear5260@fastmail.com >
2024-10-01 23:17:57 -07:00
TakoDragon
542817807d
Red circuit floor ( #32557 )
...
* red circuit added
* index colour begone
2024-10-01 23:35:48 -06:00
TakoDragon
936917cd05
Hydroponics doors ( #32575 )
...
* spriting done
* yml hydro updates
* Named wrong thing and forgot it inherets
2024-10-01 23:33:35 -06:00
Zylofan
ec8b7b238a
fixed it so blue bandana head and mask sprite is not reversed on vox ( #32569 )
2024-10-01 23:55:56 +02:00
TakoDragon
f3fe5af240
Reinforced walls sprite see throu top ( #32578 )
...
fixed a gap
2024-10-01 23:44:47 +02:00
TakoDragon
23f4bc1d7a
Gay Boykissers ( #32584 )
2024-10-01 23:07:48 +02:00
Jaraten
6c08ca60f3
frame & table ( #464 )
...
* frame & table
* rem superfluous sprite
* merge conflict
* duplicate_ID
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2024-10-01 16:32:14 +03:00
ScarKy0
ba68fb2ddb
Update binary key to use AI icon ( #32327 )
...
* Init
* uplink icon
2024-10-01 14:03:37 +10:00
Golinth
3b682d4d68
Added Firebots - Real ( #32482 )
...
* Add Firebots
Had to add OnActivateInWorld to the spray system to get the bot to work. Checks for the flammable component and if the onFire boolean is true.
* Make SpraySystem actually use useDelay
got rid of that TODO
* Added firebot speech
Fire detected!
2024-09-30 20:13:16 -07:00
pofitlo
bad7359aeb
Add camera bug ( #30250 )
...
* Add camera bug
* Update camera_bug.png
* fix
* change
* Update Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/camera_bug.yml
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* Update Resources/Prototypes/Catalog/uplink_catalog.yml
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-10-01 00:24:36 +02:00
pofitlo
2f286afd95
Syndicate business card ( #32162 )
...
* add card
* Update Resources/Locale/en-US/paper/syndicate-business-card.ftl
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
* fix
* Update Resources/Prototypes/Entities/Objects/Misc/business card.yml
Co-authored-by: Эдуард <36124833+Ertanic@users.noreply.github.com >
* add logo
* swap the "funny 'c'"
* improve logo (a little) and also fight with the funny 'c'
* fix
* oh... i think... mabe i done with this?...
* add
* smaller cards
* fix
* Update synicate_card.png
* fix typo
* fix
* fix
* Update Resources/Prototypes/Entities/Objects/Misc/business_card.yml
---------
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: Эдуард <36124833+Ertanic@users.noreply.github.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-09-30 22:44:44 +02:00
Ed
4cd9e41469
Mist + Lampposts ( #472 )
...
* lamppost
* mist weather
* maps update
* Update weather.yml
* Update meta.json
2024-09-29 13:07:30 +03:00
Ed
4d9e657f6f
Split decal cleaner into Broom + Max Gab papers and hair ( #470 )
...
* add broom
* water fix
* new hair
* paper added
* feather pen
* some unfinished inkwell
* inkstorage
* Update meta.json
* fixes
2024-09-29 11:02:39 +03:00
Ed
0dc7982109
Footprints + Mop + Force undersky liquid evaporation ( #469 )
...
* all evaporation under sky
* footprints system
* puddle footprints
* split to holder and trailer
* mop added
* mop finish
2024-09-28 18:09:30 +03:00
Futuristic-OK
a371de16d3
Some new hairstyles! ( #31010 )
...
* Add files via upload
png of hairs
* Update meta.json
hairs meta
* Update human_hair.yml
hairs yml
* Update human-hair.ftl
hairs named
* second try
* fix meta
* Add files via upload
* Add files via upload
fix again
* Add files via upload
again again
* Add files via upload
again again fix again
* Add files via upload
i hate yourself
* Add files via upload
fixxxxx!
* Add files via upload
aaagaaaaiiin
* dd
dddddd
* Add files via upload
fix again
* Add files via upload
ddsdssddssddsdsds
* Update human-hair.ftl
* Update human-hair.ftl
screw this im just going to update it myself
webops time
* Update human_hair.yml
* Update meta.json
* Rename capsdaughter.png to longbow.png
* Rename artist.png to shaped.png
---------
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com >
2024-09-28 16:07:51 +10:00
Ed
dca61c009d
2 new Lobby image, some bugfix ( #468 )
...
* +2 lobby screens
* Update goblin.yml
* workbench recipes remove nesting
* tips update
* Update sewing_table.yml
2024-09-28 01:29:02 +03:00
Fildrance
4bcf3c3c0e
Station AI ability to electricute doors ( #32012 )
...
* Boom! Emergency access!
* Emergency access sound
* locale
* Updated sounds
* bleh
* Door electrify base
* feat: popups on attempt to activate AI action when wires cut
* refactor: use SharedApcPowerReceiverComponent to check if AI can interact with door
* refactor: added icon and sound for door overcharge
* meta.json should use tabs not spaces
* refactor: extracted sounds for airlock overcharge to static field in system
* refactor: cleanup, ScarKy0 mentions for resources
* refactor: removed unused textures
* feat: now notification is displayed when AI attempting to interact with door which have wire cut
* StationAiWhitelistComponent is properly gating BUI OnMessageAttempt, SharedPowerReceiverSystem.IsPowered is now used to check if device powered
* refactor: use PlayLocal to play electrify sound only for AI player
* refactor: SetBoltsDown now uses TrySetBoltDown, checks for power.
* bolts now check for power using SharedPowerReceiverSystem
* electrify localization and louder electrify sounds
* extracted ShowDeviceNotRespondingPopup, reverted airlocks not opening/closing when ai wire was cut
* refactor: cleanup
* New sprites and fixes
* Copyright
* even more sprite changes
* refactore: cleanup, rename overcharge => electrify
---------
Co-authored-by: ScarKy0 <scarky0@onet.eu >
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2024-09-27 17:22:17 +10:00
Ed
1df3ed177b
Merge remote-tracking branch 'upstream/master' into ed-27-09-2024-upstream
...
# Conflicts:
# Content.Server/Explosion/EntitySystems/TriggerSystem.cs
2024-09-27 10:22:05 +03:00
Ed
c2704165d3
Loadout update ( #461 )
...
* some full species sprite
* floral wreath
* alchemist cloak, loadout restruct
* giant head clothing refactor
* Update entities.ftl
* backpacks loadout! yay
* trinkets
* Update general.yml
* oopsie
* Update general.yml
* fixes
* Delete test-ship.yml
2024-09-27 00:36:09 +03:00
Ed
a92c623672
Fences update ( #458 )
...
* small fences update
* Update wooden_fence.yml
* reparent all fences, fix high fence
* iron grille fix
* migration
* Update migration.yml
* construction recipes
* Update migration.yml
* fix dev map
* Update migration.yml
* Update migration.yml
* Update migration.yml
2024-09-26 14:57:24 +03:00
Zylofan
0dedc9d91a
Skull Helm Hand Sprite now turns ( #32442 )
...
Fixed a typo for the bone helmet that made it not rotate when held in the right hand.
2024-09-25 20:50:15 +10:00
Jaraten
693ba93e44
Content pack jr ( #457 )
...
* 24.09.24
* wallpapers
* backpack parenting setup
* goblin backpack
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2024-09-25 12:31:31 +03:00
Ed
75bc6d4eac
Doors update ( #455 )
...
* sprites
* mirrored + windowed wooden doors
* cooking table sprite
* craftable doors
2024-09-24 21:19:52 +03:00
ArchRBX
241be37185
AstroNav GPS Cartridge ( #32194 )
...
* initial commit
* adds astronav cartridge to QM locker
* changes requested in review
* fix merge conflicts
* fixes the statuscontrol disappearing if you eject the cartridge but still have it installed
* fix notificationsenabled on salv pda proto
* fixes lingering statuscontrol on eject while held
---------
Co-authored-by: archrbx <punk.gear5260@fastmail.com >
2024-09-24 19:02:51 +02:00
lzk
87932bce57
craftable freezers ( #32277 )
...
* Craftable freezers
* oh i forgot that
2024-09-24 17:19:40 +02:00
Ed
07637bd691
Prototypes cleaning: destructable, flammable ( #453 )
...
* damage rethinking, bush fix
* flammable rethink
* trying to fix fire
* airtight false default
* autoignite
* Update fire.yml
* Update fire.yml
* Update fire.yml
2024-09-24 13:46:26 +03:00
Ed
0456d40bef
Content pack ( #444 )
...
* cable sprite
* steel plates
* iron wall
* vladimirs resprite
* resprite cables
* cable item
* lv cable finish
* round table
* curtains! (need resprite)
* plates + cucumbers
* more procedural cooking
* some tweaks
* fix test
* пипяу
* finish
* ah
* l
* pip
* some cool
* hide station ai
* revert localization
* Update crates.yml
* Update crates.yml
* red and blue curtains
* Update crates.yml
* Update crates.yml
* fix cupboard
* Update exp_tavern.yml
* fix sliceable recursion
2024-09-23 14:53:03 +03:00
Errant
a7e29f2878
Computer wirepanel ( #32273 )
...
* Computer wirehacking
* Power wire now shocks
* deconstruction fix
* updated tests
* Better parenting
* maintenance panel sprite
* new sprite for maintenance panel open
2024-09-23 12:51:48 +02:00
Cojoke
3d2aadde1f
L6 Fits in the Suit Storage Slot ( #30525 )
...
* L6 Fits in the Suit Storage Slot
* 5x4 item
2024-09-23 16:48:58 +10:00
ravage
1aea1ae76f
Adding a holy watermelon helmet ( #32272 )
...
* lolkekhatholy
alalalla
* animationcreate
blelebleblbeleb
2024-09-22 12:33:08 +02:00
