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

[MIRROR] Fix syndicate toy C20r and L6 Saw not having riot darts (#2740)

Browse Source 
* Fix syndicate toy C20r and L6 Saw not having riot darts  (#30645)

*   Add riot darts back into toy C20r and L6 Saw

Riot darts were removed from the unrestricted variants of these guns, also changed these ruins to use the new /riot variant in order to maintain original functionality.

* Comments are good

Especially when inheritance makes everything weird.

* Fix syndicate toy C20r and L6 Saw not having riot darts
This commit is contained in:
CitadelStationBot
2017-09-13 20:57:54 -05:00
committed by Poojawa
parent ea4a505ed0
commit d64c23b7f9
4 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+2 -2
View File
@@ -694,8 +694,8 @@
/area/ruin/powered/syndicate_lava_base)
"bJ" = (
/obj/structure/table/reinforced,
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted,
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted,
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot,
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot,
/turf/open/floor/plasteel/vault{
dir = 8
},
_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+2 -2
View File
@@ -815,8 +815,8 @@
/area/ruin/unpowered)
"cC" = (
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted,
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted,
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot,
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot,
/turf/open/floor/mineral/titanium/yellow/airless,
/area/ruin/unpowered)
"cD" = (
code/game/machinery/vending.dm
+2 -2
View File
@@ -1158,8 +1158,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/clothing/suit/syndicatefake = 5,
/obj/item/clothing/head/syndicatefake = 5) //OPS IN DORMS oh wait it's just a assistant
contraband = list(/obj/item/gun/ballistic/shotgun/toy/crossbow = 10, //Congrats, you unlocked the +18 setting!
/obj/item/gun/ballistic/automatic/c20r/toy/riot/unrestricted = 10,
/obj/item/gun/ballistic/automatic/l6_saw/toy/riot/unrestricted = 10,
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot = 10,
/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/riot = 10,
/obj/item/ammo_box/foambox/riot = 20,
/obj/item/toy/katana = 10,
/obj/item/twohanded/dualsaber/toy = 5,
code/modules/projectiles/guns/ballistic/toy.dm
+10 -14
View File
@@ -77,38 +77,34 @@
slot_flags = SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
/obj/item/gun/ballistic/automatic/c20r/toy
/obj/item/gun/ballistic/automatic/c20r/toy //This is the syndicate variant with syndicate firing pin and riot darts.
name = "donksoft SMG"
desc = "A bullpup two-round burst toy SMG, designated 'C-20r'. Ages 8 and up."
icon = 'icons/obj/guns/toy.dmi'
can_suppress = TRUE
needs_permit = 0
mag_type = /obj/item/ammo_box/magazine/toy/smgm45
mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
casing_ejector = 0
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted //Use this for actual toys
pin = /obj/item/device/firing_pin
mag_type = /obj/item/ammo_box/magazine/toy/smgm45
/obj/item/gun/ballistic/automatic/smgm45/toy/riot
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/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
/obj/item/gun/ballistic/automatic/l6_saw/toy //This is the syndicate variant with syndicate firing pin and riot darts.
name = "donksoft LMG"
desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up."
icon = 'icons/obj/guns/toy.dmi'
can_suppress = FALSE
needs_permit = 0
mag_type = /obj/item/ammo_box/magazine/toy/m762
mag_type = /obj/item/ammo_box/magazine/toy/m762/riot
casing_ejector = 0
/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted
/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted //Use this for actual toys
pin = /obj/item/device/firing_pin
mag_type = /obj/item/ammo_box/magazine/toy/m762
/obj/item/gun/ballistic/automatic/l6_saw/toy/riot
/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/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