Skip to content

Cape mining additions #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Steelpoint merged 2 commits into from
Nov 24, 2025
Merged

Cape mining additions #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ace4e6d
Merge branch 'miningmap' of https://github.com/Steelpoint/cmss13 into…
Zenith00000 Nov 6, 2025
9e7376e
Many changes + sprites & additions
Zenith00000 Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/conflicts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: eps1lon/actions-label-merge-conflict@v2.1.0
- uses: eps1lon/actions-label-merge-conflict@v3.0.3
with:
dirtyLabel: 'Merge Conflict'
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
Expand Down
15 changes: 11 additions & 4 deletions code/__DEFINES/guns.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,20 @@
#define AUTOFIRE_SUCCESS (1<<1)

///Base CO special weapons options
#define CO_GUNS list(CO_GUN_MATEBA, CO_GUN_MATEBA_SPECIAL, CO_GUN_M1911C, CO_GUN_DEAGLE)
#define CO_GUNS list(CO_GUN_MATEBA, CO_GUN_MATEBA_CLASSIC, CO_GUN_MATEBA_SPECIAL, CO_GUN_M1911C, CO_GUN_DEAGLE, CO_GUN_2006M)

///Council CO special weapons options
#define COUNCIL_CO_GUNS list(CO_GUN_MATEBA_COUNCIL)
#define COUNCIL_CO_GUNS list(CO_GUN_MATEBA_COUNCIL, CO_GUN_MATEBA_COUNCIL_GOLDEN, CO_GUN_2006M_COUNCIL, CO_GUN_2006MB_COUNCIL, CO_GUN_2006MS_COUNCIL, CO_GUN_DEAGLE_COUNCIL)

#define CO_GUN_MATEBA "Unica"
#define CO_GUN_MATEBA "Unica (camo comforting)"
#define CO_GUN_MATEBA_CLASSIC "Unica Classic"
#define CO_GUN_MATEBA_SPECIAL "Unica Special"
#define CO_GUN_2006M "2006M"
#define CO_GUN_DEAGLE "Desert Eagle"
#define CO_GUN_M1911C "M1911C"
#define CO_GUN_MATEBA_COUNCIL "Colonel's Unica"
#define CO_GUN_MATEBA_COUNCIL "Colonel's silver Unica"
#define CO_GUN_MATEBA_COUNCIL_GOLDEN "Colonel's golden Unica"
#define CO_GUN_2006M_COUNCIL "Colonel's golden 2006M"
#define CO_GUN_2006MB_COUNCIL "Colonel's golden 2006M black handle"
#define CO_GUN_2006MS_COUNCIL "Colonel's silver 2006M"
#define CO_GUN_DEAGLE_COUNCIL "Colonel's golden Desert Eagle"
2 changes: 1 addition & 1 deletion code/__DEFINES/lighting.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#define EMISSIVE_BLOCK_NONE 2

#define _EMISSIVE_COLOR(val) list(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, val,0,0,0)
#define _EMISSIVE_COLOR_NO_BLOOM(val) list(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,val,0,0)
#define _EMISSIVE_COLOR_NO_BLOOM(val) list(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 1,val,1,0)
/// The color matrix applied to all emissive overlays. Should be solely dependent on alpha and not have RGB overlap with [EM_BLOCK_COLOR].
#define EMISSIVE_COLOR _EMISSIVE_COLOR(1)
#define EMISSIVE_COLOR_NO_BLOOM _EMISSIVE_COLOR_NO_BLOOM(1)
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/autolathe.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
/obj/structure/machinery/autolathe/tgui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "Autolathe", "[name] control panel")
ui = new(user, src, "Autolathe", "[capitalize(name)] control panel")
ui.open()

/obj/structure/machinery/autolathe/ui_data(mob/user)
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/almayer_control.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
/obj/structure/machinery/computer/almayer_control/tgui_interact(mob/user, datum/tgui/ui, datum/ui_state/state)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "AlmayerControl", "[name]")
ui = new(user, src, "AlmayerControl", "[capitalize(name)]")
ui.open()

/obj/structure/machinery/computer/almayer_control/ui_status(mob/user, datum/ui_state/state)
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/demo_sim.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/obj/structure/machinery/computer/demo_sim/tgui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "DemoSim", "[src.name]")
ui = new(user, src, "DemoSim", "[capitalize(name)]")
ui.open()

/obj/structure/machinery/computer/demo_sim/ui_state(mob/user) // we gotta do custom shit here so that it always closes instead of suspending
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/door_display/door_display.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
/obj/structure/machinery/door_display/research_cell/tgui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "ResearchDoorDisplay", "[src.name]")
ui = new(user, src, "ResearchDoorDisplay", "[capitalize(name)]")
ui.open()

/obj/structure/machinery/door_display/research_cell/ui_state(mob/user)
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/doors/airlock.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list(
/obj/structure/machinery/door/airlock/tgui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if (!ui)
ui = new(user, src, "Wires", "[name] Wires")
ui = new(user, src, "Wires", "[capitalize(name)] Wires")
ui.open()

/obj/structure/machinery/door/airlock/ui_data(mob/user)
Expand All @@ -478,7 +478,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list(
"attached" = !isnull(getAssembly(wire)),
)))
.["wires"] = payload
.["proper_name"] = name
.["proper_name"] = capitalize(name)

