mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 21:48:21 +01:00
massive burndown (#29894)
This commit is contained in:
@@ -15,7 +15,6 @@
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
max_combined_w_class = 21
|
||||
storage_slots = 21
|
||||
resistance_flags = NONE
|
||||
max_integrity = 300
|
||||
sprite_sheets = list(
|
||||
"Vox" = 'icons/mob/clothing/species/vox/back.dmi',
|
||||
@@ -98,8 +97,6 @@
|
||||
desc = "Space Santa uses this to deliver toys to all the nice children in space on Christmas! Wow, it's pretty big!"
|
||||
icon_state = "giftbag0"
|
||||
item_state = "giftbag0"
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
max_combined_w_class = 400 // can store a ton of shit!
|
||||
|
||||
/obj/item/storage/backpack/cultpack
|
||||
@@ -175,7 +172,6 @@
|
||||
desc = "It's a fireproof backpack for Atmospherics Staff."
|
||||
icon_state = "atmospack"
|
||||
item_state = "atmospack"
|
||||
resistance_flags = FIRE_PROOF
|
||||
|
||||
/obj/item/storage/backpack/explorer
|
||||
name = "explorer bag"
|
||||
@@ -782,7 +778,6 @@
|
||||
desc = "Not recommended for wizardly consumption. Recommended for mundane consumption!"
|
||||
icon_state = "holyflask"
|
||||
color = "#DC0000"
|
||||
volume = 100
|
||||
list_reagents = list("dragonsbreath" = 80, "hell_water" = 20)
|
||||
|
||||
/obj/item/reagent_containers/drinks/bottle/immortality
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
belt_icon = "trashbag"
|
||||
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
|
||||
max_w_class = WEIGHT_CLASS_SMALL
|
||||
slot_flags = null
|
||||
storage_slots = 30
|
||||
max_combined_w_class = 30
|
||||
@@ -118,10 +117,7 @@
|
||||
icon_state = "plasticbag"
|
||||
item_state = "plasticbag"
|
||||
slot_flags = ITEM_SLOT_HEAD|ITEM_SLOT_BELT
|
||||
throwforce = 0
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
max_w_class = WEIGHT_CLASS_SMALL
|
||||
storage_slots = 7
|
||||
display_contents_with_number = 0 //or else this will lead to stupid behavior.
|
||||
can_hold = list() // any
|
||||
cant_hold = list(/obj/item/disk/nuclear)
|
||||
@@ -163,7 +159,6 @@
|
||||
origin_tech = "engineering=2"
|
||||
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_POCKETS
|
||||
prefered_slot_flags = ITEM_SLOT_BOTH_POCKETS
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
storage_slots = 10
|
||||
max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
@@ -298,7 +293,6 @@
|
||||
/obj/item/storage/bag/plants/seed_sorting_tray
|
||||
name = "seed sorting tray"
|
||||
desc = "A simple wooden tray with compartments for manually sorting seeds. It's better than nothing, but a plant analyzer would be more effective."
|
||||
icon = 'icons/obj/hydroponics/equipment.dmi'
|
||||
icon_state = "seed_sorting_tray"
|
||||
can_hold = list(
|
||||
/obj/item/seeds,
|
||||
@@ -322,7 +316,6 @@
|
||||
////////////////////////////////////////
|
||||
|
||||
/obj/item/storage/bag/cash
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
icon_state = "cashbag"
|
||||
name = "Cash bag"
|
||||
desc = "A bag for carrying lots of cash. It's got a big dollar sign printed on the front."
|
||||
@@ -342,7 +335,6 @@
|
||||
icon = 'icons/obj/library.dmi'
|
||||
icon_state = "bookbag"
|
||||
display_contents_with_number = 0 //This would look really stupid otherwise
|
||||
storage_slots = 7
|
||||
max_combined_w_class = 21
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
w_class = WEIGHT_CLASS_BULKY //Bigger than a book because physics
|
||||
@@ -568,7 +560,6 @@
|
||||
origin_tech = "engineering=2"
|
||||
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_POCKETS
|
||||
prefered_slot_flags = ITEM_SLOT_BOTH_POCKETS
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
storage_slots = 15
|
||||
max_combined_w_class = 60
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
|
||||
@@ -73,8 +73,6 @@
|
||||
/obj/item/storage/belt/utility
|
||||
name = "tool-belt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
|
||||
desc = "Can hold various tools."
|
||||
icon_state = "utilitybelt"
|
||||
item_state = "utility"
|
||||
use_item_overlays = TRUE
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
max_combined_w_class = 18
|
||||
@@ -221,13 +219,10 @@
|
||||
)
|
||||
|
||||
/obj/item/storage/belt/medical/surgery
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
max_combined_w_class = 17
|
||||
use_to_pickup = TRUE
|
||||
name = "surgical belt"
|
||||
desc = "Can hold various surgical tools."
|
||||
storage_slots = 9
|
||||
use_item_overlays = TRUE
|
||||
can_hold = list(
|
||||
/obj/item/scalpel,
|
||||
/obj/item/hemostat,
|
||||
@@ -372,7 +367,6 @@
|
||||
item_state = "federationwebbing"
|
||||
storage_slots = 15
|
||||
max_combined_w_class = 25
|
||||
use_item_overlays = FALSE
|
||||
layer_over_suit = TRUE
|
||||
w_class_override = list(
|
||||
/obj/item/crowbar,
|
||||
@@ -422,7 +416,6 @@
|
||||
desc = "A syndicate belt designed to be used by boarding parties. Its style is modelled after the hardsuits they wear."
|
||||
icon_state = "militarybelt"
|
||||
item_state = "military"
|
||||
max_w_class = WEIGHT_CLASS_SMALL
|
||||
max_combined_w_class = 18
|
||||
resistance_flags = FIRE_PROOF
|
||||
use_item_overlays = TRUE // Will show the tools on the sprite
|
||||
@@ -716,7 +709,6 @@
|
||||
icon_state = "fannypack_leather"
|
||||
item_state = "fannypack_leather"
|
||||
storage_slots = 3
|
||||
max_w_class = WEIGHT_CLASS_SMALL
|
||||
|
||||
/obj/item/storage/belt/fannypack/black
|
||||
name = "black fannypack"
|
||||
@@ -861,7 +853,6 @@
|
||||
item_state = "holdingbelt"
|
||||
storage_slots = 14
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
max_w_class = WEIGHT_CLASS_SMALL
|
||||
max_combined_w_class = 21 // = 14 * 1.5, not 14 * 2. This is deliberate
|
||||
origin_tech = "bluespace=5;materials=4;engineering=4;plasmatech=5"
|
||||
can_hold = list()
|
||||
@@ -884,7 +875,6 @@
|
||||
storage_slots = 6
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
max_combined_w_class = 18
|
||||
origin_tech = "bluespace=5;materials=4;engineering=4;plasmatech=5"
|
||||
allow_quick_empty = TRUE
|
||||
can_hold = list(
|
||||
/obj/item/grenade/smokebomb,
|
||||
@@ -998,7 +988,6 @@
|
||||
storage_slots = 6
|
||||
max_w_class = WEIGHT_CLASS_BULKY
|
||||
max_combined_w_class = 20
|
||||
use_item_overlays = FALSE
|
||||
layer_over_suit = TRUE
|
||||
can_hold = list(
|
||||
/obj/item/crowbar,
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
icon_state ="bible"
|
||||
throw_speed = 1
|
||||
throw_range = 5
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
resistance_flags = FIRE_PROOF
|
||||
drop_sound = 'sound/items/handling/book_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/book_pickup.ogg'
|
||||
@@ -53,9 +52,7 @@
|
||||
return TRUE // Don't run the fart emote
|
||||
|
||||
/obj/item/storage/bible/booze
|
||||
name = "bible"
|
||||
desc = "To be applied to the head repeatedly."
|
||||
icon_state ="bible"
|
||||
|
||||
/obj/item/storage/bible/booze/populate_contents()
|
||||
new /obj/item/reagent_containers/drinks/bottle/beer(src)
|
||||
@@ -186,5 +183,4 @@
|
||||
/obj/item/storage/bible/syndi
|
||||
name = "suspicious bible"
|
||||
desc = "For treading the line between cultist, contraband, and a hostile corporation."
|
||||
customisable = FALSE
|
||||
icon_state = "syndi"
|
||||
|
||||
@@ -396,7 +396,6 @@
|
||||
name = "monkey cube box"
|
||||
desc = "Drymate brand monkey cubes. Just add water!"
|
||||
icon_state = "monkey_box"
|
||||
storage_slots = 7
|
||||
can_hold = list(/obj/item/food/monkeycube)
|
||||
var/monkey_cube_type = /obj/item/food/monkeycube
|
||||
|
||||
@@ -1069,7 +1068,6 @@
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
icon_state = "paperbag_None"
|
||||
item_state = "paperbag_None"
|
||||
resistance_flags = FLAMMABLE
|
||||
foldable = null
|
||||
var/design = NODESIGN
|
||||
|
||||
@@ -1301,7 +1299,6 @@
|
||||
/obj/item/storage/box/wizard/hardsuit
|
||||
name = "battlemage armour bundle"
|
||||
desc = "This box contains a bundle of Battlemage Armour."
|
||||
icon_state = "wizard_box"
|
||||
|
||||
/obj/item/storage/box/wizard/hardsuit/populate_contents()
|
||||
new /obj/item/clothing/suit/space/hardsuit/wizard(src)
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
hitsound = "swing_hit"
|
||||
use_sound = 'sound/effects/briefcase.ogg'
|
||||
force = 8
|
||||
throw_speed = 2
|
||||
throw_range = 4
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
|
||||
@@ -378,7 +378,6 @@
|
||||
icon_state = "solar_packet"
|
||||
item_state = "solar_packet"
|
||||
cigarette_slogan = "Smoked by true patriots."
|
||||
cigarette_type = /obj/item/clothing/mask/cigarette
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_uplift
|
||||
name = "\improper Uplift Smooth packet"
|
||||
@@ -449,10 +448,7 @@
|
||||
desc = "A locked box for keeping things away from children."
|
||||
icon = 'icons/obj/vialbox.dmi'
|
||||
icon_state = "vialbox0"
|
||||
item_state = "syringe_kit"
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
can_hold = list(/obj/item/reagent_containers/glass/bottle)
|
||||
max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
|
||||
storage_slots = 6
|
||||
req_access = list(ACCESS_VIROLOGY)
|
||||
|
||||
@@ -491,8 +487,6 @@
|
||||
name = "aquatic starter kit"
|
||||
desc = "It's a starter kit box for an aquarium."
|
||||
icon_state = "AquaticKit"
|
||||
throw_speed = 2
|
||||
throw_range = 8
|
||||
med_bot_skin = "fish"
|
||||
|
||||
/obj/item/storage/firstaid/aquatic_kit/full
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
name = "generic first-aid kit"
|
||||
desc = "If you can see this, make a bug report on GitHub, something went wrong!"
|
||||
icon_state = "genericfirstaid"
|
||||
throw_speed = 2
|
||||
throw_range = 8
|
||||
req_one_access =list(ACCESS_MEDICAL, ACCESS_ROBOTICS) //Access and treatment are utilized for medbots.
|
||||
var/treatment_brute = "salglu_solution"
|
||||
@@ -176,7 +175,6 @@
|
||||
treatment_oxy = "perfluorodecalin"
|
||||
treatment_brute = "bicaridine"
|
||||
treatment_fire = "kelotane"
|
||||
treatment_tox = "charcoal"
|
||||
req_one_access = list(ACCESS_SYNDICATE)
|
||||
med_bot_skin = "bezerk"
|
||||
syndicate_aligned = TRUE
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
item_state = "syringe_kit"
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
|
||||
storage_slots = 4
|
||||
req_access = list(ACCESS_ARMORY)
|
||||
var/locked = TRUE
|
||||
@@ -119,7 +118,6 @@
|
||||
name = "medal box"
|
||||
desc = "A locked box used to store medals of honor."
|
||||
icon_state = "medalbox+l"
|
||||
item_state = "syringe_kit"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
max_w_class = WEIGHT_CLASS_SMALL
|
||||
max_combined_w_class = 20
|
||||
|
||||
@@ -12,9 +12,6 @@
|
||||
// -----------------------------
|
||||
/obj/item/storage/secure
|
||||
name = "secstorage"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
max_w_class = WEIGHT_CLASS_SMALL
|
||||
max_combined_w_class = 14
|
||||
var/icon_locking = "secureb"
|
||||
var/icon_sparking = "securespark"
|
||||
var/icon_opened = "secure0"
|
||||
@@ -203,14 +200,12 @@
|
||||
/obj/item/storage/secure/briefcase
|
||||
name = "secure briefcase"
|
||||
desc = "A large briefcase with a digital locking system."
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
icon_state = "secure"
|
||||
item_state = "sec-case"
|
||||
flags = CONDUCT
|
||||
hitsound = "swing_hit"
|
||||
use_sound = 'sound/effects/briefcase.ogg'
|
||||
force = 8
|
||||
throw_speed = 2
|
||||
throw_range = 4
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
@@ -249,7 +244,6 @@
|
||||
|
||||
/obj/item/storage/secure/safe
|
||||
name = "secure safe"
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
icon_state = "safe"
|
||||
icon_opened = "safe0"
|
||||
icon_locking = null
|
||||
@@ -258,7 +252,6 @@
|
||||
w_class = WEIGHT_CLASS_HUGE
|
||||
max_w_class = 8
|
||||
anchored = TRUE
|
||||
density = FALSE
|
||||
cant_hold = list(/obj/item/storage/secure/briefcase)
|
||||
|
||||
/obj/item/storage/secure/safe/attack_hand(mob/user as mob)
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
/obj/item/storage
|
||||
name = "storage"
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
flags_2 = BLOCKS_LIGHT_2
|
||||
/// No message on putting items in.
|
||||
var/silent = FALSE
|
||||
|
||||
@@ -8,8 +8,6 @@
|
||||
flags = CONDUCT
|
||||
force = 10
|
||||
throwforce = 10
|
||||
throw_speed = 2
|
||||
throw_range = 7
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
max_combined_w_class = 18
|
||||
|
||||
@@ -501,7 +501,6 @@
|
||||
new /obj/item/reagent_containers/syringe/pancuronium(src)
|
||||
|
||||
/obj/item/storage/box/syndie_kit/nuke
|
||||
name = "box" //Bit of stealth, since you spawn with it
|
||||
desc = "It's just an ordinary box."
|
||||
icon_state = "box"
|
||||
|
||||
@@ -511,7 +510,6 @@
|
||||
new /obj/item/paper/guides/antag/nuke_instructions(src)
|
||||
|
||||
/obj/item/storage/box/syndie_kit/supermatter
|
||||
name = "box"
|
||||
desc = "It's just an ordinary box."
|
||||
icon_state = "box"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user