Merge branch 'master' of https://github.com/goonstation/goonstation

code/modules/medical/genetics/bioEffects/powers.dm

@@ -337,6 +337,16 @@ ABSTRACT_TYPE(/datum/bioEffect/power)
 		var/sleep_time = 1 / linked_power.power
 
 		if (istype(owner.loc,/turf/))
+			var/turf/T = owner.loc
+			if (T.turf_flags & CAN_BE_SPACE_SAMPLE || T.throw_unlimited || owner.no_gravity)
+				var/push_off = FALSE
+				for(var/atom/A in oview(1, T))
+					if (A.stops_space_move)
+						push_off = TRUE
+						break
+				if(!push_off)
+					boutput(usr, SPAN_ALERT("Your leg muscles tense, but there's nothing to push off of!"))
+					return TRUE
 			usr.visible_message(SPAN_ALERT("<b>[owner]</b> takes a huge leap!"))
 			playsound(owner.loc, 'sound/impact_sounds/Generic_Shove_1.ogg', 50, 1)
 			var/prevLayer = owner.layer
@@ -384,6 +394,16 @@ ABSTRACT_TYPE(/datum/bioEffect/power)
 		var/sleep_time = 0.5 / linked_power.power
 
 		if (istype(owner.loc,/turf/))
+			var/turf/T = owner.loc
+			if (T.turf_flags & CAN_BE_SPACE_SAMPLE || T.throw_unlimited || owner.no_gravity)
+				var/push_off = FALSE
+				for(var/atom/A in oview(1, T))
+					if (A.stops_space_move)
+						push_off = TRUE
+						break
+				if(!push_off)
+					boutput(usr, SPAN_ALERT("Your leg muscles tense, but there's nothing to push off of!"))
+					return TRUE
 			usr.visible_message(SPAN_ALERT("<b>[owner]</b> leaps far too high and comes crashing down hard!"))
 			playsound(owner.loc, 'sound/impact_sounds/Generic_Shove_1.ogg', 50, 1)
 			playsound(owner.loc, 'sound/impact_sounds/Wood_Hit_1.ogg', 50, 1)

code/obj/mining.dm

@@ -198,7 +198,7 @@
 		// this used to use an area, which meant it only checked
 		var/turf/origin = get_turf(src)
 		var/unacceptable = FALSE
-		for (var/turf/T in block(origin, locate(origin.x + width - 1, origin.y + height - 1, origin.z)))
+		for (var/turf/T in block(locate(origin.x-1, origin.y-1, origin.z), locate(origin.x + width, origin.y + height, origin.z)))
 
 			for (var/mob/living/L in T)
 				if(ismobcritter(L)) // we don't care about critters

maps/donut2.dmm

@@ -1097,7 +1097,6 @@
 "afZ" = (
 /obj/machinery/chem_dispenser/chemical,
 /obj/machinery/light/incandescent,
-/obj/mapping_helper/access/heads,
 /turf/simulated/floor/purplewhite{
 	dir = 8
 	},
@@ -2051,7 +2050,9 @@
 	network = "Zeta"
 	},
 /obj/disposalpipe/segment/mail,
-/turf/simulated/floor/bluegreen/corner,
+/turf/simulated/floor/darkblue/side{
+	dir = 4
+	},
 /area/station/science/lobby)
 "alE" = (
 /turf/simulated/wall/auto/reinforced/supernorn,
@@ -2102,7 +2103,7 @@
 	icon_state = "4-8"
 	},
 /obj/disposalpipe/segment/mail,
-/turf/simulated/floor/blue/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/science/lobby)
@@ -2134,12 +2135,6 @@
 /obj/item/disk/data/tape/master/readonly,
 /turf/simulated/floor/black,
 /area/station/turret_protected/Zeta)
-"alY" = (
-/obj/disposalpipe/segment/mail,
-/turf/simulated/floor/blue/side{
-	dir = 4
-	},
-/area/station/science/lobby)
 "alZ" = (
 /obj/securearea{
 	desc = "A warning sign which reads 'SECURE AREA, Violators WILL be shot.'"
@@ -2190,7 +2185,7 @@
 "amF" = (
 /obj/machinery/light/incandescent,
 /obj/disposalpipe/segment/mail,
-/turf/simulated/floor/blue/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/science/lobby)
@@ -7800,7 +7795,7 @@
 	mail_tag = "captain";
 	name = "captain mail router"
 	},
-/turf/simulated/floor/red/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/hallway/primary/east)
@@ -8354,7 +8349,7 @@
 /obj/cable{
 	icon_state = "1-8"
 	},
-/turf/simulated/floor/red/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/hallway/primary/east)
@@ -8431,7 +8426,7 @@
 	},
 /area/station/crew_quarters/fitness)
 "aTc" = (
-/turf/simulated/floor/red/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/hallway/primary/east)
@@ -8747,7 +8742,7 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/turf/simulated/floor/red/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/hallway/primary/east)
@@ -10320,7 +10315,7 @@
 	mail_tag = "bridge";
 	name = "bridge mail router"
 	},
-/turf/simulated/floor/red/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/hallway/primary/east)
@@ -11786,6 +11781,13 @@
 	dir = 4
 	},
 /area/station/crew_quarters/kitchen)
