Merge branch 'master' into Factoly

shiptest-ss13 · May 28, 2024 · 2309b45 · 2309b45
2 parents 487c7eb + 0606877
commit 2309b45
Show file tree

Hide file tree

Showing 188 changed files with 1,008 additions and 673 deletions.
diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -7195,7 +7195,7 @@
 /turf/open/floor/plating/rust,
 /area/ruin/jungle/starport)
 "WR" = (
-/obj/machinery/computer/communications{
+/obj/structure/frame/computer{
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium/red,

diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -368,7 +368,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/jungle/cavecrew/hallway)
 "ei" = (
-/obj/machinery/computer/communications{
+/obj/structure/frame/computer{
 	dir = 8
 	},
 /obj/effect/turf_decal/techfloor{

diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
@@ -1711,7 +1711,7 @@
 /turf/open/floor/mineral/titanium/white,
 /area/overmap_encounter/planetoid/cave/explored)
 "kk" = (
-/obj/machinery/computer/communications{
+/obj/structure/frame/computer{
 	dir = 4
 	},
 /turf/open/floor/mineral/titanium/blue,

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
@@ -2744,9 +2744,8 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ruin/rockplanet/nanotrasen)
 "WY" = (
-/obj/machinery/computer/communications{
+/obj/structure/frame/computer{
 	dir = 1;
-	req_access = null
 	},
 /obj/effect/turf_decal/corner/opaque/red/diagonal,
 /turf/open/floor/plasteel/tech/techmaint,

diff --git a/_maps/RandomRuins/SpaceRuins/astraeus.dmm b/_maps/RandomRuins/SpaceRuins/astraeus.dmm
@@ -1724,7 +1724,7 @@
 /turf/open/floor/plasteel/airless,
 /area/ruin/space/has_grav/astraeus/munitions)
 "TV" = (
-/obj/machinery/computer/communications{
+/obj/structure/frame/computer{
 	dir = 8
 	},
 /turf/open/floor/plating/airless,

diff --git a/_maps/RandomRuins/SpaceRuins/ntfacility.dmm b/_maps/RandomRuins/SpaceRuins/ntfacility.dmm
@@ -1633,7 +1633,7 @@
 	dir = 8
 	},
 /obj/structure/window/reinforced,
-/obj/machinery/computer/communications{
+/obj/structure/frame/computer{
 	dir = 1
 	},
 /turf/open/floor/wood,

diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
@@ -1766,7 +1766,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/onehalf)
 "Gv" = (
-/obj/machinery/computer/communications{
+/obj/structure/frame/computer{
 	dir = 8
 	},
 /turf/open/floor/plasteel,

diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
@@ -4857,7 +4857,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "VV" = (
-/obj/machinery/computer/communications{
+/obj/structure/frame/computer{
 	dir = 8
 	},
 /obj/effect/turf_decal/techfloor{

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -1467,9 +1467,8 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/cargo/port)
 "ph" = (
-/obj/machinery/computer/communications{
-	dir = 8;
-	icon_state = "computer-left"
+/obj/structure/frame/computer{
+	dir = 8
 	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
@@ -1934,7 +1933,7 @@
 /obj/structure/railing,
 /obj/machinery/computer/atmos_control/incinerator{
 	dir = 4;
-	sensors = list("gecko_burn_sensor"="Combustion    Chamber")
+	sensors = list("gecko_burn_sensor"="Combustion Chamber")
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering/engine)
@@ -2853,7 +2852,7 @@
 "CI" = (
 /obj/machinery/computer/helm{
 	dir = 8;
-	icon_state = "computer-middle"
+	icon_state = "computer-left"
 	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
@@ -2334,9 +2334,8 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/cryo)
 "pm" = (
-/obj/machinery/computer/communications{
-	dir = 8;
-	icon_state = "computer-right"
+/obj/structure/frame/computer{
+	dir = 8
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
@@ -3088,8 +3087,7 @@
 /area/ship/bridge)
 "ud" = (
 /obj/machinery/computer/helm{
-	dir = 8;
-	icon_state = "computer-left"
+	dir = 8
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
@@ -2693,7 +2693,7 @@
 /turf/open/floor/wood,
 /area/ship/hallway/central)
 "uY" = (
-/obj/machinery/computer/communications{
+/obj/structure/frame/computer{
 	dir = 8
 	},
 /obj/effect/turf_decal/corner/opaque/ntblue/half{

diff --git a/_maps/shuttles/pirate/pirate_noderider.dmm b/_maps/shuttles/pirate/pirate_noderider.dmm
@@ -435,9 +435,7 @@
 	id = "noderiders";
 	name = "cargo airshield"
 	},
-/obj/machinery/computer/crew{
-	icon_state = "computer-right"
-	},
+/obj/machinery/computer/crew,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "fG" = (
@@ -1570,9 +1568,7 @@
 	pixel_y = 25
 	},
 /obj/machinery/firealarm/directional/west,
-/obj/machinery/computer/communications{
-	icon_state = "computer-left"
-	},
+/obj/structure/frame/computer,
 /obj/machinery/light/small/built/directional/north{
 	pixel_x = 16
 	},

diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -2560,11 +2560,8 @@
 /obj/effect/turf_decal/corner/opaque/syndiered/half{
 	dir = 4
 	},
-/obj/machinery/computer/communications{
-	dir = 8;
-	req_access = list(151);
-	set_obj_flags = "EMAGGED";
-	icon_state = "computer-right"
+/obj/structure/frame/computer{
+	dir = 8
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/bridge)
@@ -4262,7 +4259,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/computer/helm{
 	dir = 8;
-	icon_state = "computer-middle"
+	icon_state = "computer-right"
 	},
 /obj/effect/turf_decal/corner/opaque/syndiered/half{
 	dir = 4

diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm
@@ -33,6 +33,7 @@
 #define IN_STORAGE (1<<11) //is this item in the storage item, such as backpack? used for tooltips
 #define SURGICAL_TOOL (1<<12)	//Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes)
 #define EYE_STAB (1<<13) /// Item can be used to eyestab
+#define NO_PIXEL_RANDOM_DROP (1<<14) //if dropped, it wont have a randomized pixel_x/pixel_y
 
 // Flags for the clothing_flags var on /obj/item/clothing
 

diff --git a/code/__DEFINES/power.dm b/code/__DEFINES/power.dm
@@ -12,3 +12,16 @@
 
 #define TESLA_DEFAULT_POWER 1738260
 #define TESLA_MINI_POWER 869130
+
+#define LIGHT_DRAW 10 // mulitplied by brightness, typically 4-8
+
+#define IDLE_DRAW_MINIMAL 50 // 20x = 1kw, used for small things and computers on stand-by
+#define IDLE_DRAW_LOW 200 //5x = 1kw, used for always-active computers
+#define IDLE_DRAW_MEDIUM 500 //2x = 1kw
+#define IDLE_DRAW_HIGH 1000 //1kw
+
+#define ACTIVE_DRAW_MINIMAL 200 //5x = 1kw
+#define ACTIVE_DRAW_LOW 500 //2x = 1kw
+#define ACTIVE_DRAW_MEDIUM 1000 //microwaves use this
+#define ACTIVE_DRAW_HIGH 2000
+#define ACTIVE_DRAW_EXTREME 5000 //highest this value should be in most cases
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
@@ -174,6 +174,7 @@
 #define FIRE_PRIORITY_PARALLAX 65
 #define FIRE_PRIORITY_INSTRUMENTS 80
 #define FIRE_PRIORITY_MOBS 100
+#define FIRE_PRIORITY_MOVABLE_PHYSICS 105
 #define FIRE_PRIORITY_TGUI 110
 #define FIRE_PRIORITY_TICKER 200
 #define FIRE_PRIORITY_ATMOS_ADJACENCY 300

diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -294,8 +294,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_NIGHT_VISION "night_vision"
 #define TRAIT_LIGHT_STEP "light_step"
 #define TRAIT_SPIRITUAL "spiritual"
-#define TRAIT_FAN_CLOWN "fan_clown"
-#define TRAIT_FAN_MIME "fan_mime"
 #define TRAIT_FAN_RILENA "fan_rilena"
 #define TRAIT_VORACIOUS "voracious"
 #define TRAIT_SELF_AWARE "self_aware"

diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
@@ -152,6 +152,7 @@ DEFINE_BITFIELD(item_flags, list(
 	"NOBLUDGEON" = NOBLUDGEON,
 	"NO_MAT_REDEMPTION" = NO_MAT_REDEMPTION,
 	"SLOWS_WHILE_IN_HAND" = SLOWS_WHILE_IN_HAND,
+	"NO_PIXEL_RANDOM_DROP" = NO_PIXEL_RANDOM_DROP,
 ))
 
 DEFINE_BITFIELD(machine_stat, list(

diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
@@ -125,8 +125,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NIGHT_VISION" = TRAIT_NIGHT_VISION,
 		"TRAIT_LIGHT_STEP" = TRAIT_LIGHT_STEP,
 		"TRAIT_SPIRITUAL" = TRAIT_SPIRITUAL,
-		"TRAIT_FAN_CLOWN" = TRAIT_FAN_CLOWN,
-		"TRAIT_FAN_MIME" = TRAIT_FAN_MIME,
 		"TRAIT_VORACIOUS" = TRAIT_VORACIOUS,
 		"TRAIT_SELF_AWARE" = TRAIT_SELF_AWARE,
 		"TRAIT_FREERUNNING" = TRAIT_FREERUNNING,

diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm
@@ -47,10 +47,7 @@ SUBSYSTEM_DEF(machines)
 	while(currentrun.len)
 		var/obj/machinery/thing = currentrun[currentrun.len]
 		currentrun.len--
-		if(!QDELETED(thing) && thing.process(seconds) != PROCESS_KILL)
-			if(thing.use_power)
-				thing.auto_use_power() //add back the power state
-		else
+		if(QDELETED(thing) || thing.process(seconds) == PROCESS_KILL)
 			processing -= thing
 			if (!QDELETED(thing))
 				thing.datum_flags &= ~DF_ISPROCESSING

diff --git a/code/controllers/subsystem/processing/movable_physics.dm b/code/controllers/subsystem/processing/movable_physics.dm
@@ -0,0 +1,24 @@
+///Real fast ticking subsystem for moving movables via modifying pixel_x/y/z
+PROCESSING_SUBSYSTEM_DEF(movablephysics)
+	name = "Movable Physics"
+	wait = 0.05 SECONDS
+	stat_tag = "MP"
+	priority = FIRE_PRIORITY_MOVABLE_PHYSICS
+
+/datum/controller/subsystem/processing/movablephysics/fire(resumed = FALSE)
+	if (!resumed)
+		currentrun = processing.Copy()
+	//cache for sanic speed (lists are references anyways)
+	var/list/current_run = currentrun
+
+	while(current_run.len)
+		var/datum/component/thing = current_run[current_run.len]
+		current_run.len--
+		if(QDELETED(thing))
+			processing -= thing
+		else
+			if(thing.process(wait * 0.1) == PROCESS_KILL)
+				// fully stop so that a future START_PROCESSING will work
+				STOP_PROCESSING(src, thing)
+		if (MC_TICK_CHECK)
+			return
diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
@@ -23,7 +23,6 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 							list("Ageusia","Vegetarian","Deviant Tastes"), \
 							list("Ananas Affinity","Ananas Aversion"), \
 							list("Alcohol Tolerance","Light Drinker"), \
-							list("Clown Fan","Mime Fan", "RILENA Super Fan"), \
 							list("Bad Touch", "Friendly"))
 
 	species_blacklist = list("Blood Deficiency" = list(SPECIES_IPC, SPECIES_JELLYPERSON, SPECIES_PLASMAMAN, SPECIES_VAMPIRE))