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/recycling/disposal-structures.dm
+12 -12
View File
@@ -303,12 +303,12 @@
if(can_be_deconstructed(user))
if(W.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
user << "<span class='notice'>You start slicing the disposal pipe...</span>"
to_chat(user, "<span class='notice'>You start slicing the disposal pipe...</span>")
// check if anything changed over 2 seconds
if(do_after(user,30, target = src))
if(!src || !W.isOn()) return
deconstruct()
user << "<span class='notice'>You slice the disposal pipe.</span>"
to_chat(user, "<span class='notice'>You slice the disposal pipe.</span>")
else
return ..()
@@ -423,11 +423,11 @@
/obj/structure/disposalpipe/sortjunction/examine(mob/user)
..()
if(sortTypes.len>0)
user << "It is tagged with the following tags:"
to_chat(user, "It is tagged with the following tags:")
for(var/t in sortTypes)
user << TAGGERLOCATIONS[t]
to_chat(user, TAGGERLOCATIONS[t])
else
user << "It has no sorting tags set."
to_chat(user, "It has no sorting tags set.")
/obj/structure/disposalpipe/sortjunction/proc/updatedir()
@@ -467,10 +467,10 @@
if(O.currTag > 0)// Tag set
if(O.currTag in sortTypes)
sortTypes -= O.currTag
user << "<span class='notice'>Removed \"[TAGGERLOCATIONS[O.currTag]]\" filter.</span>"
to_chat(user, "<span class='notice'>Removed \"[TAGGERLOCATIONS[O.currTag]]\" filter.</span>")
else
sortTypes |= O.currTag
user << "<span class='notice'>Added \"[TAGGERLOCATIONS[O.currTag]]\" filter.</span>"
to_chat(user, "<span class='notice'>Added \"[TAGGERLOCATIONS[O.currTag]]\" filter.</span>")
playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
else
return ..()
@@ -583,7 +583,7 @@
/obj/structure/disposalpipe/trunk/can_be_deconstructed(mob/user)
if(linked)
user << "<span class='warning'>You need to deconstruct disposal machinery above this pipe!</span>"
to_chat(user, "<span class='warning'>You need to deconstruct disposal machinery above this pipe!</span>")
else
. = 1
@@ -695,20 +695,20 @@
if(mode==0)
mode=1
playsound(src.loc, I.usesound, 50, 1)
user << "<span class='notice'>You remove the screws around the power connection.</span>"
to_chat(user, "<span class='notice'>You remove the screws around the power connection.</span>")
else if(mode==1)
mode=0
playsound(src.loc, I.usesound, 50, 1)
user << "<span class='notice'>You attach the screws around the power connection.</span>"
to_chat(user, "<span class='notice'>You attach the screws around the power connection.</span>")
else if(istype(I,/obj/item/weapon/weldingtool) && mode==1)
var/obj/item/weapon/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
user << "<span class='notice'>You start slicing the floorweld off \the [src]...</span>"
to_chat(user, "<span class='notice'>You start slicing the floorweld off \the [src]...</span>")
if(do_after(user,20*I.toolspeed, target = src))
if(!src || !W.isOn()) return
user << "<span class='notice'>You slice the floorweld off \the [src].</span>"
to_chat(user, "<span class='notice'>You slice the floorweld off \the [src].</span>")
stored.loc = loc
src.transfer_fingerprints_to(stored)
stored.update_icon()