Merged taucetistation/tauceti/base into underground_zas

baystation12.dme

@@ -53,11 +53,8 @@
 #include "code\_onclick\hud\action.dm"
 #include "code\_onclick\hud\ai.dm"
 #include "code\_onclick\hud\alert.dm"
-#include "code\_onclick\hud\alien.dm"
-#include "code\_onclick\hud\facehugger.dm"
 #include "code\_onclick\hud\hud.dm"
 #include "code\_onclick\hud\human.dm"
-#include "code\_onclick\hud\larva.dm"
 #include "code\_onclick\hud\monkey.dm"
 #include "code\_onclick\hud\movable_screen_objects.dm"
 #include "code\_onclick\hud\other_mobs.dm"
@@ -294,7 +291,9 @@
 #include "code\game\gamemodes\gang\gang_pen.dm"
 #include "code\game\gamemodes\gang\recaller.dm"
 #include "code\game\gamemodes\heist\heist.dm"
+#include "code\game\gamemodes\heist\heist_prices.dm"
 #include "code\game\gamemodes\heist\heist_role_equip.dm"
+#include "code\game\gamemodes\heist\spacebike.dm"
 #include "code\game\gamemodes\infestation\infestation.dm"
 #include "code\game\gamemodes\malfunction\Malf_Modules.dm"
 #include "code\game\gamemodes\malfunction\malfunction.dm"
@@ -1042,6 +1041,9 @@
 #include "code\modules\mob\living\carbon\alien\facehugger\life.dm"
 #include "code\modules\mob\living\carbon\alien\facehugger\powers.dm"
 #include "code\modules\mob\living\carbon\alien\facehugger\update_icons.dm"
+#include "code\modules\mob\living\carbon\alien\hud\hud_alien.dm"
+#include "code\modules\mob\living\carbon\alien\hud\hud_facehugger.dm"
+#include "code\modules\mob\living\carbon\alien\hud\hud_larva.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\emote.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\humanoid.dm"

code/ZAS/Airflow.dm

@@ -11,6 +11,9 @@ Contains helper procs for airflow, handled in /connection_group.
 	if(!(status_flags & CANSTUN) && !(status_flags & CANWEAKEN))
 		src << "\blue You stay upright as the air rushes past you."
 		return 0
+	if(buckled)
+		src << "<span class='notice'>Air suddenly rushes past you!</span>"
+		return 0
 	if(weakened <= 0) src << "\red The sudden rush of air knocks you over!"
 	weakened = max(weakened,5)
 	last_airflow_stun = world.time

code/_onclick/hud/action.dm

@@ -30,7 +30,6 @@
 /datum/action/Destroy()
 	if(owner)
 		Remove(owner)
-	return ..()
 
 /datum/action/proc/Grant(mob/living/T)
 	if(owner)

code/_onclick/hud/ai.dm

@@ -5,7 +5,7 @@
 	var/obj/screen/using
 
 //AI core
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "AI Core"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "ai_core"
@@ -14,7 +14,7 @@
 	adding += using
 
 //Camera list
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "Show Camera List"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "camera"
@@ -23,7 +23,7 @@
 	adding += using
 
 //Track
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "Track With Camera"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "track"
@@ -32,7 +32,7 @@
 	adding += using
 
 //Camera light
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "Toggle Camera Light"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "camera_light"
@@ -41,7 +41,7 @@
 	adding += using
 
 //Crew Monitorting
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "Radio Settings"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "radio_control"
@@ -50,7 +50,7 @@
 	adding += using
 
 //Crew Manifest
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "Show Crew Manifest"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "manifest"
@@ -59,7 +59,7 @@
 	adding += using
 
 //Alerts
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "Show Alerts"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "alerts"
@@ -68,7 +68,7 @@
 	adding += using
 
 //Announcement
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "Announcement"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "announcement"
@@ -77,7 +77,7 @@
 	adding += using
 
 //Shuttle
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "Call Emergency Shuttle"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "call_shuttle"
@@ -86,7 +86,7 @@
 	adding += using
 
 //Laws
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "State Laws"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "state_laws"
@@ -95,7 +95,7 @@
 	adding += using
 
 //PDA message
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "PDA - Send Message"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "pda_send"
@@ -104,7 +104,7 @@
 	adding += using
 
 //PDA log
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "PDA - Show Message Log"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "pda_receive"
@@ -113,7 +113,7 @@
 	adding += using
 
 //Take image
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "Take Image"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "take_picture"
@@ -122,7 +122,7 @@
 	adding += using
 
 //View images
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "View Images"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "view_images"
@@ -131,7 +131,7 @@
 	adding += using
 
 //Medical/Security sensors
