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
+7 -7
View File
@@ -39,7 +39,7 @@
/obj/item/device/assembly/proc/is_secured(mob/user)
if(!secured)
user << "<span class='warning'>The [name] is unsecured!</span>"
to_chat(user, "<span class='warning'>The [name] is unsecured!</span>")
return 0
return 1
@@ -87,15 +87,15 @@
if((!A.secured) && (!secured))
holder = new/obj/item/device/assembly_holder(get_turf(src))
holder.assemble(src,A,user)
user << "<span class='notice'>You attach and secure \the [A] to \the [src]!</span>"
to_chat(user, "<span class='notice'>You attach and secure \the [A] to \the [src]!</span>")
else
user << "<span class='warning'>Both devices must be in attachable mode to be attached together.</span>"
to_chat(user, "<span class='warning'>Both devices must be in attachable mode to be attached together.</span>")
return
if(istype(W, /obj/item/weapon/screwdriver))
if(toggle_secure())
user << "<span class='notice'>\The [src] is ready!</span>"
to_chat(user, "<span class='notice'>\The [src] is ready!</span>")
else
user << "<span class='notice'>\The [src] can now be attached!</span>"
to_chat(user, "<span class='notice'>\The [src] can now be attached!</span>")
return
..()
@@ -103,9 +103,9 @@
/obj/item/device/assembly/examine(mob/user)
..()
if(secured)
user << "\The [src] is secured and ready to be used."
to_chat(user, "\The [src] is secured and ready to be used.")
else
user << "\The [src] can be attached to other things."
to_chat(user, "\The [src] can be attached to other things.")
/obj/item/device/assembly/attack_self(mob/user)