Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG …

…into upstream-mirror-1880
Fluffy-Frontier · Apr 10, 2024 · 7ada24e · 7ada24e
2 parents 69cb104 + e953b93
commit 7ada24e
Show file tree

Hide file tree

Showing 173 changed files with 1,265 additions and 980 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/nova/des_two.dmm b/_maps/RandomRuins/SpaceRuins/nova/des_two.dmm
@@ -578,6 +578,12 @@
 /obj/item/stack/sheet/mineral/uranium{
 	amount = 10
 	},
+/obj/item/stack/sheet/mineral/plasma{
+	amount = 10
+	},
+/obj/item/stack/sheet/mineral/titanium{
+	amount = 10
+	},
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/nova/des_two/bridge/vault)
 "cC" = (
@@ -3366,6 +3372,11 @@
 /obj/machinery/light/cold/directional/east,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/nova/des_two/halls)
+"ox" = (
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/door/window/survival_pod/left/directional/north,
+/turf/open/floor/iron/dark/small,
+/area/ruin/space/has_grav/nova/des_two/service/hydroponics)
 "oA" = (
 /obj/structure/cable,
 /obj/machinery/light/cold/directional/west,
@@ -7044,16 +7055,13 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
-/obj/item/storage/box/stockparts/basic{
-	pixel_y = 6
-	},
-/obj/item/storage/box/stockparts/basic{
-	pixel_x = 8
-	},
-/obj/item/storage/box/beakers{
+/obj/item/storage/box/stockparts/deluxe{
 	pixel_x = -4;
 	pixel_y = -2
 	},
+/obj/item/storage/box/stockparts/deluxe{
+	pixel_x = 8
+	},
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/nova/des_two/research)
 "FX" = (
@@ -7110,6 +7118,7 @@
 /obj/machinery/hydroponics/constructable,
 /obj/machinery/airalarm/directional/east,
 /obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/door/window/survival_pod/left/directional/north,
 /turf/open/floor/iron/dark/small,
 /area/ruin/space/has_grav/nova/des_two/service/hydroponics)
 "Gg" = (
@@ -9597,6 +9606,7 @@
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/effect/mapping_helpers/apc/syndicate_access,
 /obj/structure/cable,
+/obj/item/storage/part_replacer/bluespace,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/nova/des_two/research)
 "Rl" = (
@@ -10262,6 +10272,7 @@
 	pixel_x = 4
 	},
 /obj/item/reagent_containers/blood/o_minus,
+/obj/item/defibrillator/loaded,
 /turf/open/floor/iron/dark/textured_large,
 /area/ruin/space/has_grav/nova/des_two/cargo)
 "Ud" = (
@@ -13419,8 +13430,8 @@ mi
 Xz
 PS
 VB
-VB
-VB
+ox
+ox
 Hz
 tm
 RH
@@ -13529,8 +13540,8 @@ kz
 Fx
 we
 VB
-VB
-VB
+ox
+ox
 Hz
 Nl
 Jv
@@ -13584,8 +13595,8 @@ mT
 WW
 LF
 VB
-VB
-VB
+ox
+ox
 Hz
 LB
 Gz
@@ -13695,7 +13706,7 @@ DH
 dn
 eO
 Gf
-VB
+ox
 Hz
 KT
 Ku

diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm
@@ -15,7 +15,7 @@
 #define IGNORE_DENSITY (1<<11) //! Can we ignore density when building on this object? (for example, directional windows and grilles)
 #define INFINITE_RESKIN (1<<12) // We can reskin this item infinitely
 #define CONDUCTS_ELECTRICITY (1<<13) //! Can this object conduct electricity?
-#define NO_DECONSTRUCTION (1<<14) //! Prevent deconstruction of this object.
+#define NO_DECONSTRUCTION (1<<14) //! Atoms don't spawn anything when deconstructed. They just vanish
 
 // If you add new ones, be sure to add them to /obj/Initialize as well for complete mapping support
 

diff --git a/code/__DEFINES/~nova_defines/apc_defines.dm b/code/__DEFINES/~nova_defines/apc_defines.dm
@@ -1,6 +1,6 @@
 /// Lower excess value for APC arcing, 5% chance to arc
-#define APC_ARC_LOWERLIMIT 2500000
+#define APC_ARC_LOWERLIMIT 4 MEGA WATTS
 /// Moderate excess value for APC arcing, 10% chance to arc
-#define APC_ARC_MEDIUMLIMIT 5000000
+#define APC_ARC_MEDIUMLIMIT 6 MEGA WATTS
 /// Upper excess value for for APC arcing, 15% chance to arc
-#define APC_ARC_UPPERLIMIT 7500000
+#define APC_ARC_UPPERLIMIT 8.5 MEGA WATTS
diff --git a/code/_onclick/hud/generic_dextrous.dm b/code/_onclick/hud/generic_dextrous.dm
@@ -43,6 +43,9 @@
 	using.icon = ui_style
 	static_inventory += using
 
+	healthdoll = new /atom/movable/screen/healthdoll/living(null, src)
+	infodisplay += healthdoll
+
 	mymob.canon_client?.clear_screen()
 
 	for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))

diff --git a/code/datums/elements/screentips/README.md b/code/datums/elements/screentips/README.md
@@ -35,18 +35,17 @@ Example:
 
 ```dm
 /obj/structure/table/Initialize(mapload)
-	if (!(obj_flags & NO_DECONSTRUCTION))
-		var/static/list/tool_behaviors = list(
-			TOOL_SCREWDRIVER = list(
-				SCREENTIP_CONTEXT_RMB = "Disassemble",
-			),
-
-			TOOL_WRENCH = list(
-				SCREENTIP_CONTEXT_RMB = "Deconstruct",
-			),
-		)
-
-		AddElement(/datum/element/contextual_screentip_tools, tool_behaviors)
+	var/static/list/tool_behaviors = list(
+		TOOL_SCREWDRIVER = list(
+			SCREENTIP_CONTEXT_RMB = "Disassemble",
+		),
+
+		TOOL_WRENCH = list(
+			SCREENTIP_CONTEXT_RMB = "Deconstruct",
+		),
+	)
+
+	AddElement(/datum/element/contextual_screentip_tools, tool_behaviors)
 ```
 
 This will display "RMB: Deconstruct" when the user hovers over a table with a wrench.