-	using = PoolOrNew(/obj/screen)
+	using = new /obj/screen()
 	using.name = "Sensor Augmentation"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "ai_sensor"

code/_onclick/hud/alien_larva.dm

@@ -0,0 +1,81 @@
+/datum/hud/proc/larva_hud()
+
+	src.adding = list()
+	src.other = list()
+
+	var/obj/screen/using
+
+	using = new /obj/screen()
+	using.name = "act_intent"
+	using.dir = SOUTHWEST
+	using.icon = 'icons/mob/screen1_alien.dmi'
+	using.icon_state = (mymob.a_intent == "hurt" ? "harm" : mymob.a_intent)
+	using.screen_loc = ui_acti
+	using.layer = 20
+	src.adding += using
+	action_intent = using
+
+	using = new /obj/screen()
+	using.name = "mov_intent"
+	using.dir = SOUTHWEST
+	using.icon = 'icons/mob/screen1_alien.dmi'
+	using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
+	using.screen_loc = ui_movi
+	using.layer = 20
+	src.adding += using
+	move_intent = using
+
+	mymob.oxygen = new /obj/screen()
+	mymob.oxygen.icon = 'icons/mob/screen1_alien.dmi'
+	mymob.oxygen.icon_state = "oxy0"
+	mymob.oxygen.name = "oxygen"
+	mymob.oxygen.screen_loc = ui_alien_oxygen
+
+	mymob.toxin = new /obj/screen()
+	mymob.toxin.icon = 'icons/mob/screen1_alien.dmi'
+	mymob.toxin.icon_state = "tox0"
+	mymob.toxin.name = "toxin"
+	mymob.toxin.screen_loc = ui_alien_toxin
+
+
+	mymob.fire = new /obj/screen()
+	mymob.fire.icon = 'icons/mob/screen1_alien.dmi'
+	mymob.fire.icon_state = "fire0"
+	mymob.fire.name = "fire"
+	mymob.fire.screen_loc = ui_alien_fire
+
+
+	mymob.healths = new /obj/screen()
+	mymob.healths.icon = 'icons/mob/screen1_alien.dmi'
+	mymob.healths.icon_state = "health0"
+	mymob.healths.name = "health"
+	mymob.healths.screen_loc = ui_alien_health
+
+	mymob.pullin = new /obj/screen()
+	mymob.pullin.icon = 'icons/mob/screen1_alien.dmi'
+	mymob.pullin.icon_state = "pull0"
+	mymob.pullin.name = "pull"
+	mymob.pullin.screen_loc = ui_pull_resist
+
+	mymob.blind = new /obj/screen()
+	mymob.blind.icon = 'icons/mob/screen1_full.dmi'
+	mymob.blind.icon_state = "blackimageoverlay"
+	mymob.blind.name = " "
+	mymob.blind.screen_loc = "1,1"
+	mymob.blind.layer = 0
+
+	mymob.flash = new /obj/screen()
+	mymob.flash.icon = 'icons/mob/screen1_alien.dmi'
+	mymob.flash.icon_state = "blank"
+	mymob.flash.name = "flash"
+	mymob.flash.screen_loc = "1,1 to 15,15"
+	mymob.flash.layer = 17
+
+	mymob.zone_sel = new /obj/screen/zone_sel()
+	mymob.zone_sel.overlays.Cut()
+	mymob.zone_sel.overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
+
+	mymob.client.screen = null
+
+	mymob.client.screen += list( mymob.zone_sel, mymob.oxygen, mymob.toxin, mymob.fire, mymob.healths, mymob.pullin, mymob.blind, mymob.flash) //, mymob.rest, mymob.sleep, mymob.mach )
+	mymob.client.screen += src.adding + src.other

