Skip to content
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.

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

W-Y platoon #136

Draft
wants to merge 76 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
3e630b6
ooouh
bearrrrrrrr Mar 4, 2024
aaf80c5
m39 duplex uh oh
bearrrrrrrr Mar 4, 2024
dd14e44
mapwork n tweaks
bearrrrrrrr Mar 4, 2024
dd428f8
yea
bearrrrrrrr Mar 5, 2024
162f0c0
map areas
bearrrrrrrr Mar 5, 2024
c6ecc16
ooouh
bearrrrrrrr Mar 4, 2024
314db04
m39 duplex uh oh
bearrrrrrrr Mar 4, 2024
0f021b3
mapwork n tweaks
bearrrrrrrr Mar 4, 2024
623ef46
yea
bearrrrrrrr Mar 5, 2024
bac1c63
map areas
bearrrrrrrr Mar 5, 2024
853710f
auaguh
bearrrrrrrr Mar 7, 2024
6755a16
Merge branch 'wyplatoon' of https://github.com/bearrrrrrrr/PvE-CMSS13…
bearrrrrrrr Mar 7, 2024
b51639e
vendors and stuffffff
bearrrrrrrr Mar 7, 2024
f67c509
Merge branch 'master' into wyplatoon
AndroBetel Mar 7, 2024
ede8f6e
augaugaguagu
bearrrrrrrr Mar 8, 2024
5e430fb
Merge branch 'wyplatoon' of https://github.com/bearrrrrrrr/PvE-CMSS13…
bearrrrrrrr Mar 8, 2024
aa4299f
oh goodness
bearrrrrrrr Mar 8, 2024
d759b93
flat scream
bearrrrrrrr Mar 8, 2024
fa437d2
jobs done lol
bearrrrrrrr Mar 8, 2024
d5f501e
access, unsure for what to do with it for rn or what i wanna do, will…
bearrrrrrrr Mar 8, 2024
b2bb74a
machine, i know you're here. i can smell the insolent stench of your …
bearrrrrrrr Mar 9, 2024
a990ad3
C O M E T O M E
bearrrrrrrr Mar 9, 2024
cdff73a
au7ghaah
bearrrrrrrr Mar 9, 2024
73d4922
80 / 20
bearrrrrrrr Mar 10, 2024
7627ee0
agony. pain
bearrrrrrrr Mar 10, 2024
458b1fc
goodbye yellow brick road
bearrrrrrrr Mar 11, 2024
2df5f1d
*medic
bearrrrrrrr Mar 13, 2024
93c7a17
Merge branch 'master' into wyplatoon
bearrrrrrrr Mar 13, 2024
4764fbc
fix
bearrrrrrrr Mar 13, 2024
2f5dfdf
aeeuauuagg
bearrrrrrrr Mar 14, 2024
fb75dd9
fixed
bearrrrrrrr Mar 14, 2024
5da4320
AUGAUGAUGHUAHUG
bearrrrrrrr Mar 14, 2024
6308016
i aint here to break it, just see how far it will beeend
bearrrrrrrr Mar 14, 2024
804b97b
auaguaguagga
bearrrrrrrr Mar 14, 2024
a789b4b
i look just like buddy holly
bearrrrrrrr Mar 15, 2024
0994adf
At Ends
bearrrrrrrr Mar 15, 2024
197c0d2
boo hoo
bearrrrrrrr Mar 16, 2024
0c64714
...LIKE ANTENNAS TO HEAVEN
bearrrrrrrr Mar 18, 2024
b3b5d23
WE'RE SO FUCKING BACK
bearrrrrrrr Mar 18, 2024
0490024
should be good
bearrrrrrrr Mar 26, 2024
6981eb1
HHHHHHHHHHH
bearrrrrrrr Mar 28, 2024
32c8336
oops
bearrrrrrrr Mar 28, 2024
7cb8246
hud (no tracker yet)
bearrrrrrrr Mar 31, 2024
14d1dd7
i hate house md
bearrrrrrrr Apr 4, 2024
979468e
Merge branch 'master' into wyplatoon
AndroBetel Apr 9, 2024
f13488e
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 int…
AndroBetel Apr 10, 2024
bb59976
Merge branch 'wyplatoon' of https://github.com/bearrrrrrrr/PvE-CMSS13…
AndroBetel Apr 10, 2024
2221a0f
rip sodera
AndroBetel Apr 10, 2024
3cac2ff
kill the poor
AndroBetel Apr 13, 2024
20c0bf0
Update pmc_pve.dm
AndroBetel Apr 13, 2024
f5b39ad
Update lead_hawk.dmm
AndroBetel Apr 13, 2024
09fd74a
Update lead_hawk.dmm
AndroBetel Apr 13, 2024
84f5365
step by step
AndroBetel Apr 13, 2024
0e5cc85
tweaks+featuers
AndroBetel Apr 13, 2024
7c4a719
Update uscm_ship.dm
AndroBetel Apr 13, 2024
8184764
Update lead_hawk.dmm
AndroBetel Apr 13, 2024
6a70b46
Merge branch 'master' into wyplatoon
AndroBetel Apr 19, 2024
97278c6
its so over
AndroBetel Apr 26, 2024
76ca666
Merge branch 'wyplatoon' of https://github.com/bearrrrrrrr/PvE-CMSS13…
AndroBetel Apr 26, 2024
96466c0
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 int…
AndroBetel Apr 26, 2024
fb13cd8
Update rifles.dm
AndroBetel Apr 26, 2024
99c4cb5
me when the
AndroBetel Apr 26, 2024
cfc40bb
fixes
AndroBetel Apr 26, 2024
edd0961
fixes
AndroBetel Apr 26, 2024
0825b12
Update lead_hawk.dmm
AndroBetel Apr 26, 2024
17d67e6
Update lead_hawk.dmm
AndroBetel Apr 26, 2024
312c1e5
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 int…
AndroBetel Apr 26, 2024
b4d8b14
naming fixes
AndroBetel Apr 30, 2024
5e3b3c9
tweaks+mapreview
AndroBetel May 1, 2024
7cc62f4
Update lead_hawk.dmm
AndroBetel May 1, 2024
967e980
Update cans.dm
AndroBetel May 1, 2024
c155dcc
knknk
AndroBetel May 2, 2024
e03897a
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 int…
AndroBetel May 2, 2024
6cc9e0e
Update squad_prep.dm
AndroBetel May 2, 2024
ae7d187
Merge branch 'master' of https://github.com/cmss13-devs/cmss13-pve in…
AndroBetel Jul 18, 2024
576f3ad
Update lead_hawk.dmm
AndroBetel Jul 18, 2024
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
11 changes: 11 additions & 0 deletions code/__DEFINES/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#define SQUAD_SOF "SOF"
#define SQUAD_CBRN "CBRN"
#define SQUAD_UPP "Red Dawn"
#define SQUAD_PMCPLT "AZURE-15"

