cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes reparsing errors

Browse Source
This commit is contained in:
xPokee
2025-09-10 14:38:53 -04:00
parent 939f2fc9ac
commit a982fa4be2
4 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/bitfields.dm
+3 -3
View File
@@ -224,11 +224,11 @@ DEFINE_BITFIELD(item_flags, list(
"HIDESUITSTORAGE" = HIDESUITSTORAGE, \
"HIDEMUTWINGS" = HIDEMUTWINGS, \
"HIDEANTENNAE" = HIDEANTENNAE, \
"SHOWSPRITEEARS" = SHOWSPRITEEARS, \ // SKYRAT EDIT ADDITION START
"SHOWSPRITEEARS" = SHOWSPRITEEARS, \
"HIDETAIL" = HIDETAIL, \
"HIDESPINE" = HIDESPINE, \
"HIDESEXTOY" = HIDESEXTOY, \ // SKYRAT EDIT ADDITION END
)
"HIDESEXTOY" = HIDESEXTOY, \
) // SKYRAT EDIT - "SHOWSPRITEEARS" THROUGH "HIDESEXTOY"
/// Item obscured flags
DEFINE_BITFIELD(flags_inv, HIDEFLAGS_BITFIELD)
modular_skyrat/modules/tarkon/code/misc-fluff/atmos_control.dm
+2 -13
View File
@@ -24,10 +24,10 @@
chamber_id = ATMOS_GAS_MONITOR_TARKON_O2
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input/tarkon
chamber_id = ATMOS_GAS_MONITOR_TARKON_O2
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output/tarkon
chamber_id = ATMOS_GAS_MONITOR_TARKON_O2
/obj/machinery/computer/atmos_control/tarkon/plasma_tank
name = "Tarkon Plasma Supply Control"
@@ -43,10 +43,8 @@
chamber_id = ATMOS_GAS_MONITOR_TARKON_PLAS
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input/tarkon
chamber_id = ATMOS_GAS_MONITOR_TARKON_PLAS
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output/tarkon
chamber_id = ATMOS_GAS_MONITOR_TARKON_PLAS
/obj/machinery/computer/atmos_control/tarkon/mix_tank
name = "Tarkon Mix Chamber Control"
@@ -62,10 +60,8 @@
chamber_id = ATMOS_GAS_MONITOR_TARKON_MIX
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input/tarkon
chamber_id = ATMOS_GAS_MONITOR_TARKON_MIX
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output/tarkon
chamber_id = ATMOS_GAS_MONITOR_TARKON_MIX
/obj/machinery/computer/atmos_control/tarkon/nitrogen_tank
name = "Tarkon Nitrogen Supply Control"
@@ -81,10 +77,8 @@
chamber_id = ATMOS_GAS_MONITOR_TARKON_N2
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input/tarkon
chamber_id = ATMOS_GAS_MONITOR_TARKON_N2
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output/tarkon
chamber_id = ATMOS_GAS_MONITOR_TARKON_N2
/obj/machinery/computer/atmos_control/tarkon/nitrous_tank
name = "Tarkon Nitrous Oxide Supply Control"
@@ -100,10 +94,8 @@
chamber_id = ATMOS_GAS_MONITOR_TARKON_N2O
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input/tarkon
chamber_id = ATMOS_GAS_MONITOR_TARKON_N2O
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output/tarkon
chamber_id = ATMOS_GAS_MONITOR_TARKON_N2O
/obj/machinery/computer/atmos_control/tarkon/carbon_tank
name = "Tarkon Carbon Dioxide Supply Control"
@@ -119,10 +111,8 @@
chamber_id = ATMOS_GAS_MONITOR_TARKON_CO2
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input/tarkon
chamber_id = ATMOS_GAS_MONITOR_TARKON_CO2
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output/tarkon
chamber_id = ATMOS_GAS_MONITOR_TARKON_CO2
/obj/machinery/computer/atmos_control/tarkon/incinerator
name = "Tarkon Incinerator Chamber Control"
@@ -162,7 +152,6 @@
id_tag = INCINERATOR_TARKON_DP_VENTPUMP
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input/tarkon
chamber_id = ATMOS_GAS_MONITOR_TARKON_INCINERATOR
/obj/machinery/igniter/incinerator_tarkon
id = INCINERATOR_TARKON_IGNITER
modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm
-4
View File
@@ -193,10 +193,6 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
/obj/item/stack/sheet/plastitaniumglass/fifty = 1,
/obj/item/stack/sheet/rglass = 50,
/obj/item/stack/sheet/rglass/fifty = 1,
/obj/item/stack/sheet/sandblock = 75,
/obj/item/stack/sheet/sandblock/fifty = 15,
/obj/item/stack/sheet/sandblock/five = 50,
/obj/item/stack/sheet/sandblock/twenty = 25,
/obj/item/stack/sheet/titaniumglass = 25,
/obj/item/stack/sheet/titaniumglass/fifty = 1,
/obj/item/stack/sheet/xenochitin = 15
modular_zubbers/code/_globalvars/lists/~maintenance_loot.dm
+3
View File
@@ -12,3 +12,6 @@ GLOBAL_LIST_INIT(trash_pile_loot, list(
GLOB.rarity_loot = maint_rarity_weight,
GLOB.oddity_loot = maint_oddity_weight
))
//Loot pool that is copied from maint loot but doesn't get changed due to holidays
GLOBAL_LIST_INIT(dumpster_loot, GLOB.maintenance_loot.Copy())