Merge remote-tracking branch 'upstream/master'

PowerfulBacon · Jan 7, 2022 · 18b7fc9 · 18b7fc9
2 parents 97fe902 + e7112dc
commit 18b7fc9
Show file tree

Hide file tree

Showing 51 changed files with 9,199 additions and 7,061 deletions.
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
diff --git a/beestation.dme b/beestation.dme
@@ -119,6 +119,7 @@
 #include "code\__DEFINES\stat_tracking.dm"
 #include "code\__DEFINES\station.dm"
 #include "code\__DEFINES\status_effects.dm"
+#include "code\__DEFINES\strippable.dm"
 #include "code\__DEFINES\subsystems.dm"
 #include "code\__DEFINES\text.dm"
 #include "code\__DEFINES\tgs.config.dm"
@@ -600,6 +601,7 @@
 #include "code\datums\elements\embed.dm"
 #include "code\datums\elements\firestacker.dm"
 #include "code\datums\elements\squish.dm"
+#include "code\datums\elements\strippable.dm"
 #include "code\datums\elements\decals\blood.dm"
 #include "code\datums\helper_datums\events.dm"
 #include "code\datums\helper_datums\getrev.dm"
@@ -2397,6 +2399,7 @@
 #include "code\modules\mob\living\carbon\carbon_defense.dm"
 #include "code\modules\mob\living\carbon\carbon_defines.dm"
 #include "code\modules\mob\living\carbon\carbon_movement.dm"
+#include "code\modules\mob\living\carbon\carbon_stripping.dm"
 #include "code\modules\mob\living\carbon\damage_procs.dm"
 #include "code\modules\mob\living\carbon\death.dm"
 #include "code\modules\mob\living\carbon\emote.dm"
@@ -2450,6 +2453,7 @@
 #include "code\modules\mob\living\carbon\human\human_defines.dm"
 #include "code\modules\mob\living\carbon\human\human_helpers.dm"
 #include "code\modules\mob\living\carbon\human\human_movement.dm"
+#include "code\modules\mob\living\carbon\human\human_stripping.dm"
 #include "code\modules\mob\living\carbon\human\inventory.dm"
 #include "code\modules\mob\living\carbon\human\life.dm"
 #include "code\modules\mob\living\carbon\human\physiology.dm"
@@ -3316,6 +3320,7 @@
 #include "code\modules\tgs\includes.dm"
 #include "code\modules\tgui\external.dm"
 #include "code\modules\tgui\states.dm"
+#include "code\modules\tgui\status_composers.dm"
 #include "code\modules\tgui\tgui.dm"
 #include "code\modules\tgui\tgui_window.dm"
 #include "code\modules\tgui\states\admin.dm"

diff --git a/code/__DEFINES/keybinding.dm b/code/__DEFINES/keybinding.dm
@@ -39,6 +39,10 @@
 #define COMSIG_KB_LIVING_LOOKDOWN_DOWN "keybinding_living_lookdown_down"
 
 //Mob
+#define COMSIG_KB_MOB_MOVENORTH_DOWN "keybinding_mob_movenorth_down"
+#define COMSIG_KB_MOB_MOVEEAST_DOWN "keybinding_mob_moveeast_down"
+#define COMSIG_KB_MOB_MOVESOUTH_DOWN "keybinding_mob_movesouth_down"
+#define COMSIG_KB_MOB_MOVEWEST_DOWN "keybinding_mob_movewest_down"
 #define COMSIG_KB_MOB_FACENORTH_DOWN "keybinding_mob_facenorth_down"
 #define COMSIG_KB_MOB_FACEEAST_DOWN "keybinding_mob_faceeast_down"
 #define COMSIG_KB_MOB_FACESOUTH_DOWN "keybinding_mob_facesouth_down"

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -346,7 +346,7 @@
 #define WIZARD_AGE_MIN		30	//! youngest a wizard can be
 #define APPRENTICE_AGE_MIN	29	//! youngest an apprentice can be
 #define SHOES_SLOWDOWN		0	//! How much shoes slow you down by default. Negative values speed you up
-#define POCKET_STRIP_DELAY			40	//! time taken (in deciseconds) to search somebody's pockets
+#define POCKET_STRIP_DELAY	(4 SECONDS)	//! time taken to search somebody's pockets
 #define DOOR_CRUSH_DAMAGE	15	//! the amount of damage that airlocks deal when they crush you
 
 #define	HUNGER_FACTOR		0.1	//! factor at which mob nutrition decreases

