shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

July 5th TG sync (#1883)

Browse Source 
July 5th TG sync
This commit is contained in:
Poojawa
2017-07-05 22:14:19 -05:00
committed by GitHub
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures.dm
+7 -6
View File
@@ -4,9 +4,9 @@
obj_integrity = 300
max_integrity = 300
var/climb_time = 20
var/climb_stun = 2
var/climb_stun = 20
var/climbable = FALSE
var/mob/structureclimber
var/mob/living/structureclimber
var/broken = 0 //similar to machinery's stat BROKEN
/obj/structure/Initialize()
@@ -33,7 +33,7 @@
if(structureclimber && structureclimber != user)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
structureclimber.Weaken(2)
structureclimber.Knockdown(40)
structureclimber.visible_message("<span class='warning'>[structureclimber.name] has been knocked off the [src]", "You're knocked off the [src]!", "You see [structureclimber.name] get knocked off the [src]</span>")
interact(user)
@@ -48,7 +48,7 @@
. = ..()
if(!climbable)
return
if(ismob(O) && user == O && iscarbon(user))
if(user == O && iscarbon(O))
if(user.canmove)
climb_structure(user)
return
@@ -68,7 +68,7 @@
. = step(A,get_dir(A,src.loc))
density = 1
/obj/structure/proc/climb_structure(mob/user)
/obj/structure/proc/climb_structure(mob/living/user)
src.add_fingerprint(user)
user.visible_message("<span class='warning'>[user] starts climbing onto [src].</span>", \
"<span class='notice'>You start climbing onto [src]...</span>")
@@ -84,7 +84,8 @@
user.visible_message("<span class='warning'>[user] climbs onto [src].</span>", \
"<span class='notice'>You climb onto [src].</span>")
add_logs(user, src, "climbed onto")
user.Stun(climb_stun)
if(climb_stun)
user.Stun(climb_stun)
. = 1
else
to_chat(user, "<span class='warning'>You fail to climb onto [src].</span>")