Merge pull request #852 from ArchieBeepBoop/nukesbluespacethread

Nukes bluespace thread
This commit is contained in:
QuoteFox
2021-01-10 11:31:36 +00:00
committed by GitHub
10 changed files with 6 additions and 113 deletions
+2 -1
View File
@@ -47,7 +47,6 @@
//Add a "exclude" string to do the opposite, making it only only species listed that can't wear it.
//You append this to clothing objects.
//Hyper change// - Variables for HS13 checks
var/roomy = 0 //0 For false
/obj/item/clothing/Initialize()
@@ -95,6 +94,7 @@
to_chat(user, "<span class='notice'>You fix the damage on [src] with [C].</span>")
return 1
//Hyper Change//
/*
if(istype(W, /obj/item/bluespace_thread))
var/obj/item/bluespace_thread/B = W
if ((istype(src, /obj/item/clothing/under) || istype(src, /obj/item/clothing/suit)) && roomy != 1) //Make sure the thread is used on an item that could be ripped off in the first place
@@ -106,6 +106,7 @@
qdel(B)
else
user.show_message("<span class='notice'>You probably don't need any more room in that.</span>", 1)
*/ //Long live roomy = TRUE
return ..()
/obj/item/clothing/Destroy()
@@ -103,8 +103,6 @@
actions_types = list(/datum/action/item_action/toggle_helmet)
var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit
var/obj/item/tank/jetpack/suit/jetpack = null
roomy = TRUE
/obj/item/clothing/suit/space/hardsuit/Initialize()
if(jetpack && ispath(jetpack))
-1
View File
@@ -10,7 +10,6 @@
max_integrity = 250
resistance_flags = NONE
armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
roomy = TRUE
/obj/item/clothing/suit/armor/Initialize()
. = ..()
@@ -590,7 +590,6 @@
item_state = "coatcentcom"
armor = list("melee" = 40, "bullet" = 45, "laser" = 45, "energy" = 35, "bomb" = 40, "bio" = 25, "rad" = 25, "fire" = 35, "acid" = 50)
hoodtype = /obj/item/clothing/head/hooded/winterhood/centcom
roomy = TRUE
/obj/item/clothing/suit/hooded/wintercoat/centcom/Initialize()
. = ..()
@@ -599,7 +598,6 @@
/obj/item/clothing/head/hooded/winterhood/centcom
icon_state = "winterhood_centcom"
armor = list("melee" = 40, "bullet" = 45, "laser" = 45, "energy" = 35, "bomb" = 40, "bio" = 25, "rad" = 25, "fire" = 35, "acid" = 50)
roomy = TRUE
/obj/item/clothing/suit/hooded/wintercoat/captain
name = "captain's winter coat"
@@ -119,14 +119,12 @@
item_state = "g_suit"
item_color = "officer"
alt_covers_chest = TRUE
roomy = TRUE
/obj/item/clothing/under/rank/centcom_commander
desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders, adorned with a golden K and a star. signifying work under Kinaris."
name = "\improper CentCom Commander's jumpsuit"
icon_state = "centcom"
item_state = "dg_suit"
item_color = "centcom"
roomy = TRUE
/obj/item/clothing/under/rank/centcom_officer/skirt
name = "\improper CentCom Officer's jumpskirt"
desc = "It's a jumpskirt worn by CentCom's officials, adorned with a golden K and a star, signifying work under Kinaris."
@@ -136,7 +134,6 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
roomy = TRUE
/obj/item/clothing/under/space
name = "\improper NASA jumpsuit"
desc = "It has a NASA logo on it and is made of space-proofed materials."
@@ -169,7 +166,6 @@
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
can_adjust = FALSE
resistance_flags = FIRE_PROOF | ACID_PROOF
roomy = TRUE
/obj/item/clothing/under/owl
name = "owl uniform"
desc = "A soft brown jumpsuit made of synthetic feathers and strong conviction."
@@ -128,8 +128,6 @@
var/flat_icon = "towel_flat"
var/folded_icon = "towel"
var/list/possible_colors
//Hyper Change
var/roomy = TRUE //To cover XL bits
/obj/item/reagent_containers/rag/towel/Initialize()
. = ..()