cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

NT-USP - American Security - How I Learned to Stop Worrying and Love the Gun (#16414)

Browse Source 
* gun

* vendor

* remove disablers from jobs

* poop

* maybe spell it right

* asteroid + gax

* armory

* bye to all your ammo if you get heavy EMP'd

* bald

* sprite adjustment from orca feedback

* ammo change + vending change

* pixel perfect

* Update ArmamentsDispenser.js

* if this works you owe me an antag token

* maps

* Update rechargable.dm

Co-authored-by: ynot01 <ynot000001@gmail.com>
Co-authored-by: Chubbygummibear <kullen.ds@gmail.com>
This commit is contained in:
Byemoh
2023-01-07 08:06:44 -06:00
committed by GitHub
parent 3878165a18
commit 0e309e5a82
19 changed files with 337 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
_maps/map_files/AsteroidStation/AsteroidStation.dmm
View File

@@ -9307,6 +9307,14 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"cdC" = (
/obj/structure/closet/secure_closet/security/sec,
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/machinery/armaments_dispenser,
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"cdG" = (
/obj/machinery/door/airlock/highsecurity{
name = "Gravity Generator and SMES";
@@ -30965,6 +30973,14 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos_distro)
"jBf" = (
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/disabler{
pixel_x = -3;
pixel_y = 3
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"jBm" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -45686,10 +45702,14 @@
dir = 8
},
/obj/structure/rack,
/obj/item/gun/energy/disabler{
/obj/item/gun/ballistic/automatic/pistol/ntusp{
pixel_x = 3;
pixel_y = -3
},
/obj/item/ammo_box/magazine/recharge/ntusp{
pixel_x = 9;
pixel_y = -7
},
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/disabler{
pixel_x = -3;
@@ -59786,6 +59806,13 @@
},
/turf/open/floor/plasteel/white,
/area/science/research)
"tgz" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
/obj/structure/closet/secure_closet/security/sec,
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"tgD" = (
/obj/effect/landmark/start/atmospheric_technician,
/obj/structure/chair/office/dark{
@@ -104939,7 +104966,7 @@ msb
aHC
cQp
dSW
aJG
jBf
oIh
aJG
uaZ
@@ -106735,10 +106762,10 @@ adj
fdg
hFT
hFT
hFT
tgz
wIf
tPH
tPH
cdC
xnl
lkG
qya

14
_maps/map_files/GaxStation/GaxStation.dmm
View File

@@ -13287,7 +13287,8 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"guX" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
/turf/open/floor/plasteel/showroomfloor,
@@ -20899,10 +20900,14 @@
pixel_y = 3
},
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/disabler{
/obj/item/gun/ballistic/automatic/pistol/ntusp{
pixel_x = 3;
pixel_y = -3
},
/obj/item/ammo_box/magazine/recharge/ntusp{
pixel_x = 9;
pixel_y = -7
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"kBk" = (
@@ -28702,9 +28707,6 @@
/turf/open/floor/plating,
/area/crew_quarters/heads/cmo)
"oqA" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
/obj/machinery/light{
dir = 8
},
@@ -28712,7 +28714,7 @@
name = "Station Intercom (General)";
pixel_x = -29
},
/obj/effect/landmark/xeno_spawn,
/obj/machinery/armaments_dispenser,
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"oqF" = (

9
_maps/map_files/YogStation/YogStation.dmm
View File

@@ -602,6 +602,7 @@
/obj/structure/reagent_dispensers/peppertank{
pixel_x = 30
},
/obj/machinery/armaments_dispenser,
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"acV" = (
@@ -56358,12 +56359,10 @@
/turf/open/floor/plasteel,
/area/engine/atmos_distro)
"tin" = (
/obj/item/radio/off,
/obj/structure/table,
/obj/structure/table,
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
},
/obj/machinery/armaments_dispenser,
/turf/open/floor/plasteel,
/area/security/checkpoint/auxiliary)
"tit" = (
@@ -60818,6 +60817,10 @@
/obj/item/crowbar,
/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/item/radio/off{
pixel_x = 9;
pixel_y = 1
},
/turf/open/floor/plasteel,
/area/security/checkpoint/auxiliary)
"vdm" = (

19
_maps/map_files/Yogsmeta/Yogsmeta.dmm
View File

@@ -5270,10 +5270,7 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"anu" = (
/obj/structure/table,
/obj/machinery/recharger{
pixel_y = 4
},
/obj/machinery/armaments_dispenser,
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"anw" = (
@@ -5714,6 +5711,14 @@
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/recharger/wallrecharger{
pixel_x = -22;
pixel_y = -8
},
/obj/machinery/recharger/wallrecharger{
pixel_x = -22;
pixel_y = 2
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"aoH" = (
@@ -16726,6 +16731,8 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/item/folder/red,
/obj/item/folder/red,
/turf/open/floor/plasteel,
/area/security/checkpoint/customs)
"aOm" = (
@@ -17316,9 +17323,6 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aPD" = (
/obj/structure/table/reinforced,
/obj/item/folder/red,
/obj/item/folder/red,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -17328,6 +17332,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/machinery/armaments_dispenser,
/turf/open/floor/plasteel,
/area/security/checkpoint/customs)
"aPE" = (