Merge branch 'master' into minesweeper

README.md

@@ -1,17 +1,25 @@
-## Sunset Wasteland
-Based and maintained from Citadel Station by way of Desert Rose, Fortuna, The Wasteland, and Sunset Wasteland.  
+## Coyote Team - Foxybar
+Based and maintained from Citadel Station by way of Desert Rose, Fortuna, The Wasteland, Sunset Wasteland, and Coyote Bayou.
 
 [![CI Suite](https://isitmaintained.com/project/sunset-wasteland/sunset-wasteland/actions/workflows/ci_suite.yml/badge.svg?branch=master&event=push)](https://isitmaintained.com/project/sunset-wasteland/sunset-wasteland/actions/workflows/ci_suite.yml)
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/sunset-wasteland/sunset-wasteland.svg)](https://isitmaintained.com/project/LoneStarF13/LoneStar "Percentage of issues still open")
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/sunset-wasteland/sunset-wasteland.svg)](https://isitmaintained.com/project/LoneStarF13/LoneStar "Average time to resolve an issue")
 
 [![forthebadge](http://forthebadge.com/images/badges/60-percent-of-the-time-works-every-time.svg)](https://forthebadge.com) [![forthebadge](http://forthebadge.com/images/badges/pretty-risque.svg)](https://forthebadge.com) [![forthebadge](http://forthebadge.com/images/badges/you-didnt-ask-for-this.svg)](http://forthebadge.com) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
 
+
+**Foxybar**  
+* **Code:** <https://github.com/ARF-SS13/Foxybar2>
+* **Wiki:** <>
+* **Discord:** <https://discord.gg/FYSksfduBn>
+All relevant forum content takes place on the Discord!
+
+
+Most of these places are depricated in the extreme, but left for archiving purposes.
 **The Wasteland Information**  
 * **Code:** <https://github.com/ogrigbe/thewasteland>
 * **Wiki:** <>
 * **Discord:** <https://discord.gg/xCgEwJTppx>
-All relevant forum content takes place on the Discord!
 
 **Desert Rose Information**
 * **Code** <https://github.com/DesertRose2/desertrose>
@@ -25,6 +33,7 @@ All relevant forum content takes place on the Discord!
 * **Ban Appeals:** <http://citadel-station.net/forum/forumdisplay.php?fid=8>
 * **Discord:**  <https://discord.gg/E6SQuhz>
 
+Left here despite the fact that our code has a multi-year gap in functionality.
 **/tg/station Information**  
 * **Website:** <https://www.tgstation13.org>
 * **Code:** <https://github.com/tgstation/tgstation>

_maps/map_files/generic/CentCom.dmm

@@ -3194,15 +3194,13 @@
 	},
 /area/centcom/evac)
 "um" = (
-/obj/structure/closet/secure_closet/ertMed,
 /obj/structure/sign/directions/medical{
 	dir = 1;
 	pixel_y = -24
 	},
 /turf/open/floor/plasteel/dark,
 /area/centcom/evac)
 "un" = (
-/obj/structure/closet/secure_closet/ertMed,
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
 	pixel_y = -32;

code/__DEFINES/loadout.dm

@@ -22,6 +22,8 @@
 //backpack
 #define LOADOUT_CATEGORY_BACKPACK 				"In backpack"
 #define LOADOUT_SUBCATEGORY_BACKPACK_GENERAL 	"General" //basically anything that there's not enough of to have its own subcategory
+//Migrated content from the hands category
+#define LOADOUT_SUBCATEGORY_BACKPACK_SMALL_ITEMS "Small items"
 //#define LOADOUT_SUBCATEGORY_BACKPACK_TOYS 		"Toys"
 #define LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS 	"Backpacks"
 #define LOADOUT_SUBCATEGORY_BACKPACK_RATIONS 	"Snacks"

code/__HELPERS/_cit_helpers.dm

@@ -131,6 +131,11 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 /mob/living/proc/has_womb()
 	return getorganslot(ORGAN_SLOT_WOMB)
 
+/mob/living/proc/has_tail() // A MILLION PROCS FOR DINGUSES BUT NOT ONE FOR TAILS??????????
+	return getorganslot(ORGAN_SLOT_TAIL)
+
+
+
 /mob/living/proc/is_groin_exposed(list/L)
 	if(!L)
 		L = get_equipped_items()

code/_globalvars/lists/loadout_categories.dm

@@ -1,6 +1,6 @@
 GLOBAL_LIST_INIT(loadout_categories, list(
-	LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL,/* LOADOUT_SUBCATEGORY_BACKPACK_TOYS,*/ LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS, LOADOUT_SUBCATEGORY_BACKPACK_RATIONS/*, LOADOUT_SUBCATEGORY_BACKPACK_VAULTGUNS*/),
-	LOADOUT_CATEGORY_NECK = list(LOADOUT_SUBCATEGORY_NECK_GENERAL,/* LOADOUT_SUBCATEGORY_NECK_TIE,*/ LOADOUT_SUBCATEGORY_NECK_SCARVES),
+	LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL,/* LOADOUT_SUBCATEGORY_BACKPACK_TOYS,*/ LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS, LOADOUT_SUBCATEGORY_BACKPACK_RATIONS, LOADOUT_SUBCATEGORY_BACKPACK_SMALL_ITEMS, LOADOUT_SUBCATEGORIES_EARRINGS, LOADOUT_SUBCATEGORY_BACKPACK_MAKEUP),
+	LOADOUT_CATEGORY_NECK = list(LOADOUT_SUBCATEGORY_NECK_GENERAL,/* LOADOUT_SUBCATEGORY_NECK_TIE,*/ LOADOUT_SUBCATEGORY_NECK_SCARVES, LOADOUT_SUBCATEGORY_NECK_COLLAR),
 	LOADOUT_CATEGORY_MASK = list(LOADOUT_SUBCATEGORY_MASK_GENERAL, LOADOUT_SUBCATEGORY_MASK_BANDANA/*, LOADOUT_SUBCATEGORY_MASK_MISCELLANEOUS*/),
 	LOADOUT_CATEGORY_UNIFORM = list(LOADOUT_SUBCATEGORY_UNIFORM_GENERAL, LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND, LOADOUT_SUBCATEGORY_UNIFORM_MEDICAL, LOADOUT_SUBCATEGORY_UNIFORM_SUITS, LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS, LOADOUT_SUBCATEGORY_UNIFORM_DRESSES, LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS, LOADOUT_SUBCATEGORY_UNIFORM_PANTS, LOADOUT_SUBCATEGORY_UNIFORM_TRADITIONAL, LOADOUT_SUBCATEGORY_UNIFORM_RAIDER, LOADOUT_SUBCATEGORY_UNIFORM_UNIFORMS, LOADOUT_SUBCATEGORY_UNIFORM_JUMPSUITS, LOADOUT_SUBCATEGORY_UNIFORM_ESCORT, LOADOUT_SUBCATEGORY_UNIFORM_TRIBAL),
 	LOADOUT_CATEGORY_SUIT = list(LOADOUT_SUBCATEGORY_SUIT_GENERAL, LOADOUT_SUBCATEGORY_SUIT_MEDICAL, LOADOUT_SUBCATEGORY_SUIT_ARMOR, LOADOUT_SUBCATEGORY_SUIT_BALLISTICVEST, LOADOUT_SUBCATEGORY_SUIT_JACKETS, LOADOUT_SUBCATEGORY_SUIT_TAUR),

code/_onclick/hud/_defines.dm

@@ -53,9 +53,9 @@
 #define ui_resistdelay "East-2:-4,SOUTH+0:36" //This is actually resist bar
 #define ui_overridden_resist "East-2:-4,SOUTH+0:20" //this is the actual resist button
 #define ui_combat_toggle "WEST+7:16,SOUTH:2"
-#define ui_zonesel "WEST+7:16,SOUTH:3"
+#define ui_zonesel "EAST-3:-5,SOUTH:3"
 #define ui_crafting	"WEST+6:-15,SOUTH+1:1"
-#define ui_building "WEST+5:-14,SOUTH+1:1"
+#define ui_building "WEST+5:1,SOUTH+1:1"
 #define ui_language_menu "WEST+5:1,SOUTH+1:1"
 
 
@@ -69,7 +69,7 @@
 //#define ui_zonesel "Center+5:2,SOUTH:3:1"
 #define ui_mood 	"Center-1:5,South+1:11"
 #define ui_healthdoll 	"EAST-3:-3,SOUTH:4"
-#define ui_health 	"Center+0:0,South+1:-2"
+#define ui_health 	"Right-3:28,South+2:-18"
 #define ui_stamina "Right-2:27,South+1:+3" // replacing internals button
 #define ui_questbook "CENTER+2:19,SOUTH+1:-12"
 #define ui_questscanner "CENTER+3:21,SOUTH+1:-12"
@@ -158,7 +158,7 @@
 
 //living
 #define ui_living_pull "EAST-1:28,CENTER-2:15"
-#define ui_living_health "EAST-1:28,CENTER:15"
+#define ui_living_health "Right-3:28,South+2:-18"
 
 //borgs
 #define ui_borg_health "EAST-1:28,CENTER-1:15"		//borgs have the health display where humans have the pressure damage indicator.

code/_onclick/hud/hud.dm

@@ -71,13 +71,22 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	var/atom/movable/screen/newbie_hud_button
 	var/atom/movable/screen/chardir_hud_button
 	var/atom/movable/screen/pvp_focus_toggle/pvp_focus_toggle
+	var/atom/movable/screen/who
 	var/atom/movable/screen/flirt_hud_button
 	var/atom/movable/screen/merp_button
 	var/atom/movable/screen/erp_button
 	var/atom/movable/screen/vore_button
 	var/atom/movable/screen/touch_hud_button
 	var/atom/movable/screen/lick_hud_button
 	var/atom/movable/screen/kiss_hud_button
+	var/atom/movable/screen/roll_hud_button
+	var/atom/movable/screen/bite_hud_button
+	var/atom/movable/screen/claw_hud_button
+	var/atom/movable/screen/tail_hud_button
+	var/atom/movable/screen/cuphand_hud_button
+	var/atom/movable/screen/tend_hud_button
+	var/atom/movable/screen/butt_hud_button
+
 
 
 	// subtypes can override this to force a specific UI style
@@ -140,12 +149,14 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	chardir_hud_button = null
 	pvp_focus_toggle = null
 	flirt_hud_button = null
+	who = null
 	merp_button = null
 	erp_button = null
 	vore_button = null
 	touch_hud_button = null
 	lick_hud_button = null
 	kiss_hud_button = null
+	roll_hud_button = null
 
 	QDEL_LIST_ASSOC_VAL(plane_masters)
 	QDEL_LIST(screenoverlays)

code/_onclick/hud/human.dm

@@ -91,12 +91,12 @@
 	var/atom/movable/screen/using
 	var/atom/movable/screen/inventory/inv_box
 
-	using = new/atom/movable/screen/language_menu
-	using.icon = ui_style
-	if(!widescreenlayout) // CIT CHANGE
-		using.screen_loc = ui_boxlang // CIT CHANGE
-	using.hud = src
-	static_inventory += using
+	// using = new/atom/movable/screen/language_menu
+	// using.icon = ui_style
+	// if(!widescreenlayout) // CIT CHANGE
+	// 	using.screen_loc = ui_boxlang // CIT CHANGE
+	// using.hud = src
+	// static_inventory += using
 
 	using = new /atom/movable/screen/area_creator
 	using.icon = ui_style
@@ -390,6 +390,10 @@
 	newbie_hud_button.hud = src
 	infodisplay += newbie_hud_button
 
+	roll_hud_button = new /atom/movable/screen/roll_hud_button()
+	roll_hud_button.hud = src
+	infodisplay += roll_hud_button
+
 	// chardir_hud_button = new /atom/movable/screen/chardir_hud_button()
 	// chardir_hud_button.hud = src
 	// infodisplay += chardir_hud_button
@@ -398,6 +402,10 @@
 	// pvp_focus_toggle.hud = src
 	// infodisplay += pvp_focus_toggle
 
+	who = new /atom/movable/screen/who()
+	who.hud = src
+	infodisplay += who
+
 	flirt_hud_button = new /atom/movable/screen/flirt_hud_button()
 	flirt_hud_button.hud = src
 	infodisplay += flirt_hud_button
@@ -426,6 +434,30 @@
 	kiss_hud_button.hud = src
 	infodisplay += kiss_hud_button
 
+	bite_hud_button = new /atom/movable/screen/bite_hud_button()
+	bite_hud_button.hud = src
+	infodisplay += bite_hud_button
+
+	claw_hud_button = new /atom/movable/screen/claw_hud_button()
+	claw_hud_button.hud = src
+	infodisplay += claw_hud_button
+
+	tail_hud_button = new /atom/movable/screen/tail_hud_button()
+	tail_hud_button.hud = src
+	infodisplay += tail_hud_button
+
+	cuphand_hud_button = new /atom/movable/screen/cuphand_hud_button()
+	cuphand_hud_button.hud = src
+	infodisplay += cuphand_hud_button
+
+	tend_hud_button = new /atom/movable/screen/tend_hud_button()
+	tend_hud_button.hud = src
+	infodisplay += tend_hud_button
+
+	butt_hud_button = new /atom/movable/screen/butt_hud_button()
+	butt_hud_button.hud = src
+	infodisplay += butt_hud_button
+
 	pull_icon = new /atom/movable/screen/pull()
 	pull_icon.icon = ui_style
 	pull_icon.hud = src

code/_onclick/hud/screen_objects.dm

@@ -605,8 +605,6 @@
 	name = "health"
 	icon_state = "health0"
 	screen_loc = ui_health
-	mouse_opacity = 0
-	alpha = 0
 	var/base_state = "%100"
 	var/flicker_state = "%100"
 	var/blink_state = "%100"
@@ -670,6 +668,7 @@
 			if(90 to INFINITY)
 				smiley_base          = "^_^"
 				smiley_flicker       = "^_^"
+				smiley_flicker       = "^_^"
 				smiley_blink         = "^_^"
 				smiley_blink_flicker = "^_^"
 				font_color_base = "#5334ff"