cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

for-if-I-stand-I-stand-by-his-will-alone

Browse Source
This commit is contained in:
Fox McCloud
2019-10-03 19:52:03 -04:00
parent 99a6ee7827
commit 20c4cf0a08
123 changed files with 336 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/barsign.dm
+2
View File
@@ -4,6 +4,8 @@
icon = 'icons/obj/barsigns.dmi'
icon_state = "empty"
req_access = list(access_bar)
max_integrity = 500
integrity_failure = 250
armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
var/list/barsigns=list()
var/list/hiddensigns
code/game/objects/structures/crates_lockers/closets.dm
+2
View File
@@ -4,6 +4,8 @@
icon = 'icons/obj/closet.dmi'
icon_state = "closed"
density = 1
max_integrity = 200
integrity_failure = 50
armor = list("melee" = 20, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 60)
var/icon_closed = "closed"
var/icon_opened = "open"
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+1
View File
@@ -7,6 +7,7 @@
opened = 0
locked = 1
broken = 0
max_integrity = 250
armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
damage_deflection = 20
var/large = 1
code/game/objects/structures/crates_lockers/crates.dm
+2
View File
@@ -220,6 +220,7 @@
var/greenlight = "securecrateg"
var/sparks = "securecratesparks"
var/emag = "securecrateemag"
max_integrity = 500
armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
damage_deflection = 25
var/tamperproof = 0
@@ -529,6 +530,7 @@
icon_state = "largemetal"
icon_opened = "largemetalopen"
icon_closed = "largemetal"
integrity_failure = 0 //Makes the crate break when integrity reaches 0, instead of opening and becoming an invisible sprite.
/obj/structure/closet/crate/large/close()
. = ..()
code/game/objects/structures/displaycase.dm
+2
View File
@@ -98,6 +98,8 @@ GLOBAL_LIST_INIT(captain_display_cases, list())
anchored = TRUE
resistance_flags = ACID_PROOF
armor = list("melee" = 30, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100)
max_integrity = 200
integrity_failure = 50
var/health = 30
var/obj/item/occupant = null
var/destroyed = FALSE
code/game/objects/structures/extinguisher.dm
+2
View File
@@ -10,6 +10,8 @@
icon_state = "extinguisher_closed"
anchored = 1
density = 0
max_integrity = 200
integrity_failure = 50
var/obj/item/extinguisher/has_extinguisher = null
var/extinguishertype
var/opened = 0
code/game/objects/structures/false_walls.dm
+2
View File
@@ -21,6 +21,7 @@
density = TRUE
opacity = TRUE
max_integrity = 100
canSmoothWith = list(
/turf/simulated/wall,
@@ -226,6 +227,7 @@
mineral = /obj/item/stack/sheet/mineral/diamond
walltype = /turf/simulated/wall/mineral/diamond
canSmoothWith = list(/obj/structure/falsewall/diamond, /turf/simulated/wall/mineral/diamond)
max_integrity = 800
/obj/structure/falsewall/plasma
code/game/objects/structures/girders.dm
+3 -3
View File
@@ -6,7 +6,7 @@
layer = BELOW_OBJ_LAYER
var/state = GIRDER_NORMAL
var/girderpasschance = 20 // percentage chance that a projectile passes through the girder.
var/health = 200
max_integrity = 200
var/can_displace = TRUE //If the girder can be moved around by crowbarring it
var/metalUsed = 2 //used to determine amount returned in deconstruction
@@ -376,14 +376,14 @@
anchored = 0
state = GIRDER_DISPLACED
girderpasschance = 25
health = 120
max_integrity = 120
/obj/structure/girder/reinforced
name = "reinforced girder"
icon_state = "reinforced"
state = GIRDER_REINF
girderpasschance = 0
health = 350
max_integrity = 350
/obj/structure/girder/cult
name = "runed girder"
code/game/objects/structures/kitchen_spike.dm
+2
View File
@@ -8,6 +8,7 @@
desc = "The frame of a meat spike."
density = 1
anchored = 0
max_integrity = 200
/obj/structure/kitchenspike_frame/attackby(obj/item/I, mob/user, params)
add_fingerprint(user)
@@ -37,6 +38,7 @@
anchored = 1
buckle_lying = FALSE
can_buckle = TRUE
max_integrity = 250
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/structure/kitchenspike/attack_hand(mob/user)
code/game/objects/structures/lattice.dm
+1
View File
@@ -6,6 +6,7 @@
density = FALSE
anchored = TRUE
armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
max_integrity = 50
layer = LATTICE_LAYER //under pipes
plane = FLOOR_PLANE
var/number_of_rods = 1
code/game/objects/structures/mineral_doors.dm
+6 -5
View File
@@ -7,6 +7,7 @@
icon = 'icons/obj/doors/mineral_doors.dmi'
icon_state = "metal"
max_integrity = 200
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 50, "acid" = 50)
var/initial_state
var/state = 0 //closed, 1 == open
@@ -148,13 +149,13 @@
qdel(src)
/obj/structure/mineral_door/iron
hardness = 3
max_integrity = 300
/obj/structure/mineral_door/silver
name = "silver door"
icon_state = "silver"
sheetType = /obj/item/stack/sheet/mineral/silver
hardness = 3
max_integrity = 300
/obj/structure/mineral_door/gold
name = "gold door"
@@ -165,14 +166,14 @@
name = "uranium door"
icon_state = "uranium"
sheetType = /obj/item/stack/sheet/mineral/uranium
hardness = 3
max_integrity = 300
light_range = 2
/obj/structure/mineral_door/sandstone
name = "sandstone door"
icon_state = "sandstone"
sheetType = /obj/item/stack/sheet/mineral/sandstone
hardness = 0.5
max_integrity = 100
/obj/structure/mineral_door/transparent
opacity = 0
@@ -208,7 +209,7 @@
name = "diamond door"
icon_state = "diamond"
sheetType = /obj/item/stack/sheet/mineral/diamond
hardness = 10
max_integrity = 1000
/obj/structure/mineral_door/wood
name = "wood door"
code/game/objects/structures/mirror.dm
+2
View File
@@ -6,6 +6,8 @@
icon_state = "mirror"
density = 0
anchored = 1
max_integrity = 200
integrity_failure = 100
var/list/ui_users = list()
/obj/structure/mirror/New(turf/T, newdir = SOUTH, building = FALSE)
code/game/objects/structures/morgue.dm
+2
View File
@@ -16,6 +16,7 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "morgue1"
density = 1
max_integrity = 400
dir = EAST
var/obj/structure/m_tray/connected = null
var/list/status_descriptors = list(
@@ -184,6 +185,7 @@
var/obj/structure/morgue/connected = null
anchored = 1.0
pass_flags = LETPASSTHROW
max_integrity = 350
/obj/structure/m_tray/attack_hand(mob/user as mob)
code/game/objects/structures/noticeboard.dm
+1
View File
@@ -5,6 +5,7 @@
icon_state = "nboard00"
density = 0
anchored = 1
max_integrity = 150
var/notices = 0
/obj/structure/noticeboard/Initialize()
code/game/objects/structures/signs.dm
+2
View File
@@ -4,6 +4,7 @@
opacity = 0
density = 0
layer = 3.5
max_integrity = 100
armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
/obj/structure/sign/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
@@ -66,6 +67,7 @@
/obj/structure/sign/double/map
name = "station map"
desc = "A framed picture of the station."
max_integrity = 500
/obj/structure/sign/double/map/left
icon_state = "map-left"
code/game/objects/structures/statues.dm
+10 -1
View File
@@ -5,6 +5,7 @@
icon_state = ""
density = 1
anchored = 0
max_integrity = 100
var/oreAmount = 5
var/material_drop_type = /obj/item/stack/sheet/metal
@@ -61,6 +62,7 @@
qdel(src)
/obj/structure/statue/uranium
max_integrity = 300
light_range = 2
material_drop_type = /obj/item/stack/sheet/mineral/uranium
var/last_event = 0
@@ -98,6 +100,7 @@
active = null
/obj/structure/statue/plasma
max_integrity = 200
material_drop_type = /obj/item/stack/sheet/mineral/plasma
desc = "This statue is suitably made from plasma."
@@ -145,6 +148,7 @@
PlasmaBurn()
/obj/structure/statue/gold
max_integrity = 300
material_drop_type = /obj/item/stack/sheet/mineral/gold
desc = "This is a highly valuable statue made from gold."
@@ -169,6 +173,7 @@
icon_state = "rd"
/obj/structure/statue/silver
max_integrity = 300
material_drop_type = /obj/item/stack/sheet/mineral/silver
desc = "This is a valuable statue made from silver."
@@ -193,6 +198,7 @@
icon_state = "medborg"
/obj/structure/statue/diamond
max_integrity = 1000
material_drop_type = /obj/item/stack/sheet/mineral/diamond
desc = "This is a very expensive diamond statue."
@@ -209,6 +215,7 @@
icon_state = "ai2"
/obj/structure/statue/bananium
max_integrity = 300
material_drop_type = /obj/item/stack/sheet/mineral/bananium
desc = "A bananium statue with a small engraving:'HOOOOOOONK'."
var/spam_flag = 0
@@ -237,6 +244,7 @@
spam_flag = 0
/obj/structure/statue/sandstone
max_integrity = 50
material_drop_type = /obj/item/stack/sheet/mineral/sandstone
/obj/structure/statue/sandstone/assistant
@@ -251,6 +259,7 @@
icon_state = "venus"
/obj/structure/statue/tranquillite
max_integrity = 300
material_drop_type = /obj/item/stack/sheet/mineral/tranquillite
desc = "..."
@@ -278,10 +287,10 @@
icon_state = "snowman"
anchored = TRUE
density = TRUE
max_integrity = 50
/obj/structure/snowman/built
desc = "Just like the ones you remember from childhood!"
max_integrity = 50
/obj/structure/snowman/built/Destroy()
new /obj/item/reagent_containers/food/snacks/grown/carrot(drop_location())
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+1 -1
View File
@@ -5,7 +5,7 @@
desc = "It's a gruesome pile of thick, sticky resin shaped like a nest."
icon = 'icons/mob/alien.dmi'
icon_state = "nest"
var/health = 100
max_integrity = 120
var/image/nest_overlay
comfort = 0
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+2
View File
@@ -8,6 +8,8 @@
buckle_lying = FALSE // you sit in a chair, not lay
anchored = TRUE
resistance_flags = NONE
max_integrity = 250
integrity_failure = 25
buckle_offset = 0
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 1
code/game/objects/structures/window.dm
+7 -7
View File
@@ -482,7 +482,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
cancolor = TRUE
heat_resistance = 1600
armor = list("melee" = 80, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
max_integrity = 50
max_integrity = 75
explosion_block = 1
damage_deflection = 11
glass_type = /obj/item/stack/sheet/rglass
@@ -554,7 +554,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
shardtype = /obj/item/shard/plasma
glass_type = /obj/item/stack/sheet/plasmaglass
heat_resistance = 32000
max_integrity = 120
max_integrity = 200
explosion_block = 1
armor = list("melee" = 80, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100)
@@ -568,7 +568,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
shardtype = /obj/item/shard/plasma
glass_type = /obj/item/stack/sheet/plasmarglass
reinf = TRUE
max_integrity = 160
max_integrity = 500
explosion_block = 2
armor = list("melee" = 80, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100)
damage_deflection = 21
@@ -603,7 +603,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
shardtype = /obj/item/shard/plasma
glass_type = /obj/item/stack/sheet/plasmaglass
heat_resistance = 32000
max_integrity = 240
max_integrity = 300
smooth = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced)
explosion_block = 1
@@ -618,7 +618,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
glass_type = /obj/item/stack/sheet/plasmarglass
smooth = SMOOTH_TRUE
reinf = TRUE
max_integrity = 320
max_integrity = 1000
explosion_block = 2
armor = list("melee" = 80, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100)
@@ -632,7 +632,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
icon_state = "r_window"
smooth = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced)
max_integrity = 100
max_integrity = 150
reinf = TRUE
heat_resistance = 1600
armor = list("melee" = 80, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
@@ -658,7 +658,7 @@ obj/structure/window/full/reinforced/ice
desc = "A reinforced, air-locked pod window."
icon = 'icons/obj/smooth_structures/shuttle_window.dmi'
icon_state = "shuttle_window"
max_integrity = 160
max_integrity = 150
reinf = TRUE
heat_resistance = 1600
explosion_block = 3