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

2020-06-23 00:13:14 +02:00
parent 9a9e76664f a0a4007332
commit de77b7139c
727 changed files with 240611 additions and 242127 deletions
@@ -6,7 +6,7 @@
 	throwforce = 0
 	slot_flags = ITEM_SLOT_EARS
 	resistance_flags = NONE
-	custom_price = 250
+	custom_price = PRICE_BELOW_NORMAL

 /obj/item/clothing/ears/earmuffs
 	name = "earmuffs"
@@ -31,7 +31,7 @@
 	slot_flags = ITEM_SLOT_EARS | ITEM_SLOT_HEAD | ITEM_SLOT_NECK		//Fluff item, put it whereever you want!
 	actions_types = list(/datum/action/item_action/toggle_headphones)
 	var/headphones_on = FALSE
-	custom_price = 125
+	custom_price = PRICE_ALMOST_CHEAP

 /obj/item/clothing/ears/headphones/Initialize()
 	. = ..()
@@ -203,6 +203,12 @@
 	icon_state = "hipster_glasses"
 	item_state = "hipster_glasses"

+/obj/item/clothing/glasses/regular/circle
+	name = "circle glasses"
+	desc = "Why would you wear something so controversial yet so brave?"
+	icon_state = "circle_glasses"
+	item_state = "circle_glasses"
+
 //Here lies green glasses, so ugly they died. RIP

 /obj/item/clothing/glasses/sunglasses
@@ -10,8 +10,8 @@
 	permeability_coefficient = 0.05
 	resistance_flags = NONE
 	var/can_be_cut = 1
-	custom_price = 1200
-	custom_premium_price = 1200
+	custom_price = PRICE_EXPENSIVE
+	custom_premium_price = PRICE_ALMOST_ONE_GRAND

 /obj/item/toy/sprayoncan
 	name = "spray-on insulation applicator"
@@ -10,7 +10,7 @@
 	cold_protection = HANDS
 	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
 	strip_mod = 0.9
-	custom_price = 75
+	custom_price = PRICE_ALMOST_CHEAP

 /obj/item/clothing/gloves/fingerless/pugilist
 	name = "armwraps"
@@ -7,7 +7,7 @@
 	cold_protection = HANDS
 	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
 	resistance_flags = NONE
-	//custom_premium_price = 350
+	//custom_premium_price = PRICE_EXPENSIVE
 	/// For storing our tackler datum so we can remove it after
 	var/datum/component/tackler
 	/// See: [/datum/component/tackler/var/stamina_cost]
@@ -5,7 +5,6 @@
 	name = "white beanie"
 	desc = "A stylish beanie. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their heads."
 	icon_state = "beanie" //Default white
-	custom_price = 60

 /obj/item/clothing/head/beanie/black
 	name = "black beanie"
@@ -75,6 +74,10 @@
 	icon_state = "beaniedurathread"
 	armor = list("melee" = 25, "bullet" = 10, "laser" = 20,"energy" = 10, "bomb" = 30, "bio" = 15, "rad" = 20, "fire" = 100, "acid" = 50)

-
+/obj/item/clothing/head/beanie/waldo
+	name = "red striped bobble hat"
+	desc = "If you're going on a worldwide hike, you'll need some cold protection."
+	icon_state = "waldo_hat"
+	item_state = "waldo_hat"

 //No dog fashion sprites yet :(  poor Ian can't be dope like the rest of us yet
@@ -1,6 +0,0 @@
-/obj/item/clothing/head/hunter
-	name = "hunter"
-	desc = "A basic hat for hunting things."
-	icon = 'modular_citadel/icons/obj/clothing/cit_hats.dmi'
-	icon_state = "hunter"
-	item_state = "hunter_worn"
@@ -58,7 +58,7 @@
 	desc = "A reliable, blue tinted helmet reminding you that you <i>still</i> owe that engineer a beer."
 	icon_state = "blueshift"
 	item_state = "blueshift"
-	custom_premium_price = 750
+	custom_premium_price = PRICE_ABOVE_EXPENSIVE

 /obj/item/clothing/head/helmet/riot
 	name = "riot helmet"
