cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 10:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sec levels + dodgeball work

Browse Source
This commit is contained in:
ZomgPonies
2013-11-26 07:35:50 -05:00
parent 311adbd374
commit d7e91ed2ee
5 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_defenses.dm
+16 -16
View File
@@ -1,17 +1,17 @@
/mob/living/carbon/hitby(atom/movable/AM, skip)
if(!skip) //ugly, but easy
message_admins("Skip Check Passed")
if(in_throw_mode && !get_active_hand()) //empty active hand and we're in throw mode
message_admins("In Throw Mode and active hand check passed")
if(canmove && !restrained())
message_admins("Restrained/moving check passed")
if(istype(AM, /obj/item))
message_admins("Item check passed")
var/obj/item/I = AM
if(isturf(I.loc))
message_admins("Turf check passed")
put_in_active_hand(I)
visible_message("<span class='warning'>[src] catches [I]!</span>")
throw_mode_off()
return
/mob/living/carbon/hitby(atom/movable/AM)
// if(!skip) //ugly, but easy
// message_admins("Skip Check Passed")
if(in_throw_mode && !get_active_hand()) //empty active hand and we're in throw mode
message_admins("In Throw Mode and active hand check passed")
if(canmove && !restrained())
message_admins("Restrained/moving check passed")
if(istype(AM, /obj/item))
message_admins("Item check passed")
var/obj/item/I = AM
if(isturf(I.loc))
message_admins("Turf check passed")
put_in_active_hand(I)
visible_message("<span class='warning'>[src] catches [I]!</span>")
throw_mode_off()
return
..()
code/modules/mob/living/silicon/robot/robot.dm
+1 -1
View File
@@ -152,7 +152,7 @@
return
var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security")
if(security_level == SEC_LEVEL_RED)
if(security_level >= SEC_LEVEL_RED)
src << "\red Crisis mode active. Combat module available."
modules+="Combat"
if(mmi != null && mmi.alien)