Merge pull request #15 from XeroXOffice/corecode-rewrite

medal boxes + army integration

code/modules/client/preference_setup/loadout/lists/accessories.dm

@@ -63,17 +63,17 @@
 /datum/gear/accessory/ntaward
 	display_name = "corporate award selection"
 	description = "A medal or ribbon awarded to corporate personnel for significant accomplishments."
-	path = /obj/item/clothing/accessory/medal
-	cost = 8
+	path = /obj/item/storage/medalbox
+	cost = 6
 	flags = GEAR_HAS_NO_CUSTOMIZATION
 
 
 /datum/gear/accessory/ntaward/New()
 	..()
 	var/ntawards = list()
-	ntawards["sciences medal"] = /obj/item/clothing/accessory/medal/bronze/nanotrasen
-	ntawards["distinguished service"] = /obj/item/clothing/accessory/medal/silver/nanotrasen
-	ntawards["command medal"] = /obj/item/clothing/accessory/medal/gold/nanotrasen
+	ntawards["sciences medal"] = /obj/item/storage/medalbox/corp_science
+	ntawards["distinguished service"] = /obj/item/storage/medalbox/corp_service
+	ntawards["command medal"] = /obj/item/storage/medalbox/corp_command
 	gear_tweaks += new/datum/gear_tweak/path(ntawards)
 
 

code/modules/clothing/under/accessories/medals.dm

@@ -56,3 +56,33 @@
 	name = "corporate merit medal"
 	desc = "An iron medal awarded to employees for merit."
 	icon_state = "iron_nt"
+
+/obj/item/storage/medalbox
+	name = "medal box"
+	desc = "A small lacquered wooden box for holding decorations."
+	icon = 'icons/obj/medalbox.dmi'
+	icon_state = "medalbox"
+	w_class = ITEM_SIZE_SMALL
+	max_w_class = ITEM_SIZE_SMALL
+	max_storage_space = 3
+	contents_allowed = list(
+	/obj/item/clothing/accessory/medal,
+	/obj/item/clothing/accessory/ribbon,
+	/obj/item/clothing/accessory/solgov/specialty
+	)
+
+/obj/item/storage/medalbox/corp_command
+	startswith = list(/obj/item/clothing/accessory/medal/gold/nanotrasen)
+
+/obj/item/storage/medalbox/corp_service
+	startswith = list(/obj/item/clothing/accessory/medal/silver/nanotrasen)
+
+/obj/item/storage/medalbox/corp_science
+	startswith = list(/obj/item/clothing/accessory/medal/bronze/nanotrasen)
+
+/obj/item/storage/medalbox/corp_merit
+	startswith = list(/obj/item/clothing/accessory/medal/iron/nanotrasen)
+
+/obj/item/storage/medalbox/sol
+	desc = "A small aluminum box for holding decorations, adorned with gold-on-blue ribbons."
+	icon_state = "medalbox_sol"

maps/torch/items/clothing/solgov-accessory.dm

@@ -75,6 +75,74 @@ medals
 	desc = "A golden sun medal awarded by the SCG to nonmilitary individuals who have made exceptional contributions to the Sol Central Government."
 	icon_state = "medal_service"
 
