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
CRUNCH
ee13dce3e1
Borg Push Broom Icon Updates When Braced ( #31255 )
...
* broom
* Apply suggestions from code review
Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
* Update code/game/objects/items/robot/robot_items.dm
Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2025-12-27 09:35:27 +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
CRUNCH
9c92917dd2
Gives the Janiborg a Push Broom (and allows the janiborg combat broom to sweep) ( #30820 )
...
* BROOOOOOM!
* Update robot_items.dm
* Update robot_items.dm
* Update robot_items.dm
---------
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com >
2025-11-22 22:18:53 +00:00
Qwertytoforty
d9d3d44018
Makes ai upgrades the same size as every other disk ( #30748 )
...
* makes ai upgrades the same size as every other disk
* 😠
2025-10-26 13:01:42 +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
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
5b368c3f8f
Renames some pre_attack arguments ( #30324 )
...
* Renames some pre_attack arguments
* fix
2025-09-04 07:11:59 +00:00
Contrabang
e1f42f4673
pre_attack change ( #30305 )
2025-09-01 21:10:58 +00:00
CRUNCH
8ea1c3b08e
Migrates obj/item/inflatable and obj/structure/inflatable to the new attack chain. ( #30253 )
...
* creation
* Update inflatable.dm
2025-08-28 14:56:29 +00:00
Qwertytoforty
19172782f7
gives it disk sounds ( #30106 )
2025-08-19 06:28:02 +00:00
Aleksandr Sakrukin
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
PollardTheDragon
001430f6fc
Adds new AI upgrade disks as space and trader loot ( #29837 )
...
* Adds new AI upgrade disks, makes them space loot and trader loot
* Fixed oversight
2025-08-07 16:54:49 +00:00
Contrabang
1504ed98be
massive burndown ( #29894 )
2025-07-27 20:52:39 +00:00
kyunkyunkyun
b32a310f6c
Update cyborg_gripper.dm ( #29703 )
2025-07-01 15:02:03 +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
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
9219edb732
Adds AI Program Reset Disk ( #28952 )
...
* Adds AI Program Reset Disk
* Trailing newline for the linter gods
* Adds program reset alert
2025-04-15 14:55:32 +00:00
warriorstar-orion
c820499f90
Basic mobs core implementation and cow migration. ( #28667 )
...
* Basic mobs core implementation and cow migration.
* fix whitespace
* uncomfortable fix for null weirdness
* update updatepaths script number
* lewc review 1
* fix delta
* Update code/datums/ai/basic_mobs/basic_ai_behaviors/tipped_reaction.dm
Co-authored-by: Luc <89928798+lewcc@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 >
2025-04-05 11:35:42 +00:00
CRUNCH
05c4ce3c83
Makes the Alien Scalpel Into a Laser Scalpel + Slight Sprite Modification ( #28651 )
...
* Alien Scalpel Buff
* Update robot_upgrades.dm
* Update abductor.dmi
* Update abduction_gear.dm
2025-04-02 12:26:03 +00:00
Qwertytoforty
459ab2d565
moves ai upgrades to new attack chain, fixes bugs ( #28668 )
...
* ai upgrade fix
* duplicate icon and icon state
2025-03-15 08:15:19 +00:00
BiancaWilkson
780fc2d8db
Adds cyborg subtype of satchels ( #28513 )
2025-02-28 17:49:49 +00:00
CRUNCH
bfad632d10
Migrates /obj/item/borg/stun to the new attack chain. ( #28221 )
...
* Update robot_items.dm
* if () > if()
* Apply suggestions from code review
Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update code/game/objects/items/robot/robot_items.dm
Co-authored-by: Burzah <116982774+Burzah@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: chuga-git <98280110+chuga-git@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-02-15 07:48:22 +00:00
Vi3trice
de79795367
that's a lot of actions ( #28067 )
...
Why did the crusher have a spawn? No idea.
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2025-02-13 01:38:33 +00:00
CRUNCH
6ef209d931
Migrates Borg Gripper to New Attack Chain, Fixes Some Bugs ( #28139 )
...
* Creation
* Update firealarm.dm
* Update firealarm.dm
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update cyborg_gripper.dm
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
2025-01-31 15:50:15 +00:00
Mira
b109c2803d
Fix cyborg arm sprite ( #27997 )
...
* fix sprite
* turned off sprite
* no rewind animation
2025-01-18 18:01:28 +00:00
warriorstar-orion
0eafad8475
Refactor /mob/unEquip. ( #27720 )
...
* Refactor /mob/unEquip.
* fix things found in testing
* more fixes from testing
* fix removal of hooded suits
* fix flayers inability to deploy swarmprod
* fix changeling blade activation
* unnecessary parens
* pass default unequip args to proc overrides
* fix belts being able to forceMove into full hands
2025-01-10 01:58:35 +00:00
warriorstar-orion
6bf673dbb4
fix borg gripper held item self-activation ( #27740 )
2024-12-30 14:43:18 +00:00
ExusA
584e6b26d5
Adds the RSF Executive Service Upgrade for cyborgs ( #27371 )
...
* Adds the Executive RSF cyborg upgrade.
First commit for the Executive RSF with basic functionality.
* Add cheese knife
Adds a cheese knife along with the RSF upgrade to cut the cheese.
* Executive RSF Upgrade functionality.
Adds cheeses, caviar, cheese knife, and reorders RSF code to be neater.
* Nerf cyborg cheeses
Nerfs cyborg cheeses to be worse than chef food.
* Resprites Smoked Cheese
* Fixes power cost calculation
* Cleanup
* Standardize tech and Materials cost
* Adds caviar trash
Adds an empty caviar can.
* Edam and flavor
Add Edam
Adjusts flavors to compete with cheese reagent
* Undo sprinkled donut
Undid changes to RSF donut
* Fix RSF icon missed pixel
* Boolean fix
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com >
* Resprites basic cheese
Resprites basic cheese at the request of @DGamerL
* Update new cheese sprite
Adds wax to the new cheese.
* Delete unused cheese icon
Deletes a prototype cheese icon.
* Readds normal cigarettes to the executive RSF
Adds normal cigarettes back to the RSF at Fordoxia's request.
* Turns caviar from red to black
Rebrands caviar into the fancier, black variety
* Deconflict
---------
Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
2024-12-06 14:03:58 +00:00
warriorstar-orion
525c68d617
Attack chain, initial setup. (pull *immediately* for *any* TM issues) ( #26834 )
...
* refactor: Attack chain, initial setup.
* migrate curtain to make dreamchecker happy
* update thurible
* don't call attacked_by separately for legacy attack chain
* remove duplicate proc
* condense similar code, put allowances for legacy code in new procs
* update docs, include diagram source
* add comment on how to update diagram
* fix admonition
* mindflayer updates
* remove commented out code
* clarify all steps
* after_attack should be overridable
* whoops
* retrofit recent changes
* duh, can't restrict this yet because of tool_acts
* i hate ore bags with the fire of a thousand suns
* return correct value for object attack logic
* Various cleanups.
We don't want to attempt to pull stuff out of `/obj/item/attackby`,
because those pieces are part of the related objects' migrations, not
`/obj/item` itself. Attempting to do this causes knockon effects where
things expected to call e.g. `/obj/item/storage/attackby` in the call
chain were not ferried over to the new item interaction code, because
the related objects hadn't actually been migrated over yet.
I've used refactoring /obj/vehicle as the example for migrating
`attackby` methods instead.
* simplify some argument names
* fuck it
* make it do the thing
* Rename CI module call
* Prove that CI works
* improve test output
* aaand fix it again
* fix curtain tool interactions
* fix compile error
* fix compile error
* Better docs, introduce migration plan tool.
2024-12-02 23:36:36 +00:00
warriorstar-orion
0ffa8303a7
Rename all non-snake_case types. ( #27268 )
...
* refactor: Rename all non-snake_case types (not procs or vars (yet)).
* completely dynamic update script
* might help to include the data
* update aa's scuffed python
* oh
* set script PR number
* run updatepaths again
* Add other table updates with JSON columns
* bump SQL version
* just fucking end my life
* move JSON data
2024-11-30 19:08:45 +00:00
Contrabang
8352613d03
Adds CI for missing icon_states ( #27063 )
...
* Adds CI for missing icon_states
* yeah
* more fixes
* more fixes
* seems good
* moar
* fix
* yea
* hrtyhrt
* yeah
* WOE
2024-11-14 17:58:06 +00:00
Chap
d90a70ecda
[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag ( #26743 )
...
* IT WORKS UP UNTIL THIS POINT
* Consolidates SLOT_FLAG and SLOT_HUD into one
* Remove cover_both_ears
* SLOT_HUD to ITEM_SLOT
* Remove clothing_trait changes for the time being
* Remove accidental copy-paste
* Re-add no-slip var
* More failure to copy-paste correctly
* Leftover flag
* Combine left and right slot flags where possible
* UNGOOF MY DEFINES, PHAND IS NOT A THING
* Minor spacing changes
* Some more fixes from merge
* Seperates ITEM SLOT AMOUNT into two defines
* ON SECOND THOUGHT LETS NOT DO THAT.
* Addresses Contra's review
* Thank you GREP
* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES
* Added a comment to the bitmasks in clothing defines
* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY
* These are for a seperate PR.
* Magboot fixes
* Requested changes
* Re-add accidental removal
* Wrong flags
* Update code/__DEFINES/clothing_defines.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Chap <erwin@lombok.demon.nl >
* Requested changes
* Merge fixes
* Fix double headset
* Fixes multiple accessories
---------
Signed-off-by: Chap <erwin@lombok.demon.nl >
Co-authored-by: Adrer <adrermail@gmail.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-11-13 13:02:29 +00:00
Chap
3e640bd2c0
Remove user from do_install ( #27039 )
...
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2024-10-09 17:31:47 +00:00
Chap
59ce9b5ead
[FIX] Prevent duplicate cyborg upgrades ( #26731 )
...
* Disallows installing duplicate cyborg upgrades.
* Prevent duplicate Cyborg modules
* Unecessary spacing removed
* Update code/game/objects/items/robot/robot_upgrades.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: Adrer <erwin@lombok.demon.nl >
* usr > user
* Move nodrop check into do_install
* ... Why did I do that?
---------
Signed-off-by: Adrer <erwin@lombok.demon.nl >
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
2024-10-09 10:47:19 +00:00
Adrer
51c64edfc5
You can no longer put the cyborg gripper in a display case ( #26848 )
...
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2024-09-22 23:01:23 +00:00
Adrer
8d82546d9d
[FIX] Mobs that were offered up to ghosts no longer get taken over by their old owners ( #26650 )
...
* Grab_ghost now checks the ckey of the mind
* Remove superfluous loops for getting ghosts.
* Early return for MMI
---------
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2024-09-16 14:39:54 +00:00
CRUNCH
9ef47e7935
Enhances the Smoking Experience - Adds Many New Item Interactions for Cigarettes and Items Interacting With Them ( #25571 )
...
* Refactoring and other stuff.
* moar
* More smoking
* Update energy_melee_weapons.dm
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update cigs.dm
* Update cigs.dm
* Update cigs.dm
* Update code/game/objects/items/weapons/lighters.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* eee
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* sigh
* Update cigs.dm
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* hell
* Update cigs.dm
* aa
* cool
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* aa
* aaa
* suffering
* Soon
* Is it done!? Am I finally free!?
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update
* Update
* No longer assume the cig is in a mouth
* Update tools.dm
* Update pronouns.dm
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* update
* Attack animations for sword lighting!
* Update
* indentation
* Update cigs.dm
* minor refactor
* Update items.dm
* Update items.dm
* Update welder.dm
* Update energy_melee_weapons.dm
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* refactor
* Update items.dm
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* Update flamethrower.dm
* clipping
* Update legion_loot.dm
* anti attack check
* Fixes a zippo runtime
* Fixes evil runtime and stops unnecessary violence.
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update based on review
* Update cigs.dm
* Update energy_melee_weapons.dm
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update toys.dm
* Update energy_melee_weapons.dm
* Update legion_loot.dm
* Update code/game/objects/items/weapons/melee/energy_melee_weapons.dm
Co-authored-by: DGamerL <108773801+DGamerL@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: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-09-03 13:02:13 +00:00
1080pCat
681ad6ca4a
You can no longer get abductor rnd level 3+ from 1 ( #26598 )
2024-08-28 23:59:05 +00:00
CRUNCH
2c1fcbd7da
Merges the Hug Module With the Cyborg Gripper ( #26007 )
...
* Hugs
* Update cyborg_gripper.dm
* Update cyborg_gripper.dm
* Update cyborg_gripper.dm
* AGHHH!
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update cyborg_gripper.dm
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* Update cyborg_gripper.dm
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update robot_modules.dm
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Burzah <116982774+Burzah@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: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-08-07 13:07:36 +00:00
Migratingcocofruit
a0308e048a
Fixes medical grippers not being usable in surgery ( #26311 )
...
* Fixes medical grippers not being usable in surgery
* Adds a new trait for tools that behave like an open hand in surgery. uses that instead of a typecheck.
2024-08-07 00:02:03 +00:00
BiancaWilkson
ec88636e6c
Cyborg Damage, Movement, and Power Overhaul ( #25252 )
...
* Adding defines
* More signals for external power
* Gets the reboot working
* renaming a proc
* config stuff
* Working on cyborg movement
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* IOSYS where'd you come from
* begon return 0
* VTEC caps slowdown
* Adjusting EMPs
* Funny arm is GONE
* Oh yeah regenerating stamina might be a good thing
* Forgot you could uninstall vtec
* icon machine broke
* Cell-less borgs can enter chargers to stay powered
* oh that was almost bad
* Fixes some logic
* its a surprise tool that will help us later
* Adjusting some numbers
* Adds a sound to go along with the text alarm
* dead things can still charge
* Another logic error
* Xenos too
* sorry linter
* fixes CL
* Slightly more slowdown on stam damage
* neurotoxin won't stun
* SOUNDS!
* 3 flashes to stun instead of 4
* Slightly longer stun
* SPEEDING UP BORGS JUST FOR THE TM SINCE CONFIG DONT WORK
* Keep borgs stunned forever
* Power loss is more dangerous
* Adds a stamina hud to borgs
* Cyborgs now heal up properly
* Removes an outdated comment
* Replacing parts works better now
* EMPs disable components for a brief time
* More missed rebalances
* When you forget to remove debug messages
* WHAT
* Cult magic works + borgs can be silenced
* 2 flashes to stun, flashes confuse now
* Update code/game/objects/items/devices/flash.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Abductors can stun borgs
* Watcher/cyro rays deal stam to brog
* Fixes a rounding error when healing borgs back to full HP
* Fixed span
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Fixed whitespace
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Guard clausify
* Indents a message
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Update code/modules/mob/living/silicon/robot/component.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* that's not what stat does
* No more hardcoded speed, don't TM this branch
---------
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
2024-07-09 17:44:50 +00:00
DGamerL
4cf6595d12
Makes all playsounds use bools for vary ( #26183 )
...
* Makes all playsounds use `TRUE` for vary
* Same but for `FALSE`
2024-07-08 23:54:38 +00:00
CRUNCH
77d83ef1b9
Refactors Borg Grippers a Bit More, Adds Mining Gripper. Borgs Drop Items in Storage Modules if Gibbed. ( #25511 )
...
* Another gripper refactor
* Update code/modules/mob/living/silicon/robot/robot_modules.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* refactor extended description
* Update cyborg_gripper.dm
* Update cyborg_gripper.dm
* Update cyborg_gripper.dm
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com >
2024-06-12 17:58:10 +00:00
HMBGERDO
20f3b51496
fox ( #25678 )
2024-05-31 01:52:51 +00:00
CRUNCH
1933d2fab3
Refactors borg grippers, service now has a specialized gripper. ( #24596 )
...
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Most of the stuff
Most of the refactor. Needs to fix medical borg doing shrapnel extraction.
* Forgot this
* fixing space intent
* Newline
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* More improvement
* CI fixes
* GO AWAY SPACE INDENTATION I DIDN'T PUT YOU THERE AAAAA
* oops mb mb
* Makes this work with ebba's PR
* get dat fokkin disk
* Update cyborg_gripper.dm
* Removes all nuclear stuff
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update cyborg_gripper.dm
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update cyborg_gripper.dm
* coin flipping
* Update cyborg_gripper.dm
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* EOL comments no longer EOL
* autodoc
* Update cyborg_gripper.dm
* can hold all
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Oh hi mark!
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Line split
* Some comments, examine().
Examining a gripper now tells you what's inside.
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-05-17 12:43:06 +00:00
CRUNCH
66e3528b7c
Adds Abductor Janitorial Tools! ( #25057 )
...
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Out of this world cleaning!
* missing empty space
* Locker belt
* fix merge conflict and upgrade belt
* Update code/modules/research/designs/mechfabricator_designs.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/research/designs/medical_designs.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update medical_designs.dm
* Update code/game/objects/items/robot/robot_upgrades.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/abduction/abduction_gear.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Fixed missing item state
* Begone, bucket!
* Update code/game/objects/structures/mop_bucket.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@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: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-05-17 11:22:14 +00:00
Deniz
271d67d237
Adds MARK: to some comments ( #25184 )
...
* robot_upgrades
* disability
* airlock
* mecha
* Abcudtor
* Forgot a space here
* Some style changes + additions
* removed a no comment
* comment change
* empty
* empty again
dont dare look insde
* ault
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-05-01 23:54:00 +00:00
GDN
9e6dcf9c46
removes the remaining datum redeclares ( #25220 )
...
* removes the remaining datum redeclares
* the two fixes
* finneee contra
* OK CONTRA
* readd
* CURSED TO BE BROWN!
* facking automerge
2024-04-21 18:26:35 +00:00
CRUNCH
c8ffcedcb6
Merges the Janicart Floor Buffer into the Janiborg Floor Buffer ( #25125 )
...
* One Floor Buffer For All!
* better name
* Update code/modules/research/designs/mechfabricator_designs.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-04-19 18:06:41 +00:00
