Fixing missing socks on the character menu and other minor things (#1291)

Changes:
-fix socks not showing up on the character creation menu
-add paramedic access to firelocks
-fix coffee being poison to catbeasts
-added a bunch of dakka related hardsuits modules
-adds a snowflake hardsuit, with some of the new modules, for admin bus or something
-tweaks a bit what the sec and syndicate belt can hold
-move minor changes to heavy asset protection and syndicate command loadouts

code/modules/clothing/spacesuits/rig/modules/combat.dm

@@ -89,6 +89,20 @@
 	new_grenade.activate(H)
 	new_grenade.throw_at(target,fire_force,fire_distance)
 
+/obj/item/rig_module/grenade_launcher/frag
+
+	name = "mounted frag grenade launcher"
+	desc = "A shoulder-mounted fragmentation explosives dispenser."
+	selectable = 1
+	icon_state = "grenade"
+
+	interface_name = "integrated frag grenade launcher"
+	interface_desc = "Discharges loaded frag grenades against the wearer's location."
+
+	charges = list(
+		list("frag grenade",   "frag grenade",   /obj/item/weapon/grenade/frag,  3)
+		)
+
 /obj/item/rig_module/mounted
 
 	name = "mounted laser cannon"
@@ -152,6 +166,50 @@
 	interface_desc = "A shoulder-mounted cell-powered taser."
 
 	gun_type = /obj/item/weapon/gun/energy/taser/mounted
+	
+/obj/item/rig_module/mounted/pulse
+
+	name = "mounted pulse rifle"
+	desc = "A shoulder-mounted battery-powered pulse rifle mount."
+	icon_state = "pulse"
+
+	interface_name = "mounted pulse rifle"
+	interface_desc = "A shoulder-mounted cell-powered pulse rifle."
+
+	gun_type = /obj/item/weapon/gun/energy/pulse_rifle/mounted
+	
+/obj/item/rig_module/mounted/smg
+
+	name = "mounted submachine gun"
+	desc = "A forearm-mounted suit-powered ballistic submachine gun."
+	icon_state = "smg"
+
+	interface_name = "mounted submachine gun"
+	interface_desc = "A forearm-mounted suit-powered ballistic submachine gun."
+
+	gun_type = /obj/item/weapon/gun/energy/mountedsmg
+	
+/obj/item/rig_module/mounted/xray
+
+	name = "mounted xray laser gun"
+	desc = "A forearm-mounted suit-powered xray laser gun."
+	icon_state = "xray"
+
+	interface_name = "mounted xray laser gun"
+	interface_desc = "A forearm-mounted suit-powered xray laser gun."
+
+	gun_type = /obj/item/weapon/gun/energy/xray/mounted
+	
+/obj/item/rig_module/mounted/ion
+
+	name = "mounted ion rifle"
+	desc = "A shoulder-mounted battery-powered ion rifle mount."
+	icon_state = "ion"
+
+	interface_name = "mounted ion rifle"
+	interface_desc = "A shoulder-mounted cell-powered ion rifle."
+
+	gun_type = /obj/item/weapon/gun/energy/ionrifle/mounted
 
 /obj/item/rig_module/mounted/energy_blade
 

code/modules/clothing/spacesuits/rig/suits/combat.dm

@@ -26,4 +26,46 @@
 		/obj/item/rig_module/power_sink,
 		/obj/item/rig_module/electrowarfare_suite,
 		/obj/item/rig_module/chem_dispenser/combat
-		)
+		)
+		
+/obj/item/weapon/rig/military
+	name = "military hardsuit control module"
+	desc = "A powerfull hardsuit designed for military operations."
+	icon_state = "military_rig"
+	suit_type = "military hardsuit"
+	armor = list(melee = 80, bullet = 75, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 30)
+	slowdown = 1
+	offline_slowdown = 3
+	offline_vision_restriction = 1
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
+
+	chest_type = /obj/item/clothing/suit/space/rig/military
+	helm_type = /obj/item/clothing/head/helmet/space/rig/military
+	boot_type = /obj/item/clothing/shoes/magboots/rig/military
+	glove_type = /obj/item/clothing/gloves/rig/military
+
+/obj/item/clothing/head/helmet/space/rig/military
+	light_overlay = "helmet_light_dual_green"
+	species_restricted = list("Human")
+
+/obj/item/clothing/suit/space/rig/military
+	species_restricted = list("Human")
+
+/obj/item/clothing/shoes/magboots/rig/military
+	species_restricted = list("Human")
+
+/obj/item/clothing/gloves/rig/military
+	species_restricted = list("Human")
+
+/obj/item/weapon/rig/military/equipped
+	initial_modules = list(
+		/obj/item/rig_module/maneuvering_jets,
+		/obj/item/rig_module/mounted/pulse,
+		/obj/item/rig_module/vision/thermal,
+		/obj/item/rig_module/grenade_launcher/frag,
+		/obj/item/rig_module/ai_container,
+		/obj/item/rig_module/power_sink,
+		/obj/item/rig_module/chem_dispenser/combat,
+		/obj/item/rig_module/chem_dispenser/injector,
+		/obj/item/rig_module/device/plasmacutter
+		)

