and finally, the modules folder. Now I can publish and take a break

This commit is contained in:
deathride58
2018-07-02 01:19:37 -04:00
parent 91805b8789
commit b1688405d9
380 changed files with 2204 additions and 1588 deletions
+1 -1
View File
@@ -310,7 +310,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc)
C.id = id
transfer_fingerprints_to(C)
to_chat(user, "<span class='notice'>You deattach the conveyor switch.</span>")
to_chat(user, "<span class='notice'>You detach the conveyor switch.</span>")
qdel(src)
/obj/machinery/conveyor_switch/oneway
+1 -1
View File
@@ -96,7 +96,7 @@
return
if(user.a_intent != INTENT_HARM)
if((I.flags_1 & ABSTRACT_1) || !user.temporarilyRemoveItemFromInventory(I))
if((I.item_flags & ABSTRACT) || !user.temporarilyRemoveItemFromInventory(I))
return
place_item_in_disposal(I, user)
update_icon()
@@ -52,7 +52,7 @@
layer = initial(layer)
else if(ispath(pipe_type, /obj/machinery/disposal/bin))
// Disposal bins recieve special icon treating
// Disposal bins receive special icon treating
if(anchored)
icon_state = "disposal"
else
+1 -1
View File
@@ -62,7 +62,7 @@
return dpdir & (~turn(H.dir, 180))
// transfer the holder through this pipe segment
// overriden for special behaviour
// overridden for special behaviour
/obj/structure/disposalpipe/proc/transfer(obj/structure/disposalholder/H)
return transfer_to_dir(H, nextdir(H))