Skip to content
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.

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

Cryopods #8727

Merged
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
cd1498d
First commit
JamieD1 May 27, 2020
adb2d73
Next
JamieD1 May 27, 2020
11a856f
oh god why
JamieD1 May 28, 2020
ed1f3dd
Oopsie - thats for debug
JamieD1 May 28, 2020
cccb125
Fixes and Admincryo
JamieD1 May 28, 2020
daa1840
Area and icon for map - oopsie
JamieD1 May 29, 2020
c2974e4
puts them on box
smorgli May 29, 2020
74c51ad
Directional Sprites
JamieD1 May 29, 2020
a546410
Merge branch 'Cryopods-Oh-God-Why-Help-me-This-wont-work' of https://…
JamieD1 May 29, 2020
0902448
Revert "Merge branch 'Cryopods-Oh-God-Why-Help-me-This-wont-work' of …
JamieD1 May 29, 2020
69b68cc
Revert "Revert "Merge branch 'Cryopods-Oh-God-Why-Help-me-This-wont-w…
JamieD1 May 29, 2020
33e3fef
rotates the sprites on the map properly
smorgli May 29, 2020
81b9326
conflict resolved
smorgli May 29, 2020
e149240
Merge branch 'master' into Cryopods-Oh-God-Why-Help-me-This-wont-work
JamieD1 May 31, 2020
e78374b
map
smorgli Jun 2, 2020
8fcfdf0
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
smorgli Jun 2, 2020
8971c2c
omega
smorgli Jun 2, 2020
5110e17
Fixes logging and adds an area check
JamieD1 Jun 3, 2020
13c6807
Fixes and offer!
JamieD1 Jun 3, 2020
a5c4fbf
Fixes offer to randoms
JamieD1 Jun 3, 2020
0c42550
Alexkar Review Part 1
JamieD1 Jun 4, 2020
5082587
CONFLICTS
JamieD1 Jun 4, 2020
0aea876
Conflict2
JamieD1 Jun 4, 2020
51c97ef
Conflict3
JamieD1 Jun 4, 2020
6e280ca
brick
smorgli Jun 4, 2020
5ebc38e
Merge branch 'master' of https://github.com/JamieD1/Yogstation into C…
smorgli Jun 4, 2020
852353b
notsobrick
smorgli Jun 4, 2020
966c16c
omega and eclipse
smorgli Jun 5, 2020
f4cd5da
Merge branch 'master' into Cryopods-Oh-God-Why-Help-me-This-wont-work
SomeguyManperson Jun 5, 2020
530df4b
probably fixes it
SomeguyManperson Jun 5, 2020
6044d07
:pensivecowboy:
smorgli Jun 6, 2020
8bb3b70
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
smorgli Jun 6, 2020
ff08e4d
TURDIS
JamieD1 Jun 7, 2020
adf739e
Merge branch 'master' into Cryopods-Oh-God-Why-Help-me-This-wont-work
JamieD1 Jun 13, 2020
22eb9c7
Merge branch 'master' into Cryopods-Oh-God-Why-Help-me-This-wont-work
JamieD1 Jun 18, 2020
d0e3dce
Fucking conflicts
JamieD1 Jun 19, 2020
48ffc30
Merge
JamieD1 Jun 19, 2020
ab88855
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
JamieD1 Jun 19, 2020
bbfe7d3
Merge branch 'yogstation13-master' into Cryopods-Oh-God-Why-Help-me-T…
JamieD1 Jun 19, 2020
5a57c9b
yeets vr and the leftover easel on meta
smorgli Jun 20, 2020
2b11e45
Alexkar Part 1
JamieD1 Jun 20, 2020
b5d071e
Alexkar Part 2
JamieD1 Jun 20, 2020
ea97544
Compile Edition
JamieD1 Jun 20, 2020
b406fa2
Add files via upload
JamieD1 Jun 22, 2020
969dc1b
Conflicts
JamieD1 Jun 22, 2020
37e03e4
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
JamieD1 Jun 22, 2020
deae3b2
Cornflakes
JamieD1 Jun 22, 2020
0c70fef
Fucking Cornflakes
JamieD1 Jun 22, 2020
03a5c11
Alexkar
JamieD1 Jun 29, 2020
e9f4b3c
Merge remote-tracking branch 'yogs/master' into Cryopods-Oh-God-Why-H…
JamieD1 Jun 29, 2020
e499643
Cornflakes
JamieD1 Jun 29, 2020
10f4582
Cornflakes 2
JamieD1 Jun 29, 2020
a9987ad
Fix
JamieD1 Jul 2, 2020
0fe6ead
Fucking Cornflakes
JamieD1 Jul 2, 2020
beeb249
Add files via upload
JamieD1 Jul 2, 2020
8cc4054
REEEEE
JamieD1 Jul 2, 2020
d0655fe
Test
JamieD1 Jul 2, 2020
c876d59
Revert "Test"
JamieD1 Jul 2, 2020
f4fb4d5
REEEEE
JamieD1 Jul 2, 2020
34a8b97
fuck
smorgli Jul 2, 2020
cf09b6c
this
smorgli Jul 2, 2020
1a6a423
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
smorgli Jul 2, 2020
d2791af
shit
smorgli Jul 2, 2020
9e6c846
Im
smorgli Jul 3, 2020
cee4873
out
smorgli Jul 3, 2020
c06396c
Merge now
JamieD1 Jul 3, 2020
d1e9753
MERGE TIME
JamieD1 Jul 4, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
134 changes: 93 additions & 41 deletions _maps/map_files/EclipseStation/EclipseStation.dmm
Expand Up @@ -9716,14 +9716,6 @@
/obj/item/reagent_containers/glass/bucket,
/turf/open/floor/plasteel,
/area/janitor/a)
"atF" = (
/obj/structure/closet/secure_closet/personal,
/obj/structure/extinguisher_cabinet{
dir = 4;
pixel_x = 24
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/a)
"atG" = (
/turf/closed/wall,
/area/medical/chemistry)
Expand Down Expand Up @@ -10734,15 +10726,6 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/dorms/a)
"avV" = (
/obj/structure/closet/secure_closet/personal,
/obj/machinery/camera{
c_tag = "Crew Dorm Laundry";
dir = 4;
network = list("ss13")
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/a)
"avW" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/light/small{
Expand Down Expand Up @@ -11158,13 +11141,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/a)
"awR" = (
/obj/structure/closet/secure_closet/personal,
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/a)
"awS" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{
dir = 4
Expand Down Expand Up @@ -76704,14 +76680,6 @@
/obj/machinery/light,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/b)
"cYo" = (
/obj/machinery/camera{
c_tag = "Rec Deck Bathrooms";
dir = 8;
network = list("ss13")
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/b)
"cYp" = (
/obj/item/bikehorn/rubberducky,
/obj/effect/landmark/xeno_spawn,
Expand Down Expand Up @@ -82810,6 +82778,19 @@
/obj/machinery/light,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"dkm" = (
/obj/structure/closet/secure_closet/personal,
/obj/structure/extinguisher_cabinet{
dir = 4;
pixel_x = 24
},
/obj/machinery/camera{
c_tag = "Crew Dorm Laundry";
dir = 8;
network = list("ss13")
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/a)
"dnz" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
Expand Down Expand Up @@ -84827,6 +84808,17 @@
icon_state = "white"
},
/area/science/robotics/lab)
"jqF" = (
/obj/machinery/camera{
c_tag = "Rec Deck Bathrooms";
dir = 8;
network = list("ss13")
},
/obj/machinery/cryopod{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/b)
"jEo" = (
/obj/effect/turf_decal/tile/white{
dir = 1
Expand Down Expand Up @@ -85449,6 +85441,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet/red,
/area/hallway/primary/fore)
"lHJ" = (
/obj/machinery/cryopod{
dir = 1
},
/obj/machinery/computer/cryopod{
dir = 1;
pixel_y = -26
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/b)
"lHM" = (
/obj/structure/disposalpipe/segment{
dir = 4
Expand Down Expand Up @@ -86679,6 +86681,23 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"poL" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/brown{
dir = 1
},
/obj/effect/turf_decal/tile/brown{
dir = 8
},
/obj/machinery/cryopod{
dir = 4
},
/obj/machinery/computer/cryopod{
dir = 4;
pixel_x = -26
},
/turf/open/floor/plasteel,
/area/security/prison)
"pqy" = (
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
Expand Down Expand Up @@ -87268,6 +87287,12 @@
/obj/item/stack/sheet/metal/fifty,
/turf/open/floor/plating/airless,
/area/construction)
"rxZ" = (
/obj/machinery/cryopod{
dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/a)
"ryq" = (
/obj/machinery/light{
dir = 4;
Expand Down Expand Up @@ -87754,6 +87779,16 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"tjL" = (
/obj/item/radio/intercom{
freerange = 1;
name = "Common Channel";
pixel_x = 5;
pixel_y = 28
},
/obj/structure/closet/secure_closet/personal,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/a)
"tjU" = (
/obj/machinery/vending/cola/random,
/obj/machinery/camera{
Expand Down Expand Up @@ -88592,6 +88627,16 @@
/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/maintenance/department/bridge)
"vNw" = (
/obj/machinery/computer/cryopod{
dir = 4;
pixel_x = -26
},
/obj/machinery/cryopod{
dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/a)
"vOo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 8
Expand Down Expand Up @@ -88786,6 +88831,13 @@
/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"wph" = (
/obj/structure/closet/secure_closet/personal,
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/a)
"wpS" = (
/obj/effect/turf_decal/tile/purple{
dir = 8
Expand Down Expand Up @@ -114178,7 +114230,7 @@ cLW
cXW
cYb
cXG
cOR
lHJ
avq
avp
avq
Expand Down Expand Up @@ -114435,7 +114487,7 @@ avq
cLW
cLW
cXG
cYo
jqF
avq
avp
avp
Expand Down Expand Up @@ -124557,7 +124609,7 @@ abE
aaQ
ack
abQ
afa
poL
abL
abe
acf
Expand Down Expand Up @@ -131271,8 +131323,8 @@ aab
asa
aqd
aqd
avV
awR
vNw
rxZ
axO
azQ
aab
Expand Down Expand Up @@ -132039,11 +132091,11 @@ aah
aim
aah
aab
aqb
aqd
arM
atF
tjL
ave
arM
dkm
wph
avU
aww
aab
Expand Down