Merge pull request #2 from Tk420634/fenwork

mo shit

code/__DEFINES/mobs.dm

@@ -630,14 +630,14 @@
 #define SIMPLEMOB_NO_STAMCRIT -1
 
 /// Max distance you can see tats
-#define TATTOO_VISIBILITY_RANGE 3
+#define TATTOO_VISIBILITY_RANGE 50
 
 #define SIMPLEMOB_IGNORE 1
 
 #define PHUD_NONE  "GENITAL_HUD_NONE"
 #define PHUD_BUTT  "GENITAL_HUD_BUTT"
 #define PHUD_BOOB  "GENITAL_HUD_BREASTS"
-#define PHUD_PENIS "GENITAL_HUD_PEEN"
+#define PHUD_TALLYWHACKER "GENITAL_HUD_PEEN" // COH BLOYME GUV COPOYLOT GOT THEY KNICKAS IN A TWIST OVER THE WORD PENIS WOT WOT
 #define PHUD_BALLS "GENITAL_HUD_BALLS"
 #define PHUD_VAG   "GENITAL_HUD_VAG"
 #define PHUD_BELLY "GENITAL_HUD_BELLY"
@@ -646,12 +646,14 @@
 #define PHUD_SHIRT "GENITAL_HUD_SHIRT"
 #define PHUD_PANTS "GENITAL_HUD_PANTS"
 #define PHUD_SOCKS "GENITAL_HUD_SOCKS"
+#define PHUD_PVP_FLAG "GENITAL_HUD_pvp_flag"
 #define GENITAL_LAYER_OFFSET 0.1  // keep genitals close to the body
 #define SOCKS_LAYER_OFFSET 0.2   // undies go over genitals (sometimes)
 #define PANTS_LAYER_OFFSET 0.21   // undies go over genitals (sometimes)
 #define SHIRT_LAYER_OFFSET 0.22   // undies go over genitals (sometimes)
 #define WINGS_LAYER_OFFSET 0.3    // wings go over undies and genitals
 #define TAIL_LAYER_OFFSET 0.4     // Tail on the outermost of everything
+#define pvp_flag_LAYER_OFFSET 1      // Sexhole warmcock's no-pvp-for-me offset over everything everyuthing
 #define MUTANT_PORNHUD_WINGS "wings","wingsopen","deco_wings","insect_wings","insect_fluff"
 #define MUTANT_PORNHUD_TAIL "tail", "tailwag", "mam_tail", "mam_tail_animated", "tail_lizard", "tail_human", "spines" ,"waggingtail_human" ,"waggingtail_lizard" ,"waggingspines" ,"mam_waggingtail", "xenotail"
 
@@ -668,3 +670,7 @@
 
 
 #define HOSTILES_ATTACK_UNTIL_THIS_FAR_INTO_CRIT 25
+
+#define PVP_NEUTRAL "pvp_neutral"
+#define PVP_YES     "pvp_yes"
+#define PVP_NO      "pvp_no"

code/__DEFINES/traits.dm

@@ -378,6 +378,8 @@
 #define TRAIT_CLAM_LOVER "clam_lover"
 #define TRAIT_CLAM_FISHER "clam_fisher"
 
+#define TRAIT_NO_PVP_EVER "no_pvp_ever"
+
 // mobility flag traits
 // IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it)
 // BUT FOR NOW, THESE ARE HOOKED TO DO update_mobility() VIA COMSIG IN living_mobility.dm

code/_onclick/hud/_defines.dm

@@ -21,15 +21,21 @@
 #define ui_inventory "WEST:6,SOUTH:3"
 
 //Pop-up inventory
-#define ui_head "WEST:6,NORTH-5:1"
-#define ui_glasses "WEST:6,SOUTH+8:1"
-#define ui_mask "WEST:6,SOUTH+7:1"
-#define ui_ears "WEST:6,SOUTH+6:1"
-#define ui_neck "WEST:6,SOUTH+5:1"
-#define ui_oclothing "WEST:6,SOUTH+4:1"
-#define ui_gloves "WEST:6,SOUTH+3:1"
-#define ui_iclothing "WEST:6,SOUTH+2:1"
-#define ui_shoes "WEST:6,SOUTH+1:2"
+
+//top row
+#define ui_head "WEST+1:8,SOUTH+3:11"
+#define ui_glasses "WEST:6,SOUTH+3:11"
+#define ui_ears "WEST+2:10,SOUTH+3:11"
+
+//middle row
+#define ui_neck "WEST:6,SOUTH+2:9"
+#define ui_mask "WEST+1:8,SOUTH+2:9"
+#define ui_gloves "WEST+2:10,SOUTH+2:9"
+
+//bottom row
+#define ui_oclothing "WEST+1:8,SOUTH+1:7"
+#define ui_iclothing "WEST:6,SOUTH+1:7"
+#define ui_shoes "WEST+2:10,SOUTH+1:7"
 
 //Middle left indicators
 #define ui_lingchemdisplay "WEST,CENTER-1:15"
