July 5th TG sync (#1883)

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
+4 -4
View File
@@ -20,7 +20,7 @@
density = 1
anchored = 1
/obj/structure/stacklifter/attack_hand(mob/user as mob)
/obj/structure/stacklifter/attack_hand(mob/living/user)
if(in_use)
to_chat(user, "It's already in use - wait a bit.")
return
@@ -28,7 +28,7 @@
in_use = 1
icon_state = "fitnesslifter2"
user.setDir(SOUTH)
user.Stun(4)
user.Stun(80)
user.loc = src.loc
var/bragmessage = pick("pushing it to the limit","going into overdrive","burning with determination","rising up to the challenge", "getting strong now","getting ripped")
user.visible_message("<B>[user] is [bragmessage]!</B>")
@@ -58,7 +58,7 @@
density = 1
anchored = 1
/obj/structure/weightlifter/attack_hand(mob/user as mob)
/obj/structure/weightlifter/attack_hand(mob/living/user)
if(in_use)
to_chat(user, "It's already in use - wait a bit.")
return
@@ -66,7 +66,7 @@
in_use = 1
icon_state = "fitnessweight-c"
user.setDir(SOUTH)
user.Stun(4)
user.Stun(80)
user.loc = src.loc
var/mutable_appearance/swole_overlay = mutable_appearance(icon, "fitnessweight-w", WALL_OBJ_LAYER)
add_overlay(swole_overlay)