Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into deaddoll

Conflicts: code/modules/mob/new_player/preferences_setup.dm
2026-08-21 20:26:48 +01:00 · 2015-05-12 06:04:22 +03:00
parent 29823e3552 dcdc0a4862
commit 5c8ceae2fa
893 changed files with 28919 additions and 26318 deletions
@@ -33,7 +33,7 @@
 	if( findtext(href,"<script",1,0) )
 		world.log << "Attempted use of scripts within a topic call, by [src]"
 		message_admins("Attempted use of scripts within a topic call, by [src]")
-		//del(usr)
+		//qdel(usr)
 		return

 	//Admin PM
@@ -112,7 +112,7 @@

 	if(!config.guests_allowed && IsGuestKey(key))
 		alert(src,"This server doesn't allow guest accounts to play. Please go to http://www.byond.com/ and register for a key.","Guest","OK")
-		del(src)
+		qdel(src)
 		return

 	// Change the way they should download resources.
@@ -162,7 +162,11 @@
 	nanomanager.send_resources(src)

 	if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates.
-		winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold")
+		src << "<span class='info'>You have unread updates in the changelog.</span>"
+		winset(src, "rpane.changelogb", "background-color=#eaeaea;font-style=bold")
+		if(config.aggressive_changelog)
+			src.changes()
+


 	//////////////
@@ -259,8 +263,9 @@
 	getFiles(
 		'html/search.js',
 		'html/panels.css',
-		'html/painew.png',
-		'html/loading.gif',
+		'html/images/loading.gif',
+		'html/images/ntlogo.png',
+		'html/images/talisman.png',
 		'icons/pda_icons/pda_atmos.png',
 		'icons/pda_icons/pda_back.png',
 		'icons/pda_icons/pda_bell.png',
@@ -298,7 +303,16 @@
 		'icons/spideros_icons/sos_11.png',
 		'icons/spideros_icons/sos_12.png',
 		'icons/spideros_icons/sos_13.png',
-		'icons/spideros_icons/sos_14.png',
-		'html/images/ntlogo.png',
-		'html/images/talisman.png'
+		'icons/spideros_icons/sos_14.png'
 		)
+
+
+mob/proc/MayRespawn()
+	return 0
+
+client/proc/MayRespawn()
+	if(mob)
+		return mob.MayRespawn()
+
+	// Something went wrong, client is usually kicked or transfered to a new mob at this point
+	return 0
@@ -1447,7 +1447,7 @@ datum/preferences
 							rlimb_data[limb] = choice
 							organ_data[limb] = "cyborg"
 							if(second_limb)
-								organ_data[second_limb] = choice
+								rlimb_data[second_limb] = choice
 								organ_data[second_limb] = "cyborg"
 							if(third_limb && organ_data[third_limb] == "amputated")
 								organ_data[third_limb] = null
@@ -31,7 +31,7 @@ var/global/list/gear_datums = list()
 /datum/gear
 	var/display_name       //Name/index. Must be unique.
 	var/path               //Path to item.
-	var/cost               //Number of points used.
+	var/cost               //Number of points used. Items in general cost 1 point, storage/armor/gloves/special use costs 2 points.
 	var/slot               //Slot to equip to.
 	var/list/allowed_roles //Roles that can spawn with this item.
 	var/whitelisted        //Term to check the whitelist for..
@@ -48,19 +48,19 @@ var/global/list/gear_datums = list()
 /datum/gear/gbandana
 	display_name = "bandana, green"
 	path = /obj/item/clothing/head/greenbandana
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/obandana
 	display_name = "bandana, orange"
 	path = /obj/item/clothing/head/orangebandana
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/bandana
 	display_name = "bandana, pirate-red"
 	path = /obj/item/clothing/head/bandana
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/bsec_beret
@@ -73,20 +73,20 @@ var/global/list/gear_datums = list()
 /datum/gear/eng_beret
 	display_name = "beret, engie-orange"
 	path = /obj/item/clothing/head/beret/eng
