0104291682
Slaying Goliath: a Washing Machine and Dyeing overhaul ( #26265 )
...
* Washing Machine Updates
* Dye Registry Improvement + Bug Fixes
* a couple bug fixes + beanie dyeing
* oopsie
* removes washing blacklist, it is unused
* Apply suggestions from Lewcc's code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* why is all my code fucking
* Update code/modules/clothing/gloves/colored_gloves.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* cleanup
* Update code/modules/clothing/gloves/colored_gloves.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* machine wash updates for simple animals
* Update code/modules/clothing/clothing.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* adds dyeing.dm documentation
* optimizations & visible_messages
* adds SIGNAL_HANDLER
* Update code/game/machinery/washing_machine.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* update comment
* cleans up cleaning_act()
---------
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-08-19 09:38:47 +00:00
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
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
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
6a109ade7f
Moves a few sprites out of items.dmi ( #23301 )
...
* fuck you items.dmi
* banhammer
2023-11-24 15:39:20 +00:00
e2ffb8a882
Engineering borg nerf (just their decompiler ;p) ( #23227 )
...
* Engi borg nerf
* Update code/game/objects/items/devices/flashlight.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/fancy.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/fancy.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/modules/food_and_drinks/drinks/drinks/bottle.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/friendly/lizard.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/modules/projectiles/ammunition.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/modules/reagents/reagent_containers/chemical_bottle.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update lighters.dm
* Update spiders.dm
* reverts some that maybe should stay
* oops
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2023-11-14 12:51:13 +00:00
f3f9bd442a
Changes slot number defines from lowercase to all uppercase ( #22297 )
...
* undo all of it
* flags
* back
* head/mask
* left
* right
* Cuffs
* other name changes
* ID and PDA
* idk about calling them SLOT_HUD now
* glasses, gloves, and shoes, oh my!
* the rest
* comment
2023-10-03 18:27:51 +01:00
5e914948b2
Logs Toy Cuffs/Twimsts Differently from Standard Cuffs ( #22542 )
...
* god i cant believe we have to do this
* im a silly goose
* K.I.S.S.
* better wording
2023-09-28 19:32:26 -04:00
50443325bf
Adds Twimsts, a snack that can be used as eatable handcuffs ( #22092 )
...
* adds twimsts, the eatable handcuffs
* fixes twimsts cuffs showing up as cable on examine
* missing ending newline fix
* spelling
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* list formating or something
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* removes unnecessary bit of description, why did i put that there?
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* 0 to FALSE
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* path fix
* removes note showing wrong intent of adding code
* removes unnecessary examine
* code shortening, optimization, something?
* fix
* proper proc
* oops
* better sprites
* trash sprite not eaten?
* even better sprites
* removes extra empty line of code
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* fixes improper code formatting or something
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2023-09-07 10:39:29 +01:00
50bc2a2366
advtooluser dex messages ( #21996 )
2023-08-20 21:16:30 -05:00
173bfb92f5
Removes bio resist from the code ( #21108 )
...
* BIO armor is kill
* some more stuff that uses bio resist
* I did a scuffed merge conflict solve but it works
2023-06-03 09:50:22 +01:00
ced990a21c
Halves Cuffing + Garrote Sound Range and Volume ( #20674 )
...
* less echolocation
* Update garrote.dm
* hal review
2023-04-08 14:34:31 +01:00
c75f5d1f6c
Changes the fluffy cuffs description to not mention keeping your SO in line.. ( #20428 )
...
* goofy ah
* minor spelling error :(
2023-02-17 22:33:54 +00:00
7fb017915f
Makes cling tentacle more reliable / less shit ( #19855 )
...
* Cling tentacle love, part 1/2
* legcuff sprite
* S34N's changes
* Apply suggestions from code review
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
* attack logs.
* BOY I LOVE ICON CONFLICTS 1/3
* BOY I LOVE ICON CONFLICTS (3/3)
* EYE FOR AN ICON
* description update
* Final changes, whoops
* [H]
* swap the order
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2023-01-06 21:31:37 +01:00
67add93f82
fixes cable cuffs changing secbelt color ( #19656 )
2022-11-14 22:56:56 +01:00
0731101549
Gives cablecuffs and cables customizble colors, cablecuff(ed) sprites, and allows orange cables to spawn randomly ( #18318 )
...
* coloooors
* this should work
* bam, better colors
* fuck i didnt mean to delete the cueball
* cuffed state comment
2022-07-17 09:57:13 -05:00
bcf90593ed
Improves belt item overlay code, Adds new belt item overlay sprites ( #17568 )
...
* belt-improvements-and-sprites
* fixes my fix of botany belt allowed contents
2022-04-12 15:57:21 +01:00
559fa37756
add defines for damage flags
2021-08-20 21:09:21 +02:00
e7310cac9b
Adds missing things to drone cleaning ( #15553 )
...
* Adds missing things to drone cleaning.
* Update code/game/machinery/doors/airlock_electronics.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* Update code/game/machinery/doors/windowdoor.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* Update code/game/machinery/doors/airlock.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* Update code/game/machinery/doors/airlock.dm
Co-authored-by: dearmochi <shenesis@gmail.com >
* Moves destroyed electronics to emag_act
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
Co-authored-by: dearmochi <shenesis@gmail.com >
2021-03-28 12:45:29 +01:00
f2770ed6be
Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1
2021-03-11 18:41:17 +00:00
02b9445b9b
Refactors DNA Mutations; Refactors Mutations to use Traits ( #15483 )
...
* Refactors Mutations
* traits
* more work
* styling fix
* yet even more work
* oh hush
* almost there
* it continues yet further
* and that's genetics done
* and that's it folks
* last bit and golem fixup
* oof
* oops
* tweaks and fixes
* styling
2021-02-21 21:25:19 +00:00
f5f97882cf
BRUTAL Part 1 - No proc var/ in procs
2021-02-01 14:10:08 +00:00
8f72d7556e
Annihilates the blackbox ( #15132 )
...
* Lets get this show on the road
* Now were talking
* These matter
* Oh the joys of CI testing
* And this
* Wrong version
* Tweaks
* More tweaks
* Lets document this
* This too
* Upgrades this
* Fixed some sanity issues
* This too
* Screw it, this too
* More sanity
* And these
* This too
* Documentation
* This too
* Fixes **awful** scoreboard logic
* Why do we care about only half-absorbing someone
* Revert "Why do we care about only half-absorbing someone"
This reverts commit 8de1cfdf05
2020-12-24 16:06:48 -05:00
90ac9874b2
fixed orange crayons not making cables orange
2020-09-01 16:23:53 +02:00
ecf699562f
Fixes a few runtimes
2020-05-13 00:44:25 -05:00
04ba5c1cc9
File standardisation ( #13131 )
...
* Adds the check components
* Adds in trailing newlines
* Converts all CRLF to LF
* Post merge EOF
* Post merge line endings
* Final commit
2020-03-17 18:08:51 -04:00
f998cb74ad
then-we-shall-reforge-the-armor-from-what-remains
2019-09-10 07:03:05 -04:00
a015ab755f
Cuffs can't be used when you have antidrop on
2019-05-05 13:14:00 +02:00
cc8e076ae5
alternative. 1 handed cuffing
2019-03-25 20:19:42 +01:00
51feae1354
fixed the borg handcuffing being inconsistent and did some refactoring
2019-03-24 22:28:07 +01:00
6e21f6a781
tiny little code tidy
2018-12-29 22:51:58 +00:00
58033afc8a
changes the code to be not as snowflake
2018-12-29 21:07:21 +00:00
5dae4072ab
put in the brackets to fix the cluimsy thing
2018-12-29 20:34:00 +00:00
ac2d3396d6
Removes redundancies, makes exception for clumsiness
2018-12-27 20:20:19 +00:00
c03621c508
Completely Overhaul Logging
...
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
2b25584372
Merge remote-tracking branch 'upstream/master' into remove-weapons
2018-04-19 17:01:38 -04:00
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
f023edefa7
Crayons color cables, cableColor now cable_color
2018-04-14 23:54:37 -07:00
8c5beaaaff
adds some helper procs
2017-10-26 08:09:08 -04:00
e3bf6e3562
Adds random option for cable cuffs too
2017-06-15 01:47:28 +01:00
633c972f46
RnD autolathe removal + tech level overhaul
2017-06-01 11:34:29 -07:00
07e0f768d6
Using Weight Defines
2017-05-27 16:34:49 +01:00
3aa1399995
Implement usesound/toolspeed
2017-03-07 16:46:28 +01:00
52355cba9d
Added Legion megafauna, updated weather and some minor other refactors/changes.
2016-10-24 02:16:45 +02:00
f5577b4a8f
add_logs() un-fuckery
2016-08-29 17:27:56 -04:00
221476ef3b
Refactor stack recipes
...
- Styling fixes
- Added post_build() to stack recipes, for any recipes that need to do
something special
- Called with two arguments, the stack that it originated from, and the
new object.
- Moved stack recipes to their own file
Currently, only two things use post_build
- Cablecuffs use it to color the cuffs the same as the wire they
originated from
- Metal rods use it to call update_icon, in order to display the correct
sprite for whatever amount of rods you created.
2016-07-31 07:20:26 -07:00
1a6ceee4bd
Merge pull request #5172 from Fox-McCloud/remove-cable-coil
...
Removes Cablecuffs...
2016-07-26 13:27:59 -04:00
8a2e78c323
Removes Cablecuffs...
2016-07-22 22:58:50 -04:00
fe8ef6ca69
Adds in Bola, Other Recipe Tweaks
2016-07-22 13:20:09 -04:00
f7b298f68e
Merge pull request #4895 from TullyBurnalot/ArmlessCuffs
...
Armless Cuffing and Legless Legcuffing Sense-Making
2016-07-14 23:30:38 -04:00
Ryan