+//medal boxes
+/obj/item/storage/medalbox/sol/bronze_heart
+	startswith = list(
+	/obj/item/clothing/accessory/medal/solgov/mil/bronze_heart,
+	/obj/item/clothing/accessory/ribbon/solgov/medal/bronze_heart
+	)
+
+/obj/item/storage/medalbox/sol/home_guard
+	startswith = list(
+	/obj/item/clothing/accessory/medal/solgov/mil/home_guard,
+	/obj/item/clothing/accessory/ribbon/solgov/medal/home_guard
+	)
+
+/obj/item/storage/medalbox/sol/iron_star
+	startswith = list(
+	/obj/item/clothing/accessory/medal/solgov/mil/iron_star,
+	/obj/item/clothing/accessory/ribbon/solgov/medal/iron_star
+	)
+
+/obj/item/storage/medalbox/sol/medical
+	startswith = list(
+	/obj/item/clothing/accessory/medal/solgov/mil/medical,
+	/obj/item/clothing/accessory/ribbon/solgov/medal/medical
+	)
+
+/obj/item/storage/medalbox/sol/armed_forces
+	startswith = list(
+	/obj/item/clothing/accessory/medal/solgov/mil/armed_forces,
+	/obj/item/clothing/accessory/ribbon/solgov/medal/armed_forces
+	)
+
+/obj/item/storage/medalbox/sol/silver_sword
+	startswith = list(
+	/obj/item/clothing/accessory/medal/solgov/mil/silver_sword,
+	/obj/item/clothing/accessory/ribbon/solgov/medal/silver_sword
+	)
+
+/obj/item/storage/medalbox/sol/service_cross
+	startswith = list(
+	/obj/item/clothing/accessory/medal/solgov/mil/service_cross,
+	/obj/item/clothing/accessory/ribbon/solgov/medal/service_cross
+	)
+
+/obj/item/storage/medalbox/sol/medal_of_honor
+	startswith = list(
+	/obj/item/clothing/accessory/medal/solgov/mil/medal_of_honor,
+	/obj/item/clothing/accessory/ribbon/solgov/medal/medal_of_honor
+	)
+
+/obj/item/storage/medalbox/sol/expeditionary
+	startswith = list(
+	/obj/item/clothing/accessory/medal/solgov/civ/expeditionary,
+	/obj/item/clothing/accessory/ribbon/solgov/medal/expeditionary_medal
+	)
+
+/obj/item/storage/medalbox/sol/sapientarian
+	startswith = list(
+	/obj/item/clothing/accessory/medal/solgov/civ/sapientarian,
+	/obj/item/clothing/accessory/ribbon/solgov/medal/sapientarian
+	)
+
+/obj/item/storage/medalbox/sol/service
+	startswith = list(
+	/obj/item/clothing/accessory/medal/solgov/civ/service,
+	/obj/item/clothing/accessory/ribbon/solgov/medal/service
+	)
+
+
 /obj/item/clothing/accessory/solgov
 	var/check_codex_val = FACTION_FLEET
 

maps/torch/loadout/loadout_accessories.dm

@@ -1,44 +1,44 @@
 /datum/gear/accessory/solgov_award_military
 	display_name = "SolGov military award selection"
 	description = "A selection of military awards awarded by the Sol Central Government."
-	path = /obj/item/clothing/accessory/medal/solgov/mil
-	cost = 8
+	path = /obj/item/storage/medalbox/sol
+	cost = 6
 	allowed_branches = SOLGOV_BRANCHES
 	flags = GEAR_HAS_NO_CUSTOMIZATION
 
 /datum/gear/accessory/solgov_award_military/New()
 	..()
 	var/solmilitary = list()
-	solmilitary["Bronze Heart"] = /obj/item/clothing/accessory/medal/solgov/mil/bronze_heart
-	solmilitary["Home Guard medal"] = /obj/item/clothing/accessory/medal/solgov/mil/home_guard
-	solmilitary["Iron Star"] = /obj/item/clothing/accessory/medal/solgov/mil/iron_star
-	solmilitary["Combat Medical Award"] = /obj/item/clothing/accessory/medal/solgov/mil/medical
-	solmilitary["Armed Forces medal"] = /obj/item/clothing/accessory/medal/solgov/mil/armed_forces
-	solmilitary["Silver Sword"] = /obj/item/clothing/accessory/medal/solgov/mil/silver_sword
-	solmilitary["Superior Service Cross"] = /obj/item/clothing/accessory/medal/solgov/mil/service_cross
-	solmilitary["Medal of Honor"] = /obj/item/clothing/accessory/medal/solgov/mil/medal_of_honor
+	solmilitary["Bronze Heart"] = /obj/item/storage/medalbox/sol/bronze_heart
+	solmilitary["Home Guard medal"] = /obj/item/storage/medalbox/sol/home_guard
+	solmilitary["Iron Star"] = /obj/item/storage/medalbox/sol/iron_star
+	solmilitary["Combat Medical Award"] = /obj/item/storage/medalbox/sol/medical
+	solmilitary["Armed Forces medal"] = /obj/item/storage/medalbox/sol/armed_forces
+	solmilitary["Silver Sword"] = /obj/item/storage/medalbox/sol/silver_sword
+	solmilitary["Superior Service Cross"] = /obj/item/storage/medalbox/sol/service_cross
+	solmilitary["Medal of Honor"] = /obj/item/storage/medalbox/sol/medal_of_honor
 	gear_tweaks += new/datum/gear_tweak/path(solmilitary)
 
 /datum/gear/accessory/solgov_award_civilian
 	display_name = "SolGov civilian award selection"
 	description = "A selection of civilian awards awarded by the Sol Central Government."
 	path = /obj/item/clothing/accessory/medal/solgov/civ
