Merge pull request #643 from Jay-Sparrow/Bug-fixin

Hardsuits must contain girth
This commit is contained in:
Dahlular
2020-11-02 20:53:26 -07:00
committed by GitHub
6 changed files with 10 additions and 2 deletions
+1 -1
View File
@@ -99,7 +99,7 @@
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
roomy = 1 //True
roomy = TRUE //True
user.show_message("<span class='notice'>You add a few stiches to your clothing, and find them to fit a little looser.</span>", 1)
B.uses -= 1 //One use has been used
if(B.uses <= 0)
@@ -103,6 +103,7 @@
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()
+1
View File
@@ -10,6 +10,7 @@
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,6 +590,7 @@
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()
. = ..()
@@ -598,6 +599,7 @@
/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,12 +119,14 @@
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."
@@ -134,6 +136,7 @@
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."
@@ -166,6 +169,7 @@
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."
@@ -116,7 +116,7 @@
var/folded_icon = "towel"
var/list/possible_colors
//Hyper Change
var/roomy = 1 //To cover XL bits
var/roomy = TRUE //To cover XL bits
/obj/item/reagent_containers/rag/towel/Initialize()
. = ..()