diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm
index 3878e45a43b..684a3108f56 100644
--- a/code/__defines/mobs.dm
+++ b/code/__defines/mobs.dm
@@ -181,9 +181,6 @@
#define BP_ANCHOR "anchoring ligament"
#define BP_ACETONE "acetone reactor"
-// Vox bits.
-#define BP_HINDTONGUE "hindtongue"
-
// Robo Organs.
#define BP_POSIBRAIN "posibrain"
#define BP_VOICE "vocal synthesiser"
diff --git a/code/game/antagonist/antagonist_equip.dm b/code/game/antagonist/antagonist_equip.dm
index acae4930f95..aa6e3700154 100644
--- a/code/game/antagonist/antagonist_equip.dm
+++ b/code/game/antagonist/antagonist_equip.dm
@@ -12,7 +12,7 @@
for(var/obj/item/thing in player.contents)
if(player.canUnEquip(thing))
qdel(thing)
- //mainly for vox antag compatibility. Should not effect item spawning.
+ //mainly for nonhuman antag compatibility. Should not effect item spawning.
player.species.equip_survival_gear(player)
return 1
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index b6ad876f9f0..d8f3e6596e8 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -407,7 +407,7 @@
user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes_str)
O = user.get_equipped_item(slot_back_str)
- if(istype(O, /obj/item/storage) && !istype(O, /obj/item/storage/backpack/cultpack) && user.unEquip(O)) // We don't want to make the vox drop their nitrogen tank, though
+ if(istype(O, /obj/item/storage) && !istype(O, /obj/item/storage/backpack/cultpack) && user.unEquip(O))
var/obj/item/storage/backpack/cultpack/C = new /obj/item/storage/backpack/cultpack(user)
user.equip_to_slot_or_del(C, slot_back_str)
if(C)
diff --git a/code/game/machinery/computer/arcade_orion.dm b/code/game/machinery/computer/arcade_orion.dm
index 8eed182b78b..cde14fc43b3 100644
--- a/code/game/machinery/computer/arcade_orion.dm
+++ b/code/game/machinery/computer/arcade_orion.dm
@@ -115,7 +115,7 @@
event_title += ": [stops[port]]"
event_actions = "Shove off"
if(ORION_TRAIL_RAIDERS)
- event_desc = "You arm yourselves as you prepare to fight off the vox menace!"
+ event_desc = "You arm yourselves as you prepare to fight off the alien menace!"
if(ORION_TRAIL_DERELICT)
event_desc = "You come across an unpowered ship drifting slowly in the vastness of space. Sensors indicate there are no lifeforms aboard."
if(ORION_TRAIL_ILLNESS)
diff --git a/code/game/machinery/vending/misc.dm b/code/game/machinery/vending/misc.dm
index 14a82477788..ce980fd3a8c 100644
--- a/code/game/machinery/vending/misc.dm
+++ b/code/game/machinery/vending/misc.dm
@@ -111,7 +111,7 @@
name = "Lavatory Essentials"
desc = "Vends things that make you less reviled in the work-place!"
vend_delay = 15
- product_slogans = "Take a shower you hippie.;Get a haircut, hippie!;Reeking of vox taint? Take a shower!"
+ product_slogans = "Take a shower you hippie.;Get a haircut, hippie!;Reeking of scale taint? Take a shower!"
icon_state = "lavatory"
icon_deny = "lavatory-deny"
diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm
index 04b22e9cb7d..9ee36de18a1 100644
--- a/code/game/objects/items/weapons/material/knives.dm
+++ b/code/game/objects/items/weapons/material/knives.dm
@@ -108,7 +108,7 @@
material = /decl/material/solid/glass
/obj/item/knife/combat/titanium
- material = /decl/material/solid/metal/plasteel/titanium
+ material = /decl/material/solid/metal/titanium
//random stuff
/obj/item/knife/hook
@@ -141,5 +141,5 @@
/obj/item/knife/utility/lightweight
name = "lightweight utility knife"
desc = "A lightweight utility knife made out of a titanium alloy."
- material = /decl/material/solid/metal/plasteel/titanium
+ material = /decl/material/solid/metal/titanium
draw_handle = FALSE
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm
index 15fbb697438..86f6406efaa 100644
--- a/code/game/objects/items/weapons/material/misc.dm
+++ b/code/game/objects/items/weapons/material/misc.dm
@@ -73,7 +73,7 @@
item_state = "machete"
w_class = ITEM_SIZE_NORMAL
slot_flags = SLOT_LOWER_BODY
- material = /decl/material/solid/metal/plasteel/titanium
+ material = /decl/material/solid/metal/titanium
base_parry_chance = 50
max_force = 20
material_force_multiplier = 0.20 //20 with hardness 80 (titanium) or 15 with hardness 60 (steel)
diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm
index 686cb113922..ed171dc5d29 100644
--- a/code/game/objects/items/weapons/material/swords.dm
+++ b/code/game/objects/items/weapons/material/swords.dm
@@ -75,7 +75,7 @@
/obj/item/sword/katana/vibro
name = "vibrokatana"
desc = "A high-tech take on a woefully underpowered weapon. Can't mistake its sound for anything."
- material = /decl/material/solid/metal/plasteel/titanium
+ material = /decl/material/solid/metal/titanium
hitsound = 'sound/weapons/anime_sword.wav'
/obj/item/sword/katana/vibro/equipped(mob/living/user, slot)
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 8c2369b9a07..4b531d83234 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -91,17 +91,6 @@
/obj/item/oxycandle = 1,
/obj/item/crowbar/cheap = 1)
-/obj/item/storage/box/vox/
- name = "vox survival kit"
- desc = "A box decorated in warning colors that contains a limited supply of survival tools. The panel and black stripe indicate this one contains nitrogen."
- icon_state = "survivalvox"
- startswith = list(/obj/item/clothing/mask/breath = 1,
- /obj/item/tank/emergency/nitrogen = 1,
- /obj/item/chems/hypospray/autoinjector = 1,
- /obj/item/stack/medical/bruise_pack = 1,
- /obj/item/flashlight/flare/glowstick = 1,
- /obj/item/chems/food/snacks/candy/proteinbar = 1)
-
/obj/item/storage/box/engineer/
name = "engineer survival kit"
desc = "A box decorated in warning colors that contains a limited supply of survival tools. The panel and orange stripe indicate this one as the engineering variant."
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index 817ab029df4..c2270b7a403 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -970,7 +970,6 @@ something, make sure it's not in one of the other lists.*/
/obj/random/voidsuit = 10,
/obj/random/hardsuit = 10,
/obj/item/clothing/mask/muzzle = 7,
- /obj/item/clothing/mask/gas/vox = 8,
/obj/item/clothing/mask/gas/syndicate = 10,
/obj/item/clothing/glasses/night = 3,
/obj/item/clothing/glasses/thermal = 1,
diff --git a/code/game/objects/structures/wall_frame.dm b/code/game/objects/structures/wall_frame.dm
index 8833253bc8e..8f6a97c933f 100644
--- a/code/game/objects/structures/wall_frame.dm
+++ b/code/game/objects/structures/wall_frame.dm
@@ -166,7 +166,7 @@
paint_color = COLOR_WALL_GUNMETAL
/obj/structure/wall_frame/titanium
- material = /decl/material/solid/metal/plasteel/titanium
+ material = /decl/material/solid/metal/titanium
/obj/structure/wall_frame/hull
paint_color = COLOR_HULL
\ No newline at end of file
diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm
index f26cc1c0172..0d1528541e2 100644
--- a/code/game/turfs/simulated/wall_types.dm
+++ b/code/game/turfs/simulated/wall_types.dm
@@ -38,12 +38,12 @@
/turf/simulated/wall/titanium
color = COLOR_SILVER
- material = /decl/material/solid/metal/plasteel/titanium
+ material = /decl/material/solid/metal/titanium
/turf/simulated/wall/r_titanium
icon_state = "reinforced_solid"
- material = /decl/material/solid/metal/plasteel/titanium
- reinf_material = /decl/material/solid/metal/plasteel/titanium
+ material = /decl/material/solid/metal/titanium
+ reinf_material = /decl/material/solid/metal/titanium
/turf/simulated/wall/ocp_wall
color = COLOR_GUNMETAL
@@ -69,12 +69,12 @@
icon_state = "wood"
material = /decl/material/solid/wood/walnut
-/turf/simulated/wall/voxshuttle
+/turf/simulated/wall/raidershuttle
color = COLOR_GREEN_GRAY
icon_state = "metal"
- material = /decl/material/solid/metal/voxalloy
+ material = /decl/material/solid/metal/alienalloy
-/turf/simulated/wall/voxshuttle/attackby()
+/turf/simulated/wall/raidershuttle/attackby()
return
//Alien metal walls
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 9af48aa364c..55be67a07a1 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -186,34 +186,6 @@
item_state = "owl"
body_parts_covered = SLOT_HEAD|SLOT_FACE|SLOT_EYES
-//Vox Unique Masks
-
-/obj/item/clothing/mask/gas/vox
- name = "vox breathing mask"
- desc = "A small oxygen filter for use by Vox"
- icon_state = "respirator"
- item_state = "respirator"
- flags_inv = 0
- body_parts_covered = 0
- filtered_gases = list(/decl/material/gas/oxygen)
-
-
-/obj/item/clothing/mask/gas/swat/vox
- name = "alien mask"
- desc = "Clearly not designed for a human face."
- icon_state = "voxswat"
- item_state = "voxswat"
- body_parts_covered = SLOT_EYES
- filtered_gases = list(
- /decl/material/gas/oxygen,
- /decl/material/gas/nitrous_oxide,
- /decl/material/gas/chlorine,
- /decl/material/gas/ammonia,
- /decl/material/gas/carbon_monoxide,
- /decl/material/gas/methyl_bromide,
- /decl/material/gas/methane
- )
-
/obj/item/clothing/mask/gas/aquabreather
name = "aquabreather"
desc = "A compact CO2 scrubber and breathing apparatus that draws oxygen from water."
diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm
index f3e6cc54693..c69bfb83dec 100644
--- a/code/modules/emotes/definitions/audible.dm
+++ b/code/modules/emotes/definitions/audible.dm
@@ -168,11 +168,6 @@
emote_message_3p = "USER chitters."
emote_sound = 'sound/voice/Bug.ogg'
-/decl/emote/audible/vox_shriek
- key ="shriek"
- emote_message_3p = "USER SHRIEKS!"
- emote_sound = 'sound/voice/shriek1.ogg'
-
/decl/emote/audible/roar
key = "roar"
emote_message_3p = "USER roars!"
diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index f2b67c7bd95..104f728cc6d 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -1079,7 +1079,7 @@
/decl/material/solid/gemstone/diamond,
/decl/material/solid/metal/uranium,
/decl/material/solid/metal/plasteel,
- /decl/material/solid/metal/plasteel/titanium,
+ /decl/material/solid/metal/titanium,
/decl/material/solid/glass,
/decl/material/solid/plastic
)
diff --git a/code/modules/materials/_materials.dm b/code/modules/materials/_materials.dm
index c1c0037e27e..3ea1dac9379 100644
--- a/code/modules/materials/_materials.dm
+++ b/code/modules/materials/_materials.dm
@@ -138,7 +138,6 @@
var/removed_by_welder
// Mining behavior.
- var/alloy_product
var/ore_name
var/ore_desc
var/ore_smelts_to
diff --git a/code/modules/materials/definitions/solids/materials_solid_metal.dm b/code/modules/materials/definitions/solids/materials_solid_metal.dm
index a267ad90855..d3fa3f2057e 100644
--- a/code/modules/materials/definitions/solids/materials_solid_metal.dm
+++ b/code/modules/materials/definitions/solids/materials_solid_metal.dm
@@ -190,7 +190,6 @@
hardness = MAT_VALUE_VERY_HARD
stack_origin_tech = "{'materials':2}"
hitsound = 'sound/weapons/smash.ogg'
- alloy_product = TRUE
value = 1.4
reflectiveness = MAT_VALUE_MATTE
@@ -202,7 +201,7 @@
. += new/datum/stack_recipe/furniture/crate(src)
. += new/datum/stack_recipe/grip(src)
-/decl/material/solid/metal/plasteel/titanium
+/decl/material/solid/metal/titanium
name = "titanium"
lore_text = "A light, strong, corrosion-resistant metal. Perfect for cladding high-velocity ballistic supply pods."
brute_armor = 10
@@ -217,6 +216,19 @@
icon_reinf = 'icons/turf/walls/reinforced_metal.dmi'
construction_difficulty = MAT_VALUE_VERY_HARD_DIY
value = 1.5
+ explosion_resistance = 25
+ hardness = MAT_VALUE_VERY_HARD
+ stack_origin_tech = "{'materials':2}"
+ hitsound = 'sound/weapons/smash.ogg'
+ reflectiveness = MAT_VALUE_MATTE
+
+/decl/material/solid/metal/titanium/generate_recipes(var/reinforce_material)
+ . = ..()
+ if(reinforce_material) //recipes below don't support composite materials
+ return
+ . += new/datum/stack_recipe/ai_core(src)
+ . += new/datum/stack_recipe/furniture/crate(src)
+ . += new/datum/stack_recipe/grip(src)
/decl/material/solid/metal/plasteel/ocp
name = "osmium-carbide plasteel"
@@ -275,7 +287,7 @@
M.add_chemical_effect(CE_BLOODRESTORE, 8 * removed)
// Adminspawn only, do not let anyone get this.
-/decl/material/solid/metal/voxalloy
+/decl/material/solid/metal/alienalloy
name = "dense alloy"
stack_type = null
color = "#6c7364"
@@ -289,7 +301,7 @@
value = 3
// Likewise.
-/decl/material/solid/metal/voxalloy/elevatorium
+/decl/material/solid/metal/alienalloy/elevatorium
name = "elevator panelling"
color = "#666666"
hidden_from_codex = TRUE
diff --git a/code/modules/materials/definitions/solids/materials_solid_mineral.dm b/code/modules/materials/definitions/solids/materials_solid_mineral.dm
index 882aa49c978..45f38122d94 100644
--- a/code/modules/materials/definitions/solids/materials_solid_mineral.dm
+++ b/code/modules/materials/definitions/solids/materials_solid_mineral.dm
@@ -252,7 +252,7 @@
stack_type = null
color = "#d8ad97"
heating_products = list(
- /decl/material/solid/metal/plasteel/titanium = 0.8,
+ /decl/material/solid/metal/titanium = 0.8,
/decl/material/solid/slag = 0.2
)
heating_point = GENERIC_SMELTING_HEAT_POINT
diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm
index 76d5266c2a7..9726b8f85eb 100644
--- a/code/modules/materials/material_sheets.dm
+++ b/code/modules/materials/material_sheets.dm
@@ -319,7 +319,7 @@
name = "titanium"
icon_state = "sheet"
plural_icon_state = "sheet-mult"
- material = /decl/material/solid/metal/plasteel/titanium
+ material = /decl/material/solid/metal/titanium
/obj/item/stack/material/titanium/ten
amount = 10
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index a2127cb9ce4..4a3f99a7ac6 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -23,8 +23,8 @@
whispering = TRUE
message = sanitize(message)
- var/obj/item/organ/internal/voicebox/vox = locate() in internal_organs
- var/snowflake_speak = (speaking && (speaking.flags & (NONVERBAL|SIGNLANG))) || (vox && vox.is_usable() && vox.assists_languages[speaking])
+ var/obj/item/organ/internal/voicebox/voice = locate() in internal_organs
+ var/snowflake_speak = (speaking && (speaking.flags & (NONVERBAL|SIGNLANG))) || (voice && voice.is_usable() && voice.assists_languages[speaking])
if(!isSynthetic() && need_breathe() && failed_last_breath && !snowflake_speak)
var/obj/item/organ/internal/lungs/L = internal_organs_by_name[species.breathing_organ]
if(!L || L.breath_fail_ratio > 0.9)
diff --git a/code/modules/mob/living/simple_animal/hostile/voxslug.dm b/code/modules/mob/living/simple_animal/hostile/slug.dm
similarity index 56%
rename from code/modules/mob/living/simple_animal/hostile/voxslug.dm
rename to code/modules/mob/living/simple_animal/hostile/slug.dm
index c032c80294e..b3d20b42a49 100644
--- a/code/modules/mob/living/simple_animal/hostile/voxslug.dm
+++ b/code/modules/mob/living/simple_animal/hostile/slug.dm
@@ -2,13 +2,13 @@
Small, little HP, poisonous.
*/
-/mob/living/simple_animal/hostile/voxslug
+/mob/living/simple_animal/hostile/slug
name = "slug"
- desc = "A viscious little creature, it has a mouth of too many teeth and a penchant for blood."
- icon_state = "voxslug"
- icon_living = "voxslug"
- item_state = "voxslug"
- icon_dead = "voxslug_dead"
+ desc = "A vicious, viscous little creature, it has a mouth of too many teeth and a penchant for blood."
+ icon_state = "slug"
+ icon_living = "slug"
+ item_state = "slug"
+ icon_dead = "slug_dead"
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "stamps on"
@@ -23,43 +23,49 @@ Small, little HP, poisonous.
can_escape = TRUE
pass_flags = PASS_FLAG_TABLE
natural_weapon = /obj/item/natural_weapon/bite
- holder_type = /obj/item/holder/voxslug
+ holder_type = /obj/item/holder/slug
faction = "Hostile Fauna"
-/mob/living/simple_animal/hostile/voxslug/ListTargets(var/dist = 7)
+/mob/living/simple_animal/hostile/slug/proc/check_friendly_species(var/mob/living/carbon/human/H)
+ if(isliving(H))
+ var/mob/living/M = H
+ if(M.faction == faction)
+ return TRUE
+ return FALSE
+
+/mob/living/simple_animal/hostile/slug/ListTargets(var/dist = 7)
var/list/L = list()
for(var/a in hearers(src, dist))
- if(isliving(a))
- var/mob/living/M = a
- if(M.faction == faction)
- continue
- L += a
-
+ if(!check_friendly_species(a))
+ L += a
return L
-/mob/living/simple_animal/hostile/voxslug/get_scooped(var/mob/living/carbon/grabber)
- to_chat(grabber, "\The [src] wriggles out of your hands before you can pick it up!")
+/mob/living/simple_animal/hostile/slug/get_scooped(var/mob/living/carbon/grabber)
+ if(check_friendly_species(grabber))
+ ..()
+ else
+ to_chat(grabber, "\The [src] wriggles out of your hands before you can pick it up!")
-/mob/living/simple_animal/hostile/voxslug/proc/attach(var/mob/living/carbon/human/H)
+/mob/living/simple_animal/hostile/slug/proc/attach(var/mob/living/carbon/human/H)
var/obj/item/clothing/suit/space/S = H.get_covering_equipped_item_by_zone(BP_CHEST)
if(istype(S) && !length(S.breaches))
S.create_breaches(BRUTE, 20)
if(!length(S.breaches)) //unable to make a hole
return
var/obj/item/organ/external/chest = H.organs_by_name[BP_CHEST]
- var/obj/item/holder/voxslug/holder = new(get_turf(src))
+ var/obj/item/holder/slug/holder = new(get_turf(src))
src.forceMove(holder)
chest.embed(holder,0,"\The [src] latches itself onto \the [H]!")
holder.sync(src)
-/mob/living/simple_animal/hostile/voxslug/AttackingTarget()
+/mob/living/simple_animal/hostile/slug/AttackingTarget()
. = ..()
if(istype(., /mob/living/carbon/human))
var/mob/living/carbon/human/H = .
if(prob(H.getBruteLoss()/2))
attach(H)
-/mob/living/simple_animal/hostile/voxslug/Life()
+/mob/living/simple_animal/hostile/slug/Life()
. = ..()
if(. && istype(src.loc, /obj/item/holder) && isliving(src.loc.loc)) //We in somebody
var/mob/living/L = src.loc.loc
@@ -69,8 +75,8 @@ Small, little HP, poisonous.
var/datum/reagents/R = L.reagents
R.add_reagent(/decl/material/liquid/presyncopics, 0.5)
-/obj/item/holder/voxslug/attack(var/mob/target, var/mob/user)
- var/mob/living/simple_animal/hostile/voxslug/V = contents[1]
+/obj/item/holder/slug/attack(var/mob/target, var/mob/user)
+ var/mob/living/simple_animal/hostile/slug/V = contents[1]
if(!V.stat && istype(target, /mob/living/carbon/human))
var/mob/living/carbon/human/H = target
if(!do_mob(user, H, 30))
diff --git a/code/modules/organs/internal/lungs.dm b/code/modules/organs/internal/lungs.dm
index 6f5897f5a21..5cb041dbb9e 100644
--- a/code/modules/organs/internal/lungs.dm
+++ b/code/modules/organs/internal/lungs.dm
@@ -190,7 +190,7 @@
// Pass reagents from the gas into our body.
// Presumably if you breathe it you have a specialized metabolism for it, so we drop/ignore breath_type. Also avoids
- // humans processing thousands of units of oxygen over the course of a round for the sole purpose of poisoning vox.
+ // humans processing thousands of units of oxygen over the course of a round.
var/ratio = BP_IS_PROSTHETIC(src)? 0.66 : 1
for(var/gasname in breath.gas - breath_type)
var/decl/material/gas = decls_repository.get_decl(gasname)
diff --git a/code/modules/overmap/exoplanets/planet_types/desert.dm b/code/modules/overmap/exoplanets/planet_types/desert.dm
index 89136424921..0ee0c6d2d90 100644
--- a/code/modules/overmap/exoplanets/planet_types/desert.dm
+++ b/code/modules/overmap/exoplanets/planet_types/desert.dm
@@ -10,7 +10,7 @@
water_color = null
has_trees = FALSE
flora_diversity = 4
- fauna_types = list(/mob/living/simple_animal/thinbug, /mob/living/simple_animal/tindalos, /mob/living/simple_animal/hostile/voxslug, /mob/living/simple_animal/hostile/antlion)
+ fauna_types = list(/mob/living/simple_animal/thinbug, /mob/living/simple_animal/tindalos, /mob/living/simple_animal/hostile/slug, /mob/living/simple_animal/hostile/antlion)
megafauna_types = list(/mob/living/simple_animal/hostile/antlion/mega)
/obj/effect/overmap/visitable/sector/exoplanet/desert/generate_map()
diff --git a/code/modules/projectiles/guns/energy/vox.dm b/code/modules/projectiles/guns/energy/vox.dm
deleted file mode 100644
index f359dea1406..00000000000
--- a/code/modules/projectiles/guns/energy/vox.dm
+++ /dev/null
@@ -1,58 +0,0 @@
-/datum/extension/voxform
- base_type = /datum/extension/voxform
-
-/datum/extension/voxform/proc/check_held_user(var/mob/living/carbon/human/user, var/atom/movable/thing)
- if(!istype(user))
- return FALSE
- return TRUE
-
-/obj/item/gun/special_check(var/mob/living/carbon/human/user)
- . = ..()
- if(!QDELETED(src) && src.loc == user && has_extension(src, /datum/extension/voxform))
- var/datum/extension/voxform/voxform = get_extension(src, /datum/extension/voxform)
- . = voxform.check_held_user(user, src)
-
-/*
- * Vox Darkmatter Cannon
- */
-/obj/item/gun/energy/darkmatter
- name = "flux cannon"
- desc = "A vicious beam weapon that crushes targets with dark-matter gravity pulses. Parts of it twitch and writhe, as if alive."
- icon = 'icons/obj/guns/darkcannon.dmi'
- item_state = "world"
- w_class = ITEM_SIZE_LARGE
- projectile_type = /obj/item/projectile/beam/stun/darkmatter
- one_hand_penalty = 2 //a little bulky
- self_recharge = 1
- firemodes = list(
- list(mode_name="stunning", burst=1, fire_delay=null, burst_accuracy=list(30), dispersion=null, projectile_type=/obj/item/projectile/beam/stun/darkmatter, charge_cost = 50),
- list(mode_name="focused", burst=1, fire_delay=null, burst_accuracy=list(30), dispersion=null, projectile_type=/obj/item/projectile/beam/darkmatter, charge_cost = 75),
- list(mode_name="scatter burst", burst=8, fire_delay=null, burst_accuracy=list(0, 0, 0, 0, 0, 0, 0, 0), dispersion=list(0, 1, 2, 2, 3, 3, 3, 3, 3), projectile_type=/obj/item/projectile/energy/darkmatter, charge_cost = 10),
- )
-
-/obj/item/gun/energy/darkmatter/Initialize()
- . = ..()
- set_extension(src, /datum/extension/voxform)
-
-/*
- * Vox Sonic Cannon
- */
-/obj/item/gun/energy/sonic
- name = "soundcannon"
- desc = "A vicious sonic weapon of alien manufacture. Parts of it quiver gelatinously, as though the insectile-looking thing is alive."
- icon = 'icons/obj/guns/noise.dmi'
- item_state = "world"
- w_class = ITEM_SIZE_LARGE
- one_hand_penalty = 1
- self_recharge = 1
- recharge_time = 10
- fire_delay = 15
- projectile_type=/obj/item/projectile/energy/plasmastun/sonic/weak
- firemodes = list(
- list(mode_name="normal", projectile_type=/obj/item/projectile/energy/plasmastun/sonic/weak, charge_cost = 50),
- list(mode_name="overcharge", projectile_type=/obj/item/projectile/energy/plasmastun/sonic/strong, charge_cost = 200),
- )
-
-/obj/item/gun/energy/sonic/Initialize()
- . = ..()
- set_extension(src, /datum/extension/voxform)
diff --git a/code/modules/projectiles/guns/launcher/alien.dm b/code/modules/projectiles/guns/launcher/alien.dm
deleted file mode 100644
index 0522aefc370..00000000000
--- a/code/modules/projectiles/guns/launcher/alien.dm
+++ /dev/null
@@ -1,53 +0,0 @@
-/obj/item/gun/launcher/alien
- var/last_regen = 0
- var/ammo_gen_time = 100
- var/max_ammo = 3
- var/ammo = 3
- var/ammo_type
- var/ammo_name
-
-/obj/item/gun/launcher/alien/Initialize()
- . = ..()
- START_PROCESSING(SSobj, src)
- last_regen = world.time
-
-/obj/item/gun/launcher/alien/Destroy()
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/item/gun/launcher/alien/Process()
- if(ammo < max_ammo && world.time > last_regen + ammo_gen_time)
- ammo++
- last_regen = world.time
- update_icon()
-
-/obj/item/gun/launcher/alien/examine(mob/user)
- . = ..()
- to_chat(user, "It has [ammo] [ammo_name]\s remaining.")
-
-/obj/item/gun/launcher/alien/consume_next_projectile()
- if(ammo < 1) return null
- if(ammo == max_ammo) //stops people from buffering a reload (gaining effectively +1 to the clip)
- last_regen = world.time
- ammo--
- return new ammo_type
-
-/obj/item/gun/launcher/alien/Initialize()
- . = ..()
- set_extension(src, /datum/extension/voxform)
-
-//Vox pinning weapon.
-/obj/item/gun/launcher/alien/spikethrower
- name = "spike thrower"
- desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive."
- w_class = ITEM_SIZE_LARGE
- ammo_name = "spike"
- ammo_type = /obj/item/spike
- release_force = 30
- icon = 'icons/obj/guns/launcher/voxspike.dmi'
- icon_state = ICON_STATE_WORLD
- fire_sound_text = "a strange noise"
- fire_sound = 'sound/weapons/spike.ogg'
-
-/obj/item/gun/launcher/alien/spikethrower/on_update_icon()
- icon_state = "[get_world_inventory_state()][Clamp(ammo,0,3)]"
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm
index 9cffac26735..d5dbed619db 100644
--- a/code/modules/projectiles/guns/launcher/crossbow.dm
+++ b/code/modules/projectiles/guns/launcher/crossbow.dm
@@ -26,13 +26,6 @@
icon_state = "metal-rod"
item_state = "bolt"
-/obj/item/arrow/quill
- name = "vox quill"
- desc = "A wickedly barbed quill from some bizarre animal."
- icon_state = "quill"
- item_state = "quill"
- throwforce = 5
-
/obj/item/arrow/rod
name = "metal rod"
desc = "Don't cry for me, Orithena."
diff --git a/code/modules/projectiles/guns/launcher/slugsling.dm b/code/modules/projectiles/guns/launcher/slugsling.dm
deleted file mode 100644
index 75547cba6ea..00000000000
--- a/code/modules/projectiles/guns/launcher/slugsling.dm
+++ /dev/null
@@ -1,58 +0,0 @@
-/obj/item/slugegg
- name = "slugegg"
- desc = "A pulsing, disgusting door to new life."
- force = 1
- throwforce = 6
- icon = 'icons/obj/items/slug_egg.dmi'
- icon_state = "slugegg"
- var/break_on_impact = 1 //There are two modes to the eggs.
- //One breaks the egg on hit,
-
-/obj/item/slugegg/throw_impact(atom/hit_atom)
- ..()
- if(break_on_impact)
- squish()
- else
- movable_flags |= MOVABLE_FLAG_PROXMOVE //Dont want it active during the throw... loooots of unneeded checking.
-
-/obj/item/slugegg/attack_self(var/mob/living/user)
- squish()
-
-/obj/item/slugegg/HasProximity(var/atom/movable/AM)
- if(isliving(AM))
- squish()
-
-/obj/item/slugegg/proc/squish()
- src.visible_message("\The [src] bursts open!")
- new /mob/living/simple_animal/hostile/voxslug(get_turf(src))
- playsound(src.loc,'sound/effects/attackblob.ogg',100, 1)
- qdel(src)
-
-//a slug sling basically launches a small egg that hatches (either on a person or on the floor), releasing a terrible blood thirsty monster.
-//Balanced due to the non-spammy nature of the gun, as well as the frailty of the creatures.
-/obj/item/gun/launcher/alien/slugsling
- name = "slug sling"
- desc = "A bulbous looking rifle. It feels like holding a plastic bag full of meat."
- w_class = ITEM_SIZE_LARGE
- icon = 'icons/obj/guns/launcher/voxslug.dmi'
- icon_state = ICON_STATE_WORLD
- fire_sound_text = "a strange noise"
- fire_sound = 'sound/weapons/towelwhip.ogg'
- release_force = 6
- ammo_name = "slug"
- ammo_type = /obj/item/slugegg
- max_ammo = 2
- ammo = 2
- ammo_gen_time = 600
- var/mode = "Impact"
-
-/obj/item/gun/launcher/alien/slugsling/consume_next_projectile()
- var/obj/item/slugegg/S = ..()
- if(S)
- S.break_on_impact = (mode == "Impact")
- return S
-
-
-/obj/item/gun/launcher/alien/slugsling/attack_self(var/mob/living/user)
- mode = mode == "Impact" ? "Sentry" : "Impact"
- to_chat(user,"You switch \the [src]'s mode to \"[mode]\"")
diff --git a/code/modules/shuttles/antagonist.dm b/code/modules/shuttles/antagonist.dm
index 2a2b827f10f..8acf8d651eb 100644
--- a/code/modules/shuttles/antagonist.dm
+++ b/code/modules/shuttles/antagonist.dm
@@ -1,8 +1,3 @@
-/obj/machinery/computer/shuttle_control/multi/vox
- name = "skipjack control console"
- initial_access = list(access_syndicate)
- shuttle_tag = "Skipjack"
-
/obj/machinery/computer/shuttle_control/multi/syndicate
name = "mercenary shuttle control console"
initial_access = list(access_syndicate)
diff --git a/code/modules/turbolift/turbolift_turfs.dm b/code/modules/turbolift/turbolift_turfs.dm
index 080be03c605..c1728c16a32 100644
--- a/code/modules/turbolift/turbolift_turfs.dm
+++ b/code/modules/turbolift/turbolift_turfs.dm
@@ -1,2 +1,2 @@
/turf/simulated/wall/elevator/Initialize(var/ml)
- . = ..(ml, /decl/material/solid/metal/voxalloy/elevatorium)
+ . = ..(ml, /decl/material/solid/metal/alienalloy/elevatorium)
diff --git a/code/modules/xenoarcheaology/finds/find_types/material.dm b/code/modules/xenoarcheaology/finds/find_types/material.dm
index 21d3943f313..6ba3dc79385 100644
--- a/code/modules/xenoarcheaology/finds/find_types/material.dm
+++ b/code/modules/xenoarcheaology/finds/find_types/material.dm
@@ -2,7 +2,7 @@
/decl/archaeological_find/material
item_type = "material lump"
modification_flags = XENOFIND_APPLY_PREFIX
- var/list/possible_materials = list(/decl/material/solid/metal/steel, /decl/material/solid/metal/plasteel, /decl/material/solid/metal/plasteel/titanium, /decl/material/solid/glass)
+ var/list/possible_materials = list(/decl/material/solid/metal/steel, /decl/material/solid/metal/plasteel, /decl/material/solid/metal/titanium, /decl/material/solid/glass)
/decl/archaeological_find/material/spawn_item(atom/loc)
var/mat_to_spawn = pickweight(possible_materials)
diff --git a/icons/mob/simple_animal/animal.dmi b/icons/mob/simple_animal/animal.dmi
index 3d85ff28fa1..52f36afc1ca 100644
Binary files a/icons/mob/simple_animal/animal.dmi and b/icons/mob/simple_animal/animal.dmi differ
diff --git a/icons/obj/guns/darkcannon.dmi b/icons/obj/guns/darkcannon.dmi
deleted file mode 100644
index 63e8b486c55..00000000000
Binary files a/icons/obj/guns/darkcannon.dmi and /dev/null differ
diff --git a/icons/obj/guns/launcher/voxslug.dmi b/icons/obj/guns/launcher/voxslug.dmi
deleted file mode 100644
index d5f998b280f..00000000000
Binary files a/icons/obj/guns/launcher/voxslug.dmi and /dev/null differ
diff --git a/icons/obj/guns/launcher/voxspike.dmi b/icons/obj/guns/launcher/voxspike.dmi
deleted file mode 100644
index 7f8050cbd94..00000000000
Binary files a/icons/obj/guns/launcher/voxspike.dmi and /dev/null differ
diff --git a/icons/obj/guns/noise.dmi b/icons/obj/guns/noise.dmi
deleted file mode 100644
index 261fa4768b3..00000000000
Binary files a/icons/obj/guns/noise.dmi and /dev/null differ
diff --git a/icons/obj/items/slug_egg.dmi b/icons/obj/items/slug_egg.dmi
deleted file mode 100644
index 413ca9f05e9..00000000000
Binary files a/icons/obj/items/slug_egg.dmi and /dev/null differ
diff --git a/maps/antag_spawn/heist/heist.dm b/maps/antag_spawn/heist/heist.dm
index bbe276a02ff..2b74858f840 100644
--- a/maps/antag_spawn/heist/heist.dm
+++ b/maps/antag_spawn/heist/heist.dm
@@ -1,3 +1,9 @@
+#include "heist_antag.dm"
+
+// This is here so the compiler stops bitching about override preceding definition.
+/datum/antagonist/raider/proc/check_special_species(var/mob/living/carbon/human/player)
+ return FALSE
+
/datum/map_template/ruin/antag_spawn/heist
name = "Heist Base"
id = MODE_RAIDER + "_spawn"
@@ -56,3 +62,8 @@
requires_power = 0
dynamic_lighting = 0
req_access = list(access_syndicate)
+
+/obj/machinery/computer/shuttle_control/multi/raider
+ name = "skipjack control console"
+ initial_access = list(access_syndicate)
+ shuttle_tag = "Skipjack"
diff --git a/code/game/antagonist/outsider/raider.dm b/maps/antag_spawn/heist/heist_antag.dm
similarity index 99%
rename from code/game/antagonist/outsider/raider.dm
rename to maps/antag_spawn/heist/heist_antag.dm
index 0b506104c11..26bf6a82902 100644
--- a/code/game/antagonist/outsider/raider.dm
+++ b/maps/antag_spawn/heist/heist_antag.dm
@@ -5,7 +5,7 @@ GLOBAL_DATUM_INIT(raiders, /datum/antagonist/raider, new)
role_text = "Raider"
role_text_plural = "Raiders"
antag_indicator = "hudraider"
- landmark_id = "voxstart"
+ landmark_id = "raiderstart"
welcome_text = "Use :H to talk on your encrypted channel."
flags = ANTAG_OVERRIDE_JOB | ANTAG_OVERRIDE_MOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_VOTABLE | ANTAG_SET_APPEARANCE | ANTAG_HAS_LEADER
antaghud_indicator = "hudraider"
diff --git a/maps/antag_spawn/heist/heist_base.dmm b/maps/antag_spawn/heist/heist_base.dmm
index bdae515c5a5..d38cdcfe957 100644
--- a/maps/antag_spawn/heist/heist_base.dmm
+++ b/maps/antag_spawn/heist/heist_base.dmm
@@ -253,7 +253,7 @@
/area/map_template/syndicate_mothership/raider_base)
"aL" = (
/obj/effect/landmark{
- name = "voxstart"
+ name = "raiderstart"
},
/obj/effect/floor_decal/carpet{
dir = 1
@@ -363,7 +363,7 @@
/area/map_template/syndicate_mothership/raider_base)
"aX" = (
/obj/effect/landmark{
- name = "voxstart"
+ name = "raiderstart"
},
/turf/unsimulated/floor{
icon_state = "carpet";
@@ -653,7 +653,6 @@
/area/map_template/syndicate_mothership/raider_base)
"bA" = (
/obj/structure/table/rack,
-/obj/item/gun/launcher/alien/spikethrower,
/turf/unsimulated/floor{
icon_state = "asteroid"
},
@@ -1029,12 +1028,12 @@
/area/space)
"cw" = (
/obj/effect/paint/black,
-/turf/simulated/wall/voxshuttle,
+/turf/simulated/wall/raidershuttle,
/area/map_template/skipjack_station/start)
"cx" = (
/obj/machinery/door/airlock/external{
icon_state = "door_closed";
- id_tag = "vox_northwest_lock";
+ id_tag = "raider_northwest_lock";
locked = 0
},
/obj/machinery/shield_diffuser,
@@ -1042,11 +1041,11 @@
/area/map_template/skipjack_station/start)
"cy" = (
/obj/machinery/button/access/shuttle/exterior{
- id_tag = "vox_west_control";
+ id_tag = "raider_west_control";
req_access = list("ACCESS_SYNDICATE")
},
/obj/effect/paint/black,
-/turf/simulated/wall/voxshuttle,
+/turf/simulated/wall/raidershuttle,
/area/map_template/skipjack_station/start)
"cz" = (
/obj/machinery/door/blast/regular{
@@ -1072,14 +1071,14 @@
/area/map_template/skipjack_station/start)
"cB" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{
- id_tag = "vox_west_vent"
+ id_tag = "raider_west_vent"
},
/obj/random/junk,
/turf/simulated/floor/plating,
/area/map_template/skipjack_station/start)
"cC" = (
/obj/machinery/airlock_sensor/shuttle{
- id_tag = "vox_west_sensor";
+ id_tag = "raider_west_sensor";
pixel_x = 25
},
/turf/simulated/floor/plating,
@@ -1089,7 +1088,7 @@
/turf/simulated/floor/shuttle/red,
/area/map_template/skipjack_station/start)
"cE" = (
-/obj/machinery/computer/shuttle_control/multi/vox,
+/obj/machinery/computer/shuttle_control/multi/raider,
/turf/simulated/floor/shuttle/red,
/area/map_template/skipjack_station/start)
"cF" = (
@@ -1122,17 +1121,17 @@
/area/map_template/skipjack_station/start)
"cJ" = (
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
- tag_airpump = "vox_west_vent";
- tag_exterior_door = "vox_northwest_lock";
+ tag_airpump = "raider_west_vent";
+ tag_exterior_door = "raider_northwest_lock";
frequency = 1331;
- id_tag = "vox_west_control";
- tag_interior_door = "vox_southwest_lock";
+ id_tag = "raider_west_control";
+ tag_interior_door = "raider_southwest_lock";
pixel_x = 24;
- tag_chamber_sensor = "vox_west_sensor"
+ tag_chamber_sensor = "raider_west_sensor"
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{
dir = 8;
- id_tag = "vox_west_vent"
+ id_tag = "raider_west_vent"
},
/obj/machinery/light/small,
/turf/simulated/floor/plating,
@@ -1210,12 +1209,12 @@
/area/map_template/skipjack_station/start)
"cR" = (
/obj/effect/paint/brown,
-/turf/simulated/wall/voxshuttle,
+/turf/simulated/wall/raidershuttle,
/area/map_template/skipjack_station/start)
"cS" = (
/obj/machinery/door/airlock/external{
icon_state = "door_closed";
- id_tag = "vox_southwest_lock";
+ id_tag = "raider_southwest_lock";
locked = 0
},
/obj/machinery/atmospherics/pipe/simple/visible,
@@ -1256,7 +1255,7 @@
"cZ" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/button/access/shuttle/interior{
- id_tag = "vox_west_control";
+ id_tag = "raider_west_control";
pixel_x = -22;
req_access = list("ACCESS_SYNDICATE")
},
@@ -1695,7 +1694,7 @@
dir = 1
},
/obj/effect/paint/black,
-/turf/simulated/wall/voxshuttle,
+/turf/simulated/wall/raidershuttle,
/area/map_template/skipjack_station/start)
"eh" = (
/obj/random/trash,
@@ -1722,7 +1721,7 @@
"el" = (
/obj/structure/shuttle/engine/propulsion,
/obj/effect/paint/black,
-/turf/simulated/wall/voxshuttle,
+/turf/simulated/wall/raidershuttle,
/area/map_template/skipjack_station/start)
"em" = (
/obj/structure/table/standard,
diff --git a/maps/away/derelict/derelict-station.dmm b/maps/away/derelict/derelict-station.dmm
index 94abf28e3af..552cd104725 100644
--- a/maps/away/derelict/derelict-station.dmm
+++ b/maps/away/derelict/derelict-station.dmm
@@ -3,7 +3,7 @@
/turf/space,
/area/space)
"ab" = (
-/turf/simulated/wall/voxshuttle,
+/turf/simulated/wall/raidershuttle,
/area/derelict/ship)
"ac" = (
/obj/structure/window/reinforced{
@@ -741,7 +741,7 @@
/turf/simulated/floor/airless,
/area/constructionsite/maintenance)
"cn" = (
-/turf/simulated/wall/voxshuttle,
+/turf/simulated/wall/raidershuttle,
/area/space)
"co" = (
/obj/machinery/door/airlock/glass{
diff --git a/maps/away/smugglers/smugglers.dm b/maps/away/smugglers/smugglers.dm
index 9432a5dd954..21ce4771b68 100644
--- a/maps/away/smugglers/smugglers.dm
+++ b/maps/away/smugglers/smugglers.dm
@@ -40,7 +40,7 @@
/obj/item/paper/smug_2
name = "suspicious note"
- info = "That vox fuckface will be curious about what we got from that mine storage last week."
+ info = "That scaly fuckface will be curious about what we got from that mine storage last week."
/obj/item/paper/smug_3
name = "suspicious note"
diff --git a/maps/away_sites_testing/away_sites_testing.dm b/maps/away_sites_testing/away_sites_testing.dm
index 1935adcc1cf..80ec02c946e 100644
--- a/maps/away_sites_testing/away_sites_testing.dm
+++ b/maps/away_sites_testing/away_sites_testing.dm
@@ -1,5 +1,7 @@
#if !defined(USING_MAP_DATUM)
+ #include "../antag_spawn/heist/heist.dm"
+
#include "away_sites_testing_lobby.dm"
#include "blank.dmm"
diff --git a/maps/random_ruins/exoplanet_ruins/deserted_lab/deserted_lab.dmm b/maps/random_ruins/exoplanet_ruins/deserted_lab/deserted_lab.dmm
index a8de9ec9108..ee502fc6d2e 100644
--- a/maps/random_ruins/exoplanet_ruins/deserted_lab/deserted_lab.dmm
+++ b/maps/random_ruins/exoplanet_ruins/deserted_lab/deserted_lab.dmm
@@ -89,7 +89,7 @@
/area/template_noop)
"at" = (
/obj/random/loot,
-/mob/living/simple_animal/hostile/voxslug,
+/mob/living/simple_animal/hostile/slug,
/turf/simulated/floor/tiled/steel_ridged,
/area/template_noop)
"au" = (
diff --git a/maps/tradeship/tradeship.dm b/maps/tradeship/tradeship.dm
index 31f8a64a538..667e2296d93 100644
--- a/maps/tradeship/tradeship.dm
+++ b/maps/tradeship/tradeship.dm
@@ -1,5 +1,11 @@
#if !defined(USING_MAP_DATUM)
+<<<<<<< HEAD
+=======
+ #include "../antag_spawn/heist/heist.dm"
+
+ #include "../../mods/utility_frames/_utility_frames.dme"
+>>>>>>> 79a370a187... Merge pull request #1050 from MistakeNot4892/cleanup
#include "../../mods/corporate/_corporate.dme"
#include "../../mods/ascent/_ascent.dme"
diff --git a/mods/borers/mob/borer/borer.dm b/mods/borers/mob/borer/borer.dm
index 34c3ec2fe32..1992fba46d0 100644
--- a/mods/borers/mob/borer/borer.dm
+++ b/mods/borers/mob/borer/borer.dm
@@ -8,7 +8,7 @@
response_disarm = "prods"
response_harm = "stomps on"
icon_state = "brainslug"
- item_state = "voxslug" // For the lack of a better sprite...
+ item_state = "slug" // For the lack of a better sprite...
icon_living = "brainslug"
icon_dead = "brainslug_dead"
speed = 5
diff --git a/mods/corporate/away_sites/lar_maria/lar_maria.dm b/mods/corporate/away_sites/lar_maria/lar_maria.dm
index a16229c6aa3..3febdaf2aac 100644
--- a/mods/corporate/away_sites/lar_maria/lar_maria.dm
+++ b/mods/corporate/away_sites/lar_maria/lar_maria.dm
@@ -6,6 +6,7 @@
desc = "Sensors detect an orbital station with low energy profile and sporadic life signs."
icon_state = "object"
known = 0
+
/datum/map_template/ruin/away_site/lar_maria
name = "Lar Maria"
diff --git a/mods/government/away_sites/icarus/icarus-1.dmm b/mods/government/away_sites/icarus/icarus-1.dmm
index 610d2ce0cfd..015fe215cce 100644
--- a/mods/government/away_sites/icarus/icarus-1.dmm
+++ b/mods/government/away_sites/icarus/icarus-1.dmm
@@ -2416,7 +2416,7 @@
"hH" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume/shuttle{
dir = 8;
- id_tag = "vox_west_vent"
+ id_tag = "raider_west_vent"
},
/turf/simulated/floor/reinforced,
/area/icarus/vessel)
diff --git a/nebula.dme b/nebula.dme
index 36bd2d696d9..6a44b97ca7f 100644
--- a/nebula.dme
+++ b/nebula.dme
@@ -549,7 +549,6 @@
#include "code\game\antagonist\outsider\ert.dm"
#include "code\game\antagonist\outsider\mercenary.dm"
#include "code\game\antagonist\outsider\ninja.dm"
-#include "code\game\antagonist\outsider\raider.dm"
#include "code\game\antagonist\outsider\wizard.dm"
#include "code\game\antagonist\station\changeling.dm"
#include "code\game\antagonist\station\cult_god.dm"
@@ -2348,10 +2347,10 @@
#include "code\modules\mob\living\simple_animal\hostile\pike.dm"
#include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
#include "code\modules\mob\living\simple_animal\hostile\russian.dm"
+#include "code\modules\mob\living\simple_animal\hostile\slug.dm"
#include "code\modules\mob\living\simple_animal\hostile\syndicate.dm"
#include "code\modules\mob\living\simple_animal\hostile\tree.dm"
#include "code\modules\mob\living\simple_animal\hostile\vagrant.dm"
-#include "code\modules\mob\living\simple_animal\hostile\voxslug.dm"
#include "code\modules\mob\living\simple_animal\hostile\commanded\_command_defines.dm"
#include "code\modules\mob\living\simple_animal\hostile\commanded\bear_companion.dm"
#include "code\modules\mob\living\simple_animal\hostile\commanded\commanded.dm"
@@ -2734,16 +2733,13 @@
#include "code\modules\projectiles\guns\energy\staves.dm"
#include "code\modules\projectiles\guns\energy\stun.dm"
#include "code\modules\projectiles\guns\energy\temperature.dm"
-#include "code\modules\projectiles\guns\energy\vox.dm"
#include "code\modules\projectiles\guns\energy\xray.dm"
-#include "code\modules\projectiles\guns\launcher\alien.dm"
#include "code\modules\projectiles\guns\launcher\crossbow.dm"
#include "code\modules\projectiles\guns\launcher\foam_gun.dm"
#include "code\modules\projectiles\guns\launcher\grenade_launcher.dm"
#include "code\modules\projectiles\guns\launcher\money_cannon.dm"
#include "code\modules\projectiles\guns\launcher\pneumatic.dm"
#include "code\modules\projectiles\guns\launcher\rocket.dm"
-#include "code\modules\projectiles\guns\launcher\slugsling.dm"
#include "code\modules\projectiles\guns\launcher\syringe_gun.dm"
#include "code\modules\projectiles\guns\magnetic\magnetic.dm"
#include "code\modules\projectiles\guns\magnetic\magnetic_railgun.dm"
@@ -3226,7 +3222,6 @@
#include "maps\antag_spawn\antag_spawn_bases.dm"
#include "maps\antag_spawn\deity\deity.dm"
#include "maps\antag_spawn\ert\ert.dm"
-#include "maps\antag_spawn\heist\heist.dm"
#include "maps\antag_spawn\mercenary\mercenary.dm"
#include "maps\antag_spawn\ninja\ninja.dm"
#include "maps\antag_spawn\wizard\wizard.dm"