Skip to content

Commit

Permalink
replace modular gunracks with upstream gunracks
Browse files Browse the repository at this point in the history
  • Loading branch information
Legendaxe committed Oct 3, 2024
1 parent 42b7458 commit 760ed92
Show file tree
Hide file tree
Showing 13 changed files with 103 additions and 209 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@
/turf/simulated/floor/mineral/titanium,
/area/ruin/space/powered)
"rs" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light_construct/directional/south,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -865,7 +865,7 @@
/turf/simulated/floor/mineral/plastitanium/red,
/area/ruin/space/powered)
"uk" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plating,
/area/ruin/space/powered)
Expand Down Expand Up @@ -1860,7 +1860,7 @@
/turf/simulated/floor/mineral/titanium/yellow,
/area/ruin/space/powered)
"LY" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/turf/simulated/floor/mineral/plastitanium/red,
/area/ruin/space/powered)
"Md" = (
Expand Down Expand Up @@ -1981,7 +1981,7 @@
/turf/simulated/floor/mineral/titanium,
/area/ruin/space/powered)
"Po" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/machinery/light/small/directional/north,
/turf/simulated/floor/plating,
/area/ruin/space/powered)
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files220/RandomZLevels/blackmarketpackers.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Armory)
"cc" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/projectile/shotgun/riot/short{
pixel_x = 6
},
Expand Down Expand Up @@ -4542,7 +4542,7 @@
/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/Buffer)
"wU" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/energy/laser{
pixel_x = -8
},
Expand Down
44 changes: 22 additions & 22 deletions _maps/map_files220/RandomZLevels/blackmesa.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/lambda_teleporter)
"btq" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/projectile/automatic/wt550,
/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9,
Expand Down Expand Up @@ -1077,7 +1077,7 @@
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/security_outpost)
"bwp" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/projectile/automatic/wt550,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/high_security_hallway)
Expand Down Expand Up @@ -1589,7 +1589,7 @@
/turf/simulated/floor/chasm/straight_down/lava_land_surface/normal_air/normal_temp,
/area/awaymission/black_mesa/entrance)
"bWq" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/projectile/revolver/nagant,
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/security_outpost)
Expand Down Expand Up @@ -2127,7 +2127,7 @@
},
/area/awaymission/black_mesa/science_internal)
"cED" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/projectile/automatic/pistol/enforcer/lethal,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/black_ops_armory)
Expand Down Expand Up @@ -2886,7 +2886,7 @@
},
/area/awaymission/black_mesa/security_outpost)
"dzf" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/projectile/automatic/wt550,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/security_outpost)
Expand Down Expand Up @@ -2976,7 +2976,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/entrance_lobby)
"dFZ" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/melee/classic_baton,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/black_ops_armory)
Expand Down Expand Up @@ -6449,7 +6449,7 @@
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/xen/lost_camp)
"hWM" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/ammo_box/shotgun/buck,
/turf/simulated/floor/plasteel/dark{
icon_state = "dark"
Expand Down Expand Up @@ -6872,7 +6872,7 @@
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/entrance_tunnel)
"iBg" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/ammo_box/n762,
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/security_outpost)
Expand Down Expand Up @@ -7228,7 +7228,7 @@
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/lambda_hallway)
"iVz" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/projectile/automatic/m90,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/hecu_zone_external_sec)
Expand Down Expand Up @@ -8312,7 +8312,7 @@
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/high_security_servers)
"kig" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/effect/decal/cleanable/dirt,
/obj/item/ammo_box/magazine/m556,
/obj/item/ammo_box/magazine/m556,
Expand Down Expand Up @@ -8555,7 +8555,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/black_ops_entrance)
"kuQ" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/ammo_box/magazine/m556,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/black_ops_armory)
Expand Down Expand Up @@ -10636,7 +10636,7 @@
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/hecu_zone_camp)
"mXr" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/projectile/automatic/pistol/enforcer/lethal,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/security_outpost)
Expand Down Expand Up @@ -11038,7 +11038,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/scientist_hall)
"ntU" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/projectile/automatic/wt550,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/black_ops_armory)
Expand Down Expand Up @@ -12914,7 +12914,7 @@
/area/awaymission/black_mesa/science_labs)
"pGt" = (
/obj/item/gun/projectile/automatic/m90,
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/xen/lost_camp)
"pHL" = (
Expand Down Expand Up @@ -16186,7 +16186,7 @@
/turf/simulated/floor/chasm/straight_down/lava_land_surface/normal_air/normal_temp,
/area/awaymission/black_mesa/lambda_teleporter)
"tJO" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/shield/riot,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/black_ops_armory)
Expand Down Expand Up @@ -16346,7 +16346,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/black_ops_science_room)
"tWO" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/energy/lwap,
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/xen/acid_lake_building)
Expand Down Expand Up @@ -16374,7 +16374,7 @@
},
/area/awaymission/black_mesa/entrance_lobby)
"tYo" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/ammo_box/magazine/enforcer/lethal,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/black_ops_armory)
Expand Down Expand Up @@ -17170,7 +17170,7 @@
},
/area/awaymission/black_mesa/high_security_hallway)
"uVv" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/projectile/shotgun/boltaction,
/turf/simulated/floor/wood,
/area/awaymission/black_mesa/employee_dorm_room)
Expand Down Expand Up @@ -18061,7 +18061,7 @@
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/hecu_zone_camp)
"wcw" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/projectile/automatic/wt550,
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
Expand Down Expand Up @@ -18547,7 +18547,7 @@
/turf/simulated/floor/plating/dirt/xen_dirt,
/area/awaymission/black_mesa/xen/vortigaunt_village)
"wJs" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/projectile/shotgun,
/obj/item/ammo_box/shotgun/buck,
/turf/simulated/floor/plasteel/smooth,
Expand Down Expand Up @@ -18849,7 +18849,7 @@
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/genetics_elevator)
"wZE" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/ammo_box/magazine/wt550m9,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/black_ops_armory)
Expand Down Expand Up @@ -18892,7 +18892,7 @@
/turf/simulated/floor/plasteel/dark,
/area/awaymission/black_mesa/xen/lost_camp)
"xaA" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/ammo_box/magazine/m556,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/hecu_zone_external_sec)
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files220/RandomZLevels/caves.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3498,7 +3498,7 @@
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaymission/caves)
"sn" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/energy/laser/retro,
/obj/item/gun/energy/laser/retro,
/obj/effect/spawner/random_spawners/dirt_often,
Expand Down Expand Up @@ -9585,7 +9585,7 @@
/turf/simulated/floor/engine/cult/lavaland_air,
/area/awaymission/caves)
"YS" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/energy/disabler,
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plasteel/dark{
Expand Down
16 changes: 8 additions & 8 deletions _maps/map_files220/RandomZLevels/gate_lizard.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1597,7 +1597,7 @@
/turf/simulated/floor/engine/cult,
/area/awaymission/jungle_planet/outside/cave)
"cdh" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/effect/decal/cleanable/cobweb,
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/wood/oak,
Expand Down Expand Up @@ -1714,7 +1714,7 @@
/turf/simulated/floor/plating,
/area/awaymission/jungle_planet/inside/complex)
"cmS" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/energy/laser/retro/old{
desc = "An older model of the basic lasergun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws.";
pixel_y = -9
Expand Down Expand Up @@ -3594,7 +3594,7 @@
/turf/simulated/floor/mineral/titanium/yellow,
/area/awaymission/jungle_planet/outside/abandoned)
"eKg" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "red"
Expand Down Expand Up @@ -8746,7 +8746,7 @@
},
/area/awaymission/jungle_planet/outside/cave)
"liw" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/fireaxe/boneaxe,
/obj/item/spear/bonespear,
/obj/item/scythe/bone,
Expand Down Expand Up @@ -9148,7 +9148,7 @@
/turf/simulated/floor/indestructible/grass,
/area/awaymission/jungle_planet/outside)
"lJw" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/energy/e_gun/old,
/obj/effect/landmark/damageturf,
/turf/simulated/floor/wood/oak,
Expand Down Expand Up @@ -9338,7 +9338,7 @@
/turf/simulated/floor/plating,
/area/awaymission/jungle_planet/outside/river)
"lWJ" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/turf/simulated/floor/wood/oak,
/area/awaymission/jungle_planet/outside/cave/pirate)
"lWL" = (
Expand Down Expand Up @@ -12487,7 +12487,7 @@
},
/area/awaymission/jungle_planet/outside/river)
"qeb" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/item/gun/projectile/bow,
/obj/effect/landmark/damageturf,
/turf/simulated/floor/wood/oak,
Expand Down Expand Up @@ -13421,7 +13421,7 @@
},
/area/awaymission/jungle_planet/inside/complex)
"rjA" = (
/obj/structure/rack/gunrack,
/obj/structure/gunrack,
/obj/structure/window/reinforced,
/obj/item/gun/energy/laser/retro/old{
desc = "An older model of the basic lasergun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
Expand Down
Loading

0 comments on commit 760ed92

Please sign in to comment.