@@ -386,3 +386,9 @@
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
 	armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 50, "rad" = 20, "fire" = -10, "acid" = 0)
+
+/obj/item/clothing/head/helmet/police
+	name = "police officer's hat"
+	desc = "A police officer's Hat. This hat emphasizes that you are THE LAW."
+	icon_state = "policehelm"
+	dynamic_hair_suffix = ""
@@ -375,12 +375,6 @@
 	icon_state = "telegram"
 	dog_fashion = /datum/dog_fashion/head/telegram

-/obj/item/clothing/head/colour
-	name = "Singer cap"
-	desc = "A light white hat that has bands of color. Just makes you want to sing and dance!"
-	icon_state = "colour"
-	dog_fashion = /datum/dog_fashion/head/colour
-
 /obj/item/clothing/head/christmashat
 	name = "red santa hat"
 	desc = "A red Christmas Hat! How festive!"
@@ -434,3 +428,12 @@
 	desc = "A symbol of discipline, honor, and lots and lots of removal of some type of skewered food."
 	icon_state = "russobluecamohat"
 	item_state = "russobluecamohat"
+	dynamic_hair_suffix = ""
+
+/obj/item/clothing/head/hunter
+	name = "bounty hunting hat"
+	desc = "Ain't nobody gonna cheat the hangman in my town."
+	icon_state = "hunter"
+	item_state = "hunter"
+	armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -114,6 +114,7 @@
 	desc = "A jack o' lantern! Believed to ward off evil spirits."
 	icon_state = "hardhat0_pumpkin"
 	item_state = "hardhat0_pumpkin"
+	hat_type = "pumpkin"
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	brightness_on = 2 //luminosity when on
@@ -150,6 +151,7 @@
 	desc = "Some fake antlers and a very fake red nose."
 	icon_state = "hardhat0_reindeer"
 	item_state = "hardhat0_reindeer"
+	hat_type = "reindeer"
 	flags_inv = 0
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	brightness_on = 1 //luminosity when on
@@ -134,7 +134,7 @@
 	name = "baseball cap"
 	desc = "It's a robust baseball hat, this one belongs to syndicate major league team."
 	icon_state = "baseballsoft"
-	soft_type = "baseballsoft"
+	soft_type = "baseball"
 	item_state = "baseballsoft"
 	flags_inv = HIDEEYES|HIDEFACE
 	armor = list("melee" = 35, "bullet" = 35, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 90)
@@ -231,3 +231,16 @@
 			A.UpdateButtonIcon()
 		to_chat(M, "The Tiki Mask has now changed into the [choice] Mask!")
 		return TRUE
+
+/obj/item/clothing/mask/gas/tiki_mask/yalp_elor
+	icon_state = "tiki_yalp"
+	item_state = "tiki_yalp"
+	actions_types = list()
+
+/obj/item/clothing/mask/gas/hunter
+	name = "bounty hunting mask"
+	desc = "A custom tactical mask with decals added."
+	icon_state = "hunter"
+	item_state = "hunter"
+	resistance_flags = FIRE_PROOF | ACID_PROOF
+	flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS|HIDEHAIR
@@ -185,3 +185,9 @@
 		playsound(src.loc, "sound/voice/complionator/[phrase_sound].ogg", 100, 0, 4)
 		cooldown = world.time
 		cooldown_special = world.time
+
+/obj/item/clothing/mask/gas/sechailer/swat/spacepol
+	name = "spacepol mask"
+	desc = "A close-fitting tactical mask created in cooperation with a certain megacorporation, comes with an especially aggressive Compli-o-nator 3000."
+	icon_state = "spacepol"
+	item_state = "spacepol"
@@ -22,7 +22,6 @@
 	icon_state = "bluetie"
 	item_state = ""	//no inhands
 	w_class = WEIGHT_CLASS_SMALL
-	custom_price = 60

 /obj/item/clothing/neck/tie/blue
 	name = "blue tie"
