Merge branch 'master' into REVIVE-SAD

SPLURT-Station · May 11, 2024 · 6ff3d74 · 6ff3d74
2 parents be4861a + 839379c
commit 6ff3d74
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
@@ -2,8 +2,8 @@
 /obj/item/clothing/suit/hooded/explorer
 	name = "explorer suit"
 	desc = "An armoured suit for exploring harsh environments."
-	icon_state = "explorer-normal"
-	item_state = "explorer-normal"
+	icon_state = "explorer"
+	item_state = "explorer"
 	var/suit_type = "normal"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	cold_protection = CHEST|GROIN|LEGS|ARMS
@@ -13,7 +13,7 @@
 	flags_inv = HIDEJUMPSUIT|HIDETAUR
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
 	resistance_flags = FIRE_PROOF
-	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC
 	no_t = TRUE
 
 /obj/item/clothing/head/hooded/explorer

diff --git a/code/modules/research/techweb/nodes/computer_hud_nodes.dm b/code/modules/research/techweb/nodes/computer_hud_nodes.dm
@@ -5,7 +5,7 @@
 	display_name = "Computer Consoles"
 	description = "Computers and how they work."
 	prereq_ids = list("datatheory")
-	design_ids = list("cargo", "cargorequest", "libraryconsole", "mining", "miningshuttle", "crewconsole", "rdcamera", "comconsole", "idcardconsole", "seccamera")
+	design_ids = list("cargo", "cargorequest", "bounty", "libraryconsole", "mining", "miningshuttle", "crewconsole", "rdcamera", "comconsole", "idcardconsole", "seccamera")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
 
 /datum/techweb_node/computer_hardware_basic				//Modular computers are shitty and nearly useless so until someone makes them actually useful this can be easy to get.

diff --git a/html/changelogs/archive/2024-05.yml b/html/changelogs/archive/2024-05.yml
@@ -2,3 +2,8 @@
   SandPoot:
   - tweak: Mobs that can push structures off the floor will no longer do so unless
       it blocks path to a target.
+2024-05-09:
+  Fabian272:
+  - rscadd: Regular bounty console added to research, letting you print it.
+  MysteryMan21333:
+  - bugfix: Fixs the Mining suit taur sprite.
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
diff --git a/icons/mob/clothing/taur_canine.dmi b/icons/mob/clothing/taur_canine.dmi