0276cbfd54
Add wetsuits and a pair of towels to the athletic wardrobe. ( #32160 )
...
* Add wetsuits and a pair of towels to the athletic wardrobe.
* Apply suggestion from CRUNCH review
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 >
2026-07-08 00:13:20 +00:00
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
28b2c14f41
Adds a New Space Ruin: The Gas Station ( #32004 )
...
* initial commits
* linter fix and makes it more messy
* linter pt 2
* linter pt 3
* webedit heresy
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com >
* web editor heresy pt. 2
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com >
---------
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com >
2026-06-02 02:10:48 +00:00
a1b61fa2b6
Put disabled welders in open closets. ( #31995 )
...
* Put disabled welders in open closets.
* Include crates.
* Apply suggestions from CRUNCH review.
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 >
2026-05-17 18:42:20 +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
cf80c0b2b1
Fixes isopod oversight ( #31898 )
...
* Fixes isopod oversight
* Fixes some naming too
2026-04-14 04:13:18 +00:00
fb29bc6f4f
Adds Isopods ( #31842 )
...
* Adds Isopods
* Fix
* Moved some values
* Om nom nom
* Pickups
* Linters
* Adjusted name
2026-04-14 03:16:49 +00:00
d4aac8c0b5
Adds the Ability to Weld Crates Down for Metal ( #31633 )
...
* initial commit
* Update code/game/objects/structures/crates_lockers/crates.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com >
---------
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2026-03-10 21:55:03 +00:00
71e9110dfc
Removes plasma crates from irrelevant cargo orders ( #31511 )
...
* removes plasma crates from sec packs
* Adds secure medcrate, changes virus crate
2026-02-05 14:26:24 +00:00
c8d32f8484
Locker Resprite ( #31351 )
...
* ALL THE LOCKERS
* forgot one
* mime locker fix
* bluespace locker animation tweak
2026-01-08 10:45:23 +00:00
7594638d6a
Hopefully makes surplus safer ( #31274 )
2025-12-26 20:54:33 +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
439b610530
Replace captain's garment bag with CapDrobe (captain's dresser-wardrobe). ( #30885 )
...
* Replace captain's garment bag with CapDrobe.
* Incorporate feedback
- Restore chef vendor items from a stash apply gone wrong
- Make captain's gloves free
- Make basic captain wardrobe items more numerous
- Correct CapDrobe broken icon state name
* Fix small map error.
* Convert 'capdrobe' to a lockable dresser-wardrobe.
* Notify silicons of items they remove from wardrobes.
* Apply recommendations from review.
2025-12-08 22:00:52 +00:00
9a8d5462ac
Various skittish fixes ( #30994 )
...
* skittish fixes
* Update code/game/objects/structures/crates_lockers/closets.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
---------
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2025-11-13 23:21:34 +00:00
7615c724d3
adds xenobiology headset ( #30780 )
...
* adds xenobiology headset
* created xenobiologist locker
* adds the lockers to maps
2025-11-12 20:16:57 +00:00
f96b26b75a
/obj/item/projectile --> /obj/projectile (#30411 )
...
* yers
* vars
* map changes
* some comments (clearly not stolen from items)
* fix component
* summary
2025-11-12 10:23:20 +00:00
d558a69583
Ports a character customization option: Quirks ( #28388 )
...
* Makes the datum
* Initial Commit
* Gets TGUI menu not crashing
* Autodoc
* quirk menu bugged
* oh.
* Working menu + buttons
* trait defintes pt 1/?
* Moves traits around
* ACTUALLY START ON THE QUIRKS THEMSELVES
* TGUI Bundle Rebuild
* TGUI properly saves now
* Removes allergies for scope reasons, make foreigner work properly
* TGUI tweaks
* Reworks TGUI Menu
* quirks store the mob, not mind
* Adds asthma and mute
* minor tweaks
* Cloning re-adds quirks
* Adds functionality to frail
* Adds crafty
* TGUI fix
* Fixes a frail bug
* Makes sure the list is in the correct format
* TGUI size change
* Makes skittish work
* Adds glutton, removes unused traits
* Changes description and adds function to glutton
* Freerunner functioning
* Crafty buff
* Clear quirk list when changing species
* Forgot to remove light step
* Delete
* Refactor item-giving
* TGUI Bundle Rebuild
* whoops
* Apply quirks when changing species
* Removes some unneeded defines/paths
* Replaces improved charging cord with a bad charger
* coment
* Guard clause
* Changes how quirks add and remove organs
* unused var
* adding organs works, removing them doesn't yet
* oh that fixed it
* Hopefully finally once and for all fix the json issues
* Buffs asthma
* switches the processor to ssobj since it's slower
* actually spawns the items whoops
* maybe actually fixes json issues I really hope this doesn't come up again?
* moves sql to the right directory
* CULPRIT FOUND, JSON ISSUES ACTUALLY SOLVED
* adds admin tooling for quirks
* Ups the cost of lungs
* Adds removal for the drinking ones
* Fixes some duplicate code
* Removing foreigner works
* wops
* bumps sql version to 65
* prettier
* semicolon
* Foreigners can understand galcomm but not speak it, as per headmin request
* Different solution was agreed upon
* CC announcements now get auto-translated
* Apply suggestions from code review
Lewc quick suggestions
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Move alcohol tolerance basetype
* accomodates for reset_styles
* Swap to species flags, and being dead is a universal process stopper
* adds a foreigner trait
* Xenos and the like can't understand CC's translated announcements
* TGUI Bundle Rebuild
* Lewc quick fixes
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* i forgor
* i forgor pt 2
* process properly returns true
* TGUI Bundle Rebuild
* sql update for fixing merge conflicts
* bundle changes
* actual sql fix
* Not test tiny in prod
* sql fix?
* tgui update, first pass
* Adds schema changes to main quirk branch
* persistent data works now
* TGUI Bundle Rebuild
* Fixes conflict with job assignment datumization
* TGUI Bundle Rebuild
* Adds pacifism by request, -3 points
* gives skittish a small cd
* Makes the lunch randomizer I was thinking about doing
* GC returns a qdel hint now
* Removes hard refs
* SQL save fix
* Fixes admin tools
* Fixes wizards getting quirked up
* ragin too
* Lightweight is more lightweight
* Adds admin logging for when someone makes a languagesless character
* TGUI Bundle Rebuild
* Adds colorblind, hungry, and buffs asthma
* fixed vv post-merge conflict
* behold, my monster
* rebuild and merge master
* Adds more positive quirks, and makes monochrome give more points
* adds nearsighted, and no whispering
* sorry linter
* Adds the cool quirk, thanks to pumpkin312
* Oh dear that signal gets sent to everyone every time someone spawns in
* i forgot that slimes dont have eyes
* tgui fix
* bundle rebuild probably
* prettier
* prettier
* Skittish package fix
* force add bundle
* Makes plasmemes be unable to take foreigner
* Makes advanced lungs respect the owner's species
* makes breaking open wrapped crates/lockers a do_after_once
* Makes plasmeme/vox advanced lungs actually help
* You get glasses anyway whoops
* bundle rebuild
---------
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
2025-11-04 00:18:52 +00:00
0e6ecccade
adds a chasm recovery grenade to the paramedic's locker ( #30771 )
2025-11-03 10:46:58 +00:00
7a2577f725
please please work ( #30850 )
...
Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com >
2025-11-02 05:50:54 +00:00
9863606763
entire messed up branch in one commit ( #30794 )
...
Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com >
2025-10-31 22:56:33 +00:00
caa8343bf7
Repath some satchels ( #30427 )
...
* fix satchel interactions
* updatepaths name
2025-09-27 08:46:36 +00:00
df0e69332f
fix paper wrapping crates ( #30482 )
...
* fix paper wrapping crates
* define magic number
2025-09-19 16:05:48 +00:00
b52f6cc6c0
Converts farm animals to basic mobs ( #30244 )
...
* Converts farm animals to basic mobs
* Update paths, removes excess file
* CI
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-09-19 15:26:43 +00:00
bd911799b8
Librarian Drip Expansion ( #30167 )
...
* all the sprites in the wrong place
* suits are now in the suit files
* code and whatnot
* oops all config
* hand holes, locker, garment bag, loadout
* adds locker to every station
* some fixes
* pleases review overlords
* fixes errors?
2025-09-16 18:59:32 +00:00
3208049a8a
Attack chain migration: structures. ( #30365 )
...
* Attack chain migration: structures.
* whoops
* wth
2025-09-14 19:21:36 +00:00
19e1785eed
Adds a macro for 0 wait timers as END_OF_TICK ( #30309 )
...
* Adds a macro for 0 wait timers as END_OF_TICK
* comment update
2025-09-04 07:09:08 +00:00
bba55ba75f
Nanocratesen: Corporate Crates ( #30190 )
...
* sprites and obj
* Update pack_miscellaneous.dm
* sprite fix
* replaces vault crates
2025-09-01 04:30:09 +00:00
a9a8fd6233
muvgth ( #30139 )
2025-08-26 01:51:47 +00:00
9044084b95
Gives all Heads of Staff energy pistols, equips with cybernetics ( #29848 )
...
* Gives all heads of staff epistols, starts with basic implants
* Whoops
* Replaces roundstart head of staff implants with them being in single-use autosurgeons
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-08-24 15:12:55 +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
e43a88de5b
Converts Nian Caterpillars to Basic Mob AI ( #29938 )
...
* Nian Caterpillar Basic Mob
* Merge conflict resolution
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-08-19 13:40:31 +00:00
012a00aafb
Refactors large crates. Adds sound and makes them not-instant. ( #30068 )
...
* bonk
* refactors large crates
2025-08-19 13:23:16 +00:00
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
ace1fa8c24
Allow the cyborgs to place objects on tables and in closets using the gripper ( #29893 )
...
* Add exception if item is in gripper
* Add transformation from list to params, for corret work of melee_attack_chain function
2025-08-10 14:55:35 +00:00
3b085824c0
Adds mesons into explorers' lockers ( #29808 )
...
* fdnshgnd
* bikogjfnbhg
deleted icon_state string for mining wardrobe closet as its done in #29894
---------
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
2025-08-07 16:33:05 +00:00
3b0a9c4381
Converts a whole lot of friendly mobs to basic mob AI ( #29815 )
...
* Butterflies, Cockroaches, Slothes, Snakes, Penguins, and Bunny Basic Mobs
* Lizards too
* Oops
* Lizard emote keybind
* Updatepaths
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Moved lizard emote to basic_emotes.dm, simplified hide action
* New linters
* Merge conflict resolution
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2025-08-06 01:17:13 +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
435637e257
All Secondary Goals use labels ( #29776 )
...
* All Secondary Goals use labels
* Fixes.
* Fixes.
* Update code/__DEFINES/dcs/basetype_signals.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com >
---------
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-07-31 06:01:26 +00:00
b4790e057e
Converts gorillas to basic mobs ( #29783 )
...
* Converts gorillas to basic mobs
* Accidentally pushed a config change. Whoops
* Updatepaths
* Removes unique_mob var
* New linters
2025-07-31 05:49:48 +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
55358fb3c7
mflrube ( #29555 )
2025-06-19 17:51:19 +00:00
8b3de4dd3e
Add Wheelcart Sound To More Objs ( #29427 )
...
* bo
* ba
---------
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
2025-06-18 20:31:24 +00:00
586e2e6c4d
Job Perks - True Professionals ( #29478 )
...
* ddsadsa
ddsadsa
* moderate again
* revert
* medical first steps
* more work
* lots more work done
* more progress
* finished up
* attack chain linter
* attack chain update
* attack chain work
* fixes + chemist update
* gives comments
2025-06-13 19:40:29 +00:00
e5a08230ee
Inspector - IAA Stare, Alt-Title, and a Station Report ( #29487 )
...
* Inspector alt title and gaze
* Clipboard
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Reduces duplicate code
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-06-11 17:03:17 +00:00
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
1ace49ec1a
Golem ship remap and equipment tweaking. ( #29294 )
2025-05-17 13:18:47 +00:00
dfacf83e18
Ports deer to basic mobs and adds some behaviors ( #29270 )
...
* ports deer to basic mobs and adds some behaviors
* update updatepaths script number
* whitespace
* Apply suggestions from code review
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
---------
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-05-13 06:23:30 +00:00
9f6ff3a204
Fire-safety and Emergency Closets' Contents Tweak ( #29223 )
...
* bleh
+ added crowbars into fireclosets
+ wall emergency locker's contents now match the contents of the common one
* Update code/game/objects/structures/crates_lockers/walllocker.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
* Update code/game/objects/structures/crates_lockers/walllocker.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
---------
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
2025-05-13 04:07:48 +00:00
b4bdb66029
Adds Firefighting Foam extinguishers, this time hopefully wont be accidentally closing ( #28791 )
...
* Adds an atmospherics specific fire extinguisher that sprays firefighting foam!
Adds a firefighting foam tank to all the maps that refils the fire extinguisher added!
* allowed fff to enter regular extinguishers
* changed the FFF to have an F on it rather than an image of smoke
* should fix the conflicting object.dmi issues
* adds orderable firefighting foam tank crate
* makes farragus playable (literally)
* removes redundant if statement
* changes from max_water to reagent_capacity and reagent_id
2025-05-10 20:16:47 +00:00
Alan