From 9a1087486a387150cee2205eb5e588544db3f1c0 Mon Sep 17 00:00:00 2001 From: Casey Date: Tue, 7 Feb 2023 16:06:52 -0500 Subject: [PATCH 01/10] jukebox --- config/jukebox.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/config/jukebox.json b/config/jukebox.json index 313338fec8..7f9cfc3957 100644 --- a/config/jukebox.json +++ b/config/jukebox.json @@ -4734,7 +4734,31 @@ "artist": "Tom Jones", "secret": false, "lobby": false, +<<<<<<< HEAD "jukebox": true, "genre": "Pop" +======= +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/n10l5v.mp3", +"title": "Sucklet's Song", +"duration": 1840, +"artist": "emamouse", +"genre": "Folk and Indie", +"secret": true, +"lobby": false, +"jukebox": true +}, +{ +"url": "https://files.catbox.moe/6wbuyh.mp3", +"title": "King Sucklet", +"duration": 1720, +"artist": "emamouse", +"genre": "Folk and Indie", +"secret": true, +"lobby": false, +"jukebox": true +>>>>>>> a2fd507efb... Merge pull request #14463 from Very-Soft/juke } ] From 866a6692c57662a6892e7fb0139690f13d3c0f6e Mon Sep 17 00:00:00 2001 From: Fire Hazard Date: Tue, 7 Feb 2023 16:59:58 -0600 Subject: [PATCH 02/10] mask and hat Adds cyborg mask and witch hat to loadout --- .../client/preference_setup/loadout/loadout_head_ch.dm | 4 ++++ code/modules/client/preference_setup/loadout/loadout_mask.dm | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/code/modules/client/preference_setup/loadout/loadout_head_ch.dm b/code/modules/client/preference_setup/loadout/loadout_head_ch.dm index d77cafc5a3..771b02dd01 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head_ch.dm +++ b/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 \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm index af33ec7787..499b40ab1f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm @@ -62,6 +62,11 @@ path = /obj/item/clothing/accessory/gaiter cost = 1 +/datum/gear/mask/death + display_name = "white mask" + path = /obj/item/clothing/mask/gas/cyborg + cost = 1 + /datum/gear/mask/gaiter/New() ..() var/list/gaiters = list() From 5b9b2870b1f964a68853c8018d0b951ee2f24573 Mon Sep 17 00:00:00 2001 From: Fluff Date: Tue, 7 Feb 2023 19:30:59 -0500 Subject: [PATCH 03/10] Manor Balance Pass Moves Durasteel and combat medkit to the middle room, moved the sword from the middle room to storage. Replaced sharpening kit with whetstone so folks can do the intended thing with the metals easier...they'll proabaly still make armor. Added a random gun spawn to the combat medkit's old spot. Added a medkit and rando shotgun spawn to that one room I left empty. --- .../surface_submaps/wilderness/Manor1.dmm | 68 +++++++++++++++---- 1 file changed, 54 insertions(+), 14 deletions(-) diff --git a/maps/submaps/surface_submaps/wilderness/Manor1.dmm b/maps/submaps/surface_submaps/wilderness/Manor1.dmm index b6290282af..b86e03d7b5 100644 --- a/maps/submaps/surface_submaps/wilderness/Manor1.dmm +++ b/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 From cc135c3d330e6d61879fd13fd726bc0c1c109f4b Mon Sep 17 00:00:00 2001 From: Rykka Stormheart Date: Wed, 8 Feb 2023 08:01:31 -0800 Subject: [PATCH 04/10] Fixes Custom Cold messages being uneditable/editing the wrong list As described. Prior to this, clicking this would bring up the custom_heat list, and fail to set messages correctly. This corrects that. --- code/modules/client/preference_setup/vore/07_traits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 8f9964f7b0..fb40c07d75 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/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") 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") From f8c42c025eb223eb018346129f843e60101c1585 Mon Sep 17 00:00:00 2001 From: Rykka Stormheart Date: Wed, 8 Feb 2023 08:10:26 -0800 Subject: [PATCH 05/10] Renames Big/Giant Mouth to Fast Eater, adds extreme version Adds a version to instantly eat anything in one bite. Shouldn't be horribly unbalanced, considering giant exists. Giant Mouth becomes Fast Eater Big Mouth becomes Fast Eater, Minor Fast Eater, Major, added, instantly eats anything of any size. This makes the list view more similarly to Brute Resist/Major/Minor, etc. --- .../species/station/traits_vr/neutral_ch.dm | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm index 014590e31d..2cc6a36cef 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm +++ b/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." @@ -41,20 +41,27 @@ var_changes = list("metabolic_rate" = 2, "hunger_factor" = 1.6, "metabolism" = 0.012) //2x metabolism speed, 32x hunger speed custom_only = FALSE -/datum/trait/neutral/big_mouth - name = "Mouth, Big" +/datum/trait/neutral/fast_eater_minor + 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" + +/datum/trait/neutral/fast_eater + 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 - + +/datum/trait/neutral/fast_eater_major + 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 +78,3 @@ ), autohiss_exempt = list("Vespinae")) excludes = list(/datum/trait/neutral/autohiss_tajaran, /datum/trait/neutral/autohiss_unathi) - From 858e6b6adcf60cd7611cd102bca26e84e6da92c9 Mon Sep 17 00:00:00 2001 From: Fluff Date: Wed, 8 Feb 2023 19:21:57 -0500 Subject: [PATCH 06/10] Hivebot and Home Update Soo I love the hivebots but oh dear they're so freaking easy. They are so weak, and die so easily. The radiation and Ion bots feel like the biggest threat. So added a new purple branch called Precursor. All have a nice shield, and hopefully pack someform off high offense. Machine Gun - Should be a stream of bullets. Laser - Fires a precursor beam. Lobber - Lobs a special 'precursor' version of the energy artillery shot. Also turned the tank class of thinks into blue, similar to ablative/durasteel although a darker color. Might add loot tables to the precusor ones when I figure that out. And might have spelled precursor wrong somewhere. And with the new hivebots, just plopped them into the derelict engine. --- .../wilderness/derelictengine.dmm | 29 +++++++--- .../mechanical/hivebot/precusor_hivebots.dm | 52 ++++++++++++++++++ .../subtypes/mechanical/hivebot/tank.dm | 5 ++ modular_chomp/icons/mob/hivebot.dmi | Bin 0 -> 2384 bytes vorestation.dme | 2 + 5 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/precusor_hivebots.dm create mode 100644 modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm create mode 100644 modular_chomp/icons/mob/hivebot.dmi diff --git a/maps/submaps/surface_submaps/wilderness/derelictengine.dmm b/maps/submaps/surface_submaps/wilderness/derelictengine.dmm index 4c6487f2fb..8c3edd79b8 100644 --- a/maps/submaps/surface_submaps/wilderness/derelictengine.dmm +++ b/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 diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/precusor_hivebots.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/precusor_hivebots.dm new file mode 100644 index 0000000000..d1261da991 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm new file mode 100644 index 0000000000..2eee4d1bc3 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/modular_chomp/icons/mob/hivebot.dmi b/modular_chomp/icons/mob/hivebot.dmi new file mode 100644 index 0000000000000000000000000000000000000000..724e7911796dd51cc206e3a20a3509849e14b7ca GIT binary patch literal 2384 zcmV-W39t5vP)V=-0C=2r%drlEFc1ddx%U)*U?s+i>n*0lbbxn2d)g)l=2|emy@P|3<2QUY zPTkoLaJ{EZG^b?-flyr~fi(JMcU{p_)>#BLtm^P`%grpe^OXjBI zLoygGnIO~n2E#VCvA=wo)<4Hmjc#yoy{8Z6UMp_;lfWYY00@9dL_t(|ob8%lNLyJN zz<<|2G1wrt4poex6ib=X={zL+a$l2WnOiax1eebCL9Dd<5MLz-tq(B}LSJTKE_5rl zxXi$G^VG#oUdB+`(!6Yh_QCd{!o1YfG_zc+s~IOY`;eU5n|KowSB>4cwY87y;#g;tbD~=X*Bu75Q9+zh42VXh(4ZcEc}O0s`&|xtLa`2?PRCBofK%x{g2L z=f$-bBoYZ@-I*nwPGhs#=!x}^Qd35IJ;pSGZ#bYld6+v+OibiuS?0uNpYbY{!e+A} z%d(+F*L5~GH|g!|rLV8gXip}SH5<|>ev^QgcPJO9)5(eMZbs%u*xcMColYB{&CN|l z=11u6?k)ud7U7AS;Ago1~}+AF`&K58eGO7V8^ zE%sJB$L=08ep|n|&db4VX;(at&hNs;8%PU{@1;G(!|7s5kA?OEVgp;04u^yG_I6}h zM%Q&VHa1vWTSJm091aJ%t^*+Y4-F0Ba=GeyI65f)j<3TmmkTItLv3wsbar-Pv)MR# z@+4p1`I=LwPGPs(k!2a1&4$zIEa_Lg-u08=e)BCIAiVF@yoR#H#YHwYHt6f?qpz=z zL?Xewf1byWAJg00OMibq>+9<*E-o5yuja+&a@D;Q4w7H>{{h#}UT0JrWy!x}C>0?o z!pj_{X0H!u1Kdz<;KH?CagA~i{B02+yg#4~01#E83}^!=noupQv;m?@)G(x; zC^%?-#T*b-qG*~X8P|$tC20^WzKXj@oVF#1|aBlwm%K!AiXU378VbDQvF zX=ed1H|nx>nKWte7mSE1(YkWMLGq0yP`>t{(0R$fR8Urjq)8hd7qZh@Y!tsF2Z+!M zhr?2}P_0LVE|JWtNhA18@ZS672_qa1OJWwr;$sAZ!K#@&7!2me;$s!pTU3c!&O#&k z+jfCUp8thksH`iz zeL%=K4~XPru}knV)dz$^%cyD!wa8cZwm#s`CA9&#ui}+=cRs(<;6tHhu9fjS+uG>p z=rHbGU0vlrzx`(L#o+g^K7iu6e4av`K=DX#uj>Ou2#3n}9UUEfxw67Hz?Um4hBI_s zuWRs@4yfsT-c6w{K%#I?Uo24A%lZH@5byvV!wCTGz{~D#?g7ubyN$ky#2J)2`6Wrv zd_JF4lg6ovaX!xr0KPf>7dQ>@pwRI&q|=a6Q=EyNDOt0-sSgN+T&P7pMSddThax{C zS*ujl6tOz_hps-rDunlw-y-0mLk~Tc20EQiWLf4<-+#p&?;X(9%cPPiF2ybpCl0FRxD1KKdWvh_2NwL9nJmM@ z8K}Ug$X8ALWHLoz|Bs_q;2)a$0E+ji75Jk?{@~zST3hYhHSsTATxW3bC20#jA4+|| zjER5uZa;5=#q4Y|=g+_9*CKy()Xw5! zxy}!uK48YgkHyXb9%g4R03Loa@n=5O2Yf{J0e3$1`T%VQzJCY4cGT+w&Yr!Frj6p? z1z*z!P?Q^RROea zNaHW^3;K>oeSlWRFU)3r{KDW%`IU0Pp{frMp}!w|kxa|wP}K*NCoIAD` Date: Thu, 9 Feb 2023 00:42:11 -0800 Subject: [PATCH 07/10] Fixes datum names --- .../carbon/human/species/station/traits_vr/neutral_ch.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm index 2cc6a36cef..422fc6f621 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm @@ -41,21 +41,22 @@ var_changes = list("metabolic_rate" = 2, "hunger_factor" = 1.6, "metabolism" = 0.012) //2x metabolism speed, 32x hunger speed custom_only = FALSE -/datum/trait/neutral/fast_eater_minor +/datum/trait/neutral/big_mouth 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/fast_eater +/datum/trait/neutral/big_mouth_extreme 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 -/datum/trait/neutral/fast_eater_major +// 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 From f0b0736bbd11f31a765a11b50abd5e8e4209576f Mon Sep 17 00:00:00 2001 From: Fire Hazard Date: Thu, 9 Feb 2023 07:42:18 -0600 Subject: [PATCH 08/10] missing text --- code/modules/client/preference_setup/loadout/loadout_mask.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm index 499b40ab1f..600683d043 100644 --- a/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm @@ -61,7 +61,8 @@ 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 From 6bccdcc5272cf4f52775687d4cea5cf3d7a4e06b Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sun, 12 Feb 2023 17:54:56 -0700 Subject: [PATCH 09/10] Update jukebox.json --- config/jukebox.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/jukebox.json b/config/jukebox.json index 7f9cfc3957..e61afd0365 100644 --- a/config/jukebox.json +++ b/config/jukebox.json @@ -4734,10 +4734,6 @@ "artist": "Tom Jones", "secret": false, "lobby": false, -<<<<<<< HEAD -"jukebox": true, -"genre": "Pop" -======= "jukebox": true }, { @@ -4759,6 +4755,5 @@ "secret": true, "lobby": false, "jukebox": true ->>>>>>> a2fd507efb... Merge pull request #14463 from Very-Soft/juke } ] From 0b1059963b3d9aa0104797fb2102e8276b216b64 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sun, 12 Feb 2023 17:59:01 -0700 Subject: [PATCH 10/10] comments that make you say yes --- code/modules/client/preference_setup/vore/07_traits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index fb40c07d75..a5b5002c03 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/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_cold.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")