diff --git a/_maps/map_files220/generic/Admin_Zone.dmm b/_maps/map_files220/generic/Admin_Zone.dmm index 1d3188cd609b..c47718b54bcd 100644 --- a/_maps/map_files220/generic/Admin_Zone.dmm +++ b/_maps/map_files220/generic/Admin_Zone.dmm @@ -611,8 +611,9 @@ /area/holodeck/source_basketball) "jK" = ( /obj/structure/table/wood, -/obj/item/paper{ - info = "Я так понял был энфорсер с Сибилом." +/obj/item/gun/projectile/revolver/reclinable/anaconda, +/obj/item/gun/projectile/revolver/reclinable/rsh12{ + pixel_y = -12 }, /turf/simulated/floor/wood/oak, /area/admin) @@ -1620,6 +1621,12 @@ /obj/item/gun/magic/staff/slipping, /turf/simulated/floor/wood/oak, /area/admin) +"yE" = ( +/obj/machinery/economy/vending/nta/admin{ + req_access = "0" + }, +/turf/simulated/floor/wood/oak, +/area/admin) "yH" = ( /obj/structure/table/wood, /obj/item/gun/energy/gun/nuclear, @@ -1774,9 +1781,7 @@ /area/admin) "Bl" = ( /obj/structure/table/wood, -/obj/item/paper{ - info = "Тут ничего не было. Я серьёзно." - }, +/obj/item/gun/projectile/automatic/ak814, /turf/simulated/floor/wood/oak, /area/admin) "Bo" = ( @@ -10279,7 +10284,7 @@ Hc mB gd UO -UO +yE Up Up Up diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index 3bcd5b0c9730..5df73cf82337 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -25702,6 +25702,13 @@ "okC" = ( /turf/simulated/floor/carpet/purple, /area/centcom/ss220/park) +"okD" = ( +/obj/machinery/economy/vending/nta/admin, +/turf/simulated/floor/plasteel/dark{ + dir = 4; + icon_state = "darkred" + }, +/area/centcom/ss220/supply) "okL" = ( /obj/machinery/economy/vending/clothing, /turf/simulated/floor/plasteel{ @@ -35998,11 +36005,13 @@ "tVU" = ( /obj/effect/turf_decal/arrows/white{ dir = 4; - pixel_y = 8 + pixel_y = 8; + initialized = 1 }, /obj/effect/turf_decal/arrows/white{ dir = 8; - pixel_y = -9 + pixel_y = -9; + initialized = 1 }, /turf/simulated/floor/plasteel/dark, /area/centcom/ss220/supply) @@ -54652,7 +54661,7 @@ jwS vsJ ipb qyF -jwS +okD gwi fbR hXZ diff --git a/modular_ss220/vending/code/vending.dm b/modular_ss220/vending/code/vending.dm index 557d8bf66086..76816a3f470e 100644 --- a/modular_ss220/vending/code/vending.dm +++ b/modular_ss220/vending/code/vending.dm @@ -25,6 +25,97 @@ /obj/item/ammo_box/a40mm = 4, /obj/item/ammo_box/magazine/smgm9mm = 12) +/obj/machinery/economy/vending/nta/admin + products = list( + /obj/item/ammo_box/a40mm = 999, + /obj/item/ammo_box/a762 = 999, + /obj/item/ammo_box/b357 = 999, + /obj/item/ammo_box/beretta = 999, + /obj/item/ammo_box/beretta/mm919 = 999, + /obj/item/ammo_box/beretta/mmap919 = 999, + /obj/item/ammo_box/beretta/mmbsp919 = 999, + /obj/item/ammo_box/wt550 = 999, + /obj/item/ammo_box/wt550/wtap = 999, + /obj/item/ammo_box/wt550/wtic = 999, + /obj/item/ammo_box/wt550/wttx = 999, + /obj/item/ammo_box/foambox = 100, + /obj/item/ammo_box/foambox/riot = 100, + /obj/item/ammo_box/foambox/sniper = 100, + /obj/item/ammo_box/foambox/sniper/riot = 100, + /obj/item/ammo_box/laser = 999, + /obj/item/ammo_box/small_laser = 999, + /obj/item/ammo_box/box_d44 = 999, + /obj/item/ammo_box/box_mm127 = 999, + /obj/item/ammo_box/c10mm = 999, + /obj/item/ammo_box/c45 = 999, + /obj/item/ammo_box/rubber45 = 999, + /obj/item/ammo_box/c9mm = 999, + /obj/item/ammo_box/caps = 999, + /obj/item/ammo_box/n762 = 999, + /obj/item/ammo_box/magazine/ak814 = 999, + /obj/item/ammo_box/magazine/apsm10mm= 999, + /obj/item/ammo_box/magazine/beretta/mm919 = 999, + /obj/item/ammo_box/magazine/detective/speedcharger = 999, + /obj/item/ammo_box/magazine/enforcer/lethal = 999, + /obj/item/ammo_box/magazine/laser = 999, + /obj/item/ammo_box/magazine/laser/ert = 999, + /obj/item/ammo_box/magazine/m10mm = 999, + /obj/item/ammo_box/magazine/m12g = 999, + /obj/item/ammo_box/magazine/m12g/XtrLrg = 999, + /obj/item/ammo_box/magazine/m12g/XtrLrg/buckshot = 999, + /obj/item/ammo_box/magazine/m12g/XtrLrg/dragon = 999, + /obj/item/ammo_box/magazine/m12g/buckshot = 999, + /obj/item/ammo_box/magazine/m12g/bioterror = 999, + /obj/item/ammo_box/magazine/m12g/confetti = 999, + /obj/item/ammo_box/magazine/m12g/dragon = 999, + /obj/item/ammo_box/magazine/m12g/meteor = 999, + /obj/item/ammo_box/magazine/m12g/stun = 999, + /obj/item/ammo_box/a357 = 999, + /obj/item/ammo_box/magazine/m45 = 999, + /obj/item/ammo_box/magazine/m50 = 999, + /obj/item/ammo_box/magazine/m556 = 999, + /obj/item/ammo_box/magazine/m556/arg = 999, + /obj/item/ammo_box/magazine/m75 = 999, + /obj/item/ammo_box/magazine/mm556x45 = 999, + /obj/item/ammo_box/magazine/mm556x45/ap = 999, + /obj/item/ammo_box/magazine/mm556x45/bleeding = 999, + /obj/item/ammo_box/magazine/mm556x45/hollow = 999, + /obj/item/ammo_box/magazine/mm556x45/incen = 999, + /obj/item/ammo_box/magazine/pneuma/pepper = 999, + /obj/item/ammo_box/magazine/smgm45 = 999, + /obj/item/ammo_box/magazine/smgm9mm = 999, + /obj/item/ammo_box/magazine/smgm9mm/ap = 999, + /obj/item/ammo_box/magazine/smgm9mm/fire = 999, + /obj/item/ammo_box/magazine/smgm9mm/toxin = 999, + /obj/item/ammo_box/magazine/sniper_rounds = 999, + /obj/item/ammo_box/magazine/sniper_rounds/antimatter = 999, + /obj/item/ammo_box/magazine/sniper_rounds/haemorrhage = 999, + /obj/item/ammo_box/magazine/sniper_rounds/penetrator = 999, + /obj/item/ammo_box/magazine/sniper_rounds/soporific = 999, + /obj/item/ammo_box/magazine/wt550m9 = 999, + /obj/item/ammo_box/magazine/wt550m9/wtap = 999, + /obj/item/ammo_box/magazine/wt550m9/wtic = 999, + /obj/item/ammo_box/magazine/wt550m9/wttx = 999, + /obj/item/ammo_box/magazine/sslr = 999, + /obj/item/ammo_box/magazine/tommygunm45 = 999, + /obj/item/ammo_box/magazine/uzim9mm = 999, + /obj/item/ammo_box/shotgun = 999, + /obj/item/ammo_box/shotgun/beanbag = 999, + /obj/item/ammo_box/shotgun/buck = 999, + /obj/item/ammo_box/shotgun/confetti = 999, + /obj/item/ammo_box/shotgun/dragonsbreath = 999, + /obj/item/ammo_box/shotgun/rubbershot = 999, + /obj/item/ammo_box/shotgun/stun = 999, + /obj/item/ammo_box/shotgun/tranquilizer = 999, + /obj/item/storage/box/rubbershot = 999, + /obj/item/storage/box/buck = 999, + /obj/item/storage/box/dragonsbreath = 999, + /obj/item/storage/box/holy = 999, + /obj/item/storage/box/rubbershot = 999, + /obj/item/storage/box/slug = 999, + /obj/item/storage/box/stun = 999, + /obj/item/storage/box/tranquilizer = 999) + /obj/machinery/economy/vending/nta/blue name = "NT ERT Medium Gear & Ammunition" desc = "A ERT Medium equipment vendor."