/obj/structure/machinery/door/airlock/ui_static_data(mob/user)
. = list()
Expand Down
12 changes: 12 additions & 0 deletions code/game/machinery/doors/airlock_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,18 @@
/obj/structure/machinery/door/airlock/prison_hatch/autoname
autoname = TRUE

/obj/structure/machinery/door/airlock/prison_hatch/brown
icon = 'icons/obj/structures/doors/brown_hatch_blue_stripe.dmi'

/obj/structure/machinery/door/airlock/prison_hatch/brown/autoname
autoname = TRUE

/obj/structure/machinery/door/airlock/prison_hatch/brown/alt
icon = 'icons/obj/structures/doors/brown_hatch.dmi'

/obj/structure/machinery/door/airlock/prison_hatch/brown/alt/autoname
autoname = TRUE

//ALMAYER AIRLOCKS

/obj/structure/machinery/door/airlock/almayer
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/fax_machine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ GLOBAL_DATUM_INIT(fax_network, /datum/fax_network, new)
/obj/structure/machinery/faxmachine/tgui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "FaxMachine", "[src.name]")
ui = new(user, src, "FaxMachine", "[capitalize(name)]")
ui.open()

/obj/structure/machinery/faxmachine/ui_state(mob/user)
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/nuclearbomb.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ GLOBAL_VAR_INIT(bomb_set, FALSE)
/obj/structure/machinery/nuclearbomb/tgui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "NuclearBomb", "[src.name]")
ui = new(user, src, "NuclearBomb", "[capitalize(name)]")
ui.open()

/obj/structure/machinery/nuclearbomb/ui_state(mob/user)
Expand Down
43 changes: 43 additions & 0 deletions code/game/objects/effects/decals/floor_symbol.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,46 @@

/obj/effect/decal/floor_symbol/uscm_3x3/westface/northwest
dir = NORTHWEST

/obj/effect/decal/conam
icon = 'icons/effects/conam_logo_big.dmi'
icon_state = "full_conam"
layer = TURF_LAYER
plane = FLOOR_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT

/obj/effect/decal/conam/big_logo
icon_state = "full_conam"

/obj/effect/decal/conam/big_logo/damage
icon_state = "full_conam_damage"

/obj/effect/decal/conam/big_logo/damage_1
icon_state = "full_conam_damage_1"

/obj/effect/decal/conam/half_logo
icon_state = "half_conam"

/obj/effect/decal/conam/half_logo/damage
icon_state = "half_conam_damage"

/obj/effect/decal/conam/half_logo/damage_1
icon_state = "half_conam_damage_1"

/obj/effect/decal/conam/long_logo_left
icon_state = "long_conam_left"

/obj/effect/decal/conam/long_logo_left/damage
icon_state = "long_conam_left_damage"

/obj/effect/decal/conam/long_logo_left/damage_1
icon_state = "long_conam_left_damage_1"

/obj/effect/decal/conam/long_logo_right
icon_state = "long_conam_right"

/obj/effect/decal/conam/long_logo_right/damage
icon_state = "long_conam_right_damage"

/obj/effect/decal/conam/long_logo_right/damage_1
icon_state = "long_conam_right_damage_1"
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/binoculars.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
/obj/item/device/binoculars/range/tgui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "Binoculars", "[src.name]")
ui = new(user, src, "Binoculars", "[capitalize(name)]")
ui.open()

/obj/item/device/binoculars/range/ui_state(mob/user)
Expand Down
3 changes: 3 additions & 0 deletions code/game/objects/items/props/rocks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,6 @@

/obj/structure/prop/colorable_rock/colorable/alt
icon_state = "ground_colorable_alt"

/obj/structure/prop/colorable_rock/colorable/alt1
icon_state = "ground_colorable_1"
8 changes: 7 additions & 1 deletion code/game/objects/items/reagent_containers/autoinjectors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@
icon = 'icons/obj/items/hunter/pred_gear.dmi'
icon_state = "crystal"
injectSFX = 'sound/items/pred_crystal_inject.ogg'
autoinjector_type = null
autoinjector_type = "thwei"
injectVOL = 15
amount_per_transfer_from_this = REAGENTS_OVERDOSE
volume = REAGENTS_OVERDOSE
Expand All @@ -392,6 +392,12 @@
visible_message(SPAN_DANGER("[src] collapses into nothing."))
qdel(src)

/obj/item/reagent_container/hypospray/autoinjector/yautja/update_icon()
if(uses_left && autoinjector_type) //does not apply a colored fill overlay like the rest of the autoinjectors
var/image/filling = image('icons/obj/items/hunter/pred_gear.dmi', src, "[autoinjector_type]_[uses_left]")
overlays += filling
return