diff --git a/code/__DEFINES/strippable.dm b/code/__DEFINES/strippable.dm
@@ -0,0 +1,31 @@
+// All of these must be matched in StripMenu.js.
+#define STRIPPABLE_ITEM_HEAD "head"
+#define STRIPPABLE_ITEM_BACK "back"
+#define STRIPPABLE_ITEM_MASK "mask"
+#define STRIPPABLE_ITEM_NECK "neck"
+#define STRIPPABLE_ITEM_EYES "eyes"
+#define STRIPPABLE_ITEM_EARS "ears"
+#define STRIPPABLE_ITEM_JUMPSUIT "jumpsuit"
+#define STRIPPABLE_ITEM_SUIT "suit"
+#define STRIPPABLE_ITEM_GLOVES "gloves"
+#define STRIPPABLE_ITEM_FEET "shoes"
+#define STRIPPABLE_ITEM_SUIT_STORAGE "suit_storage"
+#define STRIPPABLE_ITEM_ID "id"
+#define STRIPPABLE_ITEM_BELT "belt"
+#define STRIPPABLE_ITEM_LPOCKET "left_pocket"
+#define STRIPPABLE_ITEM_RPOCKET "right_pocket"
+#define STRIPPABLE_ITEM_LHAND "left_hand"
+#define STRIPPABLE_ITEM_RHAND "right_hand"
+#define STRIPPABLE_ITEM_HANDCUFFS "handcuffs"
+#define STRIPPABLE_ITEM_LEGCUFFS "legcuffs"
+#define STRIPPABLE_ITEM_CORGI_COLLAR "corgi_collar"
+#define STRIPPABLE_ITEM_PARROT_HEADSET "parrot_headset"
+
+/// This slot is not obscured.
+#define STRIPPABLE_OBSCURING_NONE 0
+
+/// This slot is completely obscured, and cannot be accessed.
+#define STRIPPABLE_OBSCURING_COMPLETELY 1
+
+/// This slot can't be seen, but can be accessed.
+#define STRIPPABLE_OBSCURING_HIDDEN 2
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -362,6 +362,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define MADE_UNCLONEABLE "made-uncloneable"
 #define TRAIT_JAWS_OF_LIFE "jaws-of-life"
 #define STICKY_NODROP "sticky-nodrop" //sticky nodrop sounds like a bad soundcloud rapper's name
+#define TRAIT_PRESERVE_UI_WITHOUT_CLIENT "preserve_ui_without_client" //this mob should never close ui even if it doesn't have a client
 
 ///Traits given by station traits
 #define STATION_TRAIT_BANANIUM_SHIPMENTS "station_trait_bananium_shipments"

diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm
@@ -9,7 +9,7 @@
  * Misc
  */
 
-#define LAZYINITLIST(L) if (!L) L = list()
+#define LAZYINITLIST(L) if (!L) { L = list(); }
 #define UNSETEMPTY(L) if (L && !length(L)) L = null
 #define LAZYCOPY(L) (L ? L.Copy() : list() )
 #define LAZYREMOVE(L, I) if(L) { L -= I; if(!length(L)) { L = null; } }

diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm
@@ -95,8 +95,7 @@ SUBSYSTEM_DEF(input)
 // For initially setting up or resetting to default the movement keys
 /datum/controller/subsystem/input/proc/setup_default_movement_keys()
 	var/static/list/default_movement_keys = list(
-		"W" = NORTH, "A" = WEST, "S" = SOUTH, "D" = EAST,				// WASD
-		"North" = NORTH, "West" = WEST, "South" = SOUTH, "East" = EAST,	// Arrow keys & Numpad
+		"North" = NORTH, "West" = WEST, "South" = SOUTH, "East" = EAST,
 		)
 
 	movement_keys = default_movement_keys.Copy()

diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm
@@ -185,10 +185,10 @@
 	time = 40
 	category = CAT_ROBOT
 
-/datum/crafting_recipe/cleanbot/roomba
-	name = "Roomba"
-	result = /mob/living/simple_animal/bot/cleanbot/roomba
-	reqs = list(/obj/item/roombaframe = 1,
+/datum/crafting_recipe/cleanbot/larry
+	name = "Larry"
+	result = /mob/living/simple_animal/bot/cleanbot/larry
+	reqs = list(/obj/item/larryframe = 1,
 				/obj/item/assembly/prox_sensor = 1,
 				/obj/item/bodypart/r_arm/robot = 1)