Alan and GitHub
84f6a330b0
Tilt lightmask when tilting vendor. ( #32315 )
2026-07-24 08:13:29 +00:00
Hayden Redacted and GitHub
2f2a50c137
Adds Heavy Duty Cables to the YouTool Vendor ( #32151 )
2026-07-07 23:45:04 +00:00
Alan and GitHub
e3e6bae1c9
Add drinks and recipes from Hispania! ( #31983 )
...
* Add drinks and recipes from Hispania!
* Fix duplicate var in bottle.dm. Thanks, linters!
* Add fitness cups to stations, BSH loot.
* Dull some glass rims that don't need to be quite that bright.
2026-05-15 14:56:42 +00:00
Alan and GitHub
518140e03c
Add chocolate milk cartons. ( #31960 )
2026-05-10 07:53:13 +00:00
Ahzpy and GitHub
8b28cf5870
Adds Baseball Uniforms ( #31923 )
...
* loadout + obj + human + grey
* drask
* kidan
* kidan softcap fix
* vox
* oops i forgot the loadout
* skulk
* add them to the autodrobe
2026-05-10 07:47:43 +00:00
d1dad9a639
Import several foods and recipes from Hispania! ( #31831 )
...
* Import several foods and recipes from Hispania!
* Fix trailing newlines, remove hispania icon reference.
* Fix list spacing, add drink reagents, correct annona spelling.
* Amend drink description, move icons
* Apply new timer from @CRUNCH-Borg
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
Signed-off-by: Alan <alfalfascout@users.noreply.github.com >
* Apply @CRUNCH-Borg's attack chain suggestions
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
Signed-off-by: Alan <alfalfascout@users.noreply.github.com >
* Fix many duplicate vars.
* Fix more duplicate vars.
* Remove duplicate toast.
* Fix unreachable callback. Now with @CRUNCH-Borg!
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
Signed-off-by: Alan <alfalfascout@users.noreply.github.com >
* Amend some icons.
* Add vendor seeds, tweak plant sprites.
- Add base seeds to MegaSeed Servitor.
- Change smoked salmon sushi to use smoked salmon instead of salmon steak.
- Make maize dough yellower.
- Fix capitalization in peyote description.
- Make coconut inedible.
- Modify cream cheese recipe to remove conflict with butter.
- Tweak sprites of growing plants to sit inside hydroponics trays and not move around so much.
* Add guacamole recipe, agave distill reagent.
- Add prep bowl recipe for guacamole, condiment container and icons.
- Change cactus salad icon to use new plastic cup shape.
- Add distill reagent "tequila" to agave.
- Make coconuts only attack on harm intent.
- Fix some whitespace.
* Prevent bombonuts from detonating instantly.
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Alan <alfalfascout@users.noreply.github.com >
* Spellcheck.
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
Signed-off-by: Alan <alfalfascout@users.noreply.github.com >
* Change some item names, descriptions, recipes.
- Make custom robot head recipe step so that those recipes don't just call for "a head".
- Replace smoked salmon sushi ingredient with new smoked salmon.
- Fix some confusing item names.
- Update descriptions of cacti.
- Add raw mouse as mouse butchering result.
* Modify reagent colors. Make cream cheese bread with cream cheese.
* Adjust some recipes and descriptions.
- Remove hipster ridicule from mate. Add it as a reagent to the plant.
- Touch up some grammar.
- Amend recipe for sweet arepas.
* Fix grown food slicing debug message.
* Grammar improvements feat. CRUNCH
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
Signed-off-by: Alan <alfalfascout@users.noreply.github.com >
---------
Signed-off-by: Alan <alfalfascout@users.noreply.github.com >
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2026-05-07 21:01:26 +00:00
85002cca6c
[EE] Adds Market Crash Event ( #31870 )
...
* Adds Market Crash Event
* Typo
* Bees
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
2026-05-07 05:02:49 +00:00
bf974ec3ab
Adds New Medical Berets ( #31683 )
...
* Resprites current doctor beret and adds new ones
* Updates species' beret.dmi
* Updates species' beret.dmi, again
* Fixes a misnamed beret, adds obj sprites
* Makes the new berets accessible in-game
* Updates a map file to use the correct beret name
* Add desc to psych berets + small tweaks to code
* Lets other med roles use the MD beret
* Fixes species sprites
* Remove an additional blank line
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: serapher <126386932+Uno657@users.noreply.github.com >
---------
Signed-off-by: serapher <126386932+Uno657@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2026-04-02 04:46:03 +00:00
anokspy and GitHub
1a4df5b339
Adds Departmental Cowboy Hats ( #31699 )
...
* Adds le hats
* kidan hat fitting
* tan hat existence restoration
* run you POS icondiffbot
* attempt 2
* Cargo hat emblem recolor
* bluespace? more like WHITESPACE
2026-03-22 22:02:31 +00:00
Christer2222 and GitHub
b5eabdf1a9
You can now stick forks into outlets ( #31435 )
...
* now shocks
* machines + added get_internal_wires
* removed duplicate variable on syndicatebomb
* adds wire tearing, check if the door has a plating
* return a few item_interaction_complete
* linting + unpowered message
* removed some checks + floodlights + ChemMaster
* cut_random_uncut() -> cut_random_uncut_wire()
* simplified random wire selection
* return ..() + removed /
* early return if not machine
* get_internal_wires() comment
* attackchain
* attackchain + comment removal
* duplicate variable removal
* removed extra lines
* removed some / + removed unnecessary checks
* removed uncut wirecount function + extra check to cooking machinery
* attack chain signal
* space
* removed some \thes
2026-02-17 19:12:09 +00:00
Hayden Redacted and GitHub
aa8acc6cfd
Gives the Syndicate Research Base a Free Dinnerware Vendor ( #31582 )
2026-02-13 16:22:47 +00:00
f31893cb9e
Add re-wrappable, dyeable headscarves. ( #31426 )
...
* the beginning of my torment
* This was a very small piece of torment
* God agghhghhhh the suffering
* pain and suffering and destruction
* Update bot_construction.dm
* Add re-wrappable, dyeable headscarves.
* Add trailing newlines. Correctly set worn_as.
* Include DME.
* Fix relatively defined path.
* Update heretic_necks.dm
* Update heretic_armor.dm
* Fix duplicate attack chain var. Thanks, linters!
---------
Co-authored-by: Fordoxia <Thrash97@googlemail.com >
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
2026-02-11 22:39:58 +00:00
203105788c
[IDB Ignore] Heretic: The Mansus Re-Opened ( #30738 )
...
* fixes
* fuck my stupid chungus life
* Minion limit, heal fix, dead sac fix
* cooldown, no sacrificing star gazer or ascended alive heretics
* blade debuff
* oopsy
* Update tgui.bundle.js
* map diff bot what ya doing
* fuck that chat spam
* lets heretic armour hold a haunted longsword
* why not it makes sense
* do_after
* god I hate this bullshit
* other lewc stuff
* push
* heretic id card fix
* she tg on my ui till I css
* yes
* spent
* fix / ipc buff (real)™️
* moderate again
* revert
* no reserve
* bringing up to master
* update map files to master
* didnt replace centcomm
* beginning some rebalancing
* aggressive spread tweaks
* lots of tweaks and fixes
* trying to un-key the maps
* maybe this time
* this time????
* oops
* sql fix
* basicmob conversion
* paintings! and a critical influence fix
* rust + tweaks
* monster tweak
* small change
* removing this
* more tweaks. no more dusting
* added some examine_more
* flower seeds
* various tweaks. more to come
* no more conduit spacing
* fixed some dumb stuff
* silly stuff
* its always prettier
* bugfixes and linters
* linters, wow
* oops
* bah
* linter
* fuck you
* temp check
* hidden influence drain
* influence visible message
* tweak fix
* void cloak bugfix
* small fixes
* fixes
* do_after_once broken
* fixes and tweaks
* heretic blade potential fix + sacrifice changes
* batch of fixes
* tiny tweak
* rebuilt TGUI
* no greentext + rerolls
* logging + bugfix
* unused var
* small fix
* various fixes
* comment
* projectile change
* tgui rebuild
* tgui bundle redo
* rune issue solved
* influence visible now
* fix ui reloading
* new moon ascension + fixes + icons
* tweaks, species sprites
* tgui rebuild
* small tweak + linter
* harvester icon tweak
* spans
* fixes and tweaks
* caretaker nerf + tweaks
* potential fix for knowledge
* roller fix
* mad mask
* Update tgui.bundle.js
* void phase tweak
* Update tgui.bundle.js
* misc tweaks
* fix heretic not retargeting correctly with cryo
* simplify logic
* this is better
* lots of fixes and tweaks
* Update tgui.bundle.js
* linter
* linter
* fireshark and greyscale insanity
* fish
* Update tgui.bundle.js
* linter
* linter
* tgui
* no window shopping
* fish fix
* tgui rebundle
* moon smile runtime fix
* various fixes
* sacrifice fixes
* insanity is easier now, madness mask changes.
* bugfixing + teleport change
* linters + tweaks
* Update code/modules/antagonists/heretic/status_effects/mark_effects.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/antagonists/heretic/status_effects/mark_effects.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
---------
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
Co-authored-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Paul <pmerkamp@gmail.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2026-01-27 20:36:52 +00:00
db643c7460
Separates the wizard hat and fake beard into two different items ( #31171 )
...
* separate wizard hat and beard into two separate items
* small sprite tweak
* lint
* Update code/modules/clothing/suits/wiz_robe.dm
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
Signed-off-by: Pooble <90473506+poobsie@users.noreply.github.com >
* make the wizzy beard clip onto the wizzy hat
---------
Signed-off-by: Pooble <90473506+poobsie@users.noreply.github.com >
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
2026-01-20 00:40:02 +00:00
f81ef075f1
The NGCR: Nuclear Fission Reactor ( #30493 )
...
* coefficient balancing
* damage and meltdowns
* meltdown stuff
* alert stuff
* lots of work - whew
* some enrichment code
* rod encrichmnt
* working on enrichment
* more fabrication
* rod fab
* start to the nuke
* overload sprites
* overload code work
* some overload tweaking
* small tweak
* coolant ejections and QOL things
* overheat events + ripley gripper
* rebase + venting code
* save before rebase
* some pre-work for rods
* finishing the base rods
* fixed my dme
* de linting
* tiny lint fix
* more lint fixes
* linting
* linting
* linting
* linting
* linting
* temp delint
* temp delint
* undo TM stuff + minor fix
* didnt save
* some fixes
* fixes
* fixes and engine repair
* fixed broken durability decay
* LOTS of things
* tgui
* lint
* linter
* linter
* minor shit
* Update boxstation.dmm
* major refactors and fixes
* saved this
* critical testing tweaks and fixes
* fixes and tweaks
* smithing start
* forgot to save
* craftables + grill start
* saved
* fix
* more grill work
* Update tgui.bundle.js
* linter
* linter
* fixes
* rod fabricator initial
* cooking work
* push
* soundwork
* sound work tweak
* comments + sounds + toxins gen rework
* lots of work
* sprite stuff
* deconflicting
* delinting
* bundle rebuild
* prettier
* feex
* fuck you OD
* who asked?
* update to tgui
* another edit to tgui
* finish tgui
* remove debug metadata button
* rod tweaks for tgui
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/mecha/equipment/tools/work_tools.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/mecha/equipment/tools/work_tools.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/parrot.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/parrot.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/parrot.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/parrot.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_misc.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_misc.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_misc.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/reactor.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/reactor.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/reactor.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/smithing/components/misc_components.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update tgui/packages/tgui/interfaces/NuclearRodFabricator.jsx
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Spans
* tgui build
* rod redo
* improve tgui for fabricator
* sprites and centrifuge/fab work
* tgui update
* spritework
* cyberiad + hydrogen conversion
* kerberos + counter
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* sprite + fab tweak
* tgui bundle
* lintering
* bugfixing
* linting
* linting
* event tweak
* add missing gases to fission monitor
* issue fixing
* sprite/overlay fixes
* mapping
* stations again
* space lattice
* tine tweak
* linter
* no rod alerts
* buttons
* loose wire
* make it so you can interact through rod casings and the uhh big thing in the center, what's that called again
* fixes
* door fix
* many bug fixes + crates
* fab ghost touch
* water convert + maint sprite + fixes
* pack changes + neighbor fix
* doors rename
* didnt save
* hydrogen fix
* map tweaks
* repair fixes + corium LETHALITY
* upped broken rad damage
* pipe rename + overload icons
* more roundstart moderators
* rod tree tweaks
* tweaks
* pack and enrichment fixes
* misc tweaks and fixes
* fixes: Density, circuits, coolant offline negation
* Apply suggestions from code review
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* review changes
* linter + fix
* reviews and fixes
* LOTS of tweaks and changes
* supermatter kit
* spacematter balance
* tgui
* fixes and tweaks
* didnt save this
* mapping + smith fix
* cargo rods arnt radioactive til opened
* Apply suggestions from code review
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* review items
* fixes
* linters
* moving components out of nullspace
* examine fix
* Update tgui.bundle.js
* explosion nerf and minor fix
* Apply suggestions from code review
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* reviews
* map fix + ripley rad immune
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* review
* fix chamber examine
* tweaks + rod fab disk drop
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* review changes
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* fixes
* tgui bundle
* small rod tweaks
* Update code/game/machinery/computer/buildandrepair.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/smithing/components/reactor_components.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/reactor_machines.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/reactor_machines.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* reviews
* Update code/modules/power/engines/fission/reactor_machines.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Paul <pmerkamp@gmail.com >
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2026-01-07 09:19:43 +00:00
warriorstar-orion and GitHub
481f035722
Metastation kitchen area redesign and related features, take 2 ( #30754 )
...
* Metastation kitchen area redesign and related features, take 2
* reviews
2025-12-18 23:46:17 +00:00
Pooble and GitHub
2a28e04972
Adds a Santa hat and Santa suit item, and improves admin-only Santa's hat and Santa's suit. ( #31172 )
...
* adds a crew santa hat and suit, improves the Santa's hat and Santa's suit
* fix santa hat flags
* address a PR comment AND the new span stuff at the same time, wowie zowie
2025-12-14 16:32:13 +00:00
kyunkyunkyun and GitHub
b0463d3c83
Convert most spans to defines ( #31080 )
...
* spanish?
* aaaagain
* keep maptext
* Update robot_items.dm
* Update span_defines.dm
* compiles
* Update silicon_mob.dm
* compile
2025-12-13 23:55:48 +00:00
5d4a01148e
Smithing Expansion: Knives and Mothsilk ( #31084 )
...
* Smith Knives Initial Commit
* sprites and handling
* Knife stuff, mothsilk
* Touch ups
* Linters
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Abstract type desc
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2025-12-08 21:34:30 +00:00
6a6f81131e
Adds Tapioca and Cassava plants ( #30937 )
...
* dat
* Fixes a few issues and makes the pudding look good
* fixes all sprites with hope
* actually should fix the sprites
* fixes cassava sprites and dough recipe oversight
* fixes tabbing issues and prevents botany gaming
* makes the linter happier + deletes duplicate file
* changes many things about the order
* generalizes the food reagentcontainer + linter gud
* fixes the merge conflict
* removes the settings on my vs code from my pr
Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com >
* Adds suggested changes
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com >
* adds an abstract description
* fixes an accidental deletion of vscodesettings
* Update code/modules/reagents/reagent_containers/food.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com >
* adds a missing typepath
* Apply suggestions from code review
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com >
* Propose 2 tapioca pudding sprites.
* removes unused tapioca pudding sprite
* fixes my paradise.dme file
* Add new teas to the bar manual.
* adds alfalfa scout's recommended mix message
* attempts a fix for the .dme file
* removes a deconflicter mistake
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com >
---------
Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me >
2025-12-01 19:12:50 +00:00
Seren Highwater. and GitHub
dc88571fce
Adds cargo pants to clothing vendor and loadout. ( #31017 )
...
* done
* done2
* fix config oopsies
* greynvoxfix
2025-11-23 06:27:58 +00:00
Ahzpy and GitHub
0a615e798e
Bridge Gone; Science Department Resprite + Drip Expansion ( #30917 )
...
* obj sprites, human suits, vox suits, berets, softcap, loadout, vendors
* compile fix
* kidan sprites
* drask sprites + kidan uniform i missed
* xenobio merge conflict + swap robotics beret names
* grey sprites
---------
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com >
2025-11-13 23:37:20 +00:00
Alan and GitHub
95a22490ae
Add ginger ale. ( #30915 )
...
* Add ginger ale.
* Change name of ginger ale can to Zingiber Gold.
2025-11-10 16:37:19 +00:00
Alan and GitHub
5a039c166d
Add chaplain lookalikes and religious accessories to costume vendor. ( #30758 )
2025-11-05 10:25:09 +00:00
Alan and GitHub
47300bb0d0
Expand chef ensemble possibilities ( #30826 )
...
* Add many chef clothes to game, chefdrobe, and loadout.
* Add another chef envirosuit.
2025-11-05 10:22:00 +00:00
Ahzpy and GitHub
469412ed4f
Botany Resprite: Section C, Accessories ( #30714 )
...
* sprites wip
* remove wintercoat
* Update config.toml
* remove wintercoat 2
* bandana sprites
2025-11-03 10:43:52 +00:00
CRUNCH and GitHub
e0a1cc0ace
Update generic_vendors.dm ( #30786 )
2025-11-03 10:38:33 +00:00
Alan and GitHub
b2e34ff79c
Add 17 new soft drinks and their recipes. ( #30717 )
...
* Add 17 new soft drinks and their recipes.
* Add mix messages, tweak egg coffee sprite.
* Incorporate suggestions from review.
2025-11-03 10:32:23 +00:00
Ahzpy and GitHub
4df0c8edb5
New Engineering Uniforms + Jumpsuit Recolor ( #30735 )
...
* human, vox, vendor, loadout
* kidan sprites, item sprites
* grey sprites
* drask sprites, remove temp palettes
* add softcap to vendors, linters fix?
2025-10-26 13:03:28 +00:00
Alan and GitHub
a9c3b6d242
Update winter coats, add more, and tailor to species. ( #30644 )
...
* Update winter coats, add more, and tailor to species.
* Add white captain coat to loadout.
2025-10-15 11:05:58 +00:00
Alan and GitHub
b2e0a08d0b
Add a LOT of chaplain clothes from various religions. ( #30483 )
...
* Add a LOT of chaplain clothes from various religions.
* Thanks, linter!
* Deploy vendors, box envirosuits, unaccent names
* Thanks, linters!
* Accommodate ears.
* Correct accent oversight.
* Merge branch 'master' into chaplain-outfits
Conflicts in
icons/mob/clothing/species/plasmaman/helmet.dmi
icons/obj/clothing/species/plasmaman/hats.dmi
resolved by automatic merge and modifying chaplain helmet sprites to match new format.
2025-10-13 15:16:33 +00:00
kyunkyunkyun and GitHub
caa8343bf7
Repath some satchels ( #30427 )
...
* fix satchel interactions
* updatepaths name
2025-09-27 08:46:36 +00:00
CRUNCH and GitHub
e529ce7a23
Standardizes the permabrig seed inventory. ( #30400 )
...
* Update departmental_vendors.dm
* seeeeeeed
* moreseed
* Update departmental_vendors.dm
* Update deltastation.dmm
* e
2025-09-19 14:50:27 +00:00
b9581ce380
Adds New "Carcinoma Angel" Cigs ( #30338 )
...
* vkfdnvhy
- Added "Densed Nicotine" reagent, which is similiar to Nicotine, but has lower overdose threshold, is not addictive and also deals minor lung damage, makes people cough, sends evil messages to user
- Added "Carcinoma Angel" cigs which contains "Densed Nicotine". They can be found in hacked or syndie/beach cigarette vendors or in maints as loot.
* Update drugs.dm
* Apply suggestions from code review
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
* cough... new()...
* Update cigs.dm
* Update fancy.dm
* Update drugs.dm
* Update cigarettes.dmi
* Update cigarettes.dmi
* Update cigarettes.dmi
* Revert "Update cigarettes.dmi"
This reverts commit 831790523e78341303+ostrkrs@users.noreply.github.com >
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
2025-09-19 14:24:59 +00:00
CRUNCH and GitHub
763bd32861
The Smoking Expansion DLC II - The Second Puff ( #30334 )
...
* King's Own Tobacco
* Update cigs.dm
* cigar boxes
* badass
* CI
* CI (again)
* Update centcomm.dmm
2025-09-15 12:39:13 +00:00
kyunkyunkyun and GitHub
f6e682a6d7
armor defines ( #30115 )
2025-08-28 14:58:07 +00:00
bf750135d0
CSI Eridani: Detective content update ( #27512 )
...
* Ports Bay/ss220 detective work
* Removs detective scanner from circulation
* forensic supply crate
* Ports Bay/ss220 detective work
* Removs detective scanner from circulation
* forensic supply crate
* Mapping changes
* Mapping changes
* Ports Bay/ss220 detective work
* Removs detective scanner from circulation
* makes linters work
* i hate vscode
* fixes some nonsence
* may fix CI
* restore maps to CURRENT
* QOL
* makes gunshot residue actually work.
* fixes cursed logic
* adds scene cards again
* scene cards but real!
* fix med records, breaks attack chain
* Revives the PR
* fixes swabs
* TGUI update
* lewc and dgl first reviews
* dna medical records
* LINTERS FIX
* linter fix 2
* blood fix and linters again
* oops
* updated but broke
* help
* Chuga suggestion
* Fix shoes ending up with a null blood_DNA entry
* replace astype() because linters are still in the stone age
* 2 fixes, adds fingerprint cards to HOP locker.
* check user intent instead of target intent when swabbing
* adds 2 boxes of swabs to the det drobe
* comma important
* adds new det tools to sec belt
* Chuga review
* fuckin github
* should fix TM
* oops
* how about now
* also fixes cere
* fixes mobvars
* Update code/modules/detective_work/swabs.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* Update code/game/objects/effects/decals/cleanable.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* Update code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* Lewc review easy changes
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* Updated related bugfixes
* add swab to lathe
* fix metastation
* Fixes scene_cards
* fix cerestation
* fixes forensic kits
* Changes and fixes forensic_machines
* changes /obj/item/sample to use initialize
* spaces
* fix initialize to use a capital I
* mapload
* fixes linters probably
* meta fix
* swab fix maybe
* oops
* actual fix probably
* ma ybe
* bundle rebuild
* fixes fingerprint cards
* remove duplicate proc call
* /obj/item/sample migration
* /obj/item/forensics migration
* microscope and dnaforensics machines migrated
* I FORGOT DA VARS
* linter fix
* linter fix 2
* Funny review part 1
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* bundle update
* contra/funny review
* fixes CI probably
* CI fix
* cere mapping fix yipee
* screwdriver panel fixes
* improve forensic machine interactions
* improve open panel msg
* pollard review
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* linter fix
* Apply suggestions from pope review
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* rebuild
* rebuild
* Detective Rework
---------
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Chuga <98280110+chuga-git@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
Co-authored-by: Toastical <20125180+Toastical@users.noreply.github.com >
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
2025-08-23 15:27:38 +00:00
5b0447edcc
Makes automenders rarer. Adds sutures/regenerative meshes. ( #30003 )
...
* suture
* tweak
* bio 6 -> bio 7
* tweak bleed supression
* review
* Update code/game/objects/items/stacks/medical_packs.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-08-17 20:12:44 +00:00
Ahzpy and GitHub
c1ce48e413
The Big Botany BResprite: Movement II, The Clothening ( #29902 )
...
* code and icons
* file renaming
* vendor prices, apron/overalls obj icons, species sprites
* species head sprites because thats a thing
* loadout inconsistencies fix
* vox have their own apron and overalls sprites so i added those. oh the lengths i go for you botany
* loadout 2: return of the inconsistencies
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com >
* maybe fixes merge conflict?
* merge conflicts are so annoying holy shit
* sick of this dme junk
* remove unrelated change
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com >
* merge conflict test fix
* super merge conflict fix
* fix drask syndiberet
* actually fixes drask syndiberet
* super ultra final beret fix
* Update loadout_uniform.dm
---------
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com >
2025-08-13 22:30:07 +00:00
f02374ef13
Adds Jorts To The Game and Clothing Vendor ( #29816 )
...
* jorts
* jortsname
* objorts
* add
* mostly jone
* jorts jare jone
* fix?
* oh god
* fix?
* plaese fix
* good?
* OKAY
---------
Signed-off-by: Seren Highwater. <102489377+SerenHighwater@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2025-07-30 00:56:12 +00:00
Contrabang and GitHub
1504ed98be
massive burndown ( #29894 )
2025-07-27 20:52:39 +00:00
Bak Bak and GitHub
5752c8ad01
Adds Corporate Security Beret ( #29733 )
...
* new beret woo
* new beret woo
* new beret woo fixed for all species
2025-07-24 20:20:49 +00:00
CRUNCH and GitHub
175cfa60a1
The Smoking Expansion DLC ( #29674 )
...
* Creation
* refinement
* so many icons aghhhh
* The Revival
* e
* it continues (again)
* Lots of progress!
* I hate species sprites so much
* fuck
* Update fancy.dm
* Update fancy.dm
* Update cigs.dm
* attack log
* Abstract cigarette
* Update fancy.dm
2025-07-23 17:32:09 +00:00
CRUNCH and GitHub
71c98c3adf
Weeeeeeed bro ( #29485 )
2025-06-19 17:43:35 +00:00
Toastical and GitHub
8e1b5a50c4
assorted vendor fixes ( #29631 )
2025-06-18 19:49:18 +00:00
6c2915e581
New Mining Wardrobe ( #29515 )
...
* shoes resprites n fixes
* added under clothing sprites
* added softcaps and berets sprites
* added vendor sprite
* added missed shoes sprites lol
* coded it plus added dogfashion for baseball hat
* tweaked contents of the mining wardrobe closet
* added new vendor on all maps
* added new vendor to lavaland outpost too!
* added missing beret sprites for drasks
* added missing harshskirt sprites
* added missed pads for racial exploring suits
* Update code/modules/clothing/under/jobs/cargo.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
* Update wardrobe_vendors.dm
* recoloring
* updated desc
* Update code/datums/dog_fashion.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
---------
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-06-17 16:47:55 +00:00
ike709 and GitHub
1edfbcc59a
Fix a var that should be a list but isn't ( #29638 )
...
Signed-off-by: ike709 <ike709@users.noreply.github.com >
2025-06-16 13:51:22 +00:00
PollardTheDragon and GitHub
973204b3ab
Fixes deconstructing shocked devices without consequence ( #29519 )
2025-06-11 17:25:18 +00:00
Christasmurf and GitHub
6aac3647fc
Labcoat resprite + medical labcoat ( #29141 )
...
* initial code
* new dmi paths
* new dmi files
* removal of soul
* bro??
2025-05-14 07:13:39 +00:00
Seren Highwater. and GitHub
95480716fb
track ( #29262 )
2025-05-13 21:59:18 +00:00
