e8eabf3014
Pimp coat ( #26122 )
...
* mob sprites
* imcoder
* i am too tired to name these commits
* woof
* who let the dogs out?
* 3 > 1
* i hate git
2024-07-02 17:53:16 +00:00
aaad036c7c
Only small and tiny simplemobs can go on skateboards, shoot people off them [BALANCE PRE APPROVED] ( #26091 )
...
* Only small and tiny simplemobs can go on skateboards, shoot people off them
* Update code/datums/components/riding/riding_vehicle.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-07-02 00:14:09 +00:00
589650080e
Fixes chemfoam reactions ( #26097 )
...
* fixes chemfoam
* dgamer reviews
2024-07-01 23:28:48 +00:00
6f74ae32d3
Cleans up and Slightly Tweaks Health Analyser Code, Makes T-Ray \improper ( #25788 )
...
* Update scanners.dm
* Update scanners.dm
* Update scanners.dm
* Update scanners.dm
* Update code/game/objects/items/devices/scanners.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update code/game/objects/items/devices/scanners.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update scanners.dm
* Update scanners.dm
* 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 >
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-07-01 23:20:19 +00:00
6738775be2
[FIX] You can now throw chem grenades (And some other things) further than 1 tile again ( #26105 )
...
* Fix throwing for a couple of items
* Not watertanks
* Or backtank fire extinguishers
---------
Co-authored-by: Adrer <adrermail@gmail.com >
2024-07-01 23:07:26 +00:00
77253c5ae7
Gives Surgical Drapes a Use ( #25686 )
...
* Gives drapes some utility for starting surgeries
* Adds a nice helping of drapes throughout the codebase
* add icon, realize I didn't think that through
* Handles blood with signals
* whoopsie daisy
* range
* how about borgs
* Apply suggestions from code review
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
* burza suggestion
* more dgamer reviews
* Oops
* Update code/modules/surgery/surgery.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
---------
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-07-01 19:01:17 +00:00
ce5f820181
Adds the Research & Development Crate - For Continuing Science After the End of the World ( #25990 )
...
* Update pack_science.dm
* BOX
2024-07-01 18:55:47 +00:00
24ceab2633
Spray paint no longer checks for eye protection, and rather if the eyes are covered or not. ( #26001 )
...
* wowzers, who knew spraying wasn't a flash
* proc cleanup
* Update code/game/objects/items/crayons.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
---------
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-07-01 18:55:21 +00:00
29179cfb5e
Fixes eyestabbing not dealing a correct amount of damage ( #26095 )
...
* fixes 25161
* Update code/game/objects/items.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
---------
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-07-01 18:55:01 +00:00
a7b71d465c
Fix glass tables. Fix crafting. lower price / stun ( #26062 )
...
* Fix glass tables. Fix crafting. lower price / stun
* Apply suggestions from code review
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Update code/modules/vehicle/tg_vehicles/scooter.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-07-01 18:54:57 +00:00
32e46c02aa
refactor: rename action button appearance related variables and procs to be clearer ( #25658 )
...
* refactor: make action appearance creation more straightforward
* some adjustments
* fix: adjust action icons to refactor
2024-07-01 02:29:31 +00:00
340d8a3731
Update to restraints ( #25831 )
...
* Update carbon_procs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update items.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update handcuffs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update humanoid.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update human_mob.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update status_effects.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update neutral.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update blood_magic.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update abduction_gear.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update items.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update abduction_gear.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/game/objects/items/weapons/handcuffs.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/game/objects/items/weapons/handcuffs.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/game/objects/items.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/game/gamemodes/cult/blood_magic.dm
Woops.
Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update items.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update handcuffs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update handcuffs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update handcuffs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update handcuffs.dm
The consequences of my actions
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update humanoid.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update carbon_procs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update clothing.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update human_mob.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/modules/mob/living/carbon/human/human_mob.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update carbon_procs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update handcuffs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
---------
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-07-01 02:14:52 +00:00
1b56455861
Lowers grenade throwspeed ( #25921 )
2024-06-29 18:15:17 +00:00
b4bac5d681
Holoparasites are now discountable ( #25943 )
...
* Discount the parasite!
* Fix testing values
* More testing values gone
* Carp scroll not discountable again
2024-06-29 18:06:48 +00:00
68635765b2
Adds a healthhud and securityhud to Captain's garment and crew monitor to Blueshield's locker. ( #25982 )
2024-06-29 18:00:25 +00:00
1e1b711be5
More medkits ! With the correct branch this time! ( #25985 )
...
* tactical medkit craft
* machine and aquatic kit from plastic
* adds fake tactical kit
* change recipe to make the fake tactical kit
2024-06-29 17:59:35 +00:00
c3f0694bad
Drask Traitor Item - Cryoregenerative Enhancer ( #25885 )
...
* Drask Traitor Item - Cryoregenerative Enhancer
* Removed extraneous list
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Better Math
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Excessive spacing
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Comment fix
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Cleaner dna logic
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Better lore
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Better readability on checks
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* More noticable alert if empty.
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-29 17:54:39 +00:00
c12d0346a1
aaaaaa ( #26080 )
2024-06-29 01:59:20 +00:00
bfb9e8c132
Refactors Foam ( #25436 )
...
* foam starts
* foam fixes
* foam foam foam
* remove widefoam, get cleaning grenades working as they should
* sirryan reeview
* Apply suggestions from code review
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
* locs good to me
* dgamer review
---------
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-28 20:39:26 +00:00
43b7fa5ed9
Gargantua Blood Rush now removes bolas ( #25989 )
...
* gargantua bloodrush now clears legcuffs, slightly refactors removing restraints
* comment tweaks, prevents blood rush from being used when buckled.
* Update code/modules/mob/living/carbon/carbon_procs.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
---------
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-06-28 03:16:55 +00:00
bb2e96792b
Tweaks the Light Replacer ( #25932 )
...
* Light Replacer Enhancement
* Update code/game/objects/items/devices/lightreplacer.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update
* Update lightreplacer.dm
* Update lightreplacer.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 >
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-28 03:16:37 +00:00
62a7d79358
Update cigs.dm ( #25842 )
2024-06-28 03:16:32 +00:00
ee6879ad7b
Replaces the Nicotine in Rollies With Weed ( #25840 )
...
* Update cigs.dm
* Update cigs.dm
2024-06-28 03:15:33 +00:00
48f429e307
Added smoketime calc to adding reagents ( #25933 )
...
* Added smoketime calc to adding reagents
* Math fix
* Spacing
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Improved calculation
* SIMPLIFICATION MATH
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-28 03:08:46 +00:00
a3af356e55
New bag sprites by Alexios! ( #25810 )
...
* New bag sprites!
* New biobag sprite
2024-06-28 02:05:04 +00:00
5ccce78ba0
last tweaks ( #26060 )
2024-06-27 21:47:56 +00:00
da42a1c2f6
Refactors throwing ( #25946 )
...
* refactors datum/thrownthing
* cleanup
* lewc review
* calling parent doesn't do anything lmao
2024-06-26 21:03:51 +00:00
936d19c0a0
Blood spread fixes and tweaks ( #26048 )
...
* blood spread fixes and tweaks
* just to make sure
* soap cant be bloodied, better check on gloves
2024-06-26 20:57:30 +00:00
ed7782ad4c
Adds the oneuse autosurgeon ( #25978 )
2024-06-26 20:38:53 +00:00
a35abcdd29
begone typo ( #26049 )
2024-06-26 19:13:41 +00:00
f6b8d87e78
Adds sscooters and skateboards [serious pr do not close after AFD] ( #24934 )
...
* WORLD WIDE NOISE
* Makes it pass CI, tweaks values, glass table hoverboard, and railing grinding
* grind on pipes
* https://youtu.be/cTiM1MJ1o7c?feature=shared
* https://youtu.be/Jc6CHI9f6cM?feature=shared
* temporary change for icon conflicts (hopefully)
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* The rest of the fun loving owl
* missed this one
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* changes
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Update code/modules/vehicle/tg_vehicles/tg_vehicles.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* I love stealth conflicts!
* purge lines
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Update tg_vehicles.dm
* works works works
* Update code/modules/vehicle/tg_vehicles/tg_vehicles.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@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 >
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-06-25 21:38:40 +00:00
d88ddea05c
Touching bloody objects will make your hands/gloves bloody. ( #25730 )
...
* bloody blood
* no restrictions of item blood
* PR reviews
* comment
2024-06-25 21:31:00 +00:00
457f9ff04f
[TWEAK] Bio-Chip Pad Renaming Tracker Bio-Cips ( #25617 )
...
* Allows the biochip pad to change the GPS tag on the tracker implant. No more standard 'TRACK0' on everything.
Updates the UI for the biochip pad.
Adds the biochip pad to the protolathe under the medical tab
* Prettier!!! :)
* Moves the "tag" property below the general blurbs.
* Update code/game/objects/items/weapons/bio_chips/bio_chip_pad.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com >
* Merge Conflict Fix (1/2)
* MC (1.5/2)
* Merge Conflict Resolution (Hopefully)
---------
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-06-25 21:29:45 +00:00
ef3162121a
Fixes clones being stuck mindslaved ( #25981 )
...
* Update clonepod.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update clonepod.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update bio_chip_traitor.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update datum_mindslave.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update datum_mindslave.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Create misc_mindslave.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update paradise.dme
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
---------
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
2024-06-25 10:34:22 +00:00
e7adf789e1
bluespace spellblade and modsuit teleporter module work better ( #25900 )
...
* bluespace spellblade and modsuit teleporter module work better
* nah this should stay 7
* 7 ate 9
2024-06-22 23:16:01 +00:00
a960b7de6d
Standardises the comments in items.dm ( #25889 )
...
* Adds heaps of auto docs, as well as cleansup/standadises most comments
* DGL review
* Update items.dm
* Update items.dm
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
* Update items.dm
---------
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-22 22:45:32 +00:00
c3c5d890f9
CQC Slapper is now NODROP ( #25951 )
...
* parry slapper is now nodrop
* Update code/game/objects/items/hand_item.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com >
* better signal handling
* comment
* DATUM
* fixing signal proc ref
* Update code/game/objects/items/hand_item.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com >
---------
Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-06-22 22:45:03 +00:00
f0cef57c17
Nian Caterpillar Infestation and Worme Invasion ( #25560 )
...
* I hate DMI merge conflicts.
* Attempt at full merge conflict resolution
* Ticked >:C
* Moves the include because
* Fixes missing proc.
* 🫃
* Readds the worme cubes to all places the other bunches are. As well as changes the xenobiology console to spit out the type of monkey/primitive form that the monkey recycler is set to.
* Adds changes requested by DGamerL
* Replaces space indents with tabs. Error caused by copy pasting.
* Update code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com >
* Uniforms the tab spacing.
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com >
* Adds requested changes from @lewcc
* Removes so missed #undef in `monkey.dm`
---------
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-22 18:20:27 +00:00
5f2b7d7cd0
refactor: remove many unused areas. ( #25893 )
...
* refactor: remove many unused areas.
* correct pod number
2024-06-20 11:38:33 +00:00
c7d6e83d7e
fixes block uptime being 33% instead of 50% ( #25917 )
...
* matt I'm shooting you (not really but)
* also these ones
* fixes cqc
2024-06-20 11:38:30 +00:00
18b0b09778
adds spawners for NPC zombies ( #25873 )
...
* lmao
* lol
* yes
* yeah sure
* fix
* Apply suggestions from code review
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* lewc review + duplicate
---------
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
2024-06-20 11:38:23 +00:00
8173e1695d
removes flick from spark effects ( #25898 )
2024-06-17 01:54:54 +00:00
2a0d1c0416
ognerwogner[0ign3we0ifnhwepighn3igbwoigbewo ( #25902 )
2024-06-14 19:02:44 +00:00
b297a543df
Serving Tray Tweakery ( #25759 )
...
* Update bags.dm
* Update bags.dm
* Update code/game/objects/items/weapons/storage/bags.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update bags.dm
* 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 bags.dm
* Update bags.dm
* Update bags.dm
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-06-12 22:07:26 +00:00
b842e3909a
[TM FOR THE LOVE OF GOD] Makes a bunch of random things initialise. ( #25539 )
...
* I disabled my lunacy inhibitors
* Update code/game/objects/objs.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-12 21:53:58 +00:00
922d7215bd
Adds a check on messaging admins if an item is in nullspace. ( #25895 )
...
* this sucks this sucks so bad
* unused
2024-06-12 20:17:01 +00:00
9ea4320f46
Update fancy.dm ( #25721 )
2024-06-12 19:18:02 +00:00
173ff7e7d4
Deathsquad buff ( #25744 )
2024-06-12 19:17:18 +00:00
438faac253
Refactors projectile ricochets ( #25764 )
...
* same taste, twice the speed
* pulls proc/handle_ricochet() to the atom level. adds var/flags_ricochet and related defines.
* space indentation sneaks its way in yet again
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-06-12 19:08:57 +00:00
4b3b64e540
[FIX] Cyborg Zipties Will Not be Consumed When Making Wired Rods ( #25752 )
...
* r o d
* Update handcuffs.dm
* Update handcuffs.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 >
* Update handcuffs.dm
* Update handcuffs.dm
* Update handcuffs.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 >
* Update handcuffs.dm
* Update code/game/objects/items/weapons/handcuffs.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: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-12 18:56:20 +00:00
McRamon