shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-30494

Browse Source
This commit is contained in:
LetterJay
2017-09-12 02:40:24 -05:00
committed by GitHub
parent 63122795f9 8223692c32
commit dac6cc56e4
173 changed files with 8361 additions and 5643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/boxes_magazines/external_mag.dm
+9 -2
View File
@@ -324,6 +324,7 @@
/obj/item/ammo_box/magazine/toy/smg
name = "foam force SMG magazine"
icon_state = "smg9mm-42"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
max_ammo = 20
/obj/item/ammo_box/magazine/toy/smg/update_icon()
@@ -348,23 +349,29 @@
/obj/item/ammo_box/magazine/toy/smgm45
name = "donksoft SMG magazine"
caliber = "foam_force"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
max_ammo = 20
/obj/item/ammo_box/magazine/toy/smgm45/update_icon()
..()
icon_state = "c20r45-[round(ammo_count(),2)]"
/obj/item/ammo_box/magazine/toy/smgm45/riot
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
/obj/item/ammo_box/magazine/toy/m762
name = "donksoft box magazine"
caliber = "foam_force"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
max_ammo = 50
/obj/item/ammo_box/magazine/toy/m762/update_icon()
..()
icon_state = "a762-[round(ammo_count(),10)]"
/obj/item/ammo_box/magazine/toy/m762/riot
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
code/modules/projectiles/guns/ballistic/toy.dm
+13 -1
View File
@@ -89,6 +89,12 @@
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted
pin = /obj/item/device/firing_pin
/obj/item/gun/ballistic/automatic/smgm45/toy/riot
mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
/obj/item/gun/ballistic/automatic/c20r/toy/riot/unrestricted
pin = /obj/item/device/firing_pin
/obj/item/gun/ballistic/automatic/l6_saw/toy
name = "donksoft LMG"
desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up."
@@ -99,4 +105,10 @@
casing_ejector = 0
/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted
pin = /obj/item/device/firing_pin
pin = /obj/item/device/firing_pin
/obj/item/gun/ballistic/automatic/l6_saw/toy/riot
mag_type = /obj/item/ammo_box/magazine/toy/m762/riot
/obj/item/gun/ballistic/automatic/l6_saw/toy/riot/unrestricted
pin = /obj/item/device/firing_pin