Merge remote-tracking branch 'upstream/master' into ipcs-but-good

shiptest-ss13 · Nov 27, 2023 · 9c84ad7 · 9c84ad7
2 parents d3f9272 + e561205
commit 9c84ad7
Show file tree

Hide file tree

Showing 42 changed files with 65 additions and 549 deletions.
diff --git a/_maps/deprecated/Ruins/TheDerelict.dmm b/_maps/deprecated/Ruins/TheDerelict.dmm
@@ -1148,9 +1148,6 @@
 "fw" = (
 /turf/open/floor/plasteel/airless,
 /area/ruin/space/derelict/bridge/access)
-"fx" = (
-/turf/open/floor/plasteel/airless,
-/area/ruin/space/derelict/bridge/access)
 "fy" = (
 /obj/structure/table,
 /obj/item/assembly/flash/handheld,
@@ -1837,9 +1834,6 @@
 /obj/item/storage/box/lights/mixed,
 /turf/open/floor/plating/airless,
 /area/ruin/space/derelict/singularity_engine)
-"in" = (
-/turf/open/floor/plating/airless,
-/area/ruin/space/derelict/singularity_engine)
 "io" = (
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating/airless,
@@ -8596,7 +8590,7 @@ dO
 dP
 dX
 dW
-in
+dW
 dr
 iP
 ay
@@ -10391,7 +10385,7 @@ aa
 cs
 fv
 fF
-fx
+fw
 cs
 ga
 yb
@@ -10503,8 +10497,8 @@ aa
 dk
 cs
 fw
-fx
-fx
+fw
+fw
 fR
 eR
 gm
@@ -10615,9 +10609,9 @@ aa
 aa
 aa
 cs
-fx
-fx
-fx
+fw
+fw
+fw
 cs
 eR
 gn
@@ -10729,8 +10723,8 @@ aa
 aa
 cs
 fy
-fx
-fx
+fw
+fw
 fS
 MI
 go
@@ -10842,8 +10836,8 @@ aa
 ZB
 cs
 fz
-fx
-fx
+fw
+fw
 fS
 MI
 go
@@ -10955,8 +10949,8 @@ ZB
 ZB
 cs
 fA
-fx
-fx
+fw
+fw
 fS
 MI
 go
@@ -11068,8 +11062,8 @@ ZB
 ZB
 cs
 fB
-fx
-fx
+fw
+fw
 fS
 MI
 gp
@@ -11296,10 +11290,10 @@ cs
 cs
 cs
 cs
-fx
+fw
 py
 gq
-fx
+fw
 fZ
 gO
 fZ
@@ -11409,10 +11403,10 @@ cx
 cx
 cx
 cs
-fx
+fw
 py
-fx
-fx
+fw
+fw
 fZ
 gL
 aa
@@ -11635,10 +11629,10 @@ cs
 cs
 cs
 cs
-fx
-fx
-fx
-fx
+fw
+fw
+fw
+fw
 cs
 cs
 ZB
@@ -11748,10 +11742,10 @@ cs
 fC
 fC
 cs
-fx
+fw
 gg
-fx
-fx
+fw
+fw
 cs
 aa
 ay

diff --git a/_maps/deprecated/Ships/nanotrasen_pubby.dmm b/_maps/deprecated/Ships/nanotrasen_pubby.dmm
@@ -446,10 +446,6 @@
 	pixel_x = 5;
 	pixel_y = 4
 	},
-/obj/item/storage/fancy/cigarettes/cigpack_shadyjims{
-	pixel_x = -7;
-	pixel_y = 6
-	},
 /obj/item/lighter{
 	pixel_x = -5;
 	pixel_y = 4

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
@@ -7697,9 +7697,6 @@
 	pixel_x = 8;
 	pixel_y = 2
 	},
