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

CLF Operations (WIP) #228

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions code/__DEFINES/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#define SQUAD_CBRN "CBRN"
#define SQUAD_UPP "Red Dawn"
#define SQUAD_LRRP "Snake Eaters"
#define SQUAD_CLF_SHIP "Tunnel Rats"

// Job name defines
#define JOB_SQUAD_MARINE "Rifleman"
Expand Down Expand Up @@ -310,6 +311,18 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST

#define CLF_JOB_LIST list(JOB_CLF, JOB_CLF_ENGI, JOB_CLF_MEDIC, JOB_CLF_SPECIALIST, JOB_CLF_LEADER, JOB_CLF_COMMANDER, JOB_CLF_SYNTH)


//-------- CLF Coughing Canary Crew --------//
#define JOB_CLF_SHIP "CLF Freedom Fighter"
#define JOB_CLF_SHIP_ENGI "CLF Combat Technician"
#define JOB_CLF_SHIP_SPECIALIST "CLF Heavy Autogunner"
#define JOB_CLF_SHIP_MEDIC "CLF Combat Medic"
#define JOB_CLF_LEADER_SHIP "CLF Combat Team Leader"
#define JOB_CLF_COMMANDER_SHIP "Coughing Canary Captain"
#define JOB_CLF_SHIP_SYNTH "Coughing Canary Multipurpose Synthetic"

#define CLF_SHIP_JOB_LIST list(JOB_CLF_SHIP, JOB_CLF_SHIP_ENGI, JOB_CLF_SHIP_MEDIC, JOB_CLF_SHIP_SPECIALIST, JOB_CLF_SHIP_LEADER, JOB_CLF_SHIP_COMMANDER, JOB_CLF_SHIP_SYNTH)

//-------- TWE --------//
#define JOB_TWE_REPRESENTATIVE "TWE Representative"

Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ var/global/list/ROLES_AI = list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_S
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_AI_FORECON = list(JOB_SQUAD_LEADER_FORECON, JOB_SQUAD_MEDIC_FORECON, JOB_SQUAD_TEAM_LEADER_FORECON, JOB_SQUAD_SMARTGUN_FORECON, JOB_SQUAD_MARINE_FORECON, JOB_SQUAD_RTO)
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_AI_CLF_SHIP = list(JOB_CLF_SHIP, JOB_CLF_SHIP_ENGI, JOB_CLF_SHIP_MEDIC, JOB_CLF_SHIP_SPECIALIST, JOB_CLF_SHIP_LEADER, JOB_CLF_SHIP_COMMANDER, JOB_CLF_SHIP_SYNTH)
//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
57 changes: 56 additions & 1 deletion code/modules/clothing/suits/marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,62 @@
storage_slots = 2
uniform_restricted = list(/obj/item/clothing/under/marine/veteran/freelancer)

//this one is for CLF
//===========================//COLONIAL LIBERATION FRONT\\================================\\
//=====================================================================\\

/obj/item/clothing/suit/storage/marine/veteran/ua_riot/CLF/jacket
name = "\improper UA-M1 Repainted body armor"
desc = "An Repaired Set of UA-M1 body armor that is employed by UA security, riot control and union-busting teams. This Set of Armor Has Been Repainted in Dark Brown Colours and has Handmade Kneepads and Armpads added to it, Is Used by the Colonial Liberation Front since the previous owners aren't using them for the defense of the UA anymore."
icon_state = "CLF_UA"
storage_slots = 3
flags_armor_protection = BODY_FLAG_ALL_BUT_HEAD
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_energy = CLOTHING_ARMOR_MEDIUM
armor_bomb = CLOTHING_ARMOR_MEDIUM
armor_rad = CLOTHING_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
slowdown = SLOWDOWN_ARMOR_VERY_LIGHT // it's lighter
uniform_restricted = list(/obj/item/clothing/under/marine/ua_riot)
flags_atom = NO_SNOW_TYPE

