cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-16 10:27:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scrubs all mentions of Vox from the code ( I suck at Git edition ) (#10423)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2020-11-22 18:34:04 +08:00
committed by GitHub
parent b2ce742e9f
commit e8945fa626
44 changed files with 141 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/chemistry.dm
+8 -9
View File
@@ -35,20 +35,19 @@
// Some on_mob_life() procs check for alien races.
#define IS_DIONA 1
#define IS_VOX 2
#define IS_SKRELL 4
#define IS_UNATHI 8
#define IS_TAJARA 16
#define IS_XENOS 32
#define IS_MACHINE 64
#define IS_VAURCA 128
#define IS_UNDEAD 256
#define IS_SKRELL 2
#define IS_UNATHI 4
#define IS_TAJARA 8
#define IS_XENOS 16
#define IS_MACHINE 32
#define IS_VAURCA 64
#define IS_UNDEAD 128
// Apply status effects
#define CE_ALCOHOL "alcohol" // Liver filtering
#define CE_ANTIEMETIC "antiemetic" // suppresses vomiting
#define CE_ITCH "itch" // causes itching
#define CE_NOITCH "noitch" // suppresses itching
#define CE_NOITCH "noitch" // suppresses itching
#define CE_BERSERK "berserk"
#define CE_CLUMSY "clumsy" // Peridaxon side effects, etc
#define CE_DROPITEM "dropitem" // keloderm side effect
code/__defines/mobs.dm
+1 -1
View File
@@ -319,7 +319,7 @@
// Note that any given mob can be more than one type
#define TYPE_ORGANIC 1 // Almost any creature under /mob/living/carbon and most simple animals
#define TYPE_SYNTHETIC 2 // Everything under /mob/living/silicon, plus IPCs, viscerators
#define TYPE_HUMANOID 4 // Humans, skrell, unathi, tajara, vaurca, diona, IPC, vox
#define TYPE_HUMANOID 4 // Humans, skrell, unathi, tajara, vaurca, diona, IPC
#define TYPE_WEIRD 8 // Slimes, constructs, demons, and other creatures of a magical or bluespace nature.
#define TYPE_INCORPOREAL 16 // Mobs that don't really have any physical form to them.
code/__defines/species_languages.dm
+1 -2
View File
@@ -53,7 +53,6 @@
#define LANGUAGE_SIGN "Sign Language"
// Antag Languages
#define LANGUAGE_VOX "Vox-pidgin"
#define LANGUAGE_CHANGELING "Changeling"
#define LANGUAGE_BORER "Cortical Link"
#define LANGUAGE_BORER_HIVEMIND "Cortical Hivemind"
@@ -96,4 +95,4 @@
// Representative missions levels
#define REPRESENTATIVE_MISSION_LOW 1
#define REPRESENTATIVE_MISSION_MEDIUM 2
#define REPRESENTATIVE_MISSION_HIGH 3
#define REPRESENTATIVE_MISSION_HIGH 3
code/datums/trading/goods.dm
-1
View File
@@ -108,7 +108,6 @@
possible_origins = list("Space Eagle", "Banana Democracy", "Forever 22", "Textiles Factory Warehouse Outlet", "Blocks Brothers")
speech = list(
"hail_generic" = "Hello, sir! Welcome to ORIGIN!",
"hail_Vox" = "Well hello sir! I don't believe we have any clothes that fit you... but you can still look!",
"hail_deny" = "We do not trade with rude customers. Consider yourself blacklisted.",
"trade_complete" = "Thank you for shopping at ORIGIN. Remember: We cannot accept returns without the original tags!",
"trade_blacklist" = "Hm, how about no?",
code/game/antagonist/outsider/raider.dm
+3 -3
View File
@@ -6,7 +6,7 @@ var/datum/antagonist/raider/raiders
role_text_plural = "Raiders"
bantype = "raider"
antag_indicator = "mutineer"
landmark_id = "voxstart"
landmark_id = "raiderstart"
welcome_text = "Use :H to talk on your encrypted channel."
flags = ANTAG_OVERRIDE_JOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_VOTABLE | ANTAG_SET_APPEARANCE | ANTAG_HAS_LEADER | ANTAG_NO_FLAVORTEXT
antaghud_indicator = "hudmutineer"
@@ -84,7 +84,7 @@ var/datum/antagonist/raider/raiders
else
win_type = "Minor"
win_group = "Crew"
//Now we modify that result by the state of the vox crew.
//Now we modify that result by the state of the raider crew.
if(antags_are_dead())
win_type = "Major"
win_group = "Crew"
@@ -139,4 +139,4 @@ var/datum/antagonist/raider/raiders
return 1
/datum/antagonist/raider/get_antag_radio()
return "Raider"
return "Raider"
code/game/antagonist/outsider/raider_mage.dm
+2 -2
View File
@@ -6,7 +6,7 @@ var/datum/antagonist/raider_mage/raider_mage
role_text_plural = "Raider Mages"
bantype = "raider"
antag_indicator = "magineer"
landmark_id = "voxstart"
landmark_id = "raiderstart"
welcome_text = "Use :H to talk on your encrypted channel."
flags = ANTAG_OVERRIDE_JOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_VOTABLE | ANTAG_SET_APPEARANCE | ANTAG_NO_FLAVORTEXT
antaghud_indicator = "hudmagineer"
@@ -60,4 +60,4 @@ var/datum/antagonist/raider_mage/raider_mage
return TRUE
/datum/antagonist/raider_mage/get_antag_radio()
return "Raider"
return "Raider"
code/game/gamemodes/game_mode.dm
+1 -1
View File
@@ -324,7 +324,7 @@ var/global/list/additional_antag_types = list()
"suspected criminal operatives",
"malfunctioning von Neumann probe swarms",
"shadowy interlopers",
"a stranded Vox arkship",
"a stranded Vaurcan hiveship",
"haywire IPC constructs",
"rogue Unathi exiles",
"artifacts of eldritch horror",
code/game/machinery/computer/arcade_orion.dm
+3 -3
View File
@@ -4,7 +4,7 @@
//////////////////////////
//Orion Trail Events
#define ORION_TRAIL_RAIDERS "Vox Raiders"
#define ORION_TRAIL_RAIDERS "Raiders"
#define ORION_TRAIL_FLUX "Interstellar Flux"
#define ORION_TRAIL_ILLNESS "Illness"
#define ORION_TRAIL_BREAKDOWN "Breakdown"
@@ -123,7 +123,7 @@
event_title += ": [stops[port]]"
event_actions = "<a href='?src=\ref[src];continue=1'>Shove off</a>"
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 raiders!"
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)
@@ -328,7 +328,7 @@
else
event_info = "You couldn't fight them off!<br>"
if(prob(10*settlers.len))
remove_settler(null, "was kidnapped by the Vox!")
remove_settler(null, "was kidnapped by the raiders!")
change_resource(null,-1)
change_resource(null,-0.5)
if(ORION_TRAIL_DERELICT)
code/game/objects/items/weapons/tanks/tank_types.dm
-42
View File
@@ -156,45 +156,3 @@
item_state = "emergency_engi"
gauge_icon = "indicator_emergency_double"
volume = 10
/obj/item/tank/emergency_nitrogen
name = "emergency nitrogen tank"
desc = "An emergency air tank hastily painted red and issued to Vox crewmembers."
icon_state = "emergency_nitro"
gauge_icon = "indicator_emergency"
gauge_cap = 4
flags = CONDUCT
slot_flags = SLOT_BELT
w_class = ITEMSIZE_SMALL
force = 4.0
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
volume = 2
/obj/item/tank/emergency_nitrogen/Initialize()
. = ..()
air_contents.adjust_gas(GAS_NITROGEN, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/emergency_nitrogen/examine(mob/user)
if(..(user, 0) && air_contents.gas[GAS_NITROGEN] < 0.2 && loc==user)
to_chat(user, text("<span class='danger'>The meter on \the [src] indicates you are almost out of air!</span>"))
user << sound('sound/effects/alert.ogg')
/*
* Nitrogen
*/
/obj/item/tank/nitrogen
name = "nitrogen tank"
desc = "A tank of nitrogen."
icon_state = "oxygen_fr"
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
/obj/item/tank/nitrogen/Initialize()
. = ..()
air_contents.adjust_gas(GAS_NITROGEN, (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/nitrogen/examine(mob/user)
if(..(user, 0) && air_contents.gas[GAS_NITROGEN] < 10)
to_chat(user, text("<span class='danger'>The meter on \the [src] indicates you are almost out of nitrogen!</span>"))
//playsound(user, 'sound/effects/alert.ogg', 50, 1)
code/game/objects/items/weapons/vaurca_items.dm
+3 -3
View File
@@ -160,7 +160,7 @@
/obj/item/melee/vaurca/navcomp
name = "navcomp coordinate archive"
desc = "A rather heavy data disk for a Vaurcae Arkship navigation drive."
desc = "A rather heavy data disk for a Vaurcan hiveship navigation drive."
icon = 'icons/obj/vaurca_items.dmi'
icon_state = "harddisk"
force = 10
@@ -170,7 +170,7 @@
/obj/item/melee/vaurca/rock
name = "Sedantis rock"
desc = "A large chunk of alien earth from the distant Vaurcae world of Sedantis I. Just looking at it makes you feel funny."
desc = "A large chunk of alien earth from the distant Vaurcan world of Sedantis I. Just looking at it makes you feel funny."
icon_state = "glowing"
icon = 'icons/obj/vaurca_items.dmi'
force = 15
@@ -211,7 +211,7 @@
icon = 'icons/obj/vaurca_items.dmi'
icon_state = "void"
item_state = "void"
desc = "A lightweight Zo'rane designed Vaurcae softsuit, for extremely extended EVA operations."
desc = "A lightweight Zo'rane designed Vaurcan softsuit, for extremely extended EVA operations."
slowdown = 0
species_restricted = list(BODYTYPE_VAURCA)
code/game/objects/random/random.dm
-1
View File
@@ -431,7 +431,6 @@
/obj/random/voidsuit
name = "random voidsuit"
var/damaged = 0
var/for_vox = FALSE
var/list/suitmap = list(
/obj/item/clothing/suit/space/void = /obj/item/clothing/head/helmet/space/void,
/obj/item/clothing/suit/space/void/engineering = /obj/item/clothing/head/helmet/space/void/engineering,
code/modules/admin/admin_verbs.dm
+1 -1
View File
@@ -968,7 +968,7 @@ var/list/admin_verbs_cciaa = list(
if(!istype(M, /mob/living/carbon/human))
to_chat(usr, "<span class='warning'>You can only do this to humans!</span>")
return
switch(alert("Are you sure you wish to edit this mob's appearance? Skrell, Unathi, Vox and Tajaran can result in unintended consequences.",,"Yes","No"))
switch(alert("Are you sure you wish to edit this mob's appearance? Skrell, Unathi and Tajaran can result in unintended consequences.",,"Yes","No"))
if("No")
return
var/new_facial = input("Please select facial hair color.", "Character Generation") as color
code/modules/admin/verbs/bluespacetech.dm
-1
View File
@@ -113,7 +113,6 @@
bst.add_language(LANGUAGE_DRONE)
bst.add_language(LANGUAGE_EAL)
// Antagonist languages
bst.add_language(LANGUAGE_VOX)
bst.add_language(LANGUAGE_CHANGELING)
bst.add_language(LANGUAGE_BORER)
code/modules/client/preferences_ambience.dm
+6 -6
View File
@@ -2,7 +2,7 @@
// /client/proc/Toggle_asfx,
// /client/proc/Toggle_footsteps,
/client/proc/Toggle_asfx_vote,
/client/proc/toggle_vox_voice,
/client/proc/Toggle_messagesounds,
/client/proc/Toggle_dropsounds,
/client/proc/Toggle_arcadesounds,
/client/proc/Toggle_radiosounds,
@@ -57,14 +57,14 @@
to_chat(src, "<span class='warning'>You will no longer hear the vote alarm.</span>")
feedback_add_details("admin_verb","TSFXFV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/toggle_vox_voice()
set name = "Toggle VOX Voice"
/client/proc/Toggle_messagesounds()
set name = "Toggle Message SFX"
set category = "SoundFx Prefs"
set desc = "Toggles the announcement voice."
set desc = "Toggles the message sounds."
prefs.asfx_togs ^= ASFX_VOX
prefs.save_preferences()
to_chat(src, "You will [(prefs.asfx_togs & ASFX_VOX) ? "now" : "no longer"] hear the VOX voice.")
to_chat(src, "You will [(prefs.asfx_togs & ASFX_VOX) ? "now" : "no longer"] hear chat voices.")
/client/proc/Toggle_dropsounds()
set name = "Hear/Silence Drop Sounds"
@@ -112,4 +112,4 @@
if(prefs.asfx_togs & ASFX_INSTRUMENT)
to_chat(src, "You will now hear instrument sounds.")
else
to_chat(src, "<span class='warning'>You will no longer hear instrument sounds.</span>")
to_chat(src, "<span class='warning'>You will no longer hear instrument sounds.</span>")
code/modules/clothing/clothing.dm
+1 -1
View File
@@ -16,7 +16,7 @@
Sprites used when the clothing item is refit. This is done by setting icon_override.
For best results, if this is set then sprite_sheets should be null and vice versa, but that is by no means necessary.
Ideally, sprite_sheets_refit should be used for "hard" clothing items that can't change shape very well to fit the wearer (e.g. helmets, voidsuits),
while sprite_sheets should be used for "flexible" clothing items that do not need to be refitted (e.g. vox wearing jumpsuits).
while sprite_sheets should be used for "flexible" clothing items that do not need to be refitted (e.g. special species wearing jumpsuits).
*/
var/list/sprite_sheets_refit = null
code/modules/goonchat/browserassets/css/browserOutput.css
-1
View File
@@ -358,7 +358,6 @@ h1.alert, h2.alert {color: #a4bad6;}
.solcom {color: #5f5fd4;}
.soghun_alt {color: #1d9b1d;}
.changeling {color: #ad14ad;}
.vox {color: #bb19bb;}
.rough {font-family: "Trebuchet MS", cursive, sans-serif;}
.say_quote {font-family: Georgia, Verdana, sans-serif;}
.yassa {color: #6323b6;}
code/modules/goonchat/browserassets/css/browserOutput_white.css
-1
View File
@@ -355,7 +355,6 @@ h1.alert, h2.alert {color: #000080;}
.solcom {color: #22228B;}
.soghun_alt {color: #024402;}
.changeling {color: #800080;}
.vox {color: #AA00AA;}
.rough {font-family: "Trebuchet MS", cursive, sans-serif;}
.say_quote {font-family: Georgia, Verdana, sans-serif;}
.yassa {color: #400987;}
code/modules/goonchat/browserassets/css/styles_template.css
-1
View File
@@ -327,7 +327,6 @@ h1.alert, h2.alert {color: #000080;}
.solcom {color: #22228B;}
.soghun_alt {color: #024402;}
.changeling {color: #800080;}
.vox {color: #AA00AA;}
.rough {font-family: "Trebuchet MS", cursive, sans-serif;}
.say_quote {font-family: Georgia, Verdana, sans-serif;}
.yassa {color: #400987;}
code/modules/mob/living/silicon/robot/robot_modules.dm
-1
View File
@@ -1024,7 +1024,6 @@ var/global/list/robot_modules = list(
LANGUAGE_ROBOT = TRUE,
LANGUAGE_DRONE = TRUE,
LANGUAGE_EAL = TRUE,
LANGUAGE_VOX = TRUE,
LANGUAGE_CHANGELING = TRUE,
LANGUAGE_BORER = TRUE
)
code/modules/projectiles/guns/alien.dm
+1 -1
View File
@@ -60,7 +60,7 @@
addtimer(CALLBACK(src, .proc/regen_spike), spike_gen_time, TIMER_UNIQUE)
return new /obj/item/spike(src)
//This gun only functions for armalis. The on-sprite is too huge to render properly on other sprites.
//This gun only functions for vaurca warriors. The on-sprite is too huge to render properly on other sprites.
/obj/item/gun/energy/noisecannon
name = "alien heavy cannon"
desc = "It's some kind of enormous alien weapon, as long as a man is tall."
code/modules/projectiles/guns/launcher/crossbow.dm
+2 -2
View File
@@ -30,7 +30,7 @@
pickup_sound = /decl/sound_category/sword_pickup_sound
/obj/item/arrow/quill
name = "vox quill"
name = "alien quill"
desc = "A wickedly barbed quill from some bizarre animal."
icon = 'icons/obj/weapons.dmi'
icon_state = "quill"
@@ -368,4 +368,4 @@
/obj/item/gun/launcher/crossbow/RFD/examine(var/user)
. = ..()
if(.)
to_chat(user, "It currently holds <b>[stored_matter]/[max_stored_matter]</b> matter-units.")
to_chat(user, "It currently holds <b>[stored_matter]/[max_stored_matter]</b> matter-units.")
code/modules/projectiles/guns/projectile/dartgun.dm
-10
View File
@@ -195,13 +195,3 @@
unload_ammo(usr)
src.updateUsrDialog()
return
/obj/item/gun/projectile/dartgun/alien
name = "alien dart gun"
desc = "A small gas-powered dartgun, fitted for nonhuman hands."
/obj/item/gun/projectile/dartgun/vox/medical
starting_chems = list(/datum/reagent/kelotane, /datum/reagent/bicaridine, /datum/reagent/dylovene)
/obj/item/gun/projectile/dartgun/vox/raider
starting_chems = list(/datum/reagent/space_drugs, /datum/reagent/soporific, /datum/reagent/impedrezene)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
+4 -7
View File
@@ -49,10 +49,7 @@
fallback_specific_heat = 1.048
/datum/reagent/ammonia/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_VOX)
M.adjustOxyLoss(-removed * 10)
else
M.adjustToxLoss(removed * 1.5)
M.adjustToxLoss(removed * 1.5)
/datum/reagent/carbon
name = "Carbon"
@@ -316,7 +313,7 @@
reagent_state = LIQUID
color = "#484848"
ingest_met = REM*0.1
breathe_met = REM*0.4
breathe_met = REM*0.4
breathe_mul = 2 //mercury vapours and skin absorption more dangerous than eating mercury.
touch_met = REM*0.1
touch_mul = 1.25
@@ -325,7 +322,7 @@
fallback_specific_heat = 0.631
/datum/reagent/mercury/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
/datum/reagent/mercury/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
M.add_chemical_effect(CE_NEUROTOXIC, 2*removed)
if(dose > 1)
if(prob(dose/2))
@@ -333,7 +330,7 @@
M.confused = max(M.confused, 10)
if(dose > 4)
M.add_chemical_effect(CE_CLUMSY, 1)
if(prob(dose/4))
if(prob(dose/4))
M.emote(pick("twitch", "shiver", "drool"))
if(prob(dose/4))
M.visible_message("<b>[M]</b> chuckles spontaneously.", "You chuckle spontaneously.")
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+10 -12
View File
@@ -16,7 +16,7 @@
M.add_chemical_effect(CE_STABLE)
M.add_chemical_effect(CE_PAINKILLER, 25)
/datum/reagent/inaprovaline/overdose(var/mob/living/carbon/M, var/alien, var/removed)
/datum/reagent/inaprovaline/overdose(var/mob/living/carbon/M, var/alien, var/removed)
if(prob(2))
to_chat(M, SPAN_WARNING(pick("Your chest feels tight.", "Your chest is aching a bit.", "You have a stabbing pain in your chest.")))
M.adjustHalLoss(5)
@@ -45,8 +45,8 @@
M.make_dizzy(5)
M.adjustHydrationLoss(5*removed)
M.adjustNutritionLoss(5*removed)
var/mob/living/carbon/human/H = M
var/mob/living/carbon/human/H = M
if(dose > 30) //Bicaridine treats arterial bleeding when dose is greater than 30u and when the drug is overdosing (chemical volume in blood greater than 20).
for(var/obj/item/organ/external/E in H.organs)
if(E.status & ORGAN_ARTERY_CUT && prob(2))
@@ -165,8 +165,6 @@
var/strength = 6
/datum/reagent/dexalin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_VOX)
M.adjustToxLoss(removed * strength)
M.add_chemical_effect(CE_OXYGENATED, strength/6) // 1 for dexalin, 2 for dexplus
holder.remove_reagent(/datum/reagent/lexorin, strength/3 * removed)
@@ -562,13 +560,13 @@
M.add_chemical_effect(CE_PULSE, 1)
if (!modifier)
modifier = M.add_modifier(/datum/modifier/stimulant, MODIFIER_REAGENT, src, _strength = 1, override = MODIFIER_OVERRIDE_STRENGTHEN)
if((locate(/datum/reagent/adrenaline) in M.reagents.reagent_list))
if(M.reagents.get_reagent_amount(/datum/reagent/adrenaline) > 5) //So you can tolerate being attacked whilst hyperzine is in your system.
overdose = volume/2 //Straight to overdose.
/datum/reagent/hyperzine/overdose(var/mob/living/carbon/M, var/alien, var/removed)
M.adjustNutritionLoss(5*removed)
M.adjustNutritionLoss(5*removed)
M.add_chemical_effect(CE_PULSE, 2)
if(prob(5))
to_chat(M, SPAN_DANGER(pick("Your heart is beating rapidly!", "Your chest hurts!")))
@@ -659,7 +657,7 @@
else
M.apply_radiation(-30 * removed)
/datum/reagent/hyronalin/overdose(var/mob/living/carbon/M, var/alien, var/removed)
/datum/reagent/hyronalin/overdose(var/mob/living/carbon/M, var/alien, var/removed)
if(prob(60))
M.take_organ_damage(4 * removed, 0) //Hyronaline OD deals brute damage to the same degree as Arithrazine
@@ -1145,7 +1143,7 @@
description = "Neurapan is a groundbreaking, expensive antipsychotic medication capable of treating a whole spectrum of mental illnesses, including psychoses, anxiety disorders, Tourette Syndrome and depression, and can alleviate symptoms of stress. Neurapan can be addictive due to its tranquilising effects, and withdrawal symptoms are dangerous."
reagent_state = LIQUID
color = "#FF4444"
overdose = 10
overdose = 10
metabolism = 0.02 * REM
od_minimum_dose = 0.4
data = 0
@@ -1456,7 +1454,7 @@
else
H.adjustOxyLoss(2)
H.add_chemical_effect(CE_PNEUMOTOXIC, 0.1)
/datum/reagent/pulmodeiectionem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
M.adjustToxLoss(2 * removed)
M.add_chemical_effect(CE_ITCH, dose)
@@ -1588,7 +1586,7 @@
taste_description = "premium salty water"
unaffected_species = IS_MACHINE
ingest_mul = 0
breathe_mul = 0
breathe_mul = 0
/datum/reagent/saline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if((M.hydration > M.max_hydration) > CREW_HYDRATION_OVERHYDRATED)
@@ -1597,7 +1595,7 @@
M.adjustHydrationLoss(-removed*5)
if(volume < 3)
M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
/datum/reagent/saline/overdose(var/mob/living/carbon/M, var/alien)
M.confused = max(M.confused, 20)
M.make_jittery(5)
code/modules/shuttles/antagonist.dm
+2 -2
View File
@@ -1,4 +1,4 @@
/obj/machinery/computer/shuttle_control/multi/vox
/obj/machinery/computer/shuttle_control/multi/raider
name = "skipjack control console"
req_access = list(access_syndicate)
shuttle_tag = "Skipjack"
@@ -20,4 +20,4 @@
name = "shuttle control console"
req_access = list(access_syndicate)
shuttle_tag = "Merc Elite"
light_color = LIGHT_COLOR_RED
light_color = LIGHT_COLOR_RED
code/stylesheet.dm
-1
View File
@@ -98,7 +98,6 @@ h1.alert, h2.alert {color: #000000;}
.solcom {color: #22228B;}
.soghun_alt {color: #024402;}
.changeling {color: #800080;}
.vox {color: #AA00AA;}
.rough {font-family: "Trebuchet MS", cursive, sans-serif;}
.say_quote {font-family: Georgia, Verdana, sans-serif;}
.yassa {color: #400987;}
html/changelogs/wezzy_lastofvox.yml
+41
View File
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Wowzewow (Wezzy)
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscdel: "Scrubs all references to Vox and Vox Armalis from the code."
icons/mob/human_face/vox_hair.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

icons/mob/human_races/r_armalis.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.0 KiB

icons/mob/human_races/r_def_vox.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

icons/mob/human_races/r_vox.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

icons/mob/species/armalis/feet.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 369 B

icons/mob/species/armalis/gloves.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 377 B

icons/mob/species/armalis/head.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 385 B

icons/mob/species/armalis/held.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 996 B

icons/mob/species/armalis/mask.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 182 B

icons/mob/species/armalis/suit.dmi
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 887 B

icons/obj/clothing/hats.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 84 KiB

icons/obj/clothing/masks.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

icons/obj/clothing/suits.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 149 KiB

After

Width:  |  Height:  |  Size: 143 KiB

icons/obj/tank.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

maps/aurora/aurora-1_centcomm.dmm
+21 -23
View File
@@ -2608,14 +2608,14 @@
/obj/machinery/door/airlock/hatch{
frequency = 1332;
icon_state = "door_locked";
id_tag = "vox_northeast_lock";
id_tag = "raider_northeast_lock";
locked = 1;
req_access = list(150)
},
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1332;
master_tag = "vox_east_control";
master_tag = "raider_east_control";
pixel_x = -26;
pixel_y = 12;
req_access = list(150)
@@ -2848,7 +2848,7 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 0;
frequency = 1332;
id_tag = "vox_east_vent"
id_tag = "raider_east_vent"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -3027,7 +3027,7 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 8;
frequency = 1332;
id_tag = "vox_east_vent"
id_tag = "raider_east_vent"
},
/turf/simulated/floor/plating,
/area/shuttle/skipjack)
@@ -3181,7 +3181,7 @@
/obj/machinery/door/airlock/hatch{
frequency = 1332;
icon_state = "door_locked";
id_tag = "vox_southeast_lock";
id_tag = "raider_southeast_lock";
locked = 1;
req_access = list(150)
},
@@ -5090,7 +5090,7 @@
"aIF" = (
/obj/machinery/airlock_sensor{
frequency = 1332;
id_tag = "vox_east_sensor";
id_tag = "raider_east_sensor";
pixel_x = -25
},
/obj/effect/decal/cleanable/dirt,
@@ -5188,8 +5188,6 @@
},
/area/antag/wizard)
"aIX" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/item/tank/nitrogen,
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/shuttle/skipjack)
@@ -10188,7 +10186,7 @@
/area/shuttle/skipjack)
"cRd" = (
/obj/effect/landmark{
name = "voxstart"
name = "raiderstart"
},
/turf/unsimulated/floor{
icon_state = "lino_grey"
@@ -10749,7 +10747,7 @@
dir = 4
},
/obj/effect/landmark{
name = "voxstart"
name = "raiderstart"
},
/turf/unsimulated/floor{
icon_state = "wood"
@@ -11875,7 +11873,7 @@
"dUK" = (
/obj/structure/bed/chair/comfy/brown,
/obj/effect/landmark{
name = "voxstart"
name = "raiderstart"
},
/obj/effect/decal/cleanable/dirt,
/turf/unsimulated/floor{
@@ -14459,7 +14457,7 @@
dir = 8
},
/obj/effect/landmark{
name = "voxstart"
name = "raiderstart"
},
/turf/unsimulated/floor{
icon_state = "wood"
@@ -14840,7 +14838,7 @@
dir = 4
},
/obj/effect/landmark{
name = "voxstart"
name = "raiderstart"
},
/obj/effect/decal/cleanable/dirt,
/turf/unsimulated/floor{
@@ -15308,7 +15306,7 @@
"fYr" = (
/obj/item/stool/bar/padded,
/obj/effect/landmark{
name = "voxstart"
name = "raiderstart"
},
/turf/unsimulated/floor{
icon_state = "wood"
@@ -15440,7 +15438,7 @@
dir = 8
},
/obj/effect/landmark{
name = "voxstart"
name = "raiderstart"
},
/obj/effect/decal/cleanable/dirt,
/turf/unsimulated/floor{
@@ -16520,7 +16518,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1332;
master_tag = "vox_east_control";
master_tag = "raider_east_control";
pixel_x = 22;
pixel_y = 24;
req_access = list(150)
@@ -21663,17 +21661,17 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1332;
id_tag = "vox_east_vent"
id_tag = "raider_east_vent"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1332;
id_tag = "vox_east_control";
id_tag = "raider_east_control";
pixel_x = -24;
tag_airpump = "vox_east_vent";
tag_chamber_sensor = "vox_east_sensor";
tag_exterior_door = "vox_northeast_lock";
tag_interior_door = "vox_southeast_lock"
tag_airpump = "raider_east_vent";
tag_chamber_sensor = "raider_east_sensor";
tag_exterior_door = "raider_northeast_lock";
tag_interior_door = "raider_southeast_lock"
},
/obj/vehicle/bike{
dir = 4
@@ -37745,7 +37743,7 @@
/turf/unsimulated/floor,
/area/antag/mercenary)
"uOL" = (
/obj/machinery/computer/shuttle_control/multi/vox,
/obj/machinery/computer/shuttle_control/multi/raider,
/obj/effect/floor_decal/corner/red{
dir = 5
},
maps/aurora/code/aurora_shuttles.dm
+2 -2
View File
@@ -305,7 +305,7 @@ AURORA_ESCAPE_POD(3)
name = "Skipjack"
current_location = "nav_skipjack_start"
landmark_transition = "nav_skipjack_interim"
dock_target = "vox_east_control"
dock_target = "raider_east_control"
warmup_time = 10
move_time = 75
shuttle_area = /area/shuttle/skipjack
@@ -593,4 +593,4 @@ AURORA_ESCAPE_POD(3)
landmark_tag = "nav_distress_blue"
docking_controller = "distress_shuttle_dock"
special_dock_targets = list("Distress Shuttle" = "distress_shuttle_fore")
landmark_flags = SLANDMARK_FLAG_AUTOSET
landmark_flags = SLANDMARK_FLAG_AUTOSET
maps/exodus/exodus-2_centcomm.dmm
+28 -30
View File
@@ -7140,7 +7140,7 @@
"aBm" = (
/obj/item/stool/padded,
/obj/effect/landmark{
name = "voxstart"
name = "raiderstart"
},
/turf/unsimulated/floor{
dir = 8;
@@ -7615,7 +7615,7 @@
name = "\improper Raider Base"
})
"aDa" = (
/obj/machinery/computer/shuttle_control/multi/vox,
/obj/machinery/computer/shuttle_control/multi/raider,
/turf/unsimulated/floor{
icon_state = "cult";
name = "plating"
@@ -7999,7 +7999,7 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1331;
master_tag = "vox_west_control";
master_tag = "raider_west_control";
req_one_access = list(150)
},
/turf/simulated/wall/shuttle/raider,
@@ -8007,7 +8007,7 @@
"aEI" = (
/obj/machinery/door/airlock/hatch{
frequency = 1331;
id_tag = "vox_northwest_lock";
id_tag = "raider_northwest_lock";
req_access = list(150)
},
/turf/simulated/floor/plating,
@@ -8057,7 +8057,7 @@
"aEM" = (
/obj/machinery/door/airlock/hatch{
frequency = 1331;
id_tag = "vox_northeast_lock";
id_tag = "raider_northeast_lock";
req_access = list(150)
},
/turf/simulated/floor/plating,
@@ -8066,7 +8066,7 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1331;
master_tag = "vox_east_control";
master_tag = "raider_east_control";
req_access = list(150)
},
/turf/simulated/wall/shuttle/raider,
@@ -8130,14 +8130,14 @@
"aFe" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
frequency = 1331;
id_tag = "vox_west_vent"
id_tag = "raider_west_vent"
},
/turf/simulated/floor/plating,
/area/shuttle/skipjack)
"aFf" = (
/obj/machinery/airlock_sensor{
frequency = 1331;
id_tag = "vox_west_sensor";
id_tag = "raider_west_sensor";
pixel_x = 25
},
/turf/simulated/floor/plating,
@@ -8147,7 +8147,7 @@
/turf/simulated/floor/shuttle/red,
/area/shuttle/skipjack)
"aFh" = (
/obj/machinery/computer/shuttle_control/multi/vox,
/obj/machinery/computer/shuttle_control/multi/raider,
/turf/simulated/floor/shuttle/red,
/area/shuttle/skipjack)
"aFi" = (
@@ -8165,7 +8165,7 @@
"aFk" = (
/obj/machinery/airlock_sensor{
frequency = 1331;
id_tag = "vox_east_sensor";
id_tag = "raider_east_sensor";
pixel_x = -25
},
/turf/simulated/floor/plating,
@@ -8173,7 +8173,7 @@
"aFl" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
frequency = 1331;
id_tag = "vox_east_vent"
id_tag = "raider_east_vent"
},
/turf/simulated/floor/plating,
/area/shuttle/skipjack)
@@ -8223,18 +8223,18 @@
"aFw" = (
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
frequency = 1331;
id_tag = "vox_west_control";
id_tag = "raider_west_control";
pixel_x = 24;
req_access = list(150);
tag_airpump = "vox_west_vent";
tag_chamber_sensor = "vox_west_sensor";
tag_exterior_door = "vox_northwest_lock";
tag_interior_door = "vox_southwest_lock"
tag_airpump = "raider_west_vent";
tag_chamber_sensor = "raider_west_sensor";
tag_exterior_door = "raider_northwest_lock";
tag_interior_door = "raider_southwest_lock"
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 8;
frequency = 1331;
id_tag = "vox_west_vent"
id_tag = "raider_west_vent"
},
/obj/machinery/light/small,
/turf/simulated/floor/plating,
@@ -8268,18 +8268,18 @@
"aFB" = (
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
frequency = 1331;
id_tag = "vox_east_control";
id_tag = "raider_east_control";
pixel_x = -24;
req_access = list(150);
tag_airpump = "vox_east_vent";
tag_chamber_sensor = "vox_east_sensor";
tag_exterior_door = "vox_northeast_lock";
tag_interior_door = "vox_southeast_lock"
tag_airpump = "raider_east_vent";
tag_chamber_sensor = "raider_east_sensor";
tag_exterior_door = "raider_northeast_lock";
tag_interior_door = "raider_southeast_lock"
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1331;
id_tag = "vox_east_vent"
id_tag = "raider_east_vent"
},
/obj/machinery/light/small,
/turf/simulated/floor/plating,
@@ -8294,7 +8294,7 @@
"aFN" = (
/obj/machinery/door/airlock/hatch{
frequency = 1331;
id_tag = "vox_southwest_lock";
id_tag = "raider_southwest_lock";
req_access = list(150)
},
/obj/machinery/atmospherics/pipe/simple/visible,
@@ -8317,7 +8317,7 @@
"aFR" = (
/obj/machinery/door/airlock/hatch{
frequency = 1331;
id_tag = "vox_southeast_lock";
id_tag = "raider_southeast_lock";
req_access = list(150)
},
/obj/machinery/atmospherics/pipe/simple/visible,
@@ -8337,7 +8337,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1331;
master_tag = "vox_west_control";
master_tag = "raider_west_control";
pixel_x = -22;
req_one_access = list(150)
},
@@ -8424,7 +8424,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1331;
master_tag = "vox_east_control";
master_tag = "raider_east_control";
pixel_x = 22;
req_access = list(150)
},
@@ -8772,7 +8772,7 @@
/area/shuttle/skipjack)
"aHh" = (
/obj/machinery/bodyscanner{
allowed_species = list("Human","Skrell","Unathi","Tajara","M'sai Tajara","Zhan-Khazan Tajara","Vaurca Worker","Vaurca Warrior","Diona","Vox");
allowed_species = list("Human","Skrell","Unathi","Tajara","M'sai Tajara","Zhan-Khazan Tajara","Vaurca Worker","Vaurca Warrior","Diona");
dir = 8;
icon_state = "body_scanner_0"
},
@@ -8803,8 +8803,6 @@
/turf/simulated/floor/plating,
/area/shuttle/skipjack)
"aHl" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/item/tank/nitrogen,
/turf/simulated/floor/plating,
/area/shuttle/skipjack)
"aHm" = (