Defines for the define god

This commit is contained in:
Francis Devine
2014-10-09 14:49:28 +13:00
parent 970c61844f
commit f737f7889c
6 changed files with 10 additions and 8 deletions
+2
View File
@@ -35,6 +35,8 @@
#define CLICK_CD_MELEE 8
#define CLICK_CD_RANGE 4
#define CLICK_CD_HANDCUFFED 10
#define CLICK_CD_BREAKOUT 100
#define CLICK_CD_RESIST 20
//click cooldowns, in tenths of a second
+1 -1
View File
@@ -383,7 +383,7 @@
if(open || !locked) //Open and unlocked, no need to escape
open = 1
return
user.changeNext_move(100)
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + 100
user << "<span class='notice'>You lean on the back of [src] and start pushing the door open. (this will take about [breakout_time] minutes.)</span>"
user.visible_message("<span class='warning'>You hear a metallic creaking from [src]!</span>")
+1 -1
View File
@@ -427,7 +427,7 @@
/obj/machinery/suit_storage_unit/container_resist()
var/mob/living/user = usr
if(islocked)
user.changeNext_move(100)
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + 100
var/breakout_time = 2
user << "<span class='notice'>You start kicking against the doors to escape! (This will take about [breakout_time] minutes.)</span>"
+1 -1
View File
@@ -212,7 +212,7 @@
/obj/effect/spider/cocoon/container_resist()
var/mob/living/user = usr
var/breakout_time = 2
user.changeNext_move(100)
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + 100
user << "<span class='notice'>You struggle against the tight bonds! (This will take about [breakout_time] minutes.)</span>"
visible_message("You see something struggling and writhing in the [src]!")
@@ -312,7 +312,7 @@
return //Door's open, not locked or welded, no point in resisting.
//okay, so the closet is either welded or locked... resist!!!
user.changeNext_move(100)
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + 100
user << "<span class='notice'>You lean on the back of [src] and start pushing the door open. (this will take about [breakout_time] minutes.)</span>"
for(var/mob/O in viewers(src))
+4 -4
View File
@@ -476,7 +476,7 @@
if(!isliving(usr) || usr.next_move > world.time)
return
usr.changeNext_move(20)
usr.changeNext_move(CLICK_CD_RESIST)
var/mob/living/L = usr
@@ -509,7 +509,7 @@
if(iscarbon(L))
var/mob/living/carbon/C = L
if(C.handcuffed)
C.changeNext_move(100)
C.changeNext_move(CLICK_CD_BREAKOUT)
C.last_special = world.time + 100
C.visible_message("<span class='warning'>[usr] attempts to unbuckle themself!</span>", \
"<span class='notice'>You attempt to unbuckle yourself. (This will take around one minute and you need to stay still.)</span>")
@@ -548,7 +548,7 @@
return
if(CM.canmove && (CM.last_special <= world.time))
if(CM.handcuffed || CM.legcuffed)
CM.changeNext_move(100)
CM.changeNext_move(CLICK_CD_BREAKOUT)
CM.last_special = world.time + 100
if(CM.handcuffed)
cuff_resist(CM.handcuffed, CM)
@@ -629,4 +629,4 @@
if(what && Adjacent(who))
src.unEquip(what)
who.equip_to_slot_if_possible(what, where, 0, 1)
add_logs(src, who, "equipped", object=what)
add_logs(src, who, "equipped", object=what)