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
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
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
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
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
20f3b51496
fox ( #25678 )
2024-05-31 01:52:51 +00:00
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
Adrer