cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 14:08:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8252 from Raptor1628/dev-freeze

Browse Source 
Assorted Fixes
This commit is contained in:
Snapshot
2015-02-24 17:08:33 -08:00
parent 00848f1a48 d4870b80ee
commit 600f55bdca
7 changed files with 73 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/belt.dm
+1
View File
@@ -113,6 +113,7 @@
/obj/item/device/pda,
/obj/item/device/radio/headset,
/obj/item/weapon/melee,
/obj/item/weapon/gun/projectile/sec,
/obj/item/taperoll/police
)
code/game/objects/random/random.dm
+14 -27
View File
@@ -170,21 +170,26 @@
prob(1);/obj/item/weapon/reagent_containers/syringe/drugs)
/obj/random/armory
name = "Random Armory Weapon"
/obj/random/energy
name = "Random Energy Weapon"
desc = "This is a random security weapon."
icon = 'icons/obj/gun.dmi'
icon_state = "energykill100"
item_to_spawn()
return pick(prob(3);/obj/item/weapon/gun/projectile/shotgun/pump,\
prob(2);/obj/item/weapon/gun/energy/ionrifle,\
prob(2);/obj/item/weapon/gun/projectile/automatic/wt550,\
prob(1);/obj/item/weapon/gun/projectile/automatic/z8,\
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/stunrevolver)
/obj/random/projectile
name = "Random Projectile Weapon"
desc = "This is a random security weapon."
icon = 'icons/obj/gun.dmi'
icon_state = "revolver"
item_to_spawn()
return pick(prob(3);/obj/item/weapon/gun/projectile/shotgun/pump,\
prob(2);/obj/item/weapon/gun/projectile/automatic/wt550,\
prob(3);/obj/item/weapon/gun/projectile/sec,\
prob(2);/obj/item/weapon/gun/projectile/sec/wood,\
prob(3);/obj/item/weapon/gun/energy/taser,\
prob(1);/obj/item/weapon/gun/projectile/shotgun/pump/combat)
@@ -202,28 +207,10 @@
prob(2);/obj/item/ammo_magazine/c45m/rubber,\
prob(2);/obj/item/ammo_magazine/c45m/flash,\
prob(1);/obj/item/ammo_magazine/mc9mmt,\
prob(3);/obj/item/ammo_magazine/mc9mmt/rubber,\
prob(2);/obj/item/ammo_magazine/a556)
prob(3);/obj/item/ammo_magazine/mc9mmt/rubber)
/obj/random/armor
name = "Random Armor"
desc = "This is a random armor vest."
icon = 'icons/obj/clothing/suits.dmi'
icon_state = "kvest"
item_to_spawn()
return pick(prob(4);/obj/item/clothing/suit/storage/vest,\
prob(3);/obj/item/clothing/suit/storage/vest/officer,\
prob(3);/obj/item/clothing/suit/storage/vest/warden,\
prob(3);/obj/item/clothing/suit/storage/vest/hos,\
prob(2);/obj/item/clothing/suit/storage/vest/pcrc,\
prob(1);/obj/item/clothing/suit/storage/vest/detective,\
prob(2);/obj/item/clothing/suit/storage/vest/heavy,\
prob(2);/obj/item/clothing/suit/storage/vest/heavy/officer,\
prob(2);/obj/item/clothing/suit/storage/vest/heavy/warden,\
prob(2);/obj/item/clothing/suit/storage/vest/heavy/hos,\
prob(2);/obj/item/clothing/suit/storage/vest/heavy/pcrc)
/obj/random/plushie
name = "random plushie"
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+1 -3
View File
@@ -157,10 +157,9 @@
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/weapon/reagent_containers/spray/pepper(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/storage/box/holobadge(src)
new /obj/item/clothing/head/beret/sec/warden(src)
new /obj/item/weapon/gun/projectile/shotgun/pump(src)
return
@@ -190,7 +189,6 @@
new /obj/item/weapon/reagent_containers/spray/pepper(src)
new /obj/item/weapon/grenade/flashbang(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/taperoll/police(src)
new /obj/item/device/hailer(src)