-	cost = 2
+	cost = 1
 	slot = slot_head
 //	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer")

 /datum/gear/purp_beret
 	display_name = "beret, purple"
 	path = /obj/item/clothing/head/beret/jan
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/red_beret
 	display_name = "beret, red"
 	path = /obj/item/clothing/head/beret
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/sec_beret
@@ -99,74 +99,80 @@ var/global/list/gear_datums = list()
 /datum/gear/bcap
 	display_name = "cap, blue"
 	path = /obj/item/clothing/head/soft/blue
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/mailman
 	display_name = "cap, blue station"
 	path = /obj/item/clothing/head/mailman
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/flatcap
 	display_name = "cap, brown-flat"
 	path = /obj/item/clothing/head/flatcap
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/corpcap
 	display_name = "cap, corporate (Security)"
 	path = /obj/item/clothing/head/soft/sec/corp
-	cost = 2
+	cost = 1
 	slot = slot_head
 	allowed_roles = list("Security Officer","Head of Security","Warden")

 /datum/gear/gcap
 	display_name = "cap, green"
 	path = /obj/item/clothing/head/soft/green
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/grcap
 	display_name = "cap, grey"
 	path = /obj/item/clothing/head/soft/grey
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/ocap
 	display_name = "cap, orange"
 	path = /obj/item/clothing/head/soft/orange
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/purcap
 	display_name = "cap, purple"
 	path = /obj/item/clothing/head/soft/purple
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/raincap
 	display_name = "cap, rainbow"
 	path = /obj/item/clothing/head/soft/rainbow
-	cost = 3
+	cost = 1
 	slot = slot_head

 /datum/gear/rcap
 	display_name = "cap, red"
 	path = /obj/item/clothing/head/soft/red
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/ycap
 	display_name = "cap, yellow"
 	path = /obj/item/clothing/head/soft/yellow
-	cost = 2
+	cost = 1
+	slot = slot_head
+
+/datum/gear/wcap
+	display_name = "cap, white"
+	path = /obj/item/clothing/head/soft/mime
+	cost = 1
 	slot = slot_head

 /datum/gear/hairflower
 	display_name = "hair flower pin"
 	path = /obj/item/clothing/head/hairflower
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/dbhardhat
@@ -181,6 +187,12 @@ var/global/list/gear_datums = list()
 	cost = 2
 	slot = slot_head

+/datum/gear/rhardhat
+	display_name = "hardhat, red"
+	path = /obj/item/clothing/head/hardhat/red
+	cost = 2
+	slot = slot_head
+
 /datum/gear/yhardhat
 	display_name = "hardhat, yellow"
 	path = /obj/item/clothing/head/hardhat
@@ -190,32 +202,38 @@ var/global/list/gear_datums = list()
 /datum/gear/boater
 	display_name = "hat, boatsman"
 	path = /obj/item/clothing/head/boaterhat
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/bowler
 	display_name = "hat, bowler"
 	path = /obj/item/clothing/head/bowler
-	cost = 2
+	cost = 1
 	slot = slot_head

 /datum/gear/fez
 	display_name = "hat, fez"
 	path = /obj/item/clothing/head/fez
-	cost = 2
+	cost = 1
+	slot = slot_head
+
+/datum/gear/tophat
+	display_name = "hat, tophat"
+	path = /obj/item/clothing/head/that
+	cost = 1
 	slot = slot_head

 // Wig by Earthcrusher, blame him.
 /datum/gear/philosopher_wig
 	display_name = "natural philosopher's wig"
 	path = /obj/item/clothing/head/philosopher_wig
-	cost = 3
+	cost = 1
 	slot = slot_head

 /datum/gear/ushanka
 	display_name = "ushanka"
 	path = /obj/item/clothing/head/ushanka
