Merge branch 'master' of https://github.com/wonderinghost/Yogstation

wonderinghost · Apr 6, 2024 · f3a76b6 · f3a76b6
2 parents 7b50998 + 6108c36
commit f3a76b6
Show file tree

Hide file tree

Showing 36 changed files with 329 additions and 177 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,13 +1,13 @@
 {
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "byond",
-      "request": "launch",
-      "name": "Launch DreamSeeker",
-      "preLaunchTask": "Build All",
-      "dmb": "${workspaceFolder}/${command:CurrentDMB}",
-      "dreamDaemon": false
-    }
-  ]
-}
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"type": "byond",
+			"request": "launch",
+			"name": "Launch DreamDaemon",
+			"preLaunchTask": "Build All",
+			"dmb": "${workspaceFolder}/${command:CurrentDMB}",
+			"dreamDaemon": true
+		}
+	]
+}
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm
@@ -1870,9 +1870,6 @@
 /obj/machinery/firealarm{
 	pixel_y = 26
 	},
-/obj/machinery/light_switch{
-	pixel_y = 28
-	},
 /turf/open/floor/carpet/red,
 /area/ruin/syndicate_icemoon/command)
 "lD" = (
@@ -3311,6 +3308,9 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/syndicate_icemoon/warehouse)
 "ud" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+	dir = 1
+	},
 /turf/open/floor/engine/plasma,
 /area/ruin/syndicate_icemoon/reactor)
 "ue" = (
@@ -5808,6 +5808,10 @@
 /obj/effect/turf_decal/siding/red{
 	dir = 10
 	},
+/obj/machinery/light_switch{
+	pixel_y = -28;
+	pixel_x = 8
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/syndicate_icemoon/command)
 "Ip" = (
@@ -6007,7 +6011,6 @@
 /area/icemoon/surface/outdoors)
 "Jy" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
-	dir = 8;
 	target_temperature = 80
 	},
 /turf/open/floor/plating,
@@ -7446,6 +7449,10 @@
 	},
 /obj/structure/closet/secure_closet/syndicate/captain,
 /obj/item/storage/toolbox/syndicate/real,
+/obj/machinery/light_switch{
+	pixel_y = 28;
+	pixel_x = -6
+	},
 /turf/open/floor/carpet/red,
 /area/ruin/syndicate_icemoon/command)
 "SZ" = (
@@ -7558,9 +7565,7 @@
 /turf/open/floor/plasteel/grimy,
 /area/ruin/syndicate_icemoon/dorms)
 "TS" = (
-/obj/machinery/atmospherics/components/unary/tank/nitrogen{
-	dir = 4
-	},
+/obj/machinery/atmospherics/components/unary/tank/nitrogen,
 /turf/open/floor/plating,
 /area/ruin/syndicate_icemoon/medical)
 "TW" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm b/_maps/RandomRuins/JungleRuins/jungleland_jungle_sinden.dmm