+"blk" = (
+/obj/disposalpipe/segment/mail,
+/obj/machinery/light/incandescent,
+/turf/simulated/floor/darkblue/side{
+	dir = 4
+	},
+/area/station/hallway/primary/east)
 "bll" = (
 /obj/disposalpipe/segment/mail{
 	dir = 2;
@@ -15894,7 +15896,7 @@
 	icon_state = "1-2"
 	},
 /obj/disposalpipe/segment,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/purple,
 /area/station/janitor/supply)
 "bZd" = (
 /obj/machinery/atmospherics/pipe/manifold{
@@ -19658,7 +19660,7 @@
 	name = "autoname  - SS13";
 	tag = ""
 	},
-/turf/simulated/floor/red/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/hallway/primary/east)
@@ -19719,6 +19721,12 @@
 /obj/landmark/kudzu,
 /turf/simulated/floor/plating,
 /area/station/maintenance/northeast)
+"enq" = (
+/obj/decal/cleanable/dirt/dirt5,
+/obj/random_item_spawner/junk/one_or_zero,
+/obj/machinery/light/small/sticky/frostedred,
+/turf/simulated/floor/plating,
+/area/station/maintenance/west)
 "enT" = (
 /obj/stool/chair/syndicate,
 /obj/npc/trader/exclown,
@@ -19834,7 +19842,9 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/turf/simulated/floor,
+/turf/simulated/floor/darkblue/side{
+	dir = 5
+	},
 /area/station/science/lobby)
 "eqa" = (
 /obj/disposalpipe/segment{
@@ -22927,7 +22937,7 @@
 /area/station/medical/medbay)
 "gni" = (
 /obj/disposalpipe/segment/mail,
-/turf/simulated/floor/blue/corner{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/science/lobby)
@@ -31585,6 +31595,12 @@
 	dir = 1
 	},
 /area/station/hallway/primary/north)
+"lAw" = (
+/obj/disposalpipe/segment/mail,
+/turf/simulated/floor/darkblue/side{
+	dir = 4
+	},
+/area/station/hallway/primary/east)
 "lAW" = (
 /obj/machinery/door/airlock/pyro/external{
 	dir = 4
@@ -31700,7 +31716,7 @@
 	name = "Bridge Lockdown Doors";
 	opacity = 0
 	},
-/turf/simulated/floor/red/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/hallway/primary/east)
@@ -34393,7 +34409,7 @@
 	dir = 0;
 	name = "autoname - SS13"
 	},
-/turf/simulated/floor/blue/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 1
 	},
 /area/station/hallway/primary/south)
@@ -36253,7 +36269,7 @@
 /obj/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/grass/leafy,
+/turf/simulated/floor/dirt,
 /area/station/ranch)
 "olV" = (
 /obj/machinery/light/incandescent,
@@ -36859,8 +36875,8 @@
 "oyr" = (
 /obj/machinery/firealarm/east,
 /obj/disposalpipe/segment/mail,
-/turf/simulated/floor/neutral/side{
-	dir = 4
+/turf/simulated/floor/darkblue/side{
+	dir = 10
 	},
 /area/station/science/lobby)
 "oys" = (
@@ -37464,7 +37480,7 @@
 /obj/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/red/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/hallway/primary/east)
@@ -39669,7 +39685,7 @@
 	dir = 10
 	},
 /obj/machinery/light/incandescent,
-/turf/simulated/floor/blue/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 1
 	},
 /area/station/hallway/primary/south)
@@ -42742,7 +42758,7 @@
 	dir = 4
 	},
 /obj/disposalpipe/segment/mail,
-/turf/simulated/floor/red/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/hallway/primary/east)
@@ -45188,7 +45204,7 @@
 	},
 /obj/machinery/door/airlock/pyro/glass,
 /obj/mapping_helper/firedoor_spawn,
-/turf/simulated/floor/red/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/hallway/primary/east)
@@ -48366,9 +48382,7 @@
 /obj/disposalpipe/segment/produce{
 	dir = 4
 	},
-/turf/simulated/floor/grasstodirt{
-	dir = 5
-	},
+/turf/simulated/floor/dirt,
 /area/station/ranch)
 "vmR" = (
 /obj/cable,
@@ -49439,7 +49453,7 @@
 "vMe" = (
 /obj/machinery/light_switch/east,
 /obj/disposalpipe/segment/mail,
-/turf/simulated/floor/blue/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/science/lobby)
@@ -51224,7 +51238,7 @@
 /obj/cable{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/red/side{
+/turf/simulated/floor/darkblue/side{
 	dir = 4
 	},
 /area/station/hallway/primary/east)
@@ -70004,8 +70018,8 @@ lPU
 lPU
 aXp
 rPd
-hWx
-gRF
+arN
+enq
 xOv
 tHK
 xuC
@@ -94140,20 +94154,20 @@ aSs
 wXs
 aTc
 aUr
-aQM
+lAw
 tuE
-aQM
-aQf
+lAw
+blk
 rWe
 aPx
-aQf
+blk
 oMA
 bbZ
-aQM
+lAw
 lDi
-aQM
-aQf
-aQM
+lAw
+blk
+lAw
 ekD
 lLB
 aXV
@@ -125185,10 +125199,10 @@ ajK
 oyr
 alD
 alM
-alY
+gni
 vMe
 amF
-alY
+gni
 gni
 epT
 rxi

strings/changelog.txt

@@ -1,3 +1,9 @@
+
+(t)wed dec 25 24
+(u)glowbold
+(p)21764
+(e)🪲⚖🔨|C-Bug, C-Balance, A-Player-Actions
+(+)Jumpy can no longer be used while floating in space.
 (t)tue dec 24 24
 (u)LeahTheTech
 (*)Magboots no longer allow you to anchor to space, now they prevent you from walking off into space when active.