Bleeding edgy refresh (#303)

* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
+11 -11
View File
@@ -70,10 +70,10 @@
/obj/structure/sign/barsign/attack_hand(mob/user)
if (!src.allowed(user))
user << "<span class='info'>Access denied.</span>"
to_chat(user, "<span class='info'>Access denied.</span>")
return
if (broken)
user << "<span class ='danger'>The controls seem unresponsive.</span>"
to_chat(user, "<span class ='danger'>The controls seem unresponsive.</span>")
return
pick_sign()
@@ -83,14 +83,14 @@
/obj/structure/sign/barsign/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/weapon/screwdriver))
if(!allowed(user))
user << "<span class='info'>Access denied.</span>"
to_chat(user, "<span class='info'>Access denied.</span>")
return
if(!panel_open)
user << "<span class='notice'>You open the maintenance panel.</span>"
to_chat(user, "<span class='notice'>You open the maintenance panel.</span>")
set_sign(new /datum/barsign/hiddensigns/signoff)
panel_open = 1
else
user << "<span class='notice'>You close the maintenance panel.</span>"
to_chat(user, "<span class='notice'>You close the maintenance panel.</span>")
if(!broken && !emagged)
set_sign(pick(barsigns))
else if(emagged)
@@ -102,17 +102,17 @@
else if(istype(I, /obj/item/stack/cable_coil) && panel_open)
var/obj/item/stack/cable_coil/C = I
if(emagged) //Emagged, not broken by EMP
user << "<span class='warning'>Sign has been damaged beyond repair!</span>"
to_chat(user, "<span class='warning'>Sign has been damaged beyond repair!</span>")
return
else if(!broken)
user << "<span class='warning'>This sign is functioning properly!</span>"
to_chat(user, "<span class='warning'>This sign is functioning properly!</span>")
return
if(C.use(2))
user << "<span class='notice'>You replace the burnt wiring.</span>"
to_chat(user, "<span class='notice'>You replace the burnt wiring.</span>")
broken = 0
else
user << "<span class='warning'>You need at least two lengths of cable!</span>"
to_chat(user, "<span class='warning'>You need at least two lengths of cable!</span>")
else
return ..()
@@ -126,9 +126,9 @@
/obj/structure/sign/barsign/emag_act(mob/user)
if(broken || emagged)
user << "<span class='warning'>Nothing interesting happens!</span>"
to_chat(user, "<span class='warning'>Nothing interesting happens!</span>")
return
user << "<span class='notice'>You emag the barsign. Takeover in progress...</span>"
to_chat(user, "<span class='notice'>You emag the barsign. Takeover in progress...</span>")
sleep(100) //10 seconds
set_sign(new /datum/barsign/hiddensigns/syndibarsign)
emagged = 1