cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Horizon Fixes IX (#35739)

Browse Source 
* Kurfs Fixes

* Enables Time Agent and Ninja Again

* RIG Fix

* Fixed Conveyor

* Revert to box as default
This commit is contained in:
DorainGrey
2024-01-09 06:10:58 +00:00
committed by GitHub
parent d49fdab1d9
commit 64ed63ff48
2 changed files with 74 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
maps/horizon.dm
View File

@@ -74,13 +74,6 @@
research_shuttle.req_access = list() //It's shared by miners and researchers, so remove access requirements
salvage_shuttle.can_rotate = 1
/datum/map/active/map_ruleset(var/datum/dynamic_ruleset/DR)
if(ispath(DR.role_category,/datum/role/ninja))
return FALSE
if(ispath(DR.role_category,/datum/role/time_agent))
return FALSE
return ..()
////////////////////////////////////////////////////////////////
#include "horizon.dmm"
#endif

160
maps/horizon.dmm
View File

@@ -1982,9 +1982,7 @@
"adH" = (
/obj/structure/table,
/obj/machinery/door/window{
dir = 8;
name = "AI Core Door";
req_access_txt = "16"
dir = 8
},
/turf/simulated/floor/plating,
/area/maintenance/fsmaint)
@@ -3283,7 +3281,7 @@
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/disk_duplicator,
/obj/machinery/computer/accounting,
/turf/simulated/floor{
icon_state = "cult"
},
@@ -16916,6 +16914,10 @@
/obj/structure/table/reinforced,
/obj/item/weapon/storage/box/mugs,
/obj/item/weapon/reagent_containers/glass/kettle/red,
/obj/item/weapon/storage/secure/safe{
pixel_x = 5;
pixel_y = -28
},
/turf/simulated/floor{
icon_state = "cult"
},
@@ -17156,11 +17158,8 @@
},
/area/science/robotics)
"aEr" = (
/obj/machinery/light_switch{
pixel_y = 25
},
/turf/simulated/floor/wood,
/area/library)
/turf/simulated/wall,
/area/medical/genetics)
"aEs" = (
/obj/machinery/computer/security/telescreen/entertainment/spesstv/flatscreen{
network = list("Brig.TV");
@@ -21197,7 +21196,6 @@
/obj/effect/decal/cleanable/cockroach_remains,
/obj/effect/decal/cleanable/spiderling_remains,
/obj/item/trash/soda_cans,
/obj/structure/hanging_lantern,
/obj/machinery/atmospherics/unary/vent_pump/on/layered{
dir = 4
},
@@ -22030,6 +22028,9 @@
/area/science/chargebay)
"aPV" = (
/obj/machinery/mech_bay_recharge_floor,
/obj/machinery/light_switch{
pixel_y = -23
},
/turf/simulated/floor,
/area/science/chargebay)
"aQa" = (
@@ -22215,6 +22216,7 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/light,
/turf/simulated/floor/carpet,
/area/security/hos)
"aQH" = (
@@ -22621,6 +22623,7 @@
/obj/item/fish_eggs/feederfish,
/obj/item/fish_eggs/glofish,
/obj/item/fish_eggs/goldfish,
/obj/item/fish_eggs/seadevil,
/turf/simulated/wall,
/area/hydroponics)
"aRZ" = (
@@ -22628,10 +22631,6 @@
/area/science/podbay{
base_turf_type = /turf/simulated/floor/engine
})
"aSa" = (
/obj/machinery/light,
/turf/simulated/wall/r_wall,
/area/security/hos)
"aSb" = (
/turf/simulated/wall/r_wall,
/area/security/warden)
@@ -23304,9 +23303,6 @@
},
/obj/item/weapon/storage/firstaid/regular,
/obj/item/weapon/storage/firstaid/regular,
/obj/machinery/light_switch{
pixel_x = -24
},
/turf/simulated/floor{
icon_state = "cmo"
},
@@ -26285,19 +26281,19 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"bdf" = (
/obj/machinery/dna_scannernew,
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"bdg" = (
/obj/machinery/computer/scan_consolenew,
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"bdh" = (
/obj/structure/morgue,
/turf/simulated/floor{
@@ -26318,7 +26314,7 @@
},
/obj/structure/window/full/reinforced,
/turf/simulated/floor/plating,
/area/medical/storage)
/area/medical/genetics)
"bdj" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
@@ -38061,12 +38057,6 @@
},
/turf/simulated/floor,
/area/engineering/burn_chamber)
"bvM" = (
/obj/item/weapon/storage/secure/safe{
pixel_x = -24
},
/turf/simulated/wall,
/area/lawoffice)
"bvN" = (
/obj/effect/decal/warning_stripes{
dir = 8;
@@ -75307,7 +75297,7 @@
"daF" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/wall,
/area/medical/storage)
/area/medical/genetics)
"daG" = (
/obj/machinery/door/poddoor{
id_tag = "Burn Chamber Vent";
@@ -75366,13 +75356,6 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,
/turf/space,
/area)
"daO" = (
/obj/machinery/light_switch{
pixel_x = 28;
pixel_y = 5
},
/turf/simulated/wall,
/area/hydroponics)
"daP" = (
/obj/machinery/camera{
dir = 4;
@@ -76149,6 +76132,10 @@
/obj/structure/bed/chair/comfy/couch/right/red{
dir = 8
},
/obj/machinery/light_switch{
pixel_x = 28;
pixel_y = 5
},
/turf/simulated/floor{
dir = 6;
icon_state = "dark"
@@ -78026,8 +78013,8 @@
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"gSI" = (
/obj/structure/table,
/obj/item/weapon/soap/deluxe,
/obj/structure/closet/secure_closet/freezer/kitchen,
/turf/simulated/floor{
dir = 5;
icon_state = "cafeteria"
@@ -78571,7 +78558,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"ieQ" = (
/obj/machinery/light{
dir = 1
@@ -78782,7 +78769,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"itJ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -79027,7 +79014,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"iHs" = (
/obj/item/beacon,
/turf/simulated/floor,
@@ -79201,7 +79188,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"iYP" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layered{
dir = 1
@@ -80257,6 +80244,7 @@
/obj/item/weapon/reagent_containers/glass/beaker,
/obj/item/weapon/storage/box/donkpockets,
/obj/item/weapon/kitchen/rollingpin,
/obj/item/weapon/reagent_containers/pan,
/turf/simulated/floor{
dir = 5;
icon_state = "cafeteria"
@@ -80606,7 +80594,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"lMP" = (
/obj/effect/landmark{
name = "xeno_spawn";
@@ -80957,9 +80945,6 @@
dir = 1
},
/obj/structure/disposalpipe/segment,
/obj/machinery/light_switch{
pixel_y = -23
},
/obj/machinery/suit_modifier{
anchored = 1
},
@@ -81066,7 +81051,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"mMu" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layered{
dir = 8
@@ -81687,7 +81672,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"nFg" = (
/obj/structure/closet/secure_closet/bar,
/turf/simulated/floor/plating,
@@ -81715,7 +81700,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"nFE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layered,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layered,
@@ -82720,7 +82705,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"pwB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layered{
dir = 4
@@ -82885,7 +82870,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"pGo" = (
/obj/machinery/door_timer/cell_2{
dir = 1;
@@ -83242,7 +83227,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"qlb" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layered{
@@ -83400,7 +83385,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"qAo" = (
/obj/machinery/power/generator{
anchored = 1;
@@ -84656,7 +84641,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"sBO" = (
/obj/machinery/light_switch{
pixel_x = -28;
@@ -84792,12 +84777,11 @@
},
/area/shuttle/escape_pod4)
"sOy" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
/turf/simulated/floor{
dir = 5;
icon_state = "cafeteria"
/obj/machinery/conveyor{
id_tag = "vox_mining_internal"
},
/area/crew_quarters/kitchen)
/turf/unsimulated/floor/airless,
/area/mine/explored)
"sOR" = (
/obj/structure/rack,
/obj/item/weapon/storage/toolbox/emergency{
@@ -85372,7 +85356,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"tRU" = (
/obj/effect/decal/warning_stripes{
dir = 8;
@@ -86630,7 +86614,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"vRv" = (
/obj/machinery/light{
dir = 1
@@ -87809,6 +87793,10 @@
department = "Detective's office";
pixel_y = -30
},
/obj/machinery/light_switch{
pixel_x = -28;
pixel_y = 5
},
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"yaG" = (
@@ -87919,7 +87907,7 @@
/turf/simulated/floor{
icon_state = "white"
},
/area/medical/storage)
/area/medical/genetics)
"yju" = (
/obj/machinery/atmospherics/unary/portables_connector,
/turf/simulated/floor/plating,
@@ -191159,7 +191147,7 @@ cdW
aOq
aPi
aQG
aSa
aMA
aSb
aSb
aSb
@@ -203641,7 +203629,7 @@ aao
abK
aaC
auq
bvM
aCo
ady
aFg
adY
@@ -204218,11 +204206,11 @@ aZP
aYH
lVf
aYH
aZP
aZP
aZP
aZP
aZP
aEr
aEr
aEr
aEr
aEr
beZ
bfS
bgv
@@ -204720,11 +204708,11 @@ nfh
aYH
vTI
bdh
aZP
aEr
vRo
iex
iWD
aZP
aEr
bfa
bfT
bgw
@@ -205222,11 +205210,11 @@ tvS
aYH
vTI
oAm
aZP
aEr
bde
yjq
bde
aZP
aEr
bfb
bfU
bgx
@@ -205724,11 +205712,11 @@ tvS
aYH
aOT
dgr
aZP
aEr
lLf
nDi
sBE
aZP
aEr
bfb
bfV
bgy
@@ -206226,11 +206214,11 @@ aYH
aYH
kLF
aYG
aZP
aEr
qAk
pFS
bdf
aZP
aEr
dad
bfV
bgy
@@ -206728,11 +206716,11 @@ bdh
bdh
jXJ
fwA
aZP
aEr
bdg
pFS
bdg
aZP
aEr
bfb
bfV
bgy
@@ -207230,11 +207218,11 @@ aVL
lTg
gvx
cRC
aZP
aEr
qjq
pup
mKY
aZP
aEr
bfb
bfV
bgy
@@ -207732,7 +207720,7 @@ oLN
oLN
pwB
cRD
aZP
aEr
tPC
isv
nFD
@@ -208234,11 +208222,11 @@ aYH
aYH
snZ
aYH
aZP
aEr
bdi
iHm
bdi
aZP
aEr
grD
ceM
bbc
@@ -208668,7 +208656,7 @@ aeH
aeG
afE
cKp
aEr
aiW
aiW
jWZ
ajp
@@ -217273,7 +217261,7 @@ iDk
iDk
iDk
iDk
sOy
iDk
bes
qYn
bfV
@@ -222283,7 +222271,7 @@ tXv
tzP
wUW
wmJ
daO
aUe
aUe
aUe
aUe
@@ -1232358,7 +1232346,7 @@ cDx
cDx
cDA
cJs
cJS
sOy
cKs
cDF
cGD