Adds objects: office chairs, feathery pen, glass and normal research airlocks, showers, styrofoam cups. Adds clothes: Fez, cheerleader outfits, captain mal uniform, hazmat suits, wedding dress, AI bliss icon. New icons for captain, head of security, security, and warden's lockers.

code/defines/obj.dm

@@ -799,6 +799,13 @@
 /obj/structure/stool/bed/chair/comfy/lime
 	icon_state = "comfychair_lime"
 
+
+/obj/structure/stool/bed/chair/office/light
+	icon_state = "officechair_white"
+
+/obj/structure/stool/bed/chair/office/dark
+	icon_state = "officechair_dark"
+
 /obj/structure/table
 	name = "table"
 	desc = "A square piece of metal standing on four metal legs. It can not move."
@@ -1500,3 +1507,12 @@
 	var/var3 = null
 	var/var4 = null
 	var/var5 = null
+
+/obj/item/rubberduck
+	name = "rubber duck"
+	desc = "A rubber duck. Quack."
+	icon = 'objects.dmi'
+	icon_state = "rduck"
+	item_state = "rduck"
+	flags = FPRINT
+	w_class = 1.0

code/defines/obj/weapon.dm

@@ -1010,6 +1010,11 @@
 	desc = "It's a cool looking pen. Lots of colors!"
 	name = "multicolor pen"
 
+/obj/item/weapon/pen/feather
+	name = "feathery pen"
+	desc = "A gold pen disguised as a quill. How quaint."
+	icon_state = "featherpen"
+
 /obj/item/weapon/banhammer
 	desc = "A banhammer"
 	name = "banhammer"

code/game/machinery/doors/airlock.dm

@@ -194,6 +194,10 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 			doortype = 17
 			glass = 1
 
+		glass_research
+			name = "Research Airlock"
+			icon = 'doorsciglass.dmi'
+			doortype = 20
 
 	centcom
 		name = "Airlock"
@@ -250,6 +254,11 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 		doortype = 19
 
 
+	research
+		name = "Research Airlock"
+		icon = 'doorsci.dmi'
+		doortype = 21
+
 	New()
 		..()
 		if (src.closeOtherId != null)

code/game/machinery/sink.dm

@@ -132,7 +132,8 @@
 
 	shower
 		name = "Shower"
-		desc = "This is dumb."
+		desc = "This is a shower. Useful for cleaning."
+		icon_state = "shower"
 
 	kitchen
 		name = "Kitchen Sink"

code/game/objects/closets/secure/security.dm

@@ -1,7 +1,12 @@
 /obj/structure/closet/secure_closet/captains
 	name = "Captain's Closet"
 	req_access = list(access_captain)
-
+	icon_state = "capsecure1"
+	icon_closed = "capsecure"
+	icon_locked = "capsecure1"
+	icon_opened = "capsecureopen"
+	icon_broken = "capsecurebroken"
+	icon_off = "capsecureoff"
 
 	New()
 		..()
@@ -25,7 +30,12 @@
 /obj/structure/closet/secure_closet/hop
 	name = "Head of Personnel"
 	req_access = list(access_hop)
-
+	icon_state = "capsecure1"
+	icon_closed = "capsecure"
+	icon_locked = "capsecure1"
+	icon_opened = "capsecureopen"
+	icon_broken = "capsecurebroken"
+	icon_off = "capsecureoff"
 
 	New()
 		..()
@@ -48,6 +58,12 @@
 /obj/structure/closet/secure_closet/hos
 	name = "Head Of Security"
 	req_access = list(access_hos)
+	icon_state = "hossecure1"
+	icon_closed = "hossecure"
+	icon_locked = "hossecure1"
+	icon_opened = "hossecureopen"
+	icon_broken = "hossecurebroken"
+	icon_off = "hossecureoff"
 
 	New()
 		..()
@@ -69,6 +85,12 @@
 /obj/structure/closet/secure_closet/warden
 	name = "Warden's Locker"
 	req_access = list(access_armory)
+	icon_state = "hossecure1"
+	icon_closed = "hossecure"
+	icon_locked = "hossecure1"
+	icon_opened = "hossecureopen"
+	icon_broken = "hossecurebroken"
+	icon_off = "hossecureoff"
 
 	New()
 		..()
@@ -91,6 +113,12 @@
 /obj/structure/closet/secure_closet/security
 	name = "Security Locker"
 	req_access = list(access_security)
