cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed cpu lock when low pop revolution fails to start.

Browse Source 
Fixed some runtime errors.
Improved golden cup.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1804 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-07-08 20:25:08 +00:00
parent a36aee006b
commit b63a4c241e
5 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+13 -15
View File
@@ -163,7 +163,7 @@
stat(null, "Intent: [a_intent]")
stat(null, "Move Mode: [m_intent]")
if(ticker.mode.name == "AI malfunction")
if(ticker && ticker.mode && ticker.mode.name == "AI malfunction")
if(ticker.mode:malf_mode_declared)
stat(null, "Time left: [max(ticker.mode:AI_win_timeleft/(ticker.mode:apcs/3), 0)]")
if(emergency_shuttle)
@@ -905,12 +905,12 @@
if(!wear_suit.allowed)
usr << "You somehow have a suit with no defined allowed items for suit storage, stop that."
return
for(var/i=1, i<=wear_suit.allowed.len, i++)
if(!W) return
// world << "[wear_suit.allowed[i]] and [W.type]"
if (findtext("[W.type]","[wear_suit.allowed[i]]") || istype(W, /obj/item/device/pda) || istype(W, /obj/item/weapon/pen))
confirm = 1
break
if (istype(W, /obj/item/device/pda) || istype(W, /obj/item/weapon/pen))
confirm = 1
break
if (is_type_in_list(W, wear_suit.allowed))
confirm = 1
break
if (!confirm) return
else
u_equip(W)
@@ -923,14 +923,12 @@
return
var/confirm
if (head)
for(var/i=1, i<=head.allowed.len, i++)
// world << "[head.allowed[i]] and [W.type]"
if(!W)
src << "The code is under the impression that the item you're trying to stick in your hat doesn't exist."
return
if (findtext("[W.type]","[head.allowed[i]]") || istype(W, /obj/item/weapon/pen))
confirm = 1
break
if (istype(W, /obj/item/weapon/pen))
confirm = 1
break
if (istype(head) && is_type_in_list(W, head.allowed)) // NOTE: head is /obj/item/clothing/head/ and parer hat is not /obj/item/clothing/ and does not have "allowed" --rastaf0
confirm = 1
break
if (!confirm) return
else
u_equip(W)