Merge branch 'master' into upstream-merge-14467

code/modules/client/preference_setup/loadout/loadout_head_ch.dm

@@ -25,3 +25,7 @@
 /datum/gear/head/tigerpeltpink
 	display_name = "pink tiger pelt"
 	path = /obj/item/clothing/head/pelt/tigerpeltpink
+
+/datum/gear/head/marisa
+	display_name = "Witch hat"
+	path = /obj/item/clothing/head/wizard/marisa

code/modules/client/preference_setup/loadout/loadout_mask.dm

@@ -61,6 +61,12 @@
 	display_name = "neck gaiter selection"
 	path = /obj/item/clothing/accessory/gaiter
 	cost = 1
+	
+//CHOMPAdd - Put this mask in loadout
+/datum/gear/mask/death
+	display_name = "white mask"
+	path = /obj/item/clothing/mask/gas/cyborg
+	cost = 1
 
 /datum/gear/mask/gaiter/New()
 	..()

code/modules/client/preference_setup/vore/07_traits.dm

@@ -379,7 +379,7 @@
 
 	else if(href_list["custom_cold"])
 		tgui_alert(user, "You are setting custom cold messages. These will overwrite your species' defaults. To return to defaults, click reset.")
-		var/old_message = pref.custom_heat.Join("\n\n")
+		var/old_message = pref.custom_cold.Join("\n\n") //CHOMP Edit
 		var/new_message = sanitize(tgui_input_text(usr,"Use double enter between messages to enter a new one. Must be at least 3 characters long, 160 characters max and up to 10 messages are allowed.","Cold Discomfort messages",old_message, multiline= TRUE, prevent_enter = TRUE), MAX_MESSAGE_LEN,0,0,0)
 		if(length(new_message) > 0)
 			var/list/raw_list = splittext(new_message,"\n\n")

code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm

@@ -15,7 +15,7 @@
 /datum/trait/neutral/succubus_bite/apply(var/datum/species/S,var/mob/living/carbon/human/H)
 	..(S,H)
 	H.verbs |= /mob/living/proc/succubus_bite
-	
+
 /datum/trait/neutral/nutritiongrow
 	name = "Growing"
 	desc = "After you consume enough nutrition, you start to slowly grow while metabolizing nutrition faster."
@@ -42,19 +42,27 @@
 	custom_only = FALSE
 
 /datum/trait/neutral/big_mouth
-	name = "Mouth, Big"
+	name = "Fast Eater, Minor"
 	desc = "It takes half as many bites to finish food as it does for most people."
 	cost = 0
 	var_changes = list("bite_mod" = 2)
 	custom_only = FALSE
-	
+
 /datum/trait/neutral/big_mouth_extreme
-	name = "Mouth, Giant"
+	name = "Fast Eater"
 	desc = "It takes a quarter as many bites to finish food as it does for most people."
 	cost = 0
 	var_changes = list("bite_mod" = 4)
 	custom_only = FALSE
-	
+
+// Doing this BC I can't rename the datum without fucking over savefiles, so meh. Hyper > Extreme, right?
+/datum/trait/neutral/big_mouth_hyper
+	name = "Fast Eater, Major"
+	desc = "You will eat anything instantly, in one bite."
+	cost = 0
+	var_changes = list("bite_mod" = 16) // Setting this intentionally ridiculously high, so anything will overflow and be eaten in one go.
+	custom_only = FALSE
+
 // CHOMPNote: Moving YW additions here, to sync our files better with VORE in the event of edits.
 /datum/trait/neutral/autohiss_vassilian
 	name = "Autohiss (Vassilian)"
@@ -71,4 +79,3 @@
 	),
 	autohiss_exempt = list("Vespinae"))
 	excludes = list(/datum/trait/neutral/autohiss_tajaran, /datum/trait/neutral/autohiss_unathi)
-	

config/jukebox.json

@@ -4734,10 +4734,6 @@
 "artist": "Tom Jones",
 "secret": false,
 "lobby": false,
