mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-05 23:21:53 +00:00
0104291682
* 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>
130 lines
4.8 KiB
Plaintext
130 lines
4.8 KiB
Plaintext
|
|
//Voidsuits
|
|
/obj/item/clothing/head/helmet/space/nasavoid
|
|
name = "\improper NASA void helmet"
|
|
desc = "A high tech, NASA Centcom branch designed space suit helmet. Used for AI satellite maintenance."
|
|
icon_state = "void-red"
|
|
item_state = "void"
|
|
flags_inv = HIDEMASK|HIDEEARS
|
|
dyeable = TRUE
|
|
dyeing_key = DYE_REGISTRY_VOID_HELMET
|
|
sprite_sheets = list(
|
|
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
|
|
"Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
|
|
"Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi',
|
|
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi',
|
|
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi')
|
|
|
|
/obj/item/clothing/suit/space/nasavoid
|
|
name = "NASA Void Suit"
|
|
icon_state = "void-red"
|
|
item_state = "void"
|
|
desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance."
|
|
dyeable = TRUE
|
|
dyeing_key = DYE_REGISTRY_VOID_SUIT
|
|
allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/multitool)
|
|
sprite_sheets = list(
|
|
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
|
|
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
|
|
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
|
|
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
|
|
|
|
//Colors!!!
|
|
/obj/item/clothing/head/helmet/space/nasavoid/green
|
|
icon_state = "void-green"
|
|
|
|
/obj/item/clothing/suit/space/nasavoid/green
|
|
icon_state = "void-green"
|
|
|
|
/obj/item/clothing/head/helmet/space/nasavoid/ntblue
|
|
icon_state = "void-ntblue"
|
|
|
|
/obj/item/clothing/suit/space/nasavoid/ntblue
|
|
icon_state = "void-ntblue"
|
|
|
|
/obj/item/clothing/head/helmet/space/nasavoid/purple
|
|
icon_state = "void-purple"
|
|
|
|
/obj/item/clothing/suit/space/nasavoid/purple
|
|
icon_state = "void-purple"
|
|
|
|
/obj/item/clothing/head/helmet/space/nasavoid/yellow
|
|
icon_state = "void-yellow"
|
|
|
|
/obj/item/clothing/suit/space/nasavoid/yellow
|
|
icon_state = "void-yellow"
|
|
|
|
/obj/item/clothing/head/helmet/space/nasavoid/ltblue
|
|
icon_state = "void-light_blue"
|
|
|
|
/obj/item/clothing/suit/space/nasavoid/ltblue
|
|
icon_state = "void-light_blue"
|
|
|
|
|
|
//Captian's Suit, like the other captian's suit, but looks better, at the cost of armor
|
|
/obj/item/clothing/head/helmet/space/nasavoid/captain
|
|
name = "fancy retro void helmet"
|
|
icon_state = "void-captian"
|
|
desc = "A high tech, NASA Centcom branch designed space suit helmet. Used for AI satellite maintenance. This one is fit for a captain."
|
|
|
|
/obj/item/clothing/suit/space/nasavoid/captain
|
|
name = "fancy NASA void suit"
|
|
icon_state = "void-captian"
|
|
desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance. This one is fit for a captain."
|
|
|
|
//Syndi's suit, on par with a blood red softsuit
|
|
|
|
/obj/item/clothing/head/helmet/space/nasavoid/syndi
|
|
name = "blood-red retro void helmet"
|
|
icon_state = "void-syndi"
|
|
desc = "A high tech, NASA Centcom branch designed space suit helmet. This one looks rather suspicious."
|
|
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
|
|
armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 20, FIRE = 200, ACID = 285)
|
|
|
|
/obj/item/clothing/suit/space/nasavoid/syndi
|
|
name = "blood-red NASA void suit"
|
|
icon_state = "void-syndi"
|
|
desc = "A high tech, NASA Centcom branch designed space suit. This one looks rather suspicious."
|
|
w_class = WEIGHT_CLASS_NORMAL
|
|
allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs,/obj/item/tank/internals)
|
|
armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 20, FIRE = 200, ACID = 285)
|
|
|
|
//random spawner
|
|
|
|
/obj/effect/nasavoidsuitspawner
|
|
name = "\improper NASA void suit spawner"
|
|
icon = 'icons/obj/clothing/suits.dmi'
|
|
icon_state = "void-red"
|
|
desc = "You shouldn't see this, a spawner for NASA Void Suits."
|
|
var/suits = list("red", "green", "ntblue", "purple", "yellow", "ltblue")
|
|
|
|
/obj/effect/nasavoidsuitspawner/New()
|
|
. = ..()
|
|
var/obj/item/clothing/head/helmet/space/nasavoid/H
|
|
var/obj/item/clothing/suit/space/nasavoid/S
|
|
switch(pick(suits))
|
|
if("red")
|
|
H = new /obj/item/clothing/head/helmet/space/nasavoid
|
|
S = new /obj/item/clothing/suit/space/nasavoid
|
|
if("green")
|
|
H = new /obj/item/clothing/head/helmet/space/nasavoid/green
|
|
S = new /obj/item/clothing/suit/space/nasavoid/green
|
|
if("ntblue")
|
|
H = new /obj/item/clothing/head/helmet/space/nasavoid/ntblue
|
|
S = new /obj/item/clothing/suit/space/nasavoid/ntblue
|
|
if("purple")
|
|
H = new /obj/item/clothing/head/helmet/space/nasavoid/purple
|
|
S = new /obj/item/clothing/suit/space/nasavoid/purple
|
|
if("yellow")
|
|
H = new /obj/item/clothing/head/helmet/space/nasavoid/yellow
|
|
S = new /obj/item/clothing/suit/space/nasavoid/yellow
|
|
if("ltblue")
|
|
H = new /obj/item/clothing/head/helmet/space/nasavoid/ltblue
|
|
S = new /obj/item/clothing/suit/space/nasavoid/ltblue
|
|
var/turf/T = get_turf(src)
|
|
if(H)
|
|
H.forceMove(T)
|
|
if(S)
|
|
S.forceMove(T)
|
|
qdel(src)
|