diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 3ab25390e1b..426ea8b6a03 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -9905,10 +9905,24 @@ /turf/open/floor/plating, /area/maintenance/fore) "ayK" = ( -/obj/structure/closet/crate/rcd, /obj/machinery/camera/motion{ c_tag = "EVA Motion Sensor" }, +/obj/structure/rack, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "ayL" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index f7e3f70793c..7fb925c4cc0 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -70531,15 +70531,6 @@ /turf/closed/wall/r_wall, /area/ai_monitored/storage/eva) "cBj" = ( -/obj/structure/closet/crate/rcd{ - pixel_y = 4 - }, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "RCD Storage"; - pixel_x = 1; - req_access_txt = "19" - }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1; @@ -70555,6 +70546,21 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, +/obj/structure/table/reinforced, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "cBk" = ( diff --git a/_maps/map_files/Donutstation/Donutstation.dmm b/_maps/map_files/Donutstation/Donutstation.dmm index 0e216eb4be3..4c46db62e06 100644 --- a/_maps/map_files/Donutstation/Donutstation.dmm +++ b/_maps/map_files/Donutstation/Donutstation.dmm @@ -10535,8 +10535,21 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "aCN" = ( -/obj/structure/closet/crate/rcd, -/obj/effect/turf_decal/bot, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, +/obj/structure/rack, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "aCO" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index d3a26a298c5..10c30ef2d0b 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -8132,14 +8132,6 @@ /obj/structure/spider/stickyweb, /turf/open/floor/plasteel/dark, /area/maintenance/port) -"and" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/closet/secure_closet/personal/patient, -/turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) "ane" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -53978,7 +53970,6 @@ helmet_type = /obj/item/clothing/head/helmet/space; suit_type = /obj/item/clothing/suit/space }, -/obj/structure/window/reinforced, /obj/item/radio/intercom{ pixel_x = 28 }, @@ -54333,12 +54324,21 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/structure/closet/crate/rcd, -/obj/machinery/door/window/northleft{ - dir = 8; - name = "RCD Storage"; - req_access_txt = "19" +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, +/obj/structure/table, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "bDB" = ( @@ -76348,9 +76348,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/camera{ c_tag = "E.V.A. Storage"; dir = 8; diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 33c43ff5e39..68a206f0aa7 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -40445,20 +40445,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bMS" = ( -/obj/structure/closet/crate/rcd{ - pixel_y = 4 - }, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "RCD Storage"; - pixel_x = 1; - req_access_txt = "19" - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -40472,6 +40458,21 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/table, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "bMT" = ( diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 26007d176a8..b94234014df 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -14522,10 +14522,24 @@ /turf/open/floor/plasteel, /area/storage/eva) "aLU" = ( -/obj/structure/closet/crate/rcd, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/rack, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, /turf/open/floor/plasteel/dark, /area/storage/eva) "aLV" = ( diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 8d1d2f5b3d1..dee23a53431 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -172,7 +172,7 @@ /obj/effect/particle_effect/foam/proc/spread_foam() var/turf/t_loc = get_turf(src) - for(var/turf/T in t_loc.GetAtmosAdjacentTurfs()) + for(var/turf/T in t_loc.reachableAdjacentTurfs()) var/obj/effect/particle_effect/foam/foundfoam = locate() in T //Don't spread foam where there's already foam! if(foundfoam) continue @@ -238,7 +238,7 @@ amount = round(sqrt(amt / 2), 1) carry.copy_to(chemholder, carry.total_volume) - if(metaltype != 0) + if(metaltype) metal = metaltype /datum/effect_system/foam_spread/start() diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 39b3ca54da2..f0db6339f89 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -187,7 +187,7 @@ RLD icon_state = "rcd" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - custom_price = 1700 + custom_premium_price = 1700 max_matter = 160 slot_flags = ITEM_SLOT_BELT item_flags = NO_MAT_REDEMPTION | NOBLUDGEON diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm index b283b7329dd..41ac52904bc 100644 --- a/code/modules/vending/engivend.dm +++ b/code/modules/vending/engivend.dm @@ -7,7 +7,6 @@ products = list(/obj/item/clothing/glasses/meson/engine = 2, /obj/item/clothing/glasses/welding = 3, /obj/item/multitool = 4, - /obj/item/construction/rcd/loaded = 3, /obj/item/grenade/chem_grenade/smart_metal_foam = 10, /obj/item/geiger_counter = 5, /obj/item/stock_parts/cell/high = 10, @@ -18,7 +17,8 @@ /obj/item/electronics/firelock = 10) contraband = list(/obj/item/stock_parts/cell/potato = 3) premium = list(/obj/item/storage/belt/utility = 3, - /obj/item/storage/box/smart_metal_foam = 1) + /obj/item/construction/rcd/loaded = 2, + /obj/item/storage/box/smart_metal_foam = 1) refill_canister = /obj/item/vending_refill/engivend default_price = 450 extra_price = 500 diff --git a/config/maps.txt b/config/maps.txt index ec91772fd23..2e3e39fb4f7 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -14,7 +14,7 @@ Format: endmap map boxstation - default + #default #voteweight 1.5 votable endmap @@ -39,6 +39,11 @@ map donutstation votable endmap +map kilostation + minplayers 25 + votable +endmap + map runtimestation endmap