Tg 2 11 sync (#215)

* first series of updates

* datums

* games folder

* admin and atmosia stuffs

* moar

* mob updates borg riding

* sprites and stuff

* fixes for various things

* oops. some missed fixes
This commit is contained in:
Poojawa
2017-02-12 03:56:14 -06:00
committed by GitHub
parent 30b3dff395
commit 6674f9fc15
153 changed files with 1651 additions and 1368 deletions
@@ -77,9 +77,10 @@ field_generator power level display
else
user << "<span class='warning'>The [src] needs to be firmly secured to the floor first!</span>"
/obj/machinery/field/generator/can_be_unfasten_wrench(mob/user)
/obj/machinery/field/generator/can_be_unfasten_wrench(mob/user, silent)
if(state == FG_WELDED)
user << "<span class='warning'>[src] is welded to the floor!</span>"
if(!silent)
user << "<span class='warning'>[src] is welded to the floor!</span>"
return FAILED_UNFASTEN
return ..()