Merge github.com:Baystation12/Baystation12

2026-01-05 23:13:06 +00:00 · 2012-12-02 13:36:10 +01:00
parent e11bab8ed7 e531751a9c
commit bce8c4cfee
13 changed files with 495 additions and 338 deletions
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -26,6 +26,12 @@ obj/machinery/atmospherics/binary/pump
 	var/id = null
 	var/datum/radio_frequency/radio_connection

+	highcap
+		name = "High capacity gas pump"
+		desc = "A high capacity pump"
+
+		target_pressure = 15000000
+
 	on
 		on = 1
 		icon_state = "intact_on"
--- a/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm
@@ -1,14 +1,61 @@

-/area/engine/cooling
+//reactor areas

-/area/engine/port_gyro_bay
+/area/engine
+	fore
+		name = "\improper Fore"

-/area/engine/starboard_gyro_bay
+	construction_storage
+		name = "\improper Construction storage"

-/area/engine/generators
+	locker
+		name = "\improper Locker room"

-/area/engine/turbine_control
+	atmos_storage
+		name = "\improper Atmos storage"

-/area/engine/reactor_core
+	control
+		name = "\improper Control"

-/area/engine/aux_control
+	electrical_storage
+		name = "\improper Electrical storage"
+
+	reactor_core
+		name = "\improper Reactor Core"
+		icon_state = "engine_core"
+
+	reactor_gas
+		name = "Reactor Gas Storage"
+		icon_state = "engine_atmos"
+
+	aux_control
+		name = "Reactor Auxiliary Control"
+		icon_state = "engine_aux"
+
+	turbine_control
+		name = "Turbine Control"
+		icon_state = "engine_turbine"
+
+	reactor_airlock
+		name = "\improper Reactor Primary Entrance"
+		icon_state = "engine_airlock"
+
+	reactor_fuel_storage
+		name = "Reactor Fuel Storage"
+		icon_state = "engine_fuel"
+
+	reactor_fuel_ports
+		name = "\improper Reactor Fuel Ports"
+		icon_state = "engine_port"
+
+	generators
+		name = "\improper Generator Room"
+		icon_state = "engine_generators"
+
+	port_gyro_bay
+		name = "\improper Port Gyrotron Bay"
+		icon_state = "engine_starboardgyro"
+
+	starboard_gyro_bay
+		name = "\improper Starboard Gyrotron Bay"
+		icon_state = "engine_portgyro"
--- a/code/game/area/Space
+++ b/code/game/area/Space
@@ -684,6 +684,26 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Captain's Quarters"
 	icon_state = "captain"

+/area/crew_quarters/heads/hop
+	name = "\improper Head of Personnel's Quarters"
+	icon_state = "head_quarters"
+
+/area/crew_quarters/heads/hor
+	name = "\improper Research Director's Quarters"
+	icon_state = "head_quarters"
+
+/area/crew_quarters/heads/chief
+	name = "\improper Chief Engineer's Quarters"
+	icon_state = "head_quarters"
+
+/area/crew_quarters/heads/hos
+	name = "\improper Head of Security's Quarters"
+	icon_state = "head_quarters"
+
+/area/crew_quarters/heads/cmo
+	name = "\improper Chief Medical Officer's Quarters"
+	icon_state = "head_quarters"
+
 /area/crew_quarters/courtroom
 	name = "\improper Courtroom"
 	icon_state = "courtroom"
@@ -1001,6 +1021,10 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Security Office"
 	icon_state = "security"

+/area/security/lobby
+	name = "\improper Security lobby"
+	icon_state = "security"
+
 /area/security/brig
 	name = "\improper Brig"
 	icon_state = "brig"
--- a/code/game/objects/effects/signs.dm
+++ b/code/game/objects/effects/signs.dm
@@ -77,6 +77,15 @@
 	opacity = 0
 	density = 0

+/obj/effect/sign/movingparts
+	desc = "A warning sign which reads 'CAUTION: MOVING PARTS, machinery liable to stop and start at random'"
+	name = "CAUTION"
+	icon = 'decals.dmi'
+	icon_state = "securearea"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
 /obj/effect/sign/examroom
 	desc = "A guidance sign which reads 'EXAM ROOM'"
 	name = "EXAM"
--- a/code/game/objects/sign_decals.dm
+++ b/code/game/objects/sign_decals.dm
@@ -0,0 +1,49 @@
+/obj/effect/sign/barsign
+	icon = 'barsigns.dmi'
+	icon_state = "empty"
+	anchored = 1
+	New()
+		ChangeSign(pick("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead"))
+		return
+	proc/ChangeSign(var/Text)
+		src.icon_state = "[Text]"
+		//on = 0
+		//brightness_on = 4 //uncomment these when the lighting fixes get in
+		return
+
+/obj/effect/sign/securearea/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			del(src)
+			return
+		if(3.0)
+			del(src)
+			return
+		else
+	return
+
+/obj/effect/sign/securearea/blob_act()
+	del(src)
+	return
+
+
+/obj/effect/sign/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			del(src)
+			return
+		if(3.0)
+			del(src)
+			return
+		else
+	return
+
+/obj/effect/sign/blob_act()
+	del(src)
+	return
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -279,6 +279,26 @@
 	return