@@ -41,9 +47,9 @@
 #define ui_sstore1 "WEST+1:6,SOUTH:3"
 #define ui_id "WEST+2:6,SOUTH:3"
 #define ui_belt "WEST+3:5,SOUTH:3"
-#define ui_back "WEST+4:4,SOUTH:3"
-#define ui_storage1 "WEST+5:4,SOUTH:3"
-#define ui_storage2 "WEST+6,SOUTH:3"
+#define ui_back "WEST+6,SOUTH:3"
+#define ui_storage2 "WEST+4:4,SOUTH:3"
+#define ui_storage1 "WEST+5:2,SOUTH:3"
 #define ui_resistdelay "WEST+7:16,SOUTH+1:17"
 #define ui_overridden_resist "WEST+7:16,SOUTH+1:1"
 #define ui_combat_toggle "WEST+7:16,SOUTH:2"
@@ -59,12 +65,14 @@
 #define ui_drop_throw "CENTER+2:33,SOUTH+0:4"
 #define ui_sprintbufferloc "CENTER+3:34,SOUTH:16"
 #define ui_movi "Center+3:33,SOUTH:4"
-#define ui_zonesel "Center+5:2,SOUTH:3"
+#define ui_zonesel "Center+5:2,SOUTH:3:1"
 #define ui_mood 	"Center-1:5,South+1:11"
-#define ui_health 	"Center+0:0,South+1:0"
+#define ui_healthdoll 	"Center+0:0,South+2:-19"
+#define ui_health 	"Center+0:0,South+1:-2"
 #define ui_stamina "Center+0:27,South+1:18" // replacing internals button
 #define ui_questbook "CENTER+2:19,SOUTH+1:-12"
 #define ui_questscanner "CENTER+3:21,SOUTH+1:-12"
+#define ui_pull_stop "CENTER+4:6,SOUTH+1:-11"
 
 /proc/ui_hand_position(i) //values based on old hand ui positions (CENTER:-/+16,SOUTH:5)
 	var/x_off = -(!(i % 2))
@@ -111,7 +119,7 @@
 //Lower right, persistent menu
 
 
-#define ui_pull_stop "EAST-1:28,SOUTH+1:24"
+
 
 
 
@@ -132,11 +140,11 @@
 
 
 //Middle right (status indicators)
-#define ui_healthdoll 			"EAST-1:28,		CENTER-1:13"
 #define ui_internal 			"EAST-1:28,		SOUTH+3:11"//CIT CHANGE - moves internal icon up a little bit to accommodate for the stamina meter
 
-#define ui_character_actions	"EAST-1:28,		SOUTH+1:2"
-#define ui_bayou				"EAST-1:28,		SOUTH+0:2" //Character directory
+#define ui_character_actions	"EAST-1:28, SOUTH+1:2"
+#define ui_bayou				"EAST-1:28, SOUTH+0:2" //Character directory
+#define ui_pvpbuttons			"EAST-1:28, SOUTH+1:18" //slut directory
 
 //living
 #define ui_living_pull "EAST-1:28,CENTER-2:15"

code/_onclick/hud/hud.dm

@@ -6,8 +6,15 @@
 
 // The default UI style is the first one in the list
 GLOBAL_LIST_INIT(available_ui_styles, list(
-	"Cludgey" = 'icons/mob/screen_clockwork.dmi',
-
+	"Fallout" = 'icons/fallout/UI/screen_fallout2.dmi', // Fallout 2 Pip-boy style UI. Walk the wasteland with style. -Pebbles
+	"Darkout" = 'icons/fallout/UI/screen_fallout2_dark.dmi', // The original Fallout 2 pipboy UI, dark
+	"Midnight" = 'icons/mob/screen_midnight.dmi',
+	"Retro" = 'icons/mob/screen_retro.dmi',
+	"Plasmafire" = 'icons/mob/screen_plasmafire.dmi',
+	"Slimecore" = 'icons/mob/screen_slimecore.dmi',
+	"Operative" = 'icons/mob/screen_operative.dmi',
+	"Clockwork" = 'icons/mob/screen_clockwork.dmi',
+	"Minimal" = 'icons/mob/screen_minimal.dmi'
 ))
 
 /proc/ui_style2icon(ui_style)
