Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
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
8 changes: 8 additions & 0 deletions code/__DEFINES/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,14 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)

#define JOB_ARMY_LIST list(JOB_ARMY_TROOPER, JOB_ARMY_ENGI, JOB_ARMY_MEDIC, JOB_ARMY_MARKSMAN, JOB_ARMY_SMARTGUNNER, JOB_ARMY_SNCO, JOB_ARMY_CO, JOB_ARMY_TANK, JOB_ARMY_SYN)

//-------- LACN --------//
#define JOB_LACN_MARINE "LACN Fusilier"
#define JOB_LACN_MEDIC "LACN Médico"
#define JOB_LACN_PILOT "LACN Piloto"
#define JOB_LACN_GROUND "LACN Personal de Tierra"
#define JOB_LACN_POLICE "LACN Polícia"

#define JOB_LACN_LIST list(JOB_LACN_PILOT, JOB_LACN_POLICE, JOB_LACN_GROUND, JOB_LACN_MEDIC, JOB_LACN_MARINE)

//-------- UPP --------//
#define JOB_UPP "UPP Ryadovoy"
Expand Down
74 changes: 74 additions & 0 deletions code/datums/skills/forecon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,77 @@ MILITARY SURVIVORS
SKILL_JTAC = SKILL_JTAC_EXPERT,
SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
)

/datum/skills/military/survivor/lacn_standard
name = "LACN Fusilier"
skills = list(
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_DOMESTIC = SKILL_DOMESTIC_TRAINED, //glorified fobbit
)


/datum/skills/military/survivor/lacn_MP
name = "LACN MP"
skills = list(
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
SKILL_CQC = SKILL_CQC_EXPERT,
SKILL_FIREARMS = SKILL_FIREARMS_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
SKILL_POLICE = SKILL_POLICE_SKILLED,
)

/datum/skills/military/survivor/lacn_groundcrew
name = "LACN Ground Crew"
skills = list(
SKILL_PILOT = SKILL_PILOT_TRAINED,
SKILL_ENGINEER = SKILL_ENGINEER_MASTER,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER,
SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER,
SKILL_JTAC = SKILL_JTAC_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
)

/datum/skills/military/survivor/lacn_vhccrew
name = "LACN Vehicle Crewmen"
skills = list(
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
SKILL_FIREARMS = SKILL_FIREARMS_SKILLED,
SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_SURGERY = SKILL_SURGERY_TRAINED,
SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
)

/datum/skills/military/survivor/lacn_pilot
name = "LACN Pilot"
skills = list(
SKILL_PILOT = SKILL_PILOT_EXPERT,
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
SKILL_CQC = SKILL_CQC_TRAINED,
SKILL_DOMESTIC = SKILL_DOMESTIC_TRAINED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
SKILL_JTAC = SKILL_JTAC_MASTER,
)
35 changes: 19 additions & 16 deletions code/game/area/varadero.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@
icon_state = "NV_no_CAS"

/area/varadero/interior/comms1
name = "New Varadero - Tertiary Communications"
name = "New Varadero - Reception"
linked_lz = DROPSHIP_LZ1
icon_state = "comms1"
minimap_color = MINIMAP_AREA_ENGI_CAVE

/area/varadero/interior/comms2
name = "New Varadero - Communications Project Site"
name = "New Varadero - Hangar Auxiliary Storage"
icon_state = "comms2"
minimap_color = MINIMAP_AREA_ENGI_CAVE
linked_lz = DROPSHIP_LZ2
Expand All @@ -68,7 +68,7 @@
linked_lz = DROPSHIP_LZ2

/area/varadero/exterior/comms4
name = "New Varadero - Walkway Extension"
name = "New Varadero - Parking Lot"
linked_lz = DROPSHIP_LZ1
icon_state = "comms4"
minimap_color = MINIMAP_AREA_ENGI_CAVE
Expand All @@ -83,34 +83,34 @@
//landing zone computers

/area/varadero/exterior/lz1_console
name = "New Varadero - Pontoon Dock"
name = "New Varadero - LZ1 Cargo Auxiliary Landing port"
requires_power = FALSE
minimap_color = MINIMAP_AREA_LZ
is_landing_zone = TRUE

/area/varadero/exterior/lz1_console/two
name = "New Varadero - Palm Airfield"
name = "New Varadero - LZ2 LACN Navybase port"
requires_power = FALSE
minimap_color = MINIMAP_AREA_LZ

//exterior areas

/area/varadero/exterior/lz1_near
name = "New Varadero - Pontoon Airfield"
name = "New Varadero - Cargo Auxiliary Airfield"
icon_state = "lz1"
linked_lz = DROPSHIP_LZ1
minimap_color = MINIMAP_AREA_LZ
is_landing_zone = TRUE

/area/varadero/exterior/lz2_near
name = "New Varadero - Palm Airfield"
name = "New Varadero - LACN Navybase Airfield"
icon_state = "lz2"
linked_lz = DROPSHIP_LZ2
minimap_color = MINIMAP_AREA_LZ
is_landing_zone = TRUE

