- Ported some stuff from baystation 12. Mostly sprites.

- Added pajama closets which contain 2 red and 2 blue pj's with 4 pairs of white shoes - for use in medbay and crew quarters. (pj sprites by baystation 12)
- Added the cart, plasma research, engineering and robotics vending machines from baystation 12 - Mostly for the sprites.
- Added science airlocks (sprites by baystation 12), made them work with our door construction / deconstruction mechanic. (those sprites are by me~)
- Added hazard doors, sprites by baystation 12. They're reskinned firedoors.
- Added two more styles of filing cabinets, all sprites from baystation 12.
- Changed the space law book's sprite to the one baystation 12 uses.
- Added a few floor sprites from baystation 12
- Added critter crates, sprites from baystation 12
- Added some surgery sprites from baystation 12
- Added plant sprites from baystation 12

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4229 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/closet.dm

@@ -294,6 +294,11 @@
 	icon_state = "white"
 	icon_closed = "white"
 
+/obj/structure/closet/wardrobe/pjs
+	name = "Pajama wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
 /obj/structure/closet/wardrobe/toxins_white
 	name = "toxins wardrobe"
 	icon_state = "white"
@@ -398,4 +403,11 @@
 	icon_off = "wall-lockeroff"
 
 	//too small to put a man in
-	large = 0
+	large = 0
+
+/obj/structure/closet/crate/critter
+	name = "critter crate"
+	desc = "A crate which can sustain life for a while."
+	icon_state = "critter"
+	icon_opened = "critteropen"
+	icon_closed = "critter"

code/defines/obj/vending.dm

@@ -121,6 +121,20 @@
 	product_hideamt = "5"
 	product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space."
 
+//This one's from bay12
+/obj/machinery/vending/cart
+	name = "PTech"
+	desc = "Cartridges for PDAs"
+	icon_state = "cart"
+	icon_deny = "cart-deny"
+	product_paths = "/obj/item/weapon/cartridge/medical;/obj/item/weapon/cartridge/engineering;/obj/item/weapon/cartridge/security;/obj/item/weapon/cartridge/janitor;/obj/item/weapon/cartridge/signal/toxins;/obj/item/device/pda/heads;/obj/item/weapon/cartridge/captain;/obj/item/weapon/cartridge/quartermaster"
+	product_amounts = "10;10;10;10;10;10;3;10"
+	product_slogans = "Carts to go!"
+	product_hidden = ""
+	product_hideamt = ""
+	product_coin = ""
+	product_coin_amt = ""
+
 /obj/machinery/vending/cigarette
 	name = "cigarette machine"
 	desc = "If you want to get cancer, might as well do it in style"
@@ -147,6 +161,17 @@
 	product_hideamt = "3;4;6"
 	product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
 
+//This one's from bay12
+/obj/machinery/vending/plasmaresearch
+	name = "Toximate 3000"
+	desc = "All the fine parts you need in one vending machine!"
+	product_paths = "/obj/item/clothing/under/rank/scientist;/obj/item/clothing/suit/bio_suit;/obj/item/clothing/head/bio_hood;/obj/item/device/transfer_valve;/obj/item/device/assembly/signaler;/obj/item/device/assembly/prox_sensor;/obj/item/device/assembly/igniter;/obj/item/device/assembly/timer"
+	product_amounts = "6;6;6;6;6"
+	product_hidden = ""
+	product_hideamt = ""
+	product_coin = ""
+	product_coin_amt = ""
+
 /obj/machinery/vending/wallmed1
 	name = "NanoMed"
 	desc = "Wall-mounted Medical Equipment dispenser."
@@ -271,3 +296,30 @@
 	product_coin = "/obj/item/weapon/storage/belt/utility"
 	product_coin_amt = "3"
 
