cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge corrections.

Browse Source 
Fixes the todo:s I claimed I'd fix at merge.
This commit is contained in:
PsiOmegaDelta
2015-08-13 10:15:48 +02:00
parent 1b10f78940
commit 62155433c2
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/living/carbon/human/human.dm
View File

@@ -207,8 +207,7 @@
/mob/living/carbon/human/show_inv(mob/user as mob) /mob/living/carbon/human/show_inv(mob/user as mob)
// TODO : Change to incapacitated() on merge. if(user.incapacitated())
if(user.stat || user.lying || user.resting || user.buckled)
return return
var/obj/item/clothing/under/suit = null var/obj/item/clothing/under/suit = null

3
code/modules/mob/living/carbon/human/stripping.dm
View File

@@ -3,8 +3,7 @@
if(!slot_to_strip || !istype(user)) if(!slot_to_strip || !istype(user))
return return
// TODO : Change to incapacitated() on merge. if(user.incapacitated())
if(user.stat || user.lying || user.resting || user.buckled)
user << browse(null, text("window=mob[src.name]")) user << browse(null, text("window=mob[src.name]"))
return return

4
code/modules/mob/living/living_defense.dm
View File

@@ -378,7 +378,3 @@
src.attack_log += "\[[time_stamp()]\]<font color='orange'> Got knifed by [user.name] ([user.ckey]) with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])</font>" src.attack_log += "\[[time_stamp()]\]<font color='orange'> Got knifed by [user.name] ([user.ckey]) with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])</font>"
msg_admin_attack("[key_name(user)] knifed [key_name(src)] with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])" ) msg_admin_attack("[key_name(user)] knifed [key_name(src)] with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])" )
return return
/mob/living/incapacitated()
if(stat || paralysis || stunned || weakened || restrained())
return 1

2
code/modules/mob/mob.dm
View File

@@ -153,7 +153,7 @@
return return
/mob/proc/incapacitated() /mob/proc/incapacitated()
return return (stat || paralysis || stunned || weakened || restrained())
/mob/proc/restrained() /mob/proc/restrained()
return return