-	cost = 2
+	cost = 1
 	slot = slot_head

 // This was sprited and coded specifically for Zhan-Khazan characters. Before you
@@ -223,7 +241,7 @@ var/global/list/gear_datums = list()
 /datum/gear/zhan_scarf
 	display_name = "Zhan headscarf"
 	path = /obj/item/clothing/head/tajaran/scarf
-	cost = 2
+	cost = 1
 	slot = slot_head
 	whitelisted = "Tajara"

@@ -239,12 +257,37 @@ var/global/list/gear_datums = list()
 	display_name = "Glasses, green"
 	path = /obj/item/clothing/glasses/gglasses
 	cost = 1
+	slot = slot_glasses
+
+/datum/gear/prescriptionhipster
+	display_name = "Glasses, hipster"
+	path = /obj/item/clothing/glasses/regular/hipster
+	cost = 1
+	slot = slot_glasses
+
+/datum/gear/prescription
+	display_name = "Glasses, prescription"
+	path = /obj/item/clothing/glasses/regular
+	cost = 1
+	slot = slot_glasses
+
+/datum/gear/monocle
+	display_name = "Monocle"
+	path = /obj/item/clothing/glasses/monocle
+	cost = 1
+	slot = slot_glasses

 /datum/gear/scanning_goggles
 	display_name = "scanning goggles"
 	path = /obj/item/clothing/glasses/fluff/uzenwa_sissra_1
 	cost = 1
-//	allowed_roles = list("Roboticist", "Scientist", "Research Director")
+	slot = slot_glasses
+
+/datum/gear/sciencegoggles
+	display_name = "Science Goggles"
+	path = /obj/item/clothing/glasses/science
+	cost = 1
+	slot = slot_glasses

 /datum/gear/security
 	display_name = "Security HUD"
@@ -260,10 +303,10 @@ var/global/list/gear_datums = list()
 	slot = slot_glasses
 	allowed_roles = list("Security Officer","Head of Security","Warden")

-/datum/gear/prescription
+/datum/gear/prescriptionsun
 	display_name = "sunglasses, presciption"
 	path = /obj/item/clothing/glasses/sunglasses/prescription
-	cost = 3
+	cost = 2
 	slot = slot_glasses

 // Mask
@@ -276,71 +319,184 @@ var/global/list/gear_datums = list()

 // Uniform slot

-/datum/gear/exec_suit
-	display_name = "executive suit"
-	path = /obj/item/clothing/under/suit_jacket/really_black
-	slot = slot_w_uniform
-	cost = 2
-
 /datum/gear/blazer_blue
 	display_name = "blazer, blue"
 	path = /obj/item/clothing/under/blazer
 	slot = slot_w_uniform
-	cost = 2
-
-/datum/gear/kilt
-	display_name = "kilt"
-	path = /obj/item/clothing/under/kilt
-	slot = slot_w_uniform
-	cost = 3
-
-/datum/gear/blackjumpskirt
-	display_name = "jumpskirt, black"
-	path = /obj/item/clothing/under/blackjumpskirt
-	slot = slot_w_uniform
-	cost = 2
-
-/datum/gear/skirt_blue
-	display_name = "plaid skirt, blue"
-	path = /obj/item/clothing/under/dress/plaid_blue
-	slot = slot_w_uniform
-	cost = 2
-
-/datum/gear/skirt_purple
-	display_name = "plaid skirt, purple"
-	path = /obj/item/clothing/under/dress/plaid_purple
-	slot = slot_w_uniform
-	cost = 2
-
-/datum/gear/skirt_red
-	display_name = "plaid skirt, red"
-	path = /obj/item/clothing/under/dress/plaid_red
-	slot = slot_w_uniform
-	cost = 2
-
-/datum/gear/skirt_black
-	display_name = "skirt, black"
-	path = /obj/item/clothing/under/blackskirt
-	slot = slot_w_uniform
-	cost = 2
-
-/datum/gear/sundress
-	display_name = "sundress"
-	path = /obj/item/clothing/under/sundress
-	slot = slot_w_uniform
-	cost = 3
-
-/datum/gear/sundress_white
-	display_name = "sundress, white"
-	path = /obj/item/clothing/under/sundress_white
-	slot = slot_w_uniform
-	cost = 3
+	cost = 1

 /datum/gear/cheongsam
 	display_name = "cheongsam, white"
 	path = /obj/item/clothing/under/cheongsam
 	slot = slot_w_uniform
