Qwertytoforty
746de75bdd
Adds most shotgun ammo boxes to cargo. Allows them to be crafted. ( #30837 )
...
* pope why didn't you test it haughughuugughuhguhguhgh
* ok let us be real it doesn't need 50 more what was I thinking
* oop
* a static shock
* spelling
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* so full of order of operations yum
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2025-11-08 22:11:53 +00:00
Alan
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
Qwertytoforty
2ecff9033a
[PTBF] [ready for review] Anomalous particulate processing objective. ( #30649 )
...
* pausing work on this till pickweight
* push
* more stuff
* proper file it
* these 2 would be interested
* and examine fix
* I should be more awake before resolving merge conflicts
* god you are stupid stop commiting every 2 seconds
* temp buff size change
* Event inhand descriptions
* behold the c o d e
* the rest of the owl
* sprite correction
* 2 more words to the list
* and this one
* yes I am having too much fun with this
* m o r e
* better glow, tech levels
* Apply suggestions from code review
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* message admins, variable
* Apply suggestions from code review
Co-authored-by: Taurtura <141481662+Taurtura@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* PPPProcessor
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Taurtura <141481662+Taurtura@users.noreply.github.com >
2025-10-25 01:01:03 +00:00
Alan
d55e4552c5
Fix the Captain's saber being invisible and undrawable in the eyes of others. ( #30749 )
2025-10-23 10:10:02 +00:00
PollardTheDragon
3e149e8e6b
Improved Ashwalker Armory: Bone Equipment ( #30600 )
...
* Adds Bone Sword, Bone Shield, Bone Sword Sheath. Todo: Light Bone Armor, Sword Inhand fix
* sword inhands
* Adds Light Bone Armor
* Linters
* Species sprites
* Fixes my crap grammar
* Updates belt icon sprite
2025-10-19 19:06:58 +00:00
PollardTheDragon
fbd8930ff4
Securiblade Redux ( #30488 )
...
* Securiblade Redux
* It's back
* Vars
* LINTERS
* Apply AP on burn damage
* Fixes recharger bug
* Slapper, Better code, cleanup, no damage on help intent while off or stun, sounds
* Secblade now makes a sound when turning itself off
2025-10-17 17:00:50 +00:00
Alan
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
PollardTheDragon
37bcc87b39
Expanded productivity bit usage ( #30476 )
2025-10-01 14:49:32 +00:00
kyunkyunkyun
caa8343bf7
Repath some satchels ( #30427 )
...
* fix satchel interactions
* updatepaths name
2025-09-27 08:46:36 +00:00
iramoye
e3f373077e
Initial commit ( #30486 )
2025-09-18 19:30:21 +00:00
warriorstar-orion
3208049a8a
Attack chain migration: structures. ( #30365 )
...
* Attack chain migration: structures.
* whoops
* wth
2025-09-14 19:21:36 +00:00
kyunkyunkyun
8821ab9a66
Updates a couple of /obj/item variables ( #29829 )
...
* compiles checkpoint
* fix some
* updatepaths
* fix
* rrr
* linters
* fiexs
* icon fixes
* plasmemes
* fix
* fix
* fix bit more
* fix
* well
* cleanup
* fix glasses layer
* conflict
* fuck gun code
* fixes
* fix
* fixes to energy guns
* review
* conflict
* support that 1 unathi pixel
* fix
2025-09-14 15:23:56 +00:00
Chap
8b8181e18a
Upgrade ERT oxygen tanks to doubles. ( #30208 )
...
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2025-08-28 20:54:42 +00:00
Silverplate
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
iramoye
94f137c41c
Renames Zvezhan to Cygni Standard ( #29965 )
...
* looks good to me
* replaces mentions of humans
* Revert "looks good to me", as Trinary is not being replaced
This reverts commit 275aca6adb
2025-08-15 06:41:27 +00:00
Alan
fb42a234f2
Resprite chef outfit for relevant species, icons ( #29959 )
...
* Resprite chef outfit for relevant species, icons
Change underclothing for human, drask, grey, kidan, vox, human, inventory, inhand.
Change uniform and helmet for plasmaman, including inventory icon.
Change hat for human, drask, grey, kidan, vox, corgi, inventory, and inhand.
Change belt (apron) for human, inventory, and inhand. Add new belt files for kidan and vox.
Change chef code to support new items for species and hands that didn't have them before.
* Remove identical belt file path, caught by linter
2025-08-12 06:10:58 +00:00
Kyani
b1b3eee1dc
Adds wizard item: Plague Talisman ( #28150 )
...
* first bits
* moving to an item
* progress
* more.... progress?
* it works! now sprites
* sprite + bugfixing
* renaming
* removed spacing
* upgraded to advanced kingstons
* added examine text
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/godhand.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/spellbook.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/belt.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update zombie_spells.dm
* made the talisman smaller
* this was leftovers. Deleted
* alerts zombies to their disease
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* updated to new attack chain
* I think this will work?...
* maybe this time + bugfix
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/belt.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/antagonists/zombie/zombie_spells.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/carbon/examine.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* fixed some reviews
* new sprite!!!!
* reworkin it
* oops spacing
* more rework. claws dont work no mo
* FINALLY
* fixed indent
* fixed an exploit + comments
* forgot to save this
* beginning rework
* Update wizard_diseases.dm
* Update wizard_diseases.dm
* finished the diseases
* removed unused proc
* removed brainrot
* misc fixes
* adds diseases to blacklist
* fixed the empty box
* silent already exists, bah
* reworked, per contra
* more fixing
* Update code/datums/diseases/wizard_diseases.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/diseases/wizard_diseases.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/diseases/zombie_virus.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/antagonists/zombie/zombie_spells.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/antagonists/zombie/zombie_spells.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/diseases/wizard_diseases.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* small tweaks
* fix + tweak
* rework + revive tweak
* tweaks
* tweaks
* slight tweak
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* review fixes
* Update artefact.dm
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/diseases/wizard_diseases.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* small tweaks
* lower regen. why was this so high
* linter
* linter
---------
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-08-06 19:53:27 +00:00
Charlie Nolan
8ffefd8777
Move all the non-weapons out of code/game/objects/weapons ( #29820 )
2025-08-06 01:37:56 +00:00
YoursTrulyHollow
072bebd088
Drip expansion: Syndicate garment bag ( #29764 )
...
* repair droid sprite update
* biochips
* syndie drip 1
* Update code/game/objects/items/weapons/storage/garment.dm
Indeed, my apologies
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com >
* Update code/modules/clothing/glasses/glasses.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com >
* Update code/modules/clothing/glasses/glasses.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com >
* Update code/modules/clothing/head/beret.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com >
* Update code/modules/clothing/neck/cloaks.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com >
* merge conflict resolve attempt 1
* Merge conflict resolve attempt 2
* mergre conflict RESOLUTION attempt 3
* Revert "mergre conflict RESOLUTION attempt 3"
This reverts commit 06e0f77564100510026+Hollow1364781653786@users.noreply.github.com >
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-08-02 05:27:06 +00:00
Contrabang
1504ed98be
massive burndown ( #29894 )
2025-07-27 20:52:39 +00:00
Christasmurf
0332d0dbfd
Paramedic Drip + some tweaks ( #29766 )
...
* code stuff
* icon stuff
* forgor the corgi
* absolutely beefed it
* old vest code removal
* wardrobe removal from maps
* frick and frock
* update path script
2025-07-26 05:57:31 +00:00
Arthri
4016c25199
Allow mining charges to be stored in explorer's webbing ( #29789 )
...
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
2025-07-24 19:56:00 +00:00
CRUNCH
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
SchrodingersWolf
ab22665626
Makes oxygen grenades printable in Protolathe and Increase amount of oxygen grenades in Cargo Emergency Equipment Crate: Back with a vengeance ( #29595 )
...
* Oxygen nades!
* Cargo oxy nades upgrade
* I'm BACK - Edited levels, need to remake PR
* Oxygen reqs added
* Minor spelling mistake
* Update code/modules/research/designs/misc_designs.dm
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
---------
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-07-15 20:07:53 +00:00
PopeDaveThe3th
f0c83f9803
Adds Stinger Grenades ( #29178 )
...
* ballin
* sprite change
* curse of balance
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
---------
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2025-07-04 19:13:08 +00:00
Toastical
9309ca46fb
Adds storage dumping ( #29641 )
...
* added storage dumping
* retain in storage item shuffling
2025-07-04 19:07:07 +00:00
CRUNCH
71c98c3adf
Weeeeeeed bro ( #29485 )
2025-06-19 17:43:35 +00:00
Kyani
fdcf4899a2
Frankenstein Station 13: Introducing dissections and alien organs to xenobiology ( #29093 )
...
* ddsadsa
ddsadsa
* moderate again
* revert
* beginning with rebase
* organssssssssss
* organs now process!
* analyzer finished! + mapping
* tool bit implementation and quality
* organs and fixes and reworks
* more organ work
* more organs done
* more organ progress!
* more organ work
* MORE. ORGANS.
* temp
* more organsssss
* ITS DONE!!!!!!!!
* oops
* also oops
* linter stuff
* forgot this + oops
* linter
* i forgot to save!
* lots of improvements and tweaks
* move icon over
* icon tweaks
* icon mistake
* oops
* dumb
* more icon validations
* i think thisll fix it?
* Apply suggestions from code review
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* fixes
* fixes+tweaks
* fix
* oops
* linter
* i didnt save....
* this should give -some- warning
* forgot a span
* Apply suggestions from code review
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* beginning edits
* more fixed and tweaks with cooldowns
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* lots of tweaks
* more review changes
* comment change
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* returns start back to gland
* Apply suggestions from code review
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* code review fixes
* trying to make surgery work....
* might as well push this
* perfection. now i need text
* text + small tweaks and bugfixing
* linting
* forgot to implement this
* deconflicting maps
* modifying for xenos again
* i guess this wasnt needed???
* added surgical belts to xeno
* minor swap
* quick fix
* small tweaks
* small tweak
* tiny tweak
* some slime updates
* more tweaks
* more updates
* first batch of fixes
* hiero audio fix
* robotic fauna fixes
* more rounds of bugfixes
* prevents teleporting
* tiny fix
* makes sharp more common
* misc fixes
* surgery and revenant fixes + extractor
* adds cursed organ logging
* small bananium organ tweak
* actually gives teleporter access
* adds a message to the analyzer
* can now drag naughts
* slime behavior tweaks
* headslug tweak, cant eat organs
* Update code/datums/components/special_tastes.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/components/special_tastes.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/components/special_tastes.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/slime/slime_mob.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/slime/slime_mob.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/revenant/revenant.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/components/special_tastes.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/abduction/gland.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/abduction/gland.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* moved this
* major rework prep
* didnt save
* rework done
* small fix
* makes aliens draggable by crew after death
* shouldnt have cut this
* xeno organ tweak + tips
* oops
* fixes and tweaks to slimes
* not used
* temp revert
* rebase map files to master
* re-applying changes
* access fix
* access tweak
* big fix for new refactor
* more refactoring
* forgot a span
* Update code/datums/components/surgery_initiator.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* hiero only doesnt target dead megafauna
* various fixes
* fix requests
* fixed weird conflict markers
* deconflict
* deconflicting
* antimagic flags
* merge fixing
* Update code/modules/mining/lavaland/loot/hierophant_loot.dm
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
* regen mesh fix
* small fixes
* tick fix
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* grammar
* Update code/modules/surgery/organs/organ_internal.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/surgery/organs/organ_internal.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/research/xenobiology/xenobiology_organs.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/research/xenobiology/xenobiology_organs.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/research/xenobiology/xenobiology_organs.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* tweaks
---------
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-06-10 16:46:56 +00:00
Osetrokarasek
8dcfbb327e
No Brute From Throwing Cig Butts ( #29445 )
...
* fo
* fa
* Update lighters.dm
2025-06-07 13:26:48 +00:00
Contrabang
f9e95a2b1d
Adds an icon for non-abstract nodrop items ( #29452 )
2025-06-07 13:25:01 +00:00
PopeDaveThe3th
5837434099
Adds Federation marine combat armor ( #29285 )
...
* finally
* grey
2025-05-30 21:13:03 +00:00
Osetrokarasek
07230191d7
Update bags.dm ( #29248 )
2025-05-22 18:59:56 +00:00
Christasmurf
de2e87289b
CMO & RD Drip ( #29333 )
...
* code code code
* all of the sprites
* final code?
2025-05-17 13:11:42 +00:00
ExusA
e81fbe2d18
new satchels ( #29302 )
2025-05-15 08:26:02 +00:00
PollardTheDragon
9cabc380b4
Makes Golems Mine Again ( #29154 )
2025-05-13 06:13:25 +00:00
Toastical
d3e09bcb76
increase slots to 27 ( #29243 )
2025-05-13 04:06:38 +00:00
warriorstar-orion
cca96c5e15
restrict food tray pickup items to food, fix sliceable tray click pickup ( #29216 )
2025-05-13 04:02:24 +00:00
Christasmurf
dde810d7bf
all the bits ( #29130 )
2025-05-04 03:46:44 +00:00
kyunkyunkyun
7aaca16579
Update firstaid.dm ( #29088 )
2025-05-04 03:40:11 +00:00
kyunkyunkyun
6f0f2b8024
Syndicate mobs rework ( #28706 )
...
* initial
* i'll get fired
* update icons for mapping as well
* update maps
* tweak
* tweak and revert a bit
* tabs
* speak english, motherfucker
* oh
* updatepaths
2025-04-26 17:58:24 +00:00
CRUNCH
e6ad589b41
Update surgical_tray.dm ( #28975 )
2025-04-24 14:34:35 +00:00
PollardTheDragon
760db22912
Adds smith bag ( #29015 )
2025-04-20 21:07:41 +00:00
Burzah
b5b05a11af
Changes the colors of some chemicals while in glass containers ( #28510 )
...
* Initial commit
* made color changes
2025-04-16 13:30:57 +00:00
kyunkyunkyun
bf28bfd604
Updates Rocky Motel ( #28786 )
...
* this motel rocks
* nvm i got chat gpt
* relocate icon
* oh it removed web commit
2025-04-09 19:26:42 +00:00
warriorstar-orion
071ecc371f
refactor: remove unused var /mob/var/LAssailant ( #28825 )
2025-04-03 13:50:36 +00:00
warriorstar-orion
ff0c749f31
refactor: add commonly used investigate category defines ( #28826 )
2025-03-30 23:10:48 +00:00
Contrabang
fde22d1c43
Adds more reasons to explosion logging ( #28812 )
...
* explos
* yeah good enough
* shorten that
* use ckey
* forgot this cause
* unfuck it
2025-03-28 18:49:57 +00:00
warriorstar-orion
f9ade844c9
Kitchen rework part 1: machines and recipes. ( #28277 )
...
* Kitchen rework part 1: machines and recipes.
* update oldstation
* update updatepaths script number
* fix blank icon test
* remove old deep fryer completely
* fix duped recipes and recipe datum names
* add chef PDA cart to chefdrobe
* nerf grill wood consumption rate
* multiply food for cooking machine rating
* fix runtime
* add cookware to syndie base and oldstation
* remove dupe burger recipe, update syndie/oldstation setups
* nerf potency quality award
* buff burn/ignite times, remove pointless on_fire flag
* more grill woodburn nerf
* meh
* try and unfuck timing issues
* more fixes and icon updates
* more fixes
* more review changes
* fix linter
* disable pcwj debug
* fix grill and deep fryer overlays
* fix timers with no containers
* attempt to fix reagent adding issues
* more cleanups
* allow rped usage
* grammar, null checks, reagent display
* PDA updates, map updates
* fix mats values
* new panel sprites
* recipe fixes, add prep bowl
* revert unused icon file changes
* move this to mesh with smith TM
* remove food quality for now
* New sprites, autochef.
* fix examine text
* reduce oven cook times
* lots of fixes
* fix autochef recipes that start with reagents
* prevent shenanigans
* megapatch 1
* block ingredients behind oven door
* PDA app improvements
* remove unused proc
* fixes for cookbook, descontructions, completed steps
* allow empty containers with a tracker to be claimed
* allow reclaiming
* autochef reliability fixes
* autochef reliability fixes
* fix quality product count
* update updatepaths script
* better stack handling
* more fixes for stacks and reagents
* timers no longer turn off burners automatically
* autochef turn offs and make sure we can see output storage
* add microwave recipe for roundremoving player brains
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
* burza review 1
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
* fix berry muffin name while i'm here
* grill -> microwave in new tests
* grill -> microwave in new tests, but actually for realsies
* i definitely know what i'm doing
* redundant attack chain setting
* add examine text about clearing buffer
* remove unused vars and start improving docs
---------
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-03-23 04:59:08 +00:00
warriorstar-orion
7eb404f562
attack chain migration: reagent containers ( #28699 )
...
* migrate reagent_containers.dm
* applicator migration + game test
* borg hypo migration
* condiment migration + game test
* fixed and expanded applicator game test, helper proc for puppet activate_self
* expanded condiment game test, added negative any_chatlog define
* drinks_base.dm migration
* bottle.dm migrated
* molotov migrated
* cans migrated
* drinking glass migrated
* shot glass migration
* bottles suck
* some fixes
* more bottle.dm
* bottles finally behave
* bottle fixed, shotglass fixed, everfull migrated
* bottle tests
* cyborg trashbag can crush autopickup is broken
* fixed cans insertion into backpacks
* added zone targeting to puppet
* more tests for drinks
* dropper migration
* dropper finished, removed a repeated proc
* smol tweak
* glass containers
* glass containers finished
* fixed can and bottle tests
* molotov test
* drinking glass and started shot glass
* fixed puppet activate_self + done with drinkingglass
* med containers, shuffle tests around a tiny bit
* fix autoinjectors
* remove return value from spawn block
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
---------
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Toastical <toast@toaster.com >
Co-authored-by: Toastical <toastical@toaster.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-03-21 20:42:24 +00:00
PollardTheDragon
cd7cb01a1f
Meet the Smith - New Supply Role ( #28273 )
...
* Smith role, access, access helpers, spawn point, comms, and IDs
* Area defines
* Hammertime
* Cyberiad Smith's office
* Forgot some atmos stuff
* Autolathable Hammers
* Formatting
* Toolbelts can hold hammers
* Initial work on smith machines
* Farragus Smith Office
* Placeholder sprites, mapping
* Smart hopper points and console messages
* More work on smithing machines
* Fixed mapping, added qualities, added smithed items, fixed sizing, fixed access
* Smith components, new materials
* New ores, material datums, furnace, power hammer, kinetic assembler, hammer act, item creation
* Missed one
* Grrr map conflicts begone
* Dirt begone
* Casts and smelting
* Linters
* Attack chain linters!
* Better grip to throw people into your industrial machines
* Placeholder spots in the DMIs
* UpdatePaths - Space ruins now spawn new space ores in their rocks
* Small changes - removed excess tgui code from hopper
* Fixed a button on emerald
* Attaching inserts and lenses. Tool bits are pain.
* Tool bit initial implementation
* Merge conflict resolution
* Attack chain grrr
* Fixed a pair of minor mapping issues
* Tool bit implementation, efficiency, failure rate
* Hot things burn hands
* Points fix on hopper
* New mining rocks for space exploration
* Areas on asteroids
* Machinery icons 1
Adds basic icons for the new machinery
* Vendor iconstate update
* Crucible touchups
* Hammer touchups
* Crucible Input Animation
Adds an animation when you deposit ores
* Added scanning the crucible with multitool to get mineral count
* clothing sprites part 1
* locker sprite
* job icons
* garment bag
* Smith locker mapping
* Insert and Bit removal fix
* Job menu alignment fix, Allowed_items and small spriting path fixes
* Adds new asteroid ruins to config
* Ore Sprites
* Hammer Sprite
* Item Sprites 1
* Sheets, Wall Ores and Trim
* Sheet iconstate names
* species uniforms
* Tabs
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Lens spelling fix
* Signalizes attaching and detaching modifications, fixes inserting items into smith machines, fixes cast bugs
* Fixed type lists
* Smithing machine bug fixes.
* Fixed adding modifications to items
* Crucible Lava Idle
Adds an idle animation for the crucible, but it needs overlay code to work.
* Fixed eguns
* Magma Crucible overlays and animations
* Machine broken/Off states
Adds broken, wires exposed (and on/off where appropriate) states to machines.
* Castivend recolor and Hot Items
* Overlays for all machines, new sprites for hot items, new checks, fixes
* Woe, farragus merge conflict
* update_appearance linters
* I have fat fingers.
* Forgot one
* transfer_item_to and qdel null check
* Usr to User
* Modsuits should not have inserts.
* Adds casting lip overlay
* Balance pass on movement debuffs and buffs
* Material movespeed changes
* Config Adjustments - USED FOR TESTMERGING. REVERT BEFORE FULL MERGE
* Math fixes for lenses and bits.
* Mobility suit no longer speeds you up, but negates suit-based slowdown like an oil slick potion. Fixed movement mods in material datums
* Bad var. Bad.
* Various fixes to bugs revealed in initial TM
* TYPO
* Lavaland base turf fix
* Paths in examine fix
* Adds an intercom to the workshop.
* Stamina-hybrid damage oversight fix for det revolver, uion, etc.
* Currently Operating Message fix
* Allows glass to show different turfs beneath. Adds plasmaglass section to workshop.
* Armor and upgrade fixes
* RCD tool bit equip fix
* Adds smith access to a few lists in access.dm that were missed in an oversight
* Indent fixes
* Fixes vending machine, allows tool bit use on mining equipment
* CI, you make me mad sometimes
* Removed duplicate code
* Name fix for CI again
* ORM now can handle space ores
* Adds space ores to Vetus drop and to trader inventories
* Fixes runtime with open hand attacking a lava furnace with nothing in it
* Adds crewvend kit to Castivend
* Fixes not being able to see new ores
* Adds drill and RCS to smith locker
* Map changes. Added cargo pad. Expanded catwalk. Moved vendors. Added recharger.
* Plant fixes
* Fixes doubled-up catwalk
* Emerald cargo windoor fix, small lavaland adjustment
* Small oversight for overlay fix
* Missing lightswitches
* Fixed stock parts mismatch in casting basin recipe
* Better support for power tools, grrr attackchain
* Better attack chain handling. Better handling for bit insertion
* Fixes handling of inserts with storage suits (like labcoats)
* sprites for bomber + plasmeme outfit
* Adds missing adjacency checks
* Buffs speed boost from upgrade - max upgrade reduces cycle to 2 seconds.
* Fixed floating lights, brightened the explorer's new room, expanded smith workshop slightly.
* Small hallway adjustment
* Illuminates metastation smith office
* Removes excessive decimals in magma crucible scan output
* Berserker should not have inserts.
* Buffs bit durability significantly, nerfs amplifier lens and densifier lense slightly
* Adds smith bomber jacket to loadout panel
* Adds random spawners for smithed items, adds random low-quality items to maints loot
* Adds traitor version of bulldog shotgun
* Revert "Adds traitor version of bulldog shotgun"
This reverts commit 1d39c59f07108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Compacts extra ore drops from Vetus
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* better looping
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Better loop
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Multitools don't need tool bits.
* Better variable names, fixed missing parenthesis
* Recursive hammering, removed attack animations when inserting items or using multitool on smithing machines
* window
* Update deltastation.dmm
* Update deltastation.dmm
* Update deltastation.dmm
* Fixes small oversights
* Minor lavaland remap
* Reverts TM-required changes in preparation for full merge
* Begone, stray font!
* Damn you cable CI
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: ExusA <67055922+ExusA@users.noreply.github.com >
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-03-15 21:35:21 +00:00
