mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 00:21:11 +01:00
Deck 3 Security Mapping Oversights Fixes (#15080)
This commit is contained in:
SleepyGemmy
+1
-1
@@ -2713,7 +2713,7 @@
|
||||
#include "code\modules\projectiles\guns\energy\blaster.dm"
|
||||
#include "code\modules\projectiles\guns\energy\crank.dm"
|
||||
#include "code\modules\projectiles\guns\energy\cult.dm"
|
||||
#include "code\modules\projectiles\guns\energy\disrupter.dm"
|
||||
#include "code\modules\projectiles\guns\energy\disruptor.dm"
|
||||
#include "code\modules\projectiles\guns\energy\freezeray.dm"
|
||||
#include "code\modules\projectiles\guns\energy\laser.dm"
|
||||
#include "code\modules\projectiles\guns\energy\lawgiver.dm"
|
||||
|
||||
@@ -309,7 +309,8 @@
|
||||
/obj/structure/closet/secure_closet/brig
|
||||
name = "brig locker"
|
||||
req_access = list(access_brig)
|
||||
anchored = 1
|
||||
anchored = TRUE
|
||||
canbemoved = TRUE
|
||||
var/id = null
|
||||
|
||||
/obj/structure/closet/secure_closet/brig/Initialize()
|
||||
@@ -357,3 +358,17 @@
|
||||
new /obj/item/device/radio/headset/headset_com/alt(src)
|
||||
new /obj/item/device/radio/off(src)
|
||||
new /obj/item/device/gps(src)
|
||||
|
||||
// Evidence Storage Locker
|
||||
/obj/structure/closet/secure_closet/evidence
|
||||
name = "evidence storage locker"
|
||||
anchored = TRUE
|
||||
canbemoved = TRUE
|
||||
req_one_access = list(access_brig, access_armory, access_forensics_lockers, access_detective)
|
||||
|
||||
// Contraband Storage Locker
|
||||
/obj/structure/closet/secure_closet/contraband
|
||||
name = "contraband weapons and ammunition storage locker"
|
||||
anchored = TRUE
|
||||
canbemoved = TRUE
|
||||
req_access = list(access_armory)
|
||||
@@ -107,6 +107,7 @@
|
||||
|
||||
/obj/item/ammo_magazine/c45m/practice
|
||||
name = "magazine (.45 practice)"
|
||||
icon_state = "45_practice"
|
||||
ammo_type = /obj/item/ammo_casing/c45/practice
|
||||
|
||||
/obj/item/ammo_magazine/c45m/flash
|
||||
@@ -326,6 +327,7 @@
|
||||
|
||||
/obj/item/ammo_magazine/a556/carbine/practice
|
||||
name = "carbine magazine (5.56mm practice)"
|
||||
icon_state = "5.56c_practice"
|
||||
ammo_type = /obj/item/ammo_casing/a556/practice
|
||||
|
||||
/obj/item/ammo_magazine/a556/carbine/ap
|
||||
|
||||
@@ -548,15 +548,15 @@
|
||||
var/mob/living/carbon/human/M = user
|
||||
|
||||
mouthshoot = TRUE
|
||||
M.visible_message(SPAN_WARNING("\The [user] sticks their gun in their mouth, ready to pull the trigger..."))
|
||||
M.visible_message(SPAN_DANGER("\The [user] sticks \the [src] in their mouth, their finger ready to pull the trigger..."))
|
||||
if(!do_after(user, 40))
|
||||
M.visible_message(SPAN_NOTICE("\The [user] decided life was worth living"))
|
||||
M.visible_message(SPAN_GOOD("\The [user] takes \the [src] out of their mouth."))
|
||||
mouthshoot = FALSE
|
||||
return
|
||||
var/obj/item/projectile/in_chamber = consume_next_projectile()
|
||||
if (istype(in_chamber))
|
||||
user.visible_message(SPAN_WARNING("\The [user] pulls the trigger."))
|
||||
if (!pin && needspin)//Checks the pin of the gun.
|
||||
if(istype(in_chamber))
|
||||
user.visible_message(SPAN_DANGER("\The [user] pulls the trigger."))
|
||||
if (!pin && needspin) // Checks the pin of the gun.
|
||||
handle_click_empty(user)
|
||||
mouthshoot = FALSE
|
||||
return
|
||||
@@ -565,7 +565,6 @@
|
||||
mouthshoot = FALSE
|
||||
return
|
||||
if(safety() && user.a_intent != I_HURT)
|
||||
user.visible_message(SPAN_WARNING("The safety was on. How anticlimatic!"))
|
||||
handle_click_empty(user)
|
||||
mouthshoot = FALSE
|
||||
return
|
||||
@@ -576,16 +575,15 @@
|
||||
|
||||
in_chamber.on_hit(M)
|
||||
|
||||
if (in_chamber.damage == 0)
|
||||
if(in_chamber.damage == 0)
|
||||
user.show_message(SPAN_WARNING("You feel rather silly, trying to commit suicide with a toy."))
|
||||
mouthshoot = FALSE
|
||||
return
|
||||
else if (in_chamber.damage_type == PAIN)
|
||||
to_chat(user, SPAN_NOTICE("Ow..."))
|
||||
user.apply_effect(110,PAIN,0)
|
||||
else if(in_chamber.damage_type == PAIN)
|
||||
user.apply_damage(in_chamber.damage * 2, PAIN, BP_HEAD)
|
||||
else
|
||||
log_and_message_admins("[key_name(user)] commited suicide using \a [src]")
|
||||
user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, BP_HEAD, used_weapon = "Point blank shot in the mouth with \a [in_chamber]", damage_flags = DAM_SHARP)
|
||||
log_and_message_admins("[key_name(user)] commited suicide using \a [src].")
|
||||
user.apply_damage(in_chamber.damage * 20, in_chamber.damage_type, BP_HEAD, used_weapon = "Point blank shot in the mouth with \a [in_chamber]", damage_flags = DAM_SHARP)
|
||||
user.death()
|
||||
|
||||
handle_post_fire(user, user, FALSE, FALSE, FALSE)
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
pixel_offset_y = 18
|
||||
|
||||
/obj/item/gun/bang/sec
|
||||
name = ".45 pistol"
|
||||
name = "\improper .45 pistol"
|
||||
desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. Uses .45 rounds."
|
||||
desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
|
||||
icon = 'icons/obj/guns/secgun.dmi'
|
||||
@@ -21,9 +21,9 @@
|
||||
name = ".45 signal pistol"
|
||||
|
||||
/obj/item/gun/bang/sec/wood
|
||||
name = "custom .45 pistol"
|
||||
desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip. Uses .45 rounds."
|
||||
desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a wooden grip. It uses .45 rounds."
|
||||
name = "custom .45 Pistol"
|
||||
icon = 'icons/obj/guns/secgun_wood.dmi'
|
||||
icon_state = "secgunwood"
|
||||
item_state = "secgunwood"
|
||||
|
||||
+12
-4
@@ -1,5 +1,3 @@
|
||||
|
||||
|
||||
/obj/item/gun/energy/disruptorpistol
|
||||
name = "disruptor pistol"
|
||||
desc = "A NanoTrasen designed blaster pistol with two settings: stun and lethal."
|
||||
@@ -14,7 +12,7 @@
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 2000)
|
||||
projectile_type = /obj/item/projectile/energy/disruptorstun
|
||||
secondary_projectile_type = /obj/item/projectile/energy/blaster
|
||||
secondary_projectile_type = /obj/item/projectile/energy/blaster/disruptor
|
||||
max_shots = 10
|
||||
charge_cost = 150
|
||||
accuracy = 1
|
||||
@@ -24,10 +22,20 @@
|
||||
firemodes = list(
|
||||
list(mode_name="stun", projectile_type=/obj/item/projectile/energy/disruptorstun, modifystate="disruptorpistolstun", fire_sound = 'sound/weapons/gunshot/bolter.ogg'),
|
||||
list(mode_name="lethal", projectile_type=/obj/item/projectile/energy/blaster/disruptor, modifystate="disruptorpistolkill", recoil = 1, fire_sound = 'sound/weapons/gunshot/bolter.ogg')
|
||||
)
|
||||
)
|
||||
required_firemode_auth = list(WIRELESS_PIN_STUN, WIRELESS_PIN_LETHAL)
|
||||
var/selectframecheck = FALSE
|
||||
|
||||
/obj/item/gun/energy/disruptorpistol/practice
|
||||
name = "practice disruptor pistol"
|
||||
desc = "A variant of the NT DP-7. It fires less concentrated energy bolts that are visible, but ultimately harmless, designed for target practice."
|
||||
projectile_type = /obj/item/projectile/energy/disruptorstun/practice
|
||||
secondary_projectile_type = /obj/item/projectile/energy/blaster/disruptor/practice
|
||||
firemodes = list(
|
||||
list(mode_name="stun (practice)", projectile_type=/obj/item/projectile/energy/disruptorstun/practice, modifystate="disruptorpistolstun", fire_sound = 'sound/weapons/gunshot/bolter.ogg'),
|
||||
list(mode_name="lethal (practice)", projectile_type=/obj/item/projectile/energy/blaster/disruptor/practice, modifystate="disruptorpistolkill", recoil = 1, fire_sound = 'sound/weapons/gunshot/bolter.ogg')
|
||||
)
|
||||
|
||||
/obj/item/gun/energy/disruptorpistol/security
|
||||
pin = /obj/item/device/firing_pin/wireless
|
||||
|
||||
@@ -60,6 +60,11 @@
|
||||
firemodes = list()
|
||||
modifystate = null
|
||||
|
||||
/obj/item/gun/energy/rifle/laser/practice
|
||||
name = "practice laser rifle"
|
||||
desc = "A modified version of the NT LR-6. It fires less concentrated laser beams that are visible, but ultimately harmless, designed for target practice."
|
||||
projectile_type = /obj/item/projectile/beam/practice
|
||||
|
||||
/obj/item/gun/energy/rifle/laser/noctiluca
|
||||
name = "combat laser rifle"
|
||||
desc = "The Noctiluca XM/24 is a brand new model of laser rifle, developed entirely by Kumar Arms, a Zavodskoi Interstellar subsidiary. Easy to handle for users with minimal training, reliable and with a reasonable form factor, it is poised to become the new standard for laser weaponry."
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
icon_state = "coltauto-e"
|
||||
|
||||
/obj/item/gun/projectile/sec
|
||||
name = ".45 pistol"
|
||||
name = "\improper .45 pistol"
|
||||
desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. Uses .45 rounds."
|
||||
desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
|
||||
icon = 'icons/obj/guns/secgun.dmi'
|
||||
@@ -118,9 +118,9 @@
|
||||
magazine_type = /obj/item/ammo_magazine/c45m/flash
|
||||
|
||||
/obj/item/gun/projectile/sec/wood
|
||||
name = "custom .45 pistol"
|
||||
desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip. Uses .45 rounds."
|
||||
desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a faux wooden grip. It uses .45 rounds."
|
||||
name = "custom .45 Pistol"
|
||||
icon = 'icons/obj/guns/secgun_wood.dmi'
|
||||
icon_state = "secgunwood"
|
||||
item_state = "secgunwood"
|
||||
|
||||
@@ -19,13 +19,9 @@
|
||||
|
||||
/obj/item/projectile/beam/practice
|
||||
name = "laser"
|
||||
icon_state = "laser"
|
||||
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSRAILING
|
||||
damage = 0
|
||||
damage_type = BURN
|
||||
no_attack_log = 1
|
||||
check_armor = "laser"
|
||||
eyeblur = 2
|
||||
damage = 5
|
||||
damage_type = PAIN
|
||||
eyeblur = 0
|
||||
|
||||
/obj/item/projectile/beam/pistol
|
||||
damage = 25
|
||||
|
||||
@@ -184,6 +184,11 @@
|
||||
damage = 20
|
||||
pass_flags = PASSTABLE | PASSRAILING
|
||||
|
||||
/obj/item/projectile/energy/blaster/disruptor/practice
|
||||
damage = 5
|
||||
damage_type = PAIN
|
||||
eyeblur = 0
|
||||
|
||||
/obj/item/projectile/energy/disruptorstun
|
||||
name = "disruptor bolt"
|
||||
icon_state = "blue_laser"
|
||||
@@ -195,6 +200,11 @@
|
||||
pass_flags = PASSTABLE | PASSRAILING
|
||||
muzzle_type = /obj/effect/projectile/muzzle/bolt
|
||||
|
||||
/obj/item/projectile/energy/disruptorstun/practice
|
||||
damage = 5
|
||||
damage_type = PAIN
|
||||
eyeblur = 0
|
||||
|
||||
/obj/item/projectile/energy/blaster/heavy
|
||||
damage = 35
|
||||
armor_penetration = 10
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
author: SleepyGemmy
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- bugfix: "Fixes some mapping oversights on deck 3."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 36 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 998 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.0 KiB |
@@ -18810,6 +18810,10 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark/full,
|
||||
/area/engineering/lobby)
|
||||
"jnh" = (
|
||||
/obj/structure/closet/secure_closet/contraband,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/security/armory)
|
||||
"jno" = (
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "2-8"
|
||||
@@ -77320,7 +77324,7 @@ noZ
|
||||
rKv
|
||||
oiD
|
||||
noZ
|
||||
noZ
|
||||
jnh
|
||||
vaj
|
||||
dYr
|
||||
bIi
|
||||
|
||||
@@ -1015,6 +1015,8 @@
|
||||
/obj/effect/floor_decal/corner/blue{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/disposal/small/east,
|
||||
/obj/structure/disposalpipe/trunk,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/security/investigations)
|
||||
"aOF" = (
|
||||
@@ -2568,7 +2570,7 @@
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/turf/simulated/floor/tiled/full,
|
||||
/area/security/investigations)
|
||||
/area/maintenance/security_starboard)
|
||||
"cfB" = (
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "0-8"
|
||||
@@ -2878,6 +2880,10 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 8;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/security/investigations)
|
||||
"cAK" = (
|
||||
@@ -3607,6 +3613,9 @@
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/green/full{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/hallway/deck_three/primary/central)
|
||||
"dhj" = (
|
||||
@@ -3771,7 +3780,8 @@
|
||||
/area/horizon/crew_quarters/cryo/dormitories)
|
||||
"dnw" = (
|
||||
/obj/structure/morgue{
|
||||
dir = 2
|
||||
dir = 2;
|
||||
name = "investigations morgue B"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue/full{
|
||||
dir = 8
|
||||
@@ -4465,6 +4475,9 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/full,
|
||||
/area/security/investigations)
|
||||
"dUB" = (
|
||||
@@ -4915,6 +4928,9 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/security/investigations)
|
||||
"emK" = (
|
||||
@@ -5622,15 +5638,25 @@
|
||||
"eSk" = (
|
||||
/obj/machinery/light,
|
||||
/obj/machinery/computer/ship/navigation{
|
||||
dir = 1;
|
||||
density = 0;
|
||||
pixel_y = -32
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue{
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/hallway/deck_three/primary/central)
|
||||
"eTq" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/green/full{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/hallway/deck_three/primary/central)
|
||||
"eUd" = (
|
||||
/obj/machinery/door/airlock/multi_tile/glass{
|
||||
name = "Cryogenic Storage"
|
||||
@@ -6053,7 +6079,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/security/investigations)
|
||||
/area/maintenance/security_starboard)
|
||||
"fhs" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/bed/stool/chair/padded/brown{
|
||||
@@ -6222,6 +6248,9 @@
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/captain)
|
||||
"fll" = (
|
||||
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
|
||||
/area/maintenance/security_starboard)
|
||||
"fmg" = (
|
||||
/obj/effect/floor_decal/corner/blue{
|
||||
dir = 9
|
||||
@@ -7242,6 +7271,9 @@
|
||||
/obj/machinery/vending/cigarette,
|
||||
/turf/simulated/floor/tiled/dark/full,
|
||||
/area/horizon/deck_three/cafeteria)
|
||||
"fXr" = (
|
||||
/turf/simulated/wall,
|
||||
/area/maintenance/security_starboard)
|
||||
"fXt" = (
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "1-2"
|
||||
@@ -8032,14 +8064,14 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/hallway/deck_three/primary/port)
|
||||
"gGN" = (
|
||||
/obj/structure/closet{
|
||||
name = "Evidence Closet"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue/full,
|
||||
/obj/effect/floor_decal/industrial/outline/grey,
|
||||
/obj/machinery/light/small{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/closet/secure_closet/evidence{
|
||||
name = "evidence storage locker C"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/security/investigations_storage)
|
||||
"gHo" = (
|
||||
@@ -9143,13 +9175,13 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/hallway/deck_three/primary/starboard/docks)
|
||||
"huD" = (
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 2;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/crew_armoury/foyer)
|
||||
"hvK" = (
|
||||
@@ -9273,7 +9305,6 @@
|
||||
req_access = null;
|
||||
req_one_access = list(4,68)
|
||||
},
|
||||
/obj/structure/plasticflaps/airtight,
|
||||
/obj/machinery/door/firedoor,
|
||||
/turf/simulated/floor/tiled/full,
|
||||
/area/security/investigations_storage)
|
||||
@@ -10492,20 +10523,48 @@
|
||||
name = "Weaponry (Practice Ammunition)";
|
||||
req_access = list(1)
|
||||
},
|
||||
/obj/item/ammo_magazine/c45m/practice,
|
||||
/obj/item/ammo_magazine/c45m/practice,
|
||||
/obj/item/ammo_magazine/c45m/practice,
|
||||
/obj/effect/floor_decal/industrial/outline/security,
|
||||
/obj/item/ammo_magazine/c45m/practice,
|
||||
/obj/item/ammo_magazine/c45m/practice,
|
||||
/obj/item/ammo_magazine/c45m/practice,
|
||||
/obj/item/storage/box/practiceshells,
|
||||
/obj/item/storage/box/practiceshells,
|
||||
/obj/item/storage/box/practiceshells,
|
||||
/obj/item/device/radio/intercom{
|
||||
dir = 4;
|
||||
pixel_x = -24
|
||||
},
|
||||
/obj/item/storage/box/practiceshells,
|
||||
/obj/item/storage/box/practiceshells,
|
||||
/obj/item/storage/box/practiceshells,
|
||||
/obj/item/ammo_magazine/c45m/practice{
|
||||
pixel_x = 4
|
||||
},
|
||||
/obj/item/ammo_magazine/c45m/practice{
|
||||
pixel_x = -4
|
||||
},
|
||||
/obj/item/ammo_magazine/c45m/practice{
|
||||
pixel_x = -4
|
||||
},
|
||||
/obj/item/ammo_magazine/c45m/practice{
|
||||
pixel_x = -4
|
||||
},
|
||||
/obj/item/ammo_magazine/c45m/practice{
|
||||
pixel_x = 4
|
||||
},
|
||||
/obj/item/ammo_magazine/c45m/practice{
|
||||
pixel_x = 4
|
||||
},
|
||||
/obj/item/ammo_magazine/a556/carbine/practice{
|
||||
pixel_y = 9;
|
||||
pixel_x = -5
|
||||
},
|
||||
/obj/item/ammo_magazine/a556/carbine/practice{
|
||||
pixel_y = 9;
|
||||
pixel_x = 7
|
||||
},
|
||||
/obj/item/ammo_magazine/a556/carbine/practice{
|
||||
pixel_y = 9;
|
||||
pixel_x = -5
|
||||
},
|
||||
/obj/item/ammo_magazine/a556/carbine/practice{
|
||||
pixel_y = 9;
|
||||
pixel_x = 7
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/security/investigations)
|
||||
"iEo" = (
|
||||
@@ -12064,7 +12123,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/security/investigations)
|
||||
/area/maintenance/security_starboard)
|
||||
"jUp" = (
|
||||
/obj/effect/floor_decal/industrial/outline/grey,
|
||||
/obj/structure/bed/stool/padded/black,
|
||||
@@ -14763,12 +14822,13 @@
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/green{
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/disposalpipe/junction{
|
||||
dir = 4;
|
||||
icon_state = "pipe-j2"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/crew_armoury/foyer)
|
||||
"lSX" = (
|
||||
@@ -15519,7 +15579,7 @@
|
||||
},
|
||||
/obj/structure/lattice/catwalk/indoor/grate,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/security/investigations)
|
||||
/area/maintenance/security_starboard)
|
||||
"mtE" = (
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "1-2"
|
||||
@@ -15539,6 +15599,9 @@
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/template_noop)
|
||||
"muG" = (
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/maintenance/security_starboard)
|
||||
"muO" = (
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
dir = 6
|
||||
@@ -15812,7 +15875,7 @@
|
||||
/obj/structure/reagent_dispensers/extinguisher,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/security/investigations)
|
||||
/area/maintenance/security_starboard)
|
||||
"mOc" = (
|
||||
/obj/machinery/door/airlock/glass{
|
||||
name = "Deck 3 Port Docks"
|
||||
@@ -17242,13 +17305,13 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/horizon/crew_quarters/fitness/hallway)
|
||||
"nWA" = (
|
||||
/obj/structure/closet{
|
||||
name = "Evidence Closet"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue{
|
||||
dir = 10
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/outline/grey,
|
||||
/obj/structure/closet/secure_closet/evidence{
|
||||
name = "evidence storage locker B"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/security/investigations_storage)
|
||||
"nXf" = (
|
||||
@@ -17396,7 +17459,10 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/disposalpipe/junction{
|
||||
dir = 2;
|
||||
icon_state = "pipe-j2"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/security/investigations)
|
||||
"oez" = (
|
||||
@@ -18352,7 +18418,7 @@
|
||||
},
|
||||
/obj/structure/lattice/catwalk/indoor/grate,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/security/investigations)
|
||||
/area/maintenance/security_starboard)
|
||||
"oLM" = (
|
||||
/obj/machinery/firealarm/south,
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
@@ -19247,7 +19313,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
|
||||
/turf/simulated/floor/tiled/full,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/hallway/deck_three/primary/port)
|
||||
"pAt" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
@@ -20183,6 +20249,7 @@
|
||||
/obj/machinery/newscaster{
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/crew_armoury/foyer)
|
||||
"qol" = (
|
||||
@@ -20448,15 +20515,26 @@
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/outline/security,
|
||||
/obj/item/gun/energy/laser/practice,
|
||||
/obj/item/gun/energy/laser/practice,
|
||||
/obj/item/gun/energy/laser/practice,
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/sign/nosmoking_2{
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/item/gun/energy/disruptorpistol/practice{
|
||||
pixel_y = -4
|
||||
},
|
||||
/obj/item/gun/energy/disruptorpistol/practice,
|
||||
/obj/item/gun/energy/disruptorpistol/practice{
|
||||
pixel_y = 4
|
||||
},
|
||||
/obj/item/gun/energy/rifle/laser/practice{
|
||||
pixel_y = -4
|
||||
},
|
||||
/obj/item/gun/energy/rifle/laser/practice,
|
||||
/obj/item/gun/energy/rifle/laser/practice{
|
||||
pixel_y = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/security/investigations)
|
||||
"qzn" = (
|
||||
@@ -20486,7 +20564,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/security/investigations)
|
||||
/area/maintenance/security_starboard)
|
||||
"qBz" = (
|
||||
/obj/effect/floor_decal/corner/green{
|
||||
dir = 9
|
||||
@@ -20602,7 +20680,8 @@
|
||||
/area/maintenance/bridge)
|
||||
"qIl" = (
|
||||
/obj/structure/morgue{
|
||||
dir = 2
|
||||
dir = 2;
|
||||
name = "investigations morgue A"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/blue{
|
||||
dir = 5
|
||||
@@ -22066,7 +22145,7 @@
|
||||
/obj/item/material/shard,
|
||||
/obj/structure/lattice/catwalk/indoor/grate,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/security/investigations)
|
||||
/area/maintenance/security_starboard)
|
||||
"rRk" = (
|
||||
/obj/effect/floor_decal/corner/paleblue{
|
||||
dir = 10
|
||||
@@ -22383,6 +22462,16 @@
|
||||
},
|
||||
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
|
||||
/area/horizon/crew_quarters/fitness/pool)
|
||||
"scO" = (
|
||||
/obj/effect/floor_decal/corner/blue{
|
||||
dir = 10
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/outline/grey,
|
||||
/obj/structure/closet/secure_closet/evidence{
|
||||
name = "evidence storage locker A"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/security/investigations_storage)
|
||||
"sdp" = (
|
||||
/obj/structure/window/shuttle/scc_space_ship,
|
||||
/obj/structure/grille,
|
||||
@@ -22486,7 +22575,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/tiled/full,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/hallway/deck_three/primary/port)
|
||||
"sgZ" = (
|
||||
/obj/structure/cable/green{
|
||||
@@ -23627,13 +23716,12 @@
|
||||
/obj/effect/floor_decal/corner/green{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/firealarm/west,
|
||||
/obj/machinery/disposal/small/east,
|
||||
/obj/structure/disposalpipe/trunk,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/crew_armoury/foyer)
|
||||
"sYp" = (
|
||||
@@ -23857,6 +23945,7 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/crew_armoury/foyer)
|
||||
"tjz" = (
|
||||
@@ -25325,7 +25414,7 @@
|
||||
/obj/structure/reagent_dispensers/watertank,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/security/investigations)
|
||||
/area/maintenance/security_starboard)
|
||||
"ulh" = (
|
||||
/obj/item/trash/koisbar,
|
||||
/obj/machinery/alarm{
|
||||
@@ -25337,7 +25426,7 @@
|
||||
},
|
||||
/obj/structure/lattice/catwalk/indoor/grate,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/security/investigations)
|
||||
/area/maintenance/security_starboard)
|
||||
"uly" = (
|
||||
/obj/effect/floor_decal/corner/green{
|
||||
dir = 5
|
||||
@@ -25346,7 +25435,7 @@
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/turf/simulated/floor/tiled/full,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/hallway/deck_three/primary/port)
|
||||
"umT" = (
|
||||
/obj/structure/railing/mapped{
|
||||
@@ -26094,7 +26183,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/open,
|
||||
/area/security/investigations)
|
||||
/area/maintenance/security_starboard)
|
||||
"uQk" = (
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "1-4"
|
||||
@@ -28242,11 +28331,10 @@
|
||||
/turf/simulated/floor/carpet,
|
||||
/area/bridge/meeting_room)
|
||||
"wtM" = (
|
||||
/obj/structure/plasticflaps/airtight,
|
||||
/obj/machinery/door/airlock/security{
|
||||
name = "Evidence Storage";
|
||||
req_access = null;
|
||||
req_one_access = list(4,68)
|
||||
req_one_access = list(2,3,4,68)
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/structure/cable/green{
|
||||
@@ -53827,7 +53915,7 @@ ofY
|
||||
aLd
|
||||
bfx
|
||||
ejB
|
||||
aBC
|
||||
eTq
|
||||
dfX
|
||||
lrF
|
||||
tLV
|
||||
@@ -55849,7 +55937,7 @@ hxQ
|
||||
ePK
|
||||
ptT
|
||||
kJE
|
||||
nWA
|
||||
scO
|
||||
hSz
|
||||
gJb
|
||||
ofl
|
||||
@@ -57474,7 +57562,7 @@ sNN
|
||||
qdz
|
||||
dqT
|
||||
sGQ
|
||||
ofl
|
||||
muG
|
||||
uks
|
||||
msr
|
||||
jUg
|
||||
@@ -57676,13 +57764,13 @@ nbR
|
||||
nbR
|
||||
fWH
|
||||
tni
|
||||
ofl
|
||||
muG
|
||||
mNY
|
||||
rRe
|
||||
oLG
|
||||
fho
|
||||
ulh
|
||||
ioQ
|
||||
fXr
|
||||
vhh
|
||||
shI
|
||||
ert
|
||||
@@ -57878,13 +57966,13 @@ gTO
|
||||
nbR
|
||||
dAI
|
||||
pbx
|
||||
fQJ
|
||||
fQJ
|
||||
fQJ
|
||||
fQJ
|
||||
fQJ
|
||||
fQJ
|
||||
fQJ
|
||||
fll
|
||||
fll
|
||||
fll
|
||||
fll
|
||||
fll
|
||||
fll
|
||||
fll
|
||||
lwt
|
||||
dkM
|
||||
lwt
|
||||
|
||||
Reference in New Issue
Block a user