-<<<<<<< HEAD
-"jukebox": true,
-"genre": "Pop"
-=======
 "jukebox": true
 },
 {
@@ -4751,14 +4747,10 @@
 "jukebox": true
 },
 {
-"url": "https://files.catbox.moe/6m88w6.mp3",
-"title": "King Sucklet",
-"duration": 1370,
 "artist": "emamouse",
 "genre": "Folk and Indie",
 "secret": true,
 "lobby": false,
 "jukebox": true
->>>>>>> 1444784d2a... Merge pull request #14467 from Very-Soft/succlet
 }
 ]

maps/submaps/surface_submaps/wilderness/Manor1.dmm

@@ -445,13 +445,18 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/flora/pottedplant/drooping,
 /obj/effect/spider/stickyweb,
+/obj/item/stack/material/durasteel{
+	amount = 3
+	},
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "bI" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/flora/pottedplant/dead,
 /obj/effect/spider/stickyweb,
-/obj/item/weapon/material/sword,
+/obj/item/stack/material/durasteel{
+	amount = 3
+	},
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "bJ" = (
@@ -556,7 +561,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/weapon/cell/device/weapon,
 /obj/item/weapon/cell/device/weapon,
-/obj/item/weapon/storage/firstaid/combat,
+/obj/random/energy,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "cd" = (
@@ -595,9 +600,7 @@
 /obj/random/contraband,
 /obj/random/contraband/nofail,
 /obj/random/cash/huge,
-/obj/item/stack/material/durasteel{
-	amount = 18
-	},
+/obj/item/weapon/material/sword,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "cj" = (
@@ -791,6 +794,15 @@
 /obj/effect/spider/stickyweb,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
+"dH" = (
+/obj/structure/table/woodentable,
+/obj/random/drinksoft,
+/obj/effect/spider/stickyweb/dark,
+/obj/item/stack/material/durasteel{
+	amount = 3
+	},
+/turf/simulated/floor/holofloor/wood,
+/area/submap/Manor1)
 "eq" = (
 /obj/effect/spider/stickyweb,
 /obj/effect/spider/stickyweb,
@@ -891,6 +903,11 @@
 /obj/effect/spider/stickyweb,
 /turf/simulated/floor/carpet/purcarpet,
 /area/submap/Manor1)
+"iX" = (
+/obj/structure/table/woodentable,
+/obj/random/projectile/shotgun,
+/turf/simulated/floor/holofloor/wood,
+/area/submap/Manor1)
 "ja" = (
 /obj/effect/spider/stickyweb,
 /obj/effect/spider/stickyweb,
@@ -915,6 +932,7 @@
 "jr" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/food/snacks/sandwich,
+/obj/item/weapon/storage/firstaid/combat,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "jD" = (
@@ -931,6 +949,14 @@
 /obj/effect/spider/stickyweb,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
+"jJ" = (
+/obj/structure/flora/pottedplant/dead,
+/obj/effect/spider/stickyweb,
+/obj/item/stack/material/durasteel{
+	amount = 3
+	},
+/turf/simulated/floor/holofloor/wood,
+/area/submap/Manor1)
 "jK" = (
 /obj/effect/spider/stickyweb,
 /turf/simulated/floor/carpet/blucarpet,
@@ -1310,6 +1336,15 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
+"Lv" = (
+/obj/structure/table/woodentable,
+/obj/random/drinksoft,
+/obj/effect/spider/stickyweb,
+/obj/item/stack/material/durasteel{
+	amount = 3
+	},
+/turf/simulated/floor/holofloor/wood,
+/area/submap/Manor1)
 "LR" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcooked,
@@ -1351,7 +1386,7 @@
 "ND" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/material/knife/ritual,
-/obj/item/weapon/material/sharpeningkit,
+/obj/item/weapon/whetstone,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "Oo" = (
@@ -1472,6 +1507,11 @@
 /obj/effect/spider/stickyweb,
 /turf/simulated/floor/tiled/hydro,
 /area/submap/Manor1)
+"WG" = (
+/obj/structure/table/woodentable,
+/obj/random/medical,
+/turf/simulated/floor/holofloor/wood,
+/area/submap/Manor1)
 "WS" = (
 /obj/effect/spider/stickyweb,
 /turf/simulated/floor/carpet/turcarpet,
@@ -2436,7 +2476,7 @@ ar
 ar
 an
 ab
-aI
+jJ
 aK
 ag
 ag
@@ -2530,7 +2570,7 @@ DL
 Sx
 Sy
 RI
-jr
+eI
 al
 bh
 aA
@@ -2568,7 +2608,7 @@ aV
 al
 kb
 sD
-Jn
+dH
 jd
 xH
 al
@@ -2778,7 +2818,7 @@ HJ
 gY
 LR
 RI
-Sy
+Lv
 fx
 jc
 sD
@@ -2824,7 +2864,7 @@ kb
 al
 SC
 al
-eI
+jr
 jd
 bD
 aA
@@ -2898,7 +2938,7 @@ aq
 aq
 ag
 ab
-aI
+jJ
 aK
 aK
 ag
@@ -3503,7 +3543,7 @@ ab
 RX
 eT
 ab
-al
+iX
 bl
 bp
 bw
@@ -3587,7 +3627,7 @@ eA
 KN
 an
 ab
-al
+WG
 ag
 ag
 ag

maps/submaps/surface_submaps/wilderness/derelictengine.dmm

@@ -225,7 +225,8 @@
 /obj/structure/table/alien,
 /obj/effect/floor_decal/techfloor,
 /obj/item/weapon/storage/belt/medical/alien,
-/obj/item/clothing/head/helmet/alien/tank,
+/obj/item/weapon/telecube/precursor/mated/mirrorcolor,
+/obj/item/weapon/implantcase/sprinter,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/DerelictEngine)
 "el" = (
@@ -554,10 +555,11 @@
 /obj/structure/table/alien,
 /obj/item/weapon/gun/energy/alien,
 /obj/item/prop/alien/phasecoil,
-/obj/item/clothing/suit/armor/alien,
+/obj/item/clothing/suit/armor/alien/tank,
 /obj/item/stack/material/diamond{
 	amount = 15
 	},
+/obj/item/clothing/head/helmet/alien/tank,
 /turf/simulated/floor/greengrid,
 /area/submap/DerelictEngine)
 "jE" = (
@@ -1285,7 +1287,6 @@
 "vU" = (
 /obj/structure/table/alien/blue,
 /obj/item/prop/alien/junk,
-/obj/item/weapon/telecube/precursor/mated/mirrorcolor,
 /turf/simulated/shuttle/floor/alienplating/external,
 /area/submap/DerelictEngine)
 "wd" = (
@@ -1497,7 +1498,7 @@
 	dir = 10
 	},
 /obj/item/prop/alien/junk,
-/obj/item/weapon/implantcase/surge,
+/obj/item/device/perfect_tele/alien,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/DerelictEngine)
 "yB" = (
@@ -2328,6 +2329,10 @@
 /mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/fragmentation,
 /turf/simulated/shuttle/floor/alien/blue,
 /area/submap/DerelictEngine)
+"MC" = (
+/mob/living/simple_mob/mechanical/hivebot/precusor/lobber,
+/turf/simulated/floor/greengrid,
+/area/submap/DerelictEngine)
 "MD" = (
 /mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid,
 /obj/effect/floor_decal/techfloor{
@@ -2375,7 +2380,7 @@
 /obj/item/stack/material/phoron{
 	amount = 10
 	},
-/obj/item/device/perfect_tele/alien,
+/obj/item/weapon/implantcase/surge,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/DerelictEngine)
 "Nm" = (
@@ -2650,6 +2655,7 @@
 /obj/effect/floor_decal/techfloor/hole/right{
 	dir = 1
 	},
+/mob/living/simple_mob/mechanical/hivebot/precusor/machinegun,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/DerelictEngine)
 "RB" = (
@@ -2691,6 +2697,11 @@
 "SF" = (
 /turf/template_noop,
 /area/template_noop)
+"SJ" = (
+/obj/effect/decal/cleanable/generic,
+/mob/living/simple_mob/mechanical/hivebot/precusor/laser,
+/turf/simulated/floor/plating,
+/area/submap/DerelictEngine)
 "ST" = (
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 8
@@ -2885,6 +2896,9 @@
 /obj/item/stack/material/glass/plastitanium{
 	amount = 20
 	},
+/obj/item/clothing/suit/armor/alien,
+/obj/item/clothing/head/helmet/alien/tank,
+/obj/item/weapon/gun/energy/alien,
 /turf/simulated/floor/greengrid,
 /area/submap/DerelictEngine)
 "Vb" = (
@@ -3073,6 +3087,7 @@
 	dir = 8
 	},
 /obj/item/weapon/circuitboard/pacman,
+/obj/item/weapon/telecube/precursor/mated/zone,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/DerelictEngine)
 "Yr" = (
@@ -3620,7 +3635,7 @@ jl
 jl
 fO
 AX
-HS
+MC
 UZ
 gy
 yB
@@ -4018,7 +4033,7 @@ fO
 Uv
 GM
 IM
-CL
+SJ
 VQ
 iB
 nZ

modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/precusor_hivebots.dm

@@ -0,0 +1,52 @@
+//This hivebots are meant to be high threats, and a tad more fitting of the alien places they tend to be in. Aka mini-bosses.
+
+/mob/living/simple_mob/mechanical/hivebot/precusor
+	name = "Precursor Hivebot"
+	icon = 'modular_chomp/icons/mob/hivebot.dmi'
+	icon_state = "precursorhive"
+	icon_living = "precursorhive"
+	attacktext = list("prodded")
+	maxHealth = 5 LASERS_TO_KILL // 150 health
+	health = 5 LASERS_TO_KILL
+	movement_cooldown = 4
+	melee_damage_lower = 15
+	melee_damage_upper = 15
+
+	var/obj/item/shield_projector/shields = null
+
+/mob/living/simple_mob/mechanical/hivebot/precusor/Initialize(mapload)
+	shields = new /obj/item/shield_projector/rectangle/automatic/hivebot_drone(src)
+	return ..()
+
+
+/mob/living/simple_mob/mechanical/hivebot/precusor/machinegun
+	projectiletype = /obj/item/projectile/bullet/hivebot
+	base_attack_cooldown = 0 // Extremly rapid fire with rather weak bullets.
+
+/mob/living/simple_mob/mechanical/hivebot/precusor/laser
+	projectiletype = /obj/item/projectile/beam/precursor
+	projectile_dispersion = 5
+	projectile_accuracy = -30
+
+/mob/living/simple_mob/mechanical/hivebot/precusor/lobber
+	projectiletype = /obj/item/projectile/arc/blue_energy/precusor
+
+
+/obj/item/projectile/arc/blue_energy/precusor
+	name = "energy missile"
+	icon_state = "force_missile"
+	armor_penetration = 10
+	damage = 50 // Mimics the precusor laser damage and armor peircing with a tad more damage because of the lobbying style.
+	damage_type = BURN
+	color = "#A020F0"
+
+/obj/item/shield_projector/rectangle/automatic/hivebot_drone
+	shield_health = 100
+	max_shield_health = 100
+	shield_regen_delay = 5 SECONDS
+	shield_regen_amount = 20
+	size_x = 3
+	size_y = 3
+	color = "#A020F0"
+	high_color = "#A020F0"
+	low_color = "#A020F0"

modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm

@@ -0,0 +1,5 @@
+//Giving the tank hivebot class a new look,
+/mob/living/simple_mob/mechanical/hivebot/tank
+	icon = 'modular_chomp/icons/mob/hivebot.dmi'
+	icon_state = "blue"
+	icon_living = "blue"

vorestation.dme

@@ -4583,6 +4583,8 @@
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\cultist_ch.dm"
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\disbot.dm"
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\drones\combat_drone.dm"
+#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\precusor_hivebots.dm"
+#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\tank.dm"
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\gygax.dm"
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\occult\constructs\juggernaut.dm"
 #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\bigdragon.dm"