mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 19:13:30 +01:00
Bulldog for Traitors (#28592)
* Bulldog for Traitors * Adds chat message when you try to load ammo that doesn't fit in the magazine.
This commit is contained in:
@@ -438,6 +438,22 @@
|
||||
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
|
||||
surplus = 50
|
||||
|
||||
/datum/uplink_item/dangerous/bulldog_traitor
|
||||
name = "Bulldog Shotgun"
|
||||
desc = "Lean and mean: Optimized for people that want to get up close and personal. Comes loaded with rubbershot. Extra Ammo sold separately."
|
||||
reference = "BLSG"
|
||||
item = /obj/item/gun/projectile/automatic/shotgun/bulldog/traitor
|
||||
cost = 50
|
||||
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
|
||||
|
||||
/datum/uplink_item/ammo/bull_rubbershot
|
||||
name = "Bulldog - 12g Rubbershot Magazine"
|
||||
desc = "An additional 8-round rubbershot magazine for use in the Bulldog shotgun."
|
||||
reference = "12BRU"
|
||||
item = /obj/item/ammo_box/magazine/m12g/rubbershot
|
||||
cost = 10
|
||||
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
|
||||
|
||||
/datum/uplink_item/dangerous/guardian
|
||||
name = "Holoparasites"
|
||||
reference = "HPA"
|
||||
|
||||
@@ -212,6 +212,8 @@
|
||||
user.drop_item()
|
||||
AC.loc = src
|
||||
num_loaded++
|
||||
else
|
||||
to_chat(user, "<span class='notice'>You are unable to fit [AC] into \the [src].</span>")
|
||||
if(num_loaded)
|
||||
if(!silent)
|
||||
to_chat(user, "<span class='notice'>You load [num_loaded] shell\s into \the [src]!</span>")
|
||||
|
||||
@@ -466,6 +466,16 @@
|
||||
icon_state = "m12gb"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
|
||||
|
||||
/obj/item/ammo_box/magazine/m12g/rubbershot
|
||||
name = "shotgun magazine (12g rubbershot)"
|
||||
icon_state = "m12gb"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
|
||||
|
||||
/obj/item/ammo_box/magazine/m12g/rubbershot/give_round(obj/item/ammo_casing/R, replace_spent)
|
||||
if(istype(R, /obj/item/ammo_casing/shotgun/frag12) || istype(R, /obj/item/ammo_casing/shotgun/buckshot))
|
||||
return 0
|
||||
return ..()
|
||||
|
||||
/obj/item/ammo_box/magazine/m12g/stun
|
||||
name = "shotgun magazine (12g taser slugs)"
|
||||
icon_state = "m12gs"
|
||||
|
||||
@@ -350,6 +350,10 @@
|
||||
..()
|
||||
empty_alarm()
|
||||
|
||||
// Standard traitor uplink variant
|
||||
/obj/item/gun/projectile/automatic/shotgun/bulldog/traitor
|
||||
mag_type = /obj/item/ammo_box/magazine/m12g/rubbershot
|
||||
|
||||
//////////////////////////////
|
||||
// MARK: IK-M2 LASER CARBINE
|
||||
//////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user