// Job name defines
#define JOB_SQUAD_MARINE "Rifleman"
Expand Down Expand Up @@ -218,6 +219,16 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST

#define JOB_WY_GOON_LIST list(JOB_WY_GOON, JOB_WY_GOON_LEAD)

////-------- PMC PLATOON --------//

#define JOB_PMCPLAT_OW "OVERWATCH"
#define JOB_PMCPLAT_LEADER "Operations Leader"
#define JOB_PMCPLAT_FTL "Team Leader"
#define JOB_PMCPLAT_SG "Heavy Weapons Specialist"
#define JOB_PMCPLAT_STANDARD "Tactical Unit"
#define JOB_PMC_MEDIC "Medical Specialist"


//---- Contractors ----//
#define JOB_CONTRACTOR "VAIPO Mercenary"
#define JOB_CONTRACTOR_ST "VAIPO Mercenary"
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/minimap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
#define MINIMAP_SQUAD_SOF "#400000"
#define MINIMAP_SQUAD_INTEL "#053818"
#define MINIMAP_SQUAD_UPP "#B22222"
#define MINIMAP_SQUAD_PMC "#ccffe9"

#define MINIMAP_ICON_BACKGROUND_CIVILIAN "#7D4820"
#define MINIMAP_ICON_BACKGROUND_CIC "#3f3f3f"
Expand Down
3 changes: 2 additions & 1 deletion code/__DEFINES/mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ var/global/list/ROLES_ENGINEERING = list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH,
var/global/list/ROLES_REQUISITION = list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION)
var/global/list/ROLES_MEDICAL = list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR)
var/global/list/ROLES_MARINES = list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE)
var/global/list/ROLES_SQUAD_ALL = list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MARINE_3, SQUAD_MARINE_4, SQUAD_MARINE_5, SQUAD_MARINE_CRYO, SQUAD_MARINE_INTEL, SQUAD_UPP)
var/global/list/ROLES_SQUAD_ALL = list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MARINE_3, SQUAD_MARINE_4, SQUAD_MARINE_5, SQUAD_MARINE_CRYO, SQUAD_MARINE_INTEL, SQUAD_UPP, SQUAD_PMCPLT)

