Merge pull request #25 from Aurorastation/development

Code Catchup

code/game/machinery/vending.dm

@@ -797,7 +797,7 @@
 	icon_state = "cigs"
 	products = list(/obj/item/weapon/storage/fancy/cigarettes = 10,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4)
 	contraband = list(/obj/item/weapon/lighter/zippo = 4)
-	premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2)
+	premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2,  /obj/item/weapon/storage/fancy/cigars = 4)
 	prices = list(/obj/item/weapon/storage/fancy/cigarettes = 15,/obj/item/weapon/storage/box/matches = 1,/obj/item/weapon/lighter/random = 2)
 
 

code/game/objects/items/weapons/storage/fancy.dm

@@ -204,6 +204,47 @@
 	icon_state = "Dpacket"
 	item_state = "Dpacket"
 
+/*
+ * Cigar Cases
+ */
+
+/obj/item/weapon/storage/fancy/cigars  //Complications here making it a subtype of cigarette packets, simpler to make a new type.
+	name = "\improper Cigar Case"
+	desc = "A thin, wooden case containing a selection of fine cigars, fit for a gentleman."
+	icon = 'icons/obj/cigarettes.dmi'
+	icon_state = "cigarcase"
+	item_state = "cigpacket"
+	w_class = 3
+	throwforce = 3
+	flags = TABLEPASS
+	storage_slots = 6
+	can_hold = list("/obj/item/clothing/mask/cigarette",
+					"/obj/item/weapon/lighter",
+					"/obj/item/weapon/reagent_containers/pill")
+	icon_type = "cigar"
+
+
+/obj/item/weapon/storage/fancy/cigars/New()
+	..()
+	flags |= NOREACT
+	for(var/i = 1 to storage_slots)
+		new /obj/item/clothing/mask/cigarette/cigar/(src)
+	create_reagents(15 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one
+
+/obj/item/weapon/storage/fancy/cigars/Del()
+	del(reagents)
+	..()
+
+
+/obj/item/weapon/storage/fancy/cigars/update_icon()
+	icon_state = "[initial(icon_state)][contents.len]"
+	return
+
+/obj/item/weapon/storage/fancy/cigars/remove_from_storage(obj/item/W as obj, atom/new_location)
+		var/obj/item/clothing/mask/cigarette/cigar/C = W
+		if(!istype(C)) return // what
+		reagents.trans_to(C, (reagents.total_volume/contents.len))
+
 
 /*
  * Vial Box

code/modules/client/preferences_gear.dm

@@ -476,6 +476,12 @@ proc/populate_gear_list()
 	cost = 3
 	allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Head of Security", "Warden")
 
+/datum/gear/waist
+	display_name = "waist holster"
+	path = /obj/item/clothing/tie/holster/waist
+	cost = 3
+	allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Head of Security", "Warden")
+
 
 /datum/gear/normal_beret
 	display_name = "beret"
@@ -489,6 +495,43 @@ proc/populate_gear_list()
 //	slot = slot_head
 	allowed_roles = list("Security Officer","Head of Security","Warden")
 
+/datum/gear/formal_uni
+	display_name = "formal officer's uniform"
+	path = /obj/item/clothing/under/rank/security/formal
+	cost = 1
+	allowed_roles = list("Security Officer")
+
+/datum/gear/formal_cap
+	display_name = "officer's formal cap"
+	path = /obj/item/clothing/head/helmet/secfcap
+	cost = 1
+	allowed_roles = list("Security Officer","Head of Security","Warden")
+
+/datum/gear/formal_uniw
+	display_name = "formal warden's uniform"
+	path = /obj/item/clothing/under/rank/warden/formal
+	cost = 1
+	allowed_roles = list("Warden")
+
+/datum/gear/formal_jacketw
+	display_name = "formal warden's jacket"
+	path = /obj/item/clothing/suit/armor/vest/warden/jacket
+	cost = 2
+	allowed_roles = list("Warden")
+
+/datum/gear/formal_unihos
+	display_name = "formal Head of Security's uniform"
+	path = /obj/item/clothing/under/rank/head_of_security/formal
+	cost = 1
+	allowed_roles = list("Head of Security")
+
+/datum/gear/formal_jackethos
+	display_name = "formal Head of Security's jacket"
+	path = /obj/item/clothing/suit/armor/hos/formal
+	cost = 2
+	allowed_roles = list("Head of Security")
+
+
 //Engineering
 /datum/gear/eng_beret
 	display_name = "engineering beret"
@@ -549,3 +592,8 @@ proc/populate_gear_list()
 	cost = 2
 //	slot = slot_wear_suit
 	whitelisted = "Unathi"
+
+/datum/gear/cigar_case
+	display_name = "cigar case"
+	path = /obj/item/weapon/storage/fancy/cigars
+	cost = 3

code/modules/customitems/item_defines.dm

@@ -995,4 +995,27 @@ obj/structure/stool/bed/chair/wheelchair/fluff/kit/handle_rotation()
 		if(3)
 			ink = 1
 			colour = "black"
-			user << "<span class='notice'>You cycle the pen to use the black ink cartridge.</span>"
+			user << "<span class='notice'>You cycle the pen to use the black ink cartridge.</span>"
+
+/obj/structure/sign/shaw_degree //Xenonuerology Doctorate - Alexis Shaw - Tenenza
+	name = "\improper Xenonuerology degree"//Description trimmed down, summarized.
+	desc = "Certification for a doctorate in Xenonuerology, made out to Alexis Shaw by the St. Grahelm University of Beisel, authenticated by watermarking."
+	icon_state = "shaw_degree"
+
+
+/obj/item/clothing/suit/storage/fluff/dalton_coat //Black Overcoat - Robert Dalton - Valkrae
+	name = "black overcoat"
+	desc = " A black overcoat. It seems worn, and well-made. The coat smells of tobacco and smoke."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "dalton_coat"
+	item_state = "dalton_coat"
+
+
+/obj/item/clothing/suit/storage/rohitin_jacket //CSI Jacket - Ana Ro'hi'tin - SueTheCake
+	name = "CSI jacket"
+	desc = " A black jacket with the words 'CSI' printed in the back in bright, white letters."
+	icon_state = "rohitinjacket"
+	item_state = "rohitinjacket"
+	blood_overlay_type = "armor"
+	allowed = list(/obj/item/stack/medical, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/syringe, \
+	/obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen)