Merge branch 'master' into bark-box

This commit is contained in:
ItzGabby
2021-03-19 02:48:31 -04:00
159 changed files with 2749 additions and 1120 deletions
+1
View File
@@ -94,6 +94,7 @@
icon_state = "sec_dep_jacket"
item_state = "sec_dep_jacket"
armor = list("melee" = 25, "bullet" = 15, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45)
allowed = list(/obj/item/gun/energy, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
/obj/item/clothing/suit/toggle/labcoat/depjacket/sup
name = "supply jacket"
+4
View File
@@ -4,6 +4,8 @@
actions_types = list(/datum/action/item_action/toggle_hood)
var/obj/item/clothing/head/hooded/hood
var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this
///Alternative mode for hiding the hood, instead of storing the hood in the suit it qdels it, useful for when you deal with hooded suit with storage.
var/alternative_mode = FALSE
/obj/item/clothing/suit/hooded/Initialize()
. = ..()
@@ -43,6 +45,8 @@
H.transferItemToLoc(hood, src, TRUE)
H.update_inv_wear_suit()
else
if(alternative_mode)
QDEL_NULL(hood)
hood.forceMove(src)
update_icon()
+6
View File
@@ -59,6 +59,12 @@
has_sensor = TRUE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0, "wound" = 5)
/obj/item/clothing/under/syndicate/cosmetic/skirt
name = "tactitool skirtleneck"
icon_state = "tactifool_skirt"
fitted = FEMALE_UNIFORM_TOP
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
/obj/item/clothing/under/syndicate/sniper
name = "Tactical turtleneck suit"
desc = "A double seamed tactical turtleneck disguised as a civilian grade silk suit. Intended for the most formal operator. The collar is really sharp."