Skip to content

Commit

Permalink
TGS Test Merge (#4818)
Browse files Browse the repository at this point in the history
  • Loading branch information
cm13-github committed Dec 30, 2024
2 parents d1c57e9 + 2a50711 commit e3cbb24
Show file tree
Hide file tree
Showing 21 changed files with 1,378 additions and 52 deletions.
48 changes: 32 additions & 16 deletions code/game/machinery/vending/vendor_types/crew/synthetic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list(
list("Synthetic Reset Key", 0, /obj/item/device/defibrillator/synthetic, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom/synth, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),

list("SYNTHETIC SPECIALTY EQUIPMENT", 0, null, null, null),
list("PK-130 SIMI Wrist-Mounted Computer", 0, /obj/item/clothing/gloves/synth, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
list("Smartpack, Blue", 0, /obj/item/storage/backpack/marine/smartpack, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
list("Smartpack, Green", 0, /obj/item/storage/backpack/marine/smartpack/green, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
list("Smartpack, Tan", 0, /obj/item/storage/backpack/marine/smartpack/tan, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
list("Smartpack, White", 0, /obj/item/storage/backpack/marine/smartpack/white, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
list("Smartpack, Black", 0, /obj/item/storage/backpack/marine/smartpack/black, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),

list("UNIFORM (CHOOSE 1)", 0, null, null, null),
list("Uniform, Outdated Synth", 0, /obj/item/clothing/under/rank/synthetic/old, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Uniform, Standard Synth", 0, /obj/item/clothing/under/rank/synthetic, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
Expand Down Expand Up @@ -133,11 +141,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list(
list("Latex Gloves", 0, /obj/item/clothing/gloves/latex, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_REGULAR),

list("BACKPACK (CHOOSE 1)", 0, null, null, null),
list("Smartpack, Blue", 0, /obj/item/storage/backpack/marine/smartpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("Smartpack, Green", 0, /obj/item/storage/backpack/marine/smartpack/green, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("Smartpack, Tan", 0, /obj/item/storage/backpack/marine/smartpack/tan, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("Smartpack, White", 0, /obj/item/storage/backpack/marine/smartpack/white, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("Smartpack, Black", 0, /obj/item/storage/backpack/marine/smartpack/black, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("Logistics IMP Backpack", 0, /obj/item/storage/backpack/marine/satchel/big, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("Expedition Chestrig", 0, /obj/item/storage/backpack/marine/satchel/intel/chestrig, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),

Expand Down Expand Up @@ -339,6 +342,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
list("Backpack, USCM Medical", 12, /obj/item/storage/backpack/marine/medic, null, VENDOR_ITEM_REGULAR),
list("Chestrig, Technician", 12, /obj/item/storage/backpack/marine/satchel/tech, null, VENDOR_ITEM_REGULAR),
list("Satchel, USCM", 12, /obj/item/storage/backpack/marine/satchel, null, VENDOR_ITEM_REGULAR),
list("Satchel, USCM Medical", 12, /obj/item/storage/backpack/marine/satchel/medic, null, VENDOR_ITEM_REGULAR),
list("Satchel, Leather", 12, /obj/item/storage/backpack/satchel, null, VENDOR_ITEM_REGULAR),
list("Satchel, Medical", 12, /obj/item/storage/backpack/satchel/med, null, VENDOR_ITEM_REGULAR),
list("USCM RTO Pack", 12, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -390,7 +394,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
/obj/structure/machinery/cm_vending/own_points/experimental_tools/redeem_token(obj/item/coin/marine/token, mob/user)
if(token.token_type == VEND_TOKEN_SYNTH)
if(user.drop_inv_item_to_loc(token, src))
available_points = 30
available_points = 50
available_points_to_display = available_points
to_chat(user, SPAN_NOTICE("You insert \the [token] into \the [src]."))
return TRUE
Expand All @@ -400,16 +404,28 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
return GLOB.cm_vending_synth_tools

GLOBAL_LIST_INIT(cm_vending_synth_tools, list(
list("Autocompressor", 15, /obj/item/clothing/suit/auto_cpr, null, VENDOR_ITEM_REGULAR),
list("Backpack Firefighting Watertank", 15, /obj/item/reagent_container/glass/watertank/atmos, null, VENDOR_ITEM_REGULAR),
list("Breaching Hammer", 15, /obj/item/weapon/twohanded/breacher/synth, null, VENDOR_ITEM_REGULAR),
list("Compact Defibrillator", 15, /obj/item/device/defibrillator/compact, null, VENDOR_ITEM_REGULAR),
list("Compact Nailgun kit", 15, /obj/effect/essentials_set/cnailgun, null, VENDOR_ITEM_REGULAR),
list("Crew Monitor", 15, /obj/item/tool/crew_monitor, null, VENDOR_ITEM_REGULAR),
list("Experimental Meson Goggles", 15, /obj/item/clothing/glasses/night/experimental_mesons, null, VENDOR_ITEM_REGULAR),
list("Maintenance Jack", 15, /obj/item/maintenance_jack, null, VENDOR_ITEM_REGULAR),
list("Portable Dialysis Machine", 15, /obj/item/tool/portadialysis, null, VENDOR_ITEM_REGULAR),
list("Telescopic Baton", 15, /obj/item/weapon/telebaton, null, VENDOR_ITEM_REGULAR),
list("PK-130", 0, null, null, null),
list("PK-130 Repair Mode", 12, /obj/item/device/simi_chip/repair, null, VENDOR_ITEM_RECOMMENDED),
list("PK-130 Protection Mode", 12, /obj/item/device/simi_chip/protect, null, VENDOR_ITEM_REGULAR),
list("PK-130 Anchor Mode", 6, /obj/item/device/simi_chip/anchor, null, VENDOR_ITEM_REGULAR),
list("PK-130 Motion Detector", 6, /obj/item/device/simi_chip/motion_detector, null, VENDOR_ITEM_REGULAR),
list("PK-130 Tactical Map", 6, /obj/item/device/simi_chip/tactical_map, null, VENDOR_ITEM_REGULAR),

list("UTILITY & SELF DEFENSE TOOLS", 0, null, null, null),
list("Telescopic Baton", 25, /obj/item/weapon/telebaton, null, VENDOR_ITEM_REGULAR),
list("Experimental Meson Goggles", 25, /obj/item/clothing/glasses/night/experimental_mesons, null, VENDOR_ITEM_REGULAR),
list("Backpack Firefighting Watertank", 25, /obj/item/reagent_container/glass/watertank/atmos, null, VENDOR_ITEM_REGULAR),

list("MEDICAL TOOLS", 0, null, null, null),
list("Autocompressor", 25, /obj/item/clothing/suit/auto_cpr, null, VENDOR_ITEM_REGULAR),
list("Compact Defibrillator", 25, /obj/item/device/defibrillator/compact, null, VENDOR_ITEM_REGULAR),
list("Portable Dialysis Machine", 25, /obj/item/tool/portadialysis, null, VENDOR_ITEM_REGULAR),
list("Crew Monitor", 10, /obj/item/tool/crew_monitor, null, VENDOR_ITEM_REGULAR),

list("CONSTRUCTION TOOLS", 0, null, null, null),
list("Breaching Hammer", 25, /obj/item/weapon/twohanded/breacher/synth, null, VENDOR_ITEM_REGULAR),
list("Compact Nailgun kit", 25, /obj/effect/essentials_set/cnailgun, null, VENDOR_ITEM_REGULAR),
list("Maintenance Jack", 25, /obj/item/maintenance_jack, null, VENDOR_ITEM_REGULAR),
))

//------------EXPERIMENTAL TOOL KITS---------------
Expand Down
6 changes: 4 additions & 2 deletions code/game/objects/items/devices/motion_detector.dm
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,11 @@
if(ishuman(loc))
return loc

/obj/item/device/motiondetector/sg
/obj/item/device/motiondetector/integrated
name = "integrated motion detector"
desc = "A motion sensing component from another device."

/obj/item/device/motiondetector/sg/get_user()
/obj/item/device/motiondetector/integrated/get_user()
var/atom/A = loc
if(ishuman(A.loc))
return A.loc
Expand Down
44 changes: 44 additions & 0 deletions code/game/objects/items/tools/synth_bracer/_defines.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// Possible Bracer Colors
#define SIMI_COLOR_DEFAULT "default"
#define SIMI_COLOR_WHITE "white"

/// Loads/Reloads the available actions on the computer itself.
#define SIMI_ACTIONS_LOAD "load"
#define SIMI_ACTIONS_RELOAD "reload"
/// Cleans and then adds actions to the user.
#define SIMI_ACTIONS_ADD "add"
/// Removes actions from the user.
#define SIMI_ACTIONS_REMOVE "remove"

/// No active module.
#define SIMI_ACTIVE_NONE "none"

// Primary Abilities
#define SIMI_PRIMARY_ACTION "primary"

/// Synth self-repair
#define SIMI_ABILITY_REPAIR "repair"
#define SIMI_REPAIR_COST 50

/// Synth fortify, enforced stationary
#define SIMI_ABILITY_ANCHOR "anchor"
#define SIMI_IMMOBILE_COST 20

/// Damage reduced but incapable of self defense.
#define SIMI_ABILITY_PROTECT "protect"
#define SIMI_PROTECTIVE_COST 60

// Secondary Abilities
#define SIMI_SECONDARY_ACTION "secondary"

/// Rescue hook.
#define SIMI_SECONDARY_HOOK "hook"
/// Motion Detector
#define SIMI_SECONDARY_MD "motion"

// Statuses
#define SIMI_STATUS_IDLE "status_idle"
#define SIMI_STATUS_NOACCESS "status_unauthorized"
#define SIMI_STATUS_LOWPOWER "status_lowbattery"
#define SIMI_STATUS_NOPOWER "status_nobattery"
#define SIMI_STATUS_CHARGING "status_charging"
38 changes: 38 additions & 0 deletions code/game/objects/items/tools/synth_bracer/abilities/chips.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/obj/item/device/simi_chip
name = "PK-130 SIMI programmable circuit (NOT FOR USE)"
desc = "A programmable computer circuit used within the PK-130 SINI wrist-mounted computer to add or unlock various functions."
icon = 'icons/obj/items/synth/bracer.dmi'
icon_state = "simi_chip_white"

/// The action this chip will add to the SIMI
var/chip_action = /datum/action/human_action
/// If this chip is 'secret' or not (cannot be removed/one time use)
var/secret = FALSE

/obj/item/device/simi_chip/repair
name = "PK-130 SIMI programmable circuit (Self-Repair)"
chip_action = /datum/action/human_action/synth_bracer/repair_form
icon_state = "simi_chip_red"

/obj/item/device/simi_chip/protect
name = "PK-130 SIMI programmable circuit (Damage Bracing)"
icon_state = "simi_chip_blue"
chip_action = /datum/action/human_action/synth_bracer/protective_form

/obj/item/device/simi_chip/anchor
name = "PK-130 SIMI programmable circuit (Anchor)"
icon_state = "simi_chip_blue"
chip_action = /datum/action/human_action/synth_bracer/anchor_form

/obj/item/device/simi_chip/rescue_hook
name = "PK-130 SIMI programmable circuit (Rescue Hook)"
chip_action = /datum/action/human_action/activable/synth_bracer/rescue_hook

/obj/item/device/simi_chip/motion_detector
name = "PK-130 SIMI programmable circuit (Motion Detector)"
chip_action = /datum/action/human_action/synth_bracer/motion_detector
desc = "A programmable computer circuit used within the PK-130 SIMI wrist-mounted computer to add or unlock various functions. This one activates a motion detector capability, at a running cost of power."

/obj/item/device/simi_chip/tactical_map
name = "PK-130 SIMI programmable circuit (Tactical Map)"
chip_action = /datum/action/human_action/synth_bracer/tactical_map
Loading

0 comments on commit e3cbb24

Please sign in to comment.