cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks random gun spawners and supply packs

Browse Source 
laser carbines and laser pistols spawn in the armoury with equal
probability.
Stunshells are now rare like they should be.
Shotgun crates now have two combat shotguns, as they are less likely to
spawn in the armoury anyways.
Weapons crate comes with laser pistols, energy weapons crate comes with
laser carbines. Seemed more consistent that way.
This commit is contained in:
mwerezak
2015-03-09 15:47:25 -04:00
parent 91d7dd7049
commit b9d2517d83
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/datums/supplypacks.dm
View File

@@ -696,15 +696,15 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
name = "Weapons crate" name = "Weapons crate"
contains = list(/obj/item/weapon/melee/baton, contains = list(/obj/item/weapon/melee/baton,
/obj/item/weapon/melee/baton, /obj/item/weapon/melee/baton,
/obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/gun,
/obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/gun,
/obj/item/weapon/gun/energy/taser, /obj/item/weapon/gun/energy/taser,
/obj/item/weapon/gun/energy/taser, /obj/item/weapon/gun/energy/taser,
/obj/item/weapon/gun/projectile/sec, /obj/item/weapon/gun/projectile/sec,
/obj/item/weapon/gun/projectile/sec, /obj/item/weapon/gun/projectile/sec,
/obj/item/weapon/storage/box/flashbangs, /obj/item/weapon/storage/box/flashbangs,
/obj/item/weapon/storage/box/flashbangs) /obj/item/weapon/storage/box/flashbangs)
cost = 30 cost = 40
containertype = /obj/structure/closet/crate/secure/weapon containertype = /obj/structure/closet/crate/secure/weapon
containername = "Weapons crate" containername = "Weapons crate"
access = access_security access = access_security
@@ -777,7 +777,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
name = "Energy weapons crate" name = "Energy weapons crate"
contains = list(/obj/item/weapon/gun/energy/laser, contains = list(/obj/item/weapon/gun/energy/laser,
/obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/laser,
/obj/item/weapon/gun/energy/gun) /obj/item/weapon/gun/energy/laser)
cost = 50 cost = 50
containertype = /obj/structure/closet/crate/secure containertype = /obj/structure/closet/crate/secure
containername = "energy weapons crate" containername = "energy weapons crate"
@@ -789,9 +789,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
contains = list(/obj/item/clothing/suit/armor/bulletproof, contains = list(/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/suit/armor/bulletproof, /obj/item/clothing/suit/armor/bulletproof,
/obj/item/weapon/storage/box/shotgunammo, /obj/item/weapon/storage/box/shotgunammo,
/obj/item/weapon/gun/projectile/shotgun/pump, /obj/item/weapon/storage/box/shotgunshells,
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
/obj/item/weapon/gun/projectile/shotgun/pump/combat) /obj/item/weapon/gun/projectile/shotgun/pump/combat)
cost = 50 cost = 65
containertype = /obj/structure/closet/crate/secure containertype = /obj/structure/closet/crate/secure
containername = "Shotgun crate" containername = "Shotgun crate"
access = access_armory access = access_armory

22
code/game/objects/random/random.dm
View File

@@ -177,8 +177,8 @@
icon_state = "energykill100" icon_state = "energykill100"
item_to_spawn() item_to_spawn()
return pick(prob(2);/obj/item/weapon/gun/energy/laser,\ return pick(prob(2);/obj/item/weapon/gun/energy/laser,\
prob(1);/obj/item/weapon/gun/energy/gun,\ prob(2);/obj/item/weapon/gun/energy/gun,\
prob(2);/obj/item/weapon/gun/energy/stunrevolver) prob(1);/obj/item/weapon/gun/energy/stunrevolver)
/obj/random/projectile /obj/random/projectile
name = "Random Projectile Weapon" name = "Random Projectile Weapon"
@@ -206,15 +206,15 @@
icon = 'icons/obj/ammo.dmi' icon = 'icons/obj/ammo.dmi'
icon_state = "45-10" icon_state = "45-10"
item_to_spawn() item_to_spawn()
return pick(prob(3);/obj/item/weapon/storage/box/beanbags,\ return pick(prob(6);/obj/item/weapon/storage/box/beanbags,\
prob(1);/obj/item/weapon/storage/box/shotgunammo,\ prob(2);/obj/item/weapon/storage/box/shotgunammo,\
prob(2);/obj/item/weapon/storage/box/shotgunshells,\ prob(4);/obj/item/weapon/storage/box/shotgunshells,\
prob(2);/obj/item/weapon/storage/box/stunshells,\ prob(1);/obj/item/weapon/storage/box/stunshells,\
prob(1);/obj/item/ammo_magazine/c45m,\ prob(2);/obj/item/ammo_magazine/c45m,\
prob(2);/obj/item/ammo_magazine/c45m/rubber,\ prob(4);/obj/item/ammo_magazine/c45m/rubber,\
prob(2);/obj/item/ammo_magazine/c45m/flash,\ prob(4);/obj/item/ammo_magazine/c45m/flash,\
prob(1);/obj/item/ammo_magazine/mc9mmt,\ prob(2);/obj/item/ammo_magazine/mc9mmt,\
prob(3);/obj/item/ammo_magazine/mc9mmt/rubber) prob(6);/obj/item/ammo_magazine/mc9mmt/rubber)
/obj/random/action_figure /obj/random/action_figure