+	icon_state = "sec1"
+	icon_closed = "sec"
+	icon_locked = "sec1"
+	icon_opened = "secopen"
+	icon_broken = "secbroken"
+	icon_off = "secoff"
 
 	New()
 		..()

code/modules/chemical/Chemistry-Tools.dm

@@ -3585,3 +3585,126 @@
 			name = "empty jar"
 			desc = "A jar. You're not sure what it's supposed to hold."
 			return
+
+//////////////////
+//STYROFOAM CUPS//
+//////////////////
+/obj/item/weapon/reagent_containers/food/drinks/styrofoamcup
+	name = "styrofoam cup"
+	desc = "Cups for drinking."
+	icon_state = "styrocup-empty"
+	amount_per_transfer_from_this = 10
+	volume = 50
+
+	on_reagent_change()
+		if (reagents.reagent_list.len > 0)
+			switch(reagents.get_master_reagent_id())
+				if("water")
+					icon_state = "styrocup-clear"
+				else
+					icon_state ="styrocup-brown"
+		else
+			icon_state = "styrocup-empty"
+			return
+
+/*/obj/item/weapon/reagent_containers/food/drinks/styrofoamcuppile
+	name = "Styrofoam Cup Pile"
+	//desc = "A pile of styrofoam cups."
+	icon_state = "styrocup-stack6"
+	item_state = "styrocup-stack6"
+	w_class = 1
+	throwforce = 1
+	var/cupcount = 6
+	flags = TABLEPASS
+
+/obj/item/weapon/reagent_containers/food/drinks/styrofoamcuppile/update_icon()
+	src.icon_state = text("styrocup-stack[]", src.cupcount)
+	src.desc = text("There are [] cups left!", src.cupcount)
+	return
+
+/obj/item/weapon/reagent_containers/food/drinks/styrofoamcuppile/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (istype(W, /obj/item/weapon/reagent_containers/food/drinks/styrofoamcup) && (cupcount < 6))
+		user.drop_item()
+		W.loc = src
+		usr << "You place a cup back onto the pile."
+		if (src.cupcount < 6)
+			src.cupcount++
+	src.update()
+	return
+
+
+/obj/item/weapon/reagent_containers/food/drinks/styrofoamcuppile/proc/update()
+	src.icon_state = text("styrocup-stack[]", src.cupcount)
+	return
+
+/obj/item/weapon/reagent_containers/food/drinks/styrofoamcuppile/MouseDrop(mob/user as mob)
+	if ((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr))))))
+		if(ishuman(user))
+			if (usr.hand)
+				if (!( usr.l_hand ))
+					spawn( 0 )
+						src.attack_hand(usr, 1, 1)
+						return
+			else
+				if (!( usr.r_hand ))
+					spawn( 0 )
+						src.attack_hand(usr, 0, 1)
+						return
+	return
+
+/obj/item/weapon/reagent_containers/food/drinks/styrofoamcuppile/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/item/weapon/reagent_containers/food/drinks/styrofoamcuppile/attack_hand(mob/user as mob, unused, flag)
+	if (flag)
+		return ..()
+	src.add_fingerprint(user)
+	if (locate(/obj/item/weapon/reagent_containers/food/drinks/styrofoamcup, src))
+		for(var/obj/item/weapon/reagent_containers/food/drinks/styrofoamcup/P in src)
+			if (!usr.l_hand)
+				P.loc = usr
+				P.layer = 20
+				usr.l_hand = P
+				usr.update_clothing()
+				usr << "You take a cup from the pile."
+				break
+			else if (!usr.r_hand)
+				P.loc = usr
+				P.layer = 20
+				usr.r_hand = P
+				usr.update_clothing()
+				usr << "You take a cup from the pile."
+				break
+	else
+		if (src.cupcount >= 1)
+			src.cupcount--
+			var/obj/item/weapon/reagent_containers/food/drinks/styrofoamcup/D = new /obj/item/weapon/reagent_containers/food/drinks/styrofoamcup
+			D.loc = usr.loc
+			if(ishuman(usr))
+				if(!usr.get_active_hand())
+					usr.put_in_hand(D)
+					usr << "You take a cup from the pile."
+			else
+				D.loc = get_turf_loc(src)
+				usr << "You take a cup from the pile."
+
+	src.update()
+	return
+
+/obj/item/weapon/reagent_containers/food/drinks/styrofoamcuppile/examine()
+	set src in oview(1)
+
+	src.cupcount = round(src.cupcount)
+	var/n = src.cupcount
+	for(var/obj/item/weapon/reagent_containers/food/drinks/styrofoamcup/P in src)
+		n++
+	if (n <= 0)
+		n = 0
+		usr << "There are no cups left on this pile."
+	else
+		if (n == 1)
+			usr << "There is one cup left on this pile."
+		else
+			usr << text("There are [] cups on this pile.", n)
+	return
+*/