//Groundside roles
var/global/list/ROLES_XENO = list(JOB_XENOMORPH_QUEEN, JOB_XENOMORPH)
Expand All @@ -141,6 +141,7 @@ var/global/list/ROLES_UNASSIGNED = list(JOB_SQUAD_MARINE)
var/global/list/ROLES_AI = list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE)
var/global/list/ROLES_AI_UPP = list(JOB_SO_UPP, JOB_SQUAD_LEADER_UPP, JOB_SQUAD_MEDIC_UPP, JOB_SQUAD_TEAM_LEADER_UPP, JOB_SQUAD_SMARTGUN_UPP, JOB_SQUAD_MARINE_UPP)
var/global/list/ROLES_WO = list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER)
var/global/list/ROLES_PMCPLT = list(JOB_PMCPLAT_OW, JOB_PMCPLAT_LEADER, JOB_PMCPLAT_FTL, JOB_PMCPLAT_SG, JOB_PMCPLAT_STANDARD, JOB_PMC_MEDIC)
//Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc.
#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\
JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE
Expand Down
11 changes: 10 additions & 1 deletion code/datums/ammo/bullet/smg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,18 @@
/datum/ammo/bullet/smg/m39
name = "high-velocity submachinegun bullet" //i don't want all smgs to inherit 'high velocity'

/datum/ammo/bullet/smg/pve
name = "squash-head submachinegun duplex bullet"
shell_speed = AMMO_SPEED_TIER_4 //high velocitisn't
bonus_projectiles_type = /datum/ammo/bullet/smg/duplex
bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_1 //1 extra

/datum/ammo/bullet/smg/duplex
name = "squash-head submachinegun duplex bullet"
shell_speed = AMMO_SPEED_TIER_3 //high velocitisn't - lags behind first

/datum/ammo/bullet/smg/ap
name = "armor-piercing submachinegun bullet"

damage = 26
penetration = ARMOR_PENETRATION_TIER_6
shell_speed = AMMO_SPEED_TIER_4
Expand Down
39 changes: 39 additions & 0 deletions code/game/area/lead_hawk.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/area/lead_hawk
icon = 'icons/turf/area_almayer.dmi'
icon_state = "almayer"
ceiling = CEILING_METAL
powernet_name = "lead_hawk"
sound_environment = SOUND_ENVIRONMENT_ROOM
soundscape_interval = 30
ambience_exterior = AMBIENCE_ALMAYER
ceiling_muffle = FALSE

