modules misc (#18315)

This commit is contained in:
KalevTait
2022-07-20 22:56:34 +02:00
committed by GitHub
parent 234a471cf9
commit 938135f3d8
48 changed files with 214 additions and 214 deletions
@@ -7,8 +7,8 @@
desc = "A huge pipe segment used for constructing disposal systems."
icon = 'icons/obj/pipes/disposal.dmi'
icon_state = "conpipe-s"
anchored = 0
density = 0
anchored = FALSE
density = FALSE
pressure_resistance = 5*ONE_ATMOSPHERE
level = 2
max_integrity = 200
@@ -171,20 +171,20 @@
if(istype(I, /obj/item/wrench))
if(anchored)
anchored = 0
anchored = FALSE
if(ispipe)
level = 2
density = 0
density = FALSE
else
density = 1
density = TRUE
to_chat(user, "You detach the [nicetype] from the underfloor.")
else
anchored = 1
anchored = TRUE
if(ispipe)
level = 1 // We don't want disposal bins to disappear under the floors
density = 0
density = FALSE
else
density = 1 // We don't want disposal bins or outlets to go density 0
density = TRUE // We don't want disposal bins or outlets to go density 0
to_chat(user, "You attach the [nicetype] to the underfloor.")
playsound(src.loc, I.usesound, 100, 1)
update()
+22 -22
View File
@@ -12,8 +12,8 @@
desc = "A pneumatic waste disposal unit."
icon = 'icons/obj/pipes/disposal.dmi'
icon_state = "disposal"
anchored = 1
density = 1
anchored = TRUE
density = TRUE
on_blueprints = TRUE
armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 100, BOMB = 0, BIO = 100, RAD = 100, FIRE = 90, ACID = 30)
max_integrity = 200
@@ -58,8 +58,8 @@
transfer_fingerprints_to(C)
C.ptype = ptype
C.update()
C.anchored = 0
C.density = 1
C.anchored = FALSE
C.density = TRUE
qdel(src)
/obj/machinery/disposal/Destroy()
@@ -161,8 +161,8 @@
var/obj/structure/disposalconstruct/C = new (src.loc)
C.ptype = deconstructs_to
C.update()
C.anchored = 1
C.density = 1
C.anchored = TRUE
C.density = TRUE
qdel(src)
// mouse drop another mob or self
@@ -498,7 +498,7 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
var/datum/gas_mixture/gas = null // gas used to flush, will appear at exit point
var/active = 0 // true if the holder is moving, otherwise inactive
var/active = FALSE // true if the holder is moving, otherwise inactive
dir = 0
var/count = 1000 //*** can travel 1000 steps before going inactive (in case of loops)
var/has_fat_guy = 0 // true if contains a fat person
@@ -508,7 +508,7 @@
/obj/structure/disposalholder/Destroy()
QDEL_NULL(gas)
active = 0
active = FALSE
return ..()
// initialize a holder from the contents of a disposal unit
@@ -565,7 +565,7 @@
return
forceMove(D.trunk)
active = 1
active = TRUE
dir = DOWN
spawn(1)
move() // spawn off the movement process
@@ -582,7 +582,7 @@
H.take_overall_damage(20, 0, "Blunt Trauma") */ //horribly maim any living creature jumping down disposals. c'est la vie
if(has_fat_guy && prob(2)) // chance of becoming stuck per segment if contains a fat guy
active = 0
active = FALSE
// find the fat guys
for(var/mob/living/carbon/human/H in src)
@@ -596,7 +596,7 @@
//
if(!(count--))
active = 0
active = FALSE
return
@@ -662,8 +662,8 @@
icon = 'icons/obj/pipes/disposal.dmi'
name = "disposal pipe"
desc = "An underfloor disposal pipe."
anchored = 1
density = 0
anchored = TRUE
density = FALSE
on_blueprints = TRUE
level = 1 // underfloor only
@@ -688,7 +688,7 @@
// ensure if holder is present, it is expelled
/obj/structure/disposalpipe/Destroy()
for(var/obj/structure/disposalholder/H in contents)
H.active = 0
H.active = FALSE
var/turf/T = loc
if(T.density)
// deleting pipe is inside a dense turf (wall)
@@ -776,7 +776,7 @@
var/turf/target
if(T.density) // dense ouput turf, so stop holder
H.active = 0
H.active = FALSE
H.forceMove(src)
return
if(T.intact && istype(T,/turf/simulated/floor)) //intact floor, pop the tile
@@ -837,7 +837,7 @@
var/obj/structure/disposalholder/H = locate() in src
if(H)
// holder was present
H.active = 0
H.active = FALSE
var/turf/T = src.loc
if(T.density)
// broken pipe is inside a dense turf (wall)
@@ -928,7 +928,7 @@
// *** TEST verb
//client/verb/dispstop()
// for(var/obj/structure/disposalholder/H in world)
// H.active = 0
// H.active = FALSE
// a straight or bent segment
/obj/structure/disposalpipe/segment
@@ -1261,10 +1261,10 @@
desc = "An outlet for the pneumatic disposal system."
icon = 'icons/obj/pipes/disposal.dmi'
icon_state = "outlet"
density = 1
anchored = 1
density = TRUE
anchored = TRUE
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
var/active = 0
var/active = FALSE
var/turf/target // this will be where the output objects are 'thrown' to.
var/obj/structure/disposalpipe/trunk/linkedtrunk
var/mode = 0
@@ -1350,8 +1350,8 @@
transfer_fingerprints_to(C)
C.ptype = PIPE_DISPOSALS_OUTLET
C.update()
C.anchored = 0
C.density = 1
C.anchored = FALSE
C.density = TRUE
qdel(src)
// called when movable is expelled from a disposal pipe or outlet
+6 -6
View File
@@ -3,11 +3,11 @@
desc = "A big wrapped package."
icon = 'icons/obj/storage.dmi'
icon_state = "deliverycloset"
density = 1
density = TRUE
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
var/obj/wrapped = null
var/init_welded = 0
var/giftwrapped = 0
var/init_welded = FALSE
var/giftwrapped = FALSE
var/sortTag = 0
/obj/structure/bigDelivery/Destroy()
@@ -62,7 +62,7 @@
var/obj/item/stack/wrapping_paper/WP = W
if(WP.use(3))
user.visible_message("<span class='notice'>[user] wraps the package in festive paper!</span>")
giftwrapped = 1
giftwrapped = TRUE
if(istype(wrapped, /obj/structure/closet/crate))
icon_state = "giftcrate"
else
@@ -80,7 +80,7 @@
icon = 'icons/obj/storage.dmi'
icon_state = "deliverycrate2"
var/obj/item/wrapped = null
var/giftwrapped = 0
var/giftwrapped = FALSE
var/sortTag = 0
/obj/item/smallDelivery/ex_act(severity)
@@ -130,7 +130,7 @@
var/obj/item/stack/wrapping_paper/WP = W
if(WP.use(1))
icon_state = "giftcrate[wrapped.w_class]"
giftwrapped = 1
giftwrapped = TRUE
user.visible_message("<span class='notice'>[user] wraps the package in festive paper!</span>")
if(WP.amount <= 0 && !WP.loc) //if we used our last wrapping paper, drop a cardboard tube
new /obj/item/c_tube( get_turf(user) )