Merge pull request #157 from projectkepler-ru/seclite-for-all-securities

a buff to security

code/__DEFINES/~skyrat_defines/gun.dm

@@ -18,3 +18,4 @@
 #define COMPANY_JARNSMIOUR (1<<13)
 #define COMPANY_ABDUCTOR (1<<14)
 #define COMPANY_REMOVED (1<<15)
+#define COMPANY_ROMULUS (1<<16)

code/modules/jobs/job_types/captain.dm

@@ -70,7 +70,7 @@
 	gloves = /obj/item/clothing/gloves/captain
 	head = /obj/item/clothing/head/hats/caphat
 	shoes = /obj/item/clothing/shoes/laceup
-
+	r_pocket = /obj/item/flashlight/seclite
 
 	backpack = /obj/item/storage/backpack/captain
 	satchel = /obj/item/storage/backpack/satchel/cap

code/modules/jobs/job_types/detective.dm

@@ -56,6 +56,7 @@
 		/obj/item/detective_scanner = 1,
 		/obj/item/melee/baton = 1,
 		/obj/item/storage/box/evidence = 1,
+		/obj/item/flashlight/seclite = 1,
 		)
 	belt = /obj/item/modular_computer/pda/detective
 	ears = /obj/item/radio/headset/headset_sec/alt

code/modules/jobs/job_types/head_of_security.dm

@@ -51,12 +51,14 @@
 	id_trim = /datum/id_trim/job/head_of_security
 	uniform = /obj/item/clothing/under/rank/security/head_of_security
 	suit = /obj/item/clothing/suit/armor/hos/trenchcoat
-	//suit_store = /obj/item/gun/energy/e_gun //SKYRAT EDIT REMOVAL
+	suit_store = /obj/item/gun/energy/e_gun //KEPLER EDIT RESTORATION
 	backpack_contents = list(
 		/obj/item/evidencebag = 1,
-		/obj/item/storage/box/gunset/glock18_hos = 1, //SKYRAT EDIT ADDITION
+		/obj/item/flashlight/seclite = 1,
+		/obj/item/modular_computer/pda/heads/hos = 1,
+		/obj/item/choice_beacon/head_of_security = 1,
 		)
-	belt = /obj/item/modular_computer/pda/heads/hos
+	belt = /obj/item/storage/belt/security/full
 	ears = /obj/item/radio/headset/heads/hos/alt
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	gloves = /obj/item/clothing/gloves/color/black/security //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/gloves/color/black
@@ -85,3 +87,53 @@
 	head = null
 	mask = /obj/item/clothing/mask/gas/sechailer
 	internals_slot = ITEM_SLOT_SUITSTORE
+
+//TEST THIS OUT WHEN NEEDED
+
+/obj/item/choice_beacon/head_of_security
+	name = "gun choice beacon"
+	desc = "whatever you choose will determine the outcome of space station 13 and the fate of the company so choose wisely."
+	company_source = "Romulus Shipping Company"
+	company_message = span_bold("Copy that SS13, supply pod enroute!")
+
+
+/obj/item/choice_beacon/head_of_security/generate_display_names()
+	var/static/list/hosgun_list
+	if(!hosgun_list)
+		hosgun_list = list()
+		for(var/obj/item/storage/box/hosgun/box as anything in typesof(/obj/item/storage/box/hosgun))
+			hosgun_list[initial(box.name)] = box
+	return hosgun_list
+
+/obj/item/storage/box/hosgun
+	name = "Classic 3-round burst pistol 9mm"
+
+/obj/item/storage/box/hosgun/PopulateContents()
+	new /obj/item/storage/box/gunset/glock18_hos(src)
+	new /obj/item/ammo_box/c9mm(src)
+	new /obj/item/ammo_box/c9mm(src)
+	new /obj/item/storage/box/hecu_rations(src)
+	new /obj/item/storage/fancy/cigarettes/cigars(src)
+
+/obj/item/storage/box/hosgun/revolver
+	name = "Romulus Officer Heavy Revolver .460"
+
+/obj/item/storage/box/hosgun/revolver/PopulateContents()
+	new /obj/item/storage/box/gunset/hos_revolver(src)
+	new	/obj/item/clothing/neck/cloak/hos/redsec(src)
+	new /obj/item/clothing/under/rank/security/head_of_security/redsec(src)
+	new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/redsec(src)
+	new /obj/item/clothing/shoes/jackboots/sec/redsec(src)
+	new /obj/item/storage/box/nri_rations(src)
+	new /obj/item/knife/combat(src)
+
+/obj/item/storage/box/hosgun/glock
+	name = "Solaris Police Dual 9mm Pistol"
+
+/obj/item/storage/box/hosgun/glock/PopulateContents()
+	new /obj/item/storage/box/gunset/glock17(src)
+	new /obj/item/storage/box/gunset/glock17(src)
+	new /obj/item/clothing/under/rank/security/head_of_security/peacekeeper/sol(src)
+	new /obj/item/clothing/neck/tie/red(src)
+	new /obj/item/storage/pill_bottle/probital(src)
+

