cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +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/items/blueprints.dm
+1
View File
@@ -92,6 +92,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "blueprints"
fluffnotice = "Property of Nanotrasen. For heads of staff only. Store in high-secure storage."
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
w_class = WEIGHT_CLASS_NORMAL
var/list/showing = list()
var/client/viewing
code/game/objects/items/cardboard_cutouts.dm
+1 -1
View File
@@ -4,7 +4,7 @@
desc = "A vaguely humanoid cardboard cutout. It's completely blank."
icon = 'icons/obj/cardboard_cutout.dmi'
icon_state = "cutout_basic"
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
w_class = WEIGHT_CLASS_BULKY
var/list/possible_appearances = list("Assistant", "Clown", "Mime",
"Traitor", "Nuke Op", "Cultist", "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer",
code/game/objects/items/devices/flashlight.dm
+1 -2
View File
@@ -394,5 +394,4 @@
on = TRUE
anchored = TRUE
var/range = null
unacidable = TRUE
burn_state = LAVA_PROOF
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
code/game/objects/items/devices/instruments.dm
+2 -2
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/musician.dmi'
lefthand_file = 'icons/mob/inhands/equipment/instruments_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/instruments_righthand.dmi'
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
var/datum/song/handheld/song
var/instrumentId = "generic"
var/instrumentExt = "mid"
@@ -55,7 +55,7 @@
desc = "A golden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
icon_state = "golden_violin"
item_state = "golden_violin"
burn_state = LAVA_PROOF
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/item/instrument/piano_synth
name = "synthesizer"
code/game/objects/items/devices/paicard.dm
+1
View File
@@ -12,6 +12,7 @@
var/looking_for_personality = 0
var/mob/living/silicon/pai/pai
var/list/faction = list("neutral") // The factions the pAI will inherit from the card
resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE
/obj/item/paicard/syndicate
name = "syndicate personal AI device"
code/game/objects/items/documents.dm
+1
View File
@@ -10,6 +10,7 @@
throw_speed = 1
layer = 4
pressure_resistance = 2
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/item/documents/nanotrasen
desc = "\"Top Secret\" Nanotrasen documents printed on special copy-protected paper. It is filled with complex diagrams and lists of names, dates and coordinates."
code/game/objects/items/stacks/medical.dm
+1
View File
@@ -7,6 +7,7 @@
w_class = WEIGHT_CLASS_TINY
throw_speed = 3
throw_range = 7
resistance_flags = FLAMMABLE
var/heal_brute = 0
var/heal_burn = 0
var/self_delay = 20
code/game/objects/items/stacks/sheets/glass.dm
+6
View File
@@ -29,6 +29,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
icon_state = "sheet-glass"
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100)
resistance_flags = ACID_PROOF
origin_tech = "materials=1"
created_window = /obj/structure/window/basic
full_window = /obj/structure/window/full/basic
@@ -89,6 +90,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
icon_state = "sheet-rglass"
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100)
resistance_flags = ACID_PROOF
origin_tech = "materials=2"
created_window = /obj/structure/window/reinforced
full_window = /obj/structure/window/full/reinforced
@@ -115,6 +117,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
item_state = "sheet-rglass"
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT*2)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 100)
resistance_flags = ACID_PROOF
origin_tech = "plasmatech=2;materials=2"
created_window = /obj/structure/window/plasmabasic
full_window = /obj/structure/window/full/plasmabasic
@@ -157,6 +160,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
item_state = "sheet-rglass"
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT*2)
armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
resistance_flags = ACID_PROOF
origin_tech = "plasmatech=2;materials=2"
created_window = /obj/structure/window/plasmareinforced
full_window = /obj/structure/window/full/plasmareinforced
@@ -178,6 +182,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
item_state = "sheet-rglass"
materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/titaniumglass
full_window = /obj/structure/window/full/shuttle
@@ -197,6 +202,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
item_state = "sheet-rglass"
materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_PLASMA=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/plastitaniumglass
full_window = /obj/structure/window/plastitanium
code/game/objects/items/stacks/sheets/mineral.dm
+2 -2
View File
@@ -208,8 +208,8 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
origin_tech = "plasmatech=2;materials=2"
sheettype = "plasma"
materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
burn_state = FLAMMABLE
burntime = 5
resistance_flags = FLAMMABLE
max_integrity = 100
point_value = 20
/obj/item/stack/sheet/mineral/plasma/New()
code/game/objects/items/stacks/sheets/sheet_types.dm
+8 -6
View File
@@ -104,6 +104,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT)
throwforce = 10.0
flags = CONDUCT
resistance_flags = FIRE_PROOF
origin_tech = "materials=1"
merge_type = /obj/item/stack/sheet/metal
point_value = 2
@@ -150,6 +151,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list(
item_state = "sheet-metal"
materials = list(MAT_METAL=2000, MAT_PLASMA=2000)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80)
resistance_flags = FIRE_PROOF
throwforce = 10.0
flags = CONDUCT
origin_tech = "materials=2"
@@ -195,7 +197,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
singular_name = "wood plank"
icon_state = "sheet-wood"
origin_tech = "materials=1;biotech=1"
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
merge_type = /obj/item/stack/sheet/wood
@@ -239,7 +241,7 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \
singular_name = "cloth roll"
icon_state = "sheet-cloth"
origin_tech = "materials=2"
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
force = 0
throwforce = 0
merge_type = /obj/item/stack/sheet/cloth
@@ -264,7 +266,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
singular_name = "durathread roll"
icon_state = "sheet-durathread"
item_state = "sheet-cloth"
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
force = 0
throwforce = 0
merge_type = /obj/item/stack/sheet/durathread
@@ -278,7 +280,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
desc = "A bundle of raw cotton ready to be spun on the loom."
singular_name = "raw cotton ball"
icon_state = "sheet-cotton"
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
force = 0
throwforce = 0
merge_type = /obj/item/stack/sheet/cotton
@@ -329,7 +331,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list (
singular_name = "cardboard sheet"
icon_state = "sheet-card"
origin_tech = "materials=1"
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
merge_type = /obj/item/stack/sheet/cardboard
/obj/item/stack/sheet/cardboard/New(var/loc, var/amt = null)
@@ -409,7 +411,7 @@ var/global/list/datum/stack_recipe/brass_recipes = list (\
singular_name = "brass sheet"
icon_state = "sheet-brass"
icon = 'icons/obj/items.dmi'
burn_state = FIRE_PROOF
resistance_flags = FIRE_PROOF | ACID_PROOF
throwforce = 10
max_amount = 50
throw_speed = 1
code/game/objects/items/stacks/tiles/tile_types.dm
+5 -4
View File
@@ -81,7 +81,7 @@
icon_state = "tile_grass"
origin_tech = "biotech=1"
turf_type = /turf/simulated/floor/grass
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
//Wood
/obj/item/stack/tile/wood
@@ -92,7 +92,7 @@
icon_state = "tile-wood"
origin_tech = "biotech=1"
turf_type = /turf/simulated/floor/wood
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
//Carpets
/obj/item/stack/tile/carpet
@@ -101,7 +101,7 @@
desc = "A piece of carpet. It is the same size as a floor tile"
icon_state = "tile-carpet"
turf_type = /turf/simulated/floor/carpet
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/obj/item/stack/tile/carpet/black
name = "black carpet"
@@ -124,6 +124,7 @@
turf_type = /turf/simulated/floor/plasteel
mineralType = "metal"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
//Light
/obj/item/stack/tile/light
@@ -144,7 +145,7 @@
desc = "A piece of carpet with a convincing star pattern."
icon_state = "tile_space"
turf_type = /turf/simulated/floor/fakespace
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
merge_type = /obj/item/stack/tile/fakespace
/obj/item/stack/tile/fakespace/loaded
code/game/objects/items/toys.dm
+8 -7
View File
@@ -404,8 +404,8 @@
obj/item/toy/cards
burn_state = FLAMMABLE
burntime = 5
resistance_flags = FLAMMABLE
max_integrity = 50
var/parentdeck = null
var/deckstyle = "nanotrasen"
var/card_hitsound = null
@@ -627,6 +627,7 @@ obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/t
newobj.card_throw_speed = sourceobj.card_throw_speed
newobj.card_throw_range = sourceobj.card_throw_range
newobj.card_attack_verb = sourceobj.card_attack_verb
newobj.resistance_flags = sourceobj.resistance_flags
obj/item/toy/cards/singlecard
@@ -752,7 +753,7 @@ obj/item/toy/cards/deck/syndicate
card_throw_speed = 3
card_throw_range = 20
card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
burn_state = FIRE_PROOF
resistance_flags = NONE
/*
|| Custom card decks ||
@@ -890,7 +891,7 @@ obj/item/toy/cards/deck/syndicate/black
icon_state = "carpplushie"
attack_verb = list("bitten", "eaten", "fin slapped")
var/bitesound = 'sound/weapons/bite.ogg'
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
// Attack mob
/obj/item/toy/carpplushie/attack(mob/M as mob, mob/user as mob)
@@ -953,7 +954,7 @@ obj/item/toy/cards/deck/syndicate/black
icon = 'icons/obj/toy.dmi'
var/poof_sound = 'sound/weapons/thudswoosh.ogg'
attack_verb = list("poofed", "bopped", "whapped","cuddled","fluffed")
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/obj/item/toy/plushie/attack(mob/M as mob, mob/user as mob)
playsound(loc, poof_sound, 20, 1) // Play the whoosh sound in local area
@@ -1105,7 +1106,7 @@ obj/item/toy/cards/deck/syndicate/black
item_state = "arm_blade"
attack_verb = list("pricked", "absorbed", "gored")
w_class = WEIGHT_CLASS_SMALL
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/*
* Toy/fake flash
@@ -1506,7 +1507,7 @@ obj/item/toy/cards/deck/syndicate/black
icon = 'icons/obj/toy.dmi'
icon_state = "toy_mouse"
w_class = WEIGHT_CLASS_SMALL
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
var/cooldown = 0
/*
code/game/objects/items/trash.dm
+4 -4
View File
@@ -6,7 +6,7 @@
icon = 'icons/obj/trash.dmi'
w_class = WEIGHT_CLASS_TINY
desc = "This is rubbish."
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/obj/item/trash/raisins
name = "4no raisins"
@@ -43,7 +43,7 @@
/obj/item/trash/plate
name = "Plate"
icon_state = "plate"
burn_state = FIRE_PROOF
resistance_flags = NONE
/obj/item/trash/snack_bowl
name = "Snack bowl"
@@ -60,7 +60,7 @@
/obj/item/trash/tray
name = "Tray"
icon_state = "tray"
burn_state = FIRE_PROOF
resistance_flags = NONE
/obj/item/trash/candle
name = "candle"
@@ -76,7 +76,7 @@
icon_state = "cola"
var/is_glass = 0
var/is_plastic = 0
burn_state = FIRE_PROOF
resistance_flags = NONE
/obj/item/trash/gum
name = "chewed gum"
code/game/objects/items/weapons/RCD.dm
+1
View File
@@ -50,6 +50,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
flags_2 = NO_MAT_REDEMPTION_2
req_access = list(access_engine)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
// Important shit
var/datum/effect_system/spark_spread/spark_system
var/matter = 0
code/game/objects/items/weapons/cards_ids.dm
+1
View File
@@ -90,6 +90,7 @@
var/registered_name = "Unknown" // The name registered_name on the card
slot_flags = SLOT_ID
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF
var/untrackable // Can not be tracked by AI's
var/blood_type = "\[UNSET\]"
code/game/objects/items/weapons/cash.dm
+1 -1
View File
@@ -9,7 +9,7 @@
throw_speed = 1
throw_range = 7
w_class = WEIGHT_CLASS_TINY
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
singular_name = "credit"
max_amount = 1000000
merge_type = /obj/item/stack/spacecash
code/game/objects/items/weapons/chrono_eraser.dm
+4 -3
View File
@@ -149,9 +149,10 @@
desc = "An aura of time-bluespace energy."
icon = 'icons/effects/effects.dmi'
icon_state = "chronofield"
density = 1
anchored = 1
unacidable = 1
density = TRUE
anchored = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
move_resist = INFINITY
blend_mode = BLEND_MULTIPLY
var/mob/living/captured = null
var/obj/item/gun/energy/chrono_gun/gun = null
code/game/objects/items/weapons/courtroom.dm
+2 -2
View File
@@ -11,7 +11,7 @@
throwforce = 6.0
w_class = WEIGHT_CLASS_SMALL
attack_verb = list("bashed", "battered", "judged", "whacked")
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/obj/item/gavelhammer/suicide_act(mob/user)
user.visible_message("<span class='warning'>[user] has sentenced [user.p_them()]self to death with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
@@ -26,7 +26,7 @@
force = 2.0
throwforce = 2.0
w_class = WEIGHT_CLASS_TINY
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/obj/item/gavelblock/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/gavelhammer))
code/game/objects/items/weapons/defib.dm
+1
View File
@@ -260,6 +260,7 @@
force = 0
throwforce = 6
w_class = WEIGHT_CLASS_BULKY
resistance_flags = INDESTRUCTIBLE
toolspeed = 1
var/revivecost = 1000
code/game/objects/items/weapons/extinguisher.dm
+1
View File
@@ -15,6 +15,7 @@
materials = list(MAT_METAL=90)
attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
dog_fashion = /datum/dog_fashion/back
resistance_flags = FIRE_PROOF
var/max_water = 50
var/last_use = 1.0
var/safety = 1
code/game/objects/items/weapons/flamethrower.dm
+1
View File
@@ -13,6 +13,7 @@
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=500)
resistance_flags = FIRE_PROOF
origin_tech = "combat=1;plasmatech=2;engineering=2"
var/status = FALSE
var/lit = FALSE //on or off
code/game/objects/items/weapons/gift_wrappaper.dm
+2 -2
View File
@@ -13,7 +13,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "gift1"
item_state = "gift1"
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/obj/item/a_gift/New()
..()
@@ -139,7 +139,7 @@
flags = NOBLUDGEON
amount = 25
max_amount = 25
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/obj/item/stack/wrapping_paper/attack_self(mob/user)
to_chat(user, "<span class='notice'>You need to use it on a package that has already been wrapped!</span>")
code/game/objects/items/weapons/grenades/grenade.dm
+1 -1
View File
@@ -9,7 +9,7 @@
throw_range = 20
flags = CONDUCT
slot_flags = SLOT_BELT
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
burntime = 5
var/active = 0
var/det_time = 50
code/game/objects/items/weapons/lighters.dm
+1
View File
@@ -14,6 +14,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
attack_verb = null
resistance_flags = FIRE_PROOF
var/lit = 0
/obj/item/lighter/zippo
code/game/objects/items/weapons/melee/energy.dm
+1
View File
@@ -11,6 +11,7 @@
hitsound = 'sound/weapons/blade1.ogg' // Probably more appropriate than the previous hitsound. -- Dave
usesound = 'sound/weapons/blade1.ogg'
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
resistance_flags = FIRE_PROOF
toolspeed = 1
light_power = 2
var/brightness_on = 2
code/game/objects/items/weapons/mop.dm
+1 -1
View File
@@ -9,7 +9,7 @@
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
var/mopping = 0
var/mopcount = 0
var/mopcap = 5
code/game/objects/items/weapons/paint.dm
+2 -2
View File
@@ -8,8 +8,8 @@
item_state = "paintcan"
materials = list(MAT_METAL=200)
w_class = WEIGHT_CLASS_NORMAL
burn_state = FLAMMABLE
burntime = 5
resistance_flags = FLAMMABLE
max_integrity = 50
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(5,10,20,30,50,70)
volume = 70
code/game/objects/items/weapons/powerfist.dm
+1
View File
@@ -10,6 +10,7 @@
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 40)
resistance_flags = FIRE_PROOF
origin_tech = "combat=5;powerstorage=3;syndicate=3"
var/click_delay = 1.5
var/fisto_setting = 1
code/game/objects/items/weapons/rpd.dm
+1
View File
@@ -24,6 +24,7 @@
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 75000, MAT_GLASS = 37500)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
origin_tech = "engineering=4;materials=2"
var/datum/effect_system/spark_spread/spark_system
var/lastused
code/game/objects/items/weapons/scrolls.dm
+2 -2
View File
@@ -9,7 +9,7 @@
throw_speed = 4
throw_range = 20
origin_tech = "bluespace=6"
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/obj/item/teleportation_scroll/apprentice
name = "lesser scroll of teleportation"
@@ -51,7 +51,7 @@
if(!A)
return
var/area/thearea = teleportlocs[A]
if(user.stat || user.restrained())
code/game/objects/items/weapons/shards.dm
+1
View File
@@ -13,6 +13,7 @@
attack_verb = list("stabbed", "slashed", "sliced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
armor = list("melee" = 100, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100)
resistance_flags = ACID_PROOF
sharp = TRUE
var/cooldown = 0
var/icon_prefix
code/game/objects/items/weapons/shields.dm
+1 -1
View File
@@ -53,7 +53,7 @@
item_state = "buckler"
materials = list()
origin_tech = "materials=1;combat=3;biotech=2"
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
block_chance = 30
/obj/item/shield/energy
code/game/objects/items/weapons/signs.dm
+1 -1
View File
@@ -6,7 +6,7 @@
force = 5
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("bashed","smacked")
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
var/delayed = 0 //used to do delays
code/game/objects/items/weapons/staff.dm
+1 -1
View File
@@ -10,7 +10,7 @@
w_class = WEIGHT_CLASS_SMALL
armour_penetration = 100
attack_verb = list("bludgeoned", "whacked", "disciplined")
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/obj/item/twohanded/staff/broom
name = "broom"
code/game/objects/items/weapons/storage/backpack.dm
+8 -6
View File
@@ -15,7 +15,7 @@
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 21
storage_slots = 21
burn_state = FLAMMABLE
resistance_flags = NONE
burntime = 20
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/back.dmi',
@@ -56,7 +56,7 @@
item_state = "holdingpack"
max_w_class = WEIGHT_CLASS_HUGE
max_combined_w_class = 35
burn_state = FIRE_PROOF
resistance_flags = FIRE_PROOF
flags_2 = NO_MAT_REDEMPTION_2
cant_hold = list(/obj/item/storage/backpack/holding)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 50)
@@ -159,7 +159,7 @@
desc = "It's a tough backpack for the daily grind of station life."
icon_state = "engiepack"
item_state = "engiepack"
burn_state = FIRE_PROOF
resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/explorer
name = "explorer bag"
@@ -206,7 +206,7 @@
name = "leather satchel"
desc = "It's a very fancy satchel made with fine leather."
icon_state = "satchel"
burn_state = FIRE_PROOF
resistance_flags = FIRE_PROOF
var/strap_side_straight = FALSE
/obj/item/storage/backpack/satchel/verb/switch_strap()
@@ -242,7 +242,7 @@
name = "industrial satchel"
desc = "A tough satchel with extra pockets."
icon_state = "satchel-eng"
burn_state = FIRE_PROOF
resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/satchel/explorer
name = "explorer satchel"
@@ -336,6 +336,7 @@
origin_tech = "syndicate=1"
silent = 1
slowdown = 0
resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/duffel/syndie/med
name = "suspicious duffelbag"
@@ -510,7 +511,7 @@
desc = "A duffelbag designed to hold tools."
icon_state = "duffel-eng"
item_state = "duffel-eng"
burn_state = FIRE_PROOF
resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/duffel/atmos
name = "atmospherics duffelbag"
@@ -537,6 +538,7 @@
desc = "A spacious backpack with lots of pockets, used by members of the Nanotrasen Emergency Response Team."
icon_state = "ert_commander"
item_state = "backpack"
resistance_flags = FIRE_PROOF
//Commander
/obj/item/storage/backpack/ert/commander
code/game/objects/items/weapons/storage/bags.dm
+4 -4
View File
@@ -169,7 +169,7 @@
max_w_class = WEIGHT_CLASS_NORMAL
w_class = WEIGHT_CLASS_TINY
can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/reagent_containers/food/snacks/grown/ash_flora)
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/obj/item/storage/bag/plants/portaseeder
name = "portable seed extractor"
@@ -364,7 +364,7 @@
max_w_class = WEIGHT_CLASS_NORMAL
w_class = WEIGHT_CLASS_BULKY //Bigger than a book because physics
can_hold = list(/obj/item/book, /obj/item/storage/bible, /obj/item/tome, /obj/item/spellbook)
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/*
* Trays - Agouri
@@ -486,7 +486,7 @@
max_combined_w_class = 200
w_class = WEIGHT_CLASS_TINY
can_hold = list(/obj/item/reagent_containers/food/pill,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/bottle)
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
/*
* Biowaste bag (mostly for xenobiologists)
*/
@@ -500,4 +500,4 @@
max_combined_w_class = 200
w_class = WEIGHT_CLASS_TINY
can_hold = list(/obj/item/slime_extract,/obj/item/reagent_containers/food/snacks/monkeycube,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/iv_bag,/obj/item/reagent_containers/hypospray/autoinjector)
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
code/game/objects/items/weapons/storage/belt.dm
+1
View File
@@ -293,6 +293,7 @@
icon_state = "militarybelt"
item_state = "military"
max_w_class = WEIGHT_CLASS_SMALL
resistance_flags = FIRE_PROOF
/obj/item/storage/belt/military/sst
icon_state = "assaultbelt"
code/game/objects/items/weapons/storage/boxes.dm
+2 -1
View File
@@ -24,7 +24,7 @@
desc = "It's just an ordinary box."
icon_state = "box"
item_state = "syringe_kit"
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
var/foldable = /obj/item/stack/sheet/cardboard
var/amt = 1
@@ -964,6 +964,7 @@
desc = "A sack neatly crafted out of paper."
icon_state = "paperbag_None"
item_state = "paperbag_None"
resistance_flags = FLAMMABLE
foldable = null
var/design = NODESIGN
code/game/objects/items/weapons/storage/briefcase.dm
+1 -1
View File
@@ -12,7 +12,7 @@
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 21
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
burntime = 20
/obj/item/storage/briefcase/sniperbundle
code/game/objects/items/weapons/storage/fancy.dm
+1 -1
View File
@@ -17,7 +17,7 @@
icon = 'icons/obj/food/containers.dmi'
icon_state = "donutbox6"
name = "donut box"
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
var/icon_type = "donut"
/obj/item/storage/fancy/update_icon(var/itemremoved = 0)
code/game/objects/items/weapons/storage/toolbox.dm
+1
View File
@@ -121,6 +121,7 @@
desc = "A huge brass box with several indentations in its surface."
icon_state = "brassbox"
item_state = null
resistance_flags = FIRE_PROOF | ACID_PROOF
w_class = WEIGHT_CLASS_HUGE
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 28
code/game/objects/items/weapons/storage/wallets.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon = 'icons/obj/wallets.dmi'
icon_state = "wallet"
w_class = WEIGHT_CLASS_SMALL
burn_state = FLAMMABLE
resistance_flags = FLAMMABLE
can_hold = list(
/obj/item/stack/spacecash,
/obj/item/card,
code/game/objects/items/weapons/tanks/jetpack.dm
+1
View File
@@ -122,6 +122,7 @@
item_state = "jetpack-captain"
volume = 90
w_class = WEIGHT_CLASS_NORMAL
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF //steal objective items are hard to destroy.
/obj/item/tank/jetpack/oxygen/harness
name = "jet harness (oxygen)"
code/game/objects/items/weapons/tanks/watertank.dm
+1
View File
@@ -10,6 +10,7 @@
slowdown = 1
actions_types = list(/datum/action/item_action/toggle_mister)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
resistance_flags = FIRE_PROOF
var/obj/item/noz
var/on = 0
code/game/objects/items/weapons/teleportation.dm
+1
View File
@@ -105,6 +105,7 @@ Frequency:
materials = list(MAT_METAL=10000)
origin_tech = "magnets=3;bluespace=4"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
var/active_portals = 0
/obj/item/hand_tele/attack_self(mob/user as mob)
code/game/objects/items/weapons/tools.dm
+6
View File
@@ -45,6 +45,7 @@
desc = "A brass wrench. It's faintly warm to the touch."
icon_state = "wrench_brass"
toolspeed = 0.5
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/wrench/abductor
name = "alien wrench"
@@ -172,6 +173,7 @@
icon_state = "screwdriver_brass"
toolspeed = 0.5
random_color = FALSE
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/screwdriver/abductor
name = "alien screwdriver"
@@ -267,6 +269,7 @@
icon_state = "cutters_brass"
toolspeed = 0.5
random_color = FALSE
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/wirecutters/abductor
name = "alien wirecutters"
@@ -330,6 +333,7 @@
var/deac_sound = 'sound/items/welderdeactivate.ogg'
w_class = WEIGHT_CLASS_SMALL
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
resistance_flags = FIRE_PROOF
materials = list(MAT_METAL=70, MAT_GLASS=30)
origin_tech = "engineering=1;plasmatech=1"
toolspeed = 1
@@ -661,6 +665,7 @@
desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch."
icon_state = "brasswelder"
item_state = "brasswelder"
resistance_flags = FIRE_PROOF | ACID_PROOF
obj/item/weldingtool/experimental/process()
..()
@@ -699,6 +704,7 @@ obj/item/weldingtool/experimental/process()
icon_state = "crowbar_brass"
item_state = "crowbar_brass"
toolspeed = 0.5
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/crowbar/abductor
name = "alien crowbar"
code/game/objects/items/weapons/twohanded.dm
+5
View File
@@ -115,6 +115,7 @@
icon_state = "offhand"
name = "offhand"
flags = ABSTRACT
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
/obj/item/twohanded/offhand/unwield()
if(!QDELETED(src))
@@ -182,6 +183,7 @@
hitsound = 'sound/weapons/bladeslice.ogg'
usesound = 'sound/items/crowbar.ogg'
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
resistance_flags = FIRE_PROOF
/obj/item/twohanded/fireaxe/update_icon() //Currently only here to fuck with the on-mob icons.
icon_state = "fireaxe[wielded]"
@@ -232,6 +234,7 @@
block_chance = 75
sharp_when_wielded = TRUE // only sharp when wielded
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
light_power = 2
var/brightness_on = 2
var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE)
@@ -589,6 +592,7 @@
throw_range = 1
w_class = WEIGHT_CLASS_HUGE
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF
var/charged = 5
origin_tech = "combat=4;bluespace=4;plasmatech=7"
@@ -810,6 +814,7 @@
attack_verb = list("attacked", "impaled", "pierced")
hitsound = 'sound/weapons/bladeslice.ogg'
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
resistance_flags = FIRE_PROOF
/obj/item/twohanded/pitchfork/demonic
name = "demonic pitchfork"
code/game/objects/items/weapons/weaponry.dm
+4
View File
@@ -10,6 +10,7 @@
throw_range = 15
attack_verb = list("banned")
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
/obj/item/banhammer/suicide_act(mob/user)
@@ -48,6 +49,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
/obj/item/claymore/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is falling on the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
@@ -73,6 +75,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
/obj/item/katana/cursed
slot_flags = null
@@ -149,6 +152,7 @@
embedded_fall_chance = 0 //Hahaha!
sharp = 1
materials = list(MAT_METAL=500, MAT_GLASS=500)
resistance_flags = FIRE_PROOF
/obj/item/spear/kidan
icon_state = "kidanspear"