/area/varadero/exterior/pontoon_beach
name = "New Varadero - Rockabilly Beach"
name = "New Varadero - Hydrogenerator Beach"
icon_state = "varadero0"
linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2)
minimap_color = MINIMAP_AREA_JUNGLE
Expand All @@ -120,13 +120,13 @@
linked_lz = DROPSHIP_LZ1

/area/varadero/exterior/eastbeach
name = "New Varadero - East Beach"
name = "New Varadero - Eastern Runway"
linked_lz = DROPSHIP_LZ2
icon_state = "varadero1"
minimap_color = MINIMAP_AREA_JUNGLE

/area/varadero/exterior/monsoon
name = "New Varadero - Monsoon"
name = "New Varadero - Southern Runway"
icon_state = "varadero1"
minimap_color = MINIMAP_AREA_JUNGLE

Expand Down Expand Up @@ -159,7 +159,7 @@


/area/varadero/interior/beach_bar
name = "New Varadero - Beach Bar"
name = "New Varadero - Crashed UD-6B"
icon_state = "varadero4"
linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2)
minimap_color = MINIMAP_AREA_JUNGLE
Expand Down Expand Up @@ -235,6 +235,9 @@
/area/varadero/interior/maintenance/security/south
name = "New Varadero - South Sec. Maintenance"

/area/varadero/interior/maintenance/security/south/hangar
name = "New Varadero - Areodrome"

/area/varadero/interior/research
name = "New Varadero - Research Offices"
icon_state = "offices4"
Expand Down Expand Up @@ -270,13 +273,13 @@
minimap_color = MINIMAP_AREA_COMMAND

/area/varadero/interior/library
name = "New Varadero - Library"
name = "New Varadero - Armoury"
icon_state = "offices0"
linked_lz = DROPSHIP_LZ1
minimap_color = MINIMAP_AREA_COMMAND_CAVE

/area/varadero/interior/library/restaraunt
name = "New Varadero - Restaurant"
name = "New Varadero - Gallery"
icon_state = "pizza"

/area/varadero/interior/court
Expand All @@ -290,12 +293,12 @@
minimap_color = MINIMAP_AREA_COMMAND_CAVE

/area/varadero/interior/bunks
name = "New Varadero - Level 1 Quarters"
name = "New Varadero - Barracks"
icon_state = "req3"
minimap_color = MINIMAP_AREA_JUNGLE

/area/varadero/interior/security
name = "New Varadero - Security Offices"
name = "New Varadero - Military Police Office"
icon_state = "offices0"
minimap_color = MINIMAP_AREA_SEC

Expand Down Expand Up @@ -339,7 +342,7 @@
minimap_color = MINIMAP_AREA_CAVES

/area/varadero/interior_protected/caves/digsite
name = "New Varadero - Dig Site"
name = "New Varadero - Vessel recovery site"
icon_state = "deepcaves3"

/area/varadero/interior_protected/caves/makeshift_tent
Expand Down
18 changes: 18 additions & 0 deletions code/game/jobs/job/special/uscm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,21 @@

/datum/job/special/uscm/cmt
title = JOB_ARMY_MEDIC

// LACN
/datum/job/special/lacn/marine
title = JOB_LACN_MARINE

/datum/job/special/lacn/medic
title = JOB_LACN_MEDIC

/datum/job/special/lacn/pilot
title = JOB_LACN_PILOT


/datum/job/special/lacn/police
title = JOB_LACN_POLICE


/datum/job/special/lacn/ground
title = JOB_LACN_GROUND
70 changes: 70 additions & 0 deletions code/game/objects/effects/landmarks/corpsespawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -402,3 +402,73 @@
/obj/effect/landmark/corpsespawner/tyrargo/us_army_medic/burst
name = "Corpse - Burst - US Army - Trooper"
equip_path = /datum/equipment_preset/corpse/tyrargo/us_army_medic/burst

//*****************************************************************************************************/

///LACN///

// LACN Marine - unarmed //

/obj/effect/landmark/corpsespawner/new_varadero/lacn_marine
name = "Corpse - LACN - Marine - Unarmed"
equip_path = /datum/equipment_preset/corpse/new_varadero/lacn_marine

/obj/effect/landmark/corpsespawner/new_varadero/lacn_marine/burst
name = "Corpse - Burst - LACN - Marine - Unarmed"
equip_path = /datum/equipment_preset/corpse/new_varadero/lacn_marine/burst

// LACN Marine //

/obj/effect/landmark/corpsespawner/new_varadero/lacn_marine_a
name = "Corpse - LACN - Marine"
equip_path = /datum/equipment_preset/corpse/new_varadero/lacn_marine_a

/obj/effect/landmark/corpsespawner/new_varadero/lacn_marine_a/burst
name = "Corpse - Burst - LACN - Marine"
equip_path = /datum/equipment_preset/corpse/new_varadero/lacn_marine_a/burst

