Skip to content

Commit

Permalink
vendor and gamemode setup
Browse files Browse the repository at this point in the history
  • Loading branch information
silencer-pl committed Aug 29, 2024
1 parent ce624e9 commit a8e4d99
Show file tree
Hide file tree
Showing 12 changed files with 350 additions and 8 deletions.
2 changes: 1 addition & 1 deletion code/_globalvars/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ GLOBAL_VAR_INIT(perf_flags, NO_FLAGS)

GLOBAL_LIST_INIT(bitflags, list((1<<0), (1<<1), (1<<2), (1<<3), (1<<4), (1<<5), (1<<6), (1<<7), (1<<8), (1<<9), (1<<10), (1<<11), (1<<12), (1<<13), (1<<14), (1<<15), (1<<16), (1<<17), (1<<18), (1<<19), (1<<20), (1<<21), (1<<22), (1<<23)))

GLOBAL_VAR_INIT(master_mode, "Distress Signal: Lowpop")
GLOBAL_VAR_INIT(master_mode, "Xenosurge")

GLOBAL_VAR_INIT(timezoneOffset, 0)

Expand Down
2 changes: 1 addition & 1 deletion code/controllers/configuration/entries/general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ Voting

// Gamemode to auto-switch to at the start of the round
/datum/config_entry/string/gamemode_default
config_entry_value = "Distress Signal: Lowpop"
config_entry_value = "Xenosurge"

/datum/config_entry/number/rounds_until_hard_restart
config_entry_value = -1 // -1 is disabled by default, 0 is every round, x is after so many rounds
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/mapping.dm
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ SUBSYSTEM_DEF(mapping)

/datum/controller/subsystem/mapping/proc/Loadship(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, override_map_path = "maps/")
LoadGroup(errorList, name, path, files, traits, default_traits, silent, override_map_path = override_map_path)
GLOB.gamemode_roles["Distress Signal: Lowpop"] = GLOB.platoon_to_role_list[MAIN_SHIP_PLATOON]
GLOB.gamemode_roles["Xenosurge"] = GLOB.platoon_to_role_list[MAIN_SHIP_PLATOON]

/datum/controller/subsystem/mapping/proc/Loadground(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, override_map_path = "maps/")
LoadGroup(errorList, name, path, files, traits, default_traits, silent, override_map_path = override_map_path)
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ SUBSYSTEM_DEF(ticker)
if(mode)
GLOB.master_mode = SSmapping.configs[GROUND_MAP].force_mode ? SSmapping.configs[GROUND_MAP].force_mode : mode
else
GLOB.master_mode = "Distress Signal: Lowpop"
GLOB.master_mode = "Xenosurge"
log_game("Saved mode is '[GLOB.master_mode]'")


Expand Down
4 changes: 2 additions & 2 deletions code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/game_mode/colonialmarines/ai
name = "Distress Signal: Lowpop"
config_tag = "Distress Signal: Lowpop"
name = "Xenosurge"
config_tag = "Xenosurge"
required_players = 0
votable = TRUE

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/game_mode/colonialmarines/ai/no_spawn
name = "Distress Signal: Lowpop (No Spawn)"
config_tag = "Distress Signal: Lowpop (No Spawn)"
name = "Xenosurge (No Spawn)"
config_tag = "Xenosurge (No Spawn)"
flags_round_type = MODE_INFESTATION|MODE_NO_LATEJOIN|MODE_NO_SPAWN|MODE_NO_XENO_EVOLVE
votable = FALSE

Expand Down
53 changes: 53 additions & 0 deletions code/game/machinery/vending/vendor_types/pve/pve_clothes.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/obj/structure/machinery/cm_vending/clothing/pve/standard
name = "\improper UAR Personal Uniform Rack"
desc = "A secure personal uniform storage sollution, much like the bigger dispensers, but linked to a smaller, local storage"
req_access = list()
vendor_role = list()
vend_flags = VEND_CLUTTER_PROTECTION | VEND_UNIFORM_AUTOEQUIP

/obj/structure/machinery/cm_vending/pve/standard/get_listed_products(mob/user)
return list(
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/mmpo, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
list("UNIFORM (CHOOSE 1)", 0, null, null, null),
list("Standard", 0, /obj/item/clothing/under/marine/standard, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Medic", 0, /obj/item/clothing/under/marine/medic/standard, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Engineer", 0, /obj/item/clothing/under/marine/engineer/standard, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Engineer - alternative", 0, /obj/item/clothing/under/marine/engineer/darker, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Radio Officer", 0, /obj/item/clothing/under/marine/rto/standard, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Sniper", 0, /obj/item/clothing/under/marine/sniper/standard, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Vehicle Operator", 0, /obj/item/clothing/under/marine/tanker/standard, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
)

/obj/structure/machinery/cm_vending/sorted/pve/uniform
name = "\improper UAR Armor Vendor"
desc = "An automated supply rack hooked up to a big storage of standard marine uniforms. Can be accessed by the Requisitions Officer and Cargo Techs."
icon_state = "clothing"
req_access = list()
req_one_access = list()
hackable = TRUE
vend_flags = VEND_CLUTTER_PROTECTION | VEND_UNIFORM_AUTOEQUIP
vendor_theme = VENDOR_THEME_USCM

listed_products = list(

list("STANDARD HELMETS", -1, null, null),
list("M10 Pattern Marine Helmet - No camo", 20, /obj/item/clothing/head/helmet/marine/grey, VENDOR_ITEM_RECOMMENDED),
list("M10 Pattern Marine Helmet - Jungle camo", 20, /obj/item/clothing/head/helmet/marine/jungle, VENDOR_ITEM_REGULAR),
list("M10 Pattern Marine Helmet - Snow camo", 20, /obj/item/clothing/head/helmet/marine/snow, VENDOR_ITEM_REGULAR),
list("M10 Pattern Marine Helmet - Desert camo", 20, /obj/item/clothing/head/helmet/marine/desert, VENDOR_ITEM_REGULAR),
list("SPECIALIZED HELMETS", -1, null, null),
list("M10 Pattern Technician Helmet", 20, /obj/item/clothing/head/helmet/marine/tech, VENDOR_ITEM_REGULAR),
list("M10 Pattern Corspman Helmet", 20, /obj/item/clothing/head/helmet/marine/medic, VENDOR_ITEM_REGULAR),
list("STANDARD ARMOR", -1, null, null),
list("M3 Pattern Carrier Marine Armor", 20, /obj/item/clothing/suit/storage/marine/carrier, VENDOR_ITEM_RECOMMENDED),
list("M3 Pattern Padded Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padded, VENDOR_ITEM_REGULAR),
list("M3 Pattern Padless Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padless, VENDOR_ITEM_REGULAR),
list("M3 Pattern Ridged Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padless_lines, VENDOR_ITEM_REGULAR),
list("M3 Pattern Skull Marine Armor", 20, /obj/item/clothing/suit/storage/marine/skull, VENDOR_ITEM_REGULAR),
list("SPECIALIZED ARMOR", -1, null, null),
list("M3-EOD Pattern Heavy Armor", 20, /obj/item/clothing/suit/storage/marine/heavy, VENDOR_ITEM_REGULAR),
list("M3-L Pattern Light Armor", 20, /obj/item/clothing/suit/storage/marine/light, VENDOR_ITEM_REGULAR),
)
Loading

0 comments on commit a8e4d99

Please sign in to comment.