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
+5 -7
View File
@@ -11,7 +11,7 @@
/obj/item/device/export_scanner/examine(user)
..()
if(!cargo_console)
user << "<span class='notice'>The [src] is currently not linked to a cargo console.</span>"
to_chat(user, "<span class='notice'>The [src] is currently not linked to a cargo console.</span>")
/obj/item/device/export_scanner/afterattack(obj/O, mob/user, proximity)
if(!istype(O) || !proximity)
@@ -21,17 +21,15 @@
var/obj/machinery/computer/cargo/C = O
if(!C.requestonly)
cargo_console = C
user << "<span class='notice'>Scanner linked to [C].</span>"
to_chat(user, "<span class='notice'>Scanner linked to [C].</span>")
else if(!istype(cargo_console))
user << "<span class='warning'>You must link [src] to a cargo console first!</span>"
to_chat(user, "<span class='warning'>You must link [src] to a cargo console first!</span>")
else
// Before you fix it:
// yes, checking manifests is a part of intended functionality.
var/price = export_item_and_contents(O, cargo_console.contraband, cargo_console.emagged, dry_run=TRUE)
if(price)
user << "<span class='notice'>Scanned [O], value: <b>[price]</b> \
credits[O.contents.len ? " (contents included)" : ""].</span>"
to_chat(user, "<span class='notice'>Scanned [O], value: <b>[price]</b> credits[O.contents.len ? " (contents included)" : ""].</span>")
else
user << "<span class='warning'>Scanned [O], no export value. \
</span>"
to_chat(user, "<span class='warning'>Scanned [O], no export value.</span>")