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

Bleeding edgy refresh (#303)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+7 -7
View File
@@ -41,13 +41,13 @@
switch(construction_state)
if(PA_CONSTRUCTION_UNSECURED)
user << "Looks like it's not attached to the flooring"
to_chat(user, "Looks like it's not attached to the flooring")
if(PA_CONSTRUCTION_UNWIRED)
user << "It is missing some cables"
to_chat(user, "It is missing some cables")
if(PA_CONSTRUCTION_PANEL_OPEN)
user << "The panel is open"
to_chat(user, "The panel is open")
user << "<span class='notice'>Alt-click to rotate it clockwise.</span>"
to_chat(user, "<span class='notice'>Alt-click to rotate it clockwise.</span>")
/obj/structure/particle_accelerator/Destroy()
construction_state = PA_CONSTRUCTION_UNSECURED
@@ -65,7 +65,7 @@
if(usr.stat || !usr.canmove || usr.restrained())
return
if (anchored)
usr << "It is fastened to the floor!"
to_chat(usr, "It is fastened to the floor!")
return 0
setDir(turn(dir, -90))
return 1
@@ -73,7 +73,7 @@
/obj/structure/particle_accelerator/AltClick(mob/user)
..()
if(user.incapacitated())
user << "<span class='warning'>You can't do that right now!</span>"
to_chat(user, "<span class='warning'>You can't do that right now!</span>")
return
if(!in_range(src, user))
return
@@ -88,7 +88,7 @@
if(usr.stat || !usr.canmove || usr.restrained())
return
if (anchored)
usr << "It is fastened to the floor!"
to_chat(usr, "It is fastened to the floor!")
return 0
setDir(turn(dir, 90))
return 1
code/modules/power/singularity/particle_accelerator/particle_control.dm
+4 -7
View File
@@ -81,7 +81,7 @@
return
if(!interface_control)
usr << "<span class='error'>ERROR: Request timed out. Check wire contacts.</span>"
to_chat(usr, "<span class='error'>ERROR: Request timed out. Check wire contacts.</span>")
return
if(href_list["close"])
@@ -258,11 +258,11 @@
..()
switch(construction_state)
if(PA_CONSTRUCTION_UNSECURED)
user << "Looks like it's not attached to the flooring"
to_chat(user, "Looks like it's not attached to the flooring")
if(PA_CONSTRUCTION_UNWIRED)
user << "It is missing some cables"
to_chat(user, "It is missing some cables")
if(PA_CONSTRUCTION_PANEL_OPEN)
user << "The panel is open"
to_chat(user, "The panel is open")
/obj/machinery/particle_accelerator/control_box/attackby(obj/item/W, mob/user, params)
@@ -322,9 +322,6 @@
if(prob(50))
qdel(src)
/obj/machinery/particle_accelerator/control_box/emp_act(severity)
return
#undef PA_CONSTRUCTION_UNSECURED
#undef PA_CONSTRUCTION_UNWIRED
#undef PA_CONSTRUCTION_PANEL_OPEN