Skip to content

replaces all the blueshield's guns/implant with a single energy gun #12137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SirNightKnight wants to merge 1 commit into
base: master
Choose a base branch
from
Open

replaces all the blueshield's guns/implant with a single energy gun #12137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions _maps/map_files/Blueshift/Blueshift.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17660,9 +17660,7 @@
/turf/open/floor/grass,
/area/station/service/hydroponics)
"drc" = (
/obj/effect/turf_decal/delivery/red,
/obj/structure/window/spawner/directional/north,
/obj/structure/closet/secure_closet/tac,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/blueshield)
"dri" = (
Expand Down Expand Up @@ -73976,12 +73974,6 @@
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/test_chambers)
"onv" = (
/obj/structure/rack/shelf,
/obj/effect/turf_decal/delivery/red,
/obj/item/clothing/suit/armor/riot,
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = 6
},
/obj/structure/sign/poster/official/carwo_grenade/directional/south,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/blueshield)
Expand Down
6 changes: 0 additions & 6 deletions _maps/map_files/BoxStation/BoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29763,11 +29763,6 @@
/area/station/maintenance/port)
"jEt" = (
/obj/machinery/light/small/directional/west,
/obj/structure/rack/shelf,
/obj/item/clothing/suit/armor/riot,
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = 6
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
"jEw" = (
Expand Down Expand Up @@ -46583,7 +46578,6 @@
/area/station/science/lab)
"oYJ" = (
/obj/machinery/keycard_auth/directional/east,
/obj/structure/closet/secure_closet/tac,
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
"oYQ" = (
Expand Down
6 changes: 0 additions & 6 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14449,10 +14449,6 @@
pixel_x = -4;
pixel_y = 10
},
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = 6
},
/obj/item/clothing/suit/armor/riot,
/obj/machinery/recharger{
pixel_x = 7;
pixel_y = 4
Expand Down Expand Up @@ -36706,8 +36702,6 @@
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/ce)
"iBS" = (
/obj/structure/closet/secure_closet/tac,
/obj/effect/turf_decal/box/red,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/blueshield)
"iBX" = (
Expand Down
1 change: 0 additions & 1 deletion _maps/map_files/Graveyard/Graveyard.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29214,7 +29214,6 @@
/turf/open/floor/carpet/blue,
/area/station/command/heads_quarters/cmo)
"luw" = (
/obj/structure/closet/secure_closet/tac,
/turf/open/floor/carpet/cyan,
/area/station/command/heads_quarters/blueshield)
"luA" = (
Expand Down
3 changes: 1 addition & 2 deletions _maps/map_files/Heliostation/Heliostation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26764,7 +26764,6 @@
/turf/open/floor/iron,
/area/station/maintenance/department/science/xenobiology)
"ddq" = (
/obj/structure/closet/secure_closet/tac,
/obj/effect/turf_decal/trimline/neutral/line{
dir = 1
},
Expand All @@ -26776,6 +26775,7 @@
req_one_access = list("nt_rep", "blueshield");
name = "privacy blinds"
},
/obj/structure/closet/secure_closet/blueshield,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/blueshield)
"ddr" = (
Expand Down Expand Up @@ -68338,7 +68338,6 @@
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
"sUY" = (
/obj/structure/closet/secure_closet/blueshield,
/obj/effect/turf_decal/trimline/neutral/line{
dir = 1
},
Expand Down
1 change: 0 additions & 1 deletion _maps/map_files/IceBoxStation/IceBoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13291,7 +13291,6 @@
"dVc" = (
/obj/machinery/light/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/closet/secure_closet/tac,
/turf/open/floor/carpet/cyan,
/area/station/command/heads_quarters/blueshield)
"dVj" = (
Expand Down
2 changes: 0 additions & 2 deletions _maps/map_files/KiloStation/KiloStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1341,9 +1341,7 @@
/obj/effect/turf_decal/siding/dark_blue{
dir = 8
},
/obj/structure/closet/secure_closet/tac,
/obj/structure/window/spawner/directional/north,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/blueshield)
"aqV" = (
Expand Down
1 change: 0 additions & 1 deletion _maps/map_files/MetaStation/MetaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65268,7 +65268,6 @@
/area/station/command/heads_quarters/captain/private)
"wBt" = (
/obj/structure/extinguisher_cabinet/directional/west,
/obj/structure/closet/secure_closet/tac,
/turf/open/floor/carpet/cyan,
/area/station/command/heads_quarters/blueshield)
"wBu" = (
Expand Down
6 changes: 0 additions & 6 deletions _maps/map_files/Oshan/Oshan.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25672,8 +25672,6 @@
},
/obj/effect/turf_decal/tile/neutral/full,
/obj/effect/turf_decal/tile/dark_blue/full,
/obj/machinery/ammo_workbench,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/blueshield)
"hUQ" = (
Expand Down Expand Up @@ -46069,8 +46067,6 @@
},
/obj/effect/turf_decal/tile/neutral/full,
/obj/effect/turf_decal/tile/dark_blue/full,
/obj/structure/closet/secure_closet/tac,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/blueshield)
"oiY" = (
Expand Down Expand Up @@ -72211,8 +72207,6 @@
},
/obj/effect/turf_decal/tile/neutral/full,
/obj/effect/turf_decal/tile/dark_blue/full,
/obj/machinery/dish_drive/bullet,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/blueshield)
"wgz" = (
Expand Down
7 changes: 1 addition & 6 deletions _maps/map_files/PubbyStation/PubbyStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54612,11 +54612,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
"xfZ" = (
/obj/structure/cable,
/obj/structure/closet/secure_closet/tac,
/turf/open/floor/wood,
/area/station/command/heads_quarters/blueshield)
"xga" = (
/obj/structure/sign/warning/electric_shock{
pixel_x = -31
Expand Down Expand Up @@ -89620,7 +89615,7 @@ aht
aht
aDa
sHc
xfZ
gLF
gLF
nPn
aAH
Expand Down
6 changes: 0 additions & 6 deletions _maps/map_files/Theseus/Theseus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46130,12 +46130,6 @@
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
"nvb" = (
/obj/structure/closet/secure_closet/tac,
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = 6;
pixel_x = 7
},
/obj/item/clothing/suit/armor/riot,
/obj/machinery/firealarm/directional/east,
/obj/machinery/camera/autoname/directional/east,
/obj/machinery/light_switch/directional/east{
Expand Down
2 changes: 0 additions & 2 deletions _maps/map_files/Voidraptor/VoidRaptor.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46498,11 +46498,9 @@
name = "command camera"
},
/obj/item/radio/intercom/directional/south,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/structure/closet/secure_closet/tac,
/turf/open/floor/iron/dark/textured_large,
/area/station/command/heads_quarters/blueshield)
"mYL" = (
Expand Down
32 changes: 13 additions & 19 deletions _maps/map_files/tramstation/tramstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28883,15 +28883,14 @@
/turf/open/floor/catwalk_floor,
/area/station/hallway/primary/tram/right)
"iay" = (
/obj/structure/rack/shelf,
/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = 6
},
/obj/item/clothing/suit/armor/riot,
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/camera/directional/south{
c_tag = "Command - Blueshield's Office"
},
/obj/structure/table/reinforced,
/obj/item/gun_maintenance_supplies{
pixel_x = -4;
pixel_y = 10
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/blueshield)
"iaA" = (
Expand Down Expand Up @@ -31932,12 +31931,16 @@
/turf/open/floor/iron/smooth,
/area/station/hallway/primary/tram/right)
"iUN" = (
/obj/machinery/light/directional/south,
/obj/structure/table/reinforced,
/obj/item/gun_maintenance_supplies{
pixel_x = -4;
pixel_y = 10
/obj/machinery/recharger{
pixel_y = 5;
pixel_x = 7
},
/obj/machinery/recharger{
pixel_y = 5;
pixel_x = -6
},
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/blueshield)
"iUY" = (
Expand Down Expand Up @@ -33700,15 +33703,6 @@
/turf/open/floor/catwalk_floor,
/area/station/maintenance/department/eva)
"jwR" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger{
pixel_y = 5;
pixel_x = 7
},
/obj/machinery/recharger{
pixel_y = 5;
pixel_x = -6
},
/obj/structure/reagent_dispensers/wall/peppertank/directional/south,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/blueshield)
Expand Down
37 changes: 28 additions & 9 deletions code/game/objects/structures/crates_lockers/closets/secure/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,31 @@
new /obj/item/circuitboard/machine/techfab/department/service(src)
new /obj/item/storage/photo_album/hop(src)
new /obj/item/storage/lockbox/medal/hop(src)
new /obj/item/clothing/suit/space/hardsuit/hop(src) //monkestation addition
new /obj/item/clothing/suit/space/hardsuit/hop(src)

/obj/structure/closet/secure_closet/hop/populate_contents_immediate()
. = ..()
new /obj/item/gun/energy/e_gun(src)

/obj/structure/closet/secure_closet/blueshield
name = "blueshield's locker"
icon_state = "bs"
icon = 'monkestation/code/modules/blueshift/icons/obj/closet.dmi'
req_access = list(ACCESS_BLUESHIELD)

/obj/structure/closet/secure_closet/blueshield/New()
..()
new /obj/item/storage/briefcase/secure(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/storage/medkit/frontier/stocked(src)
new /obj/item/storage/bag/garment/blueshield(src)
new /obj/item/sensor_device/command(src)
new /obj/item/storage/photo_album/blueshield(src)

/obj/structure/closet/secure_closet/blueshield/populate_contents_immediate()
. = ..()
new /obj/item/gun/energy/e_gun(src)

@JohnFulpWillard JohnFulpWillard Jul 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a theft objective to be in immediate?

@SirNightKnight SirNightKnight Jul 11, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

other e guns are immediate spawn too so dunno, it was added in the spy theft pr

@Mantlecrawler Mantlecrawler Jul 12, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eguns are a bounty item for spies yeah


/obj/structure/closet/secure_closet/hos
name = "head of security's locker"
icon_state = "hos"
Expand All @@ -77,13 +96,13 @@
new /obj/item/storage/belt/security/full(src)
new /obj/item/circuitboard/machine/techfab/department/security(src)
new /obj/item/storage/photo_album/hos(src)
new /obj/item/bodycam_upgrade(src) //monkestation edit: Security Liability Act
new /obj/item/bodycam_upgrade(src)

/obj/structure/closet/secure_closet/hos/populate_contents_immediate()
. = ..()

// Traitor steal objectives
new /obj/item/choice_beacon/hos(src) //monkestation edit
new /obj/item/choice_beacon/hos(src)
new /obj/item/pinpointer/nuke(src)

/obj/structure/closet/secure_closet/warden
Expand All @@ -102,7 +121,7 @@
new /obj/item/storage/belt/security/full(src)
new /obj/item/flashlight/seclite(src)
new /obj/item/door_remote/head_of_security(src)
new /obj/item/storage/box/bodycamera(src) //monkestation edit: Security Liability Act
new /obj/item/storage/box/bodycamera(src)
new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src) //undoing ancient removal
new /obj/item/ammo_box/advanced/s12gauge/rubber(src) //he can have some rubber ammo too
new /obj/item/megaphone/sec(src)
Expand All @@ -122,8 +141,8 @@
new /obj/item/radio/headset/headset_sec/alt(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/flashlight/seclite(src)
new /obj/item/clothing/mask/balaclava(src) //monkestation edit
new /obj/item/bodycam_upgrade(src) //monkestation edit: Security Liability Act
new /obj/item/clothing/mask/balaclava(src)
new /obj/item/bodycam_upgrade(src)

/obj/structure/closet/secure_closet/security/sec

Expand Down Expand Up @@ -179,13 +198,13 @@
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/clothing/suit/armor/vest/det_suit(src)
new /obj/item/storage/belt/holster/detective/full(src)
new /obj/item/storage/belt/holster/detective/full(src) // Monkestation edit : Adding some substance to the detective role
new /obj/item/storage/belt/holster/detective/full(src)
new /obj/item/pinpointer/crew(src)
new /obj/item/binoculars(src)
new /obj/item/storage/box/rxglasses/spyglasskit(src)
new /obj/item/clothing/head/fedora/inspector_hat(src)
new /obj/item/card/id/advanced/undercover(src) // Monkestation edit : Adding some substance to the detective role
new /obj/item/bodycam_upgrade(src) //monkestation edit: Security Liability Act
new /obj/item/card/id/advanced/undercover(src)
new /obj/item/bodycam_upgrade(src)

/obj/structure/closet/secure_closet/injection
name = "lethal injections locker"
Expand Down
5 changes: 0 additions & 5 deletions code/modules/projectiles/ammunition/energy/laser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
e_cost = LASER_SHOTS(10, STANDARD_CELL_CHARGE)
select_name = "maim"

/obj/item/ammo_casing/energy/laser/hellfire/blueshield
projectile_type = /obj/projectile/beam/laser/hellfire
e_cost = LASER_SHOTS(13, STANDARD_CELL_CHARGE)
select_name = "maim"

/obj/item/ammo_casing/energy/lasergun
projectile_type = /obj/projectile/beam/laser
e_cost = LASER_SHOTS(16, STANDARD_CELL_CHARGE)
Expand Down
5 changes: 0 additions & 5 deletions code/modules/projectiles/guns/energy/laser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,6 @@
icon_state = "hellgun"
ammo_type = list(/obj/item/ammo_casing/energy/laser/hellfire)

/obj/item/gun/energy/laser/hellgun/blueshield
name ="modified hellfire laser gun"
desc = "A lightly overtuned version of NT's Hellfire Laser rifle, scratches showing its age and the fact it has definitely been owned before. This one is more energy efficient without sacrificing damage."
ammo_type = list(/obj/item/ammo_casing/energy/laser/hellfire/blueshield)

/obj/item/gun/energy/laser/captain
name = "antique laser gun"
icon_state = "caplaser"
Expand Down
14 changes: 0 additions & 14 deletions monkestation/code/game/objects/structures/crates_lockers/closets/secure/blueshield.dm
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions monkestation/code/modules/blueshield/gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
//Weapon beacon
/obj/item/choice_beacon/blueshield
name = "armament beacon"
desc = "A single use beacon to deliver a gunset of your choice. Please only call this in your office"
company_source = "Sol Defense Contracting"
company_message = span_bold("Supply Pod incoming, please stand by.")

/obj/item/choice_beacon/blueshield/generate_display_names()
var/static/list/selectable_gun_types = list(
"Unmarked Takbok Revolver Gunset" = /obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/takbok/blueshield,
"Custom Hellfire Laser Rifle" = /obj/item/gun/energy/laser/hellgun/blueshield,
"Bogseo Submachinegun Gunset" = /obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case/bogseo,
"Tech-9" = /obj/item/storage/toolbox/guncase/skyrat/pistol/tech_9,
"S.A.Y.A. Arm Defense System Cyberset" = /obj/item/storage/box/shield_blades,
)

return selectable_gun_types

// Gunset for the custom Takbok Revolver
/obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/takbok/blueshield
name = "Unmarked 'Takbok' gunset"
Expand Down
Loading
Loading