-	cost = 5
+	cost = 3
 	flags = GEAR_HAS_NO_CUSTOMIZATION
 
 /datum/gear/accessory/solgov_award_civilian/New()
 	..()
 	var/solcivilian = list()
-	solcivilian["Expeditionary Medal"] = /obj/item/clothing/accessory/medal/solgov/civ/expeditionary
-	solcivilian["Sapientarian Peace Award"] = /obj/item/clothing/accessory/medal/solgov/civ/sapientarian
-	solcivilian["Distinguished Service Medal"] = /obj/item/clothing/accessory/medal/solgov/civ/service
+	solcivilian["Expeditionary Medal"] = /obj/item/storage/medalbox/sol/expeditionary
+	solcivilian["Sapientarian Peace Award"] = /obj/item/storage/medalbox/sol/sapientarian
+	solcivilian["Distinguished Service Medal"] = /obj/item/storage/medalbox/sol/service
 	gear_tweaks += new/datum/gear_tweak/path(solcivilian)
 
 /datum/gear/accessory/solgov_award_ribbons
 	display_name = "SolGov ribbon selection"
 	description = "A selection of decorations and medal ribbons awarded by the Sol Central Government."
 	path = /obj/item/clothing/accessory/ribbon/solgov
-	cost = 3
+	cost = 2
 	allowed_branches = SOLGOV_BRANCHES
 	flags = GEAR_HAS_NO_CUSTOMIZATION
 
@@ -52,18 +52,6 @@
 	solribbons["Combat Action ribbon"] = /obj/item/clothing/accessory/ribbon/solgov/combat
 	solribbons["Gaia Conflict ribbon"] = /obj/item/clothing/accessory/ribbon/solgov/gaiaconflict
 	solribbons["Distinguished unit ribbon"] = /obj/item/clothing/accessory/ribbon/solgov/distinguished_unit