code/modules/jobs/job_types/security_officer.dm

@@ -209,8 +209,10 @@ GLOBAL_LIST_EMPTY(security_officer_distribution)
 	suit_store = /obj/item/gun/energy/disabler
 	backpack_contents = list(
 		/obj/item/evidencebag = 1,
+		/obj/item/flashlight/seclite = 1,
+		/obj/item/modular_computer/pda/security = 1,
 		)
-	belt = /obj/item/modular_computer/pda/security
+	belt = /obj/item/storage/belt/security/full
 	ears = /obj/item/radio/headset/headset_sec/alt
 	gloves = /obj/item/clothing/gloves/color/black/security //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/gloves/color/black
 	head = /obj/item/clothing/head/security_garrison //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/head/helmet/sec

code/modules/jobs/job_types/warden.dm

@@ -53,8 +53,11 @@
 	suit_store = /obj/item/gun/energy/disabler
 	backpack_contents = list(
 		/obj/item/evidencebag = 1,
+		/obj/item/modular_computer/pda/warden = 1,
+		/obj/item/flashlight/seclite = 1,
+		/obj/item/storage/box/gunset/glock17 = 1,
 		)
-	belt = /obj/item/modular_computer/pda/warden
+	belt = /obj/item/storage/belt/security/full
 	ears = /obj/item/radio/headset/headset_sec/alt
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	gloves = /obj/item/clothing/gloves/color/black/security //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/gloves/color/black

modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm

@@ -215,6 +215,9 @@
 			. += "<br>It has <b>[span_abductor("✌︎︎♌︎︎♎︎︎◆︎︎♍︎︎⧫︎︎❄︎♏︎♍︎♒︎")]</b> engraved into the photon accelerator."
 		if(COMPANY_REMOVED)
 			. += "<br>It has had <b>[span_grey("all identifying marks scrubbed off")].</b>"
+		if(COMPANY_ROMULUS)
+			. += "<br>It has <b><i>[span_blue("Romulus Technology")]</i></b> etched into the barrel."
+
 
 /obj/item/gun/proc/fire_select()
 	var/mob/living/carbon/human/user = usr

modular_skyrat/modules/blueshield/code/blueshield.dm

@@ -54,6 +54,8 @@
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	backpack_contents = list(
 		/obj/item/storage/box/gunset/blueshield = 1,
+		/obj/item/gun/energy/e_gun/revolver = 1,
+		/obj/item/storage/medkit/tactical/blueshield = 1,
 		/obj/item/melee/baton/security/loaded = 1,)
 	implants = list(/obj/item/implant/mindshield)
 	backpack = /obj/item/storage/backpack/blueshield
@@ -62,6 +64,7 @@
 	head = /obj/item/clothing/head/beret/blueshield
 	box = /obj/item/storage/box/survival/security
 	belt = /obj/item/modular_computer/pda/security