// LACN Medic //

/obj/effect/landmark/corpsespawner/new_varadero/lacn_medic
name = "Corpse - LACN - Medic"
equip_path = /datum/equipment_preset/corpse/new_varadero/lacn_medic

/obj/effect/landmark/corpsespawner/new_varadero/lacn_medic/burst
name = "Corpse - Burst - LACN - Medic"
equip_path = /datum/equipment_preset/corpse/new_varadero/lacn_medic/burst

// LACN Med Tech //

/obj/effect/landmark/corpsespawner/new_varadero/doctor
name = "Corpse - LACN - Medical Technician"
equip_path = /datum/equipment_preset/corpse/new_varadero/doctor

/obj/effect/landmark/corpsespawner/new_varadero/doctor/burst
name = "Corpse - Burst - LACN - Medical Technician"
equip_path = /datum/equipment_preset/corpse/new_varadero/doctor/burst

// LACN MP //

/obj/effect/landmark/corpsespawner/new_varadero/lacn_police
name = "Corpse - LACN - Army Police"
equip_path = /datum/equipment_preset/corpse/new_varadero/lacn_police

/obj/effect/landmark/corpsespawner/new_varadero/lacn_police/burst
name = "Corpse - Burst - LACN - Army Police"
equip_path = /datum/equipment_preset/corpse/new_varadero/lacn_police/burst

// LACN Pilot //

/obj/effect/landmark/corpsespawner/new_varadero/lacn_pilot
name = "Corpse - LACN - Pilot"
equip_path = /datum/equipment_preset/corpse/new_varadero/lacn_pilot

// LACN Ground crew //

/obj/effect/landmark/corpsespawner/new_varadero/lacn_groundcrew
name = "Corpse - LACN - Ground Crew"
equip_path = /datum/equipment_preset/corpse/new_varadero/lacn_groundcrew

/obj/effect/landmark/corpsespawner/new_varadero/lacn_groundcrew/burst
name = "Corpse - Burst - LACN - Ground Crew"
equip_path = /datum/equipment_preset/corpse/new_varadero/lacn_groundcrew/burst
8 changes: 8 additions & 0 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,14 @@
desc = "A chestrig used by some USCM personnel."
icon_state = "chestrig"

/obj/item/storage/backpack/marine/satchel/chestrig/LACN
name = "\improper LACN chestrig"
desc = "A standard issue chestrig used by LACN personnel."

/obj/item/storage/backpack/marine/satchel/tech/LACN
name = "\improper LACN technician chestrig"
desc = "A heavy-duty chestrig used by some LACN medical personal."

GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/rto)

/obj/item/storage/backpack/marine/satchel/rto
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/structures/landing_signs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
icon_state = "sorokyne_sign_2"

/obj/structure/lz_sign/new_varadero
name = "New Varadero landing sign"
desc = "A large sign that reads 'New Varadero'. Its always sunny here!"
name = "LACN New Varadero Naval Base Sign"
desc = "A large sign that reads 'LACN - New Varadaro Naval Base' A graphic of a palm tree adorns the sign, as well as a warning for trespassers."
icon_state = "new_varadero"

/obj/structure/lz_sign/chigusa_sign //Relocated from Desert Dam code files.
Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/head/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,9 @@ GLOBAL_LIST_INIT(allowed_hat_items, list(
icon_state = "booniehattan"
flags_atom = FPRINT|NO_GAMEMODE_SKIN

/obj/item/clothing/head/cmcap/boonie/LACN
name = "\improper LACN boonie hat"

/obj/item/clothing/head/cmcap/boonie/fisherman
name = "\improper fisherman's boonie hat"
desc = "A floppy boonie hat with hooks, lines, and sinkers tucked around the band—clearly the choice of a seasoned angler. Offers shade from the sun and some rain protection."
Expand Down
20 changes: 20 additions & 0 deletions code/modules/clothing/suits/marine_armor/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1022,3 +1022,23 @@
armor_bio = CLOTHING_ARMOR_GIGAHIGHPLUS
armor_rad = CLOTHING_ARMOR_GIGAHIGHPLUS
armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS

//LACN

/obj/item/clothing/suit/storage/marine/light/vest/LACN
name = "LACN LM2 pattern armor"
desc = "A LACN variant of the Marine M2 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage. Notably this model of the M2 lacks the rigging and such of the later generation M2s still in use by the USCM making it easier to handle."
icon_state = "lacn_armor"
icon = 'icons/obj/items/clothing/suits/suits_by_faction/UA.dmi'
item_icons = list(
WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi'
)
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS // no bracers = no arm protection
armor_melee = CLOTHING_ARMOR_MEDIUMLOW
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_bio = CLOTHING_ARMOR_MEDIUMLOW
armor_internaldamage = CLOTHING_ARMOR_LOW
flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS
movement_compensation = SLOWDOWN_ARMOR_LIGHT
flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE
storage_slots = 3
Loading