Convert some bools to TRUE/FALSE instead of 1/0. (#11100)

Co-authored-by: Aronai Sieyes <arokha@arokha.com>
This commit is contained in:
MarinaGryphon
2021-07-16 12:43:25 -05:00
committed by GitHub
parent 9ce7af6ca1
commit 577b986ba6
523 changed files with 1301 additions and 1301 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
/atom/movable
var/can_buckle = 0
var/can_buckle = FALSE
var/buckle_movable = 0
var/buckle_dir = 0
var/buckle_lying = -1 //bed-like behavior, forces mob.lying = buckle_lying if != -1
+9 -9
View File
@@ -23,9 +23,9 @@
desc = "Looks like some kind of slimy growth."
icon_state = "resin"
density = 1
density = TRUE
opacity = 1
anchored = 1
anchored = TRUE
can_atmos_pass = ATMOS_PASS_NO
var/health = 200
//var/mob/living/affecting = null
@@ -54,7 +54,7 @@
/obj/effect/alien/resin/proc/healthcheck()
if(health <=0)
density = 0
density = FALSE
qdel(src)
return
@@ -163,8 +163,8 @@
name = "growth"
desc = "Weird organic growth."
icon_state = "weeds"
anchored = 1
density = 0
anchored = TRUE
density = FALSE
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
@@ -374,9 +374,9 @@
desc = "Burbling corrossive stuff. I wouldn't want to touch it."
icon_state = "acid"
density = 0
density = FALSE
opacity = 0
anchored = 1
anchored = TRUE
var/atom/target
var/ticks = 0
@@ -439,8 +439,8 @@
name = "egg"
// icon_state = "egg_growing" // So the egg looks 'grown', even though it's not.
icon_state = "egg"
density = 0
anchored = 1
density = FALSE
anchored = TRUE
var/health = 100
var/status = BURST //can be GROWING, GROWN or BURST; all mutually exclusive
+2 -2
View File
@@ -7,8 +7,8 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
var/id = null //id of this bump_teleporter.
var/id_target = null //id of bump_teleporter which this moves you to.
invisibility = 101 //nope, can't see this
anchored = 1
density = 1
anchored = TRUE
density = TRUE
opacity = 0
/obj/effect/bump_teleporter/New()
+5 -5
View File
@@ -6,8 +6,8 @@
name = "foam"
icon_state = "foam"
opacity = 0
anchored = 1
density = 0
anchored = TRUE
density = FALSE
layer = OBJ_LAYER + 0.9
mouse_opacity = 0
animate_movement = 0
@@ -134,9 +134,9 @@
/obj/structure/foamedmetal
icon = 'icons/effects/effects.dmi'
icon_state = "metalfoam"
density = 1
density = TRUE
opacity = 1 // changed in New()
anchored = 1
anchored = TRUE
name = "foamed metal"
desc = "A lightweight foamed metal wall."
can_atmos_pass = ATMOS_PASS_NO
@@ -147,7 +147,7 @@
update_nearby_tiles(1)
/obj/structure/foamedmetal/Destroy()
density = 0
density = FALSE
update_nearby_tiles(1)
return ..()
@@ -4,7 +4,7 @@
icon_state = "fuel"
plane = DIRTY_PLANE
layer = DIRTY_LAYER
anchored = 1
anchored = TRUE
var/amount = 1
generic_filth = TRUE
persistent = FALSE
@@ -51,7 +51,7 @@
/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel
icon_state = "mustard"
anchored = 0
anchored = FALSE
/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/New(newLoc, amt = 1, d = 0)
set_dir(d) //Setting this direction means you won't get torched by your own flamethrower.
@@ -8,8 +8,8 @@ var/global/list/image/splatter_cache=list()
desc = "It's thick and gooey. Perhaps it's the chef's cooking?"
var/drydesc = "It's dry and crusty. Someone is not doing their job."
gender = PLURAL
density = 0
anchored = 1
density = FALSE
anchored = TRUE
plane = BLOOD_PLANE
layer = BLOOD_DECAL_LAYER
icon = 'icons/effects/blood.dmi'
@@ -173,8 +173,8 @@ var/global/list/image/splatter_cache=list()
name = "gibs"
desc = "They look bloody and gruesome."
gender = PLURAL
density = 0
anchored = 1
density = FALSE
anchored = TRUE
icon = 'icons/effects/blood.dmi'
icon_state = "gibbl5"
random_icon_states = list("gib1", "gib2", "gib3", "gib5", "gib6")
@@ -229,8 +229,8 @@ var/global/list/image/splatter_cache=list()
name = "mucus"
desc = "Disgusting mucus."
gender = PLURAL
density = 0
anchored = 1
density = FALSE
anchored = TRUE
icon = 'icons/effects/blood.dmi'
icon_state = "mucus"
random_icon_states = list("mucus")
@@ -2,8 +2,8 @@
name = "clutter"
desc = "Someone should clean that up."
gender = PLURAL
density = 0
anchored = 1
density = FALSE
anchored = TRUE
icon = 'icons/obj/objects.dmi'
icon_state = "shards"
@@ -13,7 +13,7 @@
gender = PLURAL
icon = 'icons/obj/objects.dmi'
icon_state = "ash"
anchored = 1
anchored = TRUE
/obj/effect/decal/cleanable/ash/attack_hand(mob/user as mob)
to_chat(user, "<span class='notice'>[src] sifts through your fingers.</span>")
@@ -32,8 +32,8 @@
name = "dirt"
desc = "Someone should clean that up."
gender = PLURAL
density = 0
anchored = 1
density = FALSE
anchored = TRUE
icon = 'icons/effects/effects.dmi'
icon_state = "dirt"
mouse_opacity = 0
@@ -42,8 +42,8 @@
name = "flour"
desc = "It's still good. Four second rule!"
gender = PLURAL
density = 0
anchored = 1
density = FALSE
anchored = TRUE
icon = 'icons/effects/effects.dmi'
icon_state = "flour"
@@ -51,8 +51,8 @@
name = "glowing goo"
desc = "Jeez. I hope that's not for lunch."
gender = PLURAL
density = 0
anchored = 1
density = FALSE
anchored = TRUE
light_range = 1
icon = 'icons/effects/effects.dmi'
icon_state = "greenglow"
@@ -60,8 +60,8 @@
/obj/effect/decal/cleanable/cobweb
name = "cobweb"
desc = "Somebody should remove that."
density = 0
anchored = 1
density = FALSE
anchored = TRUE
plane = OBJ_PLANE
icon = 'icons/effects/effects.dmi'
icon_state = "cobweb1"
@@ -69,8 +69,8 @@
/obj/effect/decal/cleanable/molten_item
name = "gooey grey mass"
desc = "It looks like a melted... something."
density = 0
anchored = 1
density = FALSE
anchored = TRUE
plane = OBJ_PLANE
icon = 'icons/obj/chemical.dmi'
icon_state = "molten"
@@ -78,8 +78,8 @@
/obj/effect/decal/cleanable/cobweb2
name = "cobweb"
desc = "Somebody should remove that."
density = 0
anchored = 1
density = FALSE
anchored = TRUE
plane = OBJ_PLANE
icon = 'icons/effects/effects.dmi'
icon_state = "cobweb2"
@@ -89,8 +89,8 @@
name = "vomit"
desc = "Gosh, how unpleasant."
gender = PLURAL
density = 0
anchored = 1
density = FALSE
anchored = TRUE
icon = 'icons/effects/blood.dmi'
icon_state = "vomit_1"
random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
@@ -99,32 +99,32 @@
/obj/effect/decal/cleanable/tomato_smudge
name = "tomato smudge"
desc = "It's red."
density = 0
anchored = 1
density = FALSE
anchored = TRUE
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
/obj/effect/decal/cleanable/egg_smudge
name = "smashed egg"
desc = "Seems like this one won't hatch."
density = 0
anchored = 1
density = FALSE
anchored = TRUE
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
/obj/effect/decal/cleanable/pie_smudge //honk
name = "smashed pie"
desc = "It's pie cream from a cream pie."
density = 0
anchored = 1
density = FALSE
anchored = TRUE
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_pie")
/obj/effect/decal/cleanable/fruit_smudge
name = "smudge"
desc = "Some kind of fruit smear."
density = 0
anchored = 1
density = FALSE
anchored = TRUE
icon = 'icons/effects/blood.dmi'
icon_state = "mfloor1"
random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7")
@@ -129,7 +129,7 @@
name = "poster"
desc = "A large piece of space-resistant printed paper. "
icon = 'icons/obj/contraband_vr.dmi' //VOREStation Edit
anchored = 1
anchored = TRUE
var/serial_number //Will hold the value of src.loc if nobody initialises it
var/poster_type //So mappers can specify a desired poster
var/ruined = 0
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/rune.dmi'
plane = DIRTY_PLANE
layer = DIRTY_LAYER
anchored = 1
anchored = TRUE
/obj/effect/decal/cleanable/crayon/New(location,main = "#FFFFFF",shade = "#000000",var/type = "rune")
..()
+3 -3
View File
@@ -4,11 +4,11 @@
icon = 'icons/mob/screen1.dmi'
icon_state = "arrow"
plane = ABOVE_PLANE
anchored = 1
anchored = TRUE
mouse_opacity = 0
// Used for spray that you spray at walls, tables, hydrovats etc
/obj/effect/decal/spraystill
density = 0
anchored = 1
density = FALSE
anchored = TRUE
plane = ABOVE_PLANE
@@ -117,7 +117,7 @@
desc = "A large piece of space-resistant printed paper. "
icon = 'icons/obj/contraband_vr.dmi' //VOREStation Edit
icon_state = "poster" //VOREStation Edit
anchored = 1
anchored = TRUE
var/decl/poster/poster_decl = null
var/target_poster_decl_path = /decl/poster
var/roll_type = /obj/item/poster
+1 -1
View File
@@ -3,7 +3,7 @@
gender = PLURAL
icon = 'icons/effects/blood.dmi'
icon_state = "remains"
anchored = 0
anchored = FALSE
/obj/effect/decal/remains/human
desc = "They look like human remains. They have a strange aura about them."
+5 -5
View File
@@ -11,7 +11,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
name = "effect"
icon = 'icons/effects/effects.dmi'
mouse_opacity = 0
unacidable = 1//So effect are not targeted by alien acid.
unacidable = TRUE//So effect are not targeted by alien acid.
pass_flags = PASSTABLE | PASSGRILLE
blocks_emissive = EMISSIVE_BLOCK_GENERIC
light_on = TRUE
@@ -60,7 +60,7 @@ steam.start() -- spawns the effect
name = "steam"
icon = 'icons/effects/effects.dmi'
icon_state = "extinguish"
density = 0
density = FALSE
/datum/effect/effect/system/steam_spread/set_up(n = 3, c = 0, turf/loc)
if(n > 10)
@@ -98,7 +98,7 @@ steam.start() -- spawns the effect
name = "sparks"
icon_state = "sparks"
var/amount = 6.0
anchored = 1.0
anchored = TRUE
mouse_opacity = 0
/obj/effect/effect/sparks/Initialize()
@@ -168,7 +168,7 @@ steam.start() -- spawns the effect
name = "smoke"
icon_state = "smoke"
opacity = 1
anchored = 0.0
anchored = FALSE
mouse_opacity = 0
var/amount = 6.0
var/time_to_live = 100
@@ -422,7 +422,7 @@ steam.start() -- spawns the effect
/obj/effect/effect/ion_trails
name = "ion trails"
icon_state = "ion_trails"
anchored = 1.0
anchored = TRUE
/datum/effect/effect/system/ion_trail_follow
var/turf/oldposition
@@ -3,7 +3,7 @@
icon = 'icons/effects/effects.dmi'
icon_state = "explosion_particle"
opacity = 1
anchored = 1
anchored = TRUE
mouse_opacity = 0
/obj/effect/expl_particles/New()
@@ -37,7 +37,7 @@
icon = 'icons/effects/96x96.dmi'
icon_state = "explosion"
opacity = 1
anchored = 1
anchored = TRUE
mouse_opacity = 0
pixel_x = -32
pixel_y = -32
@@ -1,5 +1,5 @@
/obj/effect/temporary_effect/item_pickup_ghost
anchored = 1
anchored = TRUE
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
mouse_opacity = 0//just in case something dumb happens
+6 -6
View File
@@ -2,9 +2,9 @@
name = "landmark"
icon = 'icons/mob/screen1.dmi'
icon_state = "x2"
anchored = 1.0
unacidable = 1
simulated = 0
anchored = TRUE
unacidable = TRUE
simulated = FALSE
invisibility = 100
var/delete_me = 0
@@ -24,7 +24,7 @@
return
if("JoinLate") // Bit difference, since we need the spawn point to move.
latejoin += src
simulated = 1
simulated = TRUE
// delete_me = 1
return
if("JoinLateGateway")
@@ -99,7 +99,7 @@
name = "start"
icon = 'icons/mob/screen1.dmi'
icon_state = "x"
anchored = 1.0
anchored = TRUE
/obj/effect/landmark/start/New()
..()
@@ -122,7 +122,7 @@
name = "virtual_reality"
icon = 'icons/mob/screen1.dmi'
icon_state = "x"
anchored = 1.0
anchored = TRUE
/obj/effect/landmark/virtual_reality/New()
..()
+1 -1
View File
@@ -2,7 +2,7 @@
name = "manifest"
icon = 'icons/mob/screen1.dmi'
icon_state = "x"
unacidable = 1//Just to be sure.
unacidable = TRUE//Just to be sure.
/obj/effect/manifest/New()
+3 -3
View File
@@ -1,14 +1,14 @@
/obj/effect/mine
name = "land mine" //The name and description are deliberately NOT modified, so you can't game the mines you find.
desc = "A small explosive land mine."
density = 0
anchored = 1
density = FALSE
anchored = TRUE
icon = 'icons/obj/weapons.dmi'
icon_state = "uglymine"
var/triggered = 0
var/smoke_strength = 3
var/obj/item/weapon/mine/mineitemtype = /obj/item/weapon/mine
var/panel_open = 0
var/panel_open = FALSE
var/datum/wires/mines/wires = null
var/camo_net = FALSE // Will the mine 'cloak' on deployment?
+2 -2
View File
@@ -4,8 +4,8 @@
desc = "It's a ... present?"
icon = 'icons/obj/items.dmi'
icon_state = "strangepresent"
density = 1
anchored = 0
density = TRUE
anchored = FALSE
/obj/effect/temporary_effect
name = "self deleting effect"
+8 -8
View File
@@ -1,6 +1,6 @@
/obj/effect/overlay
name = "overlay"
unacidable = 1
unacidable = TRUE
var/i_attached//Added for possible image attachments to objects. For hallucinations and the like.
/obj/effect/overlay/beam//Not actually a projectile, just an effect.
@@ -18,19 +18,19 @@
name = "Palm tree"
icon = 'icons/misc/beach2.dmi'
icon_state = "palm1"
density = 1
density = TRUE
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
anchored = 1
anchored = TRUE
/obj/effect/overlay/palmtree_l
name = "Palm tree"
icon = 'icons/misc/beach2.dmi'
icon_state = "palm2"
density = 1
density = TRUE
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
anchored = 1
anchored = TRUE
/obj/effect/overlay/coconut
name = "Coconuts"
@@ -47,8 +47,8 @@
name = "wallrot"
desc = "Ick..."
icon = 'icons/effects/wallrot.dmi'
anchored = 1
density = 1
anchored = TRUE
density = TRUE
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
mouse_opacity = 0
@@ -62,7 +62,7 @@
name = "snow"
icon = 'icons/turf/overlays.dmi'
icon_state = "snow"
anchored = 1
anchored = TRUE
plane = TURF_PLANE
// Todo: Add a version that gradually reaccumulates over time by means of alpha transparency. -Spades
+3 -3
View File
@@ -5,12 +5,12 @@ GLOBAL_LIST_BOILERPLATE(all_portals, /obj/effect/portal)
desc = "Looks unstable. Best to test it with the clown."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "portal"
density = 1
unacidable = 1//Can't destroy energy portals.
density = TRUE
unacidable = TRUE//Can't destroy energy portals.
var/failchance = 5
var/obj/item/target = null
var/creator = null
anchored = 1.0
anchored = TRUE
/obj/effect/portal/Bumped(mob/M as mob|obj)
if(istype(M,/mob) && !(istype(M,/mob/living)))
+3 -3
View File
@@ -3,8 +3,8 @@
name = "web"
desc = "it's stringy and sticky"
icon = 'icons/effects/effects.dmi'
anchored = 1
density = 0
anchored = TRUE
density = FALSE
var/health = 15
//similar to weeds, but only barfed out by nurses manually
@@ -137,7 +137,7 @@
name = "spiderling"
desc = "It never stays still for long."
icon_state = "spiderling"
anchored = 0
anchored = FALSE
layer = HIDING_LAYER
health = 3
var/last_itch = 0
+1 -1
View File
@@ -5,7 +5,7 @@
var/stopper = 1 // stops throwers
invisibility = 99 // nope cant see this shit
plane = ABOVE_PLANE
anchored = 1
anchored = TRUE
icon = 'icons/mob/screen1.dmi' //VS Edit
icon_state = "centermarker" //VS Edit
+2 -2
View File
@@ -4,8 +4,8 @@
icon = 'icons/mob/screen1.dmi'
icon_state = "x3"
invisibility = 101 //nope, can't see this
anchored = 1
density = 0
anchored = TRUE
density = FALSE
opacity = 0
can_atmos_pass = ATMOS_PASS_PROC
+1 -1
View File
@@ -49,7 +49,7 @@
var/permeability_coefficient = 1 // for chemicals/diseases
var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit)
var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up
var/canremove = 1 //Mostly for Ninja code at this point but basically will not allow the item to be removed if set to 0. /N
var/canremove = TRUE //Mostly for Ninja code at this point but basically will not allow the item to be removed if set to 0. /N
var/list/armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0)
var/list/armorsoak = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0)
var/list/allowed = null //suit storage stuff.
+2 -2
View File
@@ -27,7 +27,7 @@
open_sound = 'sound/items/zip.ogg'
close_sound = 'sound/items/zip.ogg'
var/item_path = /obj/item/bodybag
density = 0
density = FALSE
storage_capacity = (MOB_MEDIUM * 2) - 1
var/contains_body = 0
@@ -59,7 +59,7 @@
/obj/structure/closet/body_bag/close()
if(..())
density = 0
density = FALSE
return 1
return 0
@@ -86,8 +86,8 @@
/obj/effect/dummy/chameleon
name = ""
desc = ""
density = 0
anchored = 1
density = FALSE
anchored = TRUE
var/can_move = 1
var/obj/item/device/chameleon/master = null
+1 -1
View File
@@ -94,7 +94,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "geiger_wall"
item_state = "geiger_wall"
anchored = 1
anchored = TRUE
scanning = 1
radiation_count = 0
plane = TURF_PLANE
+2 -2
View File
@@ -38,7 +38,7 @@
to_chat(user, "No exposed cable here to attach to.")
return
else
anchored = 1
anchored = TRUE
mode = 1
src.visible_message("<span class='notice'>[user] attaches [src] to the cable!</span>")
playsound(src, I.usesound, 50, 1)
@@ -50,7 +50,7 @@
if (mode == 2)
STOP_PROCESSING(SSobj, src) // Now the power sink actually stops draining the station's power if you unhook it. --NeoFite
STOP_PROCESSING_POWER_OBJECT(src)
anchored = 0
anchored = FALSE
mode = 0
src.visible_message("<span class='notice'>[user] detaches [src] from the cable!</span>")
set_light(0)
@@ -4,7 +4,7 @@
icon = 'icons/obj/radio_vr.dmi' //VOREStation Edit - New Icon
icon_state = "intercom"
layer = ABOVE_WINDOW_LAYER
anchored = 1
anchored = TRUE
w_class = ITEMSIZE_LARGE
canhear_range = 7 //VOREStation Edit
flags = NOBLOODY
@@ -397,7 +397,7 @@ not carry this around."}, "OOC Warning", list("Take It","Leave It"))
icon = 'icons/obj/radio_vr.dmi'
icon_state = "floor_beacon"
w_class = ITEMSIZE_HUGE
anchored = 1
anchored = TRUE
GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beacon/stationary)
@@ -462,7 +462,7 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac
icon_state = "frontiertrans"
beacons_left = 1 //Just one
battery_lock = 1
unacidable = 1
unacidable = TRUE
failure_chance = 0 //Percent
var/phase_power = 75
+3 -3
View File
@@ -64,7 +64,7 @@
icon = 'icons/obj/closets/poireactor.dmi'
closet_appearance = null
catalogue_data = list(/datum/category_item/catalogue/information/objects/oldreactor)
climbable = 0
climbable = FALSE
starts_with = list(
/obj/item/weapon/fuel_assembly/deuterium = 6)
@@ -110,5 +110,5 @@
icon = 'icons/obj/atmos.dmi'
icon_state = "yellow-1"
catalogue_data = list(/datum/category_item/catalogue/information/objects/growthcanister)
anchored = 0
density = 1
anchored = FALSE
density = TRUE
+2 -2
View File
@@ -4,7 +4,7 @@
desc = "A shooting target."
icon = 'icons/obj/objects.dmi'
icon_state = "target_h"
density = 0
density = FALSE
var/hp = 1800
var/icon/virtualIcon
var/list/bulletholes = list()
@@ -52,7 +52,7 @@
if(stake)
if(stake.pinned_target)
stake.density = 1
density = 0
density = FALSE
layer = OBJ_LAYER
loc = user.loc
+6 -6
View File
@@ -263,8 +263,8 @@
desc = ""
icon = 'icons/obj/toy.dmi'
icon_state = "null"
anchored = 1
density = 0
anchored = TRUE
density = FALSE
/*
* Toy swords
@@ -827,8 +827,8 @@
desc = "A very generic plushie. It seems to not want to exist."
icon = 'icons/obj/toy.dmi'
icon_state = "ianplushie"
anchored = 0
density = 1
anchored = FALSE
density = TRUE
var/phrase = "I don't want to exist anymore!"
var/searching = FALSE
var/opened = FALSE // has this been slit open? this will allow you to store an object in a plushie.
@@ -1537,8 +1537,8 @@
desc = "A generic balloon. How boring."
icon = 'icons/obj/toy.dmi'
icon_state = "ghostballoon"
anchored = 0
density = 0
anchored = FALSE
density = FALSE
/obj/structure/balloon/attack_hand(mob/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+1 -1
View File
@@ -12,7 +12,7 @@
var/obj/item/weapon/cell/cell
var/cell_type = null //Can put a starting cell here
density = 1 //Is dense, but not anchored, so you can swap with it
density = TRUE //Is dense, but not anchored, so you can swap with it
slowdown = 1.5 //Heevvee.
health = 100
+2 -2
View File
@@ -11,8 +11,8 @@ RSF
icon = 'icons/obj/tools_vr.dmi' //VOREStation Edit
icon_state = "rsf" //VOREStation Edit
opacity = 0
density = 0
anchored = 0.0
density = FALSE
anchored = FALSE
matter = list(DEFAULT_WALL_MATERIAL = 25000)
var/stored_matter = 30
var/mode = 1
@@ -18,7 +18,7 @@
w_class = ITEMSIZE_SMALL
force = 15
armor_penetration = 25
sharp = 1
sharp = TRUE
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
defend_chance = 10
projectile_parry_chance = 5
@@ -31,7 +31,7 @@
w_class = ITEMSIZE_HUGE
force = 30
armor_penetration = 15
edge = 1
edge = TRUE
pry = 1
defend_chance = 40
projectile_parry_chance = 20
@@ -9,8 +9,8 @@
icon = 'icons/obj/module.dmi'
icon_state = "id_mod"
origin_tech = list(TECH_DATA = 2)
density = 0
anchored = 0
density = FALSE
anchored = FALSE
w_class = ITEMSIZE_SMALL
force = 5.0
throwforce = 5.0
@@ -6,7 +6,7 @@
w_class = ITEMSIZE_SMALL
force = 2.0
det_time = null
unacidable = 1
unacidable = TRUE
var/stage = 0
var/state = 0
@@ -5,9 +5,9 @@
desc = "Used to implant occupants with loyalty implants."
icon = 'icons/obj/machines/implantchair.dmi'
icon_state = "implantchair"
density = 1
density = TRUE
opacity = 0
anchored = 1
anchored = TRUE
var/ready = 1
var/malfunction = 0
@@ -42,8 +42,8 @@
attack_verb = list("shredded", "ripped", "torn")
playsound(src, 'sound/weapons/chainsaw_startup.ogg',40,1)
force = active_force
edge = 1
sharp = 1
edge = TRUE
sharp = TRUE
on = 1
update_icon()
else
@@ -55,8 +55,8 @@
attack_verb = list("bluntly hit", "beat", "knocked")
playsound(src, 'sound/weapons/chainsaw_turnoff.ogg',40,1)
force = inactive_force
edge = 0
sharp = 0
edge = FALSE
sharp = FALSE
on = 0
update_icon()
@@ -14,8 +14,8 @@
/obj/item/weapon/material/butterfly/update_force()
if(active)
edge = 1
sharp = 1
edge = TRUE
sharp = TRUE
..() //Updates force.
throwforce = max(3,force-3)
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -24,8 +24,8 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
else
force = 3
edge = 0
sharp = 0
edge = FALSE
sharp = FALSE
hitsound = initial(hitsound)
icon_state = initial(icon_state)
w_class = initial(w_class)
@@ -63,8 +63,8 @@
icon = 'icons/obj/kitchen.dmi'
icon_state = "knife"
desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
force_divisor = 0.15 // 9 when wielded with hardness 60 (steel)
matter = list(MAT_STEEL = 12000)
origin_tech = list(TECH_MATERIAL = 1)
@@ -8,8 +8,8 @@
throw_speed = 3
throw_range = 7
w_class = ITEMSIZE_NORMAL
sharp = 0
edge = 0
sharp = FALSE
edge = FALSE
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_material.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_material.dmi',
@@ -120,8 +120,8 @@
playsound(src, "shatter", 70, 1)
dulled = 1
if(is_sharp() || has_edge())
sharp = 0
edge = 0
sharp = FALSE
edge = FALSE
/obj/item/weapon/material/proc/repair(var/repair_amount, var/repair_time, mob/living/user)
if(!fragile)
@@ -1,7 +1,7 @@
/obj/item/weapon/material/harpoon
name = "harpoon"
sharp = 1
edge = 0
sharp = TRUE
edge = FALSE
desc = "Tharr she blows!"
icon_state = "harpoon"
item_state = "harpoon"
@@ -16,8 +16,8 @@
force_divisor = 0.2 // 12 with hardness 60 (steel)
thrown_force_divisor = 0.75 // 15 with weight 20 (steel)
w_class = ITEMSIZE_SMALL
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1)
attack_verb = list("chopped", "torn", "cut")
applies_material_colour = 0
@@ -6,8 +6,8 @@
desc = "Made of nothing. How does this even exist?" // set based on material, if this desc is visible it's a bug (shards default to being made of glass)
icon_state = "large"
randpixel = 8
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
w_class = ITEMSIZE_SMALL
force_divisor = 0.25 // 7.5 with hardness 30 (glass)
thrown_force_divisor = 0.5
@@ -5,8 +5,8 @@
slot_flags = SLOT_BELT
force_divisor = 0.7 // 42 when wielded with hardnes 60 (steel)
thrown_force_divisor = 0.5 // 10 when thrown with weight 20 (steel)
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
drop_sound = 'sound/items/drop/sword.ogg'
@@ -6,8 +6,8 @@
thrown_force_divisor = 0.75 // 15 with weight 20 (steel)
throw_speed = 10
throw_range = 15
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
/obj/item/weapon/material/star/New()
..()
@@ -90,8 +90,8 @@
unwielded_force_divisor = 0.25
force_divisor = 0.7 // 10/42 with hardness 60 (steel) and 0.25 unwielded divisor
dulled_divisor = 0.75 //Still metal on a stick
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
force_wielded = 30
@@ -153,8 +153,8 @@
unwielded_force_divisor = 0.375
thrown_force_divisor = 1.5 // 22.5 when thrown with weight 15 (glass)
throw_speed = 3
edge = 0
sharp = 1
edge = FALSE
sharp = TRUE
hitsound = 'sound/weapons/bladeslice.ogg'
mob_throw_hit_sound = 'sound/weapons/pierce.ogg'
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
@@ -176,8 +176,8 @@
thrown_force_divisor = 1
default_material = "MAT_STEEL"
fragile = 0
sharp = 1
edge = 0
sharp = TRUE
edge = FALSE
/obj/item/weapon/material/twohanded/riding_crop
name = "riding crop"
+15 -15
View File
@@ -4,8 +4,8 @@
var/active_throwforce
var/active_w_class
var/active_embed_chance = 0 //In the off chance one of these is supposed to embed, you can just tweak this var
sharp = 0
edge = 0
sharp = FALSE
edge = FALSE
armor_penetration = 50
flags = NOCONDUCT | NOBLOODY
var/lrange = 2
@@ -54,8 +54,8 @@
embed_chance = active_embed_chance
force = active_force
throwforce = active_throwforce
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
w_class = active_w_class
playsound(src, 'sound/weapons/saberon.ogg', 50, 1)
update_icon()
@@ -224,8 +224,8 @@
w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 4)
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
can_cleave = TRUE
/obj/item/weapon/melee/energy/axe/activate(mob/living/user)
@@ -276,8 +276,8 @@
w_class = ITEMSIZE_SMALL
flags = NOBLOODY
origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
colorable = TRUE
drop_sound = 'sound/items/drop/sword.ogg'
pickup_sound = 'sound/items/pickup/sword.ogg'
@@ -358,8 +358,8 @@
active_force = 5
active_throwforce = 3
active_embed_chance = 0
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
armor_penetration = 0
flags = NOBLOODY
lrange = 2
@@ -427,9 +427,9 @@
item_state = "blade"
force = 40 //Normal attacks deal very high damage - about the same as wielded fire axe
armor_penetration = 100
sharp = 1
edge = 1
anchored = 1 // Never spawned outside of inventory, should be fine.
sharp = TRUE
edge = TRUE
anchored = TRUE // Never spawned outside of inventory, should be fine.
throwforce = 1 //Throwing or dropping the item deletes it.
throw_speed = 1
throw_range = 1
@@ -514,8 +514,8 @@
desc = "Concentrated energy forming a sharp tip at the end of a long rod."
icon_state = "espear"
armor_penetration = 75
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
force = 5
throwforce = 10
throw_speed = 7
@@ -59,8 +59,8 @@
force = 30
throwforce = 10
w_class = ITEMSIZE_NORMAL
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
can_speak = 1
@@ -10,7 +10,7 @@
force = 15
throwforce = 10
w_class = ITEMSIZE_NORMAL
sharp = 1
edge = 0
sharp = TRUE
edge = FALSE
attack_verb = list("stabbed", "lunged at", "dextrously struck", "sliced", "lacerated", "impaled", "diced", "charioted")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -4,7 +4,7 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "mop"
force = 3
anchored = 1 // Never spawned outside of inventory, should be fine.
anchored = TRUE // Never spawned outside of inventory, should be fine.
throwforce = 1 //Throwing or dropping the item deletes it.
throw_speed = 1
throw_range = 1
+1 -1
View File
@@ -14,7 +14,7 @@ var/global/list/cached_icons = list()
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(10,20,30,60)
volume = 60
unacidable = 0
unacidable = FALSE
flags = OPENCONTAINER
var/paint_type = "red"
@@ -32,7 +32,7 @@ var/list/tape_roll_applications = list()
/obj/item/tape
name = "tape"
icon = 'icons/policetape.dmi'
anchored = 1
anchored = TRUE
layer = WINDOW_LAYER
var/lifted = 0
var/crumpled = 0
@@ -21,7 +21,7 @@
allow_quick_gather = 1
allow_quick_empty = 1
display_contents_with_number = 0 // UNStABLE AS FuCK, turn on when it stops crashing clients
use_to_pickup = 1
use_to_pickup = TRUE
slot_flags = SLOT_BELT
drop_sound = 'sound/items/drop/backpack.ogg'
pickup_sound = 'sound/items/pickup/backpack.ogg'
@@ -497,7 +497,7 @@
storage_slots = 24
can_hold = list(/obj/item/weapon/light/tube, /obj/item/weapon/light/bulb)
max_storage_space = ITEMSIZE_COST_SMALL * 24 //holds 24 items of w_class 2
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
use_to_pickup = TRUE // for picking up broken bulbs, not that most people will try
/obj/item/weapon/storage/box/lights/bulbs
starts_with = list(/obj/item/weapon/light/bulb = 24)
@@ -525,7 +525,7 @@
max_w_class = ITEMSIZE_NORMAL
can_hold = list(/obj/item/organ)
max_storage_space = ITEMSIZE_COST_NORMAL * 5 // Formally 21. Odd numbers are bad.
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
use_to_pickup = TRUE // for picking up broken bulbs, not that most people will try
/obj/item/weapon/storage/box/freezer/red
icon_state = "portafreezer_red"
@@ -182,7 +182,7 @@
can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/dice,/obj/item/weapon/paper)
allow_quick_gather = 1
allow_quick_empty = 1
use_to_pickup = 1
use_to_pickup = TRUE
use_sound = 'sound/items/storage/pillbottle.ogg'
max_storage_space = ITEMSIZE_COST_TINY * 14
max_w_class = ITEMSIZE_TINY
@@ -14,7 +14,7 @@
max_w_class = ITEMSIZE_LARGE
max_storage_space = ITEMSIZE_COST_NORMAL * 8
storage_slots = 20
use_to_pickup = 1
use_to_pickup = TRUE
allow_quick_empty = 1
allow_quick_gather = 1
collection_mode = 1
@@ -79,7 +79,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "offhand"
name = "second hand"
use_to_pickup = 0
use_to_pickup = FALSE
/obj/item/weapon/storage/laundry_basket/offhand/dropped(mob/user as mob)
user.drop_from_inventory(linked)
@@ -186,8 +186,8 @@
force = 8.0
w_class = ITEMSIZE_NO_CONTAINER
max_w_class = ITEMSIZE_LARGE // This was 8 previously...
anchored = 1.0
density = 0
anchored = TRUE
density = FALSE
cant_hold = list(/obj/item/weapon/storage/secure/briefcase)
starts_with = list(
/obj/item/weapon/paper,
+2 -2
View File
@@ -6,8 +6,8 @@
item_state = "baton"
slot_flags = SLOT_BELT
force = 15
sharp = 0
edge = 0
sharp = FALSE
edge = FALSE
throwforce = 7
flags = NOCONDUCT
w_class = ITEMSIZE_NORMAL
@@ -98,8 +98,8 @@
desc = "Cut, cut, and once more cut."
icon_state = "scalpel"
force = 10.0
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS
throwforce = 5.0
@@ -172,8 +172,8 @@
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
matter = list(MAT_STEEL = 20000,MAT_GLASS = 10000)
attack_verb = list("attacked", "slashed", "sawed", "cut")
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
/obj/item/weapon/surgical/circular_saw/manager
name = "energetic bone diverter"
@@ -19,7 +19,7 @@
pickup_sound = 'sound/items/pickup/screwdriver.ogg'
matter = list(MAT_STEEL = 75)
attack_verb = list("stabbed")
sharp = 1
sharp = TRUE
toolspeed = 1
tool_qualities = list(TOOL_SCREWDRIVER)
var/random_color = TRUE
@@ -19,8 +19,8 @@
usesound = 'sound/items/wirecutter.ogg'
drop_sound = 'sound/items/drop/wirecutter.ogg'
pickup_sound = 'sound/items/pickup/wirecutter.ogg'
sharp = 1
edge = 1
sharp = TRUE
edge = TRUE
toolspeed = 1
tool_qualities = list(TOOL_WIRECUTTER)
var/random_color = TRUE
+7 -7
View File
@@ -50,7 +50,7 @@
deployed = 1
user.drop_from_inventory(src)
update_icon()
anchored = 1
anchored = TRUE
/obj/item/weapon/beartrap/attack_hand(mob/user as mob)
if(has_buckled_mobs() && can_use(user))
@@ -63,7 +63,7 @@
user.visible_message("<span class='notice'>[victim] has been freed from \the [src] by [user].</span>")
for(var/A in buckled_mobs)
unbuckle_mob(A)
anchored = 0
anchored = FALSE
else if(deployed && can_use(user))
user.visible_message(
"<span class='danger'>[user] starts to disarm \the [src].</span>",
@@ -78,7 +78,7 @@
"<span class='notice'>You have disarmed \the [src]!</span>"
)
deployed = 0
anchored = 0
anchored = FALSE
update_icon()
else
..()
@@ -116,7 +116,7 @@
//trap the victim in place
set_dir(L.dir)
can_buckle = 1
can_buckle = TRUE
buckle_mob(L)
L.Stun(stun_length)
to_chat(L, "<span class='danger'>The steel jaws of \the [src] bite into you, trapping you in place!</span>")
@@ -137,7 +137,7 @@
)
attack_mob(L)
if(!has_buckled_mobs())
anchored = 0
anchored = FALSE
deployed = 0
update_icon()
..()
@@ -210,7 +210,7 @@
"<span class='danger'>[user] has collected \the [src].</span>",
"<span class='notice'>You have collected \the [src]!</span>"
)
anchored = 0
anchored = FALSE
update_icon()
else
..()
@@ -235,7 +235,7 @@
playsound(src, 'sound/items/Wirecutter.ogg',40, 1)
user.drop_from_inventory(src)
forceMove(get_turf(src))
anchored = 1
anchored = TRUE
update_icon()
/obj/item/weapon/material/barbedwire/attackby(obj/item/W as obj, mob/user as mob)
+3 -3
View File
@@ -94,12 +94,12 @@
icon = 'icons/effects/effects.dmi'
icon_state = "energynet"
density = 1
density = TRUE
opacity = 0
mouse_opacity = 1
anchored = 0
anchored = FALSE
can_buckle = 1
can_buckle = TRUE
buckle_lying = 0
buckle_dir = SOUTH
+4 -4
View File
@@ -3,7 +3,7 @@
desc = "This shouldn't be seen, yell at a dev."
icon = 'icons/effects/effects.dmi'
icon_state = "rift"
anchored = 1
anchored = TRUE
var/last_spawn = 0
var/spawn_delay = 10 MINUTES
@@ -153,7 +153,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
mob_faction = "wild animal"
total_spawns = -1
destructible = 0
anchored = 1
anchored = TRUE
invisibility = 101
spawn_types = list(
/mob/living/simple_mob/animal/passive/gaslamp = 20,
@@ -171,7 +171,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
total_spawns = -1
destructible = 1
health = 50
anchored = 1
anchored = TRUE
icon = 'icons/mob/actions.dmi'
icon_state = "alien_egg"
spawn_types = list(
@@ -190,7 +190,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
total_spawns = 1
destructible = 1
health = 50
anchored = 1
anchored = TRUE
icon = 'icons/mob/actions.dmi'
icon_state = "alien_egg"
spawn_types = list(
+3 -3
View File
@@ -5,12 +5,12 @@
//Used to store information about the contents of the object.
var/list/matter
var/w_class // Size of the object.
var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj.
var/unacidable = FALSE //universal "unacidabliness" var, here so you can use it in any obj.
animate_movement = 2
var/throwforce = 1
var/catchable = 1 // can it be caught on throws/flying?
var/sharp = 0 // whether this object cuts
var/edge = 0 // whether this object is more likely to dismember
var/sharp = FALSE // whether this object cuts
var/edge = FALSE // whether this object is more likely to dismember
var/pry = 0 //Used in attackby() to open doors
var/in_use = 0 // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
var/damtype = "brute"
+2 -2
View File
@@ -4,8 +4,8 @@
desc = "This space is blocked off by a barricade."
icon = 'icons/obj/structures.dmi'
icon_state = "barricade"
anchored = 1.0
density = 1.0
anchored = TRUE
density = TRUE
var/health = 100
var/maxhealth = 100
var/datum/material/material
+1 -1
View File
@@ -4,7 +4,7 @@
plane = ABOVE_PLANE
icon_state = "empty"
appearance_flags = 0
anchored = 1
anchored = TRUE
var/cult = 0
/obj/structure/sign/double/barsign/proc/get_valid_states(initial=1)
+1 -1
View File
@@ -164,7 +164,7 @@ LINEN BINS
desc = "A linen bin. It looks rather cosy."
icon = 'icons/obj/structures.dmi'
icon_state = "linenbin-full"
anchored = 1
anchored = TRUE
var/amount = 20
var/list/sheets = list()
var/obj/item/hidden = null
+4 -4
View File
@@ -5,8 +5,8 @@
icon_state = "catwalk"
plane = DECAL_PLANE
layer = DECAL_LAYER
density = 0
anchored = 1.0
density = FALSE
anchored = TRUE
var/hatch_open = FALSE
var/plating_color = null
var/obj/item/stack/tile/plated_tile = null
@@ -137,8 +137,8 @@
name = "plated catwalk spawner"
icon = 'icons/turf/catwalks.dmi'
icon_state = "catwalk_plated"
density = 1
anchored = 1.0
density = TRUE
anchored = TRUE
var/activated = FALSE
plane = DECAL_PLANE
layer = DECAL_LAYER
@@ -4,7 +4,7 @@
desc = "It's a basic storage unit."
icon = 'icons/obj/closets/bases/closet.dmi'
icon_state = "base"
density = 1
density = TRUE
w_class = ITEMSIZE_HUGE
layer = UNDER_JUNK_LAYER
blocks_emissive = EMISSIVE_BLOCK_GENERIC
@@ -16,7 +16,7 @@
icon_state = "closed_unlocked"
seal_tool = null
breakout_sound = 'sound/weapons/thudswoosh.ogg'
anchored = 1
anchored = TRUE
max_closets = 1
opened = 1
closet_appearance = null // Special icon for us
@@ -3,7 +3,7 @@
desc = "It's an egg; it's smooth to the touch." //This is the default egg.
icon = 'icons/obj/egg_vr.dmi'
icon_state = "egg"
density = 0 //Just in case there's a lot of eggs, so it doesn't block hallways/areas.
density = FALSE //Just in case there's a lot of eggs, so it doesn't block hallways/areas.
var/icon_closed = "egg"
var/icon_opened = "egg_open"
var/icon_locked = "egg"
@@ -12,7 +12,7 @@
name = "administrative supply closet"
desc = "It's a storage unit for things that have no right being here."
closet_appearance = /decl/closet_appearance/tactical
anchored = 0
anchored = FALSE
/obj/structure/closet/gimmick/russian
name = "russian surplus closet"
@@ -44,7 +44,7 @@
name = "\improper Thunderdome closet"
desc = "Everything you need!"
closet_appearance = /decl/closet_appearance/thunderdomered
anchored = 1
anchored = TRUE
/obj/structure/closet/thunderdome/tdred
name = "red-team Thunderdome closet"
@@ -220,8 +220,8 @@
desc = "It's wall-mounted storage unit for an AutoLok suit."
icon = 'icons/obj/closets/bases/wall_double.dmi'
closet_appearance = /decl/closet_appearance/wall_double/autolok
anchored = 1
density = 0
anchored = TRUE
density = FALSE
wall_mounted = 1
store_mobs = 0
@@ -236,8 +236,8 @@
desc = "It's wall-mounted storage unit for an emergency suit."
icon = 'icons/obj/closets/bases/wall.dmi'
closet_appearance = /decl/closet_appearance/wall/emergency
anchored = 1
density = 0
anchored = TRUE
density = FALSE
wall_mounted = 1
store_mobs = 0
@@ -226,8 +226,8 @@
desc = "It's a secure wall-mounted storage unit for first aid supplies."
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
anchored = 1
density = 0
anchored = TRUE
density = FALSE
wall_mounted = 1
store_mobs = 0
req_access = list(access_medical_equip)
@@ -3,7 +3,7 @@
desc = "It's an immobile card-locked storage unit."
icon = 'icons/obj/closet.dmi'
icon_state = "secure1"
density = 1
density = TRUE
opened = 0
var/locked = 1
var/broken = 0
@@ -260,7 +260,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
name = "brig locker"
req_access = list(access_brig)
closet_appearance = /decl/closet_appearance/secure_closet/brig
anchored = 1
anchored = TRUE
var/id = null
starts_with = list(
@@ -270,7 +270,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/structure/closet/secure_closet/posters
name = "morale storage"
req_access = list(access_security)
anchored = 1
anchored = TRUE
starts_with = list(
/obj/item/poster/nanotrasen,
@@ -297,7 +297,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
name = "wall locker"
req_access = list(access_security)
closet_appearance = /decl/closet_appearance/wall
density = 1
density = TRUE
//too small to put a man in
large = 0
@@ -3,8 +3,8 @@
desc = "An incredibly lifelike marble carving"
icon = 'icons/obj/statue.dmi'
icon_state = "human_male"
density = 1
anchored = 1
density = TRUE
anchored = TRUE
health = 0 //destroying the statue kills the mob within
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
var/intialTox = 0 //these are here to keep the mob from taking damage from things that logically wouldn't affect a rock
@@ -187,8 +187,8 @@
closet_appearance = /decl/closet_appearance/wall/hydrant
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
anchored = 1
density = 0
anchored = TRUE
density = FALSE
wall_mounted = 1
store_mobs = 0
@@ -207,7 +207,7 @@
name = "first-aid closet"
desc = "It's wall-mounted storage unit for first aid supplies."
closet_appearance = /decl/closet_appearance/wall/medical
anchored = 1
density = 0
anchored = TRUE
density = FALSE
wall_mounted = 1
store_mobs = 0
@@ -6,8 +6,8 @@
name = "Wall Locker"
icon = 'icons/obj/closets/bases/wall.dmi'
closet_appearance = /decl/closet_appearance/wall
density = 0
anchored = 1
density = FALSE
anchored = TRUE
store_mobs = 0
wall_mounted = 1
@@ -85,8 +85,8 @@
name = "Wall Cabinet"
icon = 'icons/obj/closets/bases/wall_double.dmi'
closet_appearance = /decl/closet_appearance/wall_double
density = 0
anchored = 1
density = FALSE
anchored = TRUE
store_mobs = 0
wall_mounted = 1
plane = TURF_PLANE
@@ -113,8 +113,8 @@
name = "Kitchen Cabinet"
icon = 'icons/obj/closets/bases/wall_double.dmi'
closet_appearance = /decl/closet_appearance/wall_double/kitchen
density = 0
anchored = 1
density = FALSE
anchored = TRUE
/obj/structure/closet/walllocker_double/kitchen/north
pixel_y = 32
@@ -157,8 +157,8 @@
name = "fire-safety closet"
desc = "It's a storage cabinet packed with fire-fighting supplies."
closet_appearance = /decl/closet_appearance/wall_double/fire_safety
anchored = 1
density = 0
anchored = TRUE
density = FALSE
starts_with = list(
/obj/item/clothing/suit/fire/firefighter,
@@ -5,7 +5,7 @@
desc = "A rectangular steel crate."
icon = 'icons/obj/closets/bases/crate.dmi'
closet_appearance = /decl/closet_appearance/crate
climbable = 1
climbable = TRUE
dir = 4 //Spawn facing 'forward' by default.
var/points_per_crate = 5
var/rigged = 0
@@ -3,7 +3,7 @@
desc = "A hefty wooden crate."
icon = 'icons/obj/storage.dmi'
icon_state = "densecrate"
density = 1
density = TRUE
var/list/starts_with
/obj/structure/largecrate/Initialize()
@@ -3,7 +3,7 @@
desc = "A large metal lattice that seems to exist solely to annoy consumers."
icon = 'icons/obj/storage.dmi'
icon_state = "vehicle_cage"
density = 1
density = TRUE
var/obj/vehicle/my_vehicle
var/my_vehicle_type
var/paint_color = "#666666"
+1 -1
View File
@@ -6,7 +6,7 @@
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
opacity = 1
density = 0
density = FALSE
/obj/structure/curtain/open
icon_state = "open"
+2 -2
View File
@@ -4,8 +4,8 @@
desc = "Engineered for your entertainment"
icon = 'icons/obj/objects_vr.dmi'
icon_state = "dancepole"
density = 0
anchored = 1
density = FALSE
anchored = TRUE
/obj/structure/dancepole/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(O.is_screwdriver())
+3 -3
View File
@@ -3,9 +3,9 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "glassbox1"
desc = "A display case for prized possessions. It taunts you to kick it."
density = 1
anchored = 1
unacidable = 1//Dissolving the case would also delete the gun.
density = TRUE
anchored = TRUE
unacidable = TRUE//Dissolving the case would also delete the gun.
var/health = 30
var/occupied = 1
var/destroyed = 0
+1 -1
View File
@@ -3,6 +3,6 @@
desc = "A bed made especially for dogs, or other similarly sized pets."
icon = 'icons/obj/furniture.dmi'
icon_state = "dogbed"
can_buckle = 1
can_buckle = TRUE
buckle_dir = SOUTH
buckle_lying = 1
@@ -2,8 +2,8 @@
name = "airlock assembly"
icon = 'icons/obj/doors/door_assembly.dmi'
icon_state = "door_as_0"
anchored = 0
density = 1
anchored = FALSE
density = TRUE
w_class = ITEMSIZE_HUGE
var/state = 0
var/base_icon_state = ""
+2 -2
View File
@@ -4,8 +4,8 @@
icon = 'icons/obj/closet.dmi'
icon_state = "extinguisher_closed"
layer = ABOVE_WINDOW_LAYER
anchored = 1
density = 0
anchored = TRUE
density = FALSE
var/obj/item/weapon/extinguisher/has_extinguisher
var/opened = 0
+2 -2
View File
@@ -6,8 +6,8 @@
icon = 'icons/obj/closet.dmi' //Not bothering to move icons out for now. But its dumb still.
icon_state = "fireaxe1000"
layer = ABOVE_WINDOW_LAYER
anchored = 1
density = 0
anchored = TRUE
density = FALSE
var/open = 0
var/hitstaken = 0
var/locked = 1
+2 -2
View File
@@ -1,13 +1,13 @@
/obj/structure/fitness
icon = 'icons/obj/stationobjs.dmi'
anchored = 1
anchored = TRUE
var/being_used = 0
/obj/structure/fitness/punchingbag
name = "punching bag"
desc = "A punching bag."
icon_state = "punchingbag"
density = 1
density = TRUE
var/list/hit_message = list("hit", "punch", "kick", "robust")
/obj/structure/fitness/punchingbag/attack_hand(var/mob/living/carbon/human/user)
+9 -9
View File
@@ -3,11 +3,11 @@
desc = "Firm yet springy, perhaps this could be useful!"
icon = 'icons/obj/fitness_vr.dmi'
icon_state = "ropes"
density = 1
density = TRUE
throwpass = 1
climbable = 1
climbable = TRUE
layer = WINDOW_LAYER
anchored = 1
anchored = TRUE
flags = ON_BORDER
/obj/structure/fitness/boxing_ropes/CanPass(atom/movable/mover, turf/target) //sets it so that players can enter turf from all directions except the main direction.
if(istype(mover) && mover.checkpass(PASSTABLE))
@@ -60,12 +60,12 @@
desc = "Firm yet springy, perhaps this could be useful!"
icon = 'icons/obj/fitness_vr.dmi'
icon_state = "ropes"
density = 1
density = TRUE
throwpass = 1
climbable = 1
climbable = TRUE
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
anchored = 1
anchored = TRUE
flags = ON_BORDER
/obj/structure/fitness/boxing_ropes_bottom/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSTABLE))
@@ -120,11 +120,11 @@
desc = "A sturdy post that looks like it could support even the most heaviest of heavy weights!"
icon = 'icons/obj/fitness_vr.dmi'
icon_state = "turnbuckle"
density = 1
density = TRUE
throwpass = 1
climbable = 1
climbable = TRUE
layer = WINDOW_LAYER
anchored = 1
anchored = TRUE
flags = ON_BORDER
/obj/structure/fitness/boxing_turnbuckle/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSTABLE))
@@ -79,14 +79,14 @@
icon = 'icons/obj/flora/amayastuff.dmi'
desc = "Small stones sit beside this large boulder. Moss grows on the top of each of them."
icon_state = "bigboulder1"
density = 1
density = TRUE
/obj/structure/flora/bboulder2
name = "jagged large boulder"
icon = 'icons/obj/flora/amayastuff.dmi'
desc = "This boulder has had plates broken off it. Moss grows in the cracks and across the top."
icon_state = "bigboulder2"
density = 1
density = TRUE
/obj/structure/flora/rocks1
name = "rocks"
+1 -1
View File
@@ -2,7 +2,7 @@
/obj/structure/flora/grass
name = "grass"
icon = 'icons/obj/flora/snowflora.dmi'
anchored = 1
anchored = TRUE
/obj/structure/flora/grass/brown
icon_state = "snowgrass1bb"
+2 -2
View File
@@ -1,8 +1,8 @@
//trees
/obj/structure/flora/tree
name = "tree"
anchored = 1
density = 1
anchored = TRUE
density = TRUE
pixel_x = -16
plane = MOB_PLANE // You know what, let's play it safe.
layer = ABOVE_MOB_LAYER
+5 -5
View File
@@ -1,7 +1,7 @@
/obj/structure/girder
icon_state = "girder"
anchored = 1
density = 1
anchored = TRUE
density = TRUE
plane = PLATING_PLANE
w_class = ITEMSIZE_HUGE
var/state = 0
@@ -68,7 +68,7 @@
/obj/structure/girder/displaced
icon_state = "displaced"
anchored = 0
anchored = FALSE
health = 50
cover = 25
@@ -79,7 +79,7 @@
/obj/structure/girder/proc/displace()
name = "displaced [girder_material.display_name] [initial(name)]"
icon_state = "displaced"
anchored = 0
anchored = FALSE
health = (displaced_health - round(current_damage / 4))
cover = 25
@@ -134,7 +134,7 @@
/obj/structure/girder/proc/reset_girder()
name = "[girder_material.display_name] [initial(name)]"
anchored = 1
anchored = TRUE
cover = initial(cover)
health = min(max_health - current_damage,max_health)
state = 0
+3 -3
View File
@@ -3,10 +3,10 @@
desc = "An object used in marking graves."
icon_state = "gravemarker"
density = 1
anchored = 1
density = TRUE
anchored = TRUE
throwpass = 1
climbable = 1
climbable = TRUE
layer = ABOVE_JUNK_LAYER
+4 -4
View File
@@ -3,8 +3,8 @@
desc = "A flimsy lattice of metal rods, with screws to secure it to the floor."
icon = 'icons/obj/structures_vr.dmi' // VOREStation Edit - New icons
icon_state = "grille"
density = 1
anchored = 1
density = TRUE
anchored = TRUE
pressure_resistance = 5*ONE_ATMOSPHERE
layer = TABLE_LAYER
explosion_resistance = 1
@@ -167,7 +167,7 @@
/obj/structure/grille/proc/healthcheck()
if(health <= 0)
if(!destroyed)
density = 0
density = FALSE
destroyed = 1
update_icon()
new /obj/item/stack/rods(get_turf(src))
@@ -223,7 +223,7 @@
/obj/structure/grille/broken
destroyed = 1
icon_state = "grille-b"
density = 0
density = FALSE
/obj/structure/grille/broken/New()
..()

Some files were not shown because too many files have changed in this diff Show More