code/modules/clothing/spacesuits/rig/suits/station.dm

@@ -99,6 +99,7 @@
 	offline_vision_restriction = 1
 
 	helm_type = /obj/item/clothing/head/helmet/space/rig/eva
+	glove_type = /obj/item/clothing/gloves/rig/eva
 
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/toolbox,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/device/t_scanner,/obj/item/weapon/rcd)
 
@@ -113,6 +114,9 @@
 		/obj/item/rig_module/device/rcd,
 		/obj/item/rig_module/vision/meson
 		)
+		
+/obj/item/clothing/gloves/rig/eva
+	siemens_coefficient = 0
 
 /obj/item/weapon/rig/ce
 
@@ -126,14 +130,13 @@
 	offline_vision_restriction = 0
 
 	helm_type = /obj/item/clothing/head/helmet/space/rig/ce
+	glove_type = /obj/item/clothing/gloves/rig/ce
 
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 
 	req_access = list()
 	req_one_access = list()
 
-	glove_type = /obj/item/clothing/gloves/rig/ce
-
 /obj/item/weapon/rig/ce/equipped
 
 	req_access = list(access_ce)

code/modules/mob/living/carbon/human/species/station/station.dm

@@ -101,7 +101,6 @@
 	name_plural = "Tajaran"
 	icobase = 'icons/mob/human_races/r_tajaran.dmi'
 	deform = 'icons/mob/human_races/r_def_tajaran.dmi'
-	language = "Siik'maas"
 	tail = "tajtail"
 	tail_animation = 'icons/mob/species/tajaran/tail.dmi'
 	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)

code/modules/mob/new_player/preferences_setup.dm

@@ -269,6 +269,10 @@ datum/preferences
 		if(undershirt && current_species.appearance_flags & HAS_UNDERWEAR)
 			undershirt_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = undershirt)
 
+		var/icon/socks_s = null
+		if(socks && current_species.appearance_flags & HAS_SOCKS)
+			socks_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = socks)
+
 		var/icon/clothes_s = null
 		if(job_civilian_low & ASSISTANT)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
 			clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
@@ -706,6 +710,8 @@ datum/preferences
 			preview_icon.Blend(underwear_s, ICON_OVERLAY)
 		if(undershirt_s)
 			preview_icon.Blend(undershirt_s, ICON_OVERLAY)
+		if(socks_s)
+			preview_icon.Blend(socks_s, ICON_OVERLAY)
 		if(clothes_s)
 			preview_icon.Blend(clothes_s, ICON_OVERLAY)
 		preview_icon_front = new(preview_icon, dir = SOUTH)
@@ -714,4 +720,5 @@ datum/preferences
 		qdel(eyes_s)
 		qdel(underwear_s)
 		qdel(undershirt_s)
+		qdel(socks_s)
 		qdel(clothes_s)

code/modules/projectiles/guns/energy/laser.dm

@@ -75,6 +75,13 @@ obj/item/weapon/gun/energy/retro
 	charge_cost = 100
 	max_shots = 20
 	fire_delay = 1
+	
+/obj/item/weapon/gun/energy/xray/mounted
+	name = "mounted xray laser gun"
+	charge_cost = 200
+	self_recharge = 1
+	use_external_power = 1
+	recharge_time = 5
 
 /obj/item/weapon/gun/energy/sniperrifle
 	name = "marksman energy rifle"

code/modules/projectiles/guns/energy/pulse.dm

@@ -17,8 +17,10 @@
 		)
 
 /obj/item/weapon/gun/energy/pulse_rifle/mounted
+	charge_cost = 400
 	self_recharge = 1
 	use_external_power = 1
+	recharge_time = 10
 
 /obj/item/weapon/gun/energy/pulse_rifle/destroyer
 	name = "pulse destroyer"

code/modules/projectiles/guns/energy/special.dm

@@ -22,6 +22,12 @@
 		item_state = "ionrifle-empty"
 	else
 		item_state = initial(item_state)
+		
+/obj/item/weapon/gun/energy/ionrifle/mounted
+	name = "mounted ion rifle"
+	self_recharge = 1
+	use_external_power = 1
+	recharge_time = 10
 
 /obj/item/weapon/gun/energy/decloner
 	name = "biological demolecularisor"

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -624,12 +624,9 @@
 	glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
 
 /datum/reagent/drink/coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+	..()
 	if(alien == IS_DIONA)
 		return
-	..()
-	if(alien == IS_TAJARA)
-		M.adjustToxLoss(0.5 * removed)
-		M.make_jittery(4) //extra sensitive to caffine
 	if(adj_temp > 0)
 		holder.remove_reagent("frostoil", 10 * removed)