code/_onclick/hud/hud.dm

@@ -4,6 +4,11 @@
 */
 var/datum/global_hud/global_hud = new()
 
+/datum/hud/var/obj/screen/grab_intent
+/datum/hud/var/obj/screen/hurt_intent
+/datum/hud/var/obj/screen/disarm_intent
+/datum/hud/var/obj/screen/help_intent
+
 /datum/global_hud
 	var/obj/screen/druggy
 	var/obj/screen/blurry
@@ -18,21 +23,21 @@ var/datum/global_hud/global_hud = new()
 
 /datum/global_hud/New()
 	//420erryday psychedellic colours screen overlay for when you are high
-	druggy = PoolOrNew(/obj/screen)
+	druggy = new /obj/screen()
 	druggy.screen_loc = "WEST,SOUTH to EAST,NORTH"
 	druggy.icon_state = "druggy"
 	druggy.layer = 17
 	druggy.mouse_opacity = 0
 
 	//that white blurry effect you get when you eyes are damaged
-	blurry = PoolOrNew(/obj/screen)
+	blurry = new /obj/screen()
 	blurry.screen_loc = "WEST,SOUTH to EAST,NORTH"
 	blurry.icon_state = "blurry"
 	blurry.layer = 17
 	blurry.mouse_opacity = 0
 
 	//green vision nvg for meson
-	meson = PoolOrNew(/obj/screen)
+	meson = new /obj/screen()
 	meson.icon = 'icons/effects/alert.dmi'
 	meson.icon_state = "dark128"
 	meson.icon += rgb(0, 130, 0, 90)
@@ -41,7 +46,7 @@ var/datum/global_hud/global_hud = new()
 	meson.mouse_opacity = 0
 
 	//red vision for thermals
-	thermal = PoolOrNew(/obj/screen)
+	thermal = new /obj/screen()
 	thermal.icon = 'icons/effects/alert.dmi'
 	thermal.icon_state = "dark128"
 	thermal.icon += rgb(130, 0, 0, 90)
@@ -50,7 +55,7 @@ var/datum/global_hud/global_hud = new()
 	thermal.mouse_opacity = 0
 
 	//violet vision for science googles
-	science = PoolOrNew(/obj/screen)
+	science = new /obj/screen()
 	science.icon = 'icons/effects/alert.dmi'
 	science.icon_state = "dark128"
 	//science.icon += rgb(56, 0, 130, 90) cold color
@@ -100,7 +105,7 @@ var/datum/global_hud/global_hud = new()
 	O = darkMask[8]
 	O.screen_loc = "3,14 to 13,15"
 
-	for(i in 1 to 4)
+	for(i = 1, i <= 4, i++)
 		O = vimpaired[i]
 		O.icon_state = "dither50"
 		O.layer = 17
@@ -111,7 +116,7 @@ var/datum/global_hud/global_hud = new()
 		O.layer = 17
 		O.mouse_opacity = 0
 
-	for(i in 5 to 8)
+	for(i = 5, i <= 8, i++)
 		O = darkMask[i]
 		O.icon_state = "black"
 		O.layer = 17
@@ -126,11 +131,6 @@ var/datum/global_hud/global_hud = new()
 /datum/hud
 	var/mob/mymob
 
-	var/obj/screen/grab_intent
-	var/obj/screen/hurt_intent
-	var/obj/screen/disarm_intent
-	var/obj/screen/help_intent
-
 	var/hud_shown = 1			//Used for the HUD toggle (F12)
 	var/inventory_shown = 1		//the inventory
 	var/show_intent_icons = 0
@@ -310,8 +310,6 @@ var/datum/global_hud/global_hud = new()
 			hud_used.persistant_inventory_update()
 			update_action_buttons()
 		else
-			usr << "<span class='red'>Inventory hiding is currently only supported for human mobs, sorry.</span>"
+			usr << "\red Inventory hiding is currently only supported for human mobs, sorry."
 	else
-		usr << "<span class='red'>This mob type does not use a HUD.</span>"
-
-
+		usr << "\red This mob type does not use a HUD."