-	cost = 3
+	cost = 1
+
+/datum/gear/kilt
+	display_name = "kilt"
+	path = /obj/item/clothing/under/kilt
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/blackjumpskirt
+	display_name = "jumpskirt, black"
+	path = /obj/item/clothing/under/blackjumpskirt
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/blackfjumpsuit
+	display_name = "jumpsuit, female-black"
+	path = /obj/item/clothing/under/color/blackf
+	slot = slot_w_uniform
+	cost = 1
+/datum/gear/blackfjumpsuit
+	display_name = "jumpsuit, rainbow"
+	path = /obj/item/clothing/under/rainbow
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/skirt_blue
+	display_name = "plaid skirt, blue"
+	path = /obj/item/clothing/under/dress/plaid_blue
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/skirt_purple
+	display_name = "plaid skirt, purple"
+	path = /obj/item/clothing/under/dress/plaid_purple
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/skirt_red
+	display_name = "plaid skirt, red"
+	path = /obj/item/clothing/under/dress/plaid_red
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/skirt_black
+	display_name = "skirt, black"
+	path = /obj/item/clothing/under/blackskirt
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/amishsuit
+	display_name = "suit, amish"
+	path = /obj/item/clothing/under/sl_suit
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/blacksuit
+	display_name = "suit, black"
+	path = /obj/item/clothing/under/suit_jacket
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/shinyblacksuit
+	display_name = "suit, shiny-black"
+	path = /obj/item/clothing/under/lawyer/black
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/bluesuit
+	display_name = "suit, blue"
+	path = /obj/item/clothing/under/lawyer/blue
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/burgundysuit
+	display_name = "suit, burgundy"
+	path = /obj/item/clothing/under/suit_jacket/burgundy
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/checkeredsuit
+	display_name = "suit, checkered"
+	path = /obj/item/clothing/under/suit_jacket/checkered
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/charcoalsuit
+	display_name = "suit, charcoal"
+	path = /obj/item/clothing/under/suit_jacket/charcoal
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/execsuit
+	display_name = "suit, executive"
+	path = /obj/item/clothing/under/suit_jacket/really_black
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/femaleexecsuit
+	display_name = "suit, female-executive"
+	path = /obj/item/clothing/under/suit_jacket/female
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/gentlesuit
+	display_name = "suit, gentlemen"
+	path = /obj/item/clothing/under/gentlesuit
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/navysuit
+	display_name = "suit, navy"
+	path = /obj/item/clothing/under/suit_jacket/navy
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/redsuit
+	display_name = "suit, red"
+	path = /obj/item/clothing/under/suit_jacket/red
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/redlawyer
+	display_name = "suit, lawyer-red"
+	path = /obj/item/clothing/under/lawyer/red
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/oldmansuit
+	display_name = "suit, old-man"
+	path = /obj/item/clothing/under/lawyer/oldman
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/purplesuit
+	display_name = "suit, purple"
+	path = /obj/item/clothing/under/lawyer/purpsuit
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/tansuit
+	display_name = "suit, tan"
+	path = /obj/item/clothing/under/suit_jacket/tan
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/whitesuit
+	display_name = "suit, white"
+	path = /obj/item/clothing/under/scratch
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/whitebluesuit
+	display_name = "suit, white-blue"
+	path = /obj/item/clothing/under/lawyer/bluesuit
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/sundress
+	display_name = "sundress"
+	path = /obj/item/clothing/under/sundress
+	slot = slot_w_uniform
+	cost = 1
+
+/datum/gear/sundress_white
+	display_name = "sundress, white"
+	path = /obj/item/clothing/under/sundress_white
+	slot = slot_w_uniform
+	cost = 1

 /datum/gear/uniform_captain
 	display_name = "uniform, captain's dress"
