Kyani
f81ef075f1
The NGCR: Nuclear Fission Reactor ( #30493 )
...
* coefficient balancing
* damage and meltdowns
* meltdown stuff
* alert stuff
* lots of work - whew
* some enrichment code
* rod encrichmnt
* working on enrichment
* more fabrication
* rod fab
* start to the nuke
* overload sprites
* overload code work
* some overload tweaking
* small tweak
* coolant ejections and QOL things
* overheat events + ripley gripper
* rebase + venting code
* save before rebase
* some pre-work for rods
* finishing the base rods
* fixed my dme
* de linting
* tiny lint fix
* more lint fixes
* linting
* linting
* linting
* linting
* linting
* temp delint
* temp delint
* undo TM stuff + minor fix
* didnt save
* some fixes
* fixes
* fixes and engine repair
* fixed broken durability decay
* LOTS of things
* tgui
* lint
* linter
* linter
* minor shit
* Update boxstation.dmm
* major refactors and fixes
* saved this
* critical testing tweaks and fixes
* fixes and tweaks
* smithing start
* forgot to save
* craftables + grill start
* saved
* fix
* more grill work
* Update tgui.bundle.js
* linter
* linter
* fixes
* rod fabricator initial
* cooking work
* push
* soundwork
* sound work tweak
* comments + sounds + toxins gen rework
* lots of work
* sprite stuff
* deconflicting
* delinting
* bundle rebuild
* prettier
* feex
* fuck you OD
* who asked?
* update to tgui
* another edit to tgui
* finish tgui
* remove debug metadata button
* rod tweaks for tgui
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/mecha/equipment/tools/work_tools.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/mecha/equipment/tools/work_tools.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/parrot.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/parrot.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/parrot.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/parrot.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_misc.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_misc.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_misc.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/reactor.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/reactor.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/reactor.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/smithing/components/misc_components.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update tgui/packages/tgui/interfaces/NuclearRodFabricator.jsx
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Spans
* tgui build
* rod redo
* improve tgui for fabricator
* sprites and centrifuge/fab work
* tgui update
* spritework
* cyberiad + hydrogen conversion
* kerberos + counter
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* sprite + fab tweak
* tgui bundle
* lintering
* bugfixing
* linting
* linting
* event tweak
* add missing gases to fission monitor
* issue fixing
* sprite/overlay fixes
* mapping
* stations again
* space lattice
* tine tweak
* linter
* no rod alerts
* buttons
* loose wire
* make it so you can interact through rod casings and the uhh big thing in the center, what's that called again
* fixes
* door fix
* many bug fixes + crates
* fab ghost touch
* water convert + maint sprite + fixes
* pack changes + neighbor fix
* doors rename
* didnt save
* hydrogen fix
* map tweaks
* repair fixes + corium LETHALITY
* upped broken rad damage
* pipe rename + overload icons
* more roundstart moderators
* rod tree tweaks
* tweaks
* pack and enrichment fixes
* misc tweaks and fixes
* fixes: Density, circuits, coolant offline negation
* Apply suggestions from code review
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* review changes
* linter + fix
* reviews and fixes
* LOTS of tweaks and changes
* supermatter kit
* spacematter balance
* tgui
* fixes and tweaks
* didnt save this
* mapping + smith fix
* cargo rods arnt radioactive til opened
* Apply suggestions from code review
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* review items
* fixes
* linters
* moving components out of nullspace
* examine fix
* Update tgui.bundle.js
* explosion nerf and minor fix
* Apply suggestions from code review
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* reviews
* map fix + ripley rad immune
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* review
* fix chamber examine
* tweaks + rod fab disk drop
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* review changes
* Update code/modules/power/engines/fission/nuclear_rods.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* fixes
* tgui bundle
* small rod tweaks
* Update code/game/machinery/computer/buildandrepair.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/smithing/components/reactor_components.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/reactor_machines.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/power/engines/fission/reactor_machines.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* reviews
* Update code/modules/power/engines/fission/reactor_machines.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Paul <pmerkamp@gmail.com >
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2026-01-07 09:19:43 +00:00
PollardTheDragon
74d723496f
Adds Paintball Guns ( #31184 )
...
* Paintball Guns
* Linters and cleanbot
* Fixed examine text
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Fixes decals
* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Update code/modules/projectiles/guns/projectile/toy.dm
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Spans
* Clean code fix
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Removes excess cut
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2025-12-26 22:12:03 +00:00
kyunkyunkyun
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
Contrabang
ef7e48db9c
Makes a ton of dirs into defines ( #31244 )
...
* Makes a ton of dirs into defines
* lol oops
* "fix"
* ignore everything
2025-12-12 20:32:33 +00:00
Pooble
2ac3fb2b3e
Add two new IPC implants, an EMP resist and a Defensive implant ( #30911 )
...
* add two new IPC implants
* make EMP resisted IPCs take less body damage but more organ damage
* oops
2025-12-03 17:38:26 +00:00
CRUNCH
4dd9b3f0d5
Allows inflatable barriers to be printed. ( #30970 )
...
* Update autolathe_designs.dm
* Update code/modules/research/designs/autolathe_designs.dm
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* commit inflation
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
2025-11-23 03:03:57 +00:00
kyunkyunkyun
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
PollardTheDragon
ae4489cb2f
Converts bees to basic mobs ( #30662 )
...
* Converts bees to basic mobs
* Undefs
* Linters
2025-10-28 20:53:18 +00:00
Qwertytoforty
b74375d118
the dead don't rise and nanopaste helps: organ edition ( #30712 )
2025-10-26 13:11:34 +00:00
Paul
afd37f310f
IPC Culinary Processing Implant ( #30475 )
...
* add the ipc culinary implant
* add spans
2025-10-17 16:53:11 +00:00
JimKil3
e5832d6d1f
Makes sutures and regenerative mesh craftable ( #30556 )
...
* gauze/ointment changes
Changes gauze and ointment's recipe back to using sterilizine, nerfs their healing (they both serve other purposes)
* yummy microplastics
Makes plastic require cooling to solidify into sheets
* the rest of the PR
* oops
* what was he cooking
* Apply suggestions from code review
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
* plastic volume
---------
Signed-off-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-10-11 15:58:24 +00:00
Qwertytoforty
3c7ca73c04
Gives many cybernetics on mob sprites. Adds synthetic skin to allow hiding of them. ( #30098 )
...
* the first half
* rest of the skin
* duplicate
* new sprite / updated description / no more yell at me
* the rest of the owl
* oops, fixed
2025-10-06 18:30:31 +00:00
PollardTheDragon
66d66a8f02
Adds Anomaly Refining System ( #30490 )
...
* Adds Anomaly Refining System
* Weight class
* Linters
* Fixes delta lint
* Removes emag text on examine. Examine now tells the explosion target.
* Address code review
2025-10-06 18:20:50 +00:00
Migratingcocofruit
5194a77802
remove errant debug chat message from alien cache ( #30599 )
...
* remove errant debug chat message
* Update machine_designs.dm
2025-10-02 02:45:10 +00:00
PollardTheDragon
e14a43eea1
Basic diona nymphs, spiderbots, and crabs ( #30377 )
...
* Basic nymphs, spiderbots, and crabs
* Nutrition fix
* Forgot a line
* Cooldown on eat
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-10-01 14:32:00 +00:00
Migratingcocofruit
ad98a804cb
Adds the alien cache ruin and a PTL terminal ( #30367 )
...
* Make the cache room
* adds alien cache machine
* adds the cache properly
* adds multitile component
* adds terminal building and reward selection procs
* adds laser receptacle file
* Refactors ptl targetting code
* more work on the ptl terminal
* change file name to laser_terminal
* changes area to powered makes laser terminal work properly
* makes a new pickweight function because the old one is bad
* Update alien_cache.dm
* Update canister.dm
* Update alien_cache.dm
* adds a template of the ruin
* adds some spawners to the reward pool
* adjusts agent b amount
* adjustments to loot table and changes to spawner comments
* new placeholder sprite for the cache
* randomizes reward spawn location and makes a PTL terminal sprite
* updates alien cache sprite and examine proc
* Adds overlays to the cache to indicate the current progress
* fixes mob capsule spawner and laser terminal
* Adds animations to PTL terminal
* new box part of the sprite for the PTL terminal. Adds glow
* fixes untargetting the PTL terminal and adds a little light overlay to the receiving dish
* changes PTL terminal id generation slightly
* adds simon says. incomplete
* Update paradise.dme
* simon says works now
* adds more rhythms
* Adds success and failure sounds
* Makes the ptl terminal board printable
* Update secure_alien_airlock.dm
* undo changes to preferences.dm
* undefs things
* removes identical to parent vars
* Update alien_cache_random_spawners.dm
* replaces animation end loop flag so open dream CI doesn't give errors
* changes centre platform colour and adds a fan to the entrance
* more pads more sounds
* better sprites
* remove old sprite
* adds the cache to example config
* makes it not always spawn
* Update simon_says_32x32.dmi
* adds some flavor to the ruin
* Update alien_cache_site.dmm
* adds a signal to the ruin
2025-10-01 12:54:10 +00:00
PollardTheDragon
fd6b5a6d5a
Fixes Consciousness Transfer potions not working on basic mobs ( #30570 )
2025-09-28 16:31:43 +00:00
PollardTheDragon
7caf75b37b
Converts mice to basic mobs ( #29928 )
...
* Converts mice to basic mobs
* Larger only targetting strat
* Oops.
* Linters
* Code review suggestions
* Linters
* Merge conflict resolution
* Snakes
* Oops
* Clogged Disposals
* Updates persistent client
* Linters
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
2025-09-22 13:11:44 +00:00
Migratingcocofruit
db555b4c28
Powernet separation ( #29348 )
...
* Adds reinforced APCs and frames for them.
* farragus WIP
* more farragus stuff
* more faragus stuff
* more farragus
* uses plastic for insulation instead
* box and faragus changes
* Box changes
* cerebron changes
* more meta updates
* fixes short on box station
* fixes shorts on meta station
* delta changes
* adds reinforced apcs with bigger cells
* emerald things
* more diagoras
* cleaning up cables in diagoras
* switches elecmaints smes to the engineering type on diagoras
* adds more grid monitors to cyberiad
* various corrections
* 2 doors on cyberiad electrical maints
* boxstation fixes
* Kerberos fixes
* cerebron fixes
* some faragus fixes
* more cyberiad fixes
* meta fixes
* more kerberos fixes
* faragus and cyberiad fixes
* emerald fixes
* farragus fixes
* emerald fixes
* farragus fixes
* emerald fixes
* diagoras fix
* more map fixes
* more CI fixes
* final fixes I hope
* Update emeraldstation.dmm
* finish merging metastation
* reset meta to master version
* redoing some of the meta changes
* Update metastation.dmm
* clear merge conflict
* Update metastation.dmm
* Update metastation.dmm
* Update metastation.dmm
* meta resolution
* emerald resolution
* delta resolution
* fartgas resolution
* box box
* stay out stay out
* metastation fixes
* faragus fix
* delta fix
* meta changes
* Starting over with farragus
* Starting over in faragus
* faragus changes
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* resolving some faragus conflicts
* resolve faragus conflicts
* resolves delta conflicts
* resolves cyberiad conflicts
* resolves emerald conflicts
* fixes cables in faragus
* fixes meta cables
* fixes delta cables
* more meta fixes
* more farragus cable fixes
* more cable fixes
* meta and faragus fixes
* box and delta fixes
* more mapping fixes
* hopefully the last fix
* Update metastation.dmm
* Update metastation.dmm
* fixes shorts on cyberiad cerebron and farragus
* CI fixes
* Update cerestation.dmm
* resolve faragus conflicts
* resolve emerald conflict
* fix some faragus cabling
* more cabling correction in faragus
* more cable fixes
* Update cerestation.dmm
* remove doubled scrubber pipe on tile
* resolves faragus conflict
* changes the default power input of engineering SMES to 200kw and 80kW respectively
* connects power monitoring computers to the grid that weren't
* meta station elec maints improvements
* adds missing power monitoring computers on box and delta
* removes dirt from wall
* corrects area boundry on meta
* adds missing cable on box sci
* removes dirt from wall on box
* connects cyberiad bridge to the rest of the powernet
* connects box brig to powernet
* Adds catwalks to box maints
* adds catwalks to meta
* Adds catwalks to delta
* Update deltastation.dmm
* adds ability to insulate cables
* Moves stations to using extra insulated cables for high power network
* Removes catwalks from meta
* Removes catwalks from box
* Removes catwalks from delta
* resolves box conflicts
* Update cable.dm
* remove floating request console
* corrects position of fire alarm and removes extra intercom on metastation
* resolves faragus conflict
* fixes a stray light bulb and light switch in maints as well as a doubled power
* wires kerberos security checkpoint to the grid
* Update cerestation.dmm
* Removes stray extinguisher cabinet from meta station
* resolves area conflict on faragus
* resolves more faragus issues
* fixes faragus cabling issues
* Update cerestation.dmm
* removes another stray fire extinguisher cabinet
* insulates the APC in delta PTL room
* connect delta fore starboard solars to the high power grid instead of the low power
* Update deltastation.dmm
* deconflict
* solves some unconnected cables
* connects delta customs to network and finishes resolving conflicts
* Update deltastation.dmm
* adds the new cables. needs coils and mapping
* moves connection perms to the heavy duty cables. toggled with engineering permission ID. box gets new cables
* sorts cables on stations
* faragus cable connections
* cable corrections. Adds heavy duty cables to the autolathe
* CI fix
* more fixes and makes the new cables show up on t ray scanners
* box station mapping fixes
* delta mapping fixes
* meta fix
* Update deltastation.dmm
* delta and faragus fixes
* Update emeraldstation.dmm
* adds diagonal sprites to heavy duty cables. allows sillicons to toggle them and
* Makes borg versions of the heavy duty cable coil
* palete consolidation
* Improves visibility of high power cables
* fixes a wrong wire under the pet store maints door in delta station
* resolve conflicts
* migrates new cable type to new attack chain
* Update cable_coil.dm
2025-09-22 12:52:15 +00:00
PollardTheDragon
9af452c0ce
Fixes oversights in salvage redemption machine ( #30491 )
2025-09-19 15:55:34 +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
Contrabang
46cc4269f1
Adds a cargo arm implant ( #30313 )
...
* cargo arm
* mailscanner
* remove RCS
* Update code/modules/research/designs/medical_designs.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2025-09-07 05:43:32 +00:00
Vladislav Mikhalko
9cd08ba70d
Fix dropwall launcher build path and cost ( #30328 )
2025-09-04 07:14:08 +00:00
warriorstar-orion
7022365e53
add CI check for exploitable recycle costs ( #30286 )
2025-09-04 07:00:12 +00:00
Chap
918c267e43
[FIX] Xenobio console runtime ( #30266 )
...
* Check if recycler exists
* Update code/modules/research/xenobiology/xenobio_camera.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Chap <erwin@lombok.demon.nl >
---------
Signed-off-by: Chap <erwin@lombok.demon.nl >
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
2025-08-27 19:29:49 +00:00
Osetrokarasek
97047c3bb9
Emptying Lathed Welding Tools And Extinguishers ( #30137 )
...
* asfgdsa
* cnrbangn rqerqest chaengs...
2025-08-26 01:49:10 +00:00
Kyani
e6e5f5ce36
Xenobiology QOL tweaks ( #30062 )
...
* Xenobiology QOL tweaks
* fixes
* Update generic.dm
* name tweak
* Update code/__HELPERS/trait_helpers.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
---------
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
2025-08-25 17:51:27 +00:00
PollardTheDragon
3d56e28b58
Adds EPS-99 Pulse Shield Generator for mechs ( #30043 )
...
* EPS-99 Pulse Shield Generator
* Increased drain
* Increased energy drain more
* Uses the cool AT shield. Thanks colossus. And lints
* Fixes and oversight coverage
* Messages when shield is disabled.
* Fixes + shield alpha
* Shield sprites
2025-08-24 15:16:26 +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
PollardTheDragon
747bea4fce
Adds DWDL-04 Dropwall Launcher for Mechs ( #30042 )
...
* Adds DWDL-04 Dropwall Launcher mech module
* Buffed deploy speed
* Updated weapon desc
* Lints
2025-08-19 13:35:52 +00:00
Contrabang
5b0447edcc
Makes automenders rarer. Adds sutures/regenerative meshes. ( #30003 )
...
* suture
* tweak
* bio 6 -> bio 7
* tweak bleed supression
* review
* Update code/game/objects/items/stacks/medical_packs.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-08-17 20:12:44 +00:00
CRUNCH
bb657baf57
Adds Power Cells to the Protolathe's Stock Parts Menu ( #29955 )
...
* Update power_designs.dm
* Apply suggestions from code review
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-08-17 07:38:47 +00:00
Kyani
404e922f27
small QOL ( #29961 )
2025-08-11 02:58:17 +00:00
PollardTheDragon
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
PollardTheDragon
265003e919
Adds MESG-02 Laser Scattercannon - a Mech Laser Shotgun ( #29771 )
2025-08-06 00:39:02 +00:00
Kyani
58c8de46db
all the organs now ( #29834 )
2025-08-05 16:22:40 +00:00
PollardTheDragon
2c282afb6f
Adds MESG-01 Disabler Scattercannon - a Mech Disabler Shotgun ( #29770 )
...
* Adds MESG-01 Disabler Scattercannon - a Mech Disabler Shotgun
* Reduced pellet count to 9
2025-07-31 09:18:46 +00:00
warriorstar-orion
56f4960ed4
refactor action buttons ( #29416 )
...
* refactor action buttons
* fix cult spell charge overlay
* lewc review
* update for a/mhelp buttons and xenobio organs
* update for minebot
* properly create button each time
* directly add/remove unavail overlay for reasons
* lewc review
2025-07-28 19:13:28 +00:00
Contrabang
1504ed98be
massive burndown ( #29894 )
2025-07-27 20:52:39 +00:00
Burzah
46f69c7df1
initial commit ( #29880 )
2025-07-26 14:34:15 +00:00
PollardTheDragon
b33f74594a
Converts space bears, space carp, and space bats to basic mobs ( #29775 )
...
* Bears and bats.
* Carp
* Comments, file locations
* Linters!
* Moved initial emotes for basic mobs to a component
* Linters
* Adjusted emote chance for space bats
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Updatepaths
* Apply code review suggestions
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2025-07-26 05:53:00 +00:00
PollardTheDragon
9435d8c42c
Mech Scattershot now requires Illegals 3 ( #29772 )
2025-07-18 17:14:51 +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
Arthri
ab5a7fdcbe
Fix technology levels of some items ( #29596 )
...
* Synchronize TECH defines with /datum/tech IDs
* Fix origin_tech values
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
2025-06-30 10:37:55 +00:00
Toastical
fda6dc0de6
changed drop to transfer ( #29501 )
...
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-06-18 20:48:25 +00:00
warriorstar-orion
e63415a483
port minebots to basic mobs and add some behavior ( #29319 )
...
* port minebots to basic mobs and add some behavior
* remove unused define
* update is_blocked_turf usage
* fix radio, goldgrub, and armor upgrade
* standardize blackboard names
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
* lewc review
* whoops
* 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: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-06-13 19:48:40 +00:00
CRUNCH
60173b3566
Printable woo! ( #29428 )
...
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
2025-06-11 17:15:41 +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
CRUNCH
df362db8af
Gives Medical Cyborgs a Holo Stretcher Upgrade ( #29352 )
...
* creation
* Update code/game/objects/items/robot/robot_upgrades.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-06-04 13:15:57 +00:00
PollardTheDragon
81a9ff0663
Fixes scientific assembler boards ( #29508 )
2025-06-01 15:50:34 +00:00
