mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-11 18:22:14 +00:00
exorcises hardstun weapons + death/poly wands from lootboxes (#84414)
## About The Pull Request exorcises hardstun weapons + death/poly wands from lootboxes pulse weapons are of the taserless variant also all nukeop guns are unrestricted let people have fun bro also removes the enchanted modsuit from said loot ## Why It's Good For The Game getting instantly paralyzed with a ranged gun is not fun, never will be so we just remove those also being able to use the guns you get from an admin shitspawn/deathmatch prop is pretty much a fix??? polymorph wands and death wands are stupid and are just taser++ except they kill you outright (polymorph could make you a rat that would count as dead personally) enchanted modsuit entirely shuts down basically 90% of other players spells which basically invalidates the entire ragin mages map (which sucks anyway) ## Changelog 🆑 balance: removed tasers, the unfirable turret gun, death wand, polymorph wands and the enchanted modsuit from lootbox loot tables fix: lootbox guns should now mostly not have syndicate firing pins so you can actually use them /🆑
This commit is contained in:
@@ -22,9 +22,7 @@ GLOBAL_LIST_INIT(mystery_box_guns, list(
|
|||||||
/obj/item/gun/energy/lasercannon,
|
/obj/item/gun/energy/lasercannon,
|
||||||
/obj/item/gun/energy/recharge/ebow/large,
|
/obj/item/gun/energy/recharge/ebow/large,
|
||||||
/obj/item/gun/energy/e_gun,
|
/obj/item/gun/energy/e_gun,
|
||||||
/obj/item/gun/energy/e_gun/advtaser,
|
|
||||||
/obj/item/gun/energy/e_gun/nuclear,
|
/obj/item/gun/energy/e_gun/nuclear,
|
||||||
/obj/item/gun/energy/e_gun/turret,
|
|
||||||
/obj/item/gun/energy/laser,
|
/obj/item/gun/energy/laser,
|
||||||
/obj/item/gun/energy/laser/hellgun,
|
/obj/item/gun/energy/laser/hellgun,
|
||||||
/obj/item/gun/energy/laser/captain,
|
/obj/item/gun/energy/laser/captain,
|
||||||
@@ -34,17 +32,17 @@ GLOBAL_LIST_INIT(mystery_box_guns, list(
|
|||||||
/obj/item/gun/ballistic/revolver/mateba,
|
/obj/item/gun/ballistic/revolver/mateba,
|
||||||
/obj/item/gun/ballistic/automatic/pistol/deagle/camo,
|
/obj/item/gun/ballistic/automatic/pistol/deagle/camo,
|
||||||
/obj/item/gun/ballistic/automatic/pistol/suppressed,
|
/obj/item/gun/ballistic/automatic/pistol/suppressed,
|
||||||
/obj/item/gun/energy/pulse/carbine,
|
/obj/item/gun/energy/pulse/carbine/taserless,
|
||||||
/obj/item/gun/energy/pulse/pistol,
|
/obj/item/gun/energy/pulse/pistol/taserless,
|
||||||
/obj/item/gun/ballistic/shotgun/lethal,
|
/obj/item/gun/ballistic/shotgun/lethal,
|
||||||
/obj/item/gun/ballistic/shotgun/automatic/combat,
|
/obj/item/gun/ballistic/shotgun/automatic/combat,
|
||||||
/obj/item/gun/ballistic/shotgun/bulldog,
|
/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
|
||||||
/obj/item/gun/ballistic/rifle/boltaction,
|
/obj/item/gun/ballistic/rifle/boltaction,
|
||||||
/obj/item/gun/ballistic/automatic/ar,
|
/obj/item/gun/ballistic/automatic/ar,
|
||||||
/obj/item/gun/ballistic/automatic/proto,
|
/obj/item/gun/ballistic/automatic/proto/unrestricted,
|
||||||
/obj/item/gun/ballistic/automatic/c20r,
|
/obj/item/gun/ballistic/automatic/c20r/unrestricted,
|
||||||
/obj/item/gun/ballistic/automatic/l6_saw,
|
/obj/item/gun/ballistic/automatic/l6_saw/unrestricted,
|
||||||
/obj/item/gun/ballistic/automatic/m90,
|
/obj/item/gun/ballistic/automatic/m90/unrestricted,
|
||||||
/obj/item/gun/ballistic/automatic/tommygun,
|
/obj/item/gun/ballistic/automatic/tommygun,
|
||||||
/obj/item/gun/ballistic/automatic/wt550,
|
/obj/item/gun/ballistic/automatic/wt550,
|
||||||
/obj/item/gun/ballistic/rifle/sniper_rifle,
|
/obj/item/gun/ballistic/rifle/sniper_rifle,
|
||||||
@@ -72,15 +70,11 @@ GLOBAL_LIST_INIT(mystery_magic, list(
|
|||||||
/obj/item/gun/magic/wand/arcane_barrage/blood,
|
/obj/item/gun/magic/wand/arcane_barrage/blood,
|
||||||
/obj/item/gun/magic/wand/fireball,
|
/obj/item/gun/magic/wand/fireball,
|
||||||
/obj/item/gun/magic/wand/resurrection,
|
/obj/item/gun/magic/wand/resurrection,
|
||||||
/obj/item/gun/magic/wand/death,
|
|
||||||
/obj/item/gun/magic/wand/polymorph,
|
|
||||||
/obj/item/gun/magic/wand/teleport,
|
/obj/item/gun/magic/wand/teleport,
|
||||||
/obj/item/gun/magic/wand/door,
|
/obj/item/gun/magic/wand/door,
|
||||||
/obj/item/gun/magic/wand/nothing,
|
/obj/item/gun/magic/wand/nothing,
|
||||||
/obj/item/storage/belt/wands/full,
|
/obj/item/storage/belt/wands/full,
|
||||||
/obj/item/gun/magic/staff/healing,
|
/obj/item/gun/magic/staff/healing,
|
||||||
/obj/item/gun/magic/staff/change,
|
|
||||||
/obj/item/gun/magic/staff/animate,
|
|
||||||
/obj/item/gun/magic/staff/chaos,
|
/obj/item/gun/magic/staff/chaos,
|
||||||
/obj/item/gun/magic/staff/door,
|
/obj/item/gun/magic/staff/door,
|
||||||
/obj/item/gun/magic/staff/honk,
|
/obj/item/gun/magic/staff/honk,
|
||||||
@@ -88,7 +82,6 @@ GLOBAL_LIST_INIT(mystery_magic, list(
|
|||||||
/obj/item/gun/magic/staff/flying,
|
/obj/item/gun/magic/staff/flying,
|
||||||
/obj/item/gun/magic/staff/babel,
|
/obj/item/gun/magic/staff/babel,
|
||||||
/obj/item/singularityhammer,
|
/obj/item/singularityhammer,
|
||||||
/obj/item/mod/control/pre_equipped/enchanted,
|
|
||||||
/obj/item/runic_vendor_scepter,
|
/obj/item/runic_vendor_scepter,
|
||||||
))
|
))
|
||||||
|
|
||||||
|
|||||||
@@ -59,6 +59,9 @@
|
|||||||
/obj/item/gun/energy/pulse/carbine/loyalpin
|
/obj/item/gun/energy/pulse/carbine/loyalpin
|
||||||
pin = /obj/item/firing_pin/implant/mindshield
|
pin = /obj/item/firing_pin/implant/mindshield
|
||||||
|
|
||||||
|
/obj/item/gun/energy/pulse/carbine/taserless
|
||||||
|
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/laser)
|
||||||
|
|
||||||
/obj/item/gun/energy/pulse/destroyer
|
/obj/item/gun/energy/pulse/destroyer
|
||||||
name = "pulse destroyer"
|
name = "pulse destroyer"
|
||||||
desc = "A heavy-duty energy rifle built for pure destruction."
|
desc = "A heavy-duty energy rifle built for pure destruction."
|
||||||
@@ -79,6 +82,9 @@
|
|||||||
inhand_icon_state = "gun"
|
inhand_icon_state = "gun"
|
||||||
cell_type = /obj/item/stock_parts/power_store/cell/pulse/pistol
|
cell_type = /obj/item/stock_parts/power_store/cell/pulse/pistol
|
||||||
|
|
||||||
|
/obj/item/gun/energy/pulse/pistol/taserless
|
||||||
|
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/laser)
|
||||||
|
|
||||||
/obj/item/gun/energy/pulse/pistol/loyalpin
|
/obj/item/gun/energy/pulse/pistol/loyalpin
|
||||||
pin = /obj/item/firing_pin/implant/mindshield
|
pin = /obj/item/firing_pin/implant/mindshield
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user