@@ -352,7 +508,7 @@ var/global/list/gear_datums = list()
 /datum/gear/corpsecsuit
 	display_name = "uniform, corporate (Security)"
 	path = /obj/item/clothing/under/rank/security/corp
-	cost = 2
+	cost = 1
 	slot = slot_w_uniform
 	allowed_roles = list("Security Officer","Head of Security","Warden")

@@ -373,7 +529,7 @@ var/global/list/gear_datums = list()
 /datum/gear/navysecsuit
 	display_name = "uniform, navyblue (Security)"
 	path = /obj/item/clothing/under/rank/security/navyblue
-	cost = 2
+	cost = 1
 	slot = slot_w_uniform
 	allowed_roles = list("Security Officer","Head of Security","Warden")

@@ -389,7 +545,7 @@ var/global/list/gear_datums = list()
 	display_name = "armband, EMT"
 	path = /obj/item/clothing/accessory/armband/medgreen
 	slot = slot_tie
-	cost = 2
+	cost = 1

 /datum/gear/armband_engineering
 	display_name = "armband, engineering"
@@ -425,21 +581,21 @@ var/global/list/gear_datums = list()
 	display_name = "holster, armpit"
 	path = /obj/item/clothing/accessory/holster/armpit
 	slot = slot_tie
-	cost = 2
+	cost = 1
 	allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")

 /datum/gear/hip
 	display_name = "holster, hip"
 	path = /obj/item/clothing/accessory/holster/hip
 	slot = slot_tie
-	cost = 2
+	cost = 1
 	allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Warden", "Head of Security", "Detective")

 /datum/gear/waist
 	display_name = "holster, waist"
 	path = /obj/item/clothing/accessory/holster/waist
 	slot = slot_tie
-	cost = 2
+	cost = 1
 	allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Warden", "Head of Security", "Detective")

 /datum/gear/tie_blue
@@ -464,14 +620,14 @@ var/global/list/gear_datums = list()
 	display_name = "webbing, engineering"
 	path = /obj/item/clothing/accessory/storage/brown_vest
 	slot = slot_tie
-	cost = 2
+	cost = 1
 	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer")

 /datum/gear/black_vest
 	display_name = "webbing, security"
 	path = /obj/item/clothing/accessory/storage/black_vest
 	slot = slot_tie
-	cost = 2
+	cost = 1
 	allowed_roles = list("Security Officer","Head of Security","Warden")

 /datum/gear/webbing
@@ -491,37 +647,37 @@ var/global/list/gear_datums = list()
 /datum/gear/bomber
 	display_name = "bomber jacket"
 	path = /obj/item/clothing/suit/storage/toggle/bomber
-	cost = 4
+	cost = 2
 	slot = slot_wear_suit

 /datum/gear/leather_jacket
 	display_name = "leather jacket, black"
 	path = /obj/item/clothing/suit/storage/leather_jacket
-	cost = 3
+	cost = 2
 	slot = slot_wear_suit

 /datum/gear/leather_jacket_nt
 	display_name = "leather jacket, NanoTrasen, black"
 	path = /obj/item/clothing/suit/storage/leather_jacket/nanotrasen
-	cost = 3
+	cost = 2
 	slot = slot_wear_suit

 /datum/gear/brown_jacket
 	display_name = "leather jacket, brown"
 	path = /obj/item/clothing/suit/storage/toggle/brown_jacket
-	cost = 3
+	cost = 2
 	slot = slot_wear_suit

 /datum/gear/brown_jacket_nt
 	display_name = "leather jacket, NanoTrasen, brown"
 	path = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
