Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
This commit is contained in:
@@ -132,7 +132,12 @@
|
||||
|
||||
/obj/machinery/disposal/proc/can_stuff_mob_in(mob/living/target, mob/living/user, pushing = FALSE)
|
||||
if(!pushing && !iscarbon(user) && !user.ventcrawler) //only carbon and ventcrawlers can climb into disposal by themselves.
|
||||
return FALSE
|
||||
if (iscyborg(user))
|
||||
var/mob/living/silicon/robot/borg = user
|
||||
if (!borg.module || !borg.module.canDispose)
|
||||
return
|
||||
else
|
||||
return FALSE
|
||||
if(!isturf(user.loc)) //No magically doing it from inside closets
|
||||
return FALSE
|
||||
if(target.buckled || target.has_buckled_mobs())
|
||||
|
||||
@@ -52,6 +52,10 @@
|
||||
if(istype(AM, /obj/item/smallDelivery) && !hasmob)
|
||||
var/obj/item/smallDelivery/T = AM
|
||||
src.destinationTag = T.sortTag
|
||||
else if(istype(AM, /mob/living/silicon/robot))
|
||||
var/obj/item/destTagger/borg/tagger = locate() in AM
|
||||
if (tagger)
|
||||
src.destinationTag = tagger.currTag
|
||||
|
||||
|
||||
// start the movement process
|
||||
@@ -113,7 +117,7 @@
|
||||
if(user.incapacitated())
|
||||
return
|
||||
for(var/mob/M in range(5, get_turf(src)))
|
||||
M.show_message("<FONT size=[max(0, 5 - get_dist(src, M))]>CLONG, clong!</FONT>", 2)
|
||||
M.show_message("<FONT size=[max(0, 5 - get_dist(src, M))]>CLONG, clong!</FONT>", MSG_AUDIBLE)
|
||||
playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0)
|
||||
|
||||
// called to vent all gas in holder to a location
|
||||
|
||||
@@ -50,13 +50,13 @@
|
||||
sortTypes |= n
|
||||
|
||||
/obj/structure/disposalpipe/sorting/mail/examine(mob/user)
|
||||
..()
|
||||
. = ..()
|
||||
if(sortTypes.len)
|
||||
to_chat(user, "It is tagged with the following tags:")
|
||||
. += "It is tagged with the following tags:"
|
||||
for(var/t in sortTypes)
|
||||
to_chat(user, "\t[GLOB.TAGGERLOCATIONS[t]].")
|
||||
. += "\t[GLOB.TAGGERLOCATIONS[t]]."
|
||||
else
|
||||
to_chat(user, "It has no sorting tags set.")
|
||||
. += "It has no sorting tags set."
|
||||
|
||||
|
||||
/obj/structure/disposalpipe/sorting/mail/attackby(obj/item/I, mob/user, params)
|
||||
|
||||
Reference in New Issue
Block a user