@@ -88,7 +87,6 @@
 /obj/item/clothing/neck/scarf //Default white color, same functionality as beanies.
 	name = "white scarf"
 	icon_state = "scarf"
-	custom_price = 60
 	desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks."
 	dog_fashion = /datum/dog_fashion/head

@@ -1,6 +1,5 @@
 /obj/item/clothing/shoes/sneakers
 	dying_key = DYE_REGISTRY_SNEAKERS
-	custom_price = 50

 /obj/item/clothing/shoes/sneakers/black
 	name = "black shoes"
@@ -72,7 +72,7 @@
 	equip_delay_other = 50
 	resistance_flags = NONE
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 75)
-	custom_price = 600
+	custom_price = PRICE_ABOVE_EXPENSIVE

 /obj/item/clothing/shoes/galoshes/dry
 	name = "absorbent galoshes"
@@ -384,7 +384,6 @@
 /obj/item/clothing/shoes/cowboyboots
 	name = "cowboy boots"
 	desc = "A standard pair of brown cowboy boots."
-	custom_price = 60 //remember to replace these lame cosmetics with tg's YEEEEHAW counterparts.
 	icon_state = "cowboyboots"

 /obj/item/clothing/shoes/cowboyboots/black
@@ -84,7 +84,7 @@
 		user.alpha = 255
 		user.update_atom_colour()
 		user.animate_movement = FORWARD_STEPS
-		user.notransform = 0
+		user.mob_transforming = 0
 		user.anchored = FALSE
 		teleporting = 0
 		for(var/obj/item/I in user.held_items)
@@ -125,7 +125,7 @@
 			ADD_TRAIT(I, TRAIT_NODROP, CHRONOSUIT_TRAIT)
 		user.animate_movement = NO_STEPS
 		user.changeNext_move(8 + phase_in_ds)
-		user.notransform = 1
+		user.mob_transforming = 1
 		user.anchored = TRUE
 		user.Stun(INFINITY)

@@ -469,7 +469,7 @@ Contains:
 	desc = "Voices echo from the hardsuit, driving the user insane. This one is pretty battle-worn, but still fearsome."
 	armor = list("melee" = 55, "bullet" = 40, "laser" = 40, "energy" = 40, "bomb" = 40, "bio" = 80, "rad" = 80, "fire" = 60, "acid" = 60)
 	slowdown = 0.8
-	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor/old
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/beserker/old
 	charges = 6

 /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/beserker/old
@@ -518,3 +518,14 @@ Contains:
 	desc = "A deep blue space helmet with a large red cross on the faceplate to designate the wearer as trained emergency medical personnel."
 	icon_state = "paramedic-eva-helmet"
 	item_state = "paramedic-eva-helmet"