+/obj/structure/closet/wardrobe/medic_white
+	name = "medical wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/virology_white/New()
+	new /obj/item/clothing/under/rank/medical(src)
+	new /obj/item/clothing/under/rank/medical(src)
+	new /obj/item/clothing/under/rank/medical/blue(src)
+	new /obj/item/clothing/under/rank/medical/green(src)
+	new /obj/item/clothing/under/rank/medical/purple(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/suit/labcoat(src)
+	new /obj/item/clothing/suit/labcoat(src)
+	new /obj/item/clothing/mask/surgical(src)
+	new /obj/item/clothing/mask/surgical(src)
+	return
+
+
 /obj/structure/closet/wardrobe/grey
 	name = "grey wardrobe"
 	icon_state = "grey"
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -61,6 +61,11 @@
 	icon_state = "paper"
 	item_state = "paper"

+/obj/item/fluff/maurice_bedford_1
+	name = "Monogrammed Handkerchief"
+	desc = "A neatly folded handkerchief embroidered with a 'M'."
+	icon_state = "maurice_bedford_1"
+
 //////////////////////////////////
 ////////// Usable Items //////////
 //////////////////////////////////
@@ -301,7 +306,7 @@
 	icon = 'custom_items.dmi'
 	icon_state = "odysseus_spec_id"

-/obj/item/weapon/card/id/fluff/ian_colmid //Roaper: Ian Colm
+/obj/item/weapon/card/id/fluff/ian_colm_1 //Roaper: Ian Colm
 	name = "Technician"
 	desc = "An old ID with the words 'Ian Colm's Technician ID' printed on it.."
 	icon = 'custom_items.dmi'
@@ -367,28 +372,19 @@
 	icon = 'custom_items.dmi'
 	icon_state = "book_berner_1"

-/obj/item/clothing/glasses/fluff/serithi_artalis_1 //serithi: Serithi Artalis
-	name = "extranet HUD"
-	desc = "A heads-up display with limited connectivity to the NanoTrasen Extranet, capable of displaying information from official NanoTrasen records."
-	icon = 'custom_items.dmi'
-	icon_state = "serithi_artalis_1"
-
 /obj/item/clothing/glasses/fluff/uzenwa_sissra_1 //sparklysheep: Uzenwa Sissra
 	name = "Scanning Goggles"
 	desc = "A very oddly shaped pair of goggles with bits of wire poking out the sides. A soft humming sound emanates from it."
 	icon = 'custom_items.dmi'
 	icon_state = "uzenwa_sissra_1"

+/obj/item/clothing/glasses/welding/fluff/ian_colm_2 //roaper: Ian Colm
+	name = "Ian's Goggles"
+	desc = "A pair of goggles used in the application of welding."
+	icon = 'custom_items.dmi'
+	icon_state = "ian_colm_1"
+
 //////////// Hats ////////////
-//Removed by request
-/*
-/obj/item/clothing/head/helmet/hardhat/fluff/greg_anderson_1 //deusdactyl: Greg Anderson
-	name = "old hard hat"
-	desc = "An old dented hard hat with the nametag \"Anderson\". It seems to be backwards."
-	icon_state = "hardhat0_dblue" //Already an in-game sprite
-	item_state = "hardhat0_dblue"
-	color = "dblue"
-*/

 /obj/item/clothing/head/secsoft/fluff/swatcap //deusdactyl: James Girard
 	name = "\improper SWAT hat"
@@ -420,12 +416,6 @@
 	icon = 'custom_items.dmi'
 	icon_state = "taryn_kifer_1"

-/obj/item/clothing/head/fluff/enos_adlai_1 //roaper: Enos Adlai
-	name = "comfy cap"
-	desc = "Because when you're the toughest Mother Hubbard on the station, nobody's criticizing your fashion sense."
-	icon = 'custom_items.dmi'
-	icon_state = "enos_adlai_1"
-
 /obj/item/clothing/head/fluff/edvin_telephosphor_1 //foolamancer: Edvin Telephosphor
 	name = "Edvin's Hat"
 	desc = "A hat specially tailored for Skrellian anatomy. It has a yellow badge on the front, with a large red 'T' inscribed on it."
@@ -534,25 +524,31 @@

 //////////// Shoes ////////////

-/obj/item/clothing/shoes/fluff/leatherboots //serithi: Serithi Artalis
-	name = "leather boots"
-	desc = "A pair of leather boots. Well-worn, but still kept in good condition. There is a small \"S\" scratched into the back of each boot."
+/obj/item/clothing/shoes/magboots/fluff/susan_harris_1 //sniperyeti: Susan Harris
+	name = "Susan's Magboots"
+	desc = "A colorful pair of magboots with the name Susan Harris clearly written on the back."
 	icon = 'custom_items.dmi'
-	icon_state = "leatherboots"
-	item_state = "jackboots"
+	icon_state = "atmosmagboots0"
+	verb/toggle()
+		set name = "Toggle Magboots"
+		set category = "Object"
+		set src in usr
+		if(src.magpulse)
+			src.flags &= ~NOSLIP
+			src.slowdown = SHOES_SLOWDOWN
+			src.magpulse = 0
+			icon_state = "atmosmagboots0"
+			usr << "You disable the mag-pulse traction system."
+		else
+			src.flags |= NOSLIP
+			src.slowdown = 2
+			src.magpulse = 1
+			icon_state = "atmosmagboots1"
+			usr << "You enable the mag-pulse traction system."

 //////////// Sets ////////////

-////// CDC //deusdactyl: Roger Wiles
-//Removed by request.
 /*
-/obj/item/clothing/under/rank/virologist/fluff/cdc_jumpsuit
-	name = "\improper CDC jumpsuit"
-	desc = "A modified standard-issue CDC jumpsuit made of a special fiber that gives special protection against biohazards.  It has a biohazard symbol sewn into the back."
-	icon = 'custom_items.dmi'
-	icon_state = "cdc_jumpsuit"
-	color = "cdc_jumpsuit"
-
 /obj/item/clothing/suit/labcoat/fluff/cdc_labcoat
 	name = "\improper CDC labcoat"
 	desc = "A standard-issue CDC labcoat that protects against minor chemical spills.  It has the name \"Wiles\" sewn on to the breast pocket."