diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index 5653125ca0e..6e29288ba67 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -376,7 +376,7 @@ /obj/item/storage/box/lights/bulbs, /obj/item/storage/toolbox/mechanical/old, /obj/item/gift{ - contains_type = /obj/item/gun/ballistic/automatic/toy/unrestricted + contains_type = /obj/item/gun/ballistic/automatic/toy }, /obj/item/gift{ contains_type = /obj/item/gun/ballistic/automatic/pistol/toy diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index bfbc5a18c56..0c30bb3c51d 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -4122,7 +4122,7 @@ pixel_x = -1; pixel_y = 10 }, -/obj/item/gun/ballistic/shotgun/toy/unrestricted{ +/obj/item/gun/ballistic/shotgun/toy{ pixel_y = -2 }, /obj/effect/light_emitter{ diff --git a/code/game/objects/items/storage/boxes/clothes_boxes.dm b/code/game/objects/items/storage/boxes/clothes_boxes.dm index 582b611186c..86cd3931f1e 100644 --- a/code/game/objects/items/storage/boxes/clothes_boxes.dm +++ b/code/game/objects/items/storage/boxes/clothes_boxes.dm @@ -38,8 +38,8 @@ new /obj/item/stack/sticky_tape(src) /obj/item/storage/box/fakesyndiesuit - name = "boxed space suit and helmet" - desc = "A sleek, sturdy box used to hold replica spacesuits." + name = "boxed replica space suit and helmet" + desc = "A sleek, sturdy box used to hold toy spacesuits." icon_state = "syndiebox" illustration = "syndiesuit" diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index 40cb967d3a0..10b2fbe71d0 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -246,7 +246,7 @@ new /obj/item/clothing/mask/balaclava(src) new /obj/item/gun/ballistic/shotgun/toy(src) new /obj/item/gun/ballistic/automatic/pistol/toy(src) - new /obj/item/gun/ballistic/automatic/toy/unrestricted(src) + new /obj/item/gun/ballistic/automatic/toy(src) new /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted(src) new /obj/item/ammo_box/foambox(src) if(98) diff --git a/code/modules/projectiles/boxes_magazines/internal/toy.dm b/code/modules/projectiles/boxes_magazines/internal/toy.dm index 639323f81d8..395ad80972b 100644 --- a/code/modules/projectiles/boxes_magazines/internal/toy.dm +++ b/code/modules/projectiles/boxes_magazines/internal/toy.dm @@ -3,5 +3,11 @@ caliber = CALIBER_FOAM max_ammo = 4 +/obj/item/ammo_box/magazine/internal/shot/toy/riot + ammo_type = /obj/item/ammo_casing/foam_dart/riot + /obj/item/ammo_box/magazine/internal/shot/toy/crossbow max_ammo = 5 + +/obj/item/ammo_box/magazine/internal/shot/toy/crossbow/riot + ammo_type = /obj/item/ammo_casing/foam_dart/riot diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm index cb90438f56b..bd84e5f7941 100644 --- a/code/modules/projectiles/guns/ballistic/toy.dm +++ b/code/modules/projectiles/guns/ballistic/toy.dm @@ -15,9 +15,8 @@ gun_flags = TOY_FIREARM_OVERLAY | NOT_A_REAL_GUN casing_ejector = FALSE -/obj/item/gun/ballistic/automatic/toy/unrestricted - pin = /obj/item/firing_pin - +/obj/item/gun/ballistic/automatic/toy/riot + spawn_magazine_type = /obj/item/ammo_box/magazine/toy/smg/riot /obj/item/gun/ballistic/automatic/pistol/toy name = "foam force pistol" desc = "A small, easily concealable toy handgun. Ages 8 and up." @@ -52,8 +51,8 @@ if(chambered && !chambered.loaded_projectile) qdel(chambered) -/obj/item/gun/ballistic/shotgun/toy/unrestricted - pin = /obj/item/firing_pin +/obj/item/gun/ballistic/shotgun/toy/riot + spawn_magazine_type = /obj/item/ammo_box/magazine/internal/shot/toy/riot /obj/item/gun/ballistic/shotgun/toy/crossbow name = "foam force crossbow" @@ -73,6 +72,9 @@ w_class = WEIGHT_CLASS_SMALL gun_flags = NONE +/obj/item/gun/ballistic/shotgun/toy/crossbow/riot + spawn_magazine_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow/riot + /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 three-round burst toy SMG, designated 'C-20r'. Ages 8 and up." diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm index 0bfb2e6c2df..e5697793703 100644 --- a/code/modules/vending/liberation_toy.dm +++ b/code/modules/vending/liberation_toy.dm @@ -8,31 +8,34 @@ vend_reply = "Come back for more!" circuit = /obj/item/circuitboard/machine/vending/syndicatedonksofttoyvendor products = list( - /obj/item/gun/ballistic/automatic/toy/unrestricted = 10, - /obj/item/gun/ballistic/automatic/pistol/toy = 10, - /obj/item/gun/ballistic/shotgun/toy/unrestricted = 10, - /obj/item/toy/sword = 10, + /obj/item/card/emagfake = 4, + /obj/item/hot_potato/harmless/toy = 4, + /obj/item/toy/sword = 12, + /obj/item/dualsaber/toy = 12, + /obj/item/toy/foamblade = 12, + /obj/item/gun/ballistic/automatic/pistol/toy/riot = 8, + /obj/item/gun/ballistic/automatic/toy/riot = 8, + /obj/item/gun/ballistic/shotgun/toy/riot = 8, /obj/item/ammo_box/foambox = 20, - /obj/item/toy/foamblade = 10, - /obj/item/toy/balloon/syndicate = 10, - /obj/item/clothing/suit/syndicatefake = 5, - /obj/item/clothing/head/syndicatefake = 5, //OPS IN DORMS oh wait it's just an assistant ) contraband = list( - /obj/item/gun/ballistic/shotgun/toy/crossbow = 10, //Congrats, you unlocked the +18 setting! - /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot = 10, - /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/riot = 10, + /obj/item/toy/balloon/syndicate = 1, + /obj/item/gun/ballistic/shotgun/toy/crossbow/riot = 8, + /obj/item/toy/katana = 12, + ) + premium = list( + /obj/item/toy/cards/deck/syndicate = 12, + /obj/item/storage/box/fakesyndiesuit = 4, + /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot = 4, + /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/riot = 4, /obj/item/ammo_box/foambox/riot = 20, - /obj/item/toy/katana = 10, - /obj/item/dualsaber/toy = 5, - /obj/item/toy/cards/deck/syndicate = 10, //Gambling and it hurts, making it a +18 item ) armor_type = /datum/armor/vending_toyliberationstation resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/donksoft - default_price = PAYCHECK_COMMAND + default_price = PAYCHECK_CREW extra_price = PAYCHECK_COMMAND - payment_department = ACCOUNT_SRV + payment_department = NO_FREEBIES light_mask = "donksoft-light-mask" /datum/armor/vending_toyliberationstation diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm index e3f3b3316f2..8f92e438b51 100644 --- a/code/modules/vending/toys.dm +++ b/code/modules/vending/toys.dm @@ -9,27 +9,31 @@ light_mask = "donksoft-light-mask" circuit = /obj/item/circuitboard/machine/vending/donksofttoyvendor products = list( - /obj/item/gun/ballistic/automatic/toy/unrestricted = 10, - /obj/item/gun/ballistic/automatic/pistol/toy = 10, - /obj/item/gun/ballistic/shotgun/toy/unrestricted = 10, - /obj/item/toy/sword = 10, - /obj/item/ammo_box/foambox = 20, - /obj/item/toy/foamblade = 10, - /obj/item/toy/balloon/syndicate = 10, - /obj/item/clothing/suit/syndicatefake = 5, - /obj/item/clothing/head/syndicatefake = 5, + /obj/item/card/emagfake = 4, + /obj/item/hot_potato/harmless/toy = 4, + /obj/item/toy/sword = 12, + /obj/item/toy/foamblade = 12, + /obj/item/gun/ballistic/automatic/pistol/toy = 8, + /obj/item/gun/ballistic/automatic/toy = 8, + /obj/item/gun/ballistic/shotgun/toy = 8, + /obj/item/ammo_box/foambox/mini = 20, ) contraband = list( - /obj/item/gun/ballistic/shotgun/toy/crossbow = 10, - /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted = 10, - /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 10, - /obj/item/toy/katana = 10, - /obj/item/dualsaber/toy = 5, + /obj/item/toy/balloon/syndicate = 1, + /obj/item/gun/ballistic/shotgun/toy/crossbow = 8, + /obj/item/toy/katana = 12, + /obj/item/ammo_box/foambox/riot/mini = 20, + ) + premium = list( + /obj/item/dualsaber/toy = 4, + /obj/item/storage/box/fakesyndiesuit = 4, + /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted = 4, + /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 4, ) refill_canister = /obj/item/vending_refill/donksoft default_price = PAYCHECK_CREW extra_price = PAYCHECK_COMMAND - payment_department = ACCOUNT_SRV + payment_department = NO_FREEBIES /obj/item/vending_refill/donksoft machine_name = "Donksoft Toy Vendor"