+//This one's from bay12
+/obj/machinery/vending/engineering
+	name = "Robco Tool Maker"
+	desc = "Everything you need for do-it-yourself station repair."
+	icon_state = "engi"
+	icon_deny = "engi-deny"
+	req_access_txt = "10"
+	product_paths = "/obj/item/clothing/under/rank/chief_engineer;/obj/item/clothing/under/rank/engineer;/obj/item/clothing/shoes/orange;/obj/item/clothing/head/helmet/hardhat;/obj/item/weapon/storage/belt/utility;/obj/item/clothing/glasses/meson;/obj/item/clothing/gloves/yellow;/obj/item/weapon/screwdriver;/obj/item/weapon/crowbar;/obj/item/weapon/wirecutters;/obj/item/device/multitool;/obj/item/weapon/wrench;/obj/item/device/t_scanner;/obj/item/weapon/CableCoil/power;/obj/item/weapon/circuitry;/obj/item/weapon/cell;/obj/item/weapon/weldingtool;/obj/item/clothing/head/helmet/welding;/obj/item/weapon/light/tube;/obj/item/clothing/suit/fire;/obj/item/weapon/stock_parts/scanning_module;/obj/item/weapon/stock_parts/micro_laser;/obj/item/weapon/stock_parts/matter_bin;/obj/item/weapon/stock_parts/manipulator;/obj/item/weapon/stock_parts/console_screen"
+//	product_amounts = "4;4;4;4;4;4;4;12;12;12;12;12;12;8;4;8;8;8;10;4"
+	product_hidden = ""
+	product_hideamt = ""
+	product_coin = ""
+	product_coin_amt = ""
+
+//This one's from bay12
+/obj/machinery/vending/robotics
+	name = "Robotech Deluxe"
+	desc = "All the tools you need to create your own robot army."
+	icon_state = "robotics"
+	icon_deny = "robotics-deny"
+	req_access_txt = "29"
+	product_paths = "/obj/item/clothing/suit/storage/labcoat;/obj/item/clothing/under/rank/roboticist;/obj/item/weapon/cable_coil;/obj/item/device/flash;/obj/item/weapon/cell/high;/obj/item/device/assembly/prox_sensor;/obj/item/device/assembly/signaler;/obj/item/device/healthanalyzer;/obj/item/weapon/scalpel;/obj/item/weapon/circular_saw;/obj/item/weapon/tank/anesthetic;/obj/item/clothing/mask/medical;/obj/item/weapon/screwdriver;/obj/item/weapon/crowbar"
+	product_amounts = "4;4;4;4;12"
+	product_hidden = ""
+	product_hideamt = ""
+	product_coin = ""
+	product_coin_amt = ""

code/game/machinery/doors/airlock.dm

@@ -311,10 +311,22 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 	var/mineral = "sandstone"
 	doortype = 30
 
+/obj/machinery/door/airlock/science
+	name = "Airlock"
+	icon = 'icons/obj/doors/Doorsci.dmi'
+	doortype = 31
+
+/obj/machinery/door/airlock/glass_science
+	name = "Glass Airlocks"
+	icon = 'icons/obj/doors/Doorsciglass.dmi'
+	opacity = 0
+	doortype = 32
+	glass = 1
+
 /obj/machinery/door/airlock/highsecurity
 	name = "High Tech Security Airlock"
 	icon = 'icons/obj/doors/hightechsecurity.dmi'
