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

Flammable Items, Abstractness, and hypnosis (#19267)

Browse Source 
* Laser Eyes

* Update dna.dm

* Mecha

* Update positive_genes.dm

* These

* These 2

* yeh

* Rest of these

* Update turf.dm

* Update food.dm

* Some moar

* mooove

* Update vorestation.dme

* Update burning.dm

* firesuit

* flags

* HYPNOCOLOR

* xd

* no filter

* dc

* Update ore_bag.dm

* Update misc.dm

* Update misc.dm
This commit is contained in:
Cameron Lennox
2026-04-13 00:30:02 -04:00
committed by GitHub
parent ee2fd148ae
commit d8c1932cb9
145 changed files with 791 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/intercom.dm
+1 -1
View File
@@ -160,7 +160,7 @@
A.anchored = TRUE
A.state = 2
A.update_icon()
M.deconstruct(src)
M.atom_deconstruct(TRUE, src)
qdel(src)
else
src.attack_hand(user)
code/game/objects/items/stacks/tiles/tile_types.dm
+3
View File
@@ -85,6 +85,7 @@
drop_sound = 'sound/items/drop/herb.ogg'
pickup_sound = 'sound/items/pickup/herb.ogg'
craftable = TRUE
resistance_flags = FLAMMABLE
/*
* Wood
@@ -102,6 +103,7 @@
no_variants = FALSE
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
resistance_flags = FLAMMABLE
/obj/item/stack/tile/wood/alt
name = "wood floor tile"
@@ -396,6 +398,7 @@
no_variants = FALSE
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
resistance_flags = FLAMMABLE
/obj/item/stack/tile/carpet/teal
desc = "A piece of teal carpet. It is the same size as a normal floor tile!"
code/game/objects/items/weapons/circuitboards/circuitboard.dm
+1 -1
View File
@@ -34,7 +34,7 @@
//Called when a computer is deconstructed to produce a circuitboard.
//Only used by computers, as other machines store their circuitboard instance.
/obj/item/circuitboard/proc/deconstruct(var/obj/machinery/M)
/obj/item/circuitboard/atom_deconstruct(disassembled = TRUE, var/obj/machinery/M)
if(istype(M, build_path))
return 1
return 0
code/game/objects/items/weapons/circuitboards/computer/air_management.dm
+1 -1
View File
@@ -25,6 +25,6 @@
if (..(C))
C.frequency = frequency
/obj/item/circuitboard/air_management/deconstruct(var/obj/machinery/computer/general_air_control/C)
/obj/item/circuitboard/air_management/atom_deconstruct(disassembled = TRUE, var/obj/machinery/computer/general_air_control/C)
if (..(C))
frequency = C.frequency
code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
+1 -1
View File
@@ -48,7 +48,7 @@
if (..(C))
C.set_network(network.Copy())
/obj/item/circuitboard/security/deconstruct(var/obj/machinery/computer/security/C)
/obj/item/circuitboard/security/atom_deconstruct(disassembled = TRUE, var/obj/machinery/computer/security/C)
if (..(C))
network = C.network.Copy()
code/game/objects/items/weapons/circuitboards/computer/shuttle.dm
+1 -1
View File
@@ -11,7 +11,7 @@
var/shuttle_tag = null // If set, link constructed console to this shuttle. If null, auto-detect.
hidden = TRUE // todo - Make properly constructable in round
/obj/item/circuitboard/shuttle_console/deconstruct(obj/machinery/computer/shuttle_control/M)
/obj/item/circuitboard/shuttle_console/atom_deconstruct(disassembled = TRUE, obj/machinery/computer/shuttle_control/M)
shuttle_tag = M.shuttle_tag
if(shuttle_tag)
name = T_BOARD("[shuttle_tag] control console")
code/game/objects/items/weapons/circuitboards/computer/supply.dm
+1 -1
View File
@@ -17,7 +17,7 @@
if (..(SC))
SC.can_order_contraband = contraband_enabled
/obj/item/circuitboard/supplycomp/deconstruct(var/obj/machinery/computer/supplycomp/SC)
/obj/item/circuitboard/supplycomp/atom_deconstruct(disassembled = TRUE, var/obj/machinery/computer/supplycomp/SC)
if (..(SC))
contraband_enabled = SC.can_order_contraband
code/game/objects/items/weapons/gift_wrappaper.dm
+1
View File
@@ -17,6 +17,7 @@
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
///Var used for attack_hand chain.
var/special_handling = FALSE
resistance_flags = FLAMMABLE
/obj/item/a_gift/Initialize(mapload)
. = ..()
code/game/objects/items/weapons/storage/bags.dm
+14 -1
View File
@@ -51,6 +51,7 @@
max_storage_space = ITEMSIZE_SMALL * 21
can_hold = list() // any
cant_hold = list(/obj/item/disk/nuclear)
resistance_flags = FLAMMABLE
/obj/item/storage/bag/trash/update_icon()
if(contents.len == 0)
@@ -68,6 +69,7 @@
origin_tech = list(TECH_BLUESPACE = 3)
max_w_class = ITEMSIZE_NORMAL
max_storage_space = ITEMSIZE_COST_NORMAL * 10 // Slightly less than BoH
resistance_flags = FIRE_PROOF
/obj/item/storage/bag/trash/holding/update_icon()
return
@@ -87,6 +89,7 @@
max_w_class = ITEMSIZE_SMALL
can_hold = list() // any
cant_hold = list(/obj/item/disk/nuclear)
resistance_flags = FLAMMABLE
// -----------------------------
// Plant bag
@@ -100,6 +103,7 @@
max_w_class = ITEMSIZE_NORMAL
w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown)
resistance_flags = FLAMMABLE
/obj/item/storage/bag/plants/large
name = "large plant bag"
@@ -124,6 +128,7 @@
storage_slots = 7
allow_quick_empty = 1 // this function is superceded
resistance_flags = FIRE_PROOF
/obj/item/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W as obj, stop_messages = 0)
if(!istype(W,/obj/item/stack/material))
@@ -281,6 +286,7 @@
max_w_class = ITEMSIZE_NORMAL
w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/coin,/obj/item/spacecash,/obj/item/spacecasinocash)
resistance_flags = FLAMMABLE
// -----------------------------
// Chemistry Bag
@@ -294,6 +300,7 @@
w_class = ITEMSIZE_LARGE
slowdown = 1 //you probably shouldn't be running with chemicals
can_hold = list(/obj/item/reagent_containers/pill,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/hypospray/autoinjector)
resistance_flags = FLAMMABLE
// -----------------------------
// Xeno Bag
@@ -307,6 +314,7 @@
max_w_class = ITEMSIZE_NORMAL
w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/slime_extract,/obj/item/slimepotion, /obj/item/reagent_containers/food/snacks/monkeycube)
resistance_flags = FLAMMABLE
// -----------------------------
// Virology Bag
@@ -319,7 +327,8 @@
max_storage_space = ITEMSIZE_COST_SMALL * 12
max_w_class = ITEMSIZE_NORMAL
w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/reagent_containers/glass/beaker/vial/)
can_hold = list(/obj/item/reagent_containers/glass/beaker/vial)
resistance_flags = FLAMMABLE
// -----------------------------
// Food Bag
@@ -333,6 +342,7 @@
max_w_class = ITEMSIZE_NORMAL
w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/reagent_containers/food/snacks,/obj/item/reagent_containers/food/condiment)
resistance_flags = FLAMMABLE
// -----------------------------
// Food Bag (Service Hound)
@@ -348,6 +358,7 @@
can_hold = list(/obj/item/reagent_containers/food/snacks,/obj/item/reagent_containers/food/condiment,
/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/bottle,/obj/item/coin,/obj/item/spacecash,
/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/reagent_containers/pill)
resistance_flags = FIRE_PROOF
// -----------------------------
// Evidence Bag
@@ -361,6 +372,7 @@
max_w_class = ITEMSIZE_NORMAL
w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/forensics/swab,/obj/item/sample/print,/obj/item/sample/fibers,/obj/item/evidencebag)
resistance_flags = FLAMMABLE
// -----------------------------
// Santa bag
@@ -377,6 +389,7 @@
max_storage_space = ITEMSIZE_COST_NORMAL * 100 // can store a ton of shit!
can_hold = list() // any
cant_hold = list(/obj/item/disk/nuclear)
resistance_flags = FIRE_PROOF //ho ho ho
/obj/item/storage/bag/santabag/update_icon()
if(contents.len < 10)
code/game/objects/items/weapons/storage/boxes.dm
+1
View File
@@ -34,6 +34,7 @@
use_sound = 'sound/items/storage/box.ogg'
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
resistance_flags = FLAMMABLE
// BubbleWrap - A box can be folded up to make card
/obj/item/storage/box/attack_self(mob/user)
code/game/objects/items/weapons/storage/internal.dm
+1
View File
@@ -3,6 +3,7 @@
/obj/item/storage/internal
preserve_item = 1
var/obj/item/master_item
item_flags = ABSTRACT
/obj/item/storage/internal/Initialize(mapload)
. = ..()
code/game/objects/items/weapons/storage/laundry_basket.dm
+1
View File
@@ -19,6 +19,7 @@
allow_quick_gather = 1
collection_mode = 1
var/linked
resistance_flags = FLAMMABLE
/obj/item/storage/laundry_basket/attack_hand(mob/living/user as mob)
code/game/objects/items/weapons/storage/ore_bag.dm
+3 -1
View File
@@ -43,19 +43,21 @@
var/last_update = 0
drop_sound = 'sound/items/drop/backpack.ogg'
pickup_sound = 'sound/items/pickup/backpack.ogg'
item_flags = FLAMMABLE
/obj/item/ore_bag/holding
name = "mining satchel of holding"
desc = "Like a mining satchel, but when you put your hand in, you're pretty sure you can feel time itself."
icon_state = "satchel_bspace"
max_storage_space = ITEMSIZE_COST_NORMAL * 15000 // This should never, ever, ever be reached.
item_flags = FIRE_PROOF
/obj/item/ore_bag/sleeper
name = "processing chamber"
desc = "A mining satchel built into a sleeper. VORE!!!"
icon_state = "satchel_bspace"
max_storage_space = 500
//item_flags = ABSTRACT //Enable once we have abstract PR merged.
item_flags = INDESTRUCTIBLE | ABSTRACT
/obj/item/ore_bag/attackby(obj/item/W, mob/user)
if(current_capacity >= max_storage_space)
code/game/objects/items/weapons/tanks/tanks.dm
+1
View File
@@ -596,6 +596,7 @@ GLOBAL_LIST_EMPTY(tank_gauge_cache)
desc = "Used as a stand in to trigger single tank assemblies... but you shouldn't see this."
var/obj/item/tank/tank = null
var/obj/item/assembly_holder/assembly = null
item_flags = ABSTRACT
/obj/item/tankassemblyproxy/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here.