+	r_pocket = /obj/item/flashlight/seclite
 
 	id = /obj/item/card/id/advanced/centcom
 	id_trim = /datum/id_trim/job/blueshield

modular_skyrat/modules/blueshield/code/special.dm

@@ -1,7 +1,7 @@
-/obj/item/gun/energy/e_gun/revolver //The virgin gun.
+/obj/item/gun/energy/e_gun/revolver //The gun fit for a kitsune
 	name = "X-R12 energy revolver"
 	desc = "An experimental model advanced energy weapon with the capacity to shoot both electrodes and lasers, used by many private defense contractors from Romulus to New Moscow, its also rather heavy and would certainly hurt to get pistol whipped by."
-	force = 16
+	force = 12
 	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser/blueshield)
 	ammo_x_offset = 1
 	charge_sections = 4
@@ -18,13 +18,14 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi'
 	worn_icon_state = "bsrevolver"
+	company_flag = COMPANY_ROMULUS
 
 /obj/item/stock_parts/cell/blueshield
 	name = "internal revolver power cell"
 	maxcharge = 1200
-	chargerate = 300
+	chargerate = 105 //Hit your shot and don't complain, it's self recharging.
 
-/obj/item/gun/energy/e_gun/revolver/pdw9 //The chad gun.
+/obj/item/gun/energy/e_gun/revolver/pdw9 //The gun fit for a real man
 	name = "PDW-9 taser pistol"
 	desc = "A military grade energy sidearm, used by many militia forces throughout the local sector. It comes with an internally recharging battery which is slow to recharge."
 	ammo_x_offset = 2
@@ -34,7 +35,7 @@
 
 /obj/item/stock_parts/cell/pdw9
 	name = "internal pistol power cell"
-	maxcharge = 1000
+	maxcharge = 1200
 	chargerate = 300
 	var/obj/item/gun/energy/e_gun/revolver/pdw9/parent
 

modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm

@@ -44,7 +44,7 @@
 	name = "Nanotrasen Consultant"
 	jobtype = /datum/job/nanotrasen_consultant
 
-	belt = /obj/item/modular_computer/pda/nanotrasen_consultant
+	belt = /obj/item/storage/belt/security/peacekeeper
 	glasses = /obj/item/clothing/glasses/sunglasses
 	ears = /obj/item/radio/headset/heads/nanotrasen_consultant
 	gloves = /obj/item/clothing/gloves/combat
@@ -55,6 +55,7 @@
 	backpack_contents = list(
 		/obj/item/melee/baton/telescopic = 1,
 		/obj/item/storage/box/gunset/nanotrasen_consultant = 1,
+		/obj/item/modular_computer/pda/nanotrasen_consultant = 1,
 		)
 
 	skillchips = list(/obj/item/skillchip/disk_verifier)
@@ -124,7 +125,9 @@
 	new /obj/item/ammo_box/magazine/m45a5(src)
 	new /obj/item/ammo_box/magazine/m45a5(src)
 	new /obj/item/ammo_box/magazine/m45a5(src)
-
+	new /obj/item/ammo_box/magazine/m45a5(src)
+	new /obj/item/ammo_box/magazine/m45a5(src)
+	new /obj/item/ammo_box/magazine/m45a5(src)
 
 /obj/structure/closet/secure_closet/nanotrasen_consultant/station
 	name = "\proper nanotrasen consultant's locker"

modular_skyrat/modules/sec_haul/code/security_medic/security_medic.dm

@@ -47,7 +47,7 @@
 	name = "Security Medic"
 	jobtype = /datum/job/security_medic
 
-	belt = /obj/item/modular_computer/pda/security
+	belt = /obj/item/storage/belt/security/full
 	ears = /obj/item/radio/headset/headset_medsec
 	uniform = /obj/item/clothing/under/rank/security/peacekeeper/security_medic
 	gloves = /obj/item/clothing/gloves/latex/nitrile