code/modules/clothing/gimmick.dm

@@ -551,40 +551,47 @@ obj/item/clothing/suit/justice
 //stylish new hats
 
 /obj/item/clothing/head/bowlerhat
-	name = "Bowler hat"
+	name = "\improper Bowler hat"
 	icon_state = "bowler_hat"
 	item_state = "bowler_hat"
 	desc = "For the gentleman of distinction."
 	flags = FPRINT|TABLEPASS
 
 /obj/item/clothing/head/beaverhat
-	name = "Beaver hat"
+	name = "\improper Beaver hat"
 	icon_state = "beaver_hat"
 	item_state = "beaver_hat"
 	desc = "Soft felt make this hat both comfortable and elegant."
 	flags = FPRINT|TABLEPASS
 
 /obj/item/clothing/head/boaterhat
-	name = "Boater hat"
+	name = "\improper Boater hat"
 	icon_state = "boater_hat"
 	item_state = "boater_hat"
 	desc = "The ultimate in summer fashion."
 	flags = FPRINT|TABLEPASS
 
 /obj/item/clothing/head/fedora
-	name = "Fedora"
+	name = "\improper Fedora"
 	icon_state = "fedora"
 	item_state = "fedora"
 	desc = "A sharp, stylish hat."
 	flags = FPRINT|TABLEPASS
 
 /obj/item/clothing/head/feathertrilby
-	name = "Feather trilby"
+	name = "\improper Feather trilby"
 	icon_state = "feather_trilby"
 	item_state = "feather_trilby"
 	desc = "A sharp, stylish hat with a feather."
 	flags = FPRINT|TABLEPASS
 
+/obj/item/clothing/head/fez
+	name = "\improper Fez"
+	icon_state = "fez"
+	item_state = "fez"
+	desc = "You should wear a Fez. Fezzes are cool."
+	flags = FPRINT|TABLEPASS
+
 //pyjamas
 
 /obj/item/clothing/under/bluepyjamas

code/modules/clothing/jumpsuit.dm

@@ -543,4 +543,34 @@
 	name = "Rolled Down Jumpsuit"
 	icon_state = "jumpsuitdown"
 	item_state = "jumpsuitdown"
-	color = "jumpsuitdown"
+	color = "jumpsuitdown"
+
+// Cheerleader outfits or something
+/obj/item/clothing/under/cheerleader
+	name = "cheerleader uniform"
+	desc = "Looks breezy."
+	icon = 'uniforms.dmi'
+	icon_state = "purple_cheer"
+	color = "purple_cheer"
+	flags = FPRINT | TABLEPASS
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
+/obj/item/clothing/under/cheerleader/purple
+	icon_state = "purple_cheer"
+	color = "purple_cheer"
+
+/obj/item/clothing/under/cheerleader/yellow
+	icon_state = "yellow_cheer"
+	color = "yellow_cheer"
+
+/obj/item/clothing/under/cheerleader/white
+	icon_state = "white_cheer"
+	color = "white_cheer"
+//End of cheerleaders
+
+/obj/item/clothing/under/captainmal
+	name = "Red Captain's Jumpsuit"
+	desc = "We have done the impossible, and that makes us mighty."
+	icon_state = "captainmal"
+	item_state = "captainmal"
+	color = "captainmal"

code/modules/clothing/shoes.dm

@@ -156,7 +156,30 @@
 
 /obj/item/clothing/shoes/jackboots
 	name = "Jackboots"
-	desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
+	desc = "NanoTrasen standard issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
 	icon_state = "jackboots"
 	item_state = "jackboots"
