Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit f3a76b6

Browse files
committed
2 parents 7b50998 + 6108c36 commit f3a76b6

File tree

36 files changed

+329
-177
lines changed

36 files changed

+329
-177
lines changed

.vscode/launch.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"version": "0.2.0",
3-
"configurations": [
4-
{
5-
"type": "byond",
6-
"request": "launch",
7-
"name": "Launch DreamSeeker",
8-
"preLaunchTask": "Build All",
9-
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
10-
"dreamDaemon": false
11-
}
12-
]
13-
}
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"type": "byond",
6+
"request": "launch",
7+
"name": "Launch DreamDaemon",
8+
"preLaunchTask": "Build All",
9+
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
10+
"dreamDaemon": true
11+
}
12+
]
13+
}

_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1870,9 +1870,6 @@
18701870
/obj/machinery/firealarm{
18711871
pixel_y = 26
18721872
},
1873-
/obj/machinery/light_switch{
1874-
pixel_y = 28
1875-
},
18761873
/turf/open/floor/carpet/red,
18771874
/area/ruin/syndicate_icemoon/command)
18781875
"lD" = (
@@ -3311,6 +3308,9 @@
33113308
/turf/open/floor/plasteel/dark,
33123309
/area/ruin/syndicate_icemoon/warehouse)
33133310
"ud" = (
3311+
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
3312+
dir = 1
3313+
},
33143314
/turf/open/floor/engine/plasma,
33153315
/area/ruin/syndicate_icemoon/reactor)
33163316
"ue" = (
@@ -5808,6 +5808,10 @@
58085808
/obj/effect/turf_decal/siding/red{
58095809
dir = 10
58105810
},
5811+
/obj/machinery/light_switch{
5812+
pixel_y = -28;
5813+
pixel_x = 8
5814+
},
58115815
/turf/open/floor/mineral/plastitanium,
58125816
/area/ruin/syndicate_icemoon/command)
58135817
"Ip" = (
@@ -6007,7 +6011,6 @@
60076011
/area/icemoon/surface/outdoors)
60086012
"Jy" = (
60096013
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
6010-
dir = 8;
60116014
target_temperature = 80
60126015
},
60136016
/turf/open/floor/plating,
@@ -7446,6 +7449,10 @@
74467449
},
74477450
/obj/structure/closet/secure_closet/syndicate/captain,
74487451
/obj/item/storage/toolbox/syndicate/real,
7452+
/obj/machinery/light_switch{
7453+
pixel_y = 28;
7454+
pixel_x = -6
7455+
},
74497456
/turf/open/floor/carpet/red,
74507457
/area/ruin/syndicate_icemoon/command)
74517458
"SZ" = (
@@ -7558,9 +7565,7 @@
75587565
/turf/open/floor/plasteel/grimy,
75597566
/area/ruin/syndicate_icemoon/dorms)
75607567
"TS" = (
7561-
/obj/machinery/atmospherics/components/unary/tank/nitrogen{
7562-
dir = 4
7563-
},
7568+
/obj/machinery/atmospherics/components/unary/tank/nitrogen,
75647569
/turf/open/floor/plating,
75657570
/area/ruin/syndicate_icemoon/medical)
75667571
"TW" = (

_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@
499499
/turf/open/floor/mineral/titanium,
500500
/area/ruin/powered/sinden)
501501
"DQ" = (
502-
/obj/structure/table/wood/fancy/exoticpurple,
502+
/obj/structure/table/wood/fancy/purple,
503503
/turf/open/floor/carpet/purple,
504504
/area/ruin/powered/sinden)
505505
"ED" = (
@@ -521,7 +521,7 @@
521521
/turf/open/floor/mineral/titanium,
522522
/area/ruin/powered/sinden)
523523
"Ha" = (
524-
/obj/structure/sign/barsign,
524+
/obj/machinery/barsign,
525525
/turf/closed/wall/mineral/plastitanium/nodiagonal,
526526
/area/ruin/powered/sinden)
527527
"Hf" = (
@@ -656,7 +656,6 @@
656656
/obj/machinery/light{
657657
dir = 1
658658
},
659-
/obj/structure/table/wood/fancy/exoticpurple,
660659
/obj/item/paper_bin,
661660
/obj/item/pen,
662661
/turf/open/floor/carpet/purple,

_maps/RandomRuins/SpaceRuins/kinggoatarena.dmm

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,11 @@
128128
},
129129
/area/ruin/powered/kinggoat_arena)
130130
"E" = (
131-
/obj/effect/portal/permanent/one_way/keep{
132-
id = "king goat arena";
133-
name = "king goat arena portal";
134-
teleport_channel = "free"
131+
/obj/effect/portal/permanent/one_way/multi/entry{
132+
id = "goatarena";
133+
teleport_channel = "free";
134+
desc = "Echoes of a thousand bleats and the faint smell of farm seem to emanate from this portal. Do you dare enter?";
135+
name = "Ingress";
135136
},
136137
/turf/open/indestructible/carpet,
137138
/area/ruin/powered/kinggoat_arena)
@@ -196,16 +197,18 @@
196197
/area/ruin/powered/kinggoat_arena)
197198
"T" = (
198199
/obj/machinery/door/airlock/gold/glass{
199-
desc = "Once you go in the portal past this door there is no going back...";
200+
desc = "A small engraving on the door reads: <i>Once you go in the portal past this door there is no going back...</i>";
200201
name = "POINT OF NO RETURN"
201202
},
202203
/turf/open/indestructible/carpet,
203204
/area/ruin/powered/kinggoat_arena)
204205
"V" = (
205-
/obj/effect/portal/permanent/one_way/destroy{
206-
id = "king goat arena";
207-
name = "king goat arena portal";
208-
teleport_channel = "free"
206+
/obj/effect/portal/permanent/one_way/multi/exit{
207+
id = "goatarena";
208+
teleport_channel = "free";
209+
desc = "You can barely make out what's on the other side: Freedom, something you hope to see again.";
210+
name = "Egress";
211+
alpha = 0
209212
},
210213
/turf/open/indestructible/carpet{
211214
initial_gas_mix = "o2=14;n2=23;TEMP=300"

_maps/map_files/DonutStation/DonutStation.dmm

Lines changed: 78 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2781,6 +2781,15 @@
27812781
/obj/machinery/atmospherics/pipe/layer_manifold,
27822782
/turf/open/floor/plating,
27832783
/area/ai_monitored/turret_protected/aisat_interior)
2784+
"bhk" = (
2785+
/mob/living/simple_animal/crab/kreb{
2786+
desc = "Here to lay down the hard claws of the law!";
2787+
health = 50;
2788+
name = "Officer Kreb";
2789+
real_name = "Officer Kreb"
2790+
},
2791+
/turf/open/floor/plasteel,
2792+
/area/security/checkpoint)
27842793
"bhn" = (
27852794
/obj/structure/disposalpipe/segment{
27862795
dir = 4
@@ -10298,6 +10307,15 @@
1029810307
},
1029910308
/turf/open/floor/plating,
1030010309
/area/maintenance/port/fore)
10310+
"eiT" = (
10311+
/mob/living/simple_animal/cockroach{
10312+
desc = "Virtually unkillable.";
10313+
name = "Becquerel";
10314+
sentience_type = 5;
10315+
status_flags = 16
10316+
},
10317+
/turf/open/floor/plating,
10318+
/area/maintenance/disposal/incinerator)
1030110319
"eiX" = (
1030210320
/obj/structure/closet/emcloset,
1030310321
/obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
@@ -13985,6 +14003,14 @@
1398514003
},
1398614004
/turf/open/floor/plasteel,
1398714005
/area/hallway/primary/central)
14006+
"fLh" = (
14007+
/mob/living/simple_animal/pet/penguin/emperor/shamebrero{
14008+
desc = "Was used in a experiment by the RD to test how a penguin with a sombrero would effect morale. Results were uncertain but is being kept as the science department's mascot anyway.";
14009+
name = "Anadear";
14010+
real_name = "Anadear"
14011+
},
14012+
/turf/open/floor/engine,
14013+
/area/science/explab)
1398814014
"fLk" = (
1398914015
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
1399014016
dir = 4
@@ -29836,9 +29862,6 @@
2983629862
/obj/effect/landmark/stationroom/maint/threexfive,
2983729863
/turf/template_noop,
2983829864
/area/maintenance/port/fore)
29839-
"mKX" = (
29840-
/turf/open/floor/plasteel,
29841-
/area/security/checkpoint)
2984229865
"mLc" = (
2984329866
/obj/machinery/camera{
2984429867
c_tag = "Research - Xenobiology Cell 6";
@@ -34277,6 +34300,40 @@
3427734300
dir = 5
3427834301
},
3427934302
/area/crew_quarters/kitchen)
34303+
"oAF" = (
34304+
/obj/structure/cable{
34305+
icon_state = "0-8"
34306+
},
34307+
/obj/machinery/power/apc{
34308+
areastring = "/area/crew_quarters/heads/hos";
34309+
dir = 4;
34310+
name = "Head of Security's Office APC";
34311+
pixel_x = 24
34312+
},
34313+
/mob/living/simple_animal/hostile/retaliate/bat{
34314+
desc = "A fierce companion for any person of power, this spider has been carefully trained by Nanotrasen specialists. Its beady, staring eyes send shivers down your spine.";
34315+
emote_hear = list("chitters");
34316+
faction = list("spiders");
34317+
harm_intent_damage = 3;
34318+
health = 200;
34319+
icon_dead = "guard_dead";
34320+
icon_gib = "guard_dead";
34321+
icon_living = "guard";
34322+
icon_state = "guard";
34323+
maxHealth = 250;
34324+
max_co2 = 5;
34325+
max_tox = 2;
34326+
melee_damage_lower = 15;
34327+
melee_damage_upper = 20;
34328+
min_oxy = 5;
34329+
movement_type = 1;
34330+
name = "Sergeant Araneus";
34331+
real_name = "Sergeant Araneus";
34332+
response_help = "pets";
34333+
turns_per_move = 10
34334+
},
34335+
/turf/open/floor/carpet,
34336+
/area/crew_quarters/heads/hos)
3428034337
"oAH" = (
3428134338
/obj/effect/spawner/structure/window/reinforced/shutter,
3428234339
/turf/open/floor/plating,
@@ -35184,6 +35241,10 @@
3518435241
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
3518535242
/turf/open/floor/plating,
3518635243
/area/maintenance/port/fore)
35244+
"oWY" = (
35245+
/obj/effect/spawner/lootdrop/mob/kitchen_animal,
35246+
/turf/open/floor/plasteel/showroomfloor,
35247+
/area/crew_quarters/kitchen)
3518735248
"oXw" = (
3518835249
/obj/machinery/light,
3518935250
/obj/item/kirbyplants/random,
@@ -39277,6 +39338,14 @@
3927739338
/obj/effect/turf_decal/trimline/blue/filled/line/lower,
3927839339
/turf/open/floor/plasteel,
3927939340
/area/engine/atmos)
39341+
"qIM" = (
39342+
/mob/living/simple_animal/pet/dog/pug{
39343+
desc = "Much better at protecting the armory than your average warden.";
39344+
name = "Warden Jacob";
39345+
real_name = "Warden Jacob"
39346+
},
39347+
/turf/open/floor/plasteel/showroomfloor,
39348+
/area/security/warden)
3928039349
"qIR" = (
3928139350
/obj/structure/cable/yellow{
3928239351
icon_state = "2-8"
@@ -55123,18 +55192,6 @@
5512355192
},
5512455193
/turf/open/floor/plasteel,
5512555194
/area/security/brig)
55126-
"xuj" = (
55127-
/obj/structure/cable{
55128-
icon_state = "0-8"
55129-
},
55130-
/obj/machinery/power/apc{
55131-
areastring = "/area/crew_quarters/heads/hos";
55132-
dir = 4;
55133-
name = "Head of Security's Office APC";
55134-
pixel_x = 24
55135-
},
55136-
/turf/open/floor/carpet,
55137-
/area/crew_quarters/heads/hos)
5513855195
"xuF" = (
5513955196
/obj/effect/spawner/structure/window/reinforced,
5514055197
/obj/machinery/atmospherics/pipe/simple/green/visible,
@@ -82329,7 +82386,7 @@ swf
8232982386
qgC
8233082387
cLs
8233182388
bvP
82332-
mBt
82389+
fLh
8233382390
vpD
8233482391
mXH
8233582392
qkE
@@ -91383,7 +91440,7 @@ jVy
9138391440
mew
9138491441
sii
9138591442
mvc
91386-
mvc
91443+
oWY
9138791444
mvc
9138891445
mew
9138991446
jvO
@@ -92588,7 +92645,7 @@ ylr
9258892645
ylr
9258992646
naG
9259092647
jds
92591-
mKX
92648+
bhk
9259292649
slw
9259392650
hWs
9259492651
klw
@@ -101411,7 +101468,7 @@ sMl
101411101468
wCc
101412101469
wCc
101413101470
isK
101414-
wCc
101471+
eiT
101415101472
wCc
101416101473
bBZ
101417101474
tzk
@@ -104972,7 +105029,7 @@ nXl
104972105029
jEc
104973105030
wiy
104974105031
ccS
104975-
woJ
105032+
qIM
104976105033
woJ
104977105034
woJ
104978105035
bwX
@@ -105254,7 +105311,7 @@ puT
105254105311
kPJ
105255105312
uVg
105256105313
cMD
105257-
xuj
105314+
oAF
105258105315
ixN
105259105316
kvm
105260105317
yda

0 commit comments

Comments
 (0)