/obj/item/clothing/suit/storage/marine/veteran/ua_riot/CLF/jacket
name = "\improper Camouflaged Hunter Gear Rig"
desc = "An Camouflaged Hunter Gear Rig that has an Armor Plate on the Body while it sports handmade kneepads, is the basic gear used by the Colonial Liberation Front Freedom Fighters Against The Abusive Enemies of the Humble colonists, Being UA's, WY or Even UPP Trying to Infiltrate the Cells and Colonies."
icon_state = "CLF_HUNTER"
storage_slots = 3
flags_armor_protection = BODY_FLAG_ALL_BUT_HEAD
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_energy = CLOTHING_ARMOR_MEDIUM
armor_bomb = CLOTHING_ARMOR_MEDIUM
armor_rad = CLOTHING_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
slowdown = SLOWDOWN_ARMOR_VERY_LIGHT // it's lighter
uniform_restricted = list(/obj/item/clothing/under/marine/ua_riot)
flags_atom = NO_SNOW_TYPE

/obj/item/clothing/suit/storage/marine/heavy/CLF
name = "\improper heavy plated Combat armor"
desc = "An extremely heavy-duty set of body armor made out of Handcrafted Armor Plates, Repurposed Surplus Ballistic Vests and Several Armors Combined in one, Heavy and Highly Resistant, Made by the Colonial Liberation Front For Their Autogunners and to Show that they are Prepared for Something Bigger than a Guerrilla War."
icon_state = "CLF_HEAVY"
storage_slots = 3
slowdown = SLOWDOWN_ARMOR_HEAVY
flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN
flags_armor_protection = BODY_FLAG_ALL_BUT_HEAD
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_HIGHPLUS
armor_laser = CLOTHING_ARMOR_MEDIUMLOW
armor_energy = CLOTHING_ARMOR_MEDIUM
armor_bomb = CLOTHING_ARMOR_HIGH
armor_bio = CLOTHING_ARMOR_MEDIUM
armor_rad = CLOTHING_ARMOR_MEDIUMLOW
armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS

/obj/item/clothing/suit/storage/militia
name = "colonial militia hauberk"
desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops."
Expand Down
24 changes: 24 additions & 0 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,30 @@
worn_state = "clf_uniform"
sensor_faction = FACTION_CLF

/obj/item/clothing/under/colonist/clf/crew
name = "\improper Colonial Liberation Front Combat Clothes"
desc = "A stylish Brown-Green mix of Hunting and Sports Clothes - standard issue for Frontier colonists. This version appears to have the symbol of the Colonial Liberation Front emblazoned in select areas."
icon_state = "CLF_FIGHTER"
worn_state = "CLF_FIGHTER"
sensor_faction = FACTION_CLF
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE

/obj/item/clothing/under/colonist/clf/medic
name = "\improper Colonial Liberation Front Medic Clothes"
desc = "A stylish Light Blue-White mix of Hunting and Sports Clothes - standard issue for Frontier colonists. This version appears to have the symbol of the Colonial Liberation Front emblazoned in select areas."
icon_state = "CLF_MEDIC"
worn_state = "CLF_MEDIC"
sensor_faction = FACTION_CLF
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE

/obj/item/clothing/under/colonist/clf/leader
name = "\improper Colonial Liberation Front Clothes"
desc = "A stylish Dark blue mix of Military Clothes - standard issue for Frontier colonists. This version appears to have the symbol of the Colonial Liberation Front emblazoned in select areas, shows the rank of the leaders on the shoulder."
icon_state = "CLF_LEADER"
worn_state = "CLF_LEADER"
sensor_faction = FACTION_CLF
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE

/obj/item/clothing/under/colonist/prison_boiler
name = "\improper prisoner boiler uniform"
desc = "A standardised prisoner-wear boiler uniform."
Expand Down
Binary file modified icons/landmarks.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/head_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/helmet_garb.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/suit_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/uniform_0.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_hats.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_suits.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms.dmi
Binary file not shown.
Loading