Revert "Revert "Merge remote-tracking branch 'upstream/master'""

This reverts commit 1509d9d183.
2019-11-24 03:33:02 +00:00
parent ba4fa1ef67
commit 614a462176
186 changed files with 764 additions and 405 deletions
@@ -12,6 +12,9 @@
 	new /obj/item/clothing/under/shorts/blue(src)
 	new /obj/item/clothing/under/shorts/green(src)
 	new /obj/item/clothing/under/jabroni(src)
+	new /obj/item/clothing/under/polychromic/shortpants(src)
+	new /obj/item/clothing/under/polychromic/shortpants(src)
+	new /obj/item/clothing/under/polychromic/shortpants(src)


 /obj/structure/closet/boxinggloves
@@ -352,6 +352,7 @@
 	icon_door = "black"

 /obj/structure/closet/wardrobe/curator/PopulateContents()
+	new /obj/item/clothing/accessory/pocketprotector/full(src)
 	new /obj/item/clothing/head/fedora/curator(src)
 	new /obj/item/clothing/suit/curator(src)
 	new /obj/item/clothing/under/rank/curator/treasure_hunter(src)
@@ -11,7 +11,7 @@
 	new /obj/item/clothing/under/rank/cargo(src)
 	new /obj/item/clothing/under/rank/cargo/skirt(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
-	new /obj/item/radio/headset/headset_cargo(src)
+	new /obj/item/radio/headset/heads/qm(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/gloves/fingerless(src)
 	new /obj/item/megaphone/cargo(src)
@@ -23,3 +23,4 @@
 	new /obj/item/circuitboard/machine/techfab/department/cargo(src)
 	new /obj/item/storage/photo_album/QM(src)
 	new /obj/item/circuitboard/machine/ore_silo(src)
+	new /obj/item/clothing/suit/hooded/wintercoat/qm(src)
@@ -34,6 +34,7 @@
 	new /obj/item/storage/photo_album/CE(src)
 	new	/obj/item/storage/lockbox/medal/engineering(src)
 	new /obj/item/construction/rcd/loaded/upgraded(src)
+	new /obj/item/clothing/suit/hooded/wintercoat/ce(src)

 /obj/structure/closet/secure_closet/engineering_electrical
 	name = "electrical supplies locker"
@@ -71,7 +71,7 @@
 	new /obj/item/storage/belt/medical(src)
 	new /obj/item/healthanalyzer/advanced(src)
 	new /obj/item/assembly/flash/handheld(src)
-//	new /obj/item/reagent_containers/hypospray/CMO(src) // CITADEL EDIT comments out the hypospray mk I. the MK II kit is modularized
+	new /obj/item/storage/hypospraykit/cmo(src)
 	new /obj/item/autosurgeon/cmo(src)
 	new /obj/item/door_remote/chief_medical_officer(src)
 	new /obj/item/clothing/neck/petcollar(src)
@@ -81,6 +81,7 @@
 	new /obj/item/circuitboard/machine/techfab/department/medical(src)
 	new /obj/item/storage/photo_album/CMO(src)
 	new	/obj/item/storage/lockbox/medal/medical(src)
+	new /obj/item/clothing/suit/hooded/wintercoat/cmo(src)

 /obj/structure/closet/secure_closet/animal
 	name = "animal control"
@@ -30,3 +30,4 @@
 	new /obj/item/door_remote/research_director(src)
 	new /obj/item/circuitboard/machine/techfab/department/science(src)
 	new /obj/item/storage/photo_album/RD(src)
+	new /obj/item/clothing/suit/hooded/wintercoat/rd(src)
@@ -61,6 +61,7 @@
 	new /obj/item/door_remote/civillian(src)
 	new /obj/item/circuitboard/machine/techfab/department/service(src)
 	new /obj/item/storage/photo_album/HoP(src)
+	new /obj/item/clothing/suit/hooded/wintercoat/hop(src)
 /obj/structure/closet/secure_closet/hos
 	name = "\proper head of security's locker"
 	req_access = list(ACCESS_HOS)
@@ -94,6 +95,7 @@
 	new /obj/item/pinpointer/nuke(src)
 	new /obj/item/circuitboard/machine/techfab/department/security(src)
 	new /obj/item/storage/photo_album/HoS(src)
+	new /obj/item/clothing/suit/hooded/wintercoat/hos(src)
 /obj/structure/closet/secure_closet/warden
 	name = "\proper warden's locker"
 	req_access = list(ACCESS_ARMORY)
@@ -142,28 +142,21 @@
 		new /obj/item/clothing/suit/jacket(src)
 	if(prob(40))
 		new /obj/item/clothing/suit/jacket(src)
-	new /obj/item/clothing/under/color/white(src)
-	new /obj/item/clothing/under/skirt/color/white(src)
-	new /obj/item/clothing/under/color/blue(src)
-	new /obj/item/clothing/under/skirt/color/blue(src)
-	new /obj/item/clothing/under/color/yellow(src)
-	new /obj/item/clothing/under/skirt/color/yellow(src)
-	new /obj/item/clothing/under/color/green(src)
-	new /obj/item/clothing/under/skirt/color/green(src)
-	new /obj/item/clothing/under/color/orange(src)
-	new /obj/item/clothing/under/skirt/color/orange(src)
-	new /obj/item/clothing/under/color/pink(src)
-	new /obj/item/clothing/under/skirt/color/pink(src)
-	new /obj/item/clothing/under/color/red(src)
-	new /obj/item/clothing/under/skirt/color/red(src)
-	new /obj/item/clothing/under/color/darkblue(src)
-	new /obj/item/clothing/under/skirt/color/darkblue(src)
-	new /obj/item/clothing/under/color/teal(src)
-	new /obj/item/clothing/under/skirt/color/teal(src)
-	new /obj/item/clothing/under/color/lightpurple(src)
-	new /obj/item/clothing/under/skirt/color/lightpurple(src)
-	new /obj/item/clothing/under/color/green(src)
-	new /obj/item/clothing/under/skirt/color/green(src)
+	new /obj/item/clothing/under/polychromic/jumpsuit(src)
+	new /obj/item/clothing/under/polychromic/jumpsuit(src)
+	new /obj/item/clothing/under/polychromic/jumpsuit(src)
+	new /obj/item/clothing/under/polychromic/shirt(src)
+	new /obj/item/clothing/under/polychromic/shirt(src)
+	new /obj/item/clothing/under/polychromic/shirt(src)
+	new /obj/item/clothing/under/polychromic/kilt(src)
+	new /obj/item/clothing/under/polychromic/kilt(src)
+	new /obj/item/clothing/under/polychromic/kilt(src)
+	new /obj/item/clothing/under/polychromic/skirt(src)
+	new /obj/item/clothing/under/polychromic/skirt(src)
+	new /obj/item/clothing/under/polychromic/skirt(src)
+	new /obj/item/clothing/under/polychromic/shorts(src)
+	new /obj/item/clothing/under/polychromic/shorts(src)
+	new /obj/item/clothing/under/polychromic/shorts(src)
 	new /obj/item/clothing/mask/bandana/red(src)
 	new /obj/item/clothing/mask/bandana/red(src)
 	new /obj/item/clothing/mask/bandana/blue(src)
@@ -422,7 +422,7 @@
 	implants = list(/obj/item/implant/weapons_auth)
 	id = /obj/item/card/id/syndicate

-/datum/outfit/syndicate_empty/post_equip(mob/living/carbon/human/H)
+/datum/outfit/syndicate_empty/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
 	H.faction |= ROLE_SYNDICATE

 /obj/effect/mob_spawn/human/syndicate/battlecruiser
@@ -9,11 +9,13 @@
 	armor = list("melee" = 0, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 20)
 	var/obj/item/holosign_creator/projector

-/obj/structure/holosign/New(loc, source_projector)
+/obj/structure/holosign/Initialize(mapload, source_projector)
+	. = ..()
 	if(source_projector)
 		projector = source_projector
 		projector.signs += src
-	..()
+	alpha = 0
+	SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, plane, dir, add_appearance_flags = RESET_ALPHA) //you see mobs under it, but you hit them like they are above it

 /obj/structure/holosign/Destroy()
 	if(projector)
@@ -71,10 +73,8 @@
 	desc = "A holographic barrier resembling a firelock. Though it does not prevent solid objects from passing through, gas is kept out."
 	icon_state = "holo_firelock"
 	density = FALSE
-	layer = ABOVE_MOB_LAYER
 	anchored = TRUE
 	CanAtmosPass = ATMOS_PASS_NO
-	layer = ABOVE_MOB_LAYER
 	alpha = 150

 /obj/structure/holosign/barrier/atmos/Initialize()
@@ -100,7 +100,6 @@
 	desc = "A holobarrier that uses biometrics to detect human viruses. Denies passing to personnel with easily-detected, malicious viruses. Good for quarantines."
 	icon_state = "holo_medical"
 	alpha = 125 //lazy :)
-	layer = ABOVE_MOB_LAYER
 	var/force_allaccess = FALSE
 	var/buzzcd = 0

@@ -6,12 +6,16 @@
 	armor = list("melee" = 100, "bullet" = 80, "laser" = 80, "energy" = 100, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 50, "acid" = 50)
 	density = FALSE
 	anchored = TRUE
-	layer = ABOVE_MOB_LAYER
 	CanAtmosPass = ATMOS_PASS_NO

 /obj/structure/plasticflaps/opaque
 	opacity = TRUE

+/obj/structure/plasticflaps/Initialize()
+	. = ..()
+	alpha = 0
+	SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, plane, dir, add_appearance_flags = RESET_ALPHA) //you see mobs under it, but you hit them like they are above it
+
 /obj/structure/plasticflaps/examine(mob/user)
 	. = ..()
 	if(anchored)