+
+/obj/item/clothing/suit/space/hunter
+	name = "bounty hunting suit"
+	desc = "A custom version of the MK.II SWAT suit, modified to look rugged and tough. Works as a space suit, if you can find a helmet."
+	icon_state = "hunter"
+	item_state = "swat_suit"
+	allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/kitchen/knife/combat)
+	armor = list("melee" = 60, "bullet" = 40, "laser" = 40, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
+	strip_delay = 130
+	resistance_flags = FIRE_PROOF | ACID_PROOF
+
@@ -49,7 +49,7 @@
 	desc = "A large, yet comfortable piece of armor, protecting you from some threats."
 	icon_state = "blueshift"
 	item_state = "blueshift"
-	custom_premium_price = 750
+	custom_premium_price = PRICE_ABOVE_EXPENSIVE

 /obj/item/clothing/suit/armor/hos
 	name = "armored greatcoat"
@@ -1016,3 +1016,9 @@
 /obj/item/clothing/head/hooded/winterhood/polychromic
 	icon_state = "winterhood_poly"
 	item_state = "winterhood_poly"
+
+/obj/item/clothing/suit/striped_sweater
+	name = "striped sweater"
+	desc = "Reminds you of someone, but you just can't put your finger on it..."
+	icon_state = "waldo_shirt"
+	item_state = "waldo_shirt"
@@ -192,3 +192,14 @@
 	icon_state = "hos_parade_fem"
 	item_state = "r_suit"
 	fitted = FEMALE_UNIFORM_TOP
+
+/*
+ *Spacepol
+ */
+
+/obj/item/clothing/under/rank/security/spacepol
+	name = "police uniform"
+	desc = "Space not controlled by megacorporations, planets, or pirates is under the jurisdiction of Spacepol."
+	icon_state = "spacepol"
+	item_state = "spacepol"
+	can_adjust = FALSE
@@ -87,7 +87,6 @@
 	icon_state = "overalls"
 	item_state = "lb_suit"
 	can_adjust = FALSE
-	custom_price = 60

 /obj/item/clothing/under/misc/assistantformal
 	name = "assistant's formal uniform"
@@ -3,7 +3,6 @@
 	body_parts_covered = GROIN|LEGS
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
-	custom_price = 60
 	mutantrace_variation = STYLE_DIGITIGRADE //how do they show up on taurs otherwise?

 /obj/item/clothing/under/pants/classicjeans
@@ -15,7 +14,7 @@
 	name = "Must Hang jeans"
 	desc = "Made in the finest space jeans factory this side of Alpha Centauri."
 	icon_state = "jeansmustang"
-	custom_price = 180
+	custom_price = PRICE_ABOVE_NORMAL

 /obj/item/clothing/under/pants/blackjeans
 	name = "black jeans"
@@ -17,7 +17,6 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-	custom_price = 60

 /obj/item/clothing/under/dress/skirt/red
 	name = "red skirt"
@@ -27,7 +26,6 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-	custom_price = 60

 /obj/item/clothing/under/dress/skirt/purple
 	name = "purple skirt"
@@ -37,7 +35,6 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-	custom_price = 60

 /obj/item/clothing/under/dress/sundress
 	name = "sundress"
@@ -151,7 +148,6 @@
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = TRUE
 	alt_covers_chest = TRUE
-	custom_price = 60

 /obj/item/clothing/under/dress/skirt/plaid/blue
 	name = "blue plaid skirt"
@@ -97,6 +97,48 @@
 	icon_state = "trek_ds9_medsci"
 	item_state = "b_suit"

+//Orvilike (Orville-inspired clothing with TOS-like color code)
+/obj/item/clothing/under/trek/command/orv
+	desc = "An uniform worn by command officers since 2420s."
+	icon_state = "orv_com"
+
+/obj/item/clothing/under/trek/engsec/orv
+	desc = "An uniform worn by operations officers since 2420s."
+	icon_state = "orv_ops"
+
+/obj/item/clothing/under/trek/medsci/orv
+	desc = "An uniform worn by medsci officers since 2420s."
+	icon_state = "orv_medsci"
+
+//Orvilike Extra (Ditto, but expands it for Civilian department with SS13 colors and gives specified command uniform)
+//honestly no idea why i added specified comm. uniforms but w/e
+/obj/item/clothing/under/trek/command/orv/captain
+	name = "captain uniform"
+	desc = "An uniform worn by captains since 2550s."
+	icon_state = "orv_com_capt"
+
+/obj/item/clothing/under/trek/command/orv/engsec
+	name = "operations command uniform"
+	desc = "An uniform worn by operations command officers since 2550s."
+	icon_state = "orv_com_ops"
+
+/obj/item/clothing/under/trek/command/orv/medsci
+	name = "medsci command uniform"
+	desc = "An uniform worn by medsci command officers since 2550s."
+	icon_state = "orv_com_medsci"
+
+/obj/item/clothing/under/trek/orv
+	name = "adjutant uniform"
+	desc = "An uniform worn by adjutants <i>(assistants)</i> since 2550s."
+	icon_state = "orv_ass"
+	item_state = "gy_suit"
+
+/obj/item/clothing/under/trek/orv/service
+	name = "service uniform"
+	desc = "An uniform worn by service officers since 2550s."
+	icon_state = "orv_srv"
+	item_state = "g_suit"
+
 //The Motion Picture
 /obj/item/clothing/under/trek/fedutil
 	name = "federation utility uniform"