diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm index b31b72fa50..b3f595ffe5 100644 --- a/code/defines/obj/closet.dm +++ b/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 \ No newline at end of file + 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" \ No newline at end of file diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index b8f00f6fd1..4b5eff6b79 100644 --- a/code/defines/obj/vending.dm +++ b/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 = "" diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 9a5bdfdfaf..5b44089379 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/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) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 6b0d801c1a..75098d8896 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/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 \ No newline at end of file + return 1 + +/obj/machinery/door/firedoor/border_only/hazard + name = "hazard door" + icon = 'icons/obj/doors/DoorHazard.dmi' \ No newline at end of file diff --git a/code/game/objects/closets/wardrobe.dm b/code/game/objects/closets/wardrobe.dm index f03b81201d..b10a1e5ab5 100644 --- a/code/game/objects/closets/wardrobe.dm +++ b/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) diff --git a/code/game/objects/door_assembly.dm b/code/game/objects/door_assembly.dm index e08ed5b710..23f59a082f 100644 --- a/code/game/objects/door_assembly.dm +++ b/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" diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 27e3eaaca7..8afe03e6bf 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -139,4 +139,4 @@ name = "darkred" desc = "darkred" icon_state = "darkred" - color = "darkred" \ No newline at end of file + color = "darkred" diff --git a/code/modules/clothing/under/medical.dm b/code/modules/clothing/under/medical.dm index bfe7eccb02..d6c26ab224 100644 --- a/code/modules/clothing/under/medical.dm +++ b/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" \ No newline at end of file + 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" \ No newline at end of file diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index ab2d507451..29f782cb83 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/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 diff --git a/html/changelog.html b/html/changelog.html index 7b899b867c..4c9c585ca7 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -36,7 +36,7 @@ Coders: 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
 Spriters: Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat, Kor, Ricotez, Ausops, TankNut
 Sounds: Skie, Lasty/Vinyl
 - Thanks to: CDK Station devs, GoonStation devs, the original SpaceStation developers and Invisty for the title image + Thanks to: Baystation 12, CDK Station devs, GoonStation devs, the original SpaceStation developers and Invisty for the title image diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index dd88c31b24..cb82cbefd1 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 0bd0782923..bf632f8291 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 6ea70f4fe1..6a9a57d0c0 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/doors/DoorHazard.dmi b/icons/obj/doors/DoorHazard.dmi new file mode 100644 index 0000000000..f828889ba2 Binary files /dev/null and b/icons/obj/doors/DoorHazard.dmi differ diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi index 55c7230686..fce3344be3 100644 Binary files a/icons/obj/doors/door_assembly.dmi and b/icons/obj/doors/door_assembly.dmi differ diff --git a/icons/obj/doors/doorsci.dmi b/icons/obj/doors/doorsci.dmi new file mode 100644 index 0000000000..679ee78566 Binary files /dev/null and b/icons/obj/doors/doorsci.dmi differ diff --git a/icons/obj/doors/doorsciglass.dmi b/icons/obj/doors/doorsciglass.dmi new file mode 100644 index 0000000000..faac0c1994 Binary files /dev/null and b/icons/obj/doors/doorsciglass.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 1fbf68d176..2ec341b282 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ diff --git a/icons/obj/plants.dmi b/icons/obj/plants.dmi new file mode 100644 index 0000000000..dd3fa2b2c7 Binary files /dev/null and b/icons/obj/plants.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 3ae005c82a..4009b683b7 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index 74cd775ecc..9c3c9294e2 100644 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index adeb5373ef..64c0e50d99 100644 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 7e53558f6d..bedf33e3cf 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