diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 858dfd48ceb..6245e48d595 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -8,7 +8,7 @@ /datum/gear/choker/New() ..() - gear_tweaks = list(gear_tweak_free_color_choice) + gear_tweaks += gear_tweak_free_color_choice /datum/gear/collar display_name = "collar, silver" @@ -18,7 +18,7 @@ /datum/gear/collar/New() ..() - gear_tweaks = list(gear_tweak_collar_tag) + gear_tweaks += gear_tweak_collar_tag /datum/gear/collar/golden display_name = "collar, golden" @@ -106,4 +106,4 @@ /datum/gear/accessory/flops/New() ..() - gear_tweaks = list(gear_tweak_free_color_choice) + gear_tweaks += gear_tweak_free_color_choice diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index e56a150549f..bf0148f5104 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -25,7 +25,7 @@ /datum/gear/fluff/collar/New() ..() - gear_tweaks = list(gear_tweak_collar_tag) + gear_tweaks += gear_tweak_collar_tag // 0-9 CKEYS /datum/gear/fluff/malady_crop diff --git a/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm b/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm index c6c51f5bbd3..269f9e7aa90 100644 --- a/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm @@ -12,7 +12,7 @@ /datum/gear/gloves/colored/New() ..() - gear_tweaks = list(gear_tweak_free_color_choice) + gear_tweaks += gear_tweak_free_color_choice /datum/gear/gloves/latex/colorable @@ -21,7 +21,7 @@ /datum/gear/gloves/latex/colorable/New() ..() - gear_tweaks = list(gear_tweak_free_color_choice) + gear_tweaks += gear_tweak_free_color_choice /datum/gear/gloves/siren display_name = "gloves, Siren" diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm index 41214cbd67e..ce6ada61abf 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm @@ -12,7 +12,7 @@ /datum/gear/head/headbando/New() ..() - gear_tweaks = list(gear_tweak_free_color_choice) + gear_tweaks += gear_tweak_free_color_choice //Detective alternative /datum/gear/head/detective_alt diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index 3dc33eb9b36..b9cae2ddd01 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -16,7 +16,7 @@ /datum/gear/suit/labcoat_colorable/New() ..() - gear_tweaks = list(gear_tweak_free_color_choice) + gear_tweaks += gear_tweak_free_color_choice /datum/gear/suit/jacket_modular display_name = "jacket, modular" diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm index 3ac368a7ee8..31c9cdf10fa 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm @@ -1,4 +1,4 @@ -/datum/category_item/catalogue/technology/drone/hivebot/laser // Hivebot Scanner Data - This is for Laser Hivebots +/datum/category_item/catalogue/technology/drone/hivebot/rapidfire // Hivebot Scanner Data - This is for Rapidfire Hivebots name = "Drone - Rapidfire Hivebot" desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \ rifle, built for high-rate fire. Other than that, it has similar yellowish color \ diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm index 0003b781245..434ce659e85 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm @@ -5,7 +5,7 @@ to the other hivebots. Other than that, it has similar yellowish color to regular hivebots." value = CATALOGUER_REWARD_HARD -/datum/category_item/catalogue/technology/drone/hivebot/logistics // Hivebot Scanner Data - This is for Commander Hivebots +/datum/category_item/catalogue/technology/drone/hivebot/logistics // Hivebot Scanner Data - This is for Logistics Hivebots name = "Drone - Logistics Hivebot" desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \ ballistic weapon. It also appears to have supply deploying bays, and internal fabs to repair and buff their allies' special capabilities. \ diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm index 4257afa1d6a..e2c3a86b9d5 100644 --- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm @@ -68,8 +68,13 @@ var/mob/living/carbon/human/H = M if(isTaurTail(H.tail_style)) - to_chat(src,"Too many legs. TOO MANY LEGS!!") - return FALSE + var/datum/sprite_accessory/tail/taur/ridertype = H.tail_style + if(ridertype.can_ride) + if(istype(ridertype, /datum/sprite_accessory/tail/taur/naga) || istype(ridertype, /datum/sprite_accessory/tail/taur/slug)) + to_chat(src,"Too few legs. TOO FEW LEGS!!") + return FALSE + to_chat(src,"Too many legs. TOO MANY LEGS!!") + return FALSE . = ..() if(.) @@ -190,18 +195,18 @@ extra_overlay = "fatwolf_markings" //icon_sprite_tag = "fatwolf2c" -/datum/sprite_accessory/tail/taur/wolf/skunk - name = "Skunk (Taur)" - icon_state = "skunk_s" - extra_overlay = "skunk_markings" - icon_sprite_tag = "skunk" - /datum/sprite_accessory/tail/taur/wolf/synthwolf name = "SynthWolf dual-color (Taur)" icon_state = "synthwolf_s" extra_overlay = "synthwolf_markings" //icon_sprite_tag = "synthwolf" +/datum/sprite_accessory/tail/taur/skunk + name = "Skunk (Taur)" + icon_state = "skunk_s" + extra_overlay = "skunk_markings" + icon_sprite_tag = "skunk" + /datum/sprite_accessory/tail/taur/naga name = "Naga (Taur)" icon_state = "naga_s" diff --git a/maps/expedition_vr/space/_fueldepot.dm b/maps/expedition_vr/space/_fueldepot.dm index 4ec3236dd08..1f3241aee7a 100644 --- a/maps/expedition_vr/space/_fueldepot.dm +++ b/maps/expedition_vr/space/_fueldepot.dm @@ -35,4 +35,10 @@ /turf/simulated/floor/tiled/techmaint/airless oxygen = 0 nitrogen = 0 - temperature = TCMB \ No newline at end of file + temperature = TCMB + +/obj/machinery/atmospherics/pipe/tank/phoron/full + start_pressure = 15000 + +/obj/machinery/atmospherics/pipe/tank/air/full + start_pressure = 15000 diff --git a/maps/expedition_vr/space/fueldepot.dmm b/maps/expedition_vr/space/fueldepot.dmm index 86e6cee6c0f..381d0515744 100644 --- a/maps/expedition_vr/space/fueldepot.dmm +++ b/maps/expedition_vr/space/fueldepot.dmm @@ -644,7 +644,7 @@ /turf/simulated/shuttle/plating/airless, /area/tether_away/fueldepot) "bo" = ( -/obj/machinery/atmospherics/pipe/tank/phoron, +/obj/machinery/atmospherics/pipe/tank/phoron/full, /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techmaint/airless, /area/tether_away/fueldepot) @@ -1124,7 +1124,7 @@ /turf/simulated/shuttle/plating/airless, /area/tether_away/fueldepot) "cn" = ( -/obj/machinery/atmospherics/pipe/tank/air{ +/obj/machinery/atmospherics/pipe/tank/air/full{ icon_state = "air_map"; dir = 1 },