Basic gun stuff (#7)

* initial commit

* change

* Create belts.dmi

* more stuff

* fixes

* Update _marine_armor.dm

* null icons for parent things

* Update unsc_guns.dm

* onmob

* hel[p

* MORE STUFF AND M7

* Update gun_attachables.dm

* fixes

* fixes

* Update unsc_guns.dm

* Update unsc_guns.dm

Author: DexterDude

code/__DEFINES/equipment.dm

@@ -570,6 +570,7 @@ GLOBAL_LIST_INIT(uniform_categories, list(
 #define PHONE_MARINE "Marine"
 #define PHONE_UPP_SOLDIER "Soldier"
 #define PHONE_IO "IO"
+#define PHONE_UNSC "UNSC"
 
 #define PHONE_DND_FORCED 2
 #define PHONE_DND_ON 1

code/datums/ammo/bullet/halo_unsc_ammo.dm

@@ -0,0 +1,90 @@
+// rifle ammo
+
+/datum/ammo/bullet/rifle/ma5c
+	name = "FMJ bullet"
+	headshot_state = HEADSHOT_OVERLAY_MEDIUM
+	damage = 40
+	penetration = ARMOR_PENETRATION_TIER_1
+	accurate_range = 16
+	accuracy = HIT_ACCURACY_TIER_6
+	scatter = SCATTER_AMOUNT_TIER_10
+	shell_speed = AMMO_SPEED_TIER_6
+	effective_range_max = 7
+	damage_falloff = DAMAGE_FALLOFF_TIER_7
+	max_range = 24
+
+/datum/ammo/bullet/rifle/br55
+	name = "X-HP SAP-HE bullet"
+	headshot_state = HEADSHOT_OVERLAY_MEDIUM
+	damage = 50
+	penetration = ARMOR_PENETRATION_TIER_3
+	accurate_range = 16
+	scatter = SCATTER_AMOUNT_TIER_10
+	shell_speed = 1.5*AMMO_SPEED_TIER_6
+	effective_range_max = 16
+	damage_falloff = DAMAGE_FALLOFF_TIER_7
+	max_range = 24
+
+// smg ammo
+/datum/ammo/bullet/smg/m7
+	name = "5×23mm M443 FMJ"
+	penetration = 0
+	damage = 25
+
+// shotgun ammo
+
+/datum/ammo/bullet/shotgun/buckshot/unsc
+	name = "MAG 15P-00B"
+	handful_state = "8g_shell"
+	bonus_projectiles_type = /datum/ammo/bullet/shotgun/spread/unsc
+	accurate_range = 8
+	max_range = 8
+	damage = 60
+	bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_8
+	firing_freq_offset = SOUND_FREQ_LOW
+
+/datum/ammo/bullet/shotgun/spread/unsc
+	name = "additional buckshot, USCM special type"
+	accurate_range = 8
+	max_range = 8
+	damage = 90
+	firing_freq_offset = SOUND_FREQ_LOW
+
+// rocket ammo
+
+/datum/ammo/rocket/spnkr
+	name = "M19 missile"
+	icon = 'icons/halo/obj/items/weapons/halo_projectiles.dmi'
+	icon_state = "spnkr_missile"
+	damage = 200
+	shell_speed = AMMO_SPEED_TIER_6
+	accuracy = HIT_ACCURACY_TIER_4
+	accurate_range = 14
+	max_range = 14
+
+
+// sniper ammo
+
+/datum/ammo/bullet/rifle/srs99
+	name = "APFSDS bullet"
+	headshot_state = HEADSHOT_OVERLAY_HEAVY
+	damage = 200
+	penetration = ARMOR_PENETRATION_TIER_8
+	accurate_range = 24
+	accuracy = HIT_ACCURACY_TIER_10
+	scatter = SCATTER_AMOUNT_TIER_10
+	effective_range_max = 24
+	damage_falloff = DAMAGE_FALLOFF_TIER_7
+	max_range = 48
+	shell_speed = AMMO_SPEED_TIER_6 + AMMO_SPEED_TIER_2
+
+// pistol ammo
+
+/datum/ammo/bullet/pistol/magnum
+	name = "SAP-HE bullet"
+	headshot_state = HEADSHOT_OVERLAY_HEAVY
+	accuracy = HIT_ACCURACY_TIER_4
+	accuracy_var_low = PROJECTILE_VARIANCE_TIER_6
+	damage = 40
+	penetration= ARMOR_PENETRATION_TIER_2
+	shrapnel_chance = SHRAPNEL_CHANCE_TIER_2

code/game/jobs/job/command/cic/staffofficer.dm

@@ -9,8 +9,8 @@
 	allow_additional = 1
 	scaled = FALSE
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
-	gear_preset = /datum/equipment_preset/unsc/pc
-	gear_preset_secondary = /datum/equipment_preset/unsc/pc/lesser_rank
+	gear_preset = /datum/equipment_preset/unsc/platco
+	gear_preset_secondary = /datum/equipment_preset/unsc/platco/lesser_rank
 	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to conduct the briefing for the platoon, monitor the operation, and listen to your superior officers.</a> You are in charge of the platoon for the current operation and supported by your Company Command.<br>They will give your orders VIA the telephone in your office once they are ready.<br><b>You remember that you've stored your personal gear are located in your personal quarters.</b><br>Your job involves heavy roleplay and requires you to behave like an officer and to stay in character at all times."
 
 	job_options = list(FIRST_LT_VARIANT = "1stLt", SECOND_LT_VARIANT = "2ndLt")

code/game/objects/items/devices/binoculars.dm

@@ -364,7 +364,7 @@
 
 /obj/item/device/binoculars/range/designator/sergeant
 	name = "tactical binoculars"
-	desc = "A laser designator issued to USCM command elements. It has two modes: target marking for CAS with IR laser and rangefinding. Ctrl + Click turf to target something. Ctrl + Click designator to stop lasing. Alt + Click designator to switch modes."
+	desc = "A laser designator issued to UNSC command elements. It has two modes: target marking for CAS with IR laser and rangefinding. Ctrl + Click turf to target something. Ctrl + Click designator to stop lasing. Alt + Click designator to switch modes."
 	icon_state = "advanced_binoculars"
 	range_laser_overlay = "adv_laser_range"
 	cas_laser_overlay = "adv_laser_cas"

code/game/objects/items/storage/backpack.dm

@@ -291,7 +291,7 @@
 	desc = "It's a backpack especially designed for use in a sterile environment."
 	icon_state = "medicalpack"
 
-/obj/item/storage/backpack/security //Universal between USCM MPs & Colony, should be split at some point.
+/obj/item/storage/backpack/security //Universal between UNSC MPs & Colony, should be split at some point.
 	name = "security backpack"
 	desc = "It's a very robust backpack."
 	icon_state = "securitypack"
@@ -403,7 +403,7 @@
 	desc = "Useful for holding research materials."
 	icon_state = "satchel-tox"
 
-/obj/item/storage/backpack/satchel/sec //Universal between USCM MPs & Colony, should be split at some point.
+/obj/item/storage/backpack/satchel/sec //Universal between UNSC MPs & Colony, should be split at some point.
 	name = "security satchel"
 	desc = "A robust satchel composed of two drop pouches and a large internal pocket. Made of a stiff fabric, it isn't very comfy to wear."
 	icon_state = "satchel-sec"
@@ -418,7 +418,7 @@
 
 /obj/item/storage/backpack/marine
 	name = "\improper lightweight IMP backpack"
-	desc = "The standard-issue pack of the USCM and US Army forces. Designed to lug gear into the battlefield using the Intuitive Mounting Point system on M3 armor."
+	desc = "The standard-issue pack of the UNSC and US Army forces. Designed to lug gear into the battlefield using the Intuitive Mounting Point system on M3 armor."
 	icon_state = "marinepack"
 	item_state = "marinepack"
 	has_gamemode_skin = FALSE //replace this with the atom_flag NO_SNOW_TYPE at some point, just rename it to like, NO_MAP_VARIANT_SKIN
@@ -459,8 +459,8 @@
 	UnregisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY)
 
 /obj/item/storage/backpack/marine/medic
-	name = "\improper USCM corpsman backpack"
-	desc = "A standard-issue backpack worn by USCM medics."
+	name = "\improper UNSC corpsman backpack"
+	desc = "A standard-issue backpack worn by UNSC medics."
 	icon_state = "marinepack_medic"
 	item_state = "marinepack_medic"
 	xeno_icon_state = "medicpack"
@@ -471,31 +471,31 @@
 
 /obj/item/storage/backpack/marine/medic/upp
 	name = "\improper UPP corpsman backpack"
-	desc = "Uncommon issue backpack worn by UPP medics from isolated sectors. You can swear you can see a faded USCM symbol."
+	desc = "Uncommon issue backpack worn by UPP medics from isolated sectors. You can swear you can see a faded UNSC symbol."
 
 /obj/item/storage/backpack/marine/tech
-	name = "\improper USCM technician backpack"
-	desc = "A standard-issue backpack worn by USCM technicians."
+	name = "\improper UNSC technician backpack"
+	desc = "A standard-issue backpack worn by UNSC technicians."
 	icon_state = "marinepack_techi"
 	item_state = "marinepack_techi"
 	xeno_icon_state = "marinepack"
 	xeno_types = list(/mob/living/carbon/xenomorph/runner, /mob/living/carbon/xenomorph/praetorian, /mob/living/carbon/xenomorph/drone, /mob/living/carbon/xenomorph/warrior, /mob/living/carbon/xenomorph/defender, /mob/living/carbon/xenomorph/sentinel, /mob/living/carbon/xenomorph/spitter)
 
 /obj/item/storage/backpack/marine/satchel/intel
-	name = "\improper USCM lightweight expedition pack"
-	desc = "A heavy-duty IMP based backpack that can be slung around the front or to the side, and can quickly be accessed with only one hand. Usually issued to USCM intelligence officers."
+	name = "\improper UNSC lightweight expedition pack"
+	desc = "A heavy-duty IMP based backpack that can be slung around the front or to the side, and can quickly be accessed with only one hand. Usually issued to UNSC intelligence officers."
 	icon_state = "marinebigsatch"
 	max_storage_space = 20
 
 /obj/item/storage/backpack/marine/satchel/intel/chestrig
-	name = "\improper USCM expedition chestrig"
-	desc = "A heavy-duty IMP based chestrig, can quickly be accessed with only one hand. Usually issued to USCM intelligence officers."
+	name = "\improper UNSC expedition chestrig"
+	desc = "A heavy-duty IMP based chestrig, can quickly be accessed with only one hand. Usually issued to UNSC intelligence officers."
 	icon_state = "intel_chestrig"
 	max_storage_space = 20
 
 /obj/item/storage/backpack/marine/satchel
-	name = "\improper USCM satchel"
-	desc = "A heavy-duty satchel carried by some USCM soldiers and support personnel."
+	name = "\improper UNSC satchel"
+	desc = "A heavy-duty satchel carried by some UNSC soldiers and support personnel."
 	icon_state = "marinesatch"
 	worn_accessible = TRUE
 	storage_slots = null
@@ -506,36 +506,36 @@
 	has_gamemode_skin = FALSE
 
 /obj/item/storage/backpack/marine/satchel/big //wacky squad marine loadout item, its the IO backpack.
-	name = "\improper USCM logistics IMP backpack"
+	name = "\improper UNSC logistics IMP backpack"
 	desc = "A standard-issue backpack worn by logistics personnel. It is occasionally issued to combat personnel for longer term expeditions and deep space incursions."
 	icon_state = "marinebigsatch"
 	worn_accessible = TRUE
 	storage_slots = null
 	max_storage_space = 21 //backpack size
 
 /obj/item/storage/backpack/marine/satchel/medic
-	name = "\improper USCM corpsman satchel"
-	desc = "A heavy-duty satchel used by USCM medics. It sacrifices capacity for usability. A small patch is sewn to the top flap."
+	name = "\improper UNSC corpsman satchel"
+	desc = "A heavy-duty satchel used by UNSC medics. It sacrifices capacity for usability. A small patch is sewn to the top flap."
 	icon_state = "marinesatch_medic"
 
 /obj/item/storage/backpack/marine/satchel/medic/standard
 	has_gamemode_skin = FALSE
 
 /obj/item/storage/backpack/marine/satchel/tech
-	name = "\improper USCM technician chestrig"
-	desc = "A heavy-duty chestrig used by some USCM technicians."
+	name = "\improper UNSC technician chestrig"
+	desc = "A heavy-duty chestrig used by some UNSC technicians."
 	icon_state = "marinesatch_techi"
 
 /obj/item/storage/backpack/marine/satchel/chestrig
-	name = "\improper USCM chestrig"
-	desc = "A chestrig used by some USCM personnel."
+	name = "\improper UNSC chestrig"
+	desc = "A chestrig used by some UNSC personnel."
 	icon_state = "chestrig"
 	has_gamemode_skin = FALSE
 
 GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/rto)
 
 /obj/item/storage/backpack/marine/satchel/rto
-	name = "\improper USCM Radio Telephone Pack"
+	name = "\improper Radio Telephone Pack"
 	desc = "A heavy-duty pack, used for telecommunications between central command. Commonly carried by RTOs."
 	icon_state = "rto_backpack"
 	item_state = "rto_backpack"
@@ -576,7 +576,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 	networks_transmit = list(FACTION_UPP)
 
 /obj/item/storage/backpack/marine/satchel/rto/small
-	name = "\improper USCM Small Radio Telephone Pack"
+	name = "\improper UNSC Small Radio Telephone Pack"
 	max_storage_space = 10
 
 /obj/item/storage/backpack/marine/satchel/rto/small/upp_net
@@ -596,23 +596,23 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 	xeno_types = null
 
 /obj/item/storage/backpack/marine/marsoc
-	name = "\improper USCM SOF IMP tactical rucksack"
+	name = "\improper UNSC SOF IMP tactical rucksack"
 	icon_state = "tacrucksack"
 	desc = "With a backpack like this, you'll forget you're on a hell march designed to kill you."
 	worn_accessible = TRUE
 	has_gamemode_skin = FALSE
 	xeno_types = null
 
 /obj/item/storage/backpack/marine/rocketpack
-	name = "\improper USCM IMP M22 rocket bags"
-	desc = "A specially-designed backpack that fits to the IMP mounting frame on standard USCM pattern M3 armors. It's made of two waterproofed reinforced tubes and one smaller satchel slung at the bottom. The two silos are for rockets, but no one is stopping you from cramming other things in there."
+	name = "\improper UNSC IMP M22 rocket bags"
+	desc = "A specially-designed backpack that fits to the IMP mounting frame on standard UNSC pattern M3 armors. It's made of two waterproofed reinforced tubes and one smaller satchel slung at the bottom. The two silos are for rockets, but no one is stopping you from cramming other things in there."
 	icon_state = "rocketpack"
 	worn_accessible = TRUE
 	has_gamemode_skin = FALSE //monkeysfist101 never sprited a snowtype but included duplicate icons. Why?? Recolor and touch up sprite at a later date.
 	xeno_types = null
 
 /obj/item/storage/backpack/marine/grenadepack
-	name = "\improper USCM IMP M63A1 grenade satchel"
+	name = "\improper UNSC IMP M63A1 grenade satchel"
 	desc = "A secure satchel with dedicated grenade pouches meant to minimize risks of secondary ignition."
 	icon_state = "grenadierpack"
 	overlays = list("+grenadierpack_unlocked")
@@ -631,7 +631,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 		return ..()
 
 /obj/item/storage/backpack/marine/mortarpack
-	name = "\improper USCM mortar shell backpack"
+	name = "\improper UNSC mortar shell backpack"
 	desc = "A backpack specifically designed to hold ammunition for the M402 mortar."
 	icon_state = "mortarpack"
 	max_w_class = SIZE_HUGE
@@ -676,7 +676,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 // Scout Cloak
 /obj/item/storage/backpack/marine/satchel/scout_cloak
 	name = "\improper M68 Thermal Cloak"
-	desc = "The lightweight thermal dampeners and optical camouflage provided by this cloak are weaker than those found in standard USCM ghillie suits. In exchange, the cloak can be worn over combat armor and offers the wearer high maneuverability and adaptability to many environments."
+	desc = "The lightweight thermal dampeners and optical camouflage provided by this cloak are weaker than those found in standard UNSC ghillie suits. In exchange, the cloak can be worn over combat armor and offers the wearer high maneuverability and adaptability to many environments."
 	icon_state = "scout_cloak"
 	unacidable = TRUE
 	indestructible = TRUE
@@ -825,8 +825,8 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 // Welder Backpacks //
 
 /obj/item/storage/backpack/marine/engineerpack
-	name = "\improper USCM technician welderpack"
-	desc = "A specialized backpack worn by USCM technicians. It carries a fueltank for quick welder refueling and use."
+	name = "\improper UNSC technician welderpack"
+	desc = "A specialized backpack worn by UNSC technicians. It carries a fueltank for quick welder refueling and use."
 	icon_state = "welderbackpack"
 	item_state = "welderbackpack"
 	var/max_fuel = 260
@@ -905,8 +905,8 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 	. += "[reagents.total_volume] units of fuel left!"
 
 /obj/item/storage/backpack/marine/engineerpack/satchel
-	name = "\improper USCM technician welder-satchel"
-	desc = "A specialized satchel worn by USCM technicians and engineers. It carries two small fuel tanks for quick welder refueling and use."
+	name = "\improper UNSC technician welder-satchel"
+	desc = "A specialized satchel worn by UNSC technicians and engineers. It carries two small fuel tanks for quick welder refueling and use."
 	icon_state = "satchel_marine_welder"
 	item_state = "satchel_marine_welder"
 	max_storage_space = 12
@@ -926,8 +926,8 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 
 // Pyrotechnician Spec backpack fuel tank
 /obj/item/storage/backpack/marine/engineerpack/flamethrower
-	name = "\improper USCM Pyrotechnician G6-2 fueltank"
-	desc = "A specialized fueltank worn by USCM Pyrotechnicians for use with the M240-T incinerator unit. A small general storage compartment is installed."
+	name = "\improper UNSC Pyrotechnician G6-2 fueltank"
+	desc = "A specialized fueltank worn by UNSC Pyrotechnicians for use with the M240-T incinerator unit. A small general storage compartment is installed."
 	icon_state = "flamethrower_tank"
 	max_fuel = 500
 	fuel_type = "utnapthal"
@@ -986,7 +986,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 	. = ..()
 
 /obj/item/storage/backpack/marine/engineerpack/flamethrower/kit
-	name = "\improper USCM Pyrotechnician G4-1 fueltank"
+	name = "\improper UNSC Pyrotechnician G4-1 fueltank"
 	desc = "A much older-generation back rig that holds fuel in two tanks. A small regulator sits between them. Has a few straps for holding up to three of the actual flamer tanks you'll be refilling."
 	icon_state = "flamethrower_backpack"
 	item_state = "flamethrower_backpack"