@@ -63,6 +70,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	var/atom/movable/screen/aooc_hud_button
 	var/atom/movable/screen/newbie_hud_button
 	var/atom/movable/screen/chardir_hud_button
+	var/atom/movable/screen/pvp_focus_toggle/pvp_focus_toggle
 
 	// subtypes can override this to force a specific UI style
 	var/ui_style
@@ -119,6 +127,10 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	down = null
 	sleep_hud_button = null
 	triage = null
+	aooc_hud_button = null
+	newbie_hud_button = null
+	chardir_hud_button = null
+	pvp_focus_toggle = null
 
 	QDEL_LIST_ASSOC_VAL(plane_masters)
 	QDEL_LIST(screenoverlays)

code/_onclick/hud/human.dm

@@ -394,6 +394,10 @@
 	chardir_hud_button.hud = src
 	infodisplay += chardir_hud_button
 
+	pvp_focus_toggle = new /atom/movable/screen/pvp_focus_toggle()
+	pvp_focus_toggle.hud = src
+	infodisplay += pvp_focus_toggle
+
 	pull_icon = new /atom/movable/screen/pull()
 	pull_icon.icon = ui_style
 	pull_icon.hud = src

code/_onclick/hud/screen_objects/character_actions.dm

@@ -122,3 +122,57 @@
 /atom/movable/screen/chardir_hud_button/Click(location,control,params)
 	if(usr.client)
 		usr.client.show_character_directory()
+
+/atom/movable/screen/pvp_focus_toggle
+	name = "PVP focus On/Off"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "pvp_blank"
+	screen_loc = ui_pvpbuttons
+	var/mytobe
+
+/atom/movable/screen/pvp_focus_toggle/Initialize(mapload)
+	. = ..()
+	update_icon()
+
+/atom/movable/screen/pvp_focus_toggle/Click(location,control,params)
+	if(!usr.client || !ismob(usr))
+		return
+
+	var/changeto = PVP_NEUTRAL
+	var/_y = text2num(params2list(params)["icon-y"])
+	if(_y>=25) // PVP focus on
+		if(HAS_TRAIT(usr, TRAIT_PVPFOC))
+			changeto = PVP_NEUTRAL
+		else
+			if(HAS_TRAIT(usr, TRAIT_NO_PVP_EVER))
+				to_chat(usr, span_alert("Your role/quirks/setup doesn't allow for PVP!"))
+				return
+			changeto = PVP_YES
+	else if(_y>=17) // PVP opt out on
+		if(HAS_TRAIT(usr, TRAIT_PVEFOC))
+			changeto = PVP_NEUTRAL
+		else
+			changeto = PVP_NO
+	usr.SetPVPflag(changeto, TRUE)
+
+/atom/movable/screen/pvp_focus_toggle/proc/update_intento(towhat)
+	mytobe = towhat
+	update_icon()
+
+/atom/movable/screen/pvp_focus_toggle/update_overlays()
+	. = ..()
+	var/mutable_appearance/top = mutable_appearance('icons/mob/screen_gen.dmi')
+	var/mutable_appearance/bottom = mutable_appearance('icons/mob/screen_gen.dmi')
+	switch(mytobe)
+		if(PVP_NEUTRAL)
+			top.icon_state = "pvp_top_off"
+			bottom.icon_state = "pvp_bottom_off"
+		if(PVP_YES)
+			top.icon_state = "pvp_top_on"
+			bottom.icon_state = "pvp_bottom_off"
+		if(PVP_NO)
+			top.icon_state = "pvp_top_off"
+			bottom.icon_state = "pvp_bottom_on"
+	. += top
+	. += bottom
+

code/controllers/subsystem/artifacts.dm

@@ -20,7 +20,7 @@ PROCESSING_SUBSYSTEM_DEF(artifacts)
 		ART_RARITY_UNIQUE = 0,
 	)
 
-	var/spawn_chance = 0.000000000000000000000000000000000000000001 // chance for an artifact to spawn per tick
+	var/spawn_chance = 0 // chance for an artifact to spawn per tick
 	var/use_valid_ball_spawner_chance = 50 // chance for an artifact to use a valid ball spawner
 
 	var/list/buffs_by_rarity = list(