cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 16:13:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

shotguns come preloaded with buckshot now

Browse Source
This commit is contained in:
TDSSS
2020-08-27 14:49:52 +02:00
parent c9b076e957
commit ada7ddb605
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/shuttles/admin_armory.dmm
+15 -15
View File
@@ -804,16 +804,16 @@
},
/area/shuttle/administration)
"Gn" = (
/obj/item/gun/projectile/shotgun/riot{
pixel_x = -3;
pixel_y = 3
},
/obj/item/gun/projectile/shotgun/riot,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/obj/structure/rack,
/obj/item/gun/projectile/shotgun/riot/buckshot{
pixel_x = -3;
pixel_y = 3
},
/obj/item/gun/projectile/shotgun/riot/buckshot,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
@@ -1007,11 +1007,6 @@
},
/area/shuttle/administration)
"Ni" = (
/obj/item/gun/projectile/shotgun/riot{
pixel_x = -3;
pixel_y = 3
},
/obj/item/gun/projectile/shotgun/riot,
/obj/structure/window/reinforced{
dir = 8
},
@@ -1020,6 +1015,11 @@
layer = 2.9
},
/obj/structure/rack,
/obj/item/gun/projectile/shotgun/riot/buckshot{
pixel_x = -3;
pixel_y = 3
},
/obj/item/gun/projectile/shotgun/riot/buckshot,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
@@ -1291,11 +1291,6 @@
},
/area/shuttle/administration)
"XL" = (
/obj/item/gun/projectile/shotgun/riot{
pixel_x = -3;
pixel_y = 3
},
/obj/item/gun/projectile/shotgun/riot,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
@@ -1304,6 +1299,11 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/item/gun/projectile/shotgun/riot/buckshot{
pixel_x = -3;
pixel_y = 3
},
/obj/item/gun/projectile/shotgun/riot/buckshot,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
code/modules/projectiles/ammunition/magazines.dm
+3
View File
@@ -133,6 +133,9 @@
/obj/item/ammo_box/magazine/internal/shot/riot/short
max_ammo = 3
/obj/item/ammo_box/magazine/internal/shot/riot/buckshot
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
/obj/item/ammo_box/magazine/internal/grenadelauncher
name = "grenade launcher internal magazine"
ammo_type = /obj/item/ammo_casing/a40mm
code/modules/projectiles/guns/projectile/shotgun.dm
+2
View File
@@ -197,6 +197,8 @@
..()
post_sawoff()
/obj/item/gun/projectile/shotgun/riot/buckshot //comes pre-loaded with buckshot rather than rubber
mag_type = /obj/item/ammo_box/magazine/internal/shot/riot/buckshot
///////////////////////