-/obj/item/storage/fancy/cigarettes/cigpack_shadyjims{
-	pixel_y = 10
-	},
 /obj/item/lighter/greyscale{
 	pixel_y = 4;
 	pixel_x = -9

diff --git a/code/__DEFINES/fonts.dm b/code/__DEFINES/fonts.dm
@@ -2,7 +2,7 @@
 /// Font used by regular pens
 #define PEN_FONT "Verdana"
 /// Font used by fancy pens
-#define FOUNTAIN_PEN_FONT "Segoe Script"
+#define FOUNTAIN_PEN_FONT "Adobe Garamond"
 /// Font used by crayons
 #define CRAYON_FONT "Comic Sans MS"
 /// Font used by printers

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -226,7 +226,6 @@
 #define SANITY_INSANE 0
 
 //Nutrition levels for humans
-#define NUTRITION_LEVEL_FAT 600
 #define NUTRITION_LEVEL_FULL 550
 #define NUTRITION_LEVEL_WELL_FED 450
 #define NUTRITION_LEVEL_FED 350

diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -146,7 +146,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_MUTE "mute"
 #define TRAIT_EMOTEMUTE "emotemute"
 #define TRAIT_NEARSIGHT "nearsighted"
-#define TRAIT_FAT "fat"
 #define TRAIT_HUSK "husk"
 #define TRAIT_BADDNA "baddna"
 #define TRAIT_CLUMSY "clumsy"
@@ -322,7 +321,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define UNCONSCIOUS_TRAIT "unconscious"
 #define EYE_DAMAGE "eye_damage"
 #define GENETIC_MUTATION "genetic"
-#define OBESITY "obesity"
 #define MAGIC_TRAIT "magic"
 #define TRAUMA_TRAIT "trauma"
 #define DISEASE_TRAIT "disease"

diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
@@ -17,7 +17,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_EMOTEMUTE " = TRAIT_EMOTEMUTE,
 		"TRAIT_DEAF" = TRAIT_DEAF,
 		"TRAIT_NEARSIGHT" = TRAIT_NEARSIGHT,
-		"TRAIT_FAT" = TRAIT_FAT,
 		"TRAIT_HUSK" = TRAIT_HUSK,
 		"TRAIT_BADDNA" = TRAIT_BADDNA,
 		"TRAIT_CLUMSY" = TRAIT_CLUMSY,

diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
@@ -164,11 +164,6 @@ Override makes it so the alert is not replaced until cleared by a clear_alert wi
 //End gas alerts
 
 
-/atom/movable/screen/alert/fat
-	name = "Fat"
-	desc = "You ate too much food, lardass. Run around and lose some weight."
-	icon_state = "fat"
-
 /atom/movable/screen/alert/hungry
 	name = "Hungry"
 	desc = "Some food would be good right about now."

diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm
@@ -57,7 +57,7 @@
 			pref = PARALLAX_HIGH
 		switch(C.prefs.parallax)
 			if (PARALLAX_INSANE)
-				C.parallax_throttle = FALSE
+				C.parallax_throttle = PARALLAX_DELAY_DEFAULT
 				C.parallax_layers_max = 5
 				return TRUE
 
@@ -298,13 +298,6 @@
 	speed = 3
 	layer = 3
 
-/atom/movable/screen/parallax_layer/random/space_gas
-	icon_state = "space_gas"
-
-/atom/movable/screen/parallax_layer/random/space_gas/Initialize(mapload, view)
-	. = ..()
-	src.add_atom_colour(SSparallax.random_parallax_color, ADMIN_COLOUR_PRIORITY)
-
 /atom/movable/screen/parallax_layer/random/asteroids
 	icon_state = "asteroids"
 

diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm
@@ -8,14 +8,12 @@ SUBSYSTEM_DEF(parallax)
 	var/planet_x_offset = 128
 	var/planet_y_offset = 128
 	var/random_layer
-	var/random_parallax_color
 
 //These are cached per client so needs to be done asap so people joining at roundstart do not miss these.
 /datum/controller/subsystem/parallax/PreInit()
 	. = ..()
-	if(prob(70))	//70% chance to pick a special extra layer
-		random_layer = pick(/atom/movable/screen/parallax_layer/random/space_gas, /atom/movable/screen/parallax_layer/random/asteroids)
-		random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_SILVER, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE)//Special color for random_layer1. Has to be done here so everyone sees the same color.
+	if(prob(20))	//20% chance to pick a special extra layer, in this case just asteroids, no space dirt
+		random_layer = /atom/movable/screen/parallax_layer/random/asteroids
 	planet_y_offset = rand(100, 160)
 	planet_x_offset = rand(100, 160)
 

diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
@@ -322,12 +322,7 @@
 	if(HAS_TRAIT(L, TRAIT_NOHUNGER))
 		return FALSE //no mood events for nutrition
 	switch(L.nutrition)
-		if(NUTRITION_LEVEL_FULL to INFINITY)
-			if (!HAS_TRAIT(L, TRAIT_VORACIOUS))
-				add_event(null, "nutrition", /datum/mood_event/fat)
-			else
-				add_event(null, "nutrition", /datum/mood_event/wellfed) // round and full
-		if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL)
+		if(NUTRITION_LEVEL_WELL_FED to INFINITY)
 			add_event(null, "nutrition", /datum/mood_event/wellfed)
 		if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED)
 			add_event(null, "nutrition", /datum/mood_event/fed)

diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
@@ -255,8 +255,6 @@
 		defense_mod -= 1
 	if(HAS_TRAIT(target, TRAIT_CLUMSY))
 		defense_mod -= 2
-	if(HAS_TRAIT(target, TRAIT_FAT)) // chonkers are harder to knock over
-		defense_mod += 1
 	if(HAS_TRAIT(target, TRAIT_GRABWEAKNESS))
 		defense_mod -= 2
 	if(HAS_TRAIT(target, TRAIT_DWARF))

diff --git a/code/datums/mood_events/needs_events.dm b/code/datums/mood_events/needs_events.dm
@@ -1,8 +1,4 @@
 //nutrition
-/datum/mood_event/fat
-	description = "<span class='warning'><B>I'm so fat...</B></span>\n" //muh fatshaming
-	mood_change = -6
-
 /datum/mood_event/wellfed
 	description = "<span class='nicegreen'>I'm stuffed!</span>\n"
 	mood_change = 8