Merge branch 'master' of https://github.com/Baystation12/Baystation12 into work_in_progress

Conflicts:
	code/modules/customitems/item_defines.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

baystation12.dme

@@ -288,6 +288,7 @@
 #include "code\ATMOSPHERICS\he_pipes.dm"
 #include "code\ATMOSPHERICS\pipes.dm"
 #include "code\ATMOSPHERICS\components\portables_connector.dm"
+#include "code\ATMOSPHERICS\components\tvalve.dm"
 #include "code\ATMOSPHERICS\components\valve.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\binary_atmos_base.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\circulator.dm"
@@ -635,6 +636,7 @@
 #include "code\game\objects\explosion_recursive.dm"
 #include "code\game\objects\items.dm"
 #include "code\game\objects\objs.dm"
+#include "code\game\objects\sign_decals.dm"
 #include "code\game\objects\structures.dm"
 #include "code\game\objects\weapons.dm"
 #include "code\game\objects\closets\walllocker.dm"
@@ -1206,6 +1208,7 @@
 #include "code\modules\power\switch.dm"
 #include "code\modules\power\terminal.dm"
 #include "code\modules\power\tracker.dm"
+#include "code\modules\power\turbine.dm"
 #include "code\modules\power\antimatter\containment_jar.dm"
 #include "code\modules\power\antimatter\control.dm"
 #include "code\modules\power\antimatter\shielding.dm"
@@ -1338,6 +1341,7 @@
 #include "code\WorkInProgress\Cael_Aislinn\sculpture.dm"
 #include "code\WorkInProgress\Cael_Aislinn\shield_capacitor.dm"
 #include "code\WorkInProgress\Cael_Aislinn\shield_gen.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Rust\areas.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_field.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_gen.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_monitor.dm"

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"

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"

code/datums/organs/organ_external.dm

@@ -214,6 +214,7 @@
 
 	proc/bandage()
 		var/rval = 0
+		src.status &= ~ORGAN_BLEEDING
 		for(var/datum/wound/W in wounds)
 			if(W.internal) continue
 			rval |= !W.bandaged

code/game/area/Space Station 13 areas.dm

@@ -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"

code/game/jobs/job/captain.dm

@@ -21,7 +21,7 @@
 		var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/captain(H)
 		U.hastie = new /obj/item/clothing/tie/medal/gold/captain(U)
 		H.equip_to_slot_or_del(U, slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/captain(H), slot_belt)
+		//H.equip_to_slot_or_del(new /obj/item/device/pda/captain(H), slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/captain(H), slot_wear_suit)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/clothing/head/caphat(H), slot_head)

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"

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

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"

code/modules/clothing/spacesuits/rig.dm

@@ -4,7 +4,7 @@
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
 	icon_state = "rig0-engineering"
 	item_state = "eng_helm"
-	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60)
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 100)
 	allowed = list(/obj/item/device/flashlight)
 	var/brightness_on = 4 //luminosity when on
 	var/on = 0
@@ -42,7 +42,7 @@
 	icon_state = "rig-engineering"
 	item_state = "eng_hardsuit"
 	slowdown = 2
-	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60)
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 100)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/satchel,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE

config/admins.txt

@@ -3,6 +3,7 @@ arcalane - Game Admin
 asanadas - Game Admin
 bobbehluvspropane - Game Admin
 cacophony - Game Admin
+caelaislinn - Game Master
 cajoes - Game Admin
 cib - Retired Admin
 compactninja - Retired Admin