shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1961 from Citadel-Station-13/upstream-merge-29140

Browse Source 
[MIRROR] Removes now-unnecessary obj_integrity definitions
This commit is contained in:
LetterJay
2017-07-09 23:06:13 -05:00
committed by GitHub
parent 5f54d006da 90c2a4f867
commit ff0c889a29
168 changed files with 41 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/forcefieldprojector.dm
+2 -3
View File
@@ -76,15 +76,14 @@
anchored = TRUE
density = TRUE
mouse_opacity = 2
obj_integrity = INFINITY
max_integrity = INFINITY
resistance_flags = INDESTRUCTIBLE
CanAtmosPass = ATMOS_PASS_DENSITY
armor = list(melee = 0, bullet = 25, laser = 50, energy = 50, bomb = 25, bio = 100, rad = 100, fire = 100, acid = 100)
var/obj/item/device/forcefield/generator
/obj/structure/projected_forcefield/Initialize(mapload, obj/item/device/forcefield/origin)
. = ..()
generator = origin
..()
/obj/structure/projected_forcefield/Destroy()
visible_message("<span class='warning'>[src] flickers and disappears!</span>")
code/game/objects/items/devices/instruments.dm
-1
View File
@@ -2,7 +2,6 @@
/obj/item/device/instrument
name = "generic instrument"
resistance_flags = FLAMMABLE
obj_integrity = 100
max_integrity = 100
var/datum/song/handheld/song
var/instrumentId = "generic"
code/game/objects/items/stacks/medical.dm
-1
View File
@@ -9,7 +9,6 @@
throw_speed = 3
throw_range = 7
resistance_flags = FLAMMABLE
obj_integrity = 40
max_integrity = 40
novariants = FALSE
var/heal_brute = 0
code/game/objects/items/stacks/sheets/glass.dm
+3 -4
View File
@@ -35,7 +35,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
/obj/item/stack/sheet/glass/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.glass_recipes
return ..()
/obj/item/stack/sheet/glass/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)
if(istype(W, /obj/item/stack/cable_coil))
@@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
/obj/item/stack/sheet/plasmaglass/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.pglass_recipes
return ..()
/obj/item/stack/sheet/plasmaglass/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)
@@ -156,7 +156,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
/obj/item/stack/sheet/rglass/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.reinforced_glass_recipes
return ..()
GLOBAL_LIST_INIT(prglass_recipes, list ( \
new/datum/stack_recipe("directional reinforced window", /obj/structure/window/plasma/reinforced/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("fulltile reinforced window", /obj/structure/window/plasma/reinforced/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \
@@ -192,7 +192,6 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
hitsound = 'sound/weapons/bladeslice.ogg'
resistance_flags = ACID_PROOF
armor = list("melee" = 100, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100)
obj_integrity = 40
max_integrity = 40
var/cooldown = 0
sharpness = IS_SHARP
code/game/objects/items/stacks/sheets/mineral.dm
-1
View File
@@ -152,7 +152,6 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
origin_tech = "plasmatech=2;materials=2"
sheettype = "plasma"
resistance_flags = FLAMMABLE
obj_integrity = 100
max_integrity = 100
materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
code/game/objects/items/toys.dm
-1
View File
@@ -584,7 +584,6 @@
/obj/item/toy/cards
resistance_flags = FLAMMABLE
obj_integrity = 50
max_integrity = 50
var/parentdeck = null
var/deckstyle = "nanotrasen"
code/game/objects/items/weapons/grenades/grenade.dm
-1
View File
@@ -10,7 +10,6 @@
flags = CONDUCT
slot_flags = SLOT_BELT
resistance_flags = FLAMMABLE
obj_integrity = 40
max_integrity = 40
var/active = 0
var/det_time = 50
code/game/objects/items/weapons/melee/energy.dm
-1
View File
@@ -9,7 +9,6 @@
sharpness = IS_SHARP
var/w_class_on = WEIGHT_CLASS_BULKY
heat = 3500
obj_integrity = 200
max_integrity = 200
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
resistance_flags = FIRE_PROOF
code/game/objects/items/weapons/paint.dm
-1
View File
@@ -11,7 +11,6 @@
item_state = "paintcan"
w_class = WEIGHT_CLASS_NORMAL
resistance_flags = FLAMMABLE
obj_integrity = 100
max_integrity = 100
var/paintleft = 10
code/game/objects/items/weapons/storage/backpack.dm
-1
View File
@@ -20,7 +20,6 @@
max_combined_w_class = 21
storage_slots = 21
resistance_flags = 0
obj_integrity = 300
max_integrity = 300
/*
code/game/objects/items/weapons/storage/belt.dm
-1
View File
@@ -6,7 +6,6 @@
item_state = "utility"
slot_flags = SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined")
obj_integrity = 300
max_integrity = 300
/obj/item/weapon/storage/belt/update_icon()
code/game/objects/items/weapons/storage/briefcase.dm
-2
View File
@@ -12,7 +12,6 @@
max_combined_w_class = 21
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
resistance_flags = FLAMMABLE
obj_integrity = 150
max_integrity = 150
var/folder_path = /obj/item/weapon/folder //this is the path of the folder that gets spawned in New()
@@ -43,7 +42,6 @@
max_combined_w_class = 21
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
resistance_flags = FLAMMABLE
obj_integrity = 150
max_integrity = 150
/obj/item/weapon/storage/briefcase/sniperbundle/PopulateContents()
code/game/objects/items/weapons/tanks/watertank.dm
-1
View File
@@ -9,7 +9,6 @@
slot_flags = SLOT_BACK
slowdown = 1
actions_types = list(/datum/action/item_action/toggle_mister)
obj_integrity = 200
max_integrity = 200
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
resistance_flags = FIRE_PROOF
code/game/objects/items/weapons/twohanded.dm
-4
View File
@@ -209,7 +209,6 @@
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
obj_integrity = 200
max_integrity = 200
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
resistance_flags = FIRE_PROOF
@@ -258,7 +257,6 @@
light_color = "#00ff00"//green
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 75
obj_integrity = 200
max_integrity = 200
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70)
resistance_flags = FIRE_PROOF
@@ -418,7 +416,6 @@
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
sharpness = IS_SHARP
obj_integrity = 200
max_integrity = 200
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
var/obj/item/weapon/grenade/explosive = null
@@ -568,7 +565,6 @@
attack_verb = list("attacked", "impaled", "pierced")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
obj_integrity = 200
max_integrity = 200
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
resistance_flags = FIRE_PROOF
code/game/objects/items/weapons/weaponry.dm
-3
View File
@@ -11,7 +11,6 @@
throw_speed = 3
throw_range = 7
attack_verb = list("banned")
obj_integrity = 200
max_integrity = 200
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70)
resistance_flags = FIRE_PROOF
@@ -56,7 +55,6 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 50
sharpness = IS_SHARP
obj_integrity = 200
max_integrity = 200
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
resistance_flags = FIRE_PROOF
@@ -201,7 +199,6 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 50
sharpness = IS_SHARP
obj_integrity = 200
max_integrity = 200
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
resistance_flags = FIRE_PROOF