From 5efb5630b904ba633768fe8969de18b7463d5227 Mon Sep 17 00:00:00 2001 From: AndroBetel <44546836+AndroBetel@users.noreply.github.com> Date: Sun, 11 Feb 2024 16:36:16 +0300 Subject: [PATCH] tweaks tweaks tweaks --- .../vendor_types/squad_prep/squad_medic.dm | 2 +- code/game/objects/items/storage/belt.dm | 12 +++ maps/map_files/chapaev/chapaev.dmm | 102 +++++++++--------- 3 files changed, 67 insertions(+), 49 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index 1124160684..c659cc0e3e 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -238,7 +238,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_upp_medic, list( list("Type 41 Ammo Load Rig", 0, /obj/item/storage/belt/marine/upp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("Type 47 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("Type 41 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/upp/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), - list("Type 41 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("Type 41 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/upp/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 1fd4528d20..8e0a1dd476 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -222,6 +222,18 @@ icon_state = "medicalbelt_upp" item_state = "upp_belt" +/obj/item/storage/belt/medical/upp/full/fill_preset_inventory() + new /obj/item/storage/pill_bottle/bicaridine(src) + new /obj/item/storage/pill_bottle/dexalin(src) + new /obj/item/storage/pill_bottle/antitox(src) + new /obj/item/storage/pill_bottle/kelotane(src) + new /obj/item/storage/pill_bottle/inaprovaline(src) + new /obj/item/storage/pill_bottle/tramadol(src) + new /obj/item/storage/pill_bottle/peridaxon(src) + new /obj/item/stack/medical/splint(src) + new /obj/item/stack/medical/advanced/bruise_pack(src) + new /obj/item/stack/medical/advanced/ointment(src) + /obj/item/storage/belt/medical/lifesaver name = "\improper M276 pattern lifesaver bag" desc = "The M276 is the standard load-bearing equipment of the USCM. This configuration mounts a duffel bag filled with a range of injectors and light medical supplies, and is common among medics. \nRight click its sprite and click \"toggle belt mode\" to take pills out of bottles by simply clicking them." diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm index 026ce917ca..e348534305 100644 --- a/maps/map_files/chapaev/chapaev.dmm +++ b/maps/map_files/chapaev/chapaev.dmm @@ -280,18 +280,16 @@ /turf/open/floor/almayer, /area/golden_arrow/engineering) "cd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/prop/invuln/lattice_prop{ + dir = 4; + icon_state = "lattice-simple"; + pixel_y = 10 }, /turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" + dir = 8; + icon_state = "multi_tiles" }, -/area/golden_arrow/supply) +/area/golden_arrow/prep_hallway) "ce" = ( /obj/structure/machinery/light{ dir = 1 @@ -598,19 +596,17 @@ }, /area/golden_arrow/squad_one) "er" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/prop/invuln/lattice_prop{ + dir = 4; + icon_state = "lattice-simple"; + pixel_y = 10 }, /turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" + dir = 8; + icon_state = "multi_tiles" }, -/area/golden_arrow/supply) +/area/golden_arrow/briefing) "es" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -1052,6 +1048,7 @@ req_access = null }, /obj/item/clothing/suit/storage/snow_suit/soviet, +/obj/item/clothing/suit/gimmick/jason, /turf/open/floor/strata{ dir = 6; icon_state = "multi_tiles" @@ -1092,6 +1089,10 @@ /obj/vehicle/powerloader/jd{ name = "\improper CosmosStal 12 Bogatyr Power Loader" }, +/obj/structure/machinery/door_control{ + id = "chapaevcargo"; + pixel_x = 32 + }, /turf/open/floor/strata{ dir = 6; icon_state = "multi_tiles" @@ -2615,6 +2616,11 @@ dir = 8 }, /obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/prop/invuln/lattice_prop{ + dir = 4; + icon_state = "lattice-simple"; + pixel_y = 10 + }, /turf/open/floor/plating, /area/golden_arrow/prep_hallway) "AC" = ( @@ -2667,16 +2673,6 @@ icon_state = "multi_tiles" }, /area/golden_arrow/canteen) -"Bf" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" - }, -/area/golden_arrow/supply) "Bj" = ( /obj/structure/sink{ dir = 4; @@ -2732,9 +2728,6 @@ /area/golden_arrow/engineering) "BQ" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/phone_base/no_dnd{ - pixel_y = 32 - }, /obj/structure/machinery/prop/almayer/CICmap{ density = 0; icon_state = "shuttle"; @@ -2747,6 +2740,12 @@ pixel_x = -12; network = list("Chapaev","Vehicle") }, +/obj/structure/phone_base/no_dnd{ + pixel_y = 30; + name = "Overwatch Telephone"; + phone_id = "Overwatch"; + phone_category = "Command" + }, /turf/open/floor/strata{ icon_state = "floor2" }, @@ -3537,7 +3536,7 @@ /area/golden_arrow/hangar) "Jj" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "W" }, /turf/open/floor/strata{ dir = 4; @@ -3623,7 +3622,8 @@ /area/golden_arrow/medical) "JR" = ( /obj/structure/machinery/computer/overwatch/almayer{ - faction = "UPP" + faction = "UPP"; + density = 1 }, /obj/item/clothing/glasses/hud/health{ pixel_x = 7; @@ -4148,6 +4148,11 @@ /area/golden_arrow/dorms) "Qi" = ( /obj/structure/largecrate/random/case/double, +/obj/structure/prop/invuln/lattice_prop{ + dir = 4; + icon_state = "lattice-simple"; + pixel_y = 10 + }, /turf/open/floor/strata{ dir = 4; icon_state = "floor3" @@ -4488,15 +4493,16 @@ }, /area/golden_arrow/dorms) "Ua" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/structure/prop/invuln/lattice_prop{ + dir = 4; + icon_state = "lattice-simple"; + pixel_y = 10 }, /turf/open/floor/strata{ - dir = 4; - icon_state = "floor3" + dir = 8; + icon_state = "multi_tiles" }, -/area/golden_arrow/supply) +/area/golden_arrow/briefing) "Ug" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -13367,7 +13373,7 @@ bK bK bK bK -bK +cd bK bK bK @@ -14878,7 +14884,7 @@ ts CI ts ts -ts +Ua ts ts CI @@ -15030,7 +15036,7 @@ bN bN Fh FZ -FZ +er FZ FZ bN @@ -15502,8 +15508,8 @@ ys HA vN oW -Bf -Li +Jj +Jj Jj Li Tr @@ -15654,9 +15660,9 @@ XH SQ vN HO -er -Ua -cd +Li +Li +Li Li Tr mV