Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667

2020-04-09 14:59:40 +02:00
parent 56669f9296 5078b5875a
commit d2b624a908
415 changed files with 144051 additions and 5120 deletions
@@ -3,6 +3,7 @@
 	name = "under"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	permeability_coefficient = 0.9
+	block_priority = BLOCK_PRIORITY_UNIFORM
 	slot_flags = ITEM_SLOT_ICLOTHING
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	var/fitted = FEMALE_UNIFORM_FULL // For use in alternate clothing styles for women
@@ -80,9 +80,11 @@
 	name = "ancient jumpsuit"
 	desc = "A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade."

-/obj/item/clothing/under/color/grey/glorf/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
-	owner.forcesay(GLOB.hit_appends)
-	return 0
+/obj/item/clothing/under/color/grey/glorf/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
+	. = ..()
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		H.forcesay(GLOB.hit_appends)

 /obj/item/clothing/under/color/blue
 	name = "blue jumpsuit"
@@ -12,7 +12,6 @@
 	item_state = "explorer_envirosuit"
 	item_color = "explorer_envirosuit"

-
 /obj/item/clothing/under/plasmaman/chef
 	name = "chef's plasma envirosuit"
 	desc = "A white plasmaman envirosuit designed for cullinary practices. One might question why a member of a species that doesn't need to eat would become a chef."
@@ -69,6 +68,8 @@
 	item_state = "captain_envirosuit"
 	item_color = "captain_envirosuit"
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95)
+	sensor_mode = SENSOR_COORDS
+	random_sensor = FALSE

 /obj/item/clothing/under/plasmaman/mime
 	name = "mime envirosuit"
@@ -97,4 +98,4 @@
 			H.visible_message("<span class='warning'>[H]'s suit spews out a tonne of space lube!</span>","<span class='warning'>Your suit spews out a tonne of space lube!</span>")
 			H.ExtinguishMob()
 			new /obj/effect/particle_effect/foam(loc) //Truely terrifying.
-	return FALSE
+	return FALSE
@@ -5,6 +5,8 @@
 	item_state = "security_envirosuit"
 	item_color = "security_envirosuit"
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95)
+	sensor_mode = SENSOR_COORDS
+	random_sensor = FALSE

 /obj/item/clothing/under/plasmaman/security/warden
 	name = "warden plasma envirosuit"
@@ -13,7 +13,6 @@
 	item_state = "red_suit"
 	item_color = "red_suit_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON

@@ -38,5 +37,4 @@
 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
-	can_adjust = FALSE
 	resistance_flags = NONE
@@ -14,7 +14,6 @@
 	item_state = "lb_suit"
 	item_color = "director_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON

@@ -8,6 +8,11 @@
 /*
 * Security
 */
+/obj/item/clothing/under/rank/security
+	strip_delay = 50
+	alt_covers_chest = TRUE
+	sensor_mode = SENSOR_COORDS
+	random_sensor = FALSE

 /obj/item/clothing/under/rank/security/officer
 	name = "security jumpsuit"
@@ -16,10 +21,6 @@
 	item_state = "r_suit"
 	item_color = "rsecurity"
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
-	strip_delay = 50
-	alt_covers_chest = TRUE
-	sensor_mode = SENSOR_COORDS
-	random_sensor = FALSE

 /obj/item/clothing/under/rank/security/officer/grey
 	name = "grey security jumpsuit"
@@ -74,10 +75,6 @@
 	item_state = "r_suit"
 	item_color = "rwarden"
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
-	strip_delay = 50
-	alt_covers_chest = TRUE
-	sensor_mode = 3
-	random_sensor = FALSE

 /obj/item/clothing/under/rank/security/warden/grey
 	name = "grey security suit"
@@ -116,10 +113,6 @@
 	item_state = "det"
 	item_color = "detective"
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
-	strip_delay = 50
-	alt_covers_chest = TRUE
-	sensor_mode = 3
-	random_sensor = FALSE

 /obj/item/clothing/under/rank/security/detective/skirt
 	name = "detective's suitskirt"
@@ -138,7 +131,6 @@
 	icon_state = "greydet"
 	item_state = "greydet"
 	item_color = "greydet"
-	alt_covers_chest = TRUE

 /obj/item/clothing/under/rank/security/detective/grey/skirt
 	name = "noir suitskirt"
@@ -163,9 +155,6 @@
 	item_color = "rhos"
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	strip_delay = 60
-	alt_covers_chest = TRUE
-	sensor_mode = 3
-	random_sensor = FALSE

 /obj/item/clothing/under/rank/security/head_of_security/skirt
 	name = "head of security's jumpskirt"
@@ -209,7 +198,6 @@
 	icon_state = "hosblueclothes"
 	item_state = "hosblueclothes"
 	item_color = "hosblueclothes"
-	alt_covers_chest = TRUE

 /obj/item/clothing/under/rank/security/head_of_security/parade
 	name = "head of security's parade uniform"
@@ -226,4 +214,3 @@
 	item_state = "r_suit"
 	item_color = "hos_parade_fem"
 	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE