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
+9 -9
View File
@@ -44,7 +44,7 @@
/obj/machinery/power/smes/examine(user)
..()
if(!terminal)
user << "<span class='warning'>This SMES has no power terminal!</span>"
to_chat(user, "<span class='warning'>This SMES has no power terminal!</span>")
/obj/machinery/power/smes/New()
..()
@@ -106,10 +106,10 @@
if(term && term.dir == turn(dir, 180))
terminal = term
terminal.master = src
user << "<span class='notice'>Terminal found.</span>"
to_chat(user, "<span class='notice'>Terminal found.</span>")
break
if(!terminal)
user << "<span class='alert'>No power terminal found.</span>"
to_chat(user, "<span class='alert'>No power terminal found.</span>")
return
stat &= ~BROKEN
update_icon()
@@ -126,25 +126,25 @@
return
if(terminal) //is there already a terminal ?
user << "<span class='warning'>This SMES already has a power terminal!</span>"
to_chat(user, "<span class='warning'>This SMES already has a power terminal!</span>")
return
if(!panel_open) //is the panel open ?
user << "<span class='warning'>You must open the maintenance panel first!</span>"
to_chat(user, "<span class='warning'>You must open the maintenance panel first!</span>")
return
var/turf/T = get_turf(user)
if (T.intact) //is the floor plating removed ?
user << "<span class='warning'>You must first remove the floor plating!</span>"
to_chat(user, "<span class='warning'>You must first remove the floor plating!</span>")
return
var/obj/item/stack/cable_coil/C = I
if(C.get_amount() < 10)
user << "<span class='warning'>You need more wires!</span>"
to_chat(user, "<span class='warning'>You need more wires!</span>")
return
user << "<span class='notice'>You start building the power terminal...</span>"
to_chat(user, "<span class='notice'>You start building the power terminal...</span>")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20, target = src) && C.get_amount() >= 10)
@@ -186,7 +186,7 @@
/obj/machinery/power/smes/default_deconstruction_crowbar(obj/item/weapon/crowbar/C)
if(istype(C) && terminal)
usr << "<span class='warning'>You must first remove the power terminal!</span>"
to_chat(usr, "<span class='warning'>You must first remove the power terminal!</span>")
return FALSE
return ..()