and that just leaves the modules folder
This commit is contained in:
@@ -163,18 +163,20 @@
|
||||
else if(istype(AM, /obj/structure/closet))
|
||||
return
|
||||
else if(isobj(AM))
|
||||
if(!allow_objects && !istype(AM, /obj/item) && !istype(AM, /obj/effect/dummy/chameleon))
|
||||
if (istype(AM, /obj/item))
|
||||
var/obj/item/I = AM
|
||||
if (I.item_flags & NODROP)
|
||||
return
|
||||
else if(!allow_objects && !istype(AM, /obj/effect/dummy/chameleon))
|
||||
return
|
||||
if(!allow_dense && AM.density)
|
||||
return
|
||||
if(AM.anchored || AM.has_buckled_mobs() || (AM.flags_1 & NODROP_1))
|
||||
if(AM.anchored || AM.has_buckled_mobs())
|
||||
return
|
||||
else
|
||||
return
|
||||
|
||||
AM.forceMove(src)
|
||||
if(AM.pulledby)
|
||||
AM.pulledby.stop_pulling()
|
||||
|
||||
return 1
|
||||
|
||||
@@ -245,7 +247,7 @@
|
||||
if(opened)
|
||||
return
|
||||
welded = !welded
|
||||
user.visible_message("<span class='notice'>[user] [welded ? "welds shut" : "unweldeds"] \the [src].</span>",
|
||||
user.visible_message("<span class='notice'>[user] [welded ? "welds shut" : "unwelded"] \the [src].</span>",
|
||||
"<span class='notice'>You [welded ? "weld" : "unwelded"] \the [src] with \the [W].</span>",
|
||||
"<span class='italics'>You hear welding.</span>")
|
||||
update_icon()
|
||||
@@ -257,7 +259,7 @@
|
||||
user.visible_message("<span class='notice'>[user] [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground.</span>", \
|
||||
"<span class='notice'>You [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground.</span>", \
|
||||
"<span class='italics'>You hear a ratchet.</span>")
|
||||
else if(user.a_intent != INTENT_HARM && !(W.flags_1 & NOBLUDGEON_1))
|
||||
else if(user.a_intent != INTENT_HARM && !(W.item_flags & NOBLUDGEON))
|
||||
if(W.GetID() || !toggle(user))
|
||||
togglelock(user)
|
||||
else
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
icon_state = "syndicate"
|
||||
|
||||
/obj/structure/closet/gimmick/russian
|
||||
name = "russian surplus closet"
|
||||
name = "\improper Russian surplus closet"
|
||||
desc = "It's a storage unit for Russian standard-issue surplus."
|
||||
|
||||
/obj/structure/closet/gimmick/russian/PopulateContents()
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
new /obj/item/encryptionkey/headset_med(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/detective
|
||||
name = "\proper detective's cabinet"
|
||||
name = "\improper detective's cabinet"
|
||||
req_access = list(ACCESS_FORENSICS_LOCKERS)
|
||||
icon_state = "cabinet"
|
||||
resistance_flags = FLAMMABLE
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
var/obj/item/storage/bag/trash/T = W
|
||||
to_chat(user, "<span class='notice'>You fill the bag.</span>")
|
||||
for(var/obj/item/O in src)
|
||||
T.SendSignal(COMSIG_TRY_STORAGE_INSERT, O, user, TRUE)
|
||||
SEND_SIGNAL(T, COMSIG_TRY_STORAGE_INSERT, O, user, TRUE)
|
||||
T.update_icon()
|
||||
do_animate()
|
||||
return TRUE
|
||||
|
||||
Reference in New Issue
Block a user