a909395bfc
Adds suture and mesh packs ( #32154 )
...
* Adds suture and mesh packs
* Fixes, unmedicated needles and mesh
2026-07-07 23:48:47 +00:00
99310edc81
Add light replacer to utility belt, tweak sprite. ( #32152 )
2026-07-07 23:46:22 +00:00
e694ab9ebf
Updates TSF Marine Loadouts ( #32139 )
...
* marine gear
* Update outfit_admin.dm
* Update pda.dmi
2026-07-01 23:24:16 +00:00
5a446efbec
Adds 'Prospector' Mining Turrets ( #32108 )
...
* Adds 'Prospector' Mining Turrets
* Linters
2026-06-24 22:17:48 +00:00
6b9c333636
Adds Security Fines ( #31857 )
...
* Adds Fines
* Forgot one
* Enhanced Clarity
* Fixes issue with linked account
* If no crime stated, states in the fine message
* Updates fine scanner sprite
* Updates fine scanner behavior
* Adds comment to records
* Apply suggestions from code review
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Removes capitalization
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
2026-05-17 09:45:07 +00:00
b0a8b84dbf
Add cardboard recycling. ( #31937 )
...
* Add cardboard recycling.
* Add more cardboard items to the recycling list.
2026-05-02 00:47:14 +00:00
8f842a2353
Adds Rations for the TSF, USSP, and ERTs ( #31795 )
...
* Creation
* revival AGAIN
* Update ration_pack.dm
* It returns yet again for the final time maybe
* e
* linter
* Update ration_pack.dm
* Update ration_pack.dm
* Update test_tiny.dmm
* Update bluespace_tap_spawners.dm
* Apply suggestions from code review
Co-authored-by: iramoye <projecteternal1@gmail.com >
Co-authored-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
* Update rations.dm
* Update rations.dmi
* Update storage.dmi
* Update code/modules/food_and_drinks/food/foods/rations.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
* Polish icons in rations.dmi
* Update ration storage icons.
---------
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: iramoye <projecteternal1@gmail.com >
Co-authored-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me >
2026-04-11 04:59:54 +00:00
849e33e147
Adds dueling pistols ( #31772 )
...
* Adds dueling pistols
* Bonus damage for dueling
* Oops
* Sprite stuff
* Sprites and fixes
2026-04-09 20:45:31 +00:00
05eeff6df2
Fixes a Bunch of RCL Bugs ( #31698 )
...
* RCL cable migration
* e
* Pain and death
* merge master fixes
* e
* aaaaaa
* Update RCL.dm
* AaaaAAAAA
* Update cable_coil.dm
* Update cable_coil.dm
* returns throwforce
* removes color feature
---------
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
2026-04-09 02:50:24 +00:00
87c2a19ecd
Adds Mafia Boss Syndicate Kit ( #31701 )
...
* Adds mafia boss syndicate kit
* Comment update
* Update code/modules/projectiles/guns/projectile/automatic.dm
Co-authored-by: Miles <116982774+Burzah@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: Miles <116982774+Burzah@users.noreply.github.com >
2026-03-29 02:17:15 +00:00
c4fb9bff75
Adds seven alternate finishes for the .357 Revolver ( #31668 )
...
* Adds Syndie Subtype and extra finishes
* Switches all mentions of standard revolver to the new syndicate version
* Wait why are we spinning the *barrel*
* removes duped name and description
2026-02-27 19:07:58 +00:00
ae181bf265
Make fanny packs dyeable. ( #31676 )
2026-02-27 19:06:58 +00:00
56d131c6ac
Buffs the Rapid Cable Layer and Puts it in the Hands of People ( #31513 )
...
* cables
* RCL deployment
* Update RCL.dm
* procedural colour woo
* Update RCL.dm
* Update RCL.dm
* Update RCL.dm
---------
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
2026-02-05 06:27:32 +00:00
da1ebd039d
Adds Materials to Every Autolathe and Protolathe Item (except for ammo boxes, IK mags, and Dart Boxes) ( #31445 )
...
* Holy fuck there's so much shit I'm not even done
* oh god there's so many
* it is done
* Update autolathe_designs.dm
* Update circuitboard.dm
2026-01-30 21:25:40 +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
4b2661c6d0
use ABSTRACT_TYPE_DESC in more places ( #31409 )
...
* use ABSTRACT_TYPE_DESC in more places
* fix lint
* fix fucking everything else
* there was more
* fix meta and dgl review
* fix lint
2026-01-25 22:52:12 +00:00
6a1fc4f5c2
Praise Be and Skkula: The PR (Skkulakin Race 2025) [READY FOR REVIEW] ( #30744 )
...
* skulk.dm placeholder for testing purposes
* Made an oopsie, fixed
* Skulk flesh color and language color testing
* Adding working language key, fixed language color
* Changed skulk flesh color, may change it again soon
* Ran tgui, hopefully fixed language color
* Changed skulk language color, hopefully for good this time
* Missed a spot
* Tgui fuckery
* If at first you don't succeed, cry to yourself for a bit then try again
* Tgui makes me violent
* Eyewear no longer save Skkulakin from flashes
* Skulk bones now hurt really bad
* Adds Skulk Sprites, Back Accessories, and other Placeholders
* Desperately trying to get body_accessories to work
* Minor name changes
* Skkulakin now have colorable eyes
* Makes the silk-spinning ability somewhat work, more changes need to be made
* Fixes the Skulks' ability to spin silk, however still needs changes
* Changed Skulks easier bone breaks into a trait
* Skulks (Now with 100% ethically sourced back spines!)
* Gives Skkulakin the Vox clothing sprites (Not counting head, glasses, or masks)
* Added update_spines_layer() for testing and help purposes
* Working on getting Skulk Backspines to change color depending on preset
* Skulk Backspines are now colored the same as your preset up spawning in (Thank you, Qwerty)
* Undefines SILK_NUTRITION_AMOUNT (I made a woopsie)
* Readds a return I may have accidentally removed at some point
* Skkulakin can now chitter
* Silk now be used to craft cloth and has an icon
* TGUI is going to make me do things
* Fixes the Brittle Bones Trait to work with Frail Quirk
* Sprite Fix
* Adds masking helpers
* Made a small woopsie
* I'm genuinely a fucking idiot
* Adds a bunch of new clothing
* Changes some clothing descriptions
* Fixes more placeholders and adds two new outfits
* Made small mistake, fixed
* Temporary change (Will revert soon)
* Reverted previous changes as the event is now over
* New Skulk Clothing, added some to the racial tab in the loadout, and made low-inquis robes orderable from cargo
* Adds High-Inquis Robes into cargo console
* Adds Skkulakin Flag (Orderable From Merch Vendor)
* Made small mistake, fixed it
* Inquisitorial Crate only has Low-Inquisitor clothing again
* Commits all offered suggestions
* Converts spans to defines and sorts out the rest of Skulk clothing (No MODs just yet)
* Gives Skulks the Nian Butt Sprite for now
* Fixes a small error with biosuits
* Fixes small coding error
* Fixes a few mor small coding errors
* Update code/modules/mob/living/carbon/human/appearance.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com >
* Update code/game/objects/items/stacks/sheets/sheet_types.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com >
* Update code/modules/economy/merch_items.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com >
* Removes 'collective' from outfit_admin.dm
* Basic Pixel-Shifting (Not Yet Complete)
* improve skulk headwear offset
* Revert "improve skulk headwear offset"
This reverts commit 2d93d61699108773801+DGamerL@users.noreply.github.com >
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com >
* Fixes masks and glasses for skkulakin
* Fixes Inquisitor Masks and adds missing Engineering Outfits
* Fixes Explorer Suits and HECK Suit for Skulks
* Fixes a few small issues and resolves some suggested changes
* Rebuilds TGUI
* Fixes Science Jumpsuits & Radsuits
* Fix Skkulakin chef belt disappearance.
* fix string assoc lookups for alists
* Update code/game/objects/structures/mirror.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com >
* Update code/modules/mob/living/carbon/human/species/skulk.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com >
---------
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me >
2026-01-17 20:54:56 +00:00
65441316e7
Turns off quick gather for duffel bag's and add's a duffel bag zip/unzip notice in chat. ( #31281 )
...
* Rebinds the duffelbag keybind to Alt+Click to prevent conflicting keybinds related to it.
* rebinds the unzip/zip hotkey back to what it was before and just removes the pickup_all_on_tile message at the bottom right for duffelbag's.
* Rearranges visible_message and replaces SPAN_WARNING to SPAM_NOTICE.
* Update code/game/objects/items/weapons/storage/backpack.dm
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
Signed-off-by: Vengie0 <zaydrabah11@gmail.com >
* Update code/game/objects/items/weapons/storage/backpack.dm
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
Signed-off-by: Vengie0 <zaydrabah11@gmail.com >
---------
Signed-off-by: Vengie0 <zaydrabah11@gmail.com >
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
2025-12-26 22:21:32 +00:00
eeb980f191
Adds Reycleable Materials to a Bunch of Objects ( #31320 )
...
* recycle
* moar
* Update glass_containers.dm
* Update spray.dm
* cost adjustment because sheets are 2000, not 1000
* Update hydroitemdefines.dm
* Update hydroitemdefines.dm
2025-12-25 21:03:22 +00:00
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
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
9248c028b1
[PTBF] Example PR: Kill Station Pet ( #30650 )
...
* Pet Assassination
* Antag rolls
* Adjusts weights to equal 1000
* Map deconflict
* Linter
* Update code/game/gamemodes/objective.dm
Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com >
2025-12-05 22:16:33 +00:00
d4a435f740
You can now color boxes using crayons ( #30977 )
...
* Americanized spelling
* more spelling
* spelling + alt click
* recoloring box, put it in hand and in bag
* in backpack now
* remove old comments
* updates inventory if backpack is open
* place in bags even on floor
* null check + checks actual type
* added the color tables
* added empty subtypes. Fixed movign away bug
* lint
* mapload + as mob removal
* early returning
* removed type checks. Added more checks for coloring
* added a description + early return on color tables
* lint
* documentation, formatting, HAS_TRAIT
* formatting
2025-11-28 03:51:46 +00:00
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
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
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
d55e4552c5
Fix the Captain's saber being invisible and undrawable in the eyes of others. ( #30749 )
2025-10-23 10:10:02 +00:00
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
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
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
37bcc87b39
Expanded productivity bit usage ( #30476 )
2025-10-01 14:49:32 +00:00
caa8343bf7
Repath some satchels ( #30427 )
...
* fix satchel interactions
* updatepaths name
2025-09-27 08:46:36 +00:00
e3f373077e
Initial commit ( #30486 )
2025-09-18 19:30:21 +00:00
3208049a8a
Attack chain migration: structures. ( #30365 )
...
* Attack chain migration: structures.
* whoops
* wth
2025-09-14 19:21:36 +00:00
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
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
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
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
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
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
8ffefd8777
Move all the non-weapons out of code/game/objects/weapons ( #29820 )
2025-08-06 01:37:56 +00:00
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
1504ed98be
massive burndown ( #29894 )
2025-07-27 20:52:39 +00:00
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
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
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
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
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
9309ca46fb
Adds storage dumping ( #29641 )
...
* added storage dumping
* retain in storage item shuffling
2025-07-04 19:07:07 +00:00
71c98c3adf
Weeeeeeed bro ( #29485 )
2025-06-19 17:43:35 +00:00
PollardTheDragon