various fixes to make the PR not conflict with clickdelays probably
This commit is contained in:
@@ -81,7 +81,7 @@
|
||||
/turf/open/floor/clockwork/reebe,
|
||||
/area/reebe/city_of_cogs)
|
||||
"az" = (
|
||||
/obj/structure/destructible/clockwork/heralds_beacon,
|
||||
/obj/structure/destructible/clockwork/eminence_spire,
|
||||
/turf/open/floor/clockwork/reebe,
|
||||
/area/reebe/city_of_cogs)
|
||||
"aA" = (
|
||||
@@ -142,10 +142,6 @@
|
||||
/obj/item/clockwork/component/geis_capacitor/antennae,
|
||||
/turf/open/floor/clockwork/reebe,
|
||||
/area/reebe)
|
||||
"bj" = (
|
||||
/obj/structure/destructible/clockwork/eminence_spire,
|
||||
/turf/open/floor/clockwork/reebe,
|
||||
/area/reebe/city_of_cogs)
|
||||
"bt" = (
|
||||
/obj/structure/table/bronze,
|
||||
/turf/open/floor/clockwork/reebe,
|
||||
@@ -174,10 +170,17 @@
|
||||
/area/reebe/city_of_cogs)
|
||||
"ew" = (
|
||||
/obj/structure/table/reinforced/brass,
|
||||
/obj/item/clockwork/construct_chassis/cogscarab,
|
||||
/obj/item/clockwork/construct_chassis/cogscarab,
|
||||
/obj/item/clockwork/construct_chassis/cogscarab,
|
||||
/obj/item/clockwork/construct_chassis/cogscarab,
|
||||
/obj/item/clockwork/construct_chassis/cogscarab{
|
||||
pixel_y = 20
|
||||
},
|
||||
/obj/item/clockwork/construct_chassis/cogscarab{
|
||||
pixel_x = -7;
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/clockwork/construct_chassis/cogscarab{
|
||||
pixel_x = 7;
|
||||
pixel_y = 6
|
||||
},
|
||||
/turf/open/floor/clockwork/reebe,
|
||||
/area/reebe/city_of_cogs)
|
||||
"hY" = (
|
||||
@@ -29439,7 +29442,7 @@ aj
|
||||
aj
|
||||
aj
|
||||
aj
|
||||
ab
|
||||
aa
|
||||
dl
|
||||
ab
|
||||
aa
|
||||
@@ -29696,7 +29699,7 @@ aj
|
||||
aj
|
||||
aj
|
||||
aj
|
||||
ab
|
||||
aa
|
||||
dl
|
||||
aa
|
||||
ab
|
||||
@@ -29952,10 +29955,10 @@ aj
|
||||
aj
|
||||
aj
|
||||
aj
|
||||
ab
|
||||
aa
|
||||
dl
|
||||
dl
|
||||
ab
|
||||
aa
|
||||
aa
|
||||
om
|
||||
Fd
|
||||
@@ -30210,8 +30213,8 @@ aj
|
||||
aj
|
||||
TH
|
||||
aa
|
||||
ab
|
||||
ab
|
||||
aa
|
||||
aa
|
||||
aT
|
||||
Wv
|
||||
ab
|
||||
@@ -32010,7 +32013,7 @@ aj
|
||||
aj
|
||||
aj
|
||||
aj
|
||||
ab
|
||||
aa
|
||||
ab
|
||||
aa
|
||||
ab
|
||||
@@ -33024,7 +33027,7 @@ ab
|
||||
ab
|
||||
ae
|
||||
ai
|
||||
az
|
||||
aj
|
||||
aj
|
||||
aj
|
||||
aj
|
||||
@@ -33281,7 +33284,7 @@ ab
|
||||
ab
|
||||
ae
|
||||
ai
|
||||
aj
|
||||
az
|
||||
vx
|
||||
aj
|
||||
aj
|
||||
@@ -33538,7 +33541,7 @@ ab
|
||||
ab
|
||||
ab
|
||||
ai
|
||||
bj
|
||||
aj
|
||||
aj
|
||||
aj
|
||||
sW
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
SG.ex_act(EXPLODE_DEVASTATE)
|
||||
return ..()
|
||||
|
||||
/obj/structure/destructible/clockwork/powered/clockwork_obelisk/attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
|
||||
/obj/structure/destructible/clockwork/powered/clockwork_obelisk/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
|
||||
. = ..()
|
||||
if(.)
|
||||
return
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
var/selection_timer //Timer ID; this is canceled if the vote is canceled
|
||||
var/kingmaking
|
||||
|
||||
/obj/structure/destructible/clockwork/eminence_spire/attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
|
||||
/obj/structure/destructible/clockwork/eminence_spire/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
|
||||
. = ..()
|
||||
if(.)
|
||||
return
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
toggle()
|
||||
return TRUE
|
||||
|
||||
/obj/structure/destructible/clockwork/powered/prolonging_prism/attack_hand(mob/living/user)
|
||||
/obj/structure/destructible/clockwork/powered/prolonging_prism/on_attack_hand(mob/living/user)
|
||||
if(user.canUseTopic(src, !issilicon(user), NO_DEXTERY) && is_servant_of_ratvar(user))
|
||||
if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE)
|
||||
to_chat(user, "<span class='brass'>You break [src] apart, refunding some of the power used.</span>")
|
||||
|
||||
Reference in New Issue
Block a user