diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6e206bc339..13022f96fde 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: run: | sudo dpkg --add-architecture i386 sudo apt update || true - sudo apt install libc6:i386 libgcc1:i386 libstdc++6:i386 libssl1.0.0:i386 g++-7 g++-7-multilib gcc-multilib zlib1g:i386 + sudo apt install libc6:i386 libgcc1:i386 libstdc++6:i386 libssl1.0.0:i386 zlib1g:i386 ldd librust_g.so - name: Unit Tests run: | diff --git a/code/game/mecha/combat/fighter_vr.dm b/code/game/mecha/combat/fighter_vr.dm new file mode 100644 index 00000000000..4bc4782e9f8 --- /dev/null +++ b/code/game/mecha/combat/fighter_vr.dm @@ -0,0 +1,8 @@ +/obj/mecha/combat/fighter + starting_components = list( + /obj/item/mecha_parts/component/hull/lightweight, + /obj/item/mecha_parts/component/actuator, + /obj/item/mecha_parts/component/armor, + /obj/item/mecha_parts/component/gas, + /obj/item/mecha_parts/component/electrical + ) diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index c724b9bd809..4fface95d1b 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -21,6 +21,7 @@ "Jelly Blob" = /mob/living/simple_mob/animal/space/jelly, "Wolf" = /mob/living/simple_mob/animal/wolf, "Sect Queen" = /mob/living/simple_mob/vore/sect_queen, + "Sect Drone" = /mob/living/simple_mob/vore/sect_drone, "Defanged Xenomorph" = /mob/living/simple_mob/vore/xeno_defanged, ) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm new file mode 100644 index 00000000000..619e0acad0f --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm @@ -0,0 +1,67 @@ +/datum/category_item/catalogue/fauna/sect_drone + name = "Creature - Sect Drone" + desc = "Database Update Pending" //TODO: Virgo Lore Writing WIP + value = CATALOGUER_REWARD_MEDIUM + +/mob/living/simple_mob/vore/sect_drone + name = "sect drone" + desc = "A large, chitin-plated insectoid whose multiple cyan eyes cast a frightful blue light. Its \ + abdomen has an unusually soft and... flexible-looking underbelly..." + + icon_dead = "sect_drone_dead" + icon_living = "sect_drone" + icon_state = "sect_drone" + icon = 'icons/mob/vore64x64.dmi' + vis_height = 64 + has_eye_glow = TRUE + + faction = "insects" + maxHealth = 90 + health = 90 + see_in_dark = 8 + + movement_cooldown = 3 + + melee_damage_lower = 6 + melee_damage_upper = 12 + grab_resist = 100 // you can't even wrap your arms around this thing, how could you hope to grab it??? + + vore_active = 1 + vore_capacity = 1 + vore_pounce_chance = 70 // v hongry buggo + vore_icons = SA_ICON_LIVING + + //Beeg bug don't give a fuck about atmos. Something something, phoron mutation. + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 + + response_help = "pats" + response_disarm = "tries to shove" + response_harm = "hits" + attacktext = list("slashed") + friendly = list("nuzzles", "caresses", "headbumps against", "leans against", "nibbles affectionately on", "antennae tickles") // D'awww + + old_x = -16 + old_y = 0 + default_pixel_x = -16 + pixel_x = -16 + pixel_y = 0 + + max_buckled_mobs = 1 //Yeehaw + can_buckle = TRUE + buckle_movable = TRUE + buckle_lying = FALSE + mount_offset_y = 7 + + ai_holder_type = /datum/ai_holder/simple_mob/melee + say_list_type = /datum/say_list/sect_drone + +/datum/say_list/sect_drone + say_got_target = list("chitters threateningly!") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm index e5eaff69a45..bb0933dd862 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm @@ -1,6 +1,6 @@ // Beeg bug do beeg noms. It also glows in the dark for maximum spook power. -/datum/category_item/catalogue/fauna/sect_queen //TODO: VIRGO_LORE_WRITING_WIP +/datum/category_item/catalogue/fauna/sect_queen name = "Creature - Sect Queen" desc = "A massively-sized insect that is native, although rarely spotted outside of its colony, to Virgo 3B. \ It bears the combined physical traits of several of Earth's insects. Its forelegs have claws bearing serrated \ @@ -28,7 +28,7 @@ maxHealth = 200 health = 200 see_in_dark = 8 - + melee_damage_lower = 8 melee_damage_upper = 16 @@ -61,7 +61,7 @@ default_pixel_x = -16 pixel_x = -16 pixel_y = 0 - + max_buckled_mobs = 1 //Yeehaw can_buckle = TRUE buckle_movable = TRUE diff --git a/code/modules/news/news_init.dm b/code/modules/news/news_init.dm index 33adc2d530a..2c78e4baf8e 100644 --- a/code/modules/news/news_init.dm +++ b/code/modules/news/news_init.dm @@ -2,7 +2,7 @@ GLOBAL_DATUM_INIT(news_data, /datum/lore/news, new) /datum/feed_network/New() CreateFeedChannel("Station Announcements", "NanoTrasen", 1, 1, "New Station Announcement Available") - CreateFeedChannel("Vir News Network", "Oculum Broadcast", 1, 1, "Updates from the Vir News Network!") + //CreateFeedChannel("Vir News Network", "Oculum Broadcast", 1, 1, "Updates from the Vir News Network!") //VOREStation Removal /datum/lore/news var/datum/feed_channel/station_newspaper diff --git a/icons/mob/vore64x64.dmi b/icons/mob/vore64x64.dmi index d0fb9615948..e349085e633 100644 Binary files a/icons/mob/vore64x64.dmi and b/icons/mob/vore64x64.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 7ab20528172..aead6b558a9 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/icons/obj/vending_vr.dmi b/icons/obj/vending_vr.dmi index fe07d5d1f86..64c2ad0f5cb 100644 Binary files a/icons/obj/vending_vr.dmi and b/icons/obj/vending_vr.dmi differ diff --git a/tgui/packages/tgui/interfaces/ComputerFabricator.js b/tgui/packages/tgui/interfaces/ComputerFabricator.js index 54baebaf235..acc991cf14f 100644 --- a/tgui/packages/tgui/interfaces/ComputerFabricator.js +++ b/tgui/packages/tgui/interfaces/ComputerFabricator.js @@ -271,67 +271,65 @@ const CfStep2 = (props, context) => { {data.devtype !== 2 && ( - - - - Processor Unit: - - - -