-	cost = 3
+	cost = 2
 	slot = slot_wear_suit

-/datum/gear/blue_lawyer_jacket
-	display_name = "suit jacket, blue"
-	path = /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
-	cost = 3
+/datum/gear/hazard_vest
+	display_name = "hazard vest"
+	path = /obj/item/clothing/suit/storage/hazardvest
+	cost = 2
 	slot = slot_wear_suit

 /datum/gear/hoodie
@@ -533,79 +689,122 @@ var/global/list/gear_datums = list()
 /datum/gear/hoodie/black
 	display_name = "hoodie, black"
 	path = /obj/item/clothing/suit/storage/toggle/hoodie/black
+	cost = 2

 /datum/gear/unathi_mantle
 	display_name = "hide mantle (Unathi)"
 	path = /obj/item/clothing/suit/unathi/mantle
-	cost = 2
+	cost = 1
 	slot = slot_wear_suit
 	whitelisted = "Unathi"

 /datum/gear/labcoat
 	display_name = "labcoat"
 	path = /obj/item/clothing/suit/storage/toggle/labcoat
-	cost = 3
+	cost = 2
+	slot = slot_wear_suit
+
+/datum/gear/bluelabcoat
+	display_name = "labcoat, blue"
+	path = /obj/item/clothing/suit/storage/toggle/labcoat/blue
+	cost = 2
+	slot = slot_wear_suit
+
+/datum/gear/greenlabcoat
+	display_name = "labcoat, green"
+	path = /obj/item/clothing/suit/storage/toggle/labcoat/green
+	cost = 2
+	slot = slot_wear_suit
+
+/datum/gear/orangelabcoat
+	display_name = "labcoat, orange"
+	path = /obj/item/clothing/suit/storage/toggle/labcoat/orange
+	cost = 2
+	slot = slot_wear_suit
+
+/datum/gear/purplelabcoat
+	display_name = "labcoat, purple"
+	path = /obj/item/clothing/suit/storage/toggle/labcoat/purple
+	cost = 2
+	slot = slot_wear_suit
+
+/datum/gear/redlabcoat
+	display_name = "labcoat, red"
+	path = /obj/item/clothing/suit/storage/toggle/labcoat/red
+	cost = 2
 	slot = slot_wear_suit

 /datum/gear/overalls
 	display_name = "overalls"
 	path = /obj/item/clothing/suit/apron/overalls
-	cost = 2
+	cost = 1
 	slot = slot_wear_suit

 /datum/gear/bponcho
 	display_name = "poncho, blue"
 	path = /obj/item/clothing/suit/poncho/blue
-	cost = 3
+	cost = 1
 	slot = slot_wear_suit

 /datum/gear/gponcho
 	display_name = "poncho, green"
 	path = /obj/item/clothing/suit/poncho/green
-	cost = 3
+	cost = 1
 	slot = slot_wear_suit

 /datum/gear/pponcho
 	display_name = "poncho, purple"
 	path = /obj/item/clothing/suit/poncho/purple
-	cost = 3
+	cost = 1
 	slot = slot_wear_suit

 /datum/gear/rponcho
 	display_name = "poncho, red"
 	path = /obj/item/clothing/suit/poncho/red
-	cost = 3
+	cost = 1
 	slot = slot_wear_suit

 /datum/gear/poncho
 	display_name = "poncho, tan"
 	path = /obj/item/clothing/suit/poncho
-	cost = 3
+	cost = 1
 	slot = slot_wear_suit

 /datum/gear/unathi_robe
 	display_name = "roughspun robe (Unathi)"
 	path = /obj/item/clothing/suit/unathi/robe
-	cost = 3
+	cost = 1
 	slot = slot_wear_suit
 //	whitelisted = "Unathi" // You don't have a monopoly on a robe!

