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/research/circuitprinter.dm
+5 -5
View File
@@ -98,7 +98,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
return
if(!materials.has_space(sheet_material))
user << "<span class='warning'>The [src.name]'s material bin is full! Please remove material before adding more.</span>"
to_chat(user, "<span class='warning'>The [src.name]'s material bin is full! Please remove material before adding more.</span>")
return 1
var/obj/item/stack/sheet/stack = O
@@ -110,7 +110,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
return 1
else
use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount_inserted/10)))
user << "<span class='notice'>You add [amount_inserted] sheets to the [src.name].</span>"
to_chat(user, "<span class='notice'>You add [amount_inserted] sheets to the [src.name].</span>")
updateUsrDialog()
else if(istype(O, /obj/item/weapon/ore/bluespace_crystal)) //Bluespace crystals can be either a stack or an item
@@ -122,17 +122,17 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
return
if(!materials.has_space(bs_material))
user << "<span class='warning'>The [src.name]'s material bin is full! Please remove material before adding more.</span>"
to_chat(user, "<span class='warning'>The [src.name]'s material bin is full! Please remove material before adding more.</span>")
return 1
materials.insert_item(O)
use_power(MINERAL_MATERIAL_AMOUNT/10)
user << "<span class='notice'>You add [O] to the [src.name].</span>"
to_chat(user, "<span class='notice'>You add [O] to the [src.name].</span>")
qdel(O)
updateUsrDialog()
else if(user.a_intent != INTENT_HARM)
user << "<span class='warning'>You cannot insert this item into the [name]!</span>"
to_chat(user, "<span class='warning'>You cannot insert this item into the [name]!</span>")
return 1
else
return 0