-	color = "hosred"
+	color = "hosred"
+
+/obj/item/clothing/shoes/purpleboots
+	name = "Purple boots"
+	desc = "A pair of flashy purple boots."
+	icon_state = "purpleboots"
+	item_state = "purpleboots"
+
+/obj/item/clothing/shoes/yellowboots
+	name = "Yellow boots"
+	desc = "A pair of flashy yellow boots."
+	icon_state = "yellowboots"
+	item_state = "yellowboots"
+
+/obj/item/clothing/shoes/whiteboots
+	name = "White boots"
+	desc = "A pair of flashy white boots."
+	icon_state = "whiteboots"
+	item_state = "whiteboots"
+
+/obj/item/clothing/shoes/fullbrown
+	name = "Full Brown Shoes"
+	icon_state = "fullbrown"
+	color = "fullbrown"

code/modules/clothing/suits/bio.dm

@@ -68,3 +68,57 @@
 	desc = "It protected doctors from the Black Death, back then. You bet your arse it's gonna help you against viruses."
 	icon_state = "plaguedoctor"
 	item_state = "bio_suit"
+
+
+/obj/item/clothing/head/bio_hood/hazmat_white
+	icon_state = "hazmat_white"
+	item_state = "hazhat_white"
+
+/obj/item/clothing/suit/bio_suit/hazmat_white
+	icon_state = "hazmat_white"
+	item_state = "hazsuit_white"
+
+
+/obj/item/clothing/head/bio_hood/hazmat_janitor
+	icon_state = "hazmat_janitor"
+	item_state = "hazhat_janitor"
+
+/obj/item/clothing/suit/bio_suit/hazmat_janitor
+	icon_state = "hazmat_janitor"
+	item_state = "hazsuit_janitor"
+
+
+/obj/item/clothing/head/bio_hood/hazmat_green
+	icon_state = "hazmat_green"
+	item_state = "hazhat_green"
+
+/obj/item/clothing/suit/bio_suit/hazmat_green
+	icon_state = "hazmat_green"
+	item_state = "hazsuit_green"
+
+
+/obj/item/clothing/head/bio_hood/hazmat_yellow
+	icon_state = "hazmat_yellow"
+	item_state = "hazhat_yellow"
+
+/obj/item/clothing/suit/bio_suit/hazmat_yellow
+	icon_state = "hazmat_yellow"
+	item_state = "hazsuit_yellow"
+
+
+/obj/item/clothing/head/bio_hood/hazmat_orange
+	icon_state = "hazmat_orange"
+	item_state = "hazhat_orange"
+
+/obj/item/clothing/suit/bio_suit/hazmat_orange
+	icon_state = "hazmat_orange"
+	item_state = "hazsuit_orange"
+
+
+/obj/item/clothing/head/bio_hood/hazmat_firered
+	icon_state = "hazmat_firered"
+	item_state = "hazhat_firered"
+
+/obj/item/clothing/suit/bio_suit/hazmat_firered
+	icon_state = "hazmat_firered"
+	item_state = "hazsuit_firered"

code/modules/clothing/suits/miscellaneous.dm

@@ -138,3 +138,11 @@
 	icon_state = "patientgown"
 	item_state = "patientgown"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
+
+/obj/item/clothing/suit/weddingdress
+	name = "wedding dress"
+	desc = "Here comes the bride."
+	icon_state = "weddingdress"
+	item_state = "weddingdress"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
+	flags_inv = HIDESHOES

code/modules/mob/living/silicon/ai/ai.dm

@@ -126,7 +126,7 @@
 
 		//if(icon_state == initial(icon_state))
 	var/icontype = ""
-	var/list/icons = list("Blue", "HAL9000", "Monochrome", "Rainbow", "HAL9000 Mark2", "Inverted", "Firewall", "Green", "Text", "Smiley", "Angry", "Dorf", "Matrix")
+	var/list/icons = list("Blue", "HAL9000", "Monochrome", "Rainbow", "HAL9000 Mark2", "Inverted", "Firewall", "Green", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss")
 	if (src.name == "B.A.N.N.E.D." && src.ckey == "spaceman96")
 		icons += "B.A.N.N.E.D."
 	icontype = input("Please, select a display!", "AI", null/*, null*/) in icons
@@ -156,6 +156,8 @@
 		icon_state = "ai-angryface"
 	else if(icontype == "Dorf")
 		icon_state = "ai-dorf"
+	else if(icontype == "Bliss")
+		icon_state = "ai-bliss"
 	else if(icontype == "B.A.N.N.E.D.")
 		icon_state = "ai-banned"
 	else//(icontype == "Matrix")