Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
0a6bdda
Add files via upload
nmajask May 11, 2021
f2617bd
Merge branch 'yogstation13:master' into master
nmajask May 12, 2021
ecae62c
Merge branch 'yogstation13:master' into master
nmajask May 14, 2021
be6c0e1
changed sigtech, tourist, and clerk icons
nmajask May 14, 2021
8894bf5
Merge branch 'yogstation13:master' into master
nmajask May 17, 2021
2d5f354
Some more icon changes
nmajask May 17, 2021
04c2539
Merge branch 'yogstation13:master' into master
nmajask May 17, 2021
2530bdf
applied grimm-hollowknight requested changes
nmajask May 19, 2021
7239268
ah, so thats why you reverted that change
nmajask May 28, 2021
50139ca
why cant i merge upstream
nmajask May 28, 2021
ccd6514
Merge branch 'yogstation13:master' into master
nmajask May 28, 2021
c741bab
Adds brig physicians
nmajask Jul 14, 2021
0613fed
Fixed some stuff
nmajask Jul 14, 2021
53cc9cb
Removed Brig Physician's ability to be an antag
nmajask Jul 15, 2021
73aa83f
Many requested changes
nmajask Jul 16, 2021
308897c
Another bunch of changes
nmajask Jul 19, 2021
f3110a8
Merge branch 'master' into brigphys
nmajask Jul 21, 2021
919c2d5
Might fix one of the merge conflicts
nmajask Jul 21, 2021
7a36f46
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
nmajask Jul 22, 2021
cdc31b3
Should finally bring this back to a functional state
nmajask Jul 22, 2021
c4f1717
Thought I fixed this
nmajask Jul 25, 2021
f63974c
Should fix wejengin2's issues with the maps
nmajask Jul 30, 2021
f9ab97f
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
nmajask Jul 30, 2021
1266484
Merge branch 'yogstation13-master' into brigphys
nmajask Jul 30, 2021
a8be259
Merge pull request #3 from yogstation13/master
nmajask Jul 30, 2021
ad473d7
Should fix Kilo
nmajask Jul 30, 2021
5945df5
Merge branch 'master' of git://github.com/yogstation13/Yogstation int…
nmajask Aug 3, 2021
f2b0535
Fixes an issue with the upstream merge
nmajask Aug 3, 2021
378211e
Merge branch 'master' of git://github.com/yogstation13/Yogstation int…
nmajask Aug 5, 2021
2bef3a2
Fixes the zombie hud sprite
nmajask Aug 5, 2021
cb15456
Adds some of adamsong's requested changes
nmajask Aug 14, 2021
b5098a1
Other part of adamsong's request
nmajask Aug 14, 2021
ed05ebd
Merge branch 'brigphys' of https://github.com/nmajask/Yogstation-But-…
nmajask Aug 14, 2021
897b4a4
This seems important
nmajask Aug 14, 2021
241f20a
Messes with access
nmajask Aug 14, 2021
3643959
Revert "Removed Brig Physician's ability to be an antag"
nmajask Aug 14, 2021
10276f6
Adds first-aid kits to sec offices
nmajask Aug 14, 2021
9c85421
Reworks the eclipse infirmary
nmajask Aug 14, 2021
4a06218
Adds alternate job names
nmajask Aug 15, 2021
2e8a981
Removed changes to warden.dm
nmajask Aug 16, 2021
565fb9c
fixes some stuff with test merges
nmajask Aug 16, 2021
b62b0dd
Fixes more test merge conflicts
nmajask Aug 16, 2021
5e750de
Merge branch 'master' of git://github.com/yogstation13/Yogstation int…
nmajask Aug 17, 2021
f7178ff
Fixes my Geneva Convention violation
nmajask Aug 17, 2021
2bde593
Merge branch 'master' of git://github.com/yogstation13/Yogstation int…
nmajask Aug 19, 2021
8fcb7e0
Revert "Merge branch 'master' of git://github.com/yogstation13/Yogsta…
nmajask Aug 19, 2021
3cdff49
Revert "fixes some stuff with test merges"
nmajask Aug 19, 2021
9e81035
Revert "Revert "Merge branch 'master' of git://github.com/yogstation1…
nmajask Aug 19, 2021
f7d0e2f
should fix some stuff with job alt titles
nmajask Aug 19, 2021
d5526da
Should fix this mess
nmajask Aug 19, 2021
f60741e
Fixes more things
nmajask Aug 20, 2021
93f7b26
Plasmameme outfit
nmajask Aug 20, 2021
3057916
Merge branch 'master' of git://github.com/yogstation13/Yogstation int…
nmajask Aug 21, 2021
9a62960
Rearranges some stuff in the box infirmary
nmajask Aug 22, 2021
3ec5dcd
Revert "Revert "Removed Brig Physician's ability to be an antag""
nmajask Aug 23, 2021
8ef696a
Fixes meta
nmajask Aug 24, 2021
0db139c
Merge branch 'master' of git://github.com/yogstation13/Yogstation int…
nmajask Aug 24, 2021
79de2fc
Merge branch 'master' into brigphys
JamieD1 Aug 24, 2021
5315571
Fix merge error
adamsong Aug 24, 2021
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
887 changes: 599 additions & 288 deletions _maps/map_files/EclipseStation/EclipseStation.dmm

