mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 02:24:11 +01:00
More runtime errors squashed.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@231 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -62,8 +62,10 @@
|
||||
|
||||
if (!msg)
|
||||
return
|
||||
if (usr.client && usr.client.holder)
|
||||
M << "\bold You hear a voice in your head... \italic [msg]"
|
||||
if(usr)
|
||||
if (usr.client)
|
||||
if(usr.client.holder)
|
||||
M << "\bold You hear a voice in your head... \italic [msg]"
|
||||
|
||||
log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]")
|
||||
message_admins("\blue \bold SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]", 1)
|
||||
|
||||
@@ -43,10 +43,11 @@
|
||||
..()
|
||||
statpanel("Status")
|
||||
if (src.client.statpanel == "Status")
|
||||
if(emergency_shuttle.online && emergency_shuttle.location < 2)
|
||||
var/timeleft = emergency_shuttle.timeleft()
|
||||
if (timeleft)
|
||||
stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
|
||||
if(emergency_shuttle)
|
||||
if(emergency_shuttle.online && emergency_shuttle.location < 2)
|
||||
var/timeleft = emergency_shuttle.timeleft()
|
||||
if (timeleft)
|
||||
stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
|
||||
|
||||
/mob/dead/observer/proc/reenter_corpse()
|
||||
set category = "Special Verbs"
|
||||
|
||||
@@ -153,10 +153,11 @@
|
||||
// if(ticker.mode.name == "AI malfunction")
|
||||
// if(ticker.mode:malf_mode_declared)
|
||||
// stat(null, "Time left: [ ticker.mode:AI_win_timeleft]")
|
||||
if(emergency_shuttle.online && emergency_shuttle.location < 2)
|
||||
var/timeleft = emergency_shuttle.timeleft()
|
||||
if (timeleft)
|
||||
stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
|
||||
if(emergency_shuttle)
|
||||
if(emergency_shuttle.online && emergency_shuttle.location < 2)
|
||||
var/timeleft = emergency_shuttle.timeleft()
|
||||
if (timeleft)
|
||||
stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
|
||||
|
||||
if (src.client.statpanel == "Status")
|
||||
if (src.internal)
|
||||
@@ -1088,7 +1089,7 @@
|
||||
else
|
||||
stain_icon = icon('blood.dmi', "suitblood[!src.lying ? "" : "2"]")
|
||||
src.overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
|
||||
src.wear_suit.screen_loc = ui_oclothing
|
||||
src.wear_suit.screen_loc = ui_oclothing
|
||||
if (istype(src.wear_suit, /obj/item/clothing/suit/straight_jacket))
|
||||
if (src.handcuffed)
|
||||
src.handcuffed.loc = src.loc
|
||||
|
||||
@@ -250,6 +250,8 @@
|
||||
if(O2_pp < safe_oxygen_min) // Too little oxygen
|
||||
if(prob(20))
|
||||
spawn(0) emote("gasp")
|
||||
if (O2_pp == 0)
|
||||
O2_pp = 0.01
|
||||
var/ratio = safe_oxygen_min/O2_pp
|
||||
oxyloss += min(5*ratio, 7) // Don't fuck them up too fast (space only does 7 after all!)
|
||||
oxygen_used = breath.oxygen*ratio/6
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
|
||||
/mob/living/carbon/monkey/movement_delay()
|
||||
var/tally = 0
|
||||
|
||||
if(src.reagents.has_reagent("hyperzine")) return -1
|
||||
if(src.reagents)
|
||||
if(src.reagents.has_reagent("hyperzine")) return -1
|
||||
|
||||
var/health_deficiency = (100 - src.health)
|
||||
if(health_deficiency >= 45) tally += (health_deficiency / 25)
|
||||
|
||||
@@ -38,7 +38,8 @@
|
||||
if (!src.client.changes)
|
||||
src.changes()
|
||||
if(istype (src, /mob/living))
|
||||
if(ticker.mode.name == "revolution")
|
||||
if ((src.mind in ticker.mode:revolutionaries) || (src.mind in ticker.mode:head_revolutionaries))
|
||||
ticker.mode:update_rev_icons_added(src.mind)
|
||||
if(ticker)
|
||||
if(ticker.mode.name == "revolution")
|
||||
if ((src.mind in ticker.mode:revolutionaries) || (src.mind in ticker.mode:head_revolutionaries))
|
||||
ticker.mode:update_rev_icons_added(src.mind)
|
||||
..()
|
||||
|
||||
+27
-24
@@ -1438,8 +1438,9 @@
|
||||
|
||||
//we don't use message_admins here because the sender/receiver might get it too
|
||||
for (var/mob/K in world)
|
||||
if(K && K.client && K.client.holder && K.key != usr.key && K.key != M.key)
|
||||
K << "<b><font color='blue'>PM: [key_name(usr, K)]->[key_name(M, K)]:</b> \blue [t]</font>"
|
||||
if(K)
|
||||
if(K.client && K.client.holder && K.key != usr.key && K.key != M.key)
|
||||
K << "<b><font color='blue'>PM: [key_name(usr, K)]->[key_name(M, K)]:</b> \blue [t]</font>"
|
||||
..()
|
||||
return
|
||||
|
||||
@@ -2024,26 +2025,28 @@
|
||||
if(src.mob)
|
||||
var/mob/M = src.mob
|
||||
M.loc = null // HACK, but whatever, this works
|
||||
|
||||
var/obj/screen/boom = M.hud_used.station_explosion
|
||||
M.client.screen += boom
|
||||
if(ticker)
|
||||
switch(ticker.mode.name)
|
||||
if("nuclear emergency")
|
||||
flick("start_nuke", boom)
|
||||
if("AI malfunction")
|
||||
flick("start_malf", boom)
|
||||
else
|
||||
boom.icon_state = "start"
|
||||
sleep(40)
|
||||
M << sound('explosionfar.ogg')
|
||||
boom.icon_state = "end"
|
||||
flick("explode", boom)
|
||||
sleep(40)
|
||||
if(ticker)
|
||||
switch(ticker.mode.name)
|
||||
if("nuclear emergency")
|
||||
boom.icon_state = "loss_nuke"
|
||||
if("AI malfunction")
|
||||
boom.icon_state = "loss_malf"
|
||||
else
|
||||
boom.icon_state = "loss_general"
|
||||
if (M.client)
|
||||
M.client.screen += boom
|
||||
if(ticker)
|
||||
switch(ticker.mode.name)
|
||||
if("nuclear emergency")
|
||||
flick("start_nuke", boom)
|
||||
if("AI malfunction")
|
||||
flick("start_malf", boom)
|
||||
else
|
||||
boom.icon_state = "start"
|
||||
sleep(40)
|
||||
M << sound('explosionfar.ogg')
|
||||
boom.icon_state = "end"
|
||||
flick("explode", boom)
|
||||
sleep(40)
|
||||
if(ticker)
|
||||
switch(ticker.mode.name)
|
||||
if("nuclear emergency")
|
||||
boom.icon_state = "loss_nuke"
|
||||
if("AI malfunction")
|
||||
boom.icon_state = "loss_malf"
|
||||
else
|
||||
boom.icon_state = "loss_general"
|
||||
|
||||
@@ -222,24 +222,24 @@ mob/new_player
|
||||
proc/AttemptLateSpawn(rank, maxAllowed)
|
||||
if(IsJobAvailable(rank, maxAllowed))
|
||||
var/mob/living/carbon/human/character = create_character()
|
||||
|
||||
character.Equip_Rank(rank, joined_late=1)
|
||||
if (character)
|
||||
character.Equip_Rank(rank, joined_late=1)
|
||||
|
||||
//add to manifest -- Commented out in favor of ManifestLateSpawn() -- TLE
|
||||
//for(var/datum/data/record/t in data_core.general)
|
||||
// if((t.fields["name"] == character.real_name) && (t.fields["rank"] == "Unassigned"))
|
||||
// t.fields["rank"] = rank
|
||||
|
||||
ManifestLateSpawn(character)
|
||||
ManifestLateSpawn(character)
|
||||
if(ticker)
|
||||
if (ticker.current_state == GAME_STATE_PLAYING)
|
||||
for (var/mob/living/silicon/ai/A in world)
|
||||
if (!A.stat)
|
||||
A.say("[character.real_name] has signed up as [rank].")
|
||||
|
||||
if (ticker.current_state == GAME_STATE_PLAYING)
|
||||
for (var/mob/living/silicon/ai/A in world)
|
||||
if (!A.stat)
|
||||
A.say("[character.real_name] has signed up as [rank].")
|
||||
|
||||
var/starting_loc = pick(latejoin)
|
||||
character.loc = starting_loc
|
||||
del(src)
|
||||
var/starting_loc = pick(latejoin)
|
||||
character.loc = starting_loc
|
||||
del(src)
|
||||
|
||||
else
|
||||
src << alert("[rank] is not available. Please try another.")
|
||||
@@ -371,8 +371,8 @@ mob/new_player
|
||||
|
||||
preferences.copy_to(new_character)
|
||||
new_character.dna.ready_dna(new_character)
|
||||
|
||||
mind.transfer_to(new_character)
|
||||
if(mind)
|
||||
mind.transfer_to(new_character)
|
||||
|
||||
|
||||
return new_character
|
||||
|
||||
Reference in New Issue
Block a user