cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 09:35:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MODULAR - BLOAT EDITION] The dauntless ammo locker now actually has the correct ammo types (#733)

Browse Source
This commit is contained in:
Waterpig
2023-11-19 19:11:09 +01:00
committed by GitHub
parent 93d00a5371
commit 0dfd804e17
4 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm
+1 -1
View File
@@ -2703,8 +2703,8 @@
/turf/open/floor/wood/tile,
/area/ruin/space/has_grav/bubbers/dauntless/service/diner)
"po" = (
/obj/structure/closet/secure_closet/interdynefob/munitions_locker,
/obj/structure/cable,
/obj/structure/closet/secure_closet/dauntless/munitions_locker,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/bubbers/dauntless/sec/armory)
"pq" = (
modular_zubbers/maps/offstation/dauntless/areas.dm
+1 -1
View File
@@ -8,7 +8,7 @@
// Cargo
/area/ruin/space/has_grav/bubbers/dauntless/cargo
name = "Dauntless Hangerbay"
name = "Dauntless Hangarbay"
// Engineering
modular_zubbers/maps/offstation/dauntless/security.dm
+18
View File
@@ -0,0 +1,18 @@
/obj/structure/closet/secure_closet/dauntless/munitions_locker
anchored = 1;
icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
icon_door = "riot"
icon_state = "riot"
name = "armory munitions locker"
/obj/structure/closet/secure_closet/dauntless/munitions_locker/PopulateContents()
..()
generate_items_inside(list(
/obj/item/ammo_box/magazine/m9mm = 6,
/obj/item/ammo_box/magazine/m9mm/fire = 2,
/obj/item/ammo_box/advanced/s12gauge/buckshot = 1,
/obj/item/ammo_box/advanced/s12gauge = 2,
/obj/item/ammo_box/advanced/s12gauge/rubber = 2,
/obj/item/ammo_box/magazine/sniper_rounds/soporific = 2,
), src)
tgstation.dme
+1
View File
@@ -8087,6 +8087,7 @@
#include "modular_zubbers\maps\offstation\dauntless\laws.dm"
#include "modular_zubbers\maps\offstation\dauntless\mob_spawns.dm"
#include "modular_zubbers\maps\offstation\dauntless\robot.dm"
#include "modular_zubbers\maps\offstation\dauntless\security.dm"
#include "modular_zubbers\master_files\code\modules\client\preferences\hypnopref.dm"
#include "modular_zubbers\master_files\code\modules\client\preferences\obscurity_examine.dm"
#include "modular_zubbers\master_files\code\modules\research\designs\biogenerator_designs.dm"