+/datum/gear/blue_lawyer_jacket
+	display_name = "suit jacket, blue"
+	path = /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
+	cost = 2
+	slot = slot_wear_suit
+
+/datum/gear/purple_lawyer_jacket
+	display_name = "suit jacket, purple"
+	path = /obj/item/clothing/suit/storage/lawyer/purpjacket
+	cost = 2
+	slot = slot_wear_suit
+
 /datum/gear/suspenders
 	display_name = "suspenders"
 	path = /obj/item/clothing/suit/suspenders
-	cost = 2
+	cost = 1
 	slot = slot_wear_suit

 /datum/gear/wcoat
 	display_name = "waistcoat"
 	path = /obj/item/clothing/suit/wcoat
-	cost = 2
+	cost = 1
 	slot = slot_wear_suit

 /datum/gear/zhan_furs
 	display_name = "Zhan-Khazan furs (Tajaran)"
 	path = /obj/item/clothing/suit/tajaran/furs
-	cost = 3
+	cost = 1
 	slot = slot_wear_suit
 	whitelisted = "Tajara" // You do have a monopoly on a fur suit tho

@@ -620,7 +819,7 @@ var/global/list/gear_datums = list()
 /datum/gear/blue_gloves
 	display_name = "gloves, blue"
 	path = /obj/item/clothing/gloves/blue
-	cost = 1
+	cost = 2
 	slot = slot_gloves

 /datum/gear/brown_gloves
@@ -629,22 +828,53 @@ var/global/list/gear_datums = list()
 	cost = 2
 	slot = slot_gloves

+/datum/gear/light_brown_gloves
+	display_name = "gloves, light-brown"
+	path = /obj/item/clothing/gloves/light_brown
+	cost = 2
+	slot = slot_gloves
+
 /datum/gear/green_gloves
 	display_name = "gloves, green"
 	path = /obj/item/clothing/gloves/green
-	cost = 1
+	cost = 2
 	slot = slot_gloves

+/datum/gear/grey_gloves
+	display_name = "gloves, grey"
+	path = /obj/item/clothing/gloves/grey
+	cost = 2
+	slot = slot_gloves
+
+/datum/gear/latex_gloves
+	display_name = "gloves, latex"
+	path = /obj/item/clothing/gloves/latex
+	cost = 2
+	slot = slot_gloves
+
+
 /datum/gear/orange_gloves
 	display_name = "gloves, orange"
 	path = /obj/item/clothing/gloves/orange
-	cost = 1
+	cost = 2
+	slot = slot_gloves
+
+/datum/gear/purple_gloves
+	display_name = "gloves, purple"
+	path = /obj/item/clothing/gloves/purple
+	cost = 2
+	slot = slot_gloves
+
+/datum/gear/rainbow_gloves
+	display_name = "gloves, rainbow"
+	path = /obj/item/clothing/gloves/rainbow
+	cost = 2
 	slot = slot_gloves

 /datum/gear/red_gloves
 	display_name = "gloves, red"
 	path = /obj/item/clothing/gloves/red
-	cost = 1
+	cost = 2
 	slot = slot_gloves

 /datum/gear/white_gloves
@@ -658,13 +888,13 @@ var/global/list/gear_datums = list()
 /datum/gear/jackboots
 	display_name = "jackboots"
 	path = /obj/item/clothing/shoes/jackboots
-	cost = 2
+	cost = 1
 	slot = slot_shoes

 /datum/gear/toeless_jackboots
 	display_name = "toe-less jackboots"
-	path = /obj/item/clothing/shoes/jackboots/fluff/kecer_eldraran //permisson of owner of custom item was granted
-	cost = 2
+	path = /obj/item/clothing/shoes/jackboots/fluff/kecer_eldraran
+	cost = 1
 	slot = slot_shoes

 /datum/gear/sandal
@@ -727,6 +957,12 @@ var/global/list/gear_datums = list()
 	cost = 1
 	slot = slot_shoes