-	//medal ribbons
-	solribbons["Bronze Heart ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/bronze_heart
-	solribbons["Home Guard ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/home_guard
-	solribbons["Iron Star ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/iron_star
-	solribbons["Armed Forces ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/armed_forces
-	solribbons["Silver Sword ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/silver_sword
-	solribbons["Superior Service ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/service_cross
-	solribbons["Medal of Honor ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/medal_of_honor
-	solribbons["Expeditionary Ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/expeditionary_medal
-	solribbons["Sapientarian ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/sapientarian
-	solribbons["Distinguished Service ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/service
-	solribbons["Combat Medical ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/medical
 	gear_tweaks += new/datum/gear_tweak/path(solribbons)
 
 /datum/gear/accessory/tags

maps/torch_fd/loadout/_defines.dm

@@ -52,4 +52,4 @@
 
 #define CIVILIAN_BRANCHES list(/datum/mil_branch/civilian, /datum/mil_branch/solgov)
 
-#define SOLGOV_BRANCHES list(/datum/mil_branch/expeditionary_corps, /datum/mil_branch/fleet, /datum/mil_branch/solgov)
+#define SOLGOV_BRANCHES list(/datum/mil_branch/expeditionary_corps, /datum/mil_branch/fleet, /datum/mil_branch/scga, /datum/mil_branch/solgov)

maps/torch_fd/torch_ranks.dm

@@ -34,6 +34,7 @@
 		/datum/species/vox     = list(
 			/datum/mil_branch/expeditionary_corps,
 			/datum/mil_branch/fleet,
+			/datum/mil_branch/scga,
 			/datum/mil_branch/civilian,
 			/datum/mil_branch/solgov,
 			/datum/mil_branch/skrell_fleet
@@ -197,6 +198,58 @@
 						SKILL_WEAPONS = SKILL_BASIC,
 						SKILL_EVA     = SKILL_BASIC)
 
+/datum/mil_branch/scga
+	name = "Army"
+	name_short = "SCGA"
+	email_domain = "torch.army.mil"
+
+	rank_types = list(
+		/datum/mil_rank/scga/e1,
+		/datum/mil_rank/scga/e2,
+		/datum/mil_rank/scga/e3,
+		/datum/mil_rank/scga/e4,
+		/datum/mil_rank/scga/e5,
+		/datum/mil_rank/scga/e6,
+		/datum/mil_rank/scga/e7,
+		/datum/mil_rank/scga/e8,
+		/datum/mil_rank/scga/e8_alt,
+		/datum/mil_rank/scga/e9,
+		/datum/mil_rank/scga/e9_alt1,
+		/datum/mil_rank/scga/e9_alt2,
+		/datum/mil_rank/scga/o1,
+		/datum/mil_rank/scga/o2,
+		/datum/mil_rank/scga/o3,
+		/datum/mil_rank/scga/o4,
+		/datum/mil_rank/scga/o5,
+		/datum/mil_rank/scga/o6,
+		/datum/mil_rank/scga/o7,
+		/datum/mil_rank/scga/o8,
+		/datum/mil_rank/scga/o9,
+		/datum/mil_rank/scga/o10,
+		/datum/mil_rank/scga/o10_alt
+	)
+
+	spawn_rank_types = list(
+		/datum/mil_rank/scga/e2,
+		/datum/mil_rank/scga/e3,
+		/datum/mil_rank/scga/e4,
+		/datum/mil_rank/scga/e5,
+		/datum/mil_rank/scga/e6,
+		/datum/mil_rank/scga/e7,
+		/datum/mil_rank/scga/e8,
+		/datum/mil_rank/scga/e8_alt,
+		/datum/mil_rank/scga/o1,
+		/datum/mil_rank/scga/o2,
+		/datum/mil_rank/scga/o3,
+		/datum/mil_rank/scga/o4
+	)
+
+	assistant_job = /datum/job/crew
+	min_skill = list(
+		SKILL_HAULING = SKILL_TRAINED,
+		SKILL_WEAPONS = SKILL_BASIC,
+		SKILL_COMBAT = SKILL_BASIC
+	)
 
 /datum/mil_branch/civilian
 	name = "Civilian"
@@ -467,6 +520,8 @@
 	sort_order = 18
 
 
+
+
 /*
  *  Civilians
  *  =========

mods/_fd/fd_assets/_fd_assets.dme

@@ -50,6 +50,8 @@
 #include "code/fullscreen.dm"
 #include "code/loadout.dm"
 #include "code/research_guard.dm"
+#include "code/added_branch_outfits.dm"
+#include "code/added_branches.dm"
 #include "code/skills.dm"
 #include "code/~TO_MAKE.dm"
 

mods/_fd/fd_assets/code/added_branch_outfits.dm

@@ -0,0 +1,83 @@
+//EC prospector
+/singleton/hierarchy/outfit/job/torch/passenger/research/prospector/ec
+	name = OUTFIT_JOB_NAME("Prospector - Expeditionary Corps")
+	uniform = /obj/item/clothing/under/solgov/utility/expeditionary/supply
+	shoes = /obj/item/clothing/shoes/dutyboots
+	id_types = list(/obj/item/card/id/torch/passenger/research/mining)
+	pda_type = /obj/item/modular_computer/pda/mining
+	flags = OUTFIT_FLAGS_JOB_DEFAULT | OUTFIT_EXTENDED_SURVIVAL
+	l_ear = /obj/item/device/radio/headset/headset_mining
+
+//army outfits - all of them
+//command
+/singleton/hierarchy/outfit/job/torch/crew/command/cmo/army
+	name = OUTFIT_JOB_NAME("Chief Medical Officer - Army")
+	uniform = /obj/item/clothing/under/scga/utility/urban/medical
+	shoes = /obj/item/clothing/shoes/dutyboots
+
+/singleton/hierarchy/outfit/job/torch/crew/command/cos/army
+	name = OUTFIT_JOB_NAME("Chief of Security - Army")
+	uniform = /obj/item/clothing/under/scga/utility/urban/security
+	shoes = /obj/item/clothing/shoes/dutyboots
+
+//engi
+/singleton/hierarchy/outfit/job/torch/crew/engineering/engineer/army
+	name = OUTFIT_JOB_NAME("Engineer - Army")
+	uniform = /obj/item/clothing/under/scga/utility/urban/engineering
+	shoes = /obj/item/clothing/shoes/dutyboots
+
+/singleton/hierarchy/outfit/job/torch/crew/engineering/roboticistarmy
+	name = OUTFIT_JOB_NAME("Roboticist - Army")
+	uniform = /obj/item/clothing/under/scga/utility/urban/engineering
+	shoes = /obj/item/clothing/shoes/dutyboots
+	id_types = list(/obj/item/card/id/torch/contractor/engineering/roboticist)
+	pda_type = /obj/item/modular_computer/pda/roboticist
+
+//medical
+/singleton/hierarchy/outfit/job/torch/crew/medical/senior/army
+	name = OUTFIT_JOB_NAME("Physician - Army")
+	uniform = /obj/item/clothing/under/scga/utility/urban/medical
+	shoes = /obj/item/clothing/shoes/dutyboots
+
+/singleton/hierarchy/outfit/job/torch/crew/medical/junior/army //not even used lol
+	name = OUTFIT_JOB_NAME("Medical Resident - Army")
+	uniform = /obj/item/clothing/under/scga/utility/urban/medical
+	shoes = /obj/item/clothing/shoes/dutyboots
+
+/singleton/hierarchy/outfit/job/torch/crew/medical/doctor/army
+	name = OUTFIT_JOB_NAME("Medical Technician - Army")
+	uniform = /obj/item/clothing/under/scga/utility/urban/urban/medical/banded
+	shoes = /obj/item/clothing/shoes/dutyboots
+	l_ear = /obj/item/device/radio/headset/headset_corpsman
+
+//sec
+/singleton/hierarchy/outfit/job/torch/crew/security/brig_chief/army
+	name = OUTFIT_JOB_NAME("Brig Chief - Army")
+	uniform = /obj/item/clothing/under/scga/utility/urban/security
+	shoes = /obj/item/clothing/shoes/dutyboots
+
+/singleton/hierarchy/outfit/job/torch/crew/security/maa/army
+	name = OUTFIT_JOB_NAME("Master at Arms - Army")
+	uniform = /obj/item/clothing/under/scga/utility/urban/security
+	shoes = /obj/item/clothing/shoes/dutyboots
+
+//service
+/singleton/hierarchy/outfit/job/torch/crew/service/janitor/army
+	name = OUTFIT_JOB_NAME("Sanitation Technician - Army")
+	uniform = /obj/item/clothing/under/scga/utility/urban/service
+	shoes = /obj/item/clothing/shoes/dutyboots
+
+/singleton/hierarchy/outfit/job/torch/crew/service/cook/army
+	name = OUTFIT_JOB_NAME("Cook - Army")
+	uniform = /obj/item/clothing/under/scga/utility/urban/service
+	shoes = /obj/item/clothing/shoes/dutyboots
+
+/singleton/hierarchy/outfit/job/torch/crew/service/crewman/army
+	name = OUTFIT_JOB_NAME("Crewman - Army")
+	uniform = /obj/item/clothing/under/scga/utility/urban/service
+
+//supply
+/singleton/hierarchy/outfit/job/torch/crew/supply/tech/army
+	name = OUTFIT_JOB_NAME("Deck Technician - Army")
+	uniform = /obj/item/clothing/under/scga/utility/urban/supply
+	shoes = /obj/item/clothing/shoes/dutyboots