/area/lead_hawk/medical
name = "Medical"

/area/lead_hawk/cryo_cell
name = "Cryo Cell"

/area/lead_hawk/engineer
name = "Engineering"

/area/lead_hawk/squad_theta
name = "Theta Squad Prep"

/area/lead_hawk/squad_omega
name = "Omega Squad Prep"

/area/lead_hawk/cafeteria
name = "Cafeteria"

/area/lead_hawk/briefing
name = "Briefing"

/area/lead_hawk/ares
name = "OVERLORD Restricted Area"

/area/lead_hawk/hangar
name = "\improper Hangar"
icon_state = "hangar"
soundscape_playlist = SCAPE_PL_HANGAR
soundscape_interval = 50
11 changes: 11 additions & 0 deletions code/game/jobs/job/command/cic/staffofficer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,16 @@ AddTimelock(/datum/job/command/bridge, list(
icon_state = "so_spawn"
job = /datum/job/command/bridge/ai/upp

/datum/job/command/bridge/ai/pmc
title = JOB_PMCPLAT_OW
// todo: funny AR goggles perma cyan gear_preset =
// todo: above gear_preset_secondary = /datum/equipment_preset/uscm_ship/so/upp/lesser_rank

job_options = list(FIRST_LT_VARIANT = "OVERWATCH", SECOND_LT_VARIANT = "OVERLORD")

/obj/effect/landmark/start/bridge/pmc
name = JOB_PMCPLAT_OW
job = /datum/job/command/bridge/ai/pmc

#undef SECOND_LT_VARIANT
#undef FIRST_LT_VARIANT
10 changes: 10 additions & 0 deletions code/game/jobs/job/marine/squad/leader.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,15 @@ AddTimelock(/datum/job/marine/leader, list(
squad = SQUAD_UPP
job = /datum/job/marine/leader/ai/upp

/datum/job/marine/leader/ai/pmc
title = JOB_PMCPLAT_LEADER
gear_preset = /datum/equipment_preset/uscm/pmc/sl
gear_preset_secondary = /datum/equipment_preset/uscm/pmc/sl

/obj/effect/landmark/start/marine/leader/pmc
name = JOB_PMCPLAT_LEADER
squad = SQUAD_PMCPLT
job = /datum/job/marine/leader/ai/pmc

#undef SSGT_VARIANT
#undef GYSGT_VARIANT
10 changes: 10 additions & 0 deletions code/game/jobs/job/marine/squad/medic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,15 @@ AddTimelock(/datum/job/marine/medic, list(
squad = SQUAD_UPP
job = /datum/job/marine/medic/ai/upp

/datum/job/marine/medic/ai/pmc
title = JOB_PMC_MEDIC
gear_preset = /datum/equipment_preset/uscm/pmc/med
gear_preset_secondary = /datum/equipment_preset/uscm/pmc/med

/obj/effect/landmark/start/marine/medic/pmc
name = JOB_PMC_MEDIC
squad = SQUAD_PMCPLT
job = /datum/job/marine/medic/ai/pmc

#undef LCPL_VARIANT
#undef CPL_VARIANT
10 changes: 10 additions & 0 deletions code/game/jobs/job/marine/squad/smartgunner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,15 @@ AddTimelock(/datum/job/marine/smartgunner, list(
job = JOB_SQUAD_SMARTGUN_UPP
squad = SQUAD_UPP

/datum/job/marine/smartgunner/ai/pmc
title = JOB_PMCPLAT_SG
gear_preset = /datum/equipment_preset/uscm/pmc/sg
gear_preset_secondary = /datum/equipment_preset/uscm/pmc/sg


/obj/effect/landmark/start/marine/smartgunner/pmc
name = JOB_PMCPLAT_SG
squad = SQUAD_PMCPLT

#undef LCPL_VARIANT
#undef CPL_VARIANT
10 changes: 10 additions & 0 deletions code/game/jobs/job/marine/squad/standard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,15 @@
squad = SQUAD_UPP
job = /datum/job/marine/standard/ai/upp

/datum/job/marine/standard/ai/pmc
title = JOB_PMCPLAT_STANDARD
gear_preset = /datum/equipment_preset/uscm/pmc
gear_preset_secondary = /datum/equipment_preset/uscm/pmc

/obj/effect/landmark/start/marine/pmc
name = JOB_PMCPLAT_STANDARD
squad = SQUAD_PMCPLT
job = /datum/job/marine/standard/ai/pmc

#undef PVT_VARIANT
#undef PFC_VARIANT
11 changes: 11 additions & 0 deletions code/game/jobs/job/marine/squad/tl.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,15 @@ AddTimelock(/datum/job/marine/tl, list(
squad = SQUAD_UPP
job = /datum/job/marine/tl/ai/upp

/datum/job/marine/tl/ai/pmc
title = JOB_PMCPLAT_FTL
gear_preset = /datum/equipment_preset/uscm/pmc/tl
gear_preset_secondary = /datum/equipment_preset/uscm/pmc/tl

/obj/effect/landmark/start/marine/tl/pmc
name = JOB_PMCPLAT_FTL
squad = SQUAD_PMCPLT
job = /datum/job/marine/tl/ai/pmc


#undef SGT_VARIANT
11 changes: 11 additions & 0 deletions code/game/jobs/job/marine/squads.dm
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,17 @@
name = "Taskforce White"
locked = TRUE
faction = FACTION_WY_DEATHSQUAD


//##############################

/datum/squad/pmc/pve
AndroBetel marked this conversation as resolved.
Show resolved Hide resolved
name = SQUAD_PMCPLT
chat_color = "#ccffe9"
minimap_color = MINIMAP_SQUAD_PMC
use_stripe_overlay = FALSE


//###############################
/datum/squad/clf
name = "Root"
Expand Down
40 changes: 22 additions & 18 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
Original file line number Diff line number Diff line change
Expand Up @@ -149,24 +149,25 @@
)


/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/upp
name = "\improper UnTech Surplus Uniform Vendor"
// PVE PMC VENDOR

/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/pmc
name = "\improper PMC Uniform Vendor"
desc = "An automated supply rack hooked up to a small storage of standard UPP uniforms."
icon_state = "upp_gear"
req_access = list(ACCESS_UPP_GENERAL)
req_one_access = list()
listed_products = list()
hackable = TRUE
vendor_theme = VENDOR_THEME_UPP

/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/upp/populate_product_list(scale)
/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/pmc/populate_product_list(scale)
listed_products = list(
list("STANDARD EQUIPMENT", -1, null, null, null),
list("Military Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine/upp, VENDOR_ITEM_REGULAR),
list("UPP Uniform", round(scale * 15), /obj/item/clothing/under/marine/veteran/UPP, VENDOR_ITEM_REGULAR),
list("Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine/veteran/upp, VENDOR_ITEM_REGULAR),
list("UM4 Pattern Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine/veteran/UPP, VENDOR_ITEM_REGULAR),
list("Radio Headset", round(scale * 15), /obj/item/device/radio/headset/distress/UPP, VENDOR_ITEM_REGULAR),
list("Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine/corporate, VENDOR_ITEM_REGULAR),
list("PMC Uniform", round(scale * 15), /obj/item/clothing/under/marine/veteran/pmc/corporate, VENDOR_ITEM_REGULAR),
list("Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine/veteran/pmc, VENDOR_ITEM_REGULAR),
list("M11-PMC Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine/veteran/pmc/sniper/pve, VENDOR_ITEM_REGULAR),
list("PMC Radio Headset", round(scale * 15), /obj/item/device/radio/headset/distress/pmc, 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 All @@ -176,22 +177,23 @@
list("Shoulder Holster", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),

list("ARMOR", -1, null, null),
list("UM5 Personal Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/faction/UPP, VENDOR_ITEM_REGULAR),
list("UL6 Personal Light Armor", round(scale * 10), /obj/item/clothing/suit/storage/marine/faction/UPP/support, VENDOR_ITEM_REGULAR),
list("M4 Personal Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/veteran/pmc, VENDOR_ITEM_REGULAR),
list("M4-L Personal Light Armor", round(scale * 10), /obj/item/clothing/suit/storage/marine/veteran/pmc/light, VENDOR_ITEM_REGULAR),

list("BACKPACK", -1, null, null, null),
list("Lightweight Combat Pack", round(scale * 15), /obj/item/storage/backpack/lightpack, VENDOR_ITEM_REGULAR),
list("Lightweight IMP Backpack", round(scale * 15), /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR),
list("UPP Satchel", round(scale * 15), /obj/item/storage/backpack/lightpack/upp, VENDOR_ITEM_REGULAR),

list("RESTRICTED BACKPACKS", -1, null, null),
list("Radio Telephone Backpack", round(max(1,(scale * 0.5))), /obj/item/storage/backpack/marine/satchel/rto, VENDOR_ITEM_REGULAR),

list("BELTS", -1, null, null),
list("Type 41 Pattern Ammo Load Rig", round(scale * 15), /obj/item/storage/belt/marine/upp, VENDOR_ITEM_REGULAR),
list("M276 Pattern Ammo Load Rig", round(scale * 15), /obj/item/storage/belt/marine, VENDOR_ITEM_REGULAR),
list("M276 Pattern M40 Grenade Rig", round(scale * 10), /obj/item/storage/belt/grenade, VENDOR_ITEM_REGULAR),
list("Type 47 Pattern General Pistol Holster Rig", round(scale * 15), /obj/item/storage/belt/gun/type47, VENDOR_ITEM_REGULAR),
list("M276 Pattern General Pistol Holster Rig", round(scale * 15), /obj/item/storage/belt/gun/m4a3, VENDOR_ITEM_REGULAR),
list("M276 Pattern M44 Holster Rig", round(scale * 15), /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR),
list("M276 Pattern M82F Holster Rig", round(scale * 5), /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR),
list("Type 48 General Utility Pouch", round(scale * 15), /obj/item/storage/backpack/general_belt/upp, VENDOR_ITEM_REGULAR),
list("M276 G8-A General Utility Pouch", round(scale * 15), /obj/item/storage/backpack/general_belt, VENDOR_ITEM_REGULAR),

list("POUCHES", -1, null, null, null),
list("First-Aid Pouch (Splints, Gauze, Ointment)", round(scale * 15), /obj/item/storage/pouch/firstaid/full/alternate, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -221,16 +223,18 @@
list("Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles, VENDOR_ITEM_REGULAR),
list("M1A1 Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/v2, VENDOR_ITEM_REGULAR),
list("Prescription ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR),
list("Marine RPG glasses", round(scale * 10), /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR),
list("Prescription glasses", round(scale * 10), /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR),
list("M5 Integrated Gas Mask", round(scale * 10), /obj/item/prop/helmetgarb/helmet_gasmask, VENDOR_ITEM_REGULAR),
list("M10 Helmet Netting", round(scale * 10), /obj/item/prop/helmetgarb/netting, VENDOR_ITEM_REGULAR),
list("M10 Helmet Rain Cover", round(scale * 10), /obj/item/prop/helmetgarb/raincover, VENDOR_ITEM_REGULAR),
list("Firearm Lubricant", round(scale * 15), /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR),
list("UPP Airborne Reconnaissance Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/upp/platoon, VENDOR_ITEM_REGULAR),
list("UPPA Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/upp, VENDOR_ITEM_REGULAR),
list("PMC Cap", round(scale * 15), /obj/item/clothing/head/helmet/marine/veteran/pmc, VENDOR_ITEM_REGULAR),
list("PMC Beret", round(scale * 15), /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, VENDOR_ITEM_REGULAR),
list("Bedroll", round(scale * 20), /obj/item/roller/bedroll, VENDOR_ITEM_REGULAR),
)



//--------------SQUAD SPECIFIC VERSIONS--------------
//Those vendors aren't being used i will make them us the main vendor a parent to avoid having four different
// list with just the headset changed.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,12 @@
desc = "An ammunition case containing 10 M41A magazines."
supplies = list(/obj/item/ammo_magazine/rifle = 10)

/obj/structure/largecrate/supply/ammo/m41a/extended
name = "\improper M41A ext. magazine case (x20)"
desc = "An ammunition case containing 20 extended M41A magazines."
supplies = list(/obj/item/ammo_magazine/rifle/extended = 20)


/obj/structure/largecrate/supply/ammo/m41amk1
name = "\improper M41A magazine case (x20)"
desc = "An ammunition case containing 20 M41A MK1 magazines."
Expand Down
2 changes: 1 addition & 1 deletion code/global.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
#define MAIN_SHIP_NAME SSmapping.get_main_ship_name()
#define MAIN_SHIP_DEFAULT_NAME "USS Golden Arrow"
#define SHIP_MAP_NAMES list("USS Almayer", "USS Golden Arrow", "SSV Chapaev")
#define SHIP_MAP_NAMES list("USS Almayer", "USS Golden Arrow", "SSV Chapaev", "USCSS Apostasy",)

#define MAIN_SHIP_PLATOON text2path(SSmapping.get_main_ship_platoon())
#define MAIN_SHIP_DEFAULT_PLATOON "/datum/squad/marine/alpha"
Expand Down
4 changes: 4 additions & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -992,6 +992,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
flags_inventory = COVEREYES|COVERMOUTH|BLOCKSHARPOBJ
flags_marine_helmet = HELMET_DAMAGE_OVERLAY

/obj/item/clothing/head/helmet/marine/veteran/pmc/sniper/pve
name = "\improper M11-PMC helmet"
desc = "An aftermarket helmet worn by PMC groups. A more comfortable M11, covered by a sterilized white antibacterial layer. It's a shockingly useful feature after a firefight."

/obj/item/clothing/head/helmet/marine/veteran/pmc/gunner
name = "\improper PMC gunner helmet"
desc = "A modification of the standard Armat Systems M3 armor."
Expand Down
32 changes: 32 additions & 0 deletions code/modules/gear_presets/pmc_pve.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// new file - don't wanna cram this in with other pmc's, feels bloaty

// riflemen
/datum/equipment_preset/uscm/pmc
name = "Tactical Unit"
paygrade = "PMC"
// access = list(ACCESS_PMC_GENERAL)
access = list(ACCESS_LIST_WY_ALL)
languages = list(LANGUAGE_JAPANESE, LANGUAGE_ENGLISH)
faction_group = list(FACTION_LIST_WY)
faction = FACTION_PMC

/datum/equipment_preset/uscm/pmc/sl
name = "Team Leader"
paygrade = "PMC-TL"
// access = list(ACCESS_PMC_GENERAL, ACCESS_PMC_TLPREP)

/datum/equipment_preset/uscm/pmc/tl
name = "Team Leader"
paygrade = "PMC-OP"
// access = list(ACCESS_PMC_GENERAL, ACCESS_PMC_TLPREP)

/datum/equipment_preset/uscm/pmc/sg
name = "Team Leader"
paygrade = "PMC-WS"
// access = list(ACCESS_PMC_GENERAL, ACCESS_PMC_TLPREP)

/datum/equipment_preset/uscm/pmc/med
name = "Team Leader"
paygrade = "PMC-MS"
// access = list(ACCESS_PMC_GENERAL, ACCESS_PMC_TLPREP)

Loading
Loading