Skip to content

Commit

Permalink
Lockers and such
Browse files Browse the repository at this point in the history
  • Loading branch information
@morrowwolf
morrowwolf committed Oct 17, 2023
1 parent 846afef commit 48b084b
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 13 deletions.
22 changes: 16 additions & 6 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
list("Marine Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR),
list("Marine Radio Headset", round(scale * 15), /obj/item/device/radio/headset/almayer, VENDOR_ITEM_REGULAR),
list("M10 Pattern Marine Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),
list("Marine Alpha Radio Headset", round(scale * 15), /obj/item/device/radio/headset/almayer/marine/alpha, VENDOR_ITEM_REGULAR),

list("WEBBINGS", -1, null, null),
list("Brown Webbing Vest", round(scale * 1.25), /obj/item/clothing/accessory/storage/black_vest/brown_vest, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -154,12 +155,6 @@
req_access = list(ACCESS_MARINE_PREP)
req_one_access = list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_DATABASE, ACCESS_MARINE_CARGO)

/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/alpha/populate_product_list(scale)
listed_products += list(
list("HEADSET", -1, null, null),
list("Marine Alpha Radio Headset", 10, /obj/item/device/radio/headset/almayer/marine/alpha, VENDOR_ITEM_REGULAR),
)

/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/bravo
req_access = list(ACCESS_MARINE_PREP)
req_one_access = list(ACCESS_MARINE_BRAVO, ACCESS_MARINE_DATABASE, ACCESS_MARINE_CARGO)
Expand Down Expand Up @@ -264,13 +259,28 @@
list("Multitool", round(scale * 1), /obj/item/device/multitool, VENDOR_ITEM_REGULAR),
list("Welding Tool", round(scale * 1), /obj/item/tool/weldingtool, VENDOR_ITEM_REGULAR),

list("EXPLOSIVES", -1, null, null),
list("Plastic Explosives", round(scale * 2), /obj/item/explosive/plastic, VENDOR_ITEM_REGULAR),
list("Breaching Charge", round(scale * 2), /obj/item/explosive/plastic/breaching_charge, VENDOR_ITEM_REGULAR),

list("FLARE AND LIGHT", -1, null, null),
list("Combat Flashlight", round(scale * 5), /obj/item/device/flashlight/combat, VENDOR_ITEM_REGULAR),
list("Box of Flashlight", round(scale * 1), /obj/item/ammo_box/magazine/misc/flashlight, VENDOR_ITEM_REGULAR),
list("Box of Flares", round(scale * 1), /obj/item/ammo_box/magazine/misc/flares, VENDOR_ITEM_REGULAR),
list("M94 Marking Flare Pack", round(scale * 10), /obj/item/storage/box/m94, VENDOR_ITEM_REGULAR),
list("M89-S Signal Flare Pack", round(scale * 1), /obj/item/storage/box/m94/signal, VENDOR_ITEM_REGULAR),

list("SIDEARMS", -1, null, null),
list("88 Mod 4 Combat Pistol", round(scale * 2), /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR),
list("M44 Combat Revolver", round(scale * 2), /obj/item/weapon/gun/revolver/m44, VENDOR_ITEM_REGULAR),
list("M4A3 Service Pistol", round(scale * 2), /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR),
list("M82F Flare Gun", round(scale * 1), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR),

list("SIDEARM AMMUNITION", -1, null, null),
list("88M4 AP Magazine (9mm)", round(scale * 10), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR),
list("M44 Speedloader (.44)", round(scale * 10), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR),
list("M4A3 Magazine (9mm)", round(scale * 10), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR),

list("MISCELLANEOUS", -1, null, null),
list("Extinguisher", round(scale * 5), /obj/item/tool/extinguisher, VENDOR_ITEM_REGULAR),
list("Fire Extinguisher (Portable)", round(scale * 1), /obj/item/tool/extinguisher/mini, VENDOR_ITEM_REGULAR),
Expand Down
51 changes: 51 additions & 0 deletions code/game/objects/structures/crates_lockers/closets/job_closets.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,54 @@
new /obj/item/clothing/suit/storage/lawyer/purpjacket(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/black(src)

/obj/structure/closet/secure_closet/platoon_sergeant
name = "platoon sergeant locker"
desc = "A secure storage unit for the platoon sergeant."
req_one_access = list(ACCESS_MARINE_LEADER)

/obj/structure/closet/secure_closet/platoon_sergeant/Initialize()
. = ..()
new /obj/item/weapon/gun/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/ammo_magazine/rifle/m41aMK1(src)
new /obj/item/clothing/head/helmet/marine/leader(src)
new /obj/item/device/binoculars/range/designator(src)
new /obj/item/device/whistle(src)

/obj/structure/closet/secure_closet/squad_sergeant
name = "squad sergeant locker"
desc = "A secure storage unit for a squad sergeant."
req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_TL_PREP)

/obj/structure/closet/secure_closet/squad_sergeant/Initialize()
. = ..()
new /obj/item/clothing/head/helmet/marine/rto(src)
new /obj/item/device/binoculars/range/designator(src)
new /obj/item/device/whistle(src)

/obj/structure/closet/secure_closet/smartgunner
name = "smartgunner locker"
desc = "A secure storage unit for a smartgunner."
req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_SMARTPREP)

/obj/structure/closet/secure_closet/smartgunner/Initialize()
. = ..()
new /obj/item/weapon/gun/smartgun(src)
new /obj/item/smartgun_battery(src)
new /obj/item/clothing/suit/storage/marine/smartgunner(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/storage/belt/marine/smartgunner(src)

/obj/structure/closet/cryo/Initialize()
. = ..()
new /obj/item/clothing/under/marine(src)
new /obj/item/clothing/under/marine(src)
new /obj/item/clothing/shoes/marine(src)
new /obj/item/clothing/shoes/marine(src)
5 changes: 4 additions & 1 deletion code/modules/gear_presets/uscm_ship.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,6 @@
flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE

idtype = /obj/item/card/id/silver
access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MEDBAY)
assignment = JOB_SO
rank = JOB_SO
paygrade = "MO2"
Expand All @@ -551,6 +550,10 @@
minimap_icon = list("cic" = MINIMAP_ICON_COLOR_BRONZE)
minimap_background = MINIMAP_ICON_BACKGROUND_CIC

/datum/equipment_preset/uscm_ship/so/New()
. = ..()
access = get_access(ACCESS_LIST_MARINE_MAIN)

/datum/equipment_preset/uscm_ship/so/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
Expand Down
44 changes: 38 additions & 6 deletions maps/map_files/golden_arrow/golden_arrow.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,9 @@
/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/alpha{
pixel_x = -20
},
/obj/structure/closet/secure_closet/platoon_sergeant{
pixel_x = 6
},
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -1075,6 +1078,7 @@
/obj/item/prop/magazine/boots/n054{
pixel_x = 29
},
/obj/structure/closet/secure_closet/smartgunner,
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -1909,7 +1913,7 @@
},
/area/almayer/hallways/port_hallway)
"rd" = (
/obj/structure/closet,
/obj/structure/closet/cryo,
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -2134,8 +2138,8 @@
},
/area/almayer/medical)
"sv" = (
/obj/structure/closet,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/cryo,
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -2670,6 +2674,13 @@
icon_state = "cargo"
},
/area/almayer/living/cryo_cells)
"xs" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet/squad_sergeant,
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/almayer/squads/alpha/squad_one)
"xz" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer{
Expand Down Expand Up @@ -4210,6 +4221,13 @@
icon_state = "plate"
},
/area/almayer/hallways/hangar)
"KD" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet/smartgunner,
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/almayer/squads/alpha/squad_one)
"KH" = (
/obj/vehicle/powerloader,
/turf/open/floor/almayer,
Expand Down Expand Up @@ -4373,6 +4391,13 @@
icon_state = "dark_sterile"
},
/area/almayer/living/cryo_cells)
"Me" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet/squad_sergeant,
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/almayer/squads/alpha/squad_two)
"Mi" = (
/obj/effect/landmark/late_join,
/obj/effect/landmark/start/marine/alpha,
Expand Down Expand Up @@ -5053,6 +5078,13 @@
icon_state = "plate"
},
/area/almayer/living/grunt_rnr)
"SD" = (
/obj/structure/closet/cryo,
/obj/structure/closet/cryo,
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/almayer/living/cryo_cells)
"SG" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
Expand Down Expand Up @@ -14139,7 +14171,7 @@ Iw
jc
Iu
jj
it
Me
jc
Cr
Cr
Expand Down Expand Up @@ -15050,8 +15082,8 @@ uH
Mv
Zk
HD
hQ
hQ
KD
xs
Zk
Cr
Cr
Expand Down Expand Up @@ -18847,7 +18879,7 @@ HK
rd
rd
HK
rd
SD
rd
rd
HK
Expand Down

0 comments on commit 48b084b

Please sign in to comment.