Large diffs are not rendered by default.

128 changes: 68 additions & 60 deletions _maps/map_files/KiloStation/KiloStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1958,10 +1958,10 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
/mob/living/simple_animal/bot/secbot/pingsky,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/mob/living/simple_animal/bot/secbot/pingsky,
/turf/open/floor/engine,
/area/ai_monitored/turret_protected/aisat_interior)
"adn" = (
Expand Down Expand Up @@ -3615,12 +3615,13 @@
/turf/open/floor/plasteel/dark,
/area/security/prison)
"agd" = (
/obj/structure/bodycontainer/morgue,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/delivery,
/obj/machinery/computer/operating{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/security/warden)
"age" = (
Expand Down Expand Up @@ -6136,18 +6137,17 @@
},
/area/maintenance/port/fore)
"akT" = (
/obj/structure/bed,
/obj/machinery/iv_drip,
/obj/item/bedsheet/medical,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/light/small{
dir = 4
},
/obj/effect/turf_decal/tile/red,
/obj/structure/chair/office{
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"akV" = (
Expand Down Expand Up @@ -7957,9 +7957,6 @@
/turf/open/floor/plasteel/dark,
/area/security/warden)
"anM" = (
/obj/structure/table/glass,
/obj/item/clothing/gloves/color/latex,
/obj/item/healthanalyzer,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
Expand All @@ -7969,15 +7966,7 @@
pixel_x = 26
},
/obj/effect/turf_decal/tile/red,
/obj/item/storage/box/bodybags,
/obj/item/reagent_containers/spray/cleaner{
pixel_x = 5;
pixel_y = -1
},
/obj/item/reagent_containers/spray/cleaner{
pixel_x = -3;
pixel_y = 2
},
/obj/structure/closet/secure_closet/physician,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"anN" = (
Expand Down Expand Up @@ -18191,13 +18180,6 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/genetics/cloning)
"aFu" = (
/obj/machinery/door/airlock/medical/glass{
name = "Infirmary";
req_one_access_txt = "1;34"
},
/turf/open/floor/plasteel/dark,
/area/security/main)
"aFv" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig Control";
Expand Down Expand Up @@ -45307,6 +45289,12 @@
/obj/effect/landmark/start/bartender,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"bvl" = (
/obj/machinery/modular_computer/console/preset/curator{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/library)
"bvm" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
Expand Down Expand Up @@ -76649,10 +76637,6 @@
/turf/closed/wall/rust,
/area/maintenance/port/fore)
"cxu" = (
/obj/structure/table/glass,
/obj/item/storage/firstaid/regular,
/obj/item/reagent_containers/glass/bottle/epinephrine,
/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
Expand All @@ -76671,6 +76655,8 @@
pixel_x = 24
},
/obj/effect/turf_decal/tile/red,
/obj/machinery/iv_drip,
/obj/structure/closet/crate/freezer/blood,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"cxv" = (
Expand Down Expand Up @@ -87198,10 +87184,10 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
/mob/living/simple_animal/spiffles,
/obj/structure/window/reinforced/tinted{
dir = 1
},
/mob/living/simple_animal/spiffles,
/turf/open/floor/plasteel,
/area/clerk)
"emk" = (
Expand Down Expand Up @@ -90909,6 +90895,14 @@
},
/turf/open/floor/plating,
/area/hallway/primary/fore)
"iFa" = (
/obj/machinery/door/airlock/medical/glass{
name = "Infirmary";
red_alert_access = 1;
req_access_txt = "5"
},
/turf/open/floor/plasteel/dark,
/area/security/main)
"iGD" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
Expand Down Expand Up @@ -91376,7 +91370,9 @@
/area/maintenance/port/aft)
"iZe" = (
/obj/structure/table/glass,
/obj/machinery/computer/med_data/laptop,
/obj/machinery/computer/med_data/laptop{
pixel_x = -3
},
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
Expand All @@ -91394,6 +91390,14 @@
/obj/machinery/vending/wallmed{
pixel_x = 24
},
/obj/item/reagent_containers/spray/cleaner{
pixel_x = 10;
pixel_y = 10
},
/obj/item/reagent_containers/glass/bottle/epinephrine{
pixel_x = 10;
pixel_y = 5
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"iZu" = (
Expand Down Expand Up @@ -91768,6 +91772,9 @@
/obj/item/radio/intercom{
pixel_x = -28
},
/obj/effect/decal/cleanable/blood/old,
/obj/structure/table/optable,
/obj/item/storage/backpack/duffelbag/sec/surgery,
/turf/open/floor/plasteel/dark,
/area/security/warden)
"jwf" = (
Expand Down Expand Up @@ -93077,10 +93084,10 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/prison)
"kQv" = (
/mob/living/simple_animal/hostile/asteroid/hivelord,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
/mob/living/simple_animal/hostile/asteroid/hivelord,
/turf/open/floor/plating,
/area/quartermaster/warehouse)
"kQQ" = (
Expand Down Expand Up @@ -93251,6 +93258,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft)
"kTR" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plating/asteroid,
/area/space/nearstation)
"kUb" = (
/obj/machinery/door/airlock/maintenance{
name = "kitchen maintenance";
Expand Down Expand Up @@ -96535,18 +96546,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/space,
/area/space/nearstation)
"phd" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/door/airlock/medical/glass{
name = "Infirmary"
},
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/plasteel/dark,
/area/security/warden)
"pii" = (
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
Expand Down Expand Up @@ -97659,6 +97658,20 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/genetics)
"qrw" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/door/airlock/medical/glass{
name = "Infirmary";
red_alert_access = 1;
req_access_txt = "5"
},
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/plasteel/dark,
/area/security/warden)
"qsW" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
Expand Down Expand Up @@ -100704,12 +100717,6 @@
},
/turf/open/floor/plasteel/dark,
/area/maintenance/central)
"tYo" = (
/obj/machinery/modular_computer/console/preset/curator{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/library)
"tYt" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
Expand Down Expand Up @@ -104037,6 +104044,11 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"xOK" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/landmark/start/yogs/brigphsyician,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"xOW" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
Expand Down Expand Up @@ -104367,10 +104379,6 @@
icon_state = "platingdmg3"
},
/area/maintenance/disposal/incinerator)
"ymm" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plating/asteroid,
/area/space/nearstation)

(1,1,1) = {"
aaa
Expand Down Expand Up @@ -117605,7 +117613,7 @@ rJG
rJG
cwq
aLZ
ymm
kTR
xjU
aLZ
aLZ
Expand Down Expand Up @@ -123549,12 +123557,12 @@ aef
aef
bXp
adz
phd
qrw
cdp
cnB
xOK
cnB
crz
aFu
iFa
aLi
bxS
bPI
Expand Down Expand Up @@ -128921,7 +128929,7 @@ buC
rRJ
bgY
bjk
tYo
bvl
bvb
rve
mfB
Expand Down
Loading