cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

though-this-world-may-be-broken

Browse Source
This commit is contained in:
Fox McCloud
2019-09-15 05:53:43 -04:00
parent 1bfb442d40
commit af92373d33
217 changed files with 449 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/bedsheet_bin.dm
+3 -3
View File
@@ -16,7 +16,7 @@ LINEN BINS
throw_range = 2
w_class = WEIGHT_CLASS_TINY
item_color = "white"
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
slot_flags = SLOT_BACK
dog_fashion = /datum/dog_fashion/head/ghost
@@ -236,8 +236,8 @@ LINEN BINS
icon = 'icons/obj/structures.dmi'
icon_state = "linenbin-full"
anchored = 1
burn_state = FLAMMABLE
burntime = 20
resistance_flags = FLAMMABLE
max_integrity = 70
var/amount = 20
var/list/sheets = list()
var/obj/item/hidden = null
code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+3 -3
View File
@@ -5,9 +5,9 @@
icon_state = "cardboard"
icon_opened = "cardboard_open"
icon_closed = "cardboard"
health = 10
burn_state = FLAMMABLE
burntime = 20
resistance_flags = FLAMMABLE
max_integrity = 70
integrity_failure = 0
sound = 'sound/effects/rustle2.ogg'
material_drop = /obj/item/stack/sheet/cardboard
var/amt = 4
code/game/objects/structures/crates_lockers/closets/coffin.dm
+2 -2
View File
@@ -4,8 +4,8 @@
icon_state = "coffin"
icon_closed = "coffin"
icon_opened = "coffin_open"
burn_state = FLAMMABLE
burntime = 20
resistance_flags = FLAMMABLE
max_integrity = 70
material_drop = /obj/item/stack/sheet/wood
/obj/structure/closet/coffin/update_icon()
code/game/objects/structures/crates_lockers/closets/gimmick.dm
+2 -2
View File
@@ -4,8 +4,8 @@
icon_state = "cabinet_closed"
icon_closed = "cabinet_closed"
icon_opened = "cabinet_open"
burn_state = FLAMMABLE
burntime = 20
resistance_flags = FLAMMABLE
max_integrity = 70
/obj/structure/closet/cabinet/update_icon()
if(!opened)
code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+2 -2
View File
@@ -7,8 +7,8 @@
icon_opened = "cabinetdetective_open"
icon_broken = "cabinetdetective_broken"
icon_off = "cabinetdetective_broken"
burn_state = FLAMMABLE
burntime = 20
resistance_flags = FLAMMABLE
max_integrity = 70
/obj/structure/closet/secure_closet/bar/New()
..()
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+2 -2
View File
@@ -33,8 +33,8 @@
icon_opened = "cabinetdetective_open"
icon_broken = "cabinetdetective_broken"
icon_off = "cabinetdetective_broken"
burn_state = FLAMMABLE
burntime = 20
resistance_flags = FLAMMABLE
max_integrity = 70
/obj/structure/closet/secure_closet/personal/cabinet/update_icon()
if(broken)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+2 -2
View File
@@ -333,8 +333,8 @@
icon_opened = "cabinetdetective_open"
icon_broken = "cabinetdetective_broken"
icon_off = "cabinetdetective_broken"
burn_state = FLAMMABLE
burntime = 20
resistance_flags = FLAMMABLE
max_integrity = 70
/obj/structure/closet/secure_closet/detective/New()
..()
code/game/objects/structures/displaycase.dm
+2 -1
View File
@@ -16,6 +16,7 @@ GLOBAL_LIST_INIT(captain_display_cases, list())
name = "display case frame"
icon = 'icons/obj/stock_parts.dmi'
icon_state = "box_glass"
resistance_flags = ACID_PROOF
armor = list("melee" = 30, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100)
var/obj/item/airlock_electronics/circuit = null
var/obj/item/assembly/prox_sensor/sensor = null
@@ -95,7 +96,7 @@ GLOBAL_LIST_INIT(captain_display_cases, list())
desc = "A display case for prized possessions. It taunts you to kick it."
density = TRUE
anchored = TRUE
unacidable = TRUE //Dissolving the case would also delete the contents.
resistance_flags = ACID_PROOF
armor = list("melee" = 30, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100)
var/health = 30
var/obj/item/occupant = null
code/game/objects/structures/dresser.dm
-2
View File
@@ -5,8 +5,6 @@
icon_state = "dresser"
density = 1
anchored = 1
burn_state = FLAMMABLE
burntime = 25
/obj/structure/dresser/attack_hand(mob/user as mob)
if(!Adjacent(user))//no tele-grooming
code/game/objects/structures/false_walls.dm
+1 -2
View File
@@ -333,8 +333,7 @@
desc = "A huge chunk of warm metal. The clanging of machinery emanates from within."
icon = 'icons/turf/walls/clockwork_wall.dmi'
icon_state = "clockwork_wall"
burn_state = FIRE_PROOF
unacidable = TRUE
resistance_flags = FIRE_PROOF | ACID_PROOF
mineral_amount = 1
canSmoothWith = list(/obj/effect/clockwork/overlay/wall, /obj/structure/falsewall/brass)
girder_type = /obj/structure/clockwork/wall_gear/displaced
code/game/objects/structures/flora.dm
+3 -3
View File
@@ -1,6 +1,6 @@
/obj/structure/flora
burn_state = FLAMMABLE
burntime = 30
resistance_flags = FLAMMABLE
max_integrity = 150
//trees
/obj/structure/flora/tree
@@ -244,7 +244,7 @@
desc = "a rock"
icon_state = "rock1"
icon = 'icons/obj/flora/rocks.dmi'
burn_state = FIRE_PROOF
resistance_flags = FIRE_PROOF
anchored = 1
/obj/structure/flora/rock/New()
code/game/objects/structures/lavaland/necropolis_tendril.dm
+1 -1
View File
@@ -13,7 +13,7 @@
move_resist = INFINITY // just killing it tears a massive hole in the ground, let's not move it
anchored = TRUE
burn_state = LAVA_PROOF
resistance_flags = FIRE_PROOF | LAVA_PROOF
var/gps = null
var/obj/effect/light_emitter/tendril/emitted_light
code/game/objects/structures/mineral_doors.dm
+2 -2
View File
@@ -250,8 +250,8 @@
closeSound = 'sound/effects/doorcreaky.ogg'
sheetType = /obj/item/stack/sheet/wood
hardness = 1
burn_state = FLAMMABLE
burntime = 30
resistance_flags = FLAMMABLE
max_integrity = 200
/obj/structure/mineral_door/resin
name = "resin door"
code/game/objects/structures/safe.dm
+1 -2
View File
@@ -17,8 +17,7 @@ GLOBAL_LIST_EMPTY(safes)
anchored = TRUE
density = TRUE
burn_state = LAVA_PROOF
unacidable = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
var/open = FALSE
var/locked = TRUE
code/game/objects/structures/signs.dm
+3 -1
View File
@@ -42,7 +42,7 @@
desc = ""
icon = 'icons/obj/decals.dmi'
w_class = WEIGHT_CLASS_NORMAL
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
var/sign_state = ""
/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob) //construction
@@ -125,11 +125,13 @@
name = "\improper DANGER: FIRE"
desc = "A warning sign which reads 'DANGER: FIRE'"
icon_state = "fire"
resistance_flags = FIRE_PROOF
/obj/structure/sign/nosmoking_1
name = "\improper NO SMOKING"
desc = "A warning sign which reads 'NO SMOKING'"
icon_state = "nosmoking"
resistance_flags = FLAMMABLE
/obj/structure/sign/nosmoking_2
name = "\improper NO SMOKING"
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+4 -3
View File
@@ -17,8 +17,9 @@
can_buckle = TRUE
anchored = TRUE
buckle_lying = TRUE
burn_state = FLAMMABLE
burntime = 30
resistance_flags = FLAMMABLE
max_integrity = 100
integrity_failure = 30
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 2
buckle_offset = -6
@@ -62,7 +63,7 @@
name = "roller bed"
icon = 'icons/obj/rollerbed.dmi'
icon_state = "down"
burn_state = FIRE_PROOF
resistance_flags = NONE
anchored = FALSE
comfort = 1
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+6 -6
View File
@@ -7,7 +7,7 @@
can_buckle = TRUE
buckle_lying = FALSE // you sit in a chair, not lay
anchored = TRUE
burn_state = FIRE_PROOF
resistance_flags = NONE
buckle_offset = 0
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 1
@@ -136,8 +136,8 @@
name = "wooden chair"
desc = "Old is never too old to not be in fashion."
icon_state = "wooden_chair"
burn_state = FLAMMABLE
burntime = 20
resistance_flags = FLAMMABLE
max_integrity = 70
buildstackamount = 3
buildstacktype = /obj/item/stack/sheet/wood
item_chair = /obj/item/chair/wood
@@ -154,8 +154,8 @@
desc = "It looks comfy."
icon_state = "comfychair"
color = rgb(255, 255, 255)
burn_state = FLAMMABLE
burntime = 30
resistance_flags = FLAMMABLE
max_integrity = 70
buildstackamount = 2
item_chair = null
var/image/armrest = null
@@ -415,7 +415,7 @@
name = "wooden chair"
icon_state = "wooden_chair_toppled"
item_state = "woodenchair"
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
max_integrity = 70
hitsound = 'sound/weapons/genhit1.ogg'
origin_type = /obj/structure/chair/wood
code/game/objects/structures/table_frames.dm
+2 -3
View File
@@ -100,7 +100,7 @@
icon_state = "wood_frame"
framestack = /obj/item/stack/sheet/wood
framestackamount = 2
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/obj/structure/table_frame/wood/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/stack/sheet/wood))
@@ -127,8 +127,7 @@
name = "brass table frame"
desc = "Four pieces of brass arranged in a square. It's slightly warm to the touch."
icon_state = "brass_frame"
burn_state = FIRE_PROOF
unacidable = 1
resistance_flags = FIRE_PROOF | ACID_PROOF
framestack = /obj/item/stack/tile/brass
framestackamount = 1
code/game/objects/structures/tables_racks.dm
+4 -5
View File
@@ -368,9 +368,9 @@
icon = 'icons/obj/smooth_structures/glass_table.dmi'
icon_state = "glass_table"
buildstack = /obj/item/stack/sheet/glass
max_integrity = 70
unacidable = 1
canSmoothWith = null
max_integrity = 70
resistance_flags = ACID_PROOF
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
var/list/debris = list()
@@ -453,8 +453,7 @@
buildstack = /obj/item/stack/sheet/wood
max_integrity = 70
canSmoothWith = list(/obj/structure/table/wood, /obj/structure/table/wood/poker)
burn_state = FLAMMABLE
burntime = 20
resistance_flags = FLAMMABLE
/obj/structure/table/wood/narsie_act(total_override = TRUE)
if(!total_override)
@@ -550,7 +549,7 @@
desc = "A solid, slightly beveled brass table."
icon = 'icons/obj/smooth_structures/brass_table.dmi'
icon_state = "brass_table"
burn_state = FIRE_PROOF
resistance_flags = FIRE_PROOF | ACID_PROOF
frame = /obj/structure/table_frame/brass
framestack = /obj/item/stack/tile/brass
buildstack = /obj/item/stack/tile/brass
code/game/objects/structures/watercloset.dm
+1
View File
@@ -671,6 +671,7 @@
icon_state = "puddle"
can_move = 0
can_rotate = 0
resistance_flags = UNACIDABLE
/obj/structure/sink/puddle/attack_hand(mob/M as mob)
icon_state = "puddle-splash"
code/game/objects/structures/window.dm
+2 -2
View File
@@ -32,6 +32,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
flags = ON_BORDER
can_be_unanchored = TRUE
max_integrity = 25
resistance_flags = ACID_PROOF
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
var/ini_dir = null
var/state = WINDOW_OUT_OF_FRAME
@@ -693,8 +694,7 @@ obj/structure/window/full/reinforced/ice
desc = "A paper-thin pane of translucent yet reinforced brass."
icon = 'icons/obj/smooth_structures/clockwork_window.dmi'
icon_state = "clockwork_window_single"
burn_state = FIRE_PROOF
unacidable = 1
resistance_flags = FIRE_PROOF | ACID_PROOF
max_integrity = 80
armor = list("melee" = 60, "bullet" = 25, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
explosion_block = 2 //fancy AND hard to destroy. the most useful combination.