@@ -499,7 +499,7 @@
 /turf/open/floor/mineral/titanium,
 /area/ruin/powered/sinden)
 "DQ" = (
-/obj/structure/table/wood/fancy/exoticpurple,
+/obj/structure/table/wood/fancy/purple,
 /turf/open/floor/carpet/purple,
 /area/ruin/powered/sinden)
 "ED" = (
@@ -521,7 +521,7 @@
 /turf/open/floor/mineral/titanium,
 /area/ruin/powered/sinden)
 "Ha" = (
-/obj/structure/sign/barsign,
+/obj/machinery/barsign,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ruin/powered/sinden)
 "Hf" = (
@@ -656,7 +656,6 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/structure/table/wood/fancy/exoticpurple,
 /obj/item/paper_bin,
 /obj/item/pen,
 /turf/open/floor/carpet/purple,

diff --git a/_maps/RandomRuins/SpaceRuins/kinggoatarena.dmm b/_maps/RandomRuins/SpaceRuins/kinggoatarena.dmm
@@ -128,10 +128,11 @@
 	},
 /area/ruin/powered/kinggoat_arena)
 "E" = (
-/obj/effect/portal/permanent/one_way/keep{
-	id = "king goat arena";
-	name = "king goat arena portal";
-	teleport_channel = "free"
+/obj/effect/portal/permanent/one_way/multi/entry{
+	id = "goatarena";
+	teleport_channel = "free";
+	desc = "Echoes of a thousand bleats and the faint smell of farm seem to emanate from this portal. Do you dare enter?";
+	name = "Ingress";
 	},
 /turf/open/indestructible/carpet,
 /area/ruin/powered/kinggoat_arena)
@@ -196,16 +197,18 @@
 /area/ruin/powered/kinggoat_arena)
 "T" = (
 /obj/machinery/door/airlock/gold/glass{
-	desc = "Once you go in the portal past this door there is no going back...";
+	desc = "A small engraving on the door reads: <i>Once you go in the portal past this door there is no going back...</i>";
 	name = "POINT OF NO RETURN"
 	},
 /turf/open/indestructible/carpet,
 /area/ruin/powered/kinggoat_arena)
 "V" = (
-/obj/effect/portal/permanent/one_way/destroy{
-	id = "king goat arena";
-	name = "king goat arena portal";
-	teleport_channel = "free"
+/obj/effect/portal/permanent/one_way/multi/exit{
+	id = "goatarena";
+	teleport_channel = "free";
+	desc = "You can barely make out what's on the other side: Freedom, something you hope to see again.";
+	name = "Egress";
+	alpha = 0
 	},
 /turf/open/indestructible/carpet{
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"

diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm
@@ -2781,6 +2781,15 @@
 /obj/machinery/atmospherics/pipe/layer_manifold,
 /turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
+"bhk" = (
+/mob/living/simple_animal/crab/kreb{
+	desc = "Here to lay down the hard claws of the law!";
+	health = 50;
+	name = "Officer Kreb";
+	real_name = "Officer Kreb"
+	},
+/turf/open/floor/plasteel,
+/area/security/checkpoint)
 "bhn" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -10298,6 +10307,15 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
+"eiT" = (
+/mob/living/simple_animal/cockroach{
+	desc = "Virtually unkillable.";
+	name = "Becquerel";
+	sentience_type = 5;
+	status_flags = 16
+	},
+/turf/open/floor/plating,
+/area/maintenance/disposal/incinerator)
 "eiX" = (
 /obj/structure/closet/emcloset,
 /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
@@ -13985,6 +14003,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
+"fLh" = (
+/mob/living/simple_animal/pet/penguin/emperor/shamebrero{
+	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.";
+	name = "Anadear";
+	real_name = "Anadear"
+	},
+/turf/open/floor/engine,
+/area/science/explab)
 "fLk" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -29836,9 +29862,6 @@
 /obj/effect/landmark/stationroom/maint/threexfive,
 /turf/template_noop,
 /area/maintenance/port/fore)
-"mKX" = (
-/turf/open/floor/plasteel,
-/area/security/checkpoint)
 "mLc" = (
 /obj/machinery/camera{
 	c_tag = "Research - Xenobiology Cell 6";
@@ -34277,6 +34300,40 @@
 	dir = 5
 	},
 /area/crew_quarters/kitchen)
+"oAF" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/apc{
+	areastring = "/area/crew_quarters/heads/hos";
+	dir = 4;
+	name = "Head of Security's Office APC";
+	pixel_x = 24
+	},
+/mob/living/simple_animal/hostile/retaliate/bat{
+	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.";
+	emote_hear = list("chitters");
+	faction = list("spiders");
+	harm_intent_damage = 3;
+	health = 200;
+	icon_dead = "guard_dead";
+	icon_gib = "guard_dead";
+	icon_living = "guard";
+	icon_state = "guard";
+	maxHealth = 250;
+	max_co2 = 5;
+	max_tox = 2;
+	melee_damage_lower = 15;
+	melee_damage_upper = 20;
+	min_oxy = 5;
+	movement_type = 1;
+	name = "Sergeant Araneus";
+	real_name = "Sergeant Araneus";
+	response_help = "pets";
+	turns_per_move = 10
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/heads/hos)
 "oAH" = (
 /obj/effect/spawner/structure/window/reinforced/shutter,
 /turf/open/floor/plating,
@@ -35184,6 +35241,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
+"oWY" = (
+/obj/effect/spawner/lootdrop/mob/kitchen_animal,
+/turf/open/floor/plasteel/showroomfloor,
+/area/crew_quarters/kitchen)
 "oXw" = (
 /obj/machinery/light,
 /obj/item/kirbyplants/random,
@@ -39277,6 +39338,14 @@
 /obj/effect/turf_decal/trimline/blue/filled/line/lower,
 /turf/open/floor/plasteel,
 /area/engine/atmos)
+"qIM" = (
+/mob/living/simple_animal/pet/dog/pug{
+	desc = "Much better at protecting the armory than your average warden.";
+	name = "Warden Jacob";
+	real_name = "Warden Jacob"
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
 "qIR" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
@@ -55123,18 +55192,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/brig)
-"xuj" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/power/apc{
-	areastring = "/area/crew_quarters/heads/hos";
-	dir = 4;
-	name = "Head of Security's Office APC";
-	pixel_x = 24
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/heads/hos)
 "xuF" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/green/visible,
@@ -82329,7 +82386,7 @@ swf
 qgC
 cLs
 bvP
-mBt
+fLh
 vpD
 mXH
 qkE
@@ -91383,7 +91440,7 @@ jVy
 mew
 sii
 mvc
-mvc
+oWY
 mvc
 mew
 jvO
@@ -92588,7 +92645,7 @@ ylr
 ylr
 naG
 jds
-mKX
+bhk
 slw
 hWs
 klw
@@ -101411,7 +101468,7 @@ sMl
 wCc
 wCc
 isK
-wCc
+eiT
 wCc
 bBZ
 tzk
@@ -104972,7 +105029,7 @@ nXl
 jEc
 wiy
 ccS
-woJ
+qIM
 woJ
 woJ
 bwX
@@ -105254,7 +105311,7 @@ puT
 kPJ
 uVg
 cMD
-xuj
+oAF
 ixN
 kvm
 yda