-	doortype = 31
+	doortype = 33
 
 /*
 About the new airlock wires panel:
@@ -1160,7 +1172,9 @@ About the new airlock wires panel:
 					if(28) new/obj/structure/door_assembly/door_assembly_plasma( src.loc )
 					if(29) new/obj/structure/door_assembly/door_assembly_clown( src.loc )
 					if(30) new/obj/structure/door_assembly/door_assembly_sandstone( src.loc )
-					if(31) new/obj/structure/door_assembly/door_assembly_highsecurity(src.loc)
+					if(31) new/obj/structure/door_assembly/door_assembly_science( src.loc )
+					if(32) new/obj/structure/door_assembly/door_assembly_science/glass( src.loc )
+					if(33) new/obj/structure/door_assembly/door_assembly_highsecurity(src.loc)
 
 				var/obj/item/weapon/airlock_electronics/ae
 				if(!electronics)

code/game/machinery/doors/firedoor.dm

@@ -124,4 +124,8 @@
 		else
 			if(istype(source)) air_master.tiles_to_update += source
 			if(istype(destination)) air_master.tiles_to_update += destination
-		return 1
+		return 1
+
+/obj/machinery/door/firedoor/border_only/hazard
+	name = "hazard door"
+	icon = 'icons/obj/doors/DoorHazard.dmi'

code/game/objects/closets/wardrobe.dm

@@ -128,6 +128,17 @@
 	new /obj/item/clothing/shoes/white(src)
 	return
 
+/obj/structure/closet/wardrobe/pjs/New()
+	new /obj/item/clothing/under/pj/red(src)
+	new /obj/item/clothing/under/pj/red(src)
+	new /obj/item/clothing/under/pj/blue(src)
+	new /obj/item/clothing/under/pj/blue(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	return
+
 /obj/structure/closet/wardrobe/toxins_white/New()
 	new /obj/item/clothing/under/rank/scientist(src)
 	new /obj/item/clothing/under/rank/scientist(src)

code/game/objects/door_assembly.dm

@@ -116,6 +116,21 @@ obj/structure/door_assembly
 			glass = 1
 			icon_state = "door_as_gres1"
 
+	door_assembly_science
+		name = "Science Airlock Assembly"
+		icon_state = "door_as_sci1"
+		glass_base_icon_state = "door_as_gsci"
+		glass_type = /obj/machinery/door/airlock/glass_science
+		airlock_type = /obj/machinery/door/airlock/science
+		anchored = 1
+		density = 1
+		state = 1
+		glass = 0
+
+		glass
+			glass = 1
+			icon_state = "door_as_gsci1"
+
 	door_assembly_med
 		name = "Medical Airlock Assembly"
 		icon_state = "door_as_med1"

code/modules/clothing/under/color.dm

@@ -139,4 +139,4 @@
 	name = "darkred"
 	desc = "darkred"
 	icon_state = "darkred"
-	color = "darkred"
+	color = "darkred"

code/modules/clothing/under/medical.dm

@@ -59,4 +59,20 @@
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
 	icon_state = "scrubspurple"
-	color = "scrubspurple"
+	color = "scrubspurple"
+
+//pj's
+
+/obj/item/clothing/under/pj/red
+	name = "red pj's"
+	desc = "Sleepwear."
+	icon_state = "red_pyjamas"
+	color = "red_pyjamas"
+	item_state = "w_suit"
+
+/obj/item/clothing/under/pj/blue
+	name = "blue pj's"
+	desc = "Sleepwear."
+	icon_state = "blue_pyjamas"
+	color = "blue_pyjamas"
+	item_state = "w_suit"

code/modules/paperwork/filingcabinet.dm

@@ -3,19 +3,32 @@
 	desc = "A large cabinet with drawers."
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "filing_cabinet0"
+	var/icon_closed = "filing_cabinet0"
+	var/icon_open = "filing_cabinet1"
 	density = 1
 	anchored = 1
 	var/list/items = new/list()
 
+/obj/structure/filingcabinet/chestdrawer
+	name = "chest drawer"
+	icon_state = "chestdrawer"
+	icon_closed = "chestdrawer"
+	icon_open = "chestdrawer-open"
+
+/obj/structure/filingcabinet/filingcabinet
+	icon_state = "filingcabinet"
+	icon_closed = "filingcabinet"
+	icon_open = "filingcabinet-open"
+
 /obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob)
 	if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder))
 		user << "You put the [P] in the [name]."
 		user.drop_item()
 		P.loc = src
 		spawn()
-			icon_state = "filing_cabinet1"
+			icon_state = icon_open
 			sleep(5)
-			icon_state = "filing_cabinet0"
+			icon_state = icon_closed
 	else if(istype(P, /obj/item/weapon/wrench))
 		playsound(loc, 'Ratchet.ogg', 50, 1)
 		anchored = !anchored
@@ -50,8 +63,8 @@
 			else
 				P.loc = get_turf_loc(src)
 
-			icon_state = "filing_cabinet1"
+			icon_state = icon_open
 			sleep(5)
-			icon_state = "filing_cabinet0"
+			icon_state = icon_closed
 
 

html/changelog.html

@@ -36,7 +36,7 @@
 			<font size='2'><b>Coders:</b> TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor, Polymorph, Carn, Nodrak, Donkie, Sieve, Giacom<br></font>
 			<font size='2'><b>Spriters:</b> Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat, Kor, Ricotez, Ausops, TankNut<br></font>
 			<font size='2'><b>Sounds:</b> Skie, Lasty/Vinyl<br></font>
-			<font size='2'><b>Thanks to:</b> CDK Station devs, GoonStation devs, the original SpaceStation developers and Invisty for the title image</font>
+			<font size='2'><b>Thanks to:</b> Baystation 12, CDK Station devs, GoonStation devs, the original SpaceStation developers and Invisty for the title image</font>
 		</td>
 	</tr>
 </table>