[Code Bounty] Gives hos a gun beacon, buffs multiphase, makes beanbags and rubbershot account for 250 stam (#3680)

Shoddd · web-flow · commit 6414bae3bebf · 2024-10-07T16:26:20.000-06:00
* HoSgun

* STUNSPRITE

* gun beacon

* beanbag and rubber buff

* Tot objective and spawn choice

* notdnoe

* steal objective

* beanbag

* several hours for one line change

* monkestation edit

* modularized stealing

* modularized beacon

* compact

* inhand sprites

* shotgun back + 1 mag size

* waist sprite

* fix fails
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
@@ -254,13 +254,12 @@
 /datum/objective_item/steal/hoslaser
 	name = "the head of security's personal laser gun"
 	targetitem = /obj/item/gun/energy/e_gun/hos
-	excludefromjob = list(JOB_HEAD_OF_SECURITY)
-	item_owner = list(JOB_HEAD_OF_SECURITY)
-	exists_on_map = TRUE
+
 
 /obj/item/gun/energy/e_gun/hos/add_stealing_item_objective()
 	return add_item_to_steal(src, /obj/item/gun/energy/e_gun/hos)
 */
+
 /datum/objective_item/steal/handtele
 	name = "a hand teleporter"
 	targetitem = /obj/item/hand_tele
diff --git a/code/game/objects/items/choice_beacon.dm b/code/game/objects/items/choice_beacon.dm
@@ -175,3 +175,4 @@
 	GLOB.holy_armor_type = choice_path
 	return ..()
 
+
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -65,15 +65,14 @@
 	new /obj/item/storage/belt/security/full(src)
 	new /obj/item/circuitboard/machine/techfab/department/security(src)
 	new /obj/item/storage/photo_album/hos(src)
-	new /obj/item/gun/ballistic/automatic/pistol/paco(src) //monkestation edit: paco sec
 	new /obj/item/ammo_box/magazine/m35(src) //monkestation edit: paco sec
 	new /obj/item/bodycam_upgrade(src) //monkestation edit: Security Liability Act
 
 /obj/structure/closet/secure_closet/hos/populate_contents_immediate()
 	. = ..()
 
 	// Traitor steal objectives
-	//new /obj/item/gun/energy/e_gun/hos(src) monkestation removal
+	new /obj/item/choice_beacon/hos(src) //monkestation edit
 	new /obj/item/pinpointer/nuke(src)
 
 /obj/structure/closet/secure_closet/warden
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
@@ -323,7 +323,7 @@
 
 /obj/item/stock_parts/cell/hos_gun
 	name = "X-01 multiphase energy gun power cell"
-	maxcharge = 1200
+	maxcharge = 1800 //monkestation edit
 
 /obj/item/stock_parts/cell/pulse //200 pulse shots
 	name = "pulse rifle power cell"
diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm
@@ -22,7 +22,7 @@
 	select_name = "kill"
 
 /obj/item/ammo_casing/energy/laser/hos
-	e_cost = 120
+	e_cost = 90 //monkestation edit
 
 /obj/item/ammo_casing/energy/laser/musket
 	projectile_type = /obj/projectile/beam/laser/musket
diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm
@@ -5,6 +5,9 @@
 	e_cost = 200
 	harmful = FALSE
 
+/obj/item/ammo_casing/energy/electrode/hos //monkestation edit
+	e_cost = 300
+
 /obj/item/ammo_casing/energy/electrode/spec
 	e_cost = 100
 
diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
@@ -21,6 +21,10 @@
 	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
 	max_ammo = 6
 
+/obj/item/ammo_box/magazine/internal/shot/com/compact
+	name = "compact shotgun internal magazine"
+	max_ammo = 6 //Monkestation edit
+
 /obj/item/ammo_box/magazine/internal/shot/dual
 	name = "double-barrel shotgun internal magazine"
 	max_ammo = 2
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -64,6 +64,15 @@
 	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/com
 	w_class = WEIGHT_CLASS_HUGE
 
+/obj/item/gun/ballistic/shotgun/automatic/combat/compact
+	name = "compact shotgun"
+	desc = "A compact version of the semi automatic combat shotgun. For close encounters."
+	icon_state = "cshotgunc"
+	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
+	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/com/compact
+	w_class = WEIGHT_CLASS_BULKY
+
+
 //Dual Feed Shotgun
 
 /obj/item/gun/ballistic/shotgun/automatic/dual_tube
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -67,7 +67,7 @@
 	icon_state = "hoslaser"
 	w_class = WEIGHT_CLASS_NORMAL
 	force = 10
-	ammo_type = list(/obj/item/ammo_casing/energy/disabler/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/ion/hos)
+	ammo_type = list(/obj/item/ammo_casing/energy/disabler/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/ion/hos, /obj/item/ammo_casing/energy/electrode/hos) //monkestation edit
 	ammo_x_offset = 4
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	flags_1 = PREVENT_CONTENTS_EXPLOSION_1
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -19,7 +19,7 @@
 	name = "beanbag slug"
 	icon_state = "pellet"
 	damage = 10
-	stamina = 55
+	stamina = 145 //monkestation edit
 	wound_bonus = 20
 	sharpness = NONE
 	embedding = null
@@ -84,7 +84,7 @@
 /obj/projectile/bullet/pellet/shotgun_rubbershot
 	name = "rubber shot pellet"
 	damage = 3
-	stamina = 11
+	stamina = 30 //monkestation edit
 	sharpness = NONE
 	embedding = null
 	speed = 1.2
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi
diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi
diff --git a/icons/obj/weapons/guns/ballistic.dmi b/icons/obj/weapons/guns/ballistic.dmi
diff --git a/icons/obj/weapons/guns/energy.dmi b/icons/obj/weapons/guns/energy.dmi
diff --git a/monkestation/code/modules/security/code/weapons/lawbringer.dm b/monkestation/code/modules/security/code/weapons/lawbringer.dm
@@ -600,23 +600,34 @@
 	e_cost = 1400 //47%, 2 shots
 	harmful = TRUE
 
-//LOCKER OVERRIDES//
-/obj/structure/closet/secure_closet/hos/populate_contents_immediate()
-	. = ..()
-
-	// Traitor steal objectives
-	new /obj/item/gun/energy/e_gun/lawbringer(src)
-
-//OBJECTIVE OVERRIDES//
-/datum/objective_item/steal/lawbringer
-	name = "the head of security's lawbringer"
-	targetitem = /obj/item/gun/energy/e_gun/lawbringer
+// HoS weapon beacon
+/obj/item/choice_beacon/hos
+	name = "gun beacon"
+	desc = "A single use beacon to deliver a gunset of your choice to help with security detail."
+	company_source = "Central Command"
+	company_message = span_bold("Supply Pod incoming, please stand back.")
+
+/obj/item/choice_beacon/hos/generate_display_names()
+	var/static/list/selectable_guns = list(
+		"X-01 MultiPhase Energy Gun" = /obj/item/gun/energy/e_gun/hos,
+		"Lawbringer" = /obj/item/gun/energy/e_gun/lawbringer,
+		"Compact Combat Shotgun" = /obj/item/gun/ballistic/shotgun/automatic/combat/compact,
+	)
+	return selectable_guns
+
+
+// Steal Objective, not just for Lawbringer but all their guns
+/datum/objective_item/steal/hosgun
+	name = "the head of security's personal weapon"
+	targetitem = /obj/item/choice_beacon/hos
 	excludefromjob = list(JOB_HEAD_OF_SECURITY)
+	altitems = list(/obj/item/gun/ballistic/shotgun/automatic/combat/compact, /obj/item/gun/energy/e_gun/lawbringer, /obj/item/gun/energy/e_gun/hos)
 	item_owner = list(JOB_HEAD_OF_SECURITY)
 	exists_on_map = TRUE
 
-/obj/item/gun/energy/e_gun/hos/add_stealing_item_objective()
-	return add_item_to_steal(src, /obj/item/gun/energy/e_gun/lawbringer)
+/obj/item/choice_beacon/hos/add_stealing_item_objective()
+	return add_item_to_steal(src, /obj/item/choice_beacon/hos)
+
 
 //THE MANUAL//
 /obj/item/paper/guides/lawbringer

Original file line number	Diff line number	Diff line change
`@@ -175,3 +175,4 @@`
`175`	`175`	`GLOB.holy_armor_type = choice_path`
`176`	`176`	`return ..()`
`177`	`177`
	`178`	`+`