+/datum/gear/rainbow_shoes
+	display_name = "shoes, rainbow"
+	path = /obj/item/clothing/shoes/rainbow
+	cost = 1
+	slot = slot_shoes
+
 /datum/gear/red_shoes
 	display_name = "shoes, red"
 	path = /obj/item/clothing/shoes/red
@@ -807,7 +1043,7 @@ var/global/list/gear_datums = list()
 	display_name = "cane"
 	path = /obj/item/weapon/cane
 	sort_category = "misc"
-	cost = 2
+	cost = 1

 /datum/gear/dice
 	display_name = "d20"
@@ -821,6 +1057,17 @@ var/global/list/gear_datums = list()
 	sort_category = "misc"
 	cost = 1

+/datum/gear/flask
+	display_name = "flask"
+	path = /obj/item/weapon/reagent_containers/food/drinks/flask/barflask
+	sort_category = "misc"
+	cost = 1
+
+/datum/gear/vacflask
+	display_name = "vacuum-flask"
+	path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask
+	sort_category = "misc"
+	cost = 1
 /datum/gear/blipstick
 	display_name = "lipstick, black"
 	path = /obj/item/weapon/lipstick/black
@@ -845,17 +1092,35 @@ var/global/list/gear_datums = list()
 	sort_category = "misc"
 	cost = 1

+/datum/gear/smokingpipe
+	display_name = "pipe, smoking"
+	path = /obj/item/clothing/mask/smokable/pipe
+	sort_category = "misc"
+	cost = 1
+
+/datum/gear/cornpipe
+	display_name = "pipe, corn"
+	path = /obj/item/clothing/mask/smokable/pipe/cobpipe
+	sort_category = "misc"
+	cost = 1
+
 /datum/gear/matchbook
 	display_name = "matchbook"
 	path = /obj/item/weapon/storage/box/matches
 	sort_category = "misc"
-	cost = 2
+	cost = 1

 /datum/gear/comb
 	display_name = "purple comb"
 	path = /obj/item/weapon/haircomb
 	sort_category = "misc"
-	cost = 2
+	cost = 1
+
+/datum/gear/zippo
+	display_name = "zippo"
+	path = /obj/item/weapon/flame/lighter/zippo
+	sort_category = "misc"
+	cost = 1

 /*/datum/gear/combitool
 	display_name = "combi-tool"
@@ -864,30 +1129,36 @@ var/global/list/gear_datums = list()

 // Stuff worn on the ears. Items here go in the "ears" sort_category but they must not use
 // the slot_r_ear or slot_l_ear as the slot, or else players will spawn with no headset.
+/datum/gear/earmuffs
+	display_name = "earmuffs"
+	path = /obj/item/clothing/ears/earmuffs
+	cost = 1
+	sort_category = "ears"
+
 /datum/gear/skrell_chain
 	display_name = "skrell headtail-wear, female, chain"
 	path = /obj/item/clothing/ears/skrell/chain
-	cost = 2
+	cost = 1
 	sort_category = "ears"
 	whitelisted = "Skrell"

 /datum/gear/skrell_plate
 	display_name = "skrell headtail-wear, male, bands"
 	path = /obj/item/clothing/ears/skrell/band
-	cost = 2
+	cost = 1
 	sort_category = "ears"
 	whitelisted = "Skrell"

 /datum/gear/skrell_cloth_male
 	display_name = "skrell headtail-wear, male, cloth"
 	path = /obj/item/clothing/ears/skrell/cloth_male
-	cost = 2
+	cost = 1
 	sort_category = "ears"
 	whitelisted = "Skrell"

 /datum/gear/skrell_cloth_female
 	display_name = "skrell headtail-wear, female, cloth"
 	path = /obj/item/clothing/ears/skrell/cloth_female
-	cost = 2
+	cost = 1
 	sort_category = "ears"
 	whitelisted = "Skrell"