/obj/item/reagent_container/hypospray/autoinjector/skillless
name = "first-aid autoinjector"
chemname = "tricordrazine"
Expand Down
68 changes: 63 additions & 5 deletions code/game/objects/items/storage/belt.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1728,6 +1728,15 @@
new /obj/item/ammo_magazine/pistol/heavy/super/highimpact/ap(src)
new /obj/item/ammo_magazine/pistol/heavy/super/highimpact/ap(src)

/obj/item/storage/belt/gun/m4a3/heavy/co_golden
icon = 'icons/obj/items/clothing/belts/belts_by_map/snow.dmi'
item_icons = list(
WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi',
WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi',
WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi'
)
flags_atom = FPRINT|NO_GAMEMODE_SKIN // same sprite for all gamemodes

/obj/item/storage/belt/gun/m4a3/heavy/co_golden/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/heavy/co/gold())
new /obj/item/ammo_magazine/pistol/heavy/super/highimpact(src)
Expand Down Expand Up @@ -2071,7 +2080,7 @@

/obj/item/storage/belt/gun/mateba
name = "\improper M276 pattern Unica holster rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the powerful Unica autorevolver, along with five small pouches for speedloaders. This one is aging poorly, and seems to be surplus equipment. It's stamped '3rd 'Dust Raiders' Battalion'."
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the powerful Unica autorevolver, along with five small pouches for speedloaders. It was included with the mail-order USCM edition of the Unica autorevolver in the early 2170s."
icon_state = "cmateba_holster"
item_state = "marinebelt"
icon = 'icons/obj/items/clothing/belts/belts_by_map/snow.dmi'
Expand Down Expand Up @@ -2101,8 +2110,6 @@
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)

/obj/item/storage/belt/gun/mateba/cmateba
name = "\improper M276 pattern Unica holster rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the powerful Unica autorevolver, along with five small pouches for speedloaders. It was included with the mail-order USCM edition of the Unica autorevolver in the early 2170s."
icon_state = "cmateba_holster"
item_state = "marinebelt"
flags_atom = FPRINT // has gamemode skin
Expand All @@ -2115,8 +2122,6 @@
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)

/obj/item/storage/belt/gun/mateba/cmateba/special

/obj/item/storage/belt/gun/mateba/cmateba/special/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/mateba/special())
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
Expand All @@ -2125,6 +2130,21 @@
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)

/obj/item/storage/belt/gun/mateba/mtr6m
name = "\improper M276 pattern 2006M holster rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the powerful Unica autorevolver, along with five small pouches for speedloaders. It was included with the mail-order USCM edition of the Spearhead 2006m autorevolver in the early 2170s."
icon_state = "cmateba_holster"
item_state = "marinebelt"
flags_atom = FPRINT // has gamemode skin

/obj/item/storage/belt/gun/mateba/mtr6m/full/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/mateba/mtr6m())
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)

/obj/item/storage/belt/gun/mateba/council
name = "colonel's M276 pattern Unica holster rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. \
Expand All @@ -2148,6 +2168,44 @@
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)

/obj/item/storage/belt/gun/mateba/council/full_golden/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/mateba/golden())
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)

/obj/item/storage/belt/gun/mateba/council/mtr6m
name = "colonel's M276 pattern 2006M holster rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. \
It consists of a modular belt with various clips. This version is for the powerful 2006M autorevolver, \
along with five small pouches for speedloaders. This specific one is tinted black and engraved with gold, heavily customized for a high-ranking official."

/obj/item/storage/belt/gun/mateba/council/mtr6m/full/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/mateba/mtr6m/golden())
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)

/obj/item/storage/belt/gun/mateba/council/mtr6m/full_silver/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/mateba/mtr6m/silver())
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)

/obj/item/storage/belt/gun/mateba/council/mtr6m/full_black/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/revolver/mateba/mtr6m/golden/black_handle())
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)
new /obj/item/ammo_magazine/revolver/mateba/highimpact/ap(src)

/obj/item/storage/belt/gun/mateba/commando
name = "commando WY-T190 pattern Unica holster rig"
desc = "The M276 is the standard load-bearing equipment of the Weyland Yutani. \
Expand Down
11 changes: 11 additions & 0 deletions code/game/objects/items/storage/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,17 @@
new /obj/item/attachable/mateba/long/silver(src)
new /obj/item/weapon/mateba_key(src)

/obj/item/storage/mateba_case/captain/council_gold
icon_state = "c_matebacase"
name = "senior officer's Unica spare barrels case"
desc = "A black-ebony case used for storing the tools and parts needed to customize a Unica autorevolver, as well as room for the gun itself. This variant is custom-made for senior officers and comes with golden barrel attachments."

/obj/item/storage/mateba_case/captain/council_gold/fill_preset_inventory()
new /obj/item/attachable/mateba/short/gold(src)
new /obj/item/attachable/mateba/gold(src)
new /obj/item/attachable/mateba/long/gold(src)
new /obj/item/weapon/mateba_key(src)

/obj/item/storage/mateba_case/general
icon_state = "c_matebacase"
name = "luxurious Unica customization kit case"
Expand Down
Loading
Loading