@@ -58,6 +58,7 @@
 	head = /obj/item/clothing/head/beret/sec/peacekeeper/security_medic
 	backpack_contents = list(
 		/obj/item/storage/box/gunset/firefly = 1,
+		/obj/item/modular_computer/pda/security = 1,
 		)
 	backpack = /obj/item/storage/backpack/security
 	satchel = /obj/item/storage/backpack/satchel/sec

modular_zubbers/code/game/objects/items/reshirevolver.dm

@@ -0,0 +1,67 @@
+/obj/item/gun/ballistic/revolver/hos_revolver
+	name = "\improper HR-460MS 'Tracker'"
+	desc = "A brutally effectve revolver by Romulus officers prior to destruction of the planet, if the initial damage did not kill, the bleedout would. Uses the brutal .460 Rowland ammo."
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rowland
+	icon = 'modular_zubbers/icons/obj/reshirevolver.dmi'
+	icon_state = "tracker"
+	fire_sound = 'modular_skyrat/modules/sec_haul/sound/hpistol_fire.ogg'
+	company_flag = COMPANY_ROMULUS
+	projectile_damage_multiplier = 1.6 //48 Damages, still a lot but not too much
+//With the damage multipler, it would crit in 4, kill in 6. Does not take into account armours.
+
+/obj/item/ammo_box/magazine/internal/cylinder/rowland
+	name = "\improper rowland revolver cylinder"
+	max_ammo = 6
+	ammo_type = /obj/item/ammo_casing/b460
+	caliber = CALIBER_460
+
+/obj/item/storage/bag/b460reloadpouch
+	name = "reload pouch"
+	desc = "A pouch for holding loose casings for .460 Rowland ammo. incompatible with anything else. Fit on your belt too"
+	icon = 'modular_zubbers/icons/obj/pouches.dmi'
+	icon_state = "reloadpouch"
+	slot_flags = ITEM_SLOT_POCKETS | ITEM_SLOT_BELT
+	w_class = WEIGHT_CLASS_BULKY
+	resistance_flags = FLAMMABLE
+
+/obj/item/storage/bag/b460reloadpouch/Initialize(mapload)
+	. = ..()
+	atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
+	atom_storage.max_total_storage = 30
+	atom_storage.max_slots = 30
+	atom_storage.numerical_stacking = TRUE
+	atom_storage.set_holdable(list(
+		/obj/item/ammo_casing/b460,
+		))
+
+/obj/item/storage/bag/b460reloadpouch/PopulateContents()
+	. = ..()
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+
+/obj/item/storage/box/gunset/hos_revolver/PopulateContents()
+	. = ..()
+	new /obj/item/gun/ballistic/revolver/hos_revolver(src)
+	new /obj/item/storage/bag/b460reloadpouch(src)

tgstation.dme

@@ -6694,9 +6694,13 @@
 #include "modular_zubbers\code\datums\bubber_quirks\hydrophilic.dm"
 #include "modular_zubbers\code\datums\id_trim\jobs.dm"
 #include "modular_zubbers\code\game\area\areas\station.dm"
+#include "modular_zubbers\code\game\objects\effects\decals.dm"
 #include "modular_zubbers\code\game\objects\effects\landmarks.dm"
 #include "modular_zubbers\code\game\objects\effects\items\plushes.dm"
+#include "modular_zubbers\code\game\objects\items\holy_weapons.dm"
+#include "modular_zubbers\code\game\objects\items\reshirevolver.dm"
 #include "modular_zubbers\code\game\objects\items\food\misc.dm"
+#include "modular_zubbers\code\modules\_defines.dm"
 #include "modular_zubbers\code\modules\clothing\head\helmet.dm"
 #include "modular_zubbers\code\modules\clothing\outfits\plasmaman.dm"
 #include "modular_zubbers\code\modules\clothing\suits\armor.dm"