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

Merge pull request #16659 from Fox-McCloud/the-end-of-lethal-shot

Browse Source 
Nerfs Shotguns
This commit is contained in:
variableundefined
2021-09-19 11:25:02 -05:00
committed by GitHub
parent d4e3f807bb f6c31594b2
commit 5339cdf212
9 changed files with 32 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Delta/delta.dmm
-3
View File
@@ -96443,11 +96443,8 @@
pixel_x = -24
},
/obj/item/ammo_box/shotgun/rubbershot,
/obj/item/ammo_box/shotgun/buck,
/obj/item/storage/box/rubbershot,
/obj/item/storage/box/rubbershot,
/obj/item/storage/box/buck,
/obj/item/storage/box/buck,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
_maps/map_files/MetaStation/MetaStation.dmm
+7 -15
View File
@@ -2427,15 +2427,7 @@
/area/maintenance/auxsolarport)
"agY" = (
/obj/structure/rack,
/obj/item/storage/box/buck{
pixel_x = -3;
pixel_y = 3
},
/obj/item/storage/box/buck,
/obj/item/storage/box/buck{
pixel_x = 3;
pixel_y = -3
},
/obj/item/storage/box/tranquilizer,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -4258,10 +4250,10 @@
d2 = 8;
icon_state = "4-8"
},
/mob/living/simple_animal/hostile/retaliate/araneus,
/obj/structure/disposalpipe/segment{
dir = 4
},
/mob/living/simple_animal/hostile/retaliate/araneus,
/turf/simulated/floor/carpet,
/area/security/hos)
"akC" = (
@@ -9592,10 +9584,10 @@
name = "Port Maintenance"
})
"avY" = (
/mob/living/simple_animal/mouse,
/obj/structure/disposalpipe/segment{
dir = 4
},
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -17371,13 +17363,13 @@
})
"aMc" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/mouse,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/fore)
"aMd" = (
@@ -19889,11 +19881,11 @@
},
/area/security/brig)
"aRQ" = (
/mob/living/simple_animal/mouse,
/obj/machinery/atmospherics/binary/valve,
/obj/structure/disposalpipe/segment{
dir = 4
},
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -49461,8 +49453,8 @@
/turf/simulated/floor/plating,
/area/crew_quarters/hor)
"caZ" = (
/mob/living/simple_animal/mouse,
/obj/structure/disposalpipe/segment,
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cba" = (
@@ -62965,10 +62957,10 @@
/area/toxins/storage)
"cDO" = (
/obj/structure/bed/dogbed,
/mob/living/simple_animal/pet/cat/Runtime,
/obj/machinery/light_switch{
pixel_y = -25
},
/mob/living/simple_animal/pet/cat/Runtime,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
_maps/map_files/cyberiad/cyberiad.dmm
+15 -24
View File
@@ -1940,21 +1940,27 @@
},
/area/security/brig)
"agR" = (
/obj/structure/rack,
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/window/reinforced{
dir = 4
},
/obj/item/storage/box/buck{
/obj/structure/rack,
/obj/item/storage/box/beanbag{
pixel_x = -3;
pixel_y = 3
},
/obj/item/storage/box/buck,
/obj/item/storage/box/buck{
pixel_x = 3;
pixel_y = -3
/obj/item/storage/box/beanbag,
/obj/item/storage/box/beanbag{
pixel_x = -3;
pixel_y = 3
},
/obj/item/storage/box/beanbag{
pixel_x = -3;
pixel_y = 3
},
/obj/item/storage/box/beanbag,
/obj/item/storage/box/beanbag,
/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -2439,21 +2445,6 @@
dir = 1
},
/obj/structure/rack,
/obj/item/storage/box/beanbag{
pixel_x = -3;
pixel_y = 3
},
/obj/item/storage/box/beanbag,
/obj/item/storage/box/beanbag{
pixel_x = -3;
pixel_y = 3
},
/obj/item/storage/box/beanbag{
pixel_x = -3;
pixel_y = 3
},
/obj/item/storage/box/beanbag,
/obj/item/storage/box/beanbag,
/obj/item/storage/box/tranquilizer{
pixel_x = 3;
pixel_y = -3
_maps/map_files/generic/centcomm.dmm
+3 -3
View File
@@ -4013,9 +4013,9 @@
/area/syndicate_mothership)
"oB" = (
/obj/structure/closet/secure_closet/guncabinet,
/obj/item/ammo_box/shotgun/buck,
/obj/item/ammo_box/shotgun/buck,
/obj/item/ammo_box/shotgun/buck,
/obj/item/ammo_box/shotgun/beanbag,
/obj/item/ammo_box/shotgun/beanbag,
/obj/item/ammo_box/shotgun/beanbag,
/obj/item/gun/projectile/shotgun/automatic/combat,
/obj/item/gun/projectile/shotgun/automatic/combat,
/obj/item/gun/projectile/shotgun/automatic/combat,
_maps/map_files/shuttles/admin_armory.dmm
+6 -6
View File
@@ -565,11 +565,11 @@
layer = 2.9
},
/obj/structure/rack,
/obj/item/gun/projectile/shotgun/riot/buckshot{
/obj/item/gun/projectile/shotgun/riot{
pixel_x = -3;
pixel_y = 3
},
/obj/item/gun/projectile/shotgun/riot/buckshot,
/obj/item/gun/projectile/shotgun/riot,
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Gx" = (
@@ -705,11 +705,11 @@
layer = 2.9
},
/obj/structure/rack,
/obj/item/gun/projectile/shotgun/riot/buckshot{
/obj/item/gun/projectile/shotgun/riot{
pixel_x = -3;
pixel_y = 3
},
/obj/item/gun/projectile/shotgun/riot/buckshot,
/obj/item/gun/projectile/shotgun/riot,
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"Ns" = (
@@ -914,11 +914,11 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/item/gun/projectile/shotgun/riot/buckshot{
/obj/item/gun/projectile/shotgun/riot{
pixel_x = -3;
pixel_y = 3
},
/obj/item/gun/projectile/shotgun/riot/buckshot,
/obj/item/gun/projectile/shotgun/riot,
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
code/datums/supplypacks.dm
-22
View File
@@ -412,28 +412,6 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
cost = 80
containername = "combat shotgun crate"
/datum/supply_packs/security/armory/buckshotammo
name = "Buckshot Ammo Crate"
contains = list(/obj/item/ammo_box/shotgun/buck,
/obj/item/storage/box/buck,
/obj/item/storage/box/buck,
/obj/item/storage/box/buck,
/obj/item/storage/box/buck,
/obj/item/storage/box/buck)
cost = 45
containername = "buckshot ammo crate"
/datum/supply_packs/security/armory/slugammo
name = "Slug Ammo Crate"
contains = list(/obj/item/ammo_box/shotgun,
/obj/item/storage/box/slug,
/obj/item/storage/box/slug,
/obj/item/storage/box/slug,
/obj/item/storage/box/slug,
/obj/item/storage/box/slug)
cost = 45
containername = "slug ammo crate"
/datum/supply_packs/security/armory/expenergy
name = "Energy Guns Crate"
contains = list(/obj/item/gun/energy/gun,
code/modules/projectiles/ammunition/magazines.dm
+1 -4
View File
@@ -110,7 +110,7 @@
/obj/item/ammo_box/magazine/internal/shot/com
name = "combat shotgun internal magazine"
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
max_ammo = 6
/obj/item/ammo_box/magazine/internal/shot/dual
@@ -133,9 +133,6 @@
/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
-4
View File
@@ -204,10 +204,6 @@
..()
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
///////////////////////
// BOLT ACTION RIFLE //
///////////////////////
code/modules/research/designs/autolathe_designs.dm
-16
View File
@@ -703,22 +703,6 @@
build_path = /obj/item/weaponcrafting/receiver
category = list("hacked", "Security")
/datum/design/shotgun_slug
name = "Shotgun Slug"
id = "shotgun_slug"
build_type = AUTOLATHE
materials = list(MAT_METAL = 4000)
build_path = /obj/item/ammo_casing/shotgun
category = list("hacked", "Security")
/datum/design/buckshot_shell
name = "Buckshot shell"
id = "buckshot_shell"
build_type = AUTOLATHE
materials = list(MAT_METAL = 4000)
build_path = /obj/item/ammo_casing/shotgun/buckshot
category = list("hacked", "Security")
/datum/design/shotgun_dart
name = "Shotgun Dart"
id = "shotgun_dart"