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

Converted VOREStation custom guns and ammo to handle the swap of 5.56 and 7.62 ammo.

Browse Source 
* Swapped our loot drops and guns to keep the damage of loot and guns the same.
* Edited the c762 magazine definition back to keep the same ammo count in each magazine type as before.

Conversion chart used:
==OLD==     max_ammo    ==NEW=      max_ammo
a556        10          s762        10
a556m       20          c762        (20)

s762        10          c556        20
c762        20          c556/ext    30
a762        50          a556        50
This commit is contained in:
Leshana
2017-05-26 17:54:04 -04:00
parent 8e93d971fb
commit 8c8e04a0a0
4 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/random_vr.dm
+6 -6
View File
@@ -95,12 +95,12 @@
prob(5);/obj/item/ammo_magazine/c38,\
prob(5);/obj/item/ammo_magazine/c38/rubber,\
prob(5);/obj/item/weapon/storage/box/flashbangs,\
prob(5);/obj/item/ammo_magazine/s762,\
prob(5);/obj/item/ammo_magazine/c556,\
prob(4);/obj/item/ammo_magazine/clip/a556,\
prob(4);/obj/item/ammo_magazine/clip/c45,\
prob(4);/obj/item/ammo_magazine/clip/c9mm,\
prob(4);/obj/item/ammo_magazine/c45uzi,\
prob(4);/obj/item/ammo_magazine/c762,\
prob(4);/obj/item/ammo_magazine/c556/ext,\
prob(4);/obj/item/ammo_magazine/mc9mm,\
prob(4);/obj/item/ammo_magazine/mc9mml,\
prob(4);/obj/item/ammo_magazine/mc9mmt,\
@@ -109,14 +109,14 @@
prob(4);/obj/item/ammo_magazine/p90,\
/* prob(4);/obj/item/ammo_magazine/m14,\
prob(4);/obj/item/ammo_magazine/m14/large,\ */
prob(4);/obj/item/ammo_magazine/c556/ext,\
prob(4);/obj/item/ammo_magazine/s762,\
prob(4);/obj/item/ammo_magazine/c762,\
prob(4);/obj/item/ammo_magazine/a556,\
prob(4);/obj/item/ammo_magazine/a556m,\
prob(3);/obj/item/ammo_magazine/clip/a10mm,\
prob(3);/obj/item/ammo_magazine/clip/a50,\
prob(3);/obj/item/ammo_magazine/s762,\
prob(3);/obj/item/ammo_magazine/c556,\
prob(2);/obj/item/ammo_magazine/a50,\
prob(2);/obj/item/ammo_magazine/a762,\
prob(2);/obj/item/ammo_magazine/a556,\
prob(1);/obj/item/weapon/storage/box/frags,\
/* prob(1);/obj/item/ammo_magazine/battlerifle,\ */
prob(1);/obj/item/ammo_casing/rocket,\
code/modules/awaymissions/loot_vr.dm
+7 -7
View File
@@ -192,12 +192,12 @@
prob(5);/obj/item/ammo_magazine/c38,\
prob(5);/obj/item/ammo_magazine/c38/rubber,\
prob(5);/obj/item/weapon/storage/box/flashbangs,\
prob(5);/obj/item/ammo_magazine/s762,\
prob(5);/obj/item/ammo_magazine/c556,\
prob(4);/obj/item/ammo_magazine/clip/a556,\
prob(4);/obj/item/ammo_magazine/clip/c45,\
prob(4);/obj/item/ammo_magazine/clip/c9mm,\
prob(4);/obj/item/ammo_magazine/c45uzi,\
prob(4);/obj/item/ammo_magazine/c762,\
prob(4);/obj/item/ammo_magazine/c556/ext,\
prob(4);/obj/item/ammo_magazine/mc9mm,\
prob(4);/obj/item/ammo_magazine/mc9mml,\
prob(4);/obj/item/ammo_magazine/mc9mmt,\
@@ -206,14 +206,14 @@
prob(4);/obj/item/ammo_magazine/p90,\
/* prob(4);/obj/item/ammo_magazine/m14,\
prob(4);/obj/item/ammo_magazine/m14/large,\ */
prob(4);/obj/item/ammo_magazine/c762,\
prob(4);/obj/item/ammo_magazine/a556,\
prob(4);/obj/item/ammo_magazine/a556m,\
prob(4);/obj/item/ammo_magazine/c556/ext,\
prob(4);/obj/item/ammo_magazine/s762,\
prob(4);/obj/item/ammo_magazine/c556/ext,\
prob(3);/obj/item/ammo_magazine/clip/a10mm,\
prob(3);/obj/item/ammo_magazine/clip/a50,\
prob(3);/obj/item/ammo_magazine/s762,\
prob(3);/obj/item/ammo_magazine/c556,\
prob(2);/obj/item/ammo_magazine/a50,\
prob(2);/obj/item/ammo_magazine/a762,\
prob(2);/obj/item/ammo_magazine/a556,\
prob(1);/obj/item/weapon/storage/box/frags,\
/* prob(1);/obj/item/ammo_magazine/battlerifle,\ */
prob(1);/obj/item/ammo_casing/rocket,\
code/modules/projectiles/ammunition/boxes.dm
+1 -1
View File
@@ -395,7 +395,7 @@
caliber = "a762"
matter = list(DEFAULT_WALL_MATERIAL = 2000)
ammo_type = /obj/item/ammo_casing/a762
max_ammo = 10
max_ammo = 20 // VOREStation Edit - This one is supposed to be bigger than the small one.
multiple_sprites = 1
/obj/item/ammo_magazine/c762/ap
code/modules/vore/fluffstuff/custom_guns_vr.dm
+8 -12
View File
@@ -258,7 +258,7 @@
//Currently, the only problem I have now is that this weapon's item_state isn't working.
/obj/item/weapon/gun/projectile/automatic/fluff/crestrose
name = "Crescent Rose"
desc = "Can you match my resolve? If so then you will succeed. I believe that the human spirit is indomitable. Keep Moving Forward. Uses 5.56mm rounds."
desc = "Can you match my resolve? If so then you will succeed. I believe that the human spirit is indomitable. Keep Moving Forward. Uses 7.62mm rounds."
icon = 'icons/vore/custom_guns_vr.dmi'
icon_state = "crestrose_fold"
@@ -278,9 +278,9 @@
auto_eject = 1
auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
hitsound = null
caliber = "a556"
magazine_type = /obj/item/ammo_magazine/a556
allowed_magazines = list(/obj/item/ammo_magazine/a556)
caliber = "s762"
magazine_type = /obj/item/ammo_magazine/s762
allowed_magazines = list(/obj/item/ammo_magazine/s762)
/obj/item/weapon/gun/projectile/automatic/fluff/crestrose/attack_self(mob/user as mob)
on = !on
@@ -361,10 +361,8 @@
/obj/item/weapon/gun/projectile/automatic/carbine/fluff/ufarc/update_icon(var/ignore_inhands)
..()
if(istype(ammo_magazine,/obj/item/ammo_magazine/a556m))
icon_state = "ufarc"
else
icon_state = (ammo_magazine)? "ufarc" : "ufarc-empty"
// TODO - Fix this for spriting different size magazines
icon_state = (ammo_magazine)? "ufarc" : "ufarc-empty"
item_state = (ammo_magazine)? "bullpup" : "bullpup-empty"
if(!ignore_inhands) update_held_icon()
@@ -381,10 +379,8 @@
/obj/item/weapon/gun/projectile/automatic/carbine/fluff/g44/update_icon(var/ignore_inhands)
..()
if(istype(ammo_magazine,/obj/item/ammo_magazine/a556m))
icon_state = "g44"
else
icon_state = (ammo_magazine)? "g44" : "g44-empty"
// TODO - Fix this for spriting different size magazines
icon_state = (ammo_magazine)? "g44" : "g44-empty"
item_state = (ammo_magazine)? "bullpup" : "bullpup-empty"
if(!ignore_inhands) update_held_icon()