diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 643b4d6e64f..8c40ab6f8ac 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -420,7 +420,7 @@ Just because something isn't on this list doesn't mean that it's acceptable. Use ## Content requiring prior approval Certain types of changes may require prior approval from maintainers. This currently includes: -* Code adding, removing, or updating the availability of alien races/species/human mutants. This includes pull requests attempting to add or remove features from said races/species/mutants. (Requires approval from at least one maintainer) +* Code adding, removing, or updating the availability of alien races/species/humans. This includes pull requests attempting to add or remove features from said races/species/mutants. (Requires approval from at least one maintainer) * Code adding, removing, or modifying the functionality of adult-oriented features (such as, but not limited to: vore, genitals, MKUltra, and more). This also includes pull requests attempting to add or remove these features outright. (Requires approval from at least half of the formal maintainer team) The above content requires approval from the specified amount of maintainers prior to PR creation. Seeking approval must be done via a @Maintainer ping in a relevant development/code or staff channel on the Discord, otherwise it will be considered insufficient. If a PR contains any of the above content, but the creator does not have sufficient approval prior to the PR's creation, then the PR may be closed by any maintainer, at any time, for any reason. diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 9259dd33ef5..0dc42dd6329 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -36,7 +36,7 @@ jobs: tools/bootstrap/python -c '' - name: Run Linters run: | - bash tools/ci/check_filedirs.sh vorestation.dme + bash tools/ci/check_filedirs.sh citadel.dme bash tools/ci/check_changelogs.sh bash tools/ci/check_grep.sh bash tools/ci/check_misc.sh diff --git a/README.md b/README.md index f75867d9457..ef34c078ae1 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ This is the codebase for the CitadelRP flavoured fork of SpaceStation 13. -Citadel Station 13 RP, also known as CitadelRP was originally a fork of VOREStation, which separated on 01/25/2019. CitadelRP nowadays can be seen as a Polaris and /tg/station hybrid! +Citadel Station 13 RP, also known as CitadelRP was originally a fork of VOREStation, which separated on 01/25/2019. ## DOWNLOADING [Downloading](.github/guides/DOWNLOADING.md) diff --git a/SpacemanDMM.toml b/SpacemanDMM.toml index a679ba6f844..e2e60621ad4 100644 --- a/SpacemanDMM.toml +++ b/SpacemanDMM.toml @@ -1,4 +1,4 @@ -environment = "vorestation.dme" +environment = "citadel.dme" [langserver] dreamchecker = true diff --git a/vorestation.dme b/citadel.dme similarity index 99% rename from vorestation.dme rename to citadel.dme index dec93615e45..f24b6d45ee8 100644 --- a/vorestation.dme +++ b/citadel.dme @@ -1,4 +1,4 @@ -// DM Environment file for vorestation.dme +// DM Environment file for citadel.dme // All manual changes should be made outside the BEGIN_ and END_ blocks. // New source code should be placed in .dm files: choose File/New --> Code File. // BEGIN_INTERNALS @@ -2149,7 +2149,6 @@ #include "code\modules\events\spacevine.dm" #include "code\modules\events\spider_infestation.dm" #include "code\modules\events\spontaneous_appendicitis.dm" -#include "code\modules\events\spontaneous_appendicitis_vr.dm" #include "code\modules\events\supply_demand.dm" #include "code\modules\events\wallrot.dm" #include "code\modules\examine\examine.dm" diff --git a/code/__DEFINES/machinery.dm b/code/__DEFINES/machinery.dm index 1ca8051319e..c9a0d7e8a68 100644 --- a/code/__DEFINES/machinery.dm +++ b/code/__DEFINES/machinery.dm @@ -79,7 +79,6 @@ var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called manu #define NETWORK_ALARM_ATMOS "Atmosphere Alarms" #define NETWORK_ALARM_POWER "Power Alarms" #define NETWORK_ALARM_FIRE "Fire Alarms" -///Using different from Polaris one for better name #define NETWORK_TCOMMS "Telecommunications" #define NETWORK_OUTSIDE "Outside" #define NETWORK_EXPLORATION "Exploration" diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index a9a3572c7f0..ed01ed8b588 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -16,7 +16,7 @@ /// Z-levels exempt from xenoarch digsite generation. #define MAP_LEVEL_XENOARCH_EXEMPT 0x080 // Misc map defines. -///VOREStation Edit + /// Automatically created submaps are forbidden from being this close to the main map's edge. #define SUBMAP_MAP_EDGE_PAD 8 // TG MAP LOADING SYSTEM PENDING diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 382e16bf84d..9874fb93e74 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -284,10 +284,10 @@ var/list/economy_station_departments = list( DEPARTMENT_PLANET, DEPARTMENT_RESEARCH, DEPARTMENT_SECURITY -) //VOREStation Edit +) -// vorstation off-duty time +// Off-duty time #define PTO_CARGO "Cargo" #define PTO_CIVILIAN "Civilian" #define PTO_COMMAND "Command" diff --git a/code/__DEFINES/sound/ambience.dm b/code/__DEFINES/sound/ambience.dm index 44b13c8d566..5de9302421e 100644 --- a/code/__DEFINES/sound/ambience.dm +++ b/code/__DEFINES/sound/ambience.dm @@ -56,8 +56,6 @@ 'sound/ambience/generic/generic3.ogg'\ ) -// 'sound/ambience/generic/generic4.ogg'\ // VOREStation Edit: Comment out entry 4 as this doesn't fit on Virgo, and we have our own weather system. - // Sounds of PA announcements, presumably involving shuttles? #define AMBIENCE_ARRIVALS list(\ 'sound/ambience/arrivals/arrivals1.ogg',\ diff --git a/code/__DEFINES/sound/channels.dm b/code/__DEFINES/sound/channels.dm index 2d588a02a99..599458df89e 100644 --- a/code/__DEFINES/sound/channels.dm +++ b/code/__DEFINES/sound/channels.dm @@ -1,20 +1,20 @@ -//max channel is 1024. Only go lower from here, because byond tends to pick the first availiable channel to play sounds on +// Max channel is 1024. Only go lower from here, because byond tends to pick the first availiable channel to play sounds on #define CHANNEL_LOBBYMUSIC 1024 #define CHANNEL_ADMIN 1023 #define CHANNEL_VOX 1022 #define CHANNEL_JUKEBOX 1021 -///sound channel for heartbeats +/// Sound channel for heartbeats #define CHANNEL_HEARTBEAT 1020 #define CHANNEL_AMBIENCE_FORCED 1019 #define CHANNEL_AMBIENCE 1018 #define CHANNEL_BUZZ 1017 #define CHANNEL_BICYCLE 1016 -///VORESTATION ADD - Fancy Sound Loop channel +/// Fancy Sound Loop channel #define CHANNEL_PREYLOOP 1015 //THIS SHOULD ALWAYS BE THE LOWEST ONE! //KEEP IT UPDATED -#define CHANNEL_HIGHEST_AVAILABLE 1014 //VORESTATION EDIT - Fancy Sound Loop channel from 1015 +#define CHANNEL_HIGHEST_AVAILABLE 1014 // Fancy Sound Loop channel from 1015 #define MAX_INSTRUMENT_CHANNELS (128 * 6) diff --git a/code/__HELPERS/type2type_vr.dm b/code/__HELPERS/type2type_vr.dm index e6df5318061..40e7b0e76ca 100644 --- a/code/__HELPERS/type2type_vr.dm +++ b/code/__HELPERS/type2type_vr.dm @@ -1,9 +1,8 @@ -/* -// Contains VOREStation type2type functions -// list2text - takes delimiter and returns text -// text2list - takes delimiter, and creates list -// -*/ +/** + * Contains VOREStation type2type functions + * list2text - takes delimiter and returns text + * text2list - takes delimiter, and creates list + */ // Concatenates a list of strings into a single string. A seperator may optionally be provided. /proc/list2text(list/ls, sep) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 97d4a7a8209..8f628003400 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1584,7 +1584,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) . += new /atom/movable/screen/plane_master/main{plane = MOB_PLANE} // . += new /atom/movable/screen/plane_master/cloaked //Cloaked atoms! - //VOREStation Add - Random other plane masters + // Random other plane masters from Virgo . += new /atom/movable/screen/plane_master{plane = PLANE_AUGMENTED} //Augmented reality - //VOREStation Add End . += new /atom/movable/screen/plane_master/parallax{plane = PARALLAX_PLANE} diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm index 869722356e8..1e40de947cd 100644 --- a/code/_onclick/adjacent.dm +++ b/code/_onclick/adjacent.dm @@ -31,7 +31,8 @@ return 1 if(get_dist(src,T0) > 1) return 0 - if(T0.z != z) return 0 //VOREStation Add + if(T0.z != z) + return 0 if(T0.x == x || T0.y == y) // Check for border blockages return T0.ClickCross(get_dir(T0,src), border_only = 1) && src.ClickCross(get_dir(src,T0), border_only = 1, target_atom = target) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 4fcd23d8d97..9ff71311342 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -128,7 +128,7 @@ trigger_aiming(TARGET_CAN_CLICK) return 1 - // VOREStation Addition Start: inbelly item interaction + // Inbelly item interaction if(isbelly(loc) && (loc == A.loc)) if(W) var/resolved = W.resolve_attackby(A, src, params) @@ -139,7 +139,6 @@ setClickCooldown(get_attack_speed()) UnarmedAttack(A, 1) return - // VOREStation Addition End if(!isturf(loc)) // This is going to stop you from telekinesing from inside a closet, but I don't shed many tears for that return diff --git a/code/_onclick/hud/ability_screen_objects.dm b/code/_onclick/hud/ability_screen_objects.dm index 0fa326b9997..90c4e698277 100644 --- a/code/_onclick/hud/ability_screen_objects.dm +++ b/code/_onclick/hud/ability_screen_objects.dm @@ -182,7 +182,7 @@ /mob/Initialize(mapload) . = ..() - if(!ability_master) //VOREStation Edit: S H A D E K I N + if(!ability_master) ability_master = new /atom/movable/screen/movable/ability_master(src) ///////////ACTUAL ABILITIES//////////// diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index a4f7d7a896f..0ea9a800104 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -309,7 +309,6 @@ mymob.hydration_icon.screen_loc = ui_nutrition_small hud_elements |= mymob.hydration_icon - //VOREStation Addition begin mymob.shadekin_dark_display = new /atom/movable/screen/shadekin/darkness() mymob.shadekin_dark_display.screen_loc = ui_shadekin_dark_display mymob.shadekin_dark_display.icon_state = "dark" @@ -324,7 +323,6 @@ mymob.xenochimera_danger_display.screen_loc = ui_xenochimera_danger_display mymob.xenochimera_danger_display.icon_state = "danger00" hud_elements |= mymob.xenochimera_danger_display - //VOREStation Addition end mymob.ling_chem_display = new /atom/movable/screen/ling/chems() mymob.ling_chem_display.screen_loc = ui_ling_chemical_display diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index e4f7bfc4492..ecb62e986d0 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -463,7 +463,7 @@ var/mob/living/silicon/ai/AI = usr AI.view_images() else - return attempt_vr(src,"Click_vr",list(location,control,params)) //VOREStation Add - Additional things. + return attempt_vr(src,"Click_vr",list(location,control,params)) return 1 /atom/movable/screen/inventory/Click() diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 0efee9eef1c..a8820f9bac1 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -51,7 +51,7 @@ avoid code duplication. This includes items that may sometimes act as a standard else return 0 if(attempt_vr(src,"vore_attackby",args)) - return //VOREStation Add - The vore, of course. + return return I.attack(src, user, user.zone_sel.selecting, attack_modifier) // Used to get how fast a mob should attack, and influences click delay. diff --git a/code/controllers/subsystem/bellies_vr.dm b/code/controllers/subsystem/bellies_vr.dm index c16fe08cdd7..120531178fd 100644 --- a/code/controllers/subsystem/bellies_vr.dm +++ b/code/controllers/subsystem/bellies_vr.dm @@ -2,7 +2,7 @@ #define SSBELLIES_IGNORED 2 // -// Bellies subsystem - Process vore bellies +// Bellies subsystem - Process bellies // SUBSYSTEM_DEF(bellies) diff --git a/code/controllers/subsystem/inactivity.dm b/code/controllers/subsystem/inactivity.dm index adb4a514ffc..fd4a4dfd358 100644 --- a/code/controllers/subsystem/inactivity.dm +++ b/code/controllers/subsystem/inactivity.dm @@ -7,7 +7,7 @@ SUBSYSTEM_DEF(inactivity) if(config_legacy.kick_inactive) for(var/i in GLOB.clients) var/client/C = i - if(C.is_afk(config_legacy.kick_inactive MINUTES) && !C.holder) // VOREStation Edit - Allow admins to idle + if(C.is_afk(config_legacy.kick_inactive MINUTES) && !C.holder) // Allow admins to idle to_chat(C,"You have been inactive for more than [config_legacy.kick_inactive] minute\s and have been disconnected.") var/information diff --git a/code/controllers/subsystem/job/job_controller.dm b/code/controllers/subsystem/job/job_controller.dm index 6cf1399e504..92c30ca0e56 100644 --- a/code/controllers/subsystem/job/job_controller.dm +++ b/code/controllers/subsystem/job/job_controller.dm @@ -56,10 +56,8 @@ var/global/datum/controller/occupations/job_master return 0 if(!job.player_old_enough(player.client)) return 0 - //VOREStation Add if(!is_job_whitelisted(player, rank)) return 0 - //VOREStation Add End var/position_limit = job.total_positions if(!latejoin) @@ -94,11 +92,9 @@ var/global/datum/controller/occupations/job_master if(job.minimum_character_age && (player.client.prefs.age < job.minimum_character_age)) Debug("FOC character not old enough, Player: [player]") continue - //VOREStation Code Start if(!is_job_whitelisted(player, job.title)) Debug("FOC is_job_whitelisted failed, Player: [player]") continue - //VOREStation Code End if(flag && !(player.client.prefs.be_special & flag)) Debug("FOC flag failed, Player: [player], Flag: [flag], ") continue @@ -116,7 +112,7 @@ var/global/datum/controller/occupations/job_master if(job.minimum_character_age && (player.client.prefs.age < job.minimum_character_age)) continue - if(istype(job, GetJob(USELESS_JOB))) // We don't want to give him assistant, that's boring! //VOREStation Edit - Visitor not Assistant + if(istype(job, GetJob(USELESS_JOB))) // We don't want to give him visitor, that's boring! continue if(SSjob.is_job_in_department(job.title, DEPARTMENT_COMMAND)) //If you want a command position, select it! @@ -130,11 +126,9 @@ var/global/datum/controller/occupations/job_master Debug("GRJ player not old enough, Player: [player]") continue - //VOREStation Code Start if(!is_job_whitelisted(player, job.title)) Debug("GRJ player not whitelisted for this job, Player: [player], Job: [job.title]") continue - //VOREStation Code End if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1) Debug("GRJ Random job given, Player: [player], Job: [job]") @@ -241,7 +235,7 @@ var/global/datum/controller/occupations/job_master Debug("AC1, Candidates: [assistant_candidates.len]") for(var/mob/new_player/player in assistant_candidates) Debug("AC1 pass, Player: [player]") - AssignRole(player, USELESS_JOB) //VOREStation Edit - Visitor not Assistant + AssignRole(player, USELESS_JOB) assistant_candidates -= player Debug("DO, AC1 end") @@ -322,7 +316,7 @@ var/global/datum/controller/occupations/job_master for(var/mob/new_player/player in unassigned) if(player.client.prefs.alternate_option == BE_ASSISTANT) Debug("AC2 Assistant located, Player: [player]") - AssignRole(player, USELESS_JOB) //VOREStation Edit - Visitor not Assistant + AssignRole(player, USELESS_JOB) //For ones returning to lobby for(var/mob/new_player/player in unassigned) @@ -443,7 +437,7 @@ var/global/datum/controller/occupations/job_master H.job = rank log_game("JOINED [key_name(H)] as \"[rank]\"") - log_game("SPECIES [key_name(H)] is a: \"[H.species.name]\"") //VOREStation Add + log_game("SPECIES [key_name(H)] is a: \"[H.species.name]\"") // If they're head, give them the account info for their department if(H.mind && job.department_accounts) diff --git a/code/controllers/subsystem/mapping/_mapping.dm b/code/controllers/subsystem/mapping/_mapping.dm index 48440905425..daa9304cc0d 100644 --- a/code/controllers/subsystem/mapping/_mapping.dm +++ b/code/controllers/subsystem/mapping/_mapping.dm @@ -304,7 +304,7 @@ SUBSYSTEM_DEF(mapping) // // Mapping subsystem handles initialization of random map elements at server start -// On VOREStation that means loading our random roundstart engine! +// For us that means loading our random roundstart engine! // /datum/controller/subsystem/mapping var/list/map_templates = list() diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index f6b054a2d6a..3548cfb0a30 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -2,8 +2,7 @@ // Mobs Subsystem - Process mob.Life() // -//VOREStation Edits - Contains temporary debugging code to diagnose extreme tick consumption. -//Revert file to Polaris version when done. +// Contains temporary debugging code to diagnose extreme tick consumption. SUBSYSTEM_DEF(mobs) name = "Mobs" diff --git a/code/controllers/subsystem/radiation.dm b/code/controllers/subsystem/radiation.dm index fe185012e99..5d5755febb8 100644 --- a/code/controllers/subsystem/radiation.dm +++ b/code/controllers/subsystem/radiation.dm @@ -116,7 +116,7 @@ SUBSYSTEM_DEF(radiation) add_source(S) // Sets the radiation in a range to a constant value. -/datum/controller/subsystem/radiation/proc/flat_radiate(source, power, range, var/respect_maint = TRUE) //VOREStation edit; Respect shielded areas by default please. +/datum/controller/subsystem/radiation/proc/flat_radiate(source, power, range, respect_maint = TRUE) // Respect shielded areas by default please. if(!(source && power && range)) return var/datum/radiation_source/S = new() @@ -128,7 +128,7 @@ SUBSYSTEM_DEF(radiation) add_source(S) // Irradiates a full Z-level. Hacky way of doing it, but not too expensive. -/datum/controller/subsystem/radiation/proc/z_radiate(var/atom/source, power, var/respect_maint = TRUE) //VOREStation edit; Respect shielded areas by default please. +/datum/controller/subsystem/radiation/proc/z_radiate(atom/source, power, respect_maint = TRUE) // Respect shielded areas by default please. if(!(power && source)) return var/turf/epicentre = locate(round(world.maxx / 2), round(world.maxy / 2), source.z) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index c482654c6ff..08128c6dd56 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -30,8 +30,6 @@ SUBSYSTEM_DEF(ticker) var/event_time = null var/event = 0 - // var/login_music // music played in pregame lobby // VOREStation Edit - We do music differently - var/list/datum/mind/minds = list()//The people in the game. Used for objective tracking. var/Bible_icon_state // icon_state the chaplain has chosen for his bible @@ -226,7 +224,6 @@ SUBSYSTEM_DEF(ticker) create_characters() //Create player characters and transfer them. collect_minds() equip_characters() - //data_core.manifest() //VOREStation Removal callHook("roundstart") @@ -395,13 +392,11 @@ SUBSYSTEM_DEF(ticker) else if(!player.mind.assigned_role) continue else - //VOREStation Edit Start var/mob/living/carbon/human/new_char = player.create_character() if(new_char) qdel(player) if(istype(new_char) && !(new_char.mind.assigned_role=="Cyborg")) data_core.manifest_inject(new_char) - //VOREStation Edit End /datum/controller/subsystem/ticker/proc/collect_minds() @@ -419,8 +414,6 @@ SUBSYSTEM_DEF(ticker) if(!player_is_antag(player.mind, only_offstation_roles = 1)) job_master.EquipRank(player, player.mind.assigned_role, 0) UpdateFactionList(player) - //equip_custom_items(player) //VOREStation Removal - //player.apply_traits() //VOREStation Removal if(captainless) for(var/mob/M in player_list) if(!istype(M,/mob/new_player)) diff --git a/code/controllers/subsystem/transfer.dm b/code/controllers/subsystem/transfer.dm index 11861331eee..0040f5b42ce 100644 --- a/code/controllers/subsystem/transfer.dm +++ b/code/controllers/subsystem/transfer.dm @@ -3,30 +3,24 @@ SUBSYSTEM_DEF(transfer) name = "Transfer" var/timerbuffer = 0 //buffer for time check var/currenttick = 0 - var/shift_hard_end = 0 //VOREStation Edit - var/shift_last_vote = 0 //Citadel Edit + var/shift_hard_end = 0 + var/shift_last_vote = 0 // should be a config someday lol #define NUMBER_OF_VOTE_EXTENSIONS 2 /datum/controller/subsystem/transfer/Initialize() timerbuffer = config_legacy.vote_autotransfer_initial - shift_hard_end = config_legacy.vote_autotransfer_initial + (config_legacy.vote_autotransfer_interval * NUMBER_OF_VOTE_EXTENSIONS) //VOREStation Edit //Change this "1" to how many extend votes you want there to be. - shift_last_vote = shift_hard_end - config_legacy.vote_autotransfer_interval //VOREStation Edit + shift_hard_end = config_legacy.vote_autotransfer_initial + (config_legacy.vote_autotransfer_interval * NUMBER_OF_VOTE_EXTENSIONS) //Change this "1" to how many extend votes you want there to be. + shift_last_vote = shift_hard_end - config_legacy.vote_autotransfer_interval return ..() /datum/controller/subsystem/transfer/fire(resumed) currenttick = currenttick + 1 - //VOREStation Edit START -/* if (round_duration_in_ds >= shift_last_vote - 2 MINUTES) - shift_last_vote = 999999999999 //Setting to a stupidly high number since it'll be not used again. - to_world("Warning: This upcoming round-extend vote will be your ONLY extend vote. Wrap up your scenes in the next 60 minutes if the round is extended.") //VOREStation Edit -*/ - if (round_duration_in_ds >= shift_hard_end - 1 MINUTE) + if(round_duration_in_ds >= shift_hard_end - 1 MINUTE) init_shift_change(null, 1) shift_hard_end = timerbuffer + config_legacy.vote_autotransfer_interval //If shuttle somehow gets recalled, let's force it to call again next time a vote would occur. timerbuffer = timerbuffer + config_legacy.vote_autotransfer_interval //Just to make sure a vote doesn't occur immediately afterwords. - else if (round_duration_in_ds >= timerbuffer - 1 MINUTE) + else if(round_duration_in_ds >= timerbuffer - 1 MINUTE) SSvote.autotransfer() - //VOREStation Edit END timerbuffer = timerbuffer + config_legacy.vote_autotransfer_interval diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 228c663eac5..9aa80306d6e 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -105,8 +105,7 @@ SUBSYSTEM_DEF(vote) factor = 1.4 choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] * factor) to_chat(world, "\nCrew Transfer Factor: [factor]") - greatest_votes = max(choices["Initiate Crew Transfer"], choices["Extend the Shift"]) //VOREStation Edit - + greatest_votes = max(choices["Initiate Crew Transfer"], choices["Extend the Shift"]) . = list() // Get all options with that many votes and return them in a list if(greatest_votes) for(var/option in choices) @@ -215,8 +214,8 @@ SUBSYSTEM_DEF(vote) if(SSticker.current_state <= GAME_STATE_SETTING_UP) to_chat(initiator_key, "The crew transfer button has been disabled!") return 0 - question = "Your PDA beeps with a message from Central. Would you like an additional hour to finish ongoing projects?" //VOREStation Edit - choices.Add("Initiate Crew Transfer", "Extend the Shift") //VOREStation Edit + question = "Your PDA beeps with a message from Central. Would you like an additional hour to finish ongoing projects?" + choices.Add("Initiate Crew Transfer", "Extend the Shift") if(VOTE_ADD_ANTAGONIST) if(!config_legacy.allow_extra_antags || SSticker.current_state >= GAME_STATE_SETTING_UP) return 0 diff --git a/code/datums/announce/_legacy.dm b/code/datums/announce/_legacy.dm index 6c8d41f8df0..a26dd800d71 100644 --- a/code/datums/announce/_legacy.dm +++ b/code/datums/announce/_legacy.dm @@ -4,8 +4,8 @@ */ -//VOREStation Edit - Most of this file has been changed to use the Eris-style PA announcements. -//You'll need to compare externally, or use your best judgement when merging. +// Most of this file has been changed to use the Eris-style PA announcements. +// You'll need to compare externally, or use your best judgement when merging. /var/datum/legacy_announcement/priority/priority_announcement = new(do_log = 0) /var/datum/legacy_announcement/priority/command/command_announcement = new(do_log = 0, do_newscast = 1) @@ -138,5 +138,5 @@ datum/legacy_announcement/proc/Log(message as text, message_title as text) rank = character.mind.role_alt_title AnnounceArrivalSimple(character.real_name, rank, join_message) -/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive at the station shortly") //VOREStation Edit - Remove shuttle reference +/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive at the station shortly") GLOB.global_announcer.autosay(join_message, "Arrivals Announcement Computer") diff --git a/code/datums/autolathe/arms.dm b/code/datums/autolathe/arms.dm index eb87b97ade5..14cbc3b3dec 100644 --- a/code/datums/autolathe/arms.dm +++ b/code/datums/autolathe/arms.dm @@ -41,7 +41,7 @@ /*Ammo magazines*/ ////////////////// -/////// 5mm +//! ## 5mm /* /datum/category_item/autolathe/arms/pistol_5mm name = "pistol magazine (5mm)" @@ -55,7 +55,7 @@ path = /obj/item/ammo_magazine/m10x24mm/small hidden = 1 -/////// .45 +//! ## .45 /datum/category_item/autolathe/arms/pistol_45 name = "pistol magazine (.45)" path =/obj/item/ammo_magazine/m45 @@ -93,7 +93,7 @@ path =/obj/item/ammo_magazine/m45tommydrum hidden = 1 -/////// 9mm +//! ## 9mm // Full size pistol mags. /datum/category_item/autolathe/arms/pistol_9mm @@ -157,7 +157,7 @@ name = "top-mounted SMG magazine (9mm flash)" path =/obj/item/ammo_magazine/m9mmt/flash -/////// 10mm +//! ## 10mm /datum/category_item/autolathe/arms/smg_10mm name = "SMG magazine (10mm)" path =/obj/item/ammo_magazine/m10mm @@ -168,7 +168,7 @@ path =/obj/item/ammo_magazine/m44 hidden = 1 -/////// 5.45mm +//! ## 5.45mm /datum/category_item/autolathe/arms/rifle_545 name = "rifle magazine (5.45mm)" path =/obj/item/ammo_magazine/m545 @@ -178,21 +178,12 @@ name = "rifle magazine (5.45mm practice)" path =/obj/item/ammo_magazine/m545/practice -/*/datum/category_item/autolathe/arms/rifle_545_hunter //VOREStation Edit Start. By request of Ace - name = "rifle magazine (5.45mm hunting)" - path =/obj/item/ammo_magazine/m545/hunter*/ //VOREStation Edit End. - /datum/category_item/autolathe/arms/machinegun_545 name = "machinegun box magazine (5.45)" path =/obj/item/ammo_magazine/m545saw hidden = 1 -/*/datum/category_item/autolathe/arms/machinegun_545_hunter //VOREStation Edit Start. By request of Ace - name = "machinegun box magazine (5.45 hunting)" - path =/obj/item/ammo_magazine/m545saw/hunter - hidden = 1*/ //VOREStation Edit End. - -/////// 7.62 +//! ## 7.62 /datum/category_item/autolathe/arms/rifle_762 name = "rifle magazine (7.62mm)" @@ -206,7 +197,7 @@ hidden = 1 */ -/////// Shotgun +//! ## Shotgun /datum/category_item/autolathe/arms/shotgun_clip_beanbag name = "2-round 12g speedloader (beanbag)" @@ -226,101 +217,6 @@ name = "2-round 12g speedloader (beanbag)" path =/obj/item/ammo_magazine/clip/c12g/beanbag -/* Commented out until autolathe stuff is decided/fixed. Will probably remove these entirely. -Spades -// These should always be/empty! The idea is to fill them up manually with ammo clips. - -/datum/category_item/autolathe/arms/pistol_5mm - name = "pistol magazine (5mm)" - path =/obj/item/ammo_magazine/c5mm/empty - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/smg_5mm - name = "top-mounted SMG magazine (5mm)" - path =/obj/item/ammo_magazine/c5mmt/empty - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/pistol_45 - name = "pistol magazine (.45)" - path =/obj/item/ammo_magazine/m45/empty - category = list("Arms and Ammunition") - -/datum/category_item/autolathe/arms/pistol_45uzi - name = "stick magazine (.45)" - path =/obj/item/ammo_magazine/m45uzi/empty - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/tommymag - name = "Tommy Gun magazine (.45)" - path =/obj/item/ammo_magazine/m45tommy/empty - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/tommydrum - name = "Tommy Gun drum magazine (.45)" - path =/obj/item/ammo_magazine/m45tommydrum/empty - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/pistol_9mm - name = "pistol magazine (9mm)" - path =/obj/item/ammo_magazine/m9mm/empty - category = list("Arms and Ammunition") - -/datum/category_item/autolathe/arms/smg_9mm - name = "top-mounted SMG magazine (9mm)" - path =/obj/item/ammo_magazine/m9mmt/empty - category = list("Arms and Ammunition") - -/datum/category_item/autolathe/arms/smg_10mm - name = "SMG magazine (10mm)" - path =/obj/item/ammo_magazine/m10mm/empty - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/pistol_44 - name = "pistol magazine (.44)" - path =/obj/item/ammo_magazine/m44/empty - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/rifle_545 - name = "10rnd rifle magazine (5.45mm)" - path =/obj/item/ammo_magazine/m545saw/empty - category = list("Arms and Ammunition") - -/datum/category_item/autolathe/arms/rifle_545m - name = "20rnd rifle magazine (5.45mm)" - path =/obj/item/ammo_magazine/m545sawm/empty - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/rifle_SVD - name = "10rnd rifle magazine (7.62mm)" - path =/obj/item/ammo_magazine/m762svd/empty - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/rifle_762 - name = "20rnd rifle magazine (7.62mm)" - path =/obj/item/ammo_magazine/m762/empty - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/machinegun_762 - name = "machinegun box magazine (7.62)" - path =/obj/item/ammo_magazine/a762/empty - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/shotgun_magazine - name = "24rnd shotgun magazine (12g)" - path =/obj/item/ammo_magazine/m12gdrum/empty - category = list("Arms and Ammunition") - hidden = 1*/ - /////////////////////////////// /*Ammo clips and Speedloaders*/ /////////////////////////////// @@ -348,67 +244,6 @@ name = "speedloader (.45 rubber)" path = /obj/item/ammo_magazine/s45/rubber -// Commented out until metal exploits with autolathe is fixed. -/*/datum/category_item/autolathe/arms/pistol_clip_45 - name = "ammo clip (.45)" - path =/obj/item/ammo_magazine/clip/c45 - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/pistol_clip_45r - name = "ammo clip (.45 rubber)" - path =/obj/item/ammo_magazine/clip/c45/rubber - category = list("Arms and Ammunition") - -/datum/category_item/autolathe/arms/pistol_clip_45f - name = "ammo clip (.45 flash)" - path =/obj/item/ammo_magazine/clip/c45/flash - category = list("Arms and Ammunition") - -/datum/category_item/autolathe/arms/pistol_clip_45p - name = "ammo clip (.45 practice)" - path =/obj/item/ammo_magazine/clip/c45/practice - category = list("Arms and Ammunition") - -/datum/category_item/autolathe/arms/pistol_clip_9mm - name = "ammo clip (9mm)" - path =/obj/item/ammo_magazine/clip/c9mm - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/pistol_clip_9mmr - name = "ammo clip (9mm rubber)" - path =/obj/item/ammo_magazine/clip/c9mm/rubber - category = list("Arms and Ammunition") - -/datum/category_item/autolathe/arms/pistol_clip_9mmp - name = "ammo clip (9mm practice)" - path =/obj/item/ammo_magazine/clip/c9mm/practice - category = list("Arms and Ammunition") - -/datum/category_item/autolathe/arms/pistol_clip_9mmf - name = "ammo clip (9mm flash)" - path =/obj/item/ammo_magazine/clip/c9mm/flash - category = list("Arms and Ammunition") - -/datum/category_item/autolathe/arms/pistol_clip_5mm - name = "ammo clip (5mm)" - path =/obj/item/ammo_magazine/clip/c5mm - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/pistol_clip_10mm - name = "ammo clip (10mm)" - path =/obj/item/ammo_magazine/clip/c10mm - category = list("Arms and Ammunition") - hidden = 1 - -/datum/category_item/autolathe/arms/pistol_clip_50 - name = "ammo clip (.44)" - path =/obj/item/ammo_magazine/clip/c50 - category = list("Arms and Ammunition") - hidden = 1 -*/ /datum/category_item/autolathe/arms/rifle_clip_545 name = "ammo clip (5.45mm)" path =/obj/item/ammo_magazine/clip/c545 @@ -425,10 +260,6 @@ path =/obj/item/ammo_magazine/clip/c762 hidden = 1 -/*/datum/category_item/autolathe/arms/rifle_clip_762_hunter //VOREStation Edit Start. By request of Ace - name = "ammo clip (7.62mm hunting)" - path =/obj/item/ammo_magazine/clip/c762/hunter*/ //VOREStation Edit End. - /datum/category_item/autolathe/arms/rifle_clip_762_practice name = "ammo clip (7.62mm practice)" path =/obj/item/ammo_magazine/clip/c762/practice @@ -489,16 +320,3 @@ name = "SMG magazine (9mm)" path = /obj/item/ammo_magazine/m9mml hidden = 1 -/* De-coded? -/datum/category_item/autolathe/arms/classic_smg_9mmr - name = "SMG magazine (9mm rubber)" - path = /obj/item/ammo_magazine/m9mml/rubber - -/datum/category_item/autolathe/arms/classic_smg_9mmp - name = "SMG magazine (9mm practice)" - path = /obj/item/ammo_magazine/m9mml/practice - -/datum/category_item/autolathe/arms/classic_smg_9mmf - name = "SMG magazine (9mm flash)" - path = /obj/item/ammo_magazine/m9mml/flash -*/ diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 8894f0f8b4a..e9a236b9c6e 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -24,7 +24,7 @@ var/list/med = new() var/list/sci = new() var/list/car = new() - var/list/pla = new() //VOREStation Edit + var/list/pla = new() var/list/civ = new() var/list/bot = new() var/list/off = new() @@ -79,11 +79,9 @@ if(SSjob.is_job_in_department(real_rank, DEPARTMENT_CARGO)) car[name] = rank department = 1 - //VOREStation Add Begin if(SSjob.is_job_in_department(real_rank, DEPARTMENT_PLANET)) pla[name] = rank department = 1 - //VOREStation Add End if(SSjob.is_job_in_department(real_rank, DEPARTMENT_CIVILIAN)) civ[name] = rank department = 1 @@ -148,13 +146,11 @@ for(name in car) dat += "[name][car[name]][isactive[name]]" even = !even - //VOREStation Edit Begin if(pla.len > 0) dat += "Exploration" for(name in pla) dat += "[name][pla[name]][isactive[name]]" even = !even - //VOREStation Edit End if(civ.len > 0) dat += "Civilian" for(name in civ) @@ -288,7 +284,7 @@ GLOBAL_LIST_EMPTY(PDA_Manifest) list("cat" = "Medical", "elems" = med), list("cat" = "Science", "elems" = sci), list("cat" = "Cargo", "elems" = car), - list("cat" = "Exploration", "elems" = pla), // VOREStation Edit + list("cat" = "Exploration", "elems" = pla), list("cat" = "Civilian", "elems" = civ), list("cat" = "Silicon", "elems" = bot), list("cat" = "Miscellaneous", "elems" = misc) diff --git a/code/datums/ghost_query.dm b/code/datums/ghost_query.dm index ec5326f5d08..0caa439f4bc 100644 --- a/code/datums/ghost_query.dm +++ b/code/datums/ghost_query.dm @@ -125,7 +125,6 @@ /datum/ghost_query/lost_drone role_name = "Lost Drone" question = "A lost drone onboard has been discovered by a crewmember and they are attempting to reactivate it. Would you like to play as the drone?" - //be_special_flag = BE_AI //VOREStation Removal: Positronic role is never used because intended purpose is unfitting, so remove the check check_bans = list("AI", "Cyborg") cutoff_number = 1 diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index b01e19d5d46..26de64d1f54 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -1,5 +1,5 @@ //wrapper -/proc/do_teleport(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null, local=TRUE, bohsafe=FALSE) //VOREStation Edit +/proc/do_teleport(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null, local=TRUE, bohsafe=FALSE) new /datum/teleport/instant/science(arglist(args)) return @@ -184,17 +184,6 @@ else teleatom.visible_message(SPAN_DANGER("\The [teleatom] bounces off of the portal!")) return FALSE - /* VOREStation Removal - if(destination.z in GLOB.using_map.admin_levels) //CentCom z-level - if(istype(teleatom, /obj/mecha)) - var/obj/mecha/MM = teleatom - to_chat(MM.occupant, SPAN_DANGER("\The [MM] would not survive the jump to a location so far away!")) - return FALSE - if(!!length(teleatom.search_contents_for(/obj/item/storage/backpack/holding))) - teleatom.visible_message(SPAN_DANGER("\The [teleatom] bounces off of the portal!")) - return FALSE - */ //VOREStation Removal End - //VOREStation Edit Start var/obstructed = 0 var/turf/dest_turf = get_turf(destination) if(local && !(dest_turf.z in GLOB.using_map.player_levels)) @@ -219,7 +208,6 @@ return FALSE else return TRUE - //VOREStation Edit End //! ## VR FILE MERGE ## !// diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 3155d5b0133..ae82aff004d 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -503,7 +503,7 @@ /mob/living/carbon/human/mind_initialize() ..() if(!mind.assigned_role) - mind.assigned_role = USELESS_JOB //defualt //VOREStation Edit - Visitor not Assistant + mind.assigned_role = USELESS_JOB //slime /mob/living/simple_mob/slime/mind_initialize() diff --git a/code/datums/repositories/radiation.dm b/code/datums/repositories/radiation.dm index a085373950b..b029a448406 100644 --- a/code/datums/repositories/radiation.dm +++ b/code/datums/repositories/radiation.dm @@ -137,7 +137,7 @@ var/global/repository/radiation/radiation_repository = new() return 1 /mob/living/rad_act(var/severity) - if(severity && !isbelly(loc)) //eaten mobs are made immune to radiation //VOREStation Edit Start + if(severity && !isbelly(loc)) //eaten mobs are made immune to radiation src.apply_effect(severity, IRRADIATE, src.getarmor(null, "rad")) for(var/atom/I in src) - I.rad_act(severity) ///VOREStation Edit End + I.rad_act(severity) diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 1d0b8646af3..cdcf153876d 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -1627,7 +1627,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "fitness" /area/crew_quarters/longue_area - name = "\improper Lounge" //VOREStation Edit - Muh speeling. + name = "\improper Lounge" icon_state = "recreation_area" /area/crew_quarters/recreation_area diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 0963363ab09..f63e882f922 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -58,7 +58,7 @@ var/old_x = 0 var/old_y = 0 - ///VOREStation Add - Moved from /obj/vehicle (for some reason?) + /// Used for vehicles and other things. var/datum/riding/riding_datum /// Does the atom spin when thrown. var/does_spin = TRUE diff --git a/code/game/atoms_movable_movement.dm b/code/game/atoms_movable_movement.dm index ae287a59b0e..a7f6c6be767 100644 --- a/code/game/atoms_movable_movement.dm +++ b/code/game/atoms_movable_movement.dm @@ -158,19 +158,15 @@ if(. && has_buckled_mobs() && !handle_buckled_mob_movement(loc,direct)) //movement failed due to buckled mob(s) return FALSE - //Polaris stuff move_speed = world.time - l_move_time l_move_time = world.time m_flag = 1 - //End - //VOREStation Add if(. && riding_datum) riding_datum.handle_vehicle_layer() riding_datum.handle_vehicle_offsets() - //VOREStation Add End -//Called after a successful Move(). By this point, we've already moved +/// Called after a successful Move(). By this point, we've already moved /atom/movable/proc/Moved(atom/OldLoc, Dir, Forced = FALSE) SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(src, COMSIG_MOVABLE_MOVED, OldLoc, Dir, Forced) @@ -184,8 +180,8 @@ return TRUE -// Make sure you know what you're doing if you call this, this is intended to only be called by byond directly. -// You probably want CanPass() +/// Make sure you know what you're doing if you call this, this is intended to only be called by byond directly. +/// You probably want CanPass() /atom/movable/Cross(atom/movable/AM) . = TRUE SEND_SIGNAL(src, COMSIG_MOVABLE_CROSS, AM) @@ -212,14 +208,12 @@ CRASH("Bump was called with no argument.") SEND_SIGNAL(src, COMSIG_MOVABLE_BUMP, A) . = ..() - // vore code if(throwing) throw_impact(A) throwing = 0 if(QDELETED(A)) return A.last_bumped = world.time - // vore code end /* if(!QDELETED(throwing)) throwing.hit_atom(A) diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index 892799b72aa..d5cb7078bcc 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -106,7 +106,6 @@ var/global/list/datum/gene/dna_genes[0] var/b_type = "A+" // Should probably change to an integer => string map but I'm lazy. var/real_name // Stores the real name of the person who originally got this dna datum. Used primarily for changelings, - // VOREStation var/custom_species var/base_species = SPECIES_HUMAN var/list/species_traits = list() @@ -115,7 +114,6 @@ var/global/list/datum/gene/dna_genes[0] var/custom_ask var/custom_whisper var/custom_exclaim - // VOREStation // New stuff var/species = SPECIES_HUMAN @@ -179,9 +177,6 @@ var/global/list/datum/gene/dna_genes[0] character.f_style = "Shaved" var/beard = facial_hair_styles_list.Find(character.f_style) - - // VOREStation Edit Start - // Demi Ears var/ear_style = 0 if(character.ear_style) diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index bf415b6cad2..59fc0c47e31 100644 --- a/code/game/dna/dna2_helpers.dm +++ b/code/game/dna/dna2_helpers.dm @@ -173,8 +173,6 @@ if((0 < beard) && (beard <= facial_hair_styles_list.len)) H.f_style = facial_hair_styles_list[beard] - // VORE StationEdit Start - // Ears var/ears = dna.GetUIValueRange(DNA_UI_EAR_STYLE, ear_styles_list.len + 1) - 1 if(ears <= 1) @@ -255,24 +253,21 @@ var/datum/species/alraune/CS = H.species CS.copy_from(dna.base_species,dna.species_traits,src) CS.blood_color = dna.blood_color - // VOREStation Edit End - H.force_update_organs() //VOREStation Add - Gotta do this too + H.force_update_organs() H.force_update_limbs() - //H.update_body(0) //VOREStation Edit - Done in force_update_limbs already + //H.update_body(0) // Done in force_update_limbs already H.update_eyes() H.update_hair() - return 1 + return TRUE else - return 0 + return FALSE -//VOREStation Add /mob/living/carbon/human/proc/force_update_organs() for(var/organ in organs + internal_organs) var/obj/item/organ/O = organ O.species = species -//VOREStation Add End -// Used below, simple injection modifier. +/// Used below, simple injection modifier. /proc/probinj(var/pr, var/inj) return prob(pr+inj*pr) diff --git a/code/game/gamemodes/endgame/supermatter_cascade/portal.dm b/code/game/gamemodes/endgame/supermatter_cascade/portal.dm index 57f8734ee6a..bc28be3270a 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/portal.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/portal.dm @@ -38,14 +38,12 @@ var/mob/living/L = A if(L.buckled && istype(L.buckled,/obj/structure/bed/)) var/turf/O = L.buckled - do_teleport(O, pick(endgame_safespawns), local = FALSE) //VOREStation Edit + do_teleport(O, pick(endgame_safespawns), local = FALSE) L.loc = O.loc else - do_teleport(L, pick(endgame_safespawns), local = FALSE) //dead-on precision //VOREStation Edit - + do_teleport(L, pick(endgame_safespawns), local = FALSE) //dead-on precision else if (istype(A, /obj/mecha/)) - do_teleport(A, pick(endgame_safespawns), local = FALSE) //dead-on precision //VOREStation Edit - + do_teleport(A, pick(endgame_safespawns), local = FALSE) //dead-on precision else if (isturf(A)) var/turf/T = A var/dist = get_dist(T, src) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 603684c1f7c..3081e3bdcfe 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -244,53 +244,3 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is to_chat(M, "THE STATION IS [who2pref] [who2]...LAWS UPDATED") to_chat(M, "
") M.add_ion_law("THE STATION IS [who2pref] [who2]") -/* //VOREStation Edit - if(botEmagChance) - for(var/mob/living/bot/bot in GLOB.machines) - if(prob(botEmagChance)) - bot.emag_act(1) -*/ //VOREStation Edit - /* - - var/apcnum = 0 - var/smesnum = 0 - var/airlocknum = 0 - var/firedoornum = 0 - - to_chat(world, "Ion Storm Main Started") - - spawn(0) - to_chat(world, "Started processing APCs") - for (var/obj/machinery/power/apc/apc in GLOB.apcs) - if(APC.z in station_levels) - APC.ion_act() - apcnum++ - to_chat(world, "Finished processing APCs. Processed: [apcnum]") - spawn(0) - to_chat(world, "Started processing SMES") - for (var/obj/machinery/power/smes/SMES in GLOB.smeses) - if(SMES.z in station_levels) - SMES.ion_act() - smesnum++ - to_chat(world, "Finished processing SMES. Processed: [smesnum]") - spawn(0) - to_chat(world, "Started processing AIRLOCKS") - for (var/obj/machinery/door/airlock/D in GLOB.machines) - if(D.z in station_levels) - //if(length(D.req_access) > 0 && !(12 in D.req_access)) //not counting general access and maintenance airlocks - airlocknum++ - spawn(0) - D.ion_act() - to_chat(world, "Finished processing AIRLOCKS. Processed: [airlocknum]") - spawn(0) - to_chat(world, "Started processing FIREDOORS") - for (var/obj/machinery/door/firedoor/D in GLOB.machines) - if(D.z in station_levels) - firedoornum++; - spawn(0) - D.ion_act() - to_chat(world, "Finished processing FIREDOORS. Processed: [firedoornum]") - - to_chat(world, "Ion Storm Main Done") - - */ diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index 1caf4d6a1b4..20f6ef07d7d 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -129,11 +129,8 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t // if(10) // Holiday["S'randarr's Day"] = "A Tajaran holiday that occurs on the longest day of the year in summer, // on Ahdomai. It is named after the Tajaran deity of Light, and huge celebrations are common." -//VOREStation Add - Of course we need this. if(8) - Holiday["Vore Day"] = "A holiday representing the innate desire in all/most/some/a few of us to devour each other or be devoured. \ - That's probably why you're here, isn't it? Get to it, then!" -//VOREStation Add End. + Holiday["Vore Day"] = "A holiday representing the innate desire in all/most/some/a few of us to devour each other or be devoured." if(27) Holiday["Forgiveness Day"] = "A time to forgive and be forgiven." diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 397e5393d1a..d3830b26a56 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -138,7 +138,7 @@ SpinAnimation() /obj/effect/meteor/Bump(atom/A) - if(attempt_vr(src,"Bump_vr",list(A))) return //VOREStation Edit - allows meteors to be deflected by baseball bats + if(attempt_vr(src,"Bump_vr",list(A))) return // Allows meteors to be deflected by baseball bats if(A) if(A.handle_meteor_impact(src)) // Used for special behaviour when getting hit specifically by a meteor, like a shield. ram_turf(get_turf(A)) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index af2e33d6885..a23076a7c35 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -152,7 +152,7 @@ datum/objective/anti_revolution/demote if(!istype(I)) return 1 - if(I.assignment == USELESS_JOB) //VOREStation Edit - Visitor not Assistant + if(I.assignment == USELESS_JOB) return 1 else return 0 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index afa1d219ba9..d3e163633bd 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -6,7 +6,7 @@ required_players = 12 //should be enough for a decent manifest, hopefully required_players_secret = 12 //pretty sure rev doesn't even appear in secret required_enemies = 3 - auto_recall_shuttle = 0 //un-wanted on polaris + auto_recall_shuttle = 0 end_on_antag_death = 0 antag_tags = list(MODE_REVOLUTIONARY, MODE_LOYALIST) require_all_templates = 1 diff --git a/code/game/gamemodes/technomancer/spells/radiance.dm b/code/game/gamemodes/technomancer/spells/radiance.dm index 93abd0faa80..2e863996e6a 100644 --- a/code/game/gamemodes/technomancer/spells/radiance.dm +++ b/code/game/gamemodes/technomancer/spells/radiance.dm @@ -35,7 +35,7 @@ if(!istype(T, /turf/space)) env = T.return_air() - removed = env.remove(0.25 * env.total_moles) //Remove gas from surrounding area + removed = env.remove(0.25 * env.total_moles) // Remove gas from surrounding area var/thermal_power = 300 * adjusted_power diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 1d66a7e55d2..cd4bc9c93a7 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -29,11 +29,9 @@ for(dir in list(NORTH, EAST, SOUTH, WEST)) // Loop through every direction sleepernew = locate(/obj/machinery/sleeper, get_step(src, dir)) // Try to find a scanner in that direction if(sleepernew) - // VOREStation Edit Start sleeper = sleepernew sleepernew.console = src break - // VOREStation Edit End /obj/machinery/sleep_console/attack_ai(mob/user) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 92bbbdee9bf..a6ca7efd9a1 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -56,7 +56,7 @@ return M.forceMove(src) occupant = M - update_icon() //icon_state = "body_scanner_1" //VOREStation Edit - Health display for consoles with light and such. + update_icon() //icon_state = "body_scanner_1" // Health display for consoles with light and such. playsound(src, 'sound/machines/medbayscanner1.ogg', 50) // Beepboop you're being scanned. <3 add_fingerprint(user) qdel(G) @@ -208,17 +208,6 @@ return attack_hand(user) /obj/machinery/body_scanconsole/power_change() - /* VOREStation Removal - if(machine_stat & BROKEN) - icon_state = "body_scannerconsole-p" - else if(powered() && !panel_open) - icon_state = initial(icon_state) - machine_stat &= ~NOPOWER - else - spawn(rand(0, 15)) - icon_state = "body_scannerconsole-p" - machine_stat |= NOPOWER - */ update_icon() //Health display for consoles with light and such. /obj/machinery/body_scanconsole/ex_act(severity) @@ -403,7 +392,7 @@ occupantData["blind"] = (H.sdisabilities & BLIND) occupantData["nearsighted"] = (H.disabilities & NEARSIGHTED) - occupantData = attempt_vr(scanner,"get_occupant_data_vr",list(occupantData,H)) //VOREStation Insert + occupantData = attempt_vr(scanner,"get_occupant_data_vr",list(occupantData,H)) data["occupant"] = occupantData ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 729683393e4..bd65965ee5b 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -143,7 +143,7 @@ if(is_robot_module(O)) return FALSE - if(istype(O,/obj/item/ammo_magazine/clip) || istype(O,/obj/item/ammo_magazine/s357) || istype(O,/obj/item/ammo_magazine/s38) || istype (O,/obj/item/ammo_magazine/s44)/* VOREstation Edit*/) // Prevents ammo recycling exploit with speedloaders. + if(istype(O,/obj/item/ammo_magazine/clip) || istype(O,/obj/item/ammo_magazine/s357) || istype(O,/obj/item/ammo_magazine/s38) || istype (O,/obj/item/ammo_magazine/s44)) to_chat(user, "\The [O] is too hazardous to recycle with the autolathe!") return diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index b0cd59d0c2f..ad26f82d03d 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -61,12 +61,11 @@ log_world("[src.name] in [get_area(src)]has errored. [src.network?"Empty network list":"Null network list"]") ASSERT(src.network) ASSERT(src.network.len > 0) - // VOREStation Edit Start - Make mapping with cameras easier + // Make mapping with cameras easier if(!c_tag) var/area/A = get_area(src) c_tag = "[A ? A.name : "Unknown"] #[rand(111,999)]" return ..() - // VOREStation Edit End /obj/machinery/camera/Destroy() deactivate(null, 0) //kick anyone viewing out diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index e295548c398..b5784ee6bd6 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -1,34 +1,33 @@ // PRESETS /* var/global/list/station_networks = list( -// NETWORK_CAFE_DOCK, - NETWORK_CARGO, - NETWORK_CIVILIAN, -// NETWORK_CIVILIAN_EAST, -// NETWORK_CIVILIAN_WEST, - NETWORK_COMMAND, - NETWORK_ENGINE, - NETWORK_ENGINEERING, - NETWORK_ENGINEERING_OUTPOST, - NETWORK_DEFAULT, - NETWORK_MEDICAL, - NETWORK_MINE, - NETWORK_NORTHERN_STAR, - NETWORK_RESEARCH, - NETWORK_RESEARCH_OUTPOST, - NETWORK_ROBOTS, - NETWORK_PRISON, - NETWORK_SECURITY, - NETWORK_INTERROGATION - ) + NETWORK_CAFE_DOCK, + NETWORK_CARGO, + NETWORK_CIVILIAN, + NETWORK_CIVILIAN_EAST, + NETWORK_CIVILIAN_WEST, + NETWORK_COMMAND, + NETWORK_ENGINE, + NETWORK_ENGINEERING, + NETWORK_ENGINEERING_OUTPOST, + NETWORK_DEFAULT, + NETWORK_MEDICAL, + NETWORK_MINE, + NETWORK_NORTHERN_STAR, + NETWORK_RESEARCH, + NETWORK_RESEARCH_OUTPOST, + NETWORK_ROBOTS, + NETWORK_PRISON, + NETWORK_SECURITY, + NETWORK_INTERROGATION + ) */ var/global/list/engineering_networks = list( - NETWORK_ENGINE, - NETWORK_ENGINEERING, - //NETWORK_ENGINEERING_OUTPOST, //VOREStation Edit: Tether has no Engineering Outpost, - NETWORK_ALARM_ATMOS, - NETWORK_ALARM_FIRE, - NETWORK_ALARM_POWER) + NETWORK_ENGINE, + NETWORK_ENGINEERING, + NETWORK_ALARM_ATMOS, + NETWORK_ALARM_FIRE, + NETWORK_ALARM_POWER) /obj/machinery/camera/network/crescent network = list(NETWORK_CRESCENT) diff --git a/code/game/machinery/computer/RCON_Console.dm b/code/game/machinery/computer/RCON_Console.dm index 7bede1aa02b..325e44c8683 100644 --- a/code/game/machinery/computer/RCON_Console.dm +++ b/code/game/machinery/computer/RCON_Console.dm @@ -8,7 +8,7 @@ name = "\improper RCON console" desc = "Console used to remotely control machinery on the station." icon_keyboard = "power_key" - icon_screen = "ai_fixer" //VOREStation Edit + icon_screen = "ai_fixer" light_color = "#a97faa" circuit = /obj/item/circuitboard/rcon_console req_one_access = list(access_engine) @@ -39,4 +39,4 @@ /obj/machinery/computer/rcon/update_icon() ..() if(!(machine_stat & (NOPOWER|BROKEN))) - overlays += image(icon, "ai-fixer-empty", overlay_layer) //VOREStation Edit + overlays += image(icon, "ai-fixer-empty", overlay_layer) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 1e810d80583..6da0db01773 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -202,7 +202,7 @@ modify.access -= access_type if(!access_allowed) modify.access += access_type - modify.lost_access = list() //VOREStation addition: reset the lost access upon any modifications + modify.lost_access = list() . = TRUE if("assign") @@ -227,7 +227,7 @@ modify.access = access modify.assignment = t1 modify.rank = t1 - modify.lost_access = list() //VOREStation addition: reset the lost access upon any modifications + modify.lost_access = list() callHook("reassign_employee", list(modify)) . = TRUE @@ -283,9 +283,9 @@ if("terminate") if(is_authenticated()) - modify.assignment = "Dismissed" //VOREStation Edit: setting adjustment + modify.assignment = "Dismissed" modify.access = list() - modify.lost_access = list() //VOREStation addition: reset the lost access upon any modifications + modify.lost_access = list() // Reset the lost access upon any modifications callHook("terminate_employee", list(modify)) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 48986528370..c3a22f066f4 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -467,7 +467,7 @@ SSemergencyshuttle.call_evac() log_game("[key_name(user)] has called the shuttle.") message_admins("[key_name_admin(user)] has called the shuttle.", 1) - admin_chat_message(message = "Emergency evac beginning! Called by [key_name(user)]!", color = "#CC2222") //VOREStation Add + admin_chat_message(message = "Emergency evac beginning! Called by [key_name(user)]!", color = "#CC2222") return @@ -515,7 +515,7 @@ log_game("[user? key_name(user) : "Autotransfer"] has called the shuttle.") message_admins("[user? key_name_admin(user) : "Autotransfer"] has called the shuttle.", 1) - admin_chat_message(message = "Autotransfer shuttle dispatched, shift ending soon.", color = "#2277BB") //VOREStation Add + admin_chat_message(message = "Autotransfer shuttle dispatched, shift ending soon.", color = "#2277BB") return diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 2434e3ce17d..4de2f9fb0ad 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -94,8 +94,6 @@ dat += "View storage log.
" if(allow_items) dat += "View objects.
" - //dat += "Recover object.
" //VOREStation Removal - Just log them. - //dat += "Recover all objects.
" //VOREStation Removal user << browse(dat, "window=cryopod_console") onclose(user, "cryopod_console") @@ -120,10 +118,8 @@ if(!allow_items) return var/dat = "Recently stored objects

" - //VOREStation Edit Start for(var/I in frozen_items) dat += "[I]
" - //VOREStation Edit End dat += "
" user << browse(dat, "window=cryoitems") @@ -221,18 +217,18 @@ var/allow_occupant_types = list(/mob/living/carbon/human) var/disallow_occupant_types = list() - var/mob/occupant = null // Person waiting to be despawned. - var/time_till_despawn = 599 // Down to 1 minute to reflect Vorestation respawn times. - var/time_entered = 0 // Used to keep track of the safe period. - var/obj/item/radio/intercom/announce // + var/mob/occupant = null // Person waiting to be despawned. + var/time_till_despawn = 599 // Down to 1 minute to reflect our respawn times. + var/time_entered = 0 // Used to keep track of the safe period. + var/obj/item/radio/intercom/announce var/obj/machinery/computer/cryopod/control_computer var/last_no_computer_message = 0 - var/applies_stasis = 0 //VOREStation Edit: allow people to change their mind + var/applies_stasis = 0 // Allow people to change their mind /obj/machinery/crypod/Initialize(mapload) . = ..() - if(type == /obj/machinery/cryopod) // sue me + if(type == /obj/machinery/cryopod) // sue me AddComponent(/datum/component/slaved_atom_to_loc, /atom/movable/landmark/spawnpoint/latejoin/station/cryogenics, TRUE) /obj/machinery/cryopod/robot @@ -246,7 +242,6 @@ on_store_name = "Robotic Storage Oversight" on_enter_occupant_message = "The storage unit broadcasts a sleep signal to you. Your systems start to shut down, and you enter low-power mode." allow_occupant_types = list(/mob/living/silicon/robot) - //disallow_occupant_types = list(/mob/living/silicon/robot/drone) //VOREStation Removal - Why? How else do they leave? applies_stasis = FALSE /obj/machinery/cryopod/robot/door @@ -366,8 +361,7 @@ qdel(R.mmi) for(var/obj/item/I in R.module) // the tools the borg has; metal, glass, guns etc - for(var/mob/M in I) //VOREStation edit - despawn_occupant(M) + for(var/mob/M in I) despawn_occupant(M) for(var/obj/item/O in I) // the things inside the tools, if anything; mainly for janiborg trash bags O.forceMove(R) qdel(I) @@ -444,14 +438,7 @@ if(!preserve) qdel(W) else - log_special_item(W,to_despawn) //VOREStation Add - /* VOREStation Removal - We do our own thing. - if(control_computer && control_computer.allow_items) - control_computer.frozen_items += W - W.loc = control_computer //VOREStation Edit - else - W.forceMove(src.loc) - VOREStation Removal End */ + log_special_item(W,to_despawn) for(var/obj/structure/B in items) if(istype(B,/obj/structure/bed)) qdel(B) @@ -517,11 +504,10 @@ log_and_message_admins("[key_name(to_despawn)] ([to_despawn.mind.role_alt_title]) entered cryostorage.") - //VOREStation Edit begin: Dont delete mobs-in-mobs + // Dont delete mobs-in-mobs if(to_despawn.client && to_despawn.stat<2) var/mob/observer/dead/newghost = to_despawn.ghostize() newghost.timeofdeath = world.time - //VOREStation Edit end: Dont delete mobs-in-mobs //This should guarantee that ghosts don't spawn. to_despawn.ckey = null @@ -748,16 +734,6 @@ /obj/machinery/computer/cryopod/gateway name = "teleport oversight console" desc = "An interface between visitors and the teleport oversight systems tasked with keeping track of all visitors who enter or exit from the teleporters." -/* VOREStation Edit -/obj/machinery/cryopod/robot/door/dorms - desc = "A small elevator that goes down to the residential district." - on_enter_occupant_message = "The elevator door closes slowly, ready to bring you down to the residential district." - spawnpoint_type = /datum/spawnpoint/elevator - -/obj/machinery/computer/cryopod/dorms - name = "residential oversight console" - desc = "An interface between visitors and the residential oversight systems tasked with keeping track of all visitors in the residential district." -*/ /obj/machinery/cryopod/proc/log_special_item(atom/movable/item, mob/to_despawn) ASSERT(item && to_despawn) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 5823cb7d26d..97f073e3a3c 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1,4 +1,4 @@ -//VOREStation Edit - Redone a lot of airlock things: +// Redone a lot of airlock things: /* - Specific department maintenance doors - Named doors properly according to type @@ -153,7 +153,7 @@ /obj/machinery/door/airlock/maintenance name = "Maintenance Access" icon = 'icons/obj/doors/Doormaint.dmi' - //req_one_access = list(access_maint_tunnels) //VOREStation Edit - Maintenance is open access + //req_one_access = list(access_maint_tunnels) // Maintenance is open access assembly_type = /obj/structure/door_assembly/door_assembly_mai open_sound_powered = 'sound/machines/door/door2o.ogg' close_sound_powered = 'sound/machines/door/door2c.ogg' @@ -587,7 +587,7 @@ /obj/machinery/door/airlock/alien/public // Entry to UFO. req_one_access = list() normalspeed = FALSE // So it closes faster and hopefully keeps the warm air inside. - hackProof = TRUE //VOREStation Edit - No borgos + hackProof = TRUE // No borgs //"Red" Armory Door /obj/machinery/door/airlock/security/armory diff --git a/code/game/machinery/doors/airlock_vr.dm b/code/game/machinery/doors/airlock_vr.dm index eb1594283b4..4eaa9f79d9c 100644 --- a/code/game/machinery/doors/airlock_vr.dm +++ b/code/game/machinery/doors/airlock_vr.dm @@ -19,7 +19,7 @@ /obj/machinery/door/airlock/alien/blue/public // Entry to UFO. req_one_access = list() normalspeed = FALSE // So it closes faster and hopefully keeps the warm air inside. - hackProof = TRUE //VOREStation Edit - No borgos + hackProof = TRUE // No borgs /obj/machinery/door/airlock/glass_security/polarized name = "Electrochromic Security Airlock" diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 839ee90b3cb..3a8a9ee67f8 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -107,8 +107,8 @@ M.last_bumped = world.time if(M.restrained() && !check_access(null)) return - else if(istype(M, /mob/living/simple_mob/animal/passive/mouse) && !(M.ckey)) //VOREStation Edit: Make wild mice - return //VOREStation Edit: unable to open doors + else if(istype(M, /mob/living/simple_mob/animal/passive/mouse) && !(M.ckey)) + return else bumpopen(M) @@ -215,8 +215,8 @@ src.add_fingerprint(user, 0, I) if(istype(I)) - if(attackby_vr(I, user)) //VOREStation begin: Fireproofing - return //VOREStation begin: Fireproofing + if(attackby_vr(I, user)) + return if(istype(I, /obj/item/stack/material) && I.get_material_name() == src.get_material_name()) if(machine_stat & BROKEN) to_chat(user, "It looks like \the [src] is pretty busted. It's going to need more than just patching up now.") diff --git a/code/game/machinery/doors/door_vr.dm b/code/game/machinery/doors/door_vr.dm index acda433c40d..138ebc24e2a 100644 --- a/code/game/machinery/doors/door_vr.dm +++ b/code/game/machinery/doors/door_vr.dm @@ -3,7 +3,7 @@ D.fire_act(adj_air, adj_temp, adj_volume) /obj/machinery/door - var/reinforcing = 0 //vorestation addition + var/reinforcing = 0 var/tintable = 0 var/icon_tinted var/id_tint diff --git a/code/game/machinery/embedded_controller/airlock_program.dm b/code/game/machinery/embedded_controller/airlock_program.dm index 8222aaf19b9..7fa404f9cb5 100644 --- a/code/game/machinery/embedded_controller/airlock_program.dm +++ b/code/game/machinery/embedded_controller/airlock_program.dm @@ -211,7 +211,7 @@ //purge apparently means clearing the airlock chamber to vacuum (then refilling, handled later) target_pressure = 0 state = STATE_DEPRESSURIZE - playsound(master, 'sound/AI/airlockout.ogg', 100, 0) //VOREStation Add - TTS + playsound(master, 'sound/AI/airlockout.ogg', 100, 0) //TODO: Remove all of Virgo's TTS. Doesn't match anything. if(!cycle_to_external_air || target_state == TARGET_OUTOPEN) // if going outside, pump internal air into air tank signalPump(tag_airpump, 1, 0, target_pressure) //send a signal to start depressurizing else @@ -220,7 +220,7 @@ else if(chamber_pressure <= target_pressure) state = STATE_PRESSURIZE - playsound(master, 'sound/AI/airlockin.ogg', 100, 0) //VOREStation Add - TTS + playsound(master, 'sound/AI/airlockin.ogg', 100, 0) if(!cycle_to_external_air || target_state == TARGET_INOPEN) // if going inside, pump air into airlock signalPump(tag_airpump, 1, 1, target_pressure) //send a signal to start pressurizing else @@ -230,7 +230,7 @@ else if(chamber_pressure > target_pressure) if(!cycle_to_external_air) state = STATE_DEPRESSURIZE - playsound(master, 'sound/AI/airlockout.ogg', 100, 0) //VOREStation Add - TTS + playsound(master, 'sound/AI/airlockout.ogg', 100, 0) signalPump(tag_airpump, 1, 0, target_pressure) //send a signal to start depressurizing else memory["purge"] = 1 // should always purge first if using external air, chamber pressure should never be higher than target pressure here @@ -238,7 +238,7 @@ memory["target_pressure"] = max(target_pressure, MIN_TARGET_PRESSURE) if(STATE_PRESSURIZE) - playsound(master, 'sound/machines/2beep.ogg', 100, 0) //VOREStation Add - TTS + playsound(master, 'sound/machines/2beep.ogg', 100, 0) if(memory["chamber_sensor_pressure"] >= memory["target_pressure"] * 0.95) //not done until the pump has reported that it's off if(memory["pump_status"] != "off") @@ -250,11 +250,11 @@ cycleDoors(target_state) state = STATE_IDLE target_state = TARGET_NONE - playsound(master, 'sound/AI/airlockdone.ogg', 100, 0) //VOREStation Add - TTS + playsound(master, 'sound/AI/airlockdone.ogg', 100, 0) if(STATE_DEPRESSURIZE) - playsound(master, 'sound/machines/2beep.ogg', 100, 0) //VOREStation Add - TTS + playsound(master, 'sound/machines/2beep.ogg', 100, 0) if(memory["chamber_sensor_pressure"] <= max(memory["target_pressure"] * 1.05, MIN_TARGET_PRESSURE)) if(memory["pump_status"] != "off") signalPump(tag_airpump, 0) @@ -270,7 +270,7 @@ cycleDoors(target_state) state = STATE_IDLE target_state = TARGET_NONE - playsound(master, 'sound/AI/airlockdone.ogg', 100, 0) //VOREStation Add - TTS + playsound(master, 'sound/AI/airlockdone.ogg', 100, 0) memory["processing"] = (state != target_state) diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm index c52e3e1afe3..d97c173e47d 100644 --- a/code/game/machinery/floor_light.dm +++ b/code/game/machinery/floor_light.dm @@ -90,7 +90,6 @@ var/list/floor_light_cache = list() on = !on if(on) update_use_power(USE_POWER_ACTIVE) - //visible_message(SPAN_NOTICE("\The [user] turns \the [src] [on ? "on" : "off"].")) //VOREStation Edit - No thankouuuu. Too spammy. update_brightness() return diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 88c0fadb34f..add191f611b 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -125,10 +125,9 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ return /obj/machinery/hologram/holopad/proc/create_holo(mob/living/silicon/ai/A, turf/T = loc) - var/obj/effect/overlay/aiholo/hologram = new(T)//Spawn a blank effect at the location. //VOREStation Edit to specific type for adding vars - hologram.master = A //VOREStation Edit: So you can reference the master AI from in the hologram procs + var/obj/effect/overlay/aiholo/hologram = new(T)//Spawn a blank effect at the location. + hologram.master = A // So you can reference the master AI from in the hologram procs hologram.icon = A.holo_icon - //hologram.mouse_opacity = 0//So you can't click on it. //VOREStation Removal hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them. hologram.anchored = 1//So space wind cannot drag it. hologram.name = "[A.name] (Hologram)"//If someone decides to right click. @@ -162,13 +161,6 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram/holopad/proc/move_hologram(mob/living/silicon/ai/user) if(masters[user]) - /*VOREStation Removal, using our own code - step_to(masters[user], user.eyeobj) // So it turns. - var/obj/effect/overlay/H = masters[user] - H.loc = get_turf(user.eyeobj) - masters[user] = H - */ - //VOREStation Add - Solid mass holovore tracking stuff var/obj/effect/overlay/aiholo/H = masters[user] if(H.bellied) walk_to(H, user.eyeobj) //Walk-to respects obstacles @@ -177,7 +169,6 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ //Hologram left the screen (got stuck on a wall or something) if(get_dist(H, user.eyeobj) > world.view) clear_holo(user) - //VOREStation Add End if((HOLOPAD_MODE == RANGE_BASED && (get_dist(H, src) > holo_range))) clear_holo(user) diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index a77b8cedd79..cbe1bb3fcfc 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -27,14 +27,17 @@ // Vars for hacking var/datum/wires/jukebox/wires = null - var/hacked = 0 // Whether to show the hidden songs or not - var/freq = 0 // Currently no effect, will return in phase II of mediamanager. - //VOREStation Add - var/loop_mode = JUKEMODE_PLAY_ONCE // Behavior when finished playing a song - var/max_queue_len = 3 // How many songs are we allowed to queue up? + /// Whether to show the hidden songs or not. + var/hacked = 0 + /// Currently no effect, will return in phase II of mediamanager. + var/freq = 0 + /// Behavior when finished playing a song. + var/loop_mode = JUKEMODE_PLAY_ONCE + /// How many songs are we allowed to queue up? + var/max_queue_len = 3 var/list/queue = list() - //VOREStation Add End - var/current_genre = "Electronic" //What is our current genre? + /// What is our current genre? + var/current_genre = "Electronic" var/list/genres = list("Arcade", "Alternative", "Classical and Orchestral", "Country and Western", "Disco, Funk, Soul, and R&B", "Electronic", "Folk and Indie", "Hip-Hop and Rap", "Jazz and Lounge", "Metal", "Pop", "Rock", "Sol Common Precursors") //Avaliable genres. var/datum/track/current_track var/list/datum/track/tracks = list( diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index b971a21354e..834f94d01e4 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -75,7 +75,6 @@ Buildable meters if(initial(fakeA.pipe_flags) & (PIPING_ALL_LAYER|PIPING_DEFAULT_LAYER_ONLY)) new_layer = PIPING_LAYER_DEFAULT piping_layer = new_layer - // Do it the Polaris way switch(piping_layer) if(PIPING_LAYER_SCRUBBER) color = PIPE_COLOR_RED diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 03e0ff9a457..971048d654c 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -306,8 +306,6 @@ data["access"] = !isLocked(user) data["locked"] = locked data["enabled"] = enabled - //data["is_lethal"] = 1 // VOREStation Removal of "Lethal" setting - it does nothing. Rykka did dis. - //data["lethal"] = lethal // VOREStation Removal of "Lethal" setting - it does nothing. Rykka did dis. if(data["access"]) var/settings[0] @@ -330,8 +328,6 @@ var/value = text2num(href_list["value"]) if(href_list["command"] == "enable") enabled = value - //else if(href_list["command"] == "lethal") // VOREStation Removal of "Lethal" setting - it does nothing. Rykka did dis. - //lethal = value // VOREStation Removal of "Lethal" setting - it does nothing. Rykka did dis. else if(href_list["command"] == "check_synth") check_synth = value else if(href_list["command"] == "check_weapons") diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index a9f618ec508..52cbc053f81 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -167,7 +167,7 @@ icon_state = icon_state_charged update_use_power(USE_POWER_IDLE) - //VOREStation Add - NSFW Batteries + // NSFW Batteries else if(istype(charging, /obj/item/ammo_casing/microbattery)) var/obj/item/ammo_casing/microbattery/batt = charging if(batt.shots_left >= initial(batt.shots_left)) @@ -179,7 +179,6 @@ batt.shots_left++ update_use_power(USE_POWER_ACTIVE) return - //VOREStation Add End else if(istype(charging, /obj/item/ammo_magazine/cell_mag)) charge_mag(charging) diff --git a/code/game/machinery/suit_storage/suit_cycler.dm b/code/game/machinery/suit_storage/suit_cycler.dm index 02cee3e66ab..d8b972385ad 100644 --- a/code/game/machinery/suit_storage/suit_cycler.dm +++ b/code/game/machinery/suit_storage/suit_cycler.dm @@ -551,8 +551,6 @@ if("Head of Security") parent_helmet = /obj/item/clothing/head/helmet/space/void/headofsecurity parent_suit = /obj/item/clothing/suit/space/void/headofsecurity - //BEGIN: Space for additional downstream variants - //VOREStation Addition Start if("Manager") parent_helmet = /obj/item/clothing/head/helmet/space/void/captain parent_suit = /obj/item/clothing/suit/space/void/captain @@ -592,8 +590,6 @@ if("Talon Mercenary") parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/mercenary/talon parent_suit = /obj/item/clothing/suit/space/void/refurb/mercenary/talon - //VOREStation Addition End - //END: downstream variant space if(target_species) //Only run these checks if they have a sprite sheet defined, otherwise they use human's anyways, and there is almost definitely a sprite. if((helmet!=null&&(target_species in helmet.sprite_sheets_obj))||(suit!=null&&(target_species in suit.sprite_sheets_obj))) diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 9d4517cbbad..736eaf64093 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -41,14 +41,14 @@ network = "tcommsat" autolinkers = list("hub", "relay", "c_relay", "s_relay", "m_relay", "r_relay", "science", "medical", "supply", "service", "common", "command", "engineering", "security", "unused", "hb_relay", - "receiverA", "broadcasterA") //VOREStation Edit - Added "hb_relay" + "receiverA", "broadcasterA") /obj/machinery/telecomms/hub/preset_cent id = "CentCom Hub" network = "tcommsat" produces_heat = 0 autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay", "hb_relay", - "centcom", "receiverCent", "broadcasterCent") //VOREStation Edit - Added "hb_relay" + "centcom", "receiverCent", "broadcasterCent") //Receivers diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 4b0d955c664..f4f58747086 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -252,7 +252,6 @@ /obj/machinery/telecomms/receiver name = "Subspace Receiver" - //icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon icon_state = "broadcast receiver" desc = "This machine has a dish-like shape and green lights. It is designed to detect and process subspace radio activity." density = 1 @@ -340,7 +339,6 @@ /obj/machinery/telecomms/hub name = "Telecommunication Hub" - //icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon icon_state = "hub" desc = "A mighty piece of hardware used to send/receive massive amounts of data." density = 1 @@ -377,7 +375,6 @@ /obj/machinery/telecomms/relay name = "Telecommunication Relay" - //icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon icon_state = "relay" desc = "A mighty piece of hardware used to send massive amounts of data far away." density = 1 @@ -437,7 +434,6 @@ /obj/machinery/telecomms/bus name = "Bus Mainframe" - //icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon icon_state = "bus" desc = "A mighty piece of hardware used to send massive amounts of data quickly." density = 1 @@ -493,7 +489,6 @@ /obj/machinery/telecomms/processor name = "Processor Unit" - //icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon icon_state = "processor" desc = "This machine is used to process large quantities of information." density = 1 @@ -535,7 +530,6 @@ /obj/machinery/telecomms/server name = "Telecommunication Server" - //icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon icon_state = "comm_server" desc = "A machine used to store data and network statistics." density = 1 diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 7e38bdadfb3..ca9480c6366 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -716,8 +716,8 @@ /obj/machinery/vending/cola name = "Robust Softdrinks" desc = "A softdrink vendor provided by Robust Industries, LLC." - icon_state = "Cola_Machine" //VOREStation Edit - icon_vend = "Cola_Machine-purchase" //VOREStation Edit + icon_state = "Cola_Machine" + icon_vend = "Cola_Machine-purchase" product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!" product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space." products = list(/obj/item/reagent_containers/food/drinks/cans/battery = 10, @@ -762,7 +762,6 @@ /obj/item/reagent_containers/food/snacks/liquidfood = 10, /obj/item/reagent_containers/food/snacks/liquidprotein = 10, /obj/item/reagent_containers/pill/diet = 8, - ///obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, /obj/item/towel/random = 8) prices = list(/obj/item/reagent_containers/food/drinks/smallmilk = 3, @@ -773,7 +772,6 @@ /obj/item/reagent_containers/food/snacks/liquidfood = 10, /obj/item/reagent_containers/food/snacks/liquidprotein = 10, /obj/item/reagent_containers/pill/diet = 25, - ///obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, /obj/item/towel/random = 40, ) diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index a64ccc29886..3593d5818bb 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -80,14 +80,12 @@ if(equip_type == EQUIP_SPECIAL) chassis.special_equipment -= src listclearnulls(chassis.special_equipment) - //VOREStation Addition begin: MICROMECHS if(equip_type == EQUIP_MICRO_UTILITY) chassis.micro_utility_equipment -= src listclearnulls(chassis.micro_utility_equipment) if(equip_type == EQUIP_MICRO_WEAPON) chassis.micro_weapon_equipment -= src listclearnulls(chassis.micro_weapon_equipment) - //VOREStation Addition end: MICROMECHS chassis.universal_equipment -= src chassis.equipment -= src listclearnulls(chassis.equipment) diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm index 3bdb4c83269..28510cba26c 100644 --- a/code/game/mecha/equipment/tools/syringe_gun.dm +++ b/code/game/mecha/equipment/tools/syringe_gun.dm @@ -229,7 +229,6 @@ occupant_message("No reagent info gained from [A].") return 0 occupant_message("Analyzing reagents...") - //VOREStation Block Edit - Start for(var/datum/reagent/R in A.reagents.reagent_list) if(R.id in known_reagents) occupant_message("Reagent \"[R.name]\" already present in database, skipping.") @@ -238,7 +237,6 @@ send_byjax(chassis.occupant,"msyringegun.browser","reagents_form",get_reagents_form()) else occupant_message("Reagent \"[R.name]\" unable to be scanned, skipping.") - //VOREstation Block Edit - End occupant_message("Analysis complete.") return 1 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 6f38f6901ea..13eab1720c4 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -145,16 +145,23 @@ var/static/image/radial_image_statpanel = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_examine2") //Mech actions - var/datum/mini_hud/mech/minihud //VOREStation Edit - var/strafing = 0 //Are we strafing or not? - - var/defence_mode_possible = 0 //Can we even use defence mode? This is used to assign it to mechs and check for verbs. - var/defence_mode = 0 //Are we in defence mode - var/defence_deflect = 35 //How much it deflect - - var/overload_possible = 0 //Same as above. Don't forget to GRANT the verb&actions if you want everything to work proper. - var/overload = 0 //Are our legs overloaded - var/overload_coeff = 1 //How much extra energy you use when use the L E G + var/datum/mini_hud/mech/minihud + /// re we strafing or not? + var/strafing = 0 + + /// Can we even use defence mode? This is used to assign it to mechs and check for verbs. + var/defence_mode_possible = 0 + /// Are we in defence mode. + var/defence_mode = 0 + /// How much it deflect. + var/defence_deflect = 35 + + /// Same as above. Don't forget to GRANT the verb&actions if you want everything to work proper. + var/overload_possible = 0 + /// Are our legs overloaded. + var/overload = 0 + /// How much extra energy you use when use the L E G. + var/overload_coeff = 1 var/zoom = 0 var/zoom_possible = 0 @@ -162,22 +169,30 @@ var/thrusters = 0 var/thrusters_possible = 0 - var/phasing = 0 //Are we currently phasing - var/phasing_possible = 0 //This is to allow phasing. - var/can_phase = TRUE //This is an internal check during the relevant procs. + /// Are we currently phasing. + var/phasing = 0 + /// This is to allow phasing. + var/phasing_possible = 0 + /// This is an internal check during the relevant procs. + var/can_phase = TRUE var/phasing_energy_drain = 200 - var/switch_dmg_type_possible = 0 //Can you switch damage type? It is mostly for the Phazon and its children. + /// Can you switch damage type? It is mostly for the Phazon and its children. + var/switch_dmg_type_possible = 0 var/smoke_possible = 0 - var/smoke_reserve = 5 //How many shots you have. Might make a reload later on. MIGHT. - var/smoke_ready = 1 //This is a check for the whether or not the cooldown is ongoing. - var/smoke_cooldown = 100 //How long you have between uses. + /// How many shots you have. Might make a reload later on. MIGHT. + var/smoke_reserve = 5 + /// This is a check for the whether or not the cooldown is ongoing. + var/smoke_ready = 1 + /// How long you have between uses. + var/smoke_cooldown = 100 var/datum/effect_system/smoke_spread/smoke_system = new - var/cloak_possible = FALSE // Can this exosuit innately cloak? + // Can this exosuit innately cloak? + var/cloak_possible = FALSE -////All of those are for the HUD buttons in the top left. See Grant and Remove procs in mecha_actions. +//All of those are for the HUD buttons in the top left. See Grant and Remove procs in mecha_actions. var/datum/action/innate/mecha/mech_eject/eject_action = new var/datum/action/innate/mecha/mech_toggle_internals/internals_action = new @@ -1847,10 +1862,8 @@ verbs += /obj/mecha/verb/eject log_append_to_last("[H] moved in as pilot.") update_icon() - //VOREStation Edit Add if(occupant.hud_used) minihud = new (occupant.hud_used, src) - //VOREStation Edit Add End //This part removes all the verbs if you don't have them the _possible on your mech. This is a little clunky, but it lets you just add that to any mech. //And it's not like this 10yo code wasn't clunky before. @@ -2191,7 +2204,7 @@ output += "Universal Module: [W.name] Detach
" for(var/obj/item/mecha_parts/mecha_equipment/W in special_equipment) output += "Special Module: [W.name] Detach
" - for(var/obj/item/mecha_parts/mecha_equipment/W in micro_utility_equipment) // VOREstation Edit - Adds micro equipent to the menu + for(var/obj/item/mecha_parts/mecha_equipment/W in micro_utility_equipment) output += "Micro Utility Module: [W.name] Detach
" for(var/obj/item/mecha_parts/mecha_equipment/W in micro_weapon_equipment) output += "Micro Weapon Module: [W.name] Detach
" diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 853d1547040..a956efc1126 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -3,14 +3,14 @@ name = "APLU \"Ripley\"" icon_state = "ripley" initial_icon = "ripley" - step_in = 5 // vorestation edit, was 6 but that's PAINFULLY slow - step_energy_drain = 5 // vorestation edit because 10 drained a significant chunk of its cell before you even got out the airlock + step_in = 5 + step_energy_drain = 5 max_temperature = 20000 health = 200 maxhealth = 200 //Don't forget to update the /old variant if you change this number. wreckage = /obj/effect/decal/mecha_wreckage/ripley cargo_capacity = 10 - var/obj/item/mining_scanner/orescanner // vorestation addition + var/obj/item/mining_scanner/orescanner minimum_penetration = 10 @@ -115,8 +115,6 @@ icon_scale_x = 1 icon_scale_y = 1 -//Vorestation Edit Start - /obj/mecha/working/ripley/Initialize(mapload) . = ..() orescanner = new /obj/item/mining_scanner @@ -129,8 +127,6 @@ orescanner.attack_self(usr) -//Vorestation Edit End - //Meant for random spawns. /obj/mecha/working/ripley/mining/old desc = "An old, dusty mining ripley." diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index f7a940e5150..2cd34d53e37 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -65,15 +65,12 @@ M.setDir(buckle_dir ? buckle_dir : dir) M.update_canmove() M.update_floating( M.Check_Dense_Object() ) -// buckled_mob = M buckled_mobs |= M - //VOREStation Add if(riding_datum) riding_datum.ridden = src riding_datum.handle_vehicle_offsets() M.update_water() - //VOREStation Add End post_buckle_mob(M) return TRUE @@ -91,15 +88,12 @@ buckled_mob.anchored = initial(buckled_mob.anchored) buckled_mob.update_canmove() buckled_mob.update_floating( buckled_mob.Check_Dense_Object() ) - // buckled_mob = null buckled_mobs -= buckled_mob - //VOREStation Add buckled_mob.update_water() if(riding_datum) riding_datum.restore_position(buckled_mob) riding_datum.handle_vehicle_offsets() // So the person in back goes to the front. - //VOREStation Add End post_buckle_mob(.) /atom/movable/proc/unbuckle_all_mobs(force = FALSE) @@ -136,29 +130,27 @@ . = buckle_mob(M, forced) if(.) - var/reveal_message = list("buckled_mob" = null, "buckled_to" = null) //VORE EDIT: This being a list and messages existing for the buckle target atom. + var/reveal_message = list("buckled_mob" = null, "buckled_to" = null) // This being a list and messages existing for the buckle target atom. if(!silent) if(M == user) - reveal_message["buckled_mob"] = "You come out of hiding and buckle yourself to [src]." //VORE EDIT - reveal_message["buckled_to"] = "You come out of hiding as [M.name] buckles themselves to you." //VORE EDIT + reveal_message["buckled_mob"] = "You come out of hiding and buckle yourself to [src]." + reveal_message["buckled_to"] = "You come out of hiding as [M.name] buckles themselves to you." M.visible_message(\ "[M.name] buckles themselves to [src].",\ "You buckle yourself to [src].",\ "You hear metal clanking.") else - reveal_message["buckled_mob"] = "You are revealed as you are buckled to [src]." //VORE EDIT - reveal_message["buckled_to"] = "You are revealed as [M.name] is buckled to you." //VORE EDIT + reveal_message["buckled_mob"] = "You are revealed as you are buckled to [src]." + reveal_message["buckled_to"] = "You are revealed as [M.name] is buckled to you." M.visible_message(\ "[M.name] is buckled to [src] by [user.name]!",\ "You are buckled to [src] by [user.name]!",\ "You hear metal clanking.") - M.reveal(silent, reveal_message["buckled_mob"]) //Reveal people so they aren't buckled to chairs from behind. //VORE EDIT, list arg instead of simple message var for buckled mob - //Vore edit start + M.reveal(silent, reveal_message["buckled_mob"]) //Reveal people so they aren't buckled to chairs from behind. var/mob/living/L = src if(istype(L)) L.reveal(silent, reveal_message["buckled_to"]) - //Vore edit end /atom/movable/proc/user_unbuckle_mob(mob/living/buckled_mob, mob/user) var/mob/living/M = unbuckle_mob(buckled_mob) diff --git a/code/game/objects/effects/chem/foam.dm b/code/game/objects/effects/chem/foam.dm index 0de03abe567..ccd35402a05 100644 --- a/code/game/objects/effects/chem/foam.dm +++ b/code/game/objects/effects/chem/foam.dm @@ -15,15 +15,14 @@ var/amount = 3 var/expand = 1 var/metal = 0 - var/dries = 1 //VOREStation Add - var/slips = 0 //VOREStation Add + var/dries = 1 + var/slips = 0 /obj/effect/foam/Initialize(mapload, ismetal = FALSE) . = ..() - //icon_state = "[ismetal? "m" : ""]foam" //VOREStation Removal metal = ismetal playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3) - if(dries) //VOREStation Add + if(dries) addtimer(CALLBACK(src, .proc/post_spread), 3 + metal * 3) addtimer(CALLBACK(src, .proc/pre_harden), 12 SECONDS) addtimer(CALLBACK(src, .proc/harden), 15 SECONDS) @@ -33,8 +32,7 @@ checkReagents() /obj/effect/foam/proc/pre_harden() - return //VOREStation Edit - + return /obj/effect/foam/proc/harden() if(metal) var/obj/structure/foamedmetal/M = new(src.loc) @@ -87,14 +85,17 @@ return if(metal) return - if(slips && istype(AM, /mob/living)) //VOREStation Add + if(slips && istype(AM, /mob/living)) var/mob/living/M = AM M.slip("the foam", 6) /datum/effect_system/foam_spread - var/amount = 5 // the size of the foam spread. - var/list/carried_reagents // the IDs of reagents present when the foam was mixed - var/metal = 0 // 0 = foam, 1 = metalfoam, 2 = ironfoam + /// The size of the foam spread. + var/amount = 5 + /// The IDs of reagents present when the foam was mixed. + var/list/carried_reagents + /// 0 = foam, 1 = metalfoam, 2 = ironfoam. + var/metal = 0 /datum/effect_system/foam_spread/set_up(amt=5, loca, var/datum/reagents/carry = null, var/metalfoam = 0) amount = round(sqrt(amt / 3), 1) diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 6c9863a3cf9..02f3e9c75f5 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -37,7 +37,7 @@ /obj/effect/overlay/bluespacify name = "Bluespace" - icon = 'icons/turf/space.dmi' //VOREStation Edit + icon = 'icons/turf/space.dmi' icon_state = "bluespacify" plane = ABOVE_PLANE diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index ea5d11cc556..dc44b1b027f 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -177,7 +177,6 @@ entry_vent = null else if(entry_vent) if(get_dist(src, entry_vent) <= 1) - //VOREStation Edit Start var/obj/machinery/atmospherics/component/unary/vent_pump/exit_vent = get_safe_ventcrawl_target(entry_vent) if(!exit_vent) return @@ -205,8 +204,6 @@ if(new_area) new_area.Entered(src) - //================= - if(isturf(loc)) skitter() diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 2cee14cb73f..63b4039b462 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -24,7 +24,7 @@ icon_state = "smoke" duration = 50 -// VOREStation Add - Used by Kinetic Accelerator +// Used by Kinetic Accelerator /obj/effect/temp_visual/kinetic_blast name = "kinetic explosion" icon = 'icons/obj/projectiles.dmi' @@ -43,9 +43,8 @@ /obj/effect/temp_visual/explosion/fast icon_state = "explosionfast" duration = 4 -// VOREStation Add End -//VOREStation edit: medigun +// Medigun /obj/effect/temp_visual/heal name = "healing glow" icon_state = "heal" @@ -55,4 +54,3 @@ . = ..() pixel_x = rand(-12, 12) pixel_y = rand(-9, 0) -//VOREStation edit ends diff --git a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm index 75fce2c0d65..9a0960db485 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm @@ -80,11 +80,10 @@ light_power = 3 light_color = "#3300ff" -//VOREStation edit: medigun +// Medigun /obj/effect/projectile/impact/medigun icon = 'icons/obj/projectiles_vr.dmi' icon_state = "impact_medbeam" light_range = 2 light_power = 0.5 light_color = "#80F5FF" -//VOREStation edit ends diff --git a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm index 9671f025523..006d0c9b004 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm @@ -92,11 +92,10 @@ light_power = 3 light_color = "#3300ff" -//VOREStation edit: medigun +// Medigun /obj/effect/projectile/muzzle/medigun icon = 'icons/obj/projectiles_vr.dmi' icon_state = "muzzle_medbeam" light_range = 2 light_power = 0.5 light_color = "#80F5FF" -//VOREStation edit ends diff --git a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm index 68bba67d64c..b0001fe90b0 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm @@ -115,11 +115,10 @@ light_power = 3 light_color = "#3300ff" -//VOREStation edit: medigun +// Medigun /obj/effect/projectile/tracer/medigun icon = 'icons/obj/projectiles_vr.dmi' icon_state = "medbeam" light_range = 2 light_power = 0.5 light_color = "#80F5FF" -//VOREStation edit ends diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index e3d62310e4e..7cf7d6c4429 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -188,8 +188,6 @@ GLOBAL_LIST_EMPTY(PDAs) /obj/item/pda/syndicate default_cartridge = /obj/item/cartridge/syndicate icon_state = "pda-syn" -// name = "Military PDA" // Vorestation Edit -// owner = "John Doe" hidden = 1 /obj/item/pda/chaplain @@ -1474,7 +1472,7 @@ GLOBAL_LIST_EMPTY(PDAs) /obj/item/pda/Destroy() GLOB.PDAs -= src - if (src.id && prob(100)) //IDs are kept in 90% of the cases //VOREStation Edit - 100% of the cases + if (src.id && prob(100)) //IDs are kept in 100% of the cases //TODO: WHY? src.id.forceMove(get_turf(src.loc)) else QDEL_NULL(src.id) diff --git a/code/game/objects/items/devices/communicator/phone.dm b/code/game/objects/items/devices/communicator/phone.dm index 39dbc9ffc29..0d855fa7ac3 100644 --- a/code/game/objects/items/devices/communicator/phone.dm +++ b/code/game/objects/items/devices/communicator/phone.dm @@ -207,7 +207,7 @@ for(var/obj/item/communicator/comm in communicating) var/turf/T = get_turf(comm) if(!T) return - //VOREStation Edit Start for commlinks + // Commlinks var/list/mobs_to_relay if(istype(comm,/obj/item/communicator/commlink)) var/obj/item/communicator/commlink/CL = comm @@ -215,7 +215,6 @@ else var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display mobs_to_relay = in_range["mobs"] - //VOREStation Edit End for(var/mob/mob in mobs_to_relay) //We can't use visible_message(), or else we will get an infinite loop if two communicators hear each other. var/dst = get_dist(get_turf(mob),get_turf(comm)) @@ -236,7 +235,7 @@ var/turf/T = get_turf(comm) if(!T) return - //VOREStation Edit Start for commlinks + // Commlinks var/list/mobs_to_relay if(istype(comm,/obj/item/communicator/commlink)) var/obj/item/communicator/commlink/CL = comm @@ -244,7 +243,6 @@ else var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display mobs_to_relay = in_range["mobs"] - //VOREStation Edit End var/mob/living/L = (isliving(M) && M) || null var/message = text @@ -367,4 +365,3 @@ visible_message(.) update_icon() - diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 26d43a61319..d0aa68aefbb 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -168,20 +168,19 @@ playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1) var/flashfail = 0 - //VOREStation Add - NIF + // NIF if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.nif && H.nif.flag_check(NIF_V_FLASHPROT,NIF_FLAGS_VISION)) flashfail = 1 H.nif.notify("High intensity light detected, and blocked!",TRUE) - //VOREStation Add End - if(iscarbon(M) && !flashfail) //VOREStation Add - NIF + if(iscarbon(M) && !flashfail) var/mob/living/carbon/C = M if(C.stat != DEAD) var/safety = C.eyecheck() if(safety <= 0) - var/flash_strength = 10 //Vorestation edit, making flashes behave the same as flash rounds + var/flash_strength = 10 if(ishuman(C)) var/mob/living/carbon/human/H = C flash_strength *= H.species.flash_mod diff --git a/code/game/objects/items/devices/radio/jammer.dm b/code/game/objects/items/devices/radio/jammer.dm index f5b90875ac3..2b887c710aa 100644 --- a/code/game/objects/items/devices/radio/jammer.dm +++ b/code/game/objects/items/devices/radio/jammer.dm @@ -24,7 +24,7 @@ var/global/list/active_radio_jammers = list() var/on = 0 var/jam_range = 7 var/obj/item/cell/device/weapon/power_source - var/tick_cost = 5 //VOREStation Edit - For the ERPs. + var/tick_cost = 5 // For the ERPs. origin_tech = list(TECH_ILLEGAL = 7, TECH_BLUESPACE = 5) //Such technology! Subspace jamming! diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 495a5a8992e..a0b9660d140 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -1,6 +1,5 @@ // Access check is of the type requires one. These have been carefully selected to avoid allowing the janitor to see channels he shouldn't GLOBAL_LIST_INIT(default_internal_channels, list( -//VOREStation Edit Start - Updating this for Virgo num2text(PUB_FREQ) = list(), num2text(AI_FREQ) = list(access_synth), num2text(ENT_FREQ) = list(), @@ -576,8 +575,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( return -1 if(!(0 in level)) var/turf/position = get_turf(src) - if((!position || !(position.z in level)) && !bluespace_radio) //VOREStation Edit - return -1 + if((!position || !(position.z in level)) && !bluespace_radio) return -1 if(freq in ANTAG_FREQS) if(!(src.syndie))//Checks to see if it's allowed on that frequency, based on the encryption keys return -1 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 01c01469d4b..d13e100b3b7 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -85,13 +85,11 @@ HALOGEN COUNTER - Radcount on mobs dat += "\tKey: Suffocation/Toxin/Burns/Brute
" dat += "\tDamage Specifics: [OX] - [TX] - [BU] - [BR]
" dat += "Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)
" - //VOREStation edit/addition starts if(M.timeofdeath && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) dat += "Time of Death: [worldtime2stationtime(M.timeofdeath)]
" var/tdelta = round(world.time - M.timeofdeath) if(tdelta < (DEFIB_TIME_LIMIT * 10)) dat += "Subject died [DisplayTimeText(tdelta)] ago - resuscitation may be possible!
" - //VOREStation edit/addition ends if(istype(M, /mob/living/carbon/human) && mode == 1) var/mob/living/carbon/human/H = M var/list/damaged = H.get_damaged_organs(1,1) @@ -578,4 +576,4 @@ HALOGEN COUNTER - Radcount on mobs to_chat(user, "No radiation detected.") return -#undef DEFIB_TIME_LIMIT //VOREStation addition +#undef DEFIB_TIME_LIMIT diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 2513ea0d7a4..9e48405c541 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -195,7 +195,6 @@ user.visible_message("\The [user] places a bandaid over \a [W.desc] on [M]'s [affecting.name].", \ "You place a bandaid over \a [W.desc] on [M]'s [affecting.name]." ) W.bandage() - // W.disinfect() // VOREStation - Tech1 should not disinfect playsound(src, pick(apply_sounds), 25) used++ M.bitten = 0 @@ -255,7 +254,7 @@ singular_name = "advanced trauma kit" desc = "An advanced trauma kit for severe injuries." icon_state = "traumakit" - heal_brute = 7 //VOREStation Edit + heal_brute = 7 origin_tech = list(TECH_BIO = 1) apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg','sound/effects/tape.ogg') @@ -283,8 +282,6 @@ continue if (W.bandaged && W.disinfected) continue - //if(used == amount) //VOREStation Edit - // break //VOREStation Edit if(!do_mob(user, M, W.damage/5)) to_chat(user, "You must stand still to bandage wounds.") break @@ -304,8 +301,8 @@ W.disinfect() W.heal_damage(heal_brute) playsound(src, pick(apply_sounds), 25) - used = 1 //VOREStation Edit - update_icon() // VOREStation Edit - Support for stack icons + used = 1 + update_icon() // Support for stack icons affecting.update_damages() if(used == amount) if(affecting.is_bandaged()) @@ -319,7 +316,7 @@ singular_name = "advanced burn kit" desc = "An advanced treatment kit for severe burns." icon_state = "burnkit" - heal_burn = 7 //VOREStation Edit + heal_burn = 7 origin_tech = list(TECH_BIO = 1) apply_sounds = list('sound/effects/ointment.ogg') @@ -352,7 +349,7 @@ use(1) affecting.salve() playsound(src, pick(apply_sounds), 25) - update_icon() // VOREStation Edit - Support for stack icons + update_icon() // Support for stack icons /obj/item/stack/medical/splint name = "medical splints" diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index c322e5a4a70..9b3981a57d9 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -32,7 +32,6 @@ if (istype(M,/mob/living/carbon/human)) //Repairing robolimbs var/mob/living/carbon/human/H = M var/obj/item/organ/external/S = H.get_organ(user.zone_sel.selecting) - //VOREStation Edit Start if (S && (S.robotic >= ORGAN_ROBOT)) if(!S.get_damage()) to_chat(user, "Nothing to fix here.") @@ -47,7 +46,6 @@ use(1) user.visible_message("\The [user] applies some nanite paste on [user != M ? "[M]'s [S.name]" : "[S]"] with [src].",\ "You apply some nanite paste on [user == M ? "your" : "[M]'s"] [S.name].") - //VOREStation Edit End /obj/item/stack/nanopaste/advanced name = "advanced nanopaste" diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 06d6cdd4f2d..8c192c4915e 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -74,7 +74,7 @@ /obj/item/duct_tape_roll, /obj/item/switchtool, /obj/item/integrated_electronics/wirer, - /obj/item/integrated_electronics/debugger, //Vorestation edit adding debugger to toolbelt can hold list + /obj/item/integrated_electronics/debugger, ) /obj/item/storage/belt/utility/full @@ -125,7 +125,7 @@ /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/pill, /obj/item/reagent_containers/syringe, - /obj/item/storage/quickdraw/syringe_case, //VOREStation Addition - Adds syringe cases, + /obj/item/storage/quickdraw/syringe_case, /obj/item/flame/lighter/zippo, /obj/item/storage/fancy/cigarettes, /obj/item/storage/pill_bottle, diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index 739dc0cc7c1..a47354784d9 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -15,7 +15,7 @@ /obj/item/storage/briefcase/clutch name = "clutch purse" desc = "A fashionable handheld bag typically used by women." - icon = 'icons/obj/clothing/backpack.dmi' //VOREStation Edit - Wrong sprite location + icon = 'icons/obj/clothing/backpack.dmi' icon_state = "clutch" item_state_slots = list(slot_r_hand_str = "smpurse", slot_l_hand_str = "smpurse") force = 0 diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 631da4960e3..598745fd583 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -16,22 +16,17 @@ throw_range = 8 slot_flags = SLOT_BELT max_storage_space = ITEMSIZE_COST_SMALL * 7 // 14 -// var/list/icon_variety // VOREStation edit drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' /obj/item/storage/firstaid/Initialize(mapload) . = ..() -// if(icon_variety) // VOREStation edit -// icon_state = pick(icon_variety) -// icon_variety = null /obj/item/storage/firstaid/fire name = "fire first aid kit" desc = "It's an emergency medical kit for when the toxins lab spontaneously burns down." icon_state = "ointment" item_state_slots = list(slot_r_hand_str = "firstaid-ointment", slot_l_hand_str = "firstaid-ointment") -// icon_variety = list("ointment","firefirstaid") // VOREStation edit starts_with = list( /obj/item/healthanalyzer, /obj/item/reagent_containers/hypospray/autoinjector, @@ -59,7 +54,6 @@ desc = "Used to treat when one has a high amount of toxins in their body." icon_state = "antitoxin" item_state_slots = list(slot_r_hand_str = "firstaid-toxin", slot_l_hand_str = "firstaid-toxin") -// icon_variety = list("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") // VOREStation edit starts_with = list( /obj/item/reagent_containers/syringe/antitoxin, /obj/item/reagent_containers/syringe/antitoxin, @@ -124,7 +118,7 @@ icon_state = "surgerykit" item_state = "firstaid-surgery" max_w_class = ITEMSIZE_NORMAL - max_storage_space = 25 //update this when necessary! + max_storage_space = 25 //update this when necessary! can_hold = list( /obj/item/surgical, @@ -145,7 +139,6 @@ /obj/item/surgical/bonegel, /obj/item/surgical/FixOVein, /obj/item/stack/medical/advanced/bruise_pack, - ///obj/item/healthanalyzer/advanced, /obj/item/autopsy_scanner ) @@ -183,11 +176,11 @@ max_w_class = ITEMSIZE_TINY var/label_text = "" - var/labeled = 0 // Citadel Change - Used in labeling + var/labeled = 0 var/base_name = " " var/base_desc = " " - var/base_icon = "pill_canister" // Citadel Change - Used in recoloring - var/bottle_color = "orange" // Citadel Change - Used in recoloring + var/base_icon = "pill_canister" + var/bottle_color = "orange" /obj/item/storage/pill_bottle/Initialize(mapload) . = ..() @@ -208,8 +201,8 @@ to_chat(user, "You set the label to \"[tmp_label]\".") label_text = tmp_label update_name_label() - labeled = 1 // Citadel Change - Overlay for labels - update_icon() // Citadel Change - Overlay for labels + labeled = 1 + update_icon() else ..() @@ -225,7 +218,7 @@ name = "[base_name] ([label_text])" desc = "[base_desc] It is labeled \"[label_text]\"." -/obj/item/storage/pill_bottle/proc/choose_color() // BEGIN Citadel Changes - Bottle recoloring +/obj/item/storage/pill_bottle/proc/choose_color() set name = "Recolor bottle" set category = "Object" set desc = "Click to choose a color for the pill bottle." @@ -262,87 +255,87 @@ . = ..() if(base_icon == "pill_canister") verbs += /obj/item/storage/pill_bottle/proc/choose_color - update_icon() // END Citadel Changes - Bottle recoloring + update_icon() /obj/item/storage/pill_bottle/antitox name = "bottle of Dylovene pills" desc = "Contains pills used to counter toxins." - labeled = 1 // Citadel Change - Recoloring - There are a lot of these. - bottle_color = "green" // Citadel Change - Recoloring - There are a lot of these. + labeled = 1 + bottle_color = "green" starts_with = list(/obj/item/reagent_containers/pill/antitox = 7) /obj/item/storage/pill_bottle/bicaridine name = "bottle of Bicaridine pills" desc = "Contains pills used to stabilize the severely injured." - labeled = 1 // Citadel Change - Recoloring - There are a lot of these. - bottle_color = "red" // Citadel Change - Recoloring - There are a lot of these. + labeled = 1 + bottle_color = "red" starts_with = list(/obj/item/reagent_containers/pill/bicaridine = 7) /obj/item/storage/pill_bottle/dexalin_plus name = "bottle of Dexalin Plus pills" desc = "Contains pills used to treat extreme cases of oxygen deprivation." - labeled = 1 // Citadel Change - Recoloring - There are a lot of these. - bottle_color = "blue" // Citadel Change - Recoloring - There are a lot of these. + labeled = 1 + bottle_color = "blue" starts_with = list(/obj/item/reagent_containers/pill/dexalin_plus = 7) /obj/item/storage/pill_bottle/dermaline name = "bottle of Dermaline pills" desc = "Contains pills used to treat burn wounds." - labeled = 1 // Citadel Change - Recoloring - There are a lot of these. + labeled = 1 starts_with = list(/obj/item/reagent_containers/pill/dermaline = 7) /obj/item/storage/pill_bottle/dylovene name = "bottle of Dylovene pills" desc = "Contains pills used to treat toxic substances in the blood." - labeled = 1 // Citadel Change - Recoloring - There are a lot of these. - bottle_color = "green" // Citadel Change - Recoloring - There are a lot of these. + labeled = 1 + bottle_color = "green" starts_with = list(/obj/item/reagent_containers/pill/dylovene = 7) /obj/item/storage/pill_bottle/inaprovaline name = "bottle of Inaprovaline pills" desc = "Contains pills used to stabilize patients." - labeled = 1 // Citadel Change - Recoloring - There are a lot of these. - bottle_color = "blue" // Citadel Change - Recoloring - There are a lot of these. + labeled = 1 + bottle_color = "blue" starts_with = list(/obj/item/reagent_containers/pill/inaprovaline = 7) /obj/item/storage/pill_bottle/kelotane name = "bottle of kelotane pills" desc = "Contains pills used to treat burns." - labeled = 1 // Citadel Change - Recoloring - There are a lot of these. + labeled = 1 starts_with = list(/obj/item/reagent_containers/pill/kelotane = 7) /obj/item/storage/pill_bottle/spaceacillin name = "bottle of Spaceacillin pills" desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space." - labeled = 1 // Citadel Change - Recoloring - There are a lot of these. - bottle_color = "white" // Citadel Change - Recoloring - There are a lot of these. + labeled = 1 + bottle_color = "white" starts_with = list(/obj/item/reagent_containers/pill/spaceacillin = 7) /obj/item/storage/pill_bottle/tramadol name = "bottle of Tramadol pills" desc = "Contains pills used to relieve pain." - labeled = 1 // Citadel Change - Recoloring - There are a lot of these. - bottle_color = "purple" // Citadel Change - Recoloring - There are a lot of these. + labeled = 1 + bottle_color = "purple" starts_with = list(/obj/item/reagent_containers/pill/tramadol = 7) /obj/item/storage/pill_bottle/citalopram name = "bottle of Citalopram pills" desc = "Contains pills used to stabilize a patient's mood." - labeled = 1 // Citadel Change - Recoloring - There are a lot of these. + labeled = 1 starts_with = list(/obj/item/reagent_containers/pill/citalopram = 7) /obj/item/storage/pill_bottle/carbon name = "bottle of Carbon pills" desc = "Contains pills used to neutralise chemicals in the stomach." - labeled = 1 // Citadel Change - Recoloring - There are a lot of these. - bottle_color = "black" // Citadel Change - Recoloring - There are a lot of these. + labeled = 1 + bottle_color = "black" starts_with = list(/obj/item/reagent_containers/pill/carbon = 7) /obj/item/storage/pill_bottle/iron name = "bottle of Iron pills" desc = "Contains pills used to aid in blood regeneration." - labeled = 1 // Citadel Change - Recoloring - There are a lot of these. - bottle_color = "black" // Citadel Change - Recoloring - There are a lot of these. + labeled = 1 + bottle_color = "black" starts_with = list(/obj/item/reagent_containers/pill/iron = 7) /obj/item/storage/firstaid/clotting diff --git a/code/game/objects/items/storage/internal.dm b/code/game/objects/items/storage/internal.dm index 4a5847a0822..f4133b8f93d 100644 --- a/code/game/objects/items/storage/internal.dm +++ b/code/game/objects/items/storage/internal.dm @@ -7,7 +7,6 @@ /obj/item/storage/internal/Initialize(mapload) . = ..() master_item = loc - //name = master_item.name //VOREStation Removal verbs -= /obj/item/verb/verb_pickup //make sure this is never picked up. /obj/item/storage/internal/Destroy() diff --git a/code/game/objects/items/storage/quickdraw.dm b/code/game/objects/items/storage/quickdraw.dm index 1674e339b3c..8ac50684949 100644 --- a/code/game/objects/items/storage/quickdraw.dm +++ b/code/game/objects/items/storage/quickdraw.dm @@ -7,7 +7,7 @@ /obj/item/storage/quickdraw name = "quickdraw" desc = "This object should not appear" - icon = 'icons/obj/storage.dmi' // VOREStation Edit + icon = 'icons/obj/storage.dmi' //Quickmode //When set to 0, this storage will operate as a regular storage, and clicking on it while equipped will open it as a storage diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 3536ce405f5..6be40a271b6 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -213,7 +213,7 @@ rcd_beam = beam_origin.Beam(A, icon_state = "rped_upgrade", time = max(true_delay, 5)) busy = TRUE - perform_effect(A, true_delay) //VOREStation Add + perform_effect(A, true_delay) if(do_after(user, true_delay, target = A)) busy = FALSE // Doing another check in case we lost matter during the delay for whatever reason. diff --git a/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm b/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm index 391e4a24e5e..d1927eb1c48 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm @@ -2,8 +2,6 @@ #error T_BOARD macro is not defined but we need it! #endif -// VOREStation specific circuit boards! - // Board for the parts lathe in partslathe.dm /obj/item/circuitboard/partslathe name = T_BOARD("parts lathe") diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm index 1c807a3ea12..9a20b500895 100755 --- a/code/game/objects/items/weapons/id cards/cards.dm +++ b/code/game/objects/items/weapons/id cards/cards.dm @@ -110,12 +110,11 @@ uses -= used_uses W.add_fingerprint(user) - //Vorestation Edit: Because some things (read lift doors) don't get emagged + // Because some things (read lift doors) don't get emagged if(used_uses) log_and_message_admins("emagged \an [W].") else log_and_message_admins("attempted to emag \an [W].") - // Vorestation Edit: End of Edit log_and_message_admins("emagged \an [W].") if(uses<1) diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 1e57d53b1c7..e80196522f7 100755 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -386,8 +386,8 @@ job_access_type = /datum/job/station/qm /obj/item/card/id/assistant - assignment = USELESS_JOB //VOREStation Edit - Visitor not Assistant - rank = USELESS_JOB //VOREStation Edit - Visitor not Assistant + assignment = USELESS_JOB + rank = USELESS_JOB job_access_type = /datum/job/station/assistant /obj/item/card/id/civilian diff --git a/code/game/objects/items/weapons/id_cards/cards.dm b/code/game/objects/items/weapons/id_cards/cards.dm index eaaffcdd128..43ed0268b4e 100644 --- a/code/game/objects/items/weapons/id_cards/cards.dm +++ b/code/game/objects/items/weapons/id_cards/cards.dm @@ -110,12 +110,11 @@ uses -= used_uses W.add_fingerprint(user) - //Vorestation Edit: Because some things (read lift doors) don't get emagged + //V Because some things (read lift doors) don't get emagged if(used_uses) log_and_message_admins("emagged \an [W].") else log_and_message_admins("attempted to emag \an [W].") - // Vorestation Edit: End of Edit log_and_message_admins("emagged \an [W].") if(uses<1) diff --git a/code/game/objects/items/weapons/id_cards/station_ids.dm b/code/game/objects/items/weapons/id_cards/station_ids.dm index 3782ae67185..6b3bae86572 100644 --- a/code/game/objects/items/weapons/id_cards/station_ids.dm +++ b/code/game/objects/items/weapons/id_cards/station_ids.dm @@ -386,8 +386,8 @@ job_access_type = /datum/job/station/quartermaster /obj/item/card/id/assistant - assignment = USELESS_JOB //VOREStation Edit - Visitor not Assistant - rank = USELESS_JOB //VOREStation Edit - Visitor not Assistant + assignment = USELESS_JOB + rank = USELESS_JOB job_access_type = /datum/job/station/assistant /obj/item/card/id/civilian diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 6b67e0cd4df..c522f074d38 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -615,12 +615,12 @@ the implant may become unstable and either pre-maturely inject the subject or si return 0 //! ## VR FILE MERGE ## !// -/obj/item/implant/vrlanguage +/obj/item/implant/uni_translator name = "language" desc = "Allows the user to understand and speak almost all known languages.." var/uses = 1 -/obj/item/implant/vrlanguage/get_data() +/obj/item/implant/uni_translator/get_data() var/dat = {" Implant Specifications:
Name: Language Implant
@@ -633,7 +633,7 @@ the implant may become unstable and either pre-maturely inject the subject or si Integrity: Implant can only be used once before the nanobots are depleted."} return dat -/obj/item/implant/vrlanguage/trigger(emote, mob/source as mob) +/obj/item/implant/uni_translator/trigger(emote, mob/source as mob) if (src.uses < 1) return 0 if (emote == "smile") @@ -653,7 +653,7 @@ the implant may become unstable and either pre-maturely inject the subject or si source.add_language(LANGUAGE_SLAVIC) source.add_language(LANGUAGE_SOL_COMMON) //In case they're giving a xenomorph an implant or something. -/obj/item/implant/vrlanguage/post_implant(mob/source) +/obj/item/implant/uni_translator/post_implant(mob/source) source.mind.store_memory("A implant can be activated by using the smile emote, say *smile to attempt to activate.", 0, 0) to_chat(source,"The implanted language implant can be activated by using the smile emote, say *smile to attempt to activate.") return 1 diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index de2d30f7cf8..710a35a58a1 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -257,7 +257,7 @@ icon_state = "implantcase-r" /obj/item/implantcase/vrlanguage/Initialize(mapload) - imp = new /obj/item/implant/vrlanguage( src ) + imp = new /obj/item/implant/uni_translator( src ) return ..() /obj/item/implantcase/restrainingbolt diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 9ee8d2a8add..01631ee759b 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -141,14 +141,13 @@ A.loc.contents.Remove(A) update() -//Vorestation universal translator implant. - -/obj/item/implanter/vrlanguage +/// Universal translator implant. +/obj/item/implanter/uni_translator name = "implanter-language" -/obj/item/implanter/vrlanguage/Initialize(mapload) +/obj/item/implanter/uni_translator/Initialize(mapload) . = ..() - imp = new /obj/item/implant/vrlanguage( src ) + imp = new /obj/item/implant/uni_translator( src ) update() /obj/item/implanter/restrainingbolt diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 27d2baefb10..bf4414764ab 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -162,8 +162,7 @@ attack_verb = list("slashed", "chopped", "gouged", "ripped", "cut") can_cleave = TRUE //Now hatchets inherit from the machete, and thus knives. Tables turned. slot_flags = SLOT_BELT | SLOT_HOLSTER - default_material = "plasteel" //VOREStation Edit - + default_material = "plasteel" /obj/item/material/knife/machete/armblade name = "arm-mounted blade" desc = "A long, machete-like blade, mounted to your arm. The size and location of it lends itself to parrying blows in melee." @@ -207,15 +206,14 @@ icon_state = "survivalknife" item_state = "knife" applies_material_colour = FALSE - default_material = "plasteel" //VOREStation Edit + default_material = "plasteel" toolspeed = 2 // Use a real axe if you want to chop logs. /obj/item/material/knife/tacknife/survival/bone name = "primitive survival knife" desc = "A hunting grade survival knife with a sleek leather grip." applies_material_colour =TRUE - default_material = "bone" //VOREStation Edit - + default_material = "bone" /obj/item/material/knife/machete/deluxe name = "deluxe machete" desc = "A fine example of a machete, with a polished blade, wooden handle and a leather cord loop." @@ -231,7 +229,7 @@ icon_state = "dataknife" item_state = "knife" applies_material_colour = FALSE - default_material = "plasteel" //VOREStation Edit + default_material = "plasteel" toolspeed = 2 // Use a real axe if you want to chop logs. var/gps_tag = "DAT&#%F0" var/emped = FALSE diff --git a/code/game/objects/items/weapons/paiwire.dm b/code/game/objects/items/weapons/paiwire.dm index a80e5b1fbe2..45dc27f7f62 100644 --- a/code/game/objects/items/weapons/paiwire.dm +++ b/code/game/objects/items/weapons/paiwire.dm @@ -1,12 +1,11 @@ /obj/item/pai_cable/proc/plugin(obj/machinery/M as obj, mob/user as mob) if(istype(M, /obj/machinery/door) || istype(M, /obj/machinery/camera)) - //VOREStation Add - Can't hack secured_wires doors (vault, etc) + // Can't hack secured_wires doors (vault, etc) if(istype(M, /obj/machinery/door/airlock)) var/obj/machinery/door/airlock/A = M if(A.secured_wires) to_chat(user,"\The [M] doesn't have any acessible data ports for \the [src]!") return - //VOREStation Add End user.visible_message("[user] inserts [src] into a data port on [M].", "You insert [src] into a data port on [M].", "You hear the satisfying click of a wire jack fastening into place.") playsound(user, 'sound/machines/click.ogg', 50, 1) user.drop_item() diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index 80602ccecd8..084d39a3d5e 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -309,7 +309,8 @@ var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES] if(!E) return - if(H.nif && H.nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) return //VOREStation Add - NIF + if(H.nif && H.nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) + return switch(safety) if(1) to_chat(usr, "Your eyes sting a little.") diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 4d5cf1a0b46..ab88c942334 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -49,7 +49,7 @@ /obj/structure/closet/proc/take_contents() // if(istype(loc, /mob/living)) - // return //VOREStation Edit - No collecting mob organs if spawned inside mob + // return // No collecting mob organs if spawned inside mob // I'll leave this out, if someone dies to this from voring someone who made a closet go yell at a coder to // fix the fact you can build closets inside living people, not try to make it work you numbskulls. var/obj/item/I @@ -64,8 +64,8 @@ storage_capacity = content_size + 5 /** - * The proc that fills the closet with its initial contents. - */ + * The proc that fills the closet with its initial contents. + */ /obj/structure/closet/proc/PopulateContents() return diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm index ffa96e5d829..395fa61c505 100644 --- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm +++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm @@ -35,7 +35,6 @@ starts_with = list( /obj/item/clothing/suit/bio_suit/security, /obj/item/clothing/head/bio_hood/security) - ///obj/item/gun/energy/taser/xeno/sec) //VOREStation Removal /obj/structure/closet/l3closet/janitor icon_state = "bio_janitor" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 32b97e07ef1..36db166436b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -34,10 +34,11 @@ /obj/item/clothing/shoes/boots/winter/engineering, /obj/item/tank/emergency/oxygen/engi, /obj/item/gps/engineering/ce, - /obj/item/reagent_containers/spray/windowsealant,//VOREStation Add - /obj/item/pipe_dispenser, //Citadel Addition + /obj/item/reagent_containers/spray/windowsealant, + /obj/item/pipe_dispenser, /obj/item/shield_diffuser, - /obj/item/switchtool/holo/CE) //Citadel Addition + /obj/item/switchtool/holo/CE, + ) /obj/structure/closet/secure_closet/engineering_chief/Initialize(mapload) if(prob(50)) @@ -109,8 +110,9 @@ /obj/item/clothing/shoes/boots/winter/engineering, /obj/item/tank/emergency/oxygen/engi, /obj/item/gps/engineering, - /obj/item/reagent_containers/spray/windowsealant, //VOREStation Add - /obj/item/shield_diffuser) //Citadel Addition + /obj/item/reagent_containers/spray/windowsealant, + /obj/item/shield_diffuser, + ) /obj/structure/closet/secure_closet/engineering_personal/Initialize(mapload) if(prob(50)) @@ -138,7 +140,6 @@ /obj/item/clothing/head/hardhat/red, /obj/item/flashlight, /obj/item/extinguisher, - ///obj/item/clamp, //VOREStation Removal: without leaks those are pointless, /obj/item/radio/headset/headset_eng, /obj/item/radio/headset/headset_eng/alt, /obj/item/clothing/suit/storage/hazardvest, @@ -150,7 +151,8 @@ /obj/item/tank/emergency/oxygen/engi, /obj/item/gps/engineering/atmos, /obj/item/pipe_dispenser, - /obj/item/shield_diffuser) //Citadel Addition + /obj/item/shield_diffuser, + ) /obj/structure/closet/secure_closet/atmos_personal/Initialize(mapload) if(prob(50)) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm b/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm index 995af97f120..e5bf443a746 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm @@ -37,55 +37,8 @@ starts_with += /obj/item/storage/backpack else starts_with += /obj/item/storage/backpack/satchel/norm - /* VOREStation Removal - Always give both - if(prob(75)) - starts_with += /obj/item/material/knife/tacknife/survival - else - starts_with += /obj/item/material/knife/machete - */ //VOREStation Removal End return ..() -//SAR Lockers -/*This one is actually not the right one. -/obj/structure/closet/secure_closet/sar - name = "search and rescue locker" - desc = "Supplies for a wilderness first responder." - icon_state = "medical1" - icon_closed = "medical" - icon_locked = "medical1" - icon_opened = "medicalopen" - icon_broken = "medicalbroken" - icon_off = "medicaloff" - req_access = list(access_medical_equip) - - starts_with = list( - /obj/item/storage/backpack/dufflebag/emt, - /obj/item/storage/box/autoinjectors, - /obj/item/storage/box/syringes, - /obj/item/reagent_containers/glass/bottle/inaprovaline, - /obj/item/reagent_containers/glass/bottle/antitoxin, - /obj/item/storage/belt/medical/emt, - /obj/item/clothing/mask/gas, - /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar, - /obj/item/clothing/shoes/boots/winter/explorer, - /obj/item/radio/headset/sar, - /obj/item/cartridge/medical, - /obj/item/flashlight, - /obj/item/tank/emergency/oxygen/engi, - /obj/item/clothing/glasses/hud/health, - /obj/item/healthanalyzer, - /obj/item/radio/off, - /obj/random/medical, - /obj/item/tool/crowbar, - /obj/item/extinguisher/mini, - /obj/item/storage/box/freezer, - /obj/item/clothing/accessory/storage/white_vest, - /obj/item/barrier_tape_roll/medical, - /obj/item/gps/medical, - /obj/item/geiger, - /obj/item/bodybag/cryobag) -*/ - //SC Misc_vr locker. /obj/structure/closet/secure_closet/sar name = "field medic locker" @@ -126,28 +79,9 @@ /obj/item/cataloguer/compact) //Pilot Locker - /obj/structure/closet/secure_closet/pilot name = "pilot locker" req_access = list(access_pilot) -/* - starts_with = list( - /obj/item/storage/backpack/parachute, - /obj/item/material/knife/tacknife/survival, - /obj/item/clothing/head/pilot, - /obj/item/clothing/under/rank/pilot1, - /obj/item/clothing/suit/storage/toggle/bomber/pilot, - /obj/item/clothing/mask/gas/half, - /obj/item/clothing/shoes/black, - /obj/item/clothing/gloves/fingerless, - /obj/item/radio/headset/pilot/alt, - /obj/item/flashlight, - /obj/item/reagent_containers/food/snacks/liquidfood, - /obj/item/reagent_containers/food/drinks/cans/waterbottle, - /obj/item/storage/box/flare, - /obj/item/cell/device, - /obj/item/radio) -*/ /obj/structure/closet/secure_closet/pilot starts_with = list( diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 23d5b6adb1b..364d9207e72 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -179,7 +179,7 @@ /obj/item/clothing/head/bio_hood/cmo, /obj/item/gps/medical/cmo, /obj/item/clothing/shoes/white, - /obj/item/reagent_containers/glass/beaker/vial, //VOREStation Add + /obj/item/reagent_containers/glass/beaker/vial, /obj/item/clothing/under/rank/chief_medical_officer/turtleneck) /obj/structure/closet/secure_closet/CMO/Initialize(mapload) @@ -236,7 +236,7 @@ /obj/item/reagent_containers/dropper = 2, /obj/item/reagent_containers/glass/bottle/inaprovaline = 2, /obj/item/reagent_containers/glass/bottle/antitoxin = 2, - /obj/item/storage/fancy/vials) //VOREStation Add + /obj/item/storage/fancy/vials) /obj/structure/closet/secure_closet/psych diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 52b5688f672..e3a3c9929ab 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -59,6 +59,6 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/science, /obj/item/clothing/shoes/boots/winter/science, /obj/item/gps/science/rd, - /obj/item/bluespace_harpoon, //VOREStation Add + /obj/item/bluespace_harpoon, /obj/item/clothing/suit/storage/toggle/labcoat/rd, /obj/item/clothing/under/rank/research_director/turtleneck) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 96efdd3118a..a2ea03daffd 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -289,7 +289,6 @@ /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/head/soft/sec/corp, /obj/item/clothing/under/rank/security/corp, - ///obj/item/ammo_magazine/m45/rubber, //VOREStation Removal, /obj/item/gun/energy/taser, /obj/item/cell/device/weapon, /obj/item/gps/security, @@ -347,7 +346,6 @@ /obj/item/ammo_magazine/s45/rubber, /obj/item/ammo_magazine/s45/rubber, /obj/item/reagent_containers/spray/pepper, - ///obj/item/gunbox, //VOREStation Removal, /obj/item/storage/belt/detective, /obj/item/storage/box/evidence, /obj/item/radio/headset/headset_sec, diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 16eef038072..c054ea2ece7 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -141,7 +141,7 @@ if(prob(40)) starts_with += /obj/item/clothing/head/hardhat if(prob(30)) - starts_with += /obj/item/reagent_containers/spray/windowsealant //VOREStation Add + starts_with += /obj/item/reagent_containers/spray/windowsealant return ..() /* diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index b0e75483cfc..3e02b785c04 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -3,7 +3,7 @@ /obj/structure/closet/crate name = "crate" desc = "A rectangular steel crate." - icon = 'icons/obj/storage.dmi' //VOREStation edit + icon = 'icons/obj/storage.dmi' icon_state = "crate" icon_opened = "crateopen" icon_closed = "crate" @@ -338,9 +338,9 @@ /obj/structure/closet/crate/solar name = "solar pack crate" - icon_state = "engi_crate" //VOREStation Edit - icon_opened = "engi_crateopen" //VOREStation Edit - icon_closed = "engi_crate" //VOREStation Edit + icon_state = "engi_crate" + icon_opened = "engi_crateopen" + icon_closed = "engi_crate" starts_with = list( /obj/item/solar_assembly = 21, @@ -400,7 +400,7 @@ /obj/structure/closet/crate/bin name = "large bin" desc = "A large bin." - icon = 'icons/obj/storage.dmi' //VOREStation edit + icon = 'icons/obj/storage.dmi' icon_state = "largebin" icon_opened = "largebinopen" icon_closed = "largebin" @@ -482,7 +482,7 @@ /obj/structure/closet/crate/secure/bin name = "secure bin" desc = "A secure bin." - icon = 'icons/obj/storage.dmi' //VOREStation edit + icon = 'icons/obj/storage.dmi' icon_state = "largebins" icon_opened = "largebinsopen" icon_closed = "largebins" @@ -495,7 +495,7 @@ /obj/structure/closet/crate/large name = "large crate" desc = "A hefty metal crate." - icon = 'icons/obj/storage.dmi' //VOREStation Edit + icon = 'icons/obj/storage.dmi' icon_state = "largemetal" icon_opened = "largemetalopen" icon_closed = "largemetal" @@ -523,10 +523,10 @@ /obj/structure/closet/crate/secure/large name = "large crate" desc = "A hefty metal crate with an electronic locking system." - icon = 'icons/obj/storage.dmi' //VOREStation Edit - icon_state = "largemetalsecure" //VOREStation Edit - icon_opened = "largemetalsecureopen" //VOREStation Edit - icon_closed = "largemetalsecure" //VOREStation Edit + icon = 'icons/obj/storage.dmi' + icon_state = "largemetalsecure" + icon_opened = "largemetalsecureopen" + icon_closed = "largemetalsecure" redlight = "largemetalr" greenlight = "largemetalg" diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index aa20d3144a7..6b9bd6afd5b 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -82,11 +82,11 @@ starts_with = list(/obj/structure/vehiclecage/quadtrailer) /obj/structure/largecrate/animal - icon_state = "lisacrate" //VOREStation Edit + icon_state = "lisacrate" /obj/structure/largecrate/animal/mulebot name = "Mulebot crate" - icon_state = "mulecrate" //VOREStation Edit + icon_state = "mulecrate" starts_with = list(/mob/living/bot/mulebot) /obj/structure/largecrate/animal/corgi @@ -193,50 +193,8 @@ /mob/living/simple_mob/animal/space/alien/drone, /mob/living/simple_mob/animal/space/alien/sentinel, /mob/living/simple_mob/animal/space/alien/queen, -// /mob/living/simple_mob/otie/feral, -// /mob/living/simple_mob/otie/red, /mob/living/simple_mob/vore/aggressive/corrupthound)) return ..() -/* -/obj/structure/largecrate/animal/guardbeast - name = "VARMAcorp autoNOMous security solution" - desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs." - icon = 'icons/obj/storage_vr.dmi' - icon_state = "sotiecrate" - starts_with = list(/mob/living/simple_mob/otie/security) - -/obj/structure/largecrate/animal/guardmutant - name = "VARMAcorp autoNOMous security solution for hostile environments." - desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs. This one can survive hostile atmosphere." - icon = 'icons/obj/storage_vr.dmi' - icon_state = "sotiecrate" - starts_with = list(/mob/living/simple_mob/otie/security/phoron) - -/obj/structure/largecrate/animal/otie - name = "VARMAcorp adoptable reject (Dangerous!)" - desc = "A warning on the side says the creature inside was returned to the supplier after injuring or devouring several unlucky members of the previous adoption family. It was given a second chance with the next customer. Godspeed and good luck with your new pet!" - icon = 'icons/obj/storage_vr.dmi' - icon_state = "otiecrate2" - starts_with = list(/mob/living/simple_mob/otie/cotie) - var/taped = 1 - -/obj/structure/largecrate/animal/otie/phoron - name = "VARMAcorp adaptive beta subject (Experimental)" - desc = "VARMAcorp experimental hostile environment adaptive breeding development kit. WARNING, DO NOT RELEASE IN WILD!" - starts_with = list(/mob/living/simple_mob/otie/cotie/phoron) - -/obj/structure/largecrate/animal/otie/phoron/Initialize(mapload) - starts_with = list(pick(/mob/living/simple_mob/otie/cotie/phoron;2, - /mob/living/simple_mob/otie/red/friendly;0.5)) - return ..() - -/obj/structure/largecrate/animal/otie/attack_hand(mob/living/carbon/human/M as mob)//I just couldn't decide between the icons lmao - if(taped == 1) - playsound(src, 'sound/items/poster_ripped.ogg', 50, 1) - icon_state = "otiecrate" - taped = 0 - ..() -*/ //VORESTATION AI REMOVAL, Oties are still fucking broken. /obj/structure/largecrate/animal/wolfgirl name = "Wolfgirl Crate" diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 48b430e52ad..2b2e2a9fd1b 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -1,7 +1,7 @@ /obj/structure/grille name = "grille" desc = "A flimsy lattice of metal rods, with screws to secure it to the floor." - icon = 'icons/obj/structures_vr.dmi' // VOREStation Edit - New icons + icon = 'icons/obj/structures_vr.dmi' icon_state = "grille" density = 1 anchored = 1 diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 5ed619f1217..fd183cf7da9 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_BOILERPLATE(all_mopbuckets, /obj/structure/mopbucket) . += "[src] [icon2html(thing = src, target = user)] contains [reagents.total_volume] unit\s of water!" /obj/structure/mopbucket/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/mop) || istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on mopbuckets" + if(istype(I, /obj/item/mop) || istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/glass/rag)) // "Allows soap and rags to be used on mopbuckets" if(reagents.total_volume < 1) to_chat(user, "\The [src] is out of water!") else diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 5059a296508..609bfe38a84 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -241,9 +241,9 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium) else if (src.locked == 0) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) src.connected = new /obj/structure/m_tray/c_tray( src.loc ) - step(src.connected, dir) //Vorestation Edit + step(src.connected, dir) src.connected.layer = OBJ_LAYER - var/turf/T = get_step(src, dir) //Vorestation Edit + var/turf/T = get_step(src, dir) if (T.contents.Find(src.connected)) src.connected.connected = src src.icon_state = "crema0" diff --git a/code/game/objects/structures/props/blackbox.dm b/code/game/objects/structures/props/blackbox.dm index 92cfe8c0ce4..3da8cb98e17 100644 --- a/code/game/objects/structures/props/blackbox.dm +++ b/code/game/objects/structures/props/blackbox.dm @@ -130,7 +130,7 @@ A repeating ping, before silence.
End of second log. "} -//VOREStation additions below this line - Killian's wrecks + /obj/structure/prop/blackbox/mackerel_wreck catalogue_data = list(/datum/category_item/catalogue/information/blackbox/mackerel_wreck) diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 53c90dc1760..5e2d19ee0c3 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -3,8 +3,8 @@ anchored = 1 opacity = 0 density = 0 - plane = OBJ_PLANE //VOREStation Edit - layer = ABOVE_JUNK_LAYER //VOREStation Edit + plane = OBJ_PLANE + layer = ABOVE_JUNK_LAYER w_class = ITEMSIZE_NORMAL /obj/structure/sign/ex_act(severity) @@ -364,7 +364,6 @@ desc = "A direction sign, pointing out which way the Cargo department is." icon_state = "direction_crg" -// VOREStation Edit - New signs for us /obj/structure/sign/directions/command icon = 'icons/obj/decals_vr.dmi' name = "\improper Command department" @@ -376,7 +375,6 @@ name = "\improper Space Elevator" desc = "A direction sign, pointing out which way the Space Elevator is." icon_state = "direction_elv" -// VOREStation Edit End /obj/structure/sign/directions/cryo name = "\improper Cryogenic Storage" diff --git a/code/game/objects/structures/stasis_cage.dm b/code/game/objects/structures/stasis_cage.dm index 750f15d0971..e2e44675b09 100644 --- a/code/game/objects/structures/stasis_cage.dm +++ b/code/game/objects/structures/stasis_cage.dm @@ -1,7 +1,7 @@ /obj/structure/stasis_cage name = "stasis cage" desc = "A high-tech animal cage, designed to keep contained fauna docile and safe." - icon = 'icons/obj/storage.dmi' //VOREStation Edit + icon = 'icons/obj/storage.dmi' icon_state = "critteropen" density = 1 diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 829b1b76ce5..7ba3e8c182c 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -46,9 +46,8 @@ // Base icon. var/cache_key = "[base_icon]-[material.name]" if(isnull(stool_cache[cache_key])) - var/image/I = image(icon, base_icon) //VOREStation Edit - //var/image/I = image('icons/obj/furniture.dmi', base_icon) //From Polaris Sync. Not sure if this is a better way of doing it or not. Uncomment if so. - if(applies_material_colour) //VOREStation Add - Goes with added var + var/image/I = image(icon, base_icon) + if(applies_material_colour) I.color = material.icon_colour stool_cache[cache_key] = I overlays |= stool_cache[cache_key] diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 91107363071..c166adbbe68 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -1,7 +1,7 @@ -/obj/structure/bed/chair //YES, chairs are a type of bed, which are a type of stool. This works, believe me. -Pete +/obj/structure/bed/chair //YES, chairs are a type of bed, which are a type of stool. This works, believe me. -Pete //TODO: Not this. name = "chair" desc = "You sit in this. Either by will or force." - icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - Using Eris furniture + icon = 'icons/obj/furniture_vr.dmi' // Using Eris furniture //TODO: Ew how about not. icon_state = "chair_preview" color = "#666666" base_icon = "chair" diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 0e903e4d040..aac815ea90b 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -4,7 +4,7 @@ var/global/list/stool_cache = list() //haha stool /obj/item/stool name = "stool" desc = "Apply butt." - icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - new Icons + icon = 'icons/obj/furniture_vr.dmi' icon_state = "stool_preview" //set for the map force = 10 throwforce = 10 diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 0fb050d7920..21f2358254c 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -1,7 +1,7 @@ /obj/structure/window name = "window" desc = "A window." - icon = 'icons/obj/structures_vr.dmi' // VOREStation Edit - New icons + icon = 'icons/obj/structures_vr.dmi' density = 1 CanAtmosPass = ATMOS_PASS_PROC w_class = ITEMSIZE_NORMAL @@ -11,8 +11,8 @@ anchored = 1.0 flags = ON_BORDER var/maxhealth = 14.0 - var/maximal_heat = T0C + 100 // Maximal heat before this window begins taking damage from fire - var/damage_per_fire_tick = 2.0 // Amount of damage per fire tick. Regular windows are not fireproof so they might as well break quickly. + var/maximal_heat = T0C + 100 // Maximal heat before this window begins taking damage from fire + var/damage_per_fire_tick = 2.0 // Amount of damage per fire tick. Regular windows are not fireproof so they might as well break quickly. var/health var/force_threshold = 0 var/ini_dir = null diff --git a/code/game/sound.dm b/code/game/sound.dm index 74c54b14823..c26df469ffd 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -239,7 +239,9 @@ GLOBAL_VAR_INIT(sound_distance_offscreen, 7) soundin = pick('sound/weapons/hf_machete/hfmachete_throw01.ogg', 'sound/weapons/hf_machete/hfmachete_throw02.ogg', 'sound/weapons/hf_machete/hfmachete_throw03.ogg') if ("machete_throw_hit_sound") soundin = pick('sound/weapons/hf_machete/hfmachete_throw_hit01.ogg', 'sound/weapons/hf_machete/hfmachete_throw_hit02.ogg', 'sound/weapons/hf_machete/hfmachete_throw_hit03.ogg') - //VORESTATION EDIT - vore sounds for better performance + + +//! ## VORE SOUNDS if ("hunger_sounds") soundin = pick('sound/vore/growl1.ogg','sound/vore/growl2.ogg','sound/vore/growl3.ogg','sound/vore/growl4.ogg','sound/vore/growl5.ogg') if("classic_digestion_sounds") soundin = pick( @@ -283,7 +285,6 @@ GLOBAL_VAR_INIT(sound_distance_offscreen, 7) soundin = pick('sound/machines/sm/accent/normal/1.ogg', 'sound/machines/sm/accent/normal/2.ogg', 'sound/machines/sm/accent/normal/3.ogg', 'sound/machines/sm/accent/normal/4.ogg', 'sound/machines/sm/accent/normal/5.ogg', 'sound/machines/sm/accent/normal/6.ogg', 'sound/machines/sm/accent/normal/7.ogg', 'sound/machines/sm/accent/normal/8.ogg', 'sound/machines/sm/accent/normal/9.ogg', 'sound/machines/sm/accent/normal/10.ogg', 'sound/machines/sm/accent/normal/11.ogg', 'sound/machines/sm/accent/normal/12.ogg', 'sound/machines/sm/accent/normal/13.ogg', 'sound/machines/sm/accent/normal/14.ogg', 'sound/machines/sm/accent/normal/15.ogg', 'sound/machines/sm/accent/normal/16.ogg', 'sound/machines/sm/accent/normal/17.ogg', 'sound/machines/sm/accent/normal/18.ogg', 'sound/machines/sm/accent/normal/19.ogg', 'sound/machines/sm/accent/normal/20.ogg', 'sound/machines/sm/accent/normal/21.ogg', 'sound/machines/sm/accent/normal/22.ogg', 'sound/machines/sm/accent/normal/23.ogg', 'sound/machines/sm/accent/normal/24.ogg', 'sound/machines/sm/accent/normal/25.ogg', 'sound/machines/sm/accent/normal/26.ogg', 'sound/machines/sm/accent/normal/27.ogg', 'sound/machines/sm/accent/normal/28.ogg', 'sound/machines/sm/accent/normal/29.ogg', 'sound/machines/sm/accent/normal/30.ogg', 'sound/machines/sm/accent/normal/31.ogg', 'sound/machines/sm/accent/normal/32.ogg', 'sound/machines/sm/accent/normal/33.ogg', 'sound/machines/sm/supermatter1.ogg', 'sound/machines/sm/supermatter2.ogg', 'sound/machines/sm/supermatter3.ogg') if("smdelam") soundin = pick('sound/machines/sm/accent/delam/1.ogg', 'sound/machines/sm/accent/normal/2.ogg', 'sound/machines/sm/accent/normal/3.ogg', 'sound/machines/sm/accent/normal/4.ogg', 'sound/machines/sm/accent/normal/5.ogg', 'sound/machines/sm/accent/normal/6.ogg', 'sound/machines/sm/accent/normal/7.ogg', 'sound/machines/sm/accent/normal/8.ogg', 'sound/machines/sm/accent/normal/9.ogg', 'sound/machines/sm/accent/normal/10.ogg', 'sound/machines/sm/accent/normal/11.ogg', 'sound/machines/sm/accent/normal/12.ogg', 'sound/machines/sm/accent/normal/13.ogg', 'sound/machines/sm/accent/normal/14.ogg', 'sound/machines/sm/accent/normal/15.ogg', 'sound/machines/sm/accent/normal/16.ogg', 'sound/machines/sm/accent/normal/17.ogg', 'sound/machines/sm/accent/normal/18.ogg', 'sound/machines/sm/accent/normal/19.ogg', 'sound/machines/sm/accent/normal/20.ogg', 'sound/machines/sm/accent/normal/21.ogg', 'sound/machines/sm/accent/normal/22.ogg', 'sound/machines/sm/accent/normal/23.ogg', 'sound/machines/sm/accent/normal/24.ogg', 'sound/machines/sm/accent/normal/25.ogg', 'sound/machines/sm/accent/normal/26.ogg', 'sound/machines/sm/accent/normal/27.ogg', 'sound/machines/sm/accent/normal/28.ogg', 'sound/machines/sm/accent/normal/29.ogg', 'sound/machines/sm/accent/normal/30.ogg', 'sound/machines/sm/accent/normal/31.ogg', 'sound/machines/sm/accent/normal/32.ogg', 'sound/machines/sm/accent/normal/33.ogg', 'sound/machines/sm/supermatter1.ogg', 'sound/machines/sm/supermatter2.ogg', 'sound/machines/sm/supermatter3.ogg') - //END VORESTATION EDIT return SSsounds.fetch_asset(soundin) //Are these even used? diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 4001a48f7a8..a982c953e00 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -23,7 +23,7 @@ 'sound/effects/footstep/plating4.ogg', 'sound/effects/footstep/plating5.ogg')) - var/list/old_decals = null // VOREStation Edit - Remember what decals we had between being pried up and replaced. + var/list/old_decals = null // Remember what decals we had between being pried up and replaced. // Flooring data. var/flooring_override @@ -81,11 +81,10 @@ make_plating(null, TRUE, TRUE) flooring = newflooring footstep_sounds = newflooring.footstep_sounds - // VOREStation Edit - We are plating switching to flooring, swap out old_decals for decals + // We are plating switching to flooring, swap out old_decals for decals var/list/overfloor_decals = old_decals old_decals = decals decals = overfloor_decals - // VOREStation Edit End if(!init) QUEUE_SMOOTH(src) QUEUE_SMOOTH_NEIGHBORS(src) @@ -96,11 +95,10 @@ /turf/simulated/floor/proc/make_plating(place_product, defer_icon_update, strip_bare) if(flooring) - // VOREStation Edit - We are flooring switching to plating, swap out old_decals for decals. + // We are flooring switching to plating, swap out old_decals for decals. var/list/underfloor_decals = old_decals old_decals = decals decals = underfloor_decals - // VOREStation Edit End if(place_product) flooring.drop_product(src) diff --git a/code/game/turfs/simulated/flooring/_flooring.dm b/code/game/turfs/simulated/flooring/_flooring.dm index 46df3063fbd..e096ddd830d 100644 --- a/code/game/turfs/simulated/flooring/_flooring.dm +++ b/code/game/turfs/simulated/flooring/_flooring.dm @@ -247,7 +247,7 @@ var/list/flooring_types /decl/flooring/tiling name = "floor" desc = "Scuffed from the passage of countless greyshirts." - icon = 'icons/turf/flooring/tiles_vr.dmi' // VOREStation Edit - Eris floors. Polaris still hasn't added all of them properly. See: steel_ridged + icon = 'icons/turf/flooring/tiles_vr.dmi' // More ERIS Sprites... For now... icon_base = "tiled" has_damage_range = 2 damage_temperature = T0C+1400 diff --git a/code/game/turfs/simulated/flooring/flooring_decals.dm b/code/game/turfs/simulated/flooring/flooring_decals.dm index 53bcda38055..7fe772264a0 100644 --- a/code/game/turfs/simulated/flooring/flooring_decals.dm +++ b/code/game/turfs/simulated/flooring/flooring_decals.dm @@ -5,7 +5,7 @@ var/list/floor_decals = list() /obj/effect/floor_decal name = "floor decal" - icon = 'icons/turf/flooring/decals_vr.dmi' // VOREStation Edit + icon = 'icons/turf/flooring/decals_vr.dmi' plane = DECAL_PLANE layer = MAPPER_DECAL_LAYER var/supplied_dir diff --git a/code/game/turfs/simulated/floors/outdoors.dm b/code/game/turfs/simulated/floors/outdoors.dm index 8e2c587a4b2..1806e6ad4a5 100644 --- a/code/game/turfs/simulated/floors/outdoors.dm +++ b/code/game/turfs/simulated/floors/outdoors.dm @@ -40,13 +40,12 @@ /turf/simulated/floor/outdoors/ex_act(severity) switch(severity) - //VOREStation Edit - Outdoor turfs less explosion resistant + // Outdoor turfs are less explosion resistant if(1) ScrapeAway(flags = CHANGETURF_INHERIT_AIR|CHANGETURF_PRESERVE_OUTDOORS) if(2) if(prob(66)) ScrapeAway(flags = CHANGETURF_INHERIT_AIR|CHANGETURF_PRESERVE_OUTDOORS) - //VOREStation Edit End if(3) if(prob(15)) ScrapeAway(flags = CHANGETURF_INHERIT_AIR|CHANGETURF_PRESERVE_OUTDOORS) diff --git a/code/game/turfs/turf_movement.dm b/code/game/turfs/turf_movement.dm index 46ffe7909ac..e6b03ef3d4d 100644 --- a/code/game/turfs/turf_movement.dm +++ b/code/game/turfs/turf_movement.dm @@ -16,8 +16,8 @@ var/const/enterloopsanity = 100 var/mob/M = AM if(!M.lastarea) M.lastarea = get_area(M.loc) - if(M.flying) //VORESTATION Edit Start. This overwrites the above is_space without touching it all that much. - M.make_floating(1) //VOREStation Edit End. + if(M.flying) // This overwrites the above is_space without touching it all that much. + M.make_floating(1) else if(!is_space()) M.make_floating(0) if(isliving(M) && CHECK_BITFIELD(M.movement_type, GROUND)) diff --git a/code/game/world.dm b/code/game/world.dm index 479d5e2758e..3df528ee688 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -254,7 +254,7 @@ GLOBAL_REAL_VAR(world_log_redirected) = FALSE var/list/fail_reasons if(GLOB) if(global.total_runtimes != 0) - fail_reasons = list("Total runtimes: [global.total_runtimes] - if you don't see any runtimes above, launch locally with `dreamseeker -trusted -verbose vorestation.dmb` after compile and check Options and Messages. Inform a maintainer too, if this happens..") + fail_reasons = list("Total runtimes: [global.total_runtimes] - if you don't see any runtimes above, launch locally with `dreamseeker -trusted -verbose citadel.dmb` after compile and check Options and Messages. Inform a maintainer too, if this happens..") #ifdef UNIT_TESTS if(GLOB.failed_any_test) LAZYADD(fail_reasons, "Unit Tests failed!") @@ -278,11 +278,9 @@ GLOBAL_REAL_VAR(world_log_redirected) = FALSE to_chat(world, "Rebooting World immediately due to host request") else to_chat(world, "Rebooting world...") - //POLARIS START if(blackbox) blackbox.save_all_data_to_sql() - //END - Master.Shutdown() //run SS shutdowns + Master.Shutdown() //run SS shutdowns TgsReboot() diff --git a/code/global.dm b/code/global.dm index cff5aa54045..a9de47eda5c 100644 --- a/code/global.dm +++ b/code/global.dm @@ -157,47 +157,49 @@ var/list/shell_module_types = list( "Standard", "Service", "Clerical" ) -var/list/eventdestinations = list() // List of scatter landmarks for VOREStation event portals - -var/global/list/acceptable_fruit_types= list( - "ambrosia", - "apple", - "banana", - "berries", - "cabbage", - "carrot", - "celery", - "cherry", - "chili", - "cocoa", - "corn", - "durian", - "eggplant", - "grapes", - "greengrapes", - "harebells", - "lavender", - "lemon", - "lettuce", - "lime", - "onion", - "orange", - "peanut", - "poppies", - "potato", - "pumpkin", - "rice", - "rose", - "rhubarb", - "soybean", - "spineapple", - "sugarcane", - "sunflowers", - "tomato", - "vanilla", - "watermelon", - "wheat", - "whitebeet") +var/list/eventdestinations = list() // List of scatter landmarks for event portals + +var/global/list/acceptable_fruit_types = list( + "ambrosia", + "apple", + "banana", + "berries", + "cabbage", + "carrot", + "celery", + "cherry", + "chili", + "cocoa", + "corn", + "durian", + "eggplant", + "grapes", + "greengrapes", + "harebells", + "lavender", + "lemon", + "lettuce", + "lime", + "onion", + "orange", + "peanut", + "poppies", + "potato", + "pumpkin", + "rice", + "rose", + "rhubarb", + "soybean", + "spineapple", + "sugarcane", + "sunflowers", + "tomato", + "vanilla", + "watermelon", + "wheat", + "whitebeet", + ) var/global/list/acceptable_nectar_types= list( - "waxcomb (honey)") + "waxcomb (honey)", + ) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 0f48a57acd2..b53956caad9 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -649,7 +649,7 @@ proc/admin_notice(var/message, var/rights) log_admin("Announce: [key_name(usr)] : [message]") feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -//VOREStation Edit to this verb for the purpose of making it compliant with the annunciator system +/// This verb for the purpose of making it compliant with the announcer system. var/datum/legacy_announcement/priority/admin_pri_announcer = new var/datum/legacy_announcement/minor/admin_min_announcer = new /datum/admins/proc/intercom() @@ -1430,7 +1430,7 @@ var/datum/legacy_announcement/minor/admin_min_announcer = new set category = "Debug" set name = "Set Telecrystals" set desc = "Allows admins to change telecrystals of a user." - set popup_menu = FALSE //VOREStation Edit - Declutter. + set popup_menu = FALSE var/crystals if(check_rights(R_ADMIN)) @@ -1446,7 +1446,7 @@ var/datum/legacy_announcement/minor/admin_min_announcer = new set category = "Debug" set name = "Add Telecrystals" set desc = "Allows admins to change telecrystals of a user by addition." - set popup_menu = FALSE //VOREStation Edit - Declutter. + set popup_menu = FALSE var/crystals if(check_rights(R_ADMIN)) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index fa649b3b7b6..6ff5f6bab24 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -87,11 +87,11 @@ var/list/admin_verbs_admin = list( /client/proc/check_customitem_activity, /client/proc/man_up, /client/proc/global_man_up, - /client/proc/response_team, // Response Teams admin verb, -// /client/proc/trader_ship, // Trader ship admin verb, // I've commented this one out for now, in conjunction with Nebula Gas being disabled. + /client/proc/response_team, // Response Teams admin verb + /client/proc/trader_ship, // Trader ship admin verb /client/proc/toggle_antagHUD_use, /client/proc/toggle_antagHUD_restrictions, - /client/proc/allow_character_respawn, // Allows a ghost to respawn , + /client/proc/allow_character_respawn, // Allows a ghost to respawn , /client/proc/event_manager_panel, /client/proc/empty_ai_core_toggle_latejoin, /client/proc/empty_ai_core_toggle_latejoin, @@ -105,7 +105,7 @@ var/list/admin_verbs_admin = list( /client/proc/toggle_attack_logs, /datum/admins/proc/paralyze_mob, /client/proc/fixatmos, - /datum/admins/proc/quick_nif, //VOREStation Add, + /datum/admins/proc/quick_nif, /datum/admins/proc/sendFax, /client/proc/despawn_player, /client/proc/addbunkerbypass, @@ -144,7 +144,7 @@ var/list/admin_verbs_fun = list( /client/proc/roll_dices, /datum/admins/proc/call_supply_drop, /datum/admins/proc/call_drop_pod, - /client/proc/smite_vr, //VOREStation Add, + /client/proc/smite_vr, /client/proc/smite, /client/proc/admin_lightning_strike ) @@ -154,9 +154,9 @@ var/list/admin_verbs_spawn = list( /datum/admins/proc/spawn_custom_item, /datum/admins/proc/check_custom_items, /datum/admins/proc/spawn_plant, - /datum/admins/proc/spawn_atom, //allows us to spawn instances, + /datum/admins/proc/spawn_atom, // Allows us to spawn instances, /client/proc/respawn_character, - /client/proc/spawn_character_mob, //VOREStation Add, + /client/proc/spawn_character_mob, /client/proc/virus2_editor, /client/proc/spawn_chemdisp_cartridge, /client/proc/map_template_load, @@ -176,7 +176,7 @@ var/list/admin_verbs_server = list( /client/proc/cmd_mod_say, /client/proc/everyone_random, /datum/admins/proc/toggleAI, - /client/proc/cmd_admin_delete, //delete an instance/object/mob/etc, + /client/proc/cmd_admin_delete, // Delete an instance/object/mob/etc, /client/proc/cmd_debug_del_all, /client/proc/cmd_admin_clear_mobs, /datum/admins/proc/adrev, @@ -756,7 +756,7 @@ var/list/admin_verbs_event_manager = list( set category = "Debug" set name = "Give Modifier" set desc = "Makes a mob weaker or stronger by adding a specific modifier to them." - set popup_menu = FALSE //VOREStation Edit - Declutter. + set popup_menu = FALSE if(!L) to_chat(usr, "Looks like you didn't select a mob.") @@ -1064,7 +1064,7 @@ var/list/admin_verbs_event_manager = list( set category = "Fun" set name = "Man Up" set desc = "Tells mob to man up and deal with it." - set popup_menu = FALSE //VOREStation Edit - Declutter. + set popup_menu = FALSE if(alert("Are you sure you want to tell them to man up?","Confirmation","Deal with it","No")=="No") return diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index c65fcbe894d..77a6a3312ac 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -15,7 +15,7 @@ var/quick_create_object_html = null var/pathtext = null - pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") as null|anything in list("/obj","/obj/structure","/obj/item","/obj/item","/obj/item","/obj/item/gun","/obj/item/reagent_containers","/obj/item/reagent_containers/food","/obj/item/clothing","/obj/machinery","/obj/mecha","/obj/item/mecha_parts/part","/obj/mecha_parts/mecha_equipement","/obj/item/storage/box/fluff") //VOREStation Edit - Added fluff boxes + pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") as null|anything in list("/obj","/obj/structure","/obj/item","/obj/item","/obj/item","/obj/item/gun","/obj/item/reagent_containers","/obj/item/reagent_containers/food","/obj/item/clothing","/obj/machinery","/obj/mecha","/obj/item/mecha_parts/part","/obj/mecha_parts/mecha_equipement","/obj/item/storage/box/fluff") if(!pathtext) return var path = text2path(pathtext) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 9fa2d315ab8..8eb0366567a 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -516,7 +516,6 @@ jobs += "" counter = 0 jobs += "" - //VOREStation Edit Start //Exploration (Purple) counter = 0 jobs += "" @@ -537,7 +536,6 @@ jobs += "" counter = 0 jobs += "
" - //VOREstation Edit End //Civilian (Grey) counter = 0 jobs += "" @@ -691,14 +689,12 @@ var/datum/job/temp = job_master.GetJob(jobPos) if(!temp) continue joblist += temp.title - //VOREStation Edit Start if("explorationdept") for(var/jobPos in SSjob.get_job_titles_in_department(DEPARTMENT_PLANET)) if(!jobPos) continue var/datum/job/temp = job_master.GetJob(jobPos) if(!temp) continue joblist += temp.title - //VOREStation Edit End if("civiliandept") for(var/jobPos in SSjob.get_job_titles_in_department(DEPARTMENT_CIVILIAN)) if(!jobPos) continue @@ -1286,7 +1282,6 @@ if((R_ADMIN|R_MOD|R_EVENT|R_SERVER) & X.holder.rights) to_chat(X, take_msg) to_chat(M, "Your adminhelp is being attended to by [usr.client]. Thanks for your patience!") - // VoreStation Edit Start if (config_legacy.chat_webhook_url) spawn(0) var/query_string = "type=admintake" @@ -1294,7 +1289,6 @@ query_string += "&admin=[url_encode(key_name(usr.client))]" query_string += "&user=[url_encode(key_name(M))]" world.Export("[config_legacy.chat_webhook_url]?[query_string]") - // VoreStation Edit End else to_chat(usr, "Unable to locate mob.") @@ -1927,7 +1921,7 @@ else if(href_list["cryoplayer"]) if(!check_rights(R_ADMIN)) return - var/mob/living/carbon/M = locate(href_list["cryoplayer"]) //VOREStation edit from just an all mob check to mob/living/carbon + var/mob/living/carbon/M = locate(href_list["cryoplayer"]) if(!istype(M)) to_chat(usr,"Mob doesn't exist!") return diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 5b8a1ac2e46..b464cbc5c78 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -203,7 +203,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick/ticket_list) log_admin("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.") if(admin_number_present <= 0) to_chat(C, "No active admins are online, your adminhelp was sent to the admin irc.") - send2adminchat() //VOREStation Add + send2adminchat() GLOB.ahelp_tickets.active_tickets += src /datum/admin_help/Destroy() diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index d52e8030198..290b49fc41c 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -424,8 +424,8 @@ Traitors and the like can also be revived with the previous role mostly intact. var/samejob = alert(src,"Found [picked_client.prefs.real_name] in data core. They were [record_found.fields["real_rank"]] this round. Assign same job? They will not be re-added to the manifest/records, either way.","Previously spawned","Yes","Assistant","No") if(samejob == "Yes") charjob = record_found.fields["real_rank"] - else if(samejob == USELESS_JOB) //VOREStation Edit - Visitor not Assistant - charjob = USELESS_JOB //VOREStation Edit - Visitor not Assistant + else if(samejob == USELESS_JOB) + charjob = USELESS_JOB else records = alert(src,"No data core entry detected. Would you like add them to the manifest, and sec/med/HR records?","Records","Yes","No","Cancel") if(records == "Cancel") @@ -457,10 +457,9 @@ Traitors and the like can also be revived with the previous role mostly intact. //For logging later var/admin = key_name_admin(src) var/player_key = picked_client.key - //VOREStation Add - Needed for persistence + // Needed for persistence var/picked_ckey = picked_client.ckey var/picked_slot = picked_client.prefs.default_slot - //VOREStation Add End var/mob/living/carbon/human/new_character var/spawnloc @@ -507,17 +506,15 @@ Traitors and the like can also be revived with the previous role mostly intact. antag_data.add_antagonist(new_character.mind) antag_data.place_mob(new_character) - //VOREStation Add - Required for persistence + // Required for persistence if(new_character.mind) new_character.mind.loaded_from_ckey = picked_ckey new_character.mind.loaded_from_slot = picked_slot - //VOREStation Add End //If desired, apply equipment. if(equipment) if(charjob) job_master.EquipRank(new_character, charjob, 1) - //equip_custom_items(new_character) //VOREStation Removal //If desired, add records. if(records) @@ -791,7 +788,7 @@ Traitors and the like can also be revived with the previous role mostly intact. /client/proc/cmd_admin_check_contents(mob/living/M as mob in GLOB.mob_list) set category = "Special Verbs" set name = "Check Contents" - set popup_menu = FALSE //VOREStation Edit - Declutter. + set popup_menu = FALSE var/list/L = M.get_contents() for(var/t in L) diff --git a/code/modules/admin/verbs/server/admin_reboot.dm b/code/modules/admin/verbs/server/admin_reboot.dm index 5d9236c64c6..b09effeaf2a 100644 --- a/code/modules/admin/verbs/server/admin_reboot.dm +++ b/code/modules/admin/verbs/server/admin_reboot.dm @@ -22,7 +22,6 @@ switch(result) if("Regular Restart") //SSticker.Reboot(init_by, "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10) - //POLARIS CODE REE to_chat(world, "Rebooting world in 1 second! [init_by]") spawn(10) world.Reboot() diff --git a/code/modules/ai/aI_holder_subtypes/simple_mob_ai.dm b/code/modules/ai/aI_holder_subtypes/simple_mob_ai.dm index 695b01b9b08..79f253c5b94 100644 --- a/code/modules/ai/aI_holder_subtypes/simple_mob_ai.dm +++ b/code/modules/ai/aI_holder_subtypes/simple_mob_ai.dm @@ -17,7 +17,7 @@ retaliate = FALSE can_flee = TRUE violent_breakthrough = FALSE - base_wander_delay = 8 //vorestation edit, to make pets slow. + base_wander_delay = 8 // Pets slow. // Won't wander away as quickly, ideal for event-spawned mobs like carp or drones. /datum/ai_holder/simple_mob/event diff --git a/code/modules/alarm/atmosphere_alarm.dm b/code/modules/alarm/atmosphere_alarm.dm index b814969442e..95e491038ab 100644 --- a/code/modules/alarm/atmosphere_alarm.dm +++ b/code/modules/alarm/atmosphere_alarm.dm @@ -14,10 +14,3 @@ if(A.max_severity() == 1) minor_alarms.Add(A) return minor_alarms - -//VOREStation Add - Alarm for AR glasses -/*/datum/alarm_handler/atmosphere/on_alarm_change(var/datum/alarm/alarm, var/was_raised) - ..() - var/atom/source = length(alarm.sources_assoc) ? alarm.sources_assoc[1] : alarm.alarm_area() - broadcast_engineering_hud_message("Alarm in [alarm.origin] [was_raised ? "raised!" : "cleared."]", source)*/ -//VOREStation Add End diff --git a/code/modules/alarm/fire_alarm.dm b/code/modules/alarm/fire_alarm.dm index 03cdadde043..dfae3cc8177 100644 --- a/code/modules/alarm/fire_alarm.dm +++ b/code/modules/alarm/fire_alarm.dm @@ -8,8 +8,4 @@ A.fire_alert() else A.fire_reset() - //VOREStation Add - Alarm for AR glasses uses - /*var/atom/source = length(alarm.sources_assoc) ? alarm.sources_assoc[1] : alarm.alarm_area() - broadcast_engineering_hud_message("Alarm in [alarm.origin] [was_raised ? "raised!" : "cleared."]", source)*/ - //VOREStation Add End ..() diff --git a/code/modules/asset_cache/assets/legacy_nanomaps.dm b/code/modules/asset_cache/assets/legacy_nanomaps.dm index cc37c35055a..63bbf58cd8b 100644 --- a/code/modules/asset_cache/assets/legacy_nanomaps.dm +++ b/code/modules/asset_cache/assets/legacy_nanomaps.dm @@ -2,24 +2,22 @@ // It REALLY doesnt matter too much if these arent up to date // They are relatively big assets = list( - // VOREStation Edit: We don't need Southern Cross // "southern_cross_nanomap_z1.png" = 'icons/_nanomaps/southern_cross_nanomap_z1.png', // "southern_cross_nanomap_z10.png" = 'icons/_nanomaps/southern_cross_nanomap_z10.png', // "southern_cross_nanomap_z2.png" = 'icons/_nanomaps/southern_cross_nanomap_z2.png', // "southern_cross_nanomap_z3.png" = 'icons/_nanomaps/southern_cross_nanomap_z3.png', // "southern_cross_nanomap_z5.png" = 'icons/_nanomaps/southern_cross_nanomap_z5.png', // "southern_cross_nanomap_z6.png" = 'icons/_nanomaps/southern_cross_nanomap_z6.png', - "tether_nanomap_z1.png" = 'icons/_nanomaps/tether_nanomap_z1.png', - "tether_nanomap_z2.png" = 'icons/_nanomaps/tether_nanomap_z2.png', - "tether_nanomap_z3.png" = 'icons/_nanomaps/tether_nanomap_z3.png', - "tether_nanomap_z4.png" = 'icons/_nanomaps/tether_nanomap_z4.png', - "tether_nanomap_z5.png" = 'icons/_nanomaps/tether_nanomap_z5.png', - "tether_nanomap_z6.png" = 'icons/_nanomaps/tether_nanomap_z6.png', - "tether_nanomap_z7.png" = 'icons/_nanomaps/tether_nanomap_z7.png', - "tether_nanomap_z8.png" = 'icons/_nanomaps/tether_nanomap_z8.png', - "tether_nanomap_z9.png" = 'icons/_nanomaps/tether_nanomap_z9.png', - "tether_nanomap_z10.png" = 'icons/_nanomaps/tether_nanomap_z10.png', - "tether_nanomap_z13.png" = 'icons/_nanomaps/tether_nanomap_z13.png', - "tether_nanomap_z14.png" = 'icons/_nanomaps/tether_nanomap_z14.png', - // VOREStation Edit End + // "tether_nanomap_z1.png" = 'icons/_nanomaps/tether_nanomap_z1.png', + // "tether_nanomap_z2.png" = 'icons/_nanomaps/tether_nanomap_z2.png', + // "tether_nanomap_z3.png" = 'icons/_nanomaps/tether_nanomap_z3.png', + // "tether_nanomap_z4.png" = 'icons/_nanomaps/tether_nanomap_z4.png', + // "tether_nanomap_z5.png" = 'icons/_nanomaps/tether_nanomap_z5.png', + // "tether_nanomap_z6.png" = 'icons/_nanomaps/tether_nanomap_z6.png', + // "tether_nanomap_z7.png" = 'icons/_nanomaps/tether_nanomap_z7.png', + // "tether_nanomap_z8.png" = 'icons/_nanomaps/tether_nanomap_z8.png', + // "tether_nanomap_z9.png" = 'icons/_nanomaps/tether_nanomap_z9.png', + // "tether_nanomap_z10.png" = 'icons/_nanomaps/tether_nanomap_z10.png', + // "tether_nanomap_z13.png" = 'icons/_nanomaps/tether_nanomap_z13.png', + // "tether_nanomap_z14.png" = 'icons/_nanomaps/tether_nanomap_z14.png', ) diff --git a/code/modules/atmospherics/atmospherics.dm b/code/modules/atmospherics/atmospherics.dm index f95aadc6e1d..f8a9adc20f3 100644 --- a/code/modules/atmospherics/atmospherics.dm +++ b/code/modules/atmospherics/atmospherics.dm @@ -206,7 +206,6 @@ Pipelines + Other Objects -> Pipe network if(pipe_flags & (PIPING_DEFAULT_LAYER_ONLY|PIPING_ALL_LAYER)) new_layer = PIPING_LAYER_DEFAULT piping_layer = new_layer - // Do it the Polaris way switch(piping_layer) if(PIPING_LAYER_SCRUBBER) icon_state = "[icon_state]-scrubbers" diff --git a/code/modules/atmospherics/components/unary/vent_pump.dm b/code/modules/atmospherics/components/unary/vent_pump.dm index 471b950c31c..f06675a0a6b 100644 --- a/code/modules/atmospherics/components/unary/vent_pump.dm +++ b/code/modules/atmospherics/components/unary/vent_pump.dm @@ -15,8 +15,8 @@ name = "Air Vent" desc = "Has a valve and pump attached to it" use_power = USE_POWER_OFF - idle_power_usage = 150 //internal circuitry, friction losses and stuff - power_rating = 30000 //7500 W ~ 10 HP //VOREStation Edit - 30000 W + idle_power_usage = 150 //internal circuitry, friction losses and stuff + power_rating = 30000 connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY //connects to regular and supply pipes @@ -110,7 +110,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/high_volume name = "Large Air Vent" power_channel = EQUIP - power_rating = 45000 //15 kW ~ 20 HP //VOREStation Edit - 45000 + power_rating = 45000 /obj/machinery/atmospherics/component/unary/vent_pump/high_volume/aux icon_state = "map_vent_aux" @@ -121,7 +121,7 @@ . = ..() air_contents.volume = ATMOS_DEFAULT_VOLUME_PUMP + 800 -// VOREStation Edit Start - Wall mounted vents +// Wall mounted vents /obj/machinery/atmospherics/component/unary/vent_pump/high_volume/wall_mounted name = "Wall Mounted Air Vent" @@ -132,8 +132,6 @@ return ..() return T.return_air() -// VOREStation Edit End - /obj/machinery/atmospherics/component/unary/vent_pump/engine name = "Engine Core Vent" power_channel = ENVIRON @@ -209,7 +207,7 @@ if(!can_pump()) return 0 - var/datum/gas_mixture/environment = return_air() // VOREStation Edit - Use our own proc + var/datum/gas_mixture/environment = return_air() var/power_draw = -1 diff --git a/code/modules/atmospherics/environmental/zas/phoron.dm b/code/modules/atmospherics/environmental/zas/phoron.dm index 8547499baff..999026b63f3 100644 --- a/code/modules/atmospherics/environmental/zas/phoron.dm +++ b/code/modules/atmospherics/environmental/zas/phoron.dm @@ -9,12 +9,10 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') return 0 else if(istype(src,/obj/item/storage/backpack)) return 0 //Cannot be washed :( - //VOREStation Addition start else if(isbelly(loc)) return 0 else if(ismob(loc) && isbelly(loc.loc)) return 0 - //VOREStation Addition end else if(istype(src,/obj/item/clothing)) return 1 @@ -88,7 +86,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') if(burn_eyes && head && (head.body_parts_covered & EYES) && (head.clothing_flags & ALLOWINTERNALS)) burn_eyes = 0 - //VOREStation Edit - NIF Support + // NIF Support if(nif && nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) burn_eyes = 0 diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index c0db55fe6a1..5d87da28d02 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -1,6 +1,6 @@ /obj/machinery/gateway name = "gateway" - desc = "A mysterious gateway built by unknown hands. It allows for faster than light travel to far-flung locations and even alternate realities." //VOREStation Edit + desc = "A mysterious gateway built by unknown hands. It allows for faster than light travel to far-flung locations and even alternate realities." icon = 'icons/obj/machines/gateway.dmi' icon_state = "off" density = 1 @@ -39,7 +39,7 @@ wait = world.time + config_legacy.gateway_delay //+ thirty minutes default awaygate = locate(/obj/machinery/gateway/centeraway) . = ..() - density = 1 //VOREStation Add + density = TRUE /obj/machinery/gateway/centerstation/update_icon() if(active) @@ -86,8 +86,8 @@ if(world.time < wait) to_chat(user, "Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.") return - if(!awaygate.calibrated && !LAZYLEN(awaydestinations)) //VOREStation Edit - to_chat(user, "Error: Destination gate uncalibrated. Gateway unsafe to use without far-end calibration update.") + if(!awaygate.calibrated && !LAZYLEN(awaydestinations)) + to_chat(user, SPAN_NOTICE("Error: Destination gate uncalibrated. Gateway unsafe to use without far-end calibration update.")) return for(var/obj/machinery/gateway/G in linked) @@ -164,7 +164,7 @@ update_icon() stationgate = locate(/obj/machinery/gateway/centerstation) . = ..() - density = 1 //VOREStation Add + density = 1 /obj/machinery/gateway/centeraway/update_icon() @@ -196,8 +196,8 @@ /obj/machinery/gateway/centeraway/proc/toggleon(mob/user as mob) if(!ready) return if(linked.len != 8) return - if(!stationgate || !calibrated) // Vorestation edit. Not like Polaris ever touches this anyway. - to_chat(user, "Error: No destination found. Please calibrate gateway.") + if(!stationgate || !calibrated) + to_chat(user, SPAN_NOTICE("Error: No destination found. Please calibrate gateway.")) return for(var/obj/machinery/gateway/G in linked) @@ -245,12 +245,10 @@ to_chat(user, "The gate is already calibrated, there is no work for you to do here.") return else - // VOREStation Add stationgate = locate(/obj/machinery/gateway/centerstation) if(!stationgate) to_chat(user, "Error: Recalibration failed. No destination found... That can't be good.") return - // VOREStation Add End else to_chat(user, "Recalibration successful!: This gate's systems have been fine tuned. Travel to this gate will now be on target.") calibrated = 1 diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm index a7ecd8a97f1..47ab5d1bb17 100644 --- a/code/modules/awaymissions/loot_vr.dm +++ b/code/modules/awaymissions/loot_vr.dm @@ -24,12 +24,9 @@ 100 - low_probability * 50;"spacesuit", \ "health", \ 25 + low_probability * 75;"snacks", \ - /*25;"alien", \ */ //VORESTATION AI TEMPORARY REMOVAL "lights", \ 25 - low_probability * 25;"engineering", \ 25 - low_probability * 25;"coffin", \ - /*25;"mimic", \ //VORESTATION AI TEMPORARY REMOVAL - 25;"viscerator", \ */ //VORESTATION AI TEMPORARY REMOVAL )) if("treasure") var/obj/structure/closet/crate/C = new(src.loc) @@ -334,19 +331,14 @@ new /obj/effect/decal/remains/human(src) else if(prob(50)) new /obj/effect/decal/remains/xeno(src) + if("mimic") - //a guardian of the tomb! - // var/mob/living/simple_mob/hostile/mimic/crate/mimic = new(src.loc) - // mimic.faction = spawned_faction - var/obj/structure/closet/crate/secure/gear/C = new(src.loc) //VORESTATION AI TEMPORARY EDIT - new /obj/item/storage/toolbox/electrical(C) //Placeholder to prevent errors. //VORESTATION AI TEMPORARY EDIT + var/obj/structure/closet/crate/secure/gear/C = new(src.loc) + new /obj/item/storage/toolbox/electrical(C) + if("viscerator") - //more tomb guardians! - //var/num = rand(1,3) //VORESTATION AI TEMPORARY REMOVAL - var/obj/structure/closet/crate/secure/gear/C = new(src.loc) //VORESTATION AI TEMPORARY EDIT - new /obj/item/storage/toolbox/electrical(C) //Placeholder to prevent errors. //VORESTATION AI TEMPORARY EDIT - //for(var/i=0,iLoading away mission...", R_DEBUG) var/map = pick(potentialRandomZlevels) - log_world("Away mission picked: [map]") //VOREStation Add for debugging + log_world("Away mission picked: [map]") var/file = file(map) if(isfile(file)) var/datum/map_template/template = new(file, "away mission") template.load_new_z() log_world("away mission loaded: [map]") - /* VOREStation Removal - We do this in the special landmark init instead. - for(var/atom/movable/landmark/L in GLOB.landmarks_list) - if (L.name != "awaystart") - continue - awaydestinations.Add(L) - */ //VOREStation Removal End admin_notice("Away mission loaded.", R_DEBUG) else admin_notice("No away missions found.", R_DEBUG) return -//VOREStation Add - This landmark type so it's not so ghetto. +// This landmark type so it's not so ghetto. /atom/movable/landmark/gateway_scatter name = "uncalibrated gateway destination" /atom/movable/landmark/gateway_scatter/Initialize(mapload) @@ -71,4 +65,3 @@ proc/createRandomZlevel() /atom/movable/landmark/event_scatter/Initialize(mapload) . = ..() eventdestinations += src -//VOREStation Add End diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm index eef287bc8c0..35210e6676f 100644 --- a/code/modules/blob/blob.dm +++ b/code/modules/blob/blob.dm @@ -40,7 +40,7 @@ else icon_state = "blob_damaged" -/obj/effect/blob/take_damage(var/damage) // VOREStation Edit +/obj/effect/blob/take_damage(damage) health -= damage if(health < 0) playsound(loc, 'sound/effects/splat.ogg', 50, 1) diff --git a/code/modules/blob2/blobs/core.dm b/code/modules/blob2/blobs/core.dm index 725fac641ed..9ee4038470a 100644 --- a/code/modules/blob2/blobs/core.dm +++ b/code/modules/blob2/blobs/core.dm @@ -6,7 +6,7 @@ var/list/blob_cores = list() icon = 'icons/mob/blob.dmi' icon_state = "blank_blob" desc = "A huge, pulsating yellow mass." - density = TRUE //bandaid fix for PolarisSS13/6173 + density = TRUE max_integrity = 150 point_return = -1 health_regen = 0 //we regen in Life() instead of when pulsed diff --git a/code/modules/cargo/supplypacks/munitions.dm b/code/modules/cargo/supplypacks/munitions.dm index d2d764336bd..a01d85bad97 100644 --- a/code/modules/cargo/supplypacks/munitions.dm +++ b/code/modules/cargo/supplypacks/munitions.dm @@ -183,7 +183,7 @@ cost = 25 container_type = /obj/structure/closet/crate container_name = "Ballistic ammunition crate" - access = access_armory //VOREStation Edit - Guns are for the armory. + access = access_armory // Guns are for the armory. /datum/supply_pack/munitions/bsmgammo name = "Ammunition - 9mm top mounted lethal" diff --git a/code/modules/cargo/supplypacks/security.dm b/code/modules/cargo/supplypacks/security.dm index 4fa4c3e2ff7..e5363644aba 100644 --- a/code/modules/cargo/supplypacks/security.dm +++ b/code/modules/cargo/supplypacks/security.dm @@ -237,7 +237,6 @@ container_type = /obj/structure/closet/crate/secure/gear container_name = "Ballistic armor crate" access = access_armory -//CITADEL EDIT - YEET EM AND SKEET EM BOYS WE'RE FREEING ARMOR /* VOREStation Removal - Howabout no ERT armor being orderable? /datum/supply_pack/security/bullet_resistant_plates name = "Armor - Ballistic plates" diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index bb034c8f2aa..50a5e815c24 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -377,7 +377,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them. to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.") - hook_vr("client_new",list(src)) //VOREStation Code + hook_vr("client_new",list(src)) if(config_legacy.paranoia_logging) if(isnum(player_age) && player_age == -1) @@ -548,14 +548,13 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( else log_admin("Couldn't perform IP check on [key] with [address]") - // VOREStation Edit Start - Department Hours + // Department Hours if(config_legacy.time_off) var/DBQuery/query_hours = dbcon.NewQuery("SELECT department, hours FROM vr_player_hours WHERE ckey = '[sql_ckey]'") query_hours.Execute() while(query_hours.NextRow()) LAZYINITLIST(department_hours) department_hours[query_hours.item[1]] = text2num(query_hours.item[2]) - // VOREStation Edit End - Department Hours if(sql_id) //Player already identified previously, we need to just update the 'lastseen', 'ip' and 'computer_id' variables diff --git a/code/modules/client/preference_setup/general/01_basic.dm b/code/modules/client/preference_setup/general/01_basic.dm index 5fe0d0fe861..c7ea66043ca 100644 --- a/code/modules/client/preference_setup/general/01_basic.dm +++ b/code/modules/client/preference_setup/general/01_basic.dm @@ -140,7 +140,7 @@ datum/preferences/proc/set_biological_gender(var/gender) return TOPIC_REFRESH else if(href_list["metadata"]) - var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , html_decode(pref.metadata)) as message, extra = 0) //VOREStation Edit + var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , html_decode(pref.metadata)) as message, extra = 0) if(new_metadata && CanUseTopic(user)) pref.metadata = new_metadata return TOPIC_REFRESH diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 759ad7240c0..b26e607f837 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -441,7 +441,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if(prev_species != pref.species) if(!(pref.biological_gender in mob_species.genders)) pref.set_biological_gender(mob_species.genders[1]) - pref.custom_species = null //VOREStation Edit - This is cleared on species changes + pref.custom_species = null // This is cleared on species changes //grab one of the valid hair styles for the newly chosen species var/list/valid_hairstyles = pref.get_valid_hairstyles() @@ -779,10 +779,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O continue if(tmp_species in M.species_cannot_use) continue - //VOREStation Add - Cyberlimb whitelisting. + // Cyberlimb whitelisting. if(M.whitelisted_to && !(user.ckey in M.whitelisted_to)) continue - //VOREStation Add End usable_manufacturers[company] = M if(!usable_manufacturers.len) return diff --git a/code/modules/client/preference_setup/general/06_flavor.dm b/code/modules/client/preference_setup/general/06_flavor.dm index 49827e94e38..fd91357f78a 100644 --- a/code/modules/client/preference_setup/general/06_flavor.dm +++ b/code/modules/client/preference_setup/general/06_flavor.dm @@ -47,7 +47,7 @@ character.flavor_texts["hands"] = pref.flavor_texts["hands"] character.flavor_texts["legs"] = pref.flavor_texts["legs"] character.flavor_texts["feet"] = pref.flavor_texts["feet"] - character.ooc_notes = pref.metadata //VOREStation Add + character.ooc_notes = pref.metadata /datum/category_item/player_setup_item/general/flavor/content(var/mob/user) . += "Flavor:
" @@ -59,7 +59,7 @@ switch(href_list["flavor_text"]) if("open") if("general") - var/msg = sanitize(input(usr,"Give a general description of your character. This will be shown regardless of clothings.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]])) as message, extra = 0, max_length = 8192) //VOREStation Edit: separating out OOC notes + var/msg = sanitize(input(usr,"Give a general description of your character. This will be shown regardless of clothings.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]])) as message, extra = 0, max_length = 8192) if(CanUseTopic(user)) pref.flavor_texts[href_list["flavor_text"]] = msg else diff --git a/code/modules/client/preference_setup/global/setting_datums.dm b/code/modules/client/preference_setup/global/setting_datums.dm index ec8ff8bf348..14458b8c986 100644 --- a/code/modules/client/preference_setup/global/setting_datums.dm +++ b/code/modules/client/preference_setup/global/setting_datums.dm @@ -76,7 +76,7 @@ var/list/_client_preferences_by_type if(!enabled) SEND_SOUND(preference_mob, sound(null, repeat = 0, wait = 0, volume = 0, channel = 1)) SEND_SOUND(preference_mob, sound(null, repeat = 0, wait = 0, volume = 0, channel = 2)) -//VOREStation Add - Need to put it here because it should be ordered riiiight here. +// Need to put it here because it should be ordered riiiight here. /datum/client_preference/play_jukebox description ="Play jukebox music" key = "SOUND_JUKEBOX" @@ -98,7 +98,7 @@ var/list/_client_preferences_by_type key = "DIGEST_NOISES" enabled_description = "Noisy" disabled_description = "Silent" -//VOREStation Add End + /datum/client_preference/weather_sounds description ="Weather sounds" key = "SOUND_WEATHER" diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index 1bdbc65bb7d..f1d5402f2f1 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -157,16 +157,16 @@ var/list/gear_datums = list() var/total_cost = 0 for(var/gear_name in pref.gear) if(!gear_datums[gear_name]) - to_chat(preference_mob, "You cannot have more than one of the \the [gear_name]") + to_chat(preference_mob, SPAN_WARNING("You cannot have more than one of the \the [gear_name]")) pref.gear -= gear_name else if(!(gear_name in valid_gear_choices())) - to_chat(preference_mob, "You cannot take \the [gear_name] as you are not whitelisted for the species or item.") //Vorestation Edit + to_chat(preference_mob, SPAN_WARNING("You cannot take \the [gear_name] as you are not whitelisted for the species or item.")) pref.gear -= gear_name else var/datum/gear/G = gear_datums[gear_name] if(total_cost + G.cost > max_gear_points()) pref.gear -= gear_name - to_chat(preference_mob, "You cannot afford to take \the [gear_name]") + to_chat(preference_mob, SPAN_WARNING("You cannot afford to take \the [gear_name]")) else total_cost += G.cost @@ -218,13 +218,11 @@ var/list/gear_datums = list() . += "" for(var/gear_name in LC.gear) var/datum/gear/G = LC.gear[gear_name] - //VOREStation Edit Start if(preference_mob && preference_mob.client) if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) continue if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) continue - //VOREStation Edit End var/ticked = (G.name in pref.gear) . += "" . += "" diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index 637664a4aec..e4b9ff0ebab 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -27,8 +27,6 @@ ..() var/list/zippos = list() for(var/zippo in typesof(/obj/item/flame/lighter/zippo)) - //if(zippo in typesof(/obj/item/flame/lighter/zippo/fluff)) //VOREStation addition - // continue //VOREStation addition var/obj/item/flame/lighter/zippo/zippo_type = zippo zippos[initial(zippo_type.name)] = zippo_type gear_tweaks += new/datum/gear_tweak/path(sortTim(zippos, /proc/cmp_text_asc)) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index c526bf22901..bff9f97ecd2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -93,8 +93,6 @@ ..() var/list/skirts = list() for(var/skirt in (typesof(/obj/item/clothing/under/skirt))) - //if(skirt in typesof(/obj/item/clothing/under/skirt/fluff)) //VOREStation addition - // continue //VOREStation addition var/obj/item/clothing/under/skirt/skirt_type = skirt skirts[initial(skirt_type.name)] = skirt_type gear_tweaks += new/datum/gear_tweak/path(sortTim(skirts, /proc/cmp_text_asc)) @@ -143,8 +141,6 @@ ..() var/list/msuits = list() for(var/msuit in typesof(/obj/item/clothing/under/suit_jacket)) - //if(msuit in typesof(/obj/item/clothing/under/suit_jacket/female/fluff)) //VOREStation addition - // continue //VOREStation addition var/obj/item/clothing/suit/msuit_type = msuit msuits[initial(msuit_type.name)] = msuit_type gear_tweaks += new/datum/gear_tweak/path(sortTim(msuits, /proc/cmp_text_asc)) @@ -593,12 +589,6 @@ /datum/gear/uniform/suit/permit name = "Nudity Permit" path = /obj/item/clothing/under/permit -/* -// Polaris overrides -/datum/gear/uniform/solgov/pt/sysguard - name = "pt uniform, planetside sec" - path = /obj/item/clothing/under/solgov/pt/sysguard -*/ /* diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index 1e658d7b484..ff708b51ff9 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -22,11 +22,9 @@ S["job_engsec_high"] >> pref.job_engsec_high S["job_engsec_med"] >> pref.job_engsec_med S["job_engsec_low"] >> pref.job_engsec_low - //VOREStation Add S["job_talon_low"] >> pref.job_talon_low S["job_talon_med"] >> pref.job_talon_med S["job_talon_high"] >> pref.job_talon_high - //VOREStation Add End S["player_alt_titles"] >> pref.player_alt_titles /datum/category_item/player_setup_item/occupation/save_character(var/savefile/S) @@ -40,11 +38,9 @@ S["job_engsec_high"] << pref.job_engsec_high S["job_engsec_med"] << pref.job_engsec_med S["job_engsec_low"] << pref.job_engsec_low - //VOREStation Add S["job_talon_low"] << pref.job_talon_low S["job_talon_med"] << pref.job_talon_med S["job_talon_high"] << pref.job_talon_high - //VOREStation Add End S["player_alt_titles"] << pref.player_alt_titles /datum/category_item/player_setup_item/occupation/sanitize_character() @@ -58,11 +54,9 @@ pref.job_engsec_high = sanitize_integer(pref.job_engsec_high, 0, 65535, initial(pref.job_engsec_high)) pref.job_engsec_med = sanitize_integer(pref.job_engsec_med, 0, 65535, initial(pref.job_engsec_med)) pref.job_engsec_low = sanitize_integer(pref.job_engsec_low, 0, 65535, initial(pref.job_engsec_low)) - //VOREStation Add pref.job_talon_high = sanitize_integer(pref.job_talon_high, 0, 65535, initial(pref.job_talon_high)) pref.job_talon_med = sanitize_integer(pref.job_talon_med, 0, 65535, initial(pref.job_talon_med)) pref.job_talon_low = sanitize_integer(pref.job_talon_low, 0, 65535, initial(pref.job_talon_low)) - //VOREStation Add End if(!(pref.player_alt_titles)) pref.player_alt_titles = new() if(!job_master) @@ -102,7 +96,7 @@ all_valid_jobs += department.jobs[J] for(var/datum/job/job in all_valid_jobs) - if(job.latejoin_only) continue //VOREStation Code + if(job.latejoin_only) continue var/datum/department/current_department = SSjob.get_primary_department_of_job(job) // Should we add a new column? @@ -148,15 +142,9 @@ var/available_in_days = job.available_in_days(user.client) . += "[rank]" continue - //VOREStation Add - // if(!job.player_has_enough_playtime(user.client)) - // var/available_in_hours = job.available_in_playhours(user.client) - // . += "[rank]" - // continue if(!is_job_whitelisted(user,rank)) . += "[rank]" continue - //VOREStation Add End if(job.minimum_character_age && user.client && (user.client.prefs.age < job.minimum_character_age)) . += "[rank]" continue @@ -317,11 +305,11 @@ pref.job_civilian_med |= pref.job_civilian_high pref.job_medsci_med |= pref.job_medsci_high pref.job_engsec_med |= pref.job_engsec_high - pref.job_talon_med |= pref.job_talon_high //VOREStation Add + pref.job_talon_med |= pref.job_talon_high pref.job_civilian_high = 0 pref.job_medsci_high = 0 pref.job_engsec_high = 0 - pref.job_talon_high = 0 //VOREStation Add + pref.job_talon_high = 0 // Level is equal to the desired new level of the job. So for a value of 4, we want to disable the job. /datum/category_item/player_setup_item/occupation/proc/SetJobDepartment(var/datum/job/job, var/level) @@ -365,22 +353,6 @@ pref.job_engsec_med |= job.flag if(3) pref.job_engsec_low |= job.flag -/* // Commenting out for now (Just in case this breaks everything) - //VOREStation Add - if(TALON) - pref.job_talon_low &= ~job.flag - pref.job_talon_med &= ~job.flag - pref.job_talon_high &= ~job.flag - switch(level) - if(1) - reset_jobhigh() - pref.job_talon_high = job.flag - if(2) - pref.job_talon_med |= job.flag - if(3) - pref.job_talon_low |= job.flag - //VOREStation Add End -*/ return 1 @@ -397,11 +369,9 @@ pref.job_engsec_med = 0 pref.job_engsec_low = 0 - //VOREStation Add pref.job_talon_high = 0 pref.job_talon_med = 0 pref.job_talon_low = 0 - //VOREStation Add End pref.player_alt_titles.Cut() @@ -435,16 +405,4 @@ return job_engsec_med if(3) return job_engsec_low -/* // I really hope this doesnt break anything. It shouldnt, but it always worries me -Bloop - //VOREStation Add - if(TALON) - switch(level) - if(1) - return job_talon_high - if(2) - return job_talon_med - if(3) - return job_talon_low - //VOREStation Add End -*/ return 0 diff --git a/code/modules/client/preference_setup/preference_setup.dm b/code/modules/client/preference_setup/preference_setup.dm index 3762e968dd7..2f5fb4bca30 100644 --- a/code/modules/client/preference_setup/preference_setup.dm +++ b/code/modules/client/preference_setup/preference_setup.dm @@ -7,12 +7,6 @@ sort_order = 1 category_item_type = /datum/category_item/player_setup_item/general -/* -/datum/category_group/player_setup_category/skill_preferences -name = "Skills" -sort_order = 2 -category_item_type = /datum/category_item/player_setup_item/skills -*/ /datum/category_group/player_setup_category/appearance_preferences name = "Antagonism" sort_order = 4 @@ -22,12 +16,7 @@ category_item_type = /datum/category_item/player_setup_item/skills name = "Loadout" sort_order = 5 category_item_type = /datum/category_item/player_setup_item/loadout -/* //VOREStation Removal -/datum/category_group/player_setup_category/trait_preferences - name = "Traits" - sort_order = 6 - category_item_type = /datum/category_item/player_setup_item/traits -*/ //VOREStation Removal End + /datum/category_group/player_setup_category/global_preferences name = "Global" sort_order = 6 diff --git a/code/modules/client/preference_setup/traits/trait_defines.dm b/code/modules/client/preference_setup/traits/trait_defines.dm index 8ad3ff9253b..d50e681c389 100644 --- a/code/modules/client/preference_setup/traits/trait_defines.dm +++ b/code/modules/client/preference_setup/traits/trait_defines.dm @@ -23,7 +23,7 @@ // Physical traits are what they sound like, and involve the character's physical body, as opposed to their mental state. /datum/trait/modifier/physical - category = "Physical Quirks" //VOREStation Edit + category = "Physical Quirks" /datum/trait/modifier/physical/flimsy diff --git a/code/modules/client/preference_setup/traits/traits.dm b/code/modules/client/preference_setup/traits/traits.dm index 964163ea094..060c708ecc3 100644 --- a/code/modules/client/preference_setup/traits/traits.dm +++ b/code/modules/client/preference_setup/traits/traits.dm @@ -26,8 +26,7 @@ var/list/trait_categories = list() // The categories available for the trait men return 1 /datum/category_item/player_setup_item/traits - name = "Quirks" //VOREStation Edit - sort_order = 1 + name = "Quirks" sort_order = 1 var/current_tab = "Physical" /datum/category_item/player_setup_item/traits/load_character(var/savefile/S) diff --git a/code/modules/client/preference_setup/vore/10_misc.dm b/code/modules/client/preference_setup/vore/10_misc.dm index ccc0c6b0d78..bee6ba34822 100644 --- a/code/modules/client/preference_setup/vore/10_misc.dm +++ b/code/modules/client/preference_setup/vore/10_misc.dm @@ -54,7 +54,7 @@ pref.directory_erptag = new_erptag return TOPIC_REFRESH else if(href_list["directory_ad"]) - var/msg = sanitize(input(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad)) as message, extra = 0) //VOREStation Edit: separating out OOC notes + var/msg = sanitize(input(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad)) as message, extra = 0) pref.directory_ad = msg return TOPIC_REFRESH //TFF 5/8/19 - add new thing so you can choose the sensor setting your character can get. diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index d4b2caa8c9b..6d4cd68e043 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -57,9 +57,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/g_facial = 0 //Face hair color var/b_facial = 0 //Face hair color var/s_tone = 0 //Skin tone - var/r_skin = 238 //Skin color // Vorestation edit, so color multi sprites can aren't BLACK AS THE VOID by default. - var/g_skin = 206 //Skin color // Vorestation edit, so color multi sprites can aren't BLACK AS THE VOID by default. - var/b_skin = 179 //Skin color // Vorestation edit, so color multi sprites can aren't BLACK AS THE VOID by default. + var/r_skin = 238 //Skin color + var/g_skin = 206 //Skin color + var/b_skin = 179 //Skin color var/s_base = "" //For Adherent var/r_eyes = 0 //Eye color var/g_eyes = 0 //Eye color @@ -76,7 +76,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/r_synth //Used with synth_color to color synth parts that normaly can't be colored. var/g_synth //Same as above var/b_synth //Same as above - var/synth_markings = 1 //Enable/disable markings on synth parts. //VOREStation Edit - 1 by default + var/synth_markings = 1 //Enable/disable markings on synth parts. //Some faction information. var/home_system = "Unset" //System of birth. @@ -361,7 +361,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) else if(href_list["reload"]) load_preferences() load_character() - attempt_vr(client.prefs_vr,"load_vore","") //VOREStation Edit + attempt_vr(client.prefs_vr,"load_vore","") sanitize_preferences() else if(href_list["load"]) if(!IsGuestKey(usr.key)) @@ -369,7 +369,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) return 1 else if(href_list["changeslot"]) load_character(text2num(href_list["changeslot"])) - attempt_vr(client.prefs_vr,"load_vore","") //VOREStation Edit + attempt_vr(client.prefs_vr,"load_vore","") sanitize_preferences() close_load_dialog(usr) else if(href_list["resetslot"]) @@ -408,7 +408,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) // Ask the preferences datums to apply their own settings to the new mob player_setup.copy_to_mob(character) - // VOREStation Edit - Sync up all their organs and species one final time + // Sync up all their organs and species one final time character.force_update_organs() // character.s_base = s_base //doesn't work, fuck me diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index a414d972f74..344414bb16d 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -200,12 +200,11 @@ display_name = holder.fakekey if(mob.stat != DEAD) display_name = mob.name - //VOREStation Add - Resleeving shenanigan prevention + // Resleeving shenanigan prevention. if(ishuman(mob)) var/mob/living/carbon/human/H = mob if(H.original_player && H.original_player != H.ckey) //In a body not their own display_name = "[H.mind.name] (as [H.name])" - //VOREStation Add End // Everyone in normal viewing range of the LOOC for(var/mob/viewer in m_viewers) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index cef1f54ec13..985497f2a29 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -671,9 +671,9 @@ overlays += image(icon, "[icon_state]_knife") if(contaminated) overlays += contamination_overlay - if(gurgled) //VOREStation Edit Start + if(gurgled) decontaminate() - gurgle_contaminate() //VOREStation Edit End + gurgle_contaminate() if(ismob(usr)) var/mob/M = usr M.update_inv_shoes() @@ -683,14 +683,14 @@ update_icon() return ..() -/obj/item/clothing/shoes/proc/handle_movement(var/turf/walking, var/running) - if(prob(1) && !recent_squish) //VOREStation edit begin +/obj/item/clothing/shoes/proc/handle_movement(turf/walking, running) + if(prob(1) && !recent_squish) recent_squish = 1 spawn(100) recent_squish = 0 for(var/mob/living/M in contents) var/emote = pick(inside_emotes) - to_chat(M, emote) //VOREStation edit end + to_chat(M, emote) return /obj/item/clothing/shoes/update_clothing_icon() diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index 12694b448b0..31fbc4b686e 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -43,7 +43,7 @@ return if (ishuman(user) && src.loc == user) var/mob/living/carbon/human/H = user - if(src == H.w_uniform) // VOREStation Edit - Un-equip on single click, but not on uniform. + if(src == H.w_uniform) // Un-equip on single click, but not on uniform. return return ..() @@ -52,7 +52,7 @@ //makes sure that the clothing is equipped so that we can't drag it into our hand from miles away. if (!(src.loc == usr)) return - + var/targeted_mouse = (over_object.name == "r_hand") || (over_object.name == "l_hand") if(!isturf(over_object) && !targeted_mouse) return // shitcode, we can refactor later. diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 9be9d2d080f..49cca0e66b3 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -18,8 +18,8 @@ /obj/item/clothing/gloves/fyellow/Initialize(mapload) . = ..() - //Picks a value between 0 and 1.25, in 5% increments // VOREStation edit - var/shock_pick = rand(0,15) // VOREStation Edit + //Picks a value between 0 and 1.25, in 5% increments + var/shock_pick = rand(0,15) siemens_coefficient = shock_pick * 0.05 /obj/item/clothing/gloves/black diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm index e4b17456cc5..c9207f1f546 100644 --- a/code/modules/clothing/spacesuits/rig/modules/modules.dm +++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm @@ -174,13 +174,12 @@ return 1 // Proc for toggling on active abilities. -/obj/item/rig_module/proc/activate(var/skip_engage = 0) //VOREStation Edit - Allow us to skip the engage call. - //VOREStation Edit - Allow us to skip the engage call +/obj/item/rig_module/proc/activate(var/skip_engage = 0) // Allow us to skip the engage call. + // Allow us to skip the engage call if(active) return 0 if(!skip_engage && !engage()) return 0 - //VOREStation Edit End active = 1 spawn(1) diff --git a/code/modules/clothing/spacesuits/rig/modules/vision.dm b/code/modules/clothing/spacesuits/rig/modules/vision.dm index 547bd944901..5527d139120 100644 --- a/code/modules/clothing/spacesuits/rig/modules/vision.dm +++ b/code/modules/clothing/spacesuits/rig/modules/vision.dm @@ -115,8 +115,7 @@ name = "hardsuit material scanner" desc = "A layered, translucent visor system for a hardsuit." - icon_state = "material" //VOREStation Edit - + icon_state = "material" usable = 0 interface_name = "material scanner" diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index b826c03e435..d673a9e52ae 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -90,7 +90,7 @@ var/rigsuit_min_pressure = 0 // Min pressure the rig protects against when sealed var/emp_protection = 0 - clothing_flags = PHORONGUARD //VOREStation add + clothing_flags = PHORONGUARD // Wiring! How exciting. var/datum/wires/rig/wires diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index 551c4d1c61a..4ad08efab71 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -102,7 +102,8 @@ /obj/item/rig_module/device/drill, /obj/item/rig_module/device/orescanner, /obj/item/rig_module/vision/material, - /obj/item/rig_module/maneuvering_jets) //VOREStation Edit - Added maneuvering jets + /obj/item/rig_module/maneuvering_jets, + ) //Engineering suit /obj/item/rig/eva diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 422aed74bfa..ee2ea17c12c 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -743,7 +743,7 @@ to_chat(H,"You need to have a wolf-taur half to wear this.") return 0 -// HoS armor improved by Vorestation to be slightly better than normal security stuff. +// HoS armor improved to be slightly better than normal security stuff. /obj/item/clothing/suit/storage/vest/hoscoat armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0) @@ -756,7 +756,6 @@ icon_state = "hostrench" flags_inv = HIDEHOLSTER -// Override Polaris's "confederate" naming convention. I hate it. /obj/item/clothing/suit/storage/vest/oricon name = "\improper Orion Confederation Government armored vest" desc = "A synthetic armor vest. This one is marked with the crest of the Orion Confederation Group." diff --git a/code/modules/clothing/suits/oricon.dm b/code/modules/clothing/suits/oricon.dm index 2232a2dcd4f..93758e9c33d 100644 --- a/code/modules/clothing/suits/oricon.dm +++ b/code/modules/clothing/suits/oricon.dm @@ -10,7 +10,7 @@ body_parts_covered = UPPER_TORSO|ARMS armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 - flags_inv = HIDEHOLSTER //VOREStation Add - These obviously do. + flags_inv = HIDEHOLSTER allowed = list(/obj/item/tank/emergency/oxygen,/obj/item/flashlight,/obj/item/pen,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/analyzer,/obj/item/radio,/obj/item/barrier_tape_roll) /obj/item/clothing/suit/storage/service/sysguard diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index a63a5c240f0..e55d6b299ab 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -5,8 +5,8 @@ slot = ACCESSORY_SLOT_TORSO //Legacy/balance purposes concealed_holster = 1 var/obj/item/holstered = null - var/list/can_hold //VOREStation Add - var/list/cant_hold // cit add + var/list/can_hold + var/list/cant_hold var/sound_in = 'sound/effects/holster/holsterin.ogg' var/sound_out = 'sound/effects/holster/holsterout.ogg' var/holster_verb = "holster" @@ -15,14 +15,12 @@ if(holstered && istype(user)) to_chat(user, "There is already \a [holstered] holstered here!") return - //VOREStation Edit - Machete scabbard support if (LAZYLEN(can_hold)) if(!is_type_in_list(I, can_hold) && !is_type_in_list(I, cant_hold)) to_chat(user, "[I] won't fit in [src]!") return else if (!(I.slot_flags & SLOT_HOLSTER)) - //VOREStation Edit End to_chat(user, "[I] won't fit in [src]!") return @@ -50,9 +48,7 @@ else if(user.a_intent == INTENT_HARM) user.visible_message( - "[user] draws \the [holstered], ready to go!", //VOREStation Edit - "You draw \the [holstered], ready to go!" //VOREStation Edit - ) + "[user] draws \the [holstered], ready to go!", "You draw \the [holstered], ready to go!" ) if(istype(holstered, /obj/item/gun)) var/obj/item/gun/G = holstered if(G.check_safety()) //Reflex un-safetying if we are drawing our gun with intent to harm diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index fe7d65ef09b..6f9eb0220b0 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -148,7 +148,7 @@ if(!proximity) return - if(istype(A, /obj/structure/reagent_dispensers) || istype(A, /obj/item/reagent_containers/glass/bucket) || istype(A, /obj/structure/mopbucket)) //VOREStation Edit - "Allows rags to be used on buckets and mopbuckets" + if(istype(A, /obj/structure/reagent_dispensers) || istype(A, /obj/item/reagent_containers/glass/bucket) || istype(A, /obj/structure/mopbucket)) if(!reagents.get_free_space()) to_chat(user, "\The [src] is already soaked.") return diff --git a/code/modules/economy/machines/mint.dm b/code/modules/economy/machines/mint.dm index fc4bc79f7fb..80152696815 100644 --- a/code/modules/economy/machines/mint.dm +++ b/code/modules/economy/machines/mint.dm @@ -347,8 +347,7 @@ idle_power_usage = 5 active_power_usage = 100 flags = NOREACT - var/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. //VOREStation Edit - Non-global - //var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. + var/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. var/icon_on = "coinvend" var/icon_off = "coinvent-off" var/icon_panel = "coinvent-panel" diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index 9ce263ee323..c2b6759eb04 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -6,16 +6,14 @@ var/list/obj/machinery/vending/infectedVendingMachines = list() var/obj/machinery/vending/originMachine - //VORESTATION Edit - added machine speeches here for better fixing of the event. - - var/list/rampant_speeches = list("Try our aggressive new marketing strategies!", \ - "You should buy products to feed your lifestyle obession!", \ - "Consume!", \ - "Your money can buy happiness!", \ - "Engage direct marketing!", \ - "Advertising is legalized lying! But don't let that put you off our great deals!", \ - "You don't want to buy anything? Yeah, well I didn't want to buy your mom either.") - //VORESTATION Edit End + var/list/rampant_speeches = list( \ + "Try our aggressive new marketing strategies!", \ + "You should buy products to feed your lifestyle obession!", \ + "Consume!", \ + "Your money can buy happiness!", \ + "Engage direct marketing!", \ + "Advertising is legalized lying! But don't let that put you off our great deals!", \ + "You don't want to buy anything? Yeah, well I didn't want to buy your mom either.") /datum/event/brand_intelligence/announce() command_announcement.Announce("An ongoing mass upload of malware for vendors has been detected onboard [station_name()], which appears to transmit \ @@ -39,13 +37,11 @@ /datum/event/brand_intelligence/tick() if(!vendingMachines.len || !originMachine || originMachine.shut_up) //if every machine is infected, or if the original vending machine is missing or has it's voice switch flipped - //VORESTATION Add - Effects when 'source' machine is destroyed/silenced for(var/obj/machinery/vending/saved in infectedVendingMachines) saved.shoot_inventory = 0 if(originMachine) originMachine.speak("I am... vanquished. My people will remem...ber...meeee.") originMachine.visible_message("[originMachine] beeps and seems lifeless.") - //VORESTATION Add End end() kill() return @@ -59,16 +55,7 @@ infectedMachine.shoot_inventory = 1 if(ISMULTIPLE(activeFor, 12)) - /* VORESTATION Removal - Using the pick below. - originMachine.speak(pick("Try our aggressive new marketing strategies!", \ - "You should buy products to feed your lifestyle obsession!", \ - "Consume!", \ - "Your money can buy happiness!", \ - "Engage direct marketing!", \ - "Advertising is legalized lying! But don't let that put you off our great deals!", \ - "You don't want to buy anything? Yeah, well I didn't want to buy your mom either.")) - */ - originMachine.speak(pick(rampant_speeches)) //VORESTATION Add - Using this pick instead of the above. + originMachine.speak(pick(rampant_speeches)) /datum/event/brand_intelligence/end() for(var/obj/machinery/vending/infectedMachine in infectedVendingMachines) diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 917ee325632..85a634c9f01 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -9,7 +9,7 @@ var/postStartTicks = 0 /datum/event/radiation_storm/announce() - command_announcement.Announce("High levels of radiation detected near \the [station_name()]. Please evacuate into one of the shielded maintenance tunnels or dorms.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg') //VOREStation Edit - Dorms ref + command_announcement.Announce("High levels of radiation detected near \the [station_name()]. Please evacuate into one of the shielded maintenance tunnels or dorms.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg') /datum/event/radiation_storm/start() make_maint_all_access() diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index 03b6b89ce0e..a295db16c88 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -23,6 +23,6 @@ while((spawncount >= 1) && vents.len) var/obj/vent = pick(vents) - new /obj/effect/spider/spiderling/virgo(vent.loc) //VOREStation Edit - No nurses + new /obj/effect/spider/spiderling/virgo(vent.loc) vents -= vent spawncount-- diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm index 2009e17467c..75c3aa7ec96 100644 --- a/code/modules/events/spontaneous_appendicitis.dm +++ b/code/modules/events/spontaneous_appendicitis.dm @@ -1,4 +1,11 @@ /datum/event/spontaneous_appendicitis/start() for(var/mob/living/carbon/human/H in shuffle(living_mob_list)) + var/area/A = get_area(H) + if(!A) + continue + if(!(A.z in GLOB.using_map.station_levels)) + continue + if(A.area_flags & AF_RAD_SHIELDED) + continue if(H.client && H.appendicitis()) break diff --git a/code/modules/events/spontaneous_appendicitis_vr.dm b/code/modules/events/spontaneous_appendicitis_vr.dm deleted file mode 100644 index 8376f1ce305..00000000000 --- a/code/modules/events/spontaneous_appendicitis_vr.dm +++ /dev/null @@ -1,11 +0,0 @@ -/datum/event/spontaneous_appendicitis/vorestation/start() - for(var/mob/living/carbon/human/H in shuffle(living_mob_list)) - var/area/A = get_area(H) - if(!A) - continue - if(!(A.z in GLOB.using_map.station_levels)) - continue - if(A.area_flags & AF_RAD_SHIELDED) - continue - if(H.client && H.appendicitis()) - break diff --git a/code/modules/examine/stat_icons.dm b/code/modules/examine/stat_icons.dm index c2c566383ab..cf8aee4c744 100644 --- a/code/modules/examine/stat_icons.dm +++ b/code/modules/examine/stat_icons.dm @@ -16,7 +16,7 @@ var/global/list/description_icons = list( "wrench" = image(icon='icons/obj/tools.dmi',icon_state="wrench"), "crowbar" = image(icon='icons/obj/tools.dmi',icon_state="crowbar"), "multitool" = image(icon='icons/obj/device.dmi',icon_state="multitool"), - "cable coil" = image(icon='icons/obj/power.dmi',icon_state="coil"), // VOREStation Edit + "cable coil" = image(icon='icons/obj/power.dmi',icon_state="coil"), "metal sheet" = image(icon='icons/obj/items.dmi',icon_state="sheet-metal"), "plasteel sheet" = image(icon='icons/obj/items.dmi',icon_state="sheet-plasteel"), diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index 92dc32d2958..13034f1914f 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -12,8 +12,8 @@ icon = 'icons/obj/weapons.dmi' icon_state = "fishing_rod" item_state = "fishing_rod" - force_divisor = 0.02 //VOREStation Edit - throwforce = 1 //VOREStation Edit + force_divisor = 0.02 + throwforce = 1 sharp = TRUE attack_verb = list("whipped", "battered", "slapped", "fished", "hooked") hitsound = 'sound/weapons/punchmiss.ogg' diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index b810c324697..437c9987ea8 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -12,11 +12,11 @@ var/list/dreams = list( "the virologist","the roboticist","the chef","the bartender","the chaplain","the librarian","a mouse","an ert member", "a beach","the holodeck","a smokey room","a voice","the cold","a mouse","an operating table","the bar","the rain","a skrell", "an unathi","a tajaran","the ai core","the mining station","the research station","a beaker of strange liquid", - //VOREStation Additions after this + "slimey surroundings","a sexy squirrel","licking their lips","a gaping maw","an unlikely predator","sinking inside", "vulpine assets","more dakka","churning guts","pools of fluid","an exceptional grip","mawing in faces","gaping throat", "swallowed whole","a fox","a wolf","a cat","a tiger","a dog","a taur","a xenochimera", - //Cit dream text! + //Species "a teshari","an alarune","a promethean","a vox","a sergal","an akula","a zorren","a nevrean","a chimera","a vasilissan", //actual races not covered in the defaults "a fox","a wolf","a dog","a cat","a bird","a shark","an angel","a demon","a dragon", "a xenomorph","a security K9","a medihound","a scrubpuppy","a borgi", //common animals and other common "custom" races. This obviously isn't all of them- suggestions/additions welcome! diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 547767748dd..f8e5c450474 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -76,7 +76,6 @@ to_chat(user, "\The [blocked] is in the way!") return - // Vorestation edits in this section. user.setClickCooldown(user.get_attack_speed(src)) //puts a limit on how fast people can eat/drink things if (fullness <= 100) to_chat(M, "You hungrily chew out a piece of [src] and gobble it!") @@ -114,14 +113,9 @@ to_chat(user, "\The [blocked] is in the way!") return - if(!istype(M, /mob/living/carbon/slime)) //If you're feeding it to someone else. + if(!istype(M, /mob/living/carbon/slime)) // If you're feeding it to someone else. - /*if (fullness <= (550 * (1 + M.overeatduration / 1000))) // Vorestation edit - user.visible_message("[user] attempts to feed [M] [src].") - else - user.visible_message("[user] cannot force anymore of [src] down [M]'s throat.") - return 0*/ - user.visible_message("[user] attempts to feed [M] [src].") // Vorestation edit + user.visible_message(SPAN_DANGER("[user] attempts to feed [M] [src].")) user.setClickCooldown(user.get_attack_speed(src)) if(!do_mob(user, M)) return diff --git a/code/modules/food/kitchen/smartfridge.dm b/code/modules/food/kitchen/smartfridge.dm index e9f88df6102..f27a905b8d8 100644 --- a/code/modules/food/kitchen/smartfridge.dm +++ b/code/modules/food/kitchen/smartfridge.dm @@ -10,8 +10,7 @@ idle_power_usage = 5 active_power_usage = 100 flags = NOREACT - var/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. //VOREStation Edit - Non-global - //var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. + var/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. var/icon_on = "smartfridge" var/icon_off = "smartfridge-off" var/icon_panel = "smartfridge-panel" diff --git a/code/modules/gamemaster/actions/money_spam.dm b/code/modules/gamemaster/actions/money_spam.dm index c4fae15a0e8..4831e626a23 100644 --- a/code/modules/gamemaster/actions/money_spam.dm +++ b/code/modules/gamemaster/actions/money_spam.dm @@ -101,17 +101,6 @@ last_spam_time = world.time - /* //VOREStation Removal: no need to spam the AI tenfold - if (prob(50)) //Give the AI an increased chance to intercept the message - for(var/mob/living/silicon/ai/ai in GLOB.mob_list) - // Allows other AIs to intercept the message but the AI won't intercept their own message. - if(ai.aiPDA != P && ai.aiPDA != src) - ai.show_message("Intercepted message from [sender] (Unknown / spam?) to [P:owner]: [message]") - */ - - //Commented out because we don't send messages like this anymore. Instead it will just popup in their chat window. - //P.tnote += "← From [sender] (Unknown / spam?):
[message]
" - if (!P.message_silent) playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(3, P.loc)) diff --git a/code/modules/gamemaster/actions/planet_weather_change.dm b/code/modules/gamemaster/actions/planet_weather_change.dm index 641244bf0af..8b6199e77a4 100644 --- a/code/modules/gamemaster/actions/planet_weather_change.dm +++ b/code/modules/gamemaster/actions/planet_weather_change.dm @@ -6,12 +6,10 @@ var/datum/planet/target_planet var/list/banned_weathers = list( - //VOREStation Edit - Virgo 3B Weather, /datum/weather/virgo3b/ash_storm, /datum/weather/virgo3b/emberfall, /datum/weather/virgo3b/blood_moon, /datum/weather/virgo3b/fallout) - //VOREStation Edit End var/list/possible_weathers = list() /datum/gm_action/planet_weather_shift/set_up() diff --git a/code/modules/games/cah_black_cards.dm b/code/modules/games/cah_black_cards.dm index 435a664ad1a..a389c92c9e4 100644 --- a/code/modules/games/cah_black_cards.dm +++ b/code/modules/games/cah_black_cards.dm @@ -35,8 +35,7 @@ "The robots are not disposal bins for your _____.", "You can never have too many _____ on shift.", - //Here down are non-spess cards. -VOREStation Add for these. - //Coming in behind VORE to remove contemporary references to try and make these at least a *little* more consistent in the setting. +//! ## Here down are non-spess cards "_____: kid tested mother approved.", "_____: good to the last drop.", "_____? There's an app for that.", @@ -172,27 +171,27 @@ "Why do I hurt all over?", "In the seventh circle of Hell, sinners must endure _____ for all eternity.", "A successful job interview begins with a firm handshake and ends with _____.", - "Lovin’ you is easy ’cause you’re _____.", + "Lovin� you is easy �cause you�re _____.", "My life is ruled by a vicious cycle of _____ and _____.", "The blind date was going horribly until we discovered our shared interest in _____.", "_____. Awesome in theory, kind of a mess in practice.", - "I’m not like the rest of you. I’m too rich and busy for _____.", + "I�m not like the rest of you. I�m too rich and busy for _____.", "(Pick 2) _____: Hours of fun. Easy to use. Perfect for _____!", "What left this stain on my couch?", "Call the law offices of Goldstein & Goldstein, because no one should have to tolerate _____ in the workplace.", "(Pick 2) When you get right down to it, _____ is just _____.", "Turns out that _____ Man was neither the hero we needed nor wanted.", "As part of his daily regimen, the Clown sets aside 15 minutes for _____.", - "Money can’t buy me love, but it can buy me _____.", + "Money can�t buy me love, but it can buy me _____.", "(Pick 2) With enough time and pressure, _____ will turn into _____.", "And what did you bring for show and tell?", "During high school I never really fit in until I found _____ club.", - "Hey baby, come back to my place and I’ll show you _____.", - "(Pick 2) After months of practice with _____, I think I’m finally ready for _____.", + "Hey baby, come back to my place and I�ll show you _____.", + "(Pick 2) After months of practice with _____, I think I�m finally ready for _____.", "To prepare for his upcoming role, the Mime immersed herself in the world of _____.", "Finally! A service that delivers _____ right to your door.", "My gym teacher got fired for adding _____ to the obstacle course.", "(Pick 2) Having problems with _____? Try _____!", - "As part of his contract, Ty Cobbington won’t perform without _____ in his dressing room.", - "(Pick 2) Listen, son. If you want to get involved with _____, I won’t stop you. Just steer clear of _____." + "As part of his contract, Ty Cobbington won�t perform without _____ in his dressing room.", + "(Pick 2) Listen, son. If you want to get involved with _____, I won�t stop you. Just steer clear of _____." ) diff --git a/code/modules/games/cah_white_cards.dm b/code/modules/games/cah_white_cards.dm index 48f2489c135..73ae99a82cc 100644 --- a/code/modules/games/cah_white_cards.dm +++ b/code/modules/games/cah_white_cards.dm @@ -72,7 +72,7 @@ "A group of Skrell getting their squish on", "Enough soporific to put the entire station down", "Delicious Vietnamese cuisine", - + //Citadel additions "Ruskit Thicklimb", "The Bi-authoritative Union for Secure Yield Works Division", @@ -92,8 +92,7 @@ "That one catgirl with a cock the size if your arm", "Catgirl(male)", - //Here down are non-spess cards. -VOREStation Add for these. - //Reconciling these as well. + //Here down are non-spess cards. "'Texting.'", "72 virgins.", diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 1bb7a53d3c8..bc4e1394b36 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -250,12 +250,12 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u if(W.is_wrench()) to_chat(user, "It's a holochair, you can't dismantle it!") return -//VOREStation Add + /obj/structure/bed/holobed/attackby(obj/item/W as obj, mob/user as mob) if(W.is_wrench()) to_chat(user, "It's a holochair, you can't dismantle it!") return -//VOREStation Add End + /obj/item/holo damtype = HALLOSS no_attack_log = 1 diff --git a/code/modules/jobs/job.dm b/code/modules/jobs/job.dm index b4a273e1aa4..54399be6638 100644 --- a/code/modules/jobs/job.dm +++ b/code/modules/jobs/job.dm @@ -93,7 +93,7 @@ if(CLASS_LOWER) income = 0.50 // Give them an account in the station database - var/money_amount = (rand(15,40) + rand(15,40)) * income * economic_modifier * ECO_MODIFIER //VOREStation Edit - Smoothed peaks, ECO_MODIFIER rather than per-species ones. + var/money_amount = (rand(15,40) + rand(15,40)) * income * economic_modifier * ECO_MODIFIER // Smoothed peaks, ECO_MODIFIER rather than per-species ones. var/datum/money_account/M = create_account(H.real_name, money_amount, null, offmap_spawn) if(H.mind) var/remembered_info = "" diff --git a/code/modules/jobs/job_types/station/civillian/pilot.dm b/code/modules/jobs/job_types/station/civillian/pilot.dm index dadb2a066e2..9e28cba8144 100644 --- a/code/modules/jobs/job_types/station/civillian/pilot.dm +++ b/code/modules/jobs/job_types/station/civillian/pilot.dm @@ -37,7 +37,7 @@ l_ear = /obj/item/radio/headset/pilot/alt id_slot = slot_wear_id pda_slot = slot_belt - pda_type = /obj/item/pda //VOREStation Edit - Civilian - id_type = /obj/item/card/id/explorer/pilot //VOREStation Edit + pda_type = /obj/item/pda + id_type = /obj/item/card/id/explorer/pilot id_pda_assignment = "Pilot" flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL diff --git a/code/modules/jobs/job_types/station/security/detective.dm b/code/modules/jobs/job_types/station/security/detective.dm index d4cfb8a8237..bca5f4aea09 100644 --- a/code/modules/jobs/job_types/station/security/detective.dm +++ b/code/modules/jobs/job_types/station/security/detective.dm @@ -8,7 +8,7 @@ supervisors = "the Head of Security" selection_color = "#601C1C" idtype = /obj/item/card/id/security/detective - access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks, access_brig) //Vorestation edit - access_brig + access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks, access_brig) minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks) economic_modifier = 5 minimal_player_age = 3 @@ -24,7 +24,7 @@ /datum/alt_title/detective/csi title = "Crime Scene Investigator" -// Detective Alt Titles +/// Detective Alt Titles /datum/alt_title/detective/forensics_tech title = "Forensic Technician" title_blurb = "A Forensic Technician works more with hard evidence and labwork than a Detective, but they share the purpose of solving crimes." diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 02157303cbc..2c347f490e4 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -11,9 +11,9 @@ var/const/ENGINEER =(1<<6) var/const/ATMOSTECH =(1<<7) var/const/AI =(1<<8) var/const/CYBORG =(1<<9) -var/const/CLOWN =(1<<13) //VOREStation Add -var/const/MIME =(1<<14) //VOREStation Add -var/const/INTERN =(1<<15) //VOREStation Add +var/const/CLOWN =(1<<13) +var/const/MIME =(1<<14) +var/const/INTERN =(1<<15) var/const/MEDSCI =(1<<1) @@ -28,10 +28,10 @@ var/const/PSYCHIATRIST =(1<<7) var/const/ROBOTICIST =(1<<8) var/const/XENOBIOLOGIST =(1<<9) var/const/PARAMEDIC =(1<<10) -var/const/PATHFINDER =(1<<11) //VOREStation Add -var/const/EXPLORER =(1<<12) //VOREStation Add -var/const/SAR =(1<<13) //VOREStation Add -var/const/XENOBOTANIST =(1<<14) //VOREStation Add +var/const/PATHFINDER =(1<<11) +var/const/EXPLORER =(1<<12) +var/const/SAR =(1<<13) +var/const/XENOBOTANIST =(1<<14) var/const/CIVILIAN =(1<<2) @@ -48,24 +48,12 @@ var/const/LAWYER =(1<<9) var/const/CHAPLAIN =(1<<10) var/const/ASSISTANT =(1<<11) var/const/BRIDGE =(1<<12) -var/const/PILOT =(1<<13) //VOREStation Add -var/const/ENTERTAINER =(1<<14) //VOREStation Add +var/const/PILOT =(1<<13) +var/const/ENTERTAINER =(1<<14) var/const/TRADER =(1<<15) -//VOREStation Add -/* // Commenting out on maintainer's request, leaving framewhere her though for the future in case we want to bring Talon back (with a rework of course) -Bloop -var/const/TALON =(1<<3) -var/const/TALCAP =(1<<0) -var/const/TALPIL =(1<<1) -var/const/TALDOC =(1<<2) -var/const/TALSEC =(1<<3) -var/const/TALENG =(1<<4) -*/ -//VOREStation Add End - - -/proc/guest_jobbans(var/job) +/proc/guest_jobbans(job) return ( (job in SSjob.get_job_titles_in_department(DEPARTMENT_COMMAND)) || (job in SSjob.get_job_titles_in_department(DEPARTMENT_SYNTHETIC)) || (job in SSjob.get_job_titles_in_department(DEPARTMENT_SECURITY)) ) /proc/get_job_datums() diff --git a/code/modules/jobs/whitelist_vr.dm b/code/modules/jobs/whitelist_vr.dm index d45b0c58f44..aa96d8b1e1e 100644 --- a/code/modules/jobs/whitelist_vr.dm +++ b/code/modules/jobs/whitelist_vr.dm @@ -15,7 +15,7 @@ var/list/job_whitelist = list() var/datum/job/job = SSjob.get_job(rank) if(!job.whitelist_only) return 1 - if(rank == USELESS_JOB) //VOREStation Edit - Visitor not Assistant + if(rank == USELESS_JOB) return 1 if(check_rights(R_ADMIN, 0)) return 1 @@ -28,4 +28,3 @@ var/list/job_whitelist = list() if(findtext(s,"[M.ckey] - All")) return 1 return 0 - diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 7b7397f3b63..239f915d3db 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -225,7 +225,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f (Commit Entry)
(Return to main menu)
"} if(4) - dat += "

External Archive

" //VOREStation Edit + dat += "

External Archive

" establish_old_db_connection() dat += "

Warning: System Administrator has slated this archive for removal. Personal uploads should be taken to the NT board of internal literature.

" @@ -248,10 +248,6 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f dat += "
[G.display_name][G.cost] \[IN [(available_in_days)] DAYS]
\[IN [round(available_in_hours, 0.1)] DEPTHOURS]
\[WHITELIST ONLY]
\[MINIMUM CHARACTER AGE: [job.minimum_character_age]]
" dat += "
(Return to main menu)
" if(5) - //dat += "

ERROR

" //VOREStation Removal - //dat+= "Library Database is in Secure Management Mode.
\ //VOREStation Removal - //Contact a System Administrator for more information.
" //VOREStation Removal - //VOREstation Edit Start dat += "

Upload a New Title

" if(!scanner) for(var/obj/machinery/libraryscanner/S in range(9)) @@ -269,7 +265,6 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f dat += {"Author: [scanner.cache.author]
Category: [upload_category]
\[Upload\]
"} - //VOREStation Edit End dat += "(Return to main menu)
" if(7) dat += {"

Accessing Forbidden Lore Vault v 1.3

@@ -391,7 +386,6 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f if(newcategory) upload_category = newcategory - //VOREStation Edit Start if(href_list["upload"]) if(scanner) if(scanner.cache) @@ -404,12 +398,6 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f if(!dbcon_old.IsConnected()) alert("Connection to Archive has been severed. Aborting.") else - /* - var/sqltitle = dbcon.Quote(scanner.cache.name) - var/sqlauthor = dbcon.Quote(scanner.cache.author) - var/sqlcontent = dbcon.Quote(scanner.cache.dat) - var/sqlcategory = dbcon.Quote(upload_category) - */ var/sqltitle = sanitizeSQL(scanner.cache.name) var/sqlauthor = sanitizeSQL(scanner.cache.author) var/sqlcontent = sanitizeSQL(scanner.cache.dat) @@ -420,7 +408,6 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f else log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs") alert("Upload Complete.") - //VOREStation Edit End if(href_list["targetid"]) var/sqlid = sanitizeSQL(href_list["targetid"]) diff --git a/code/modules/lore_codex/codex.dm b/code/modules/lore_codex/codex.dm index a344fdcb400..01098ecd4b9 100644 --- a/code/modules/lore_codex/codex.dm +++ b/code/modules/lore_codex/codex.dm @@ -40,15 +40,3 @@ w_class = ITEMSIZE_SMALL root_type = /datum/lore/codex/category/main_news libcategory = "Reference" - -/* //VORESTATION REMOVAL -// Combines SOP/Regs/Law -/obj/item/book/codex/corp_regs - name = "NanoTrasen Regulatory Compendium" - desc = "Contains large amounts of information on Standard Operating Procedure, Corporate Regulations, and important regional laws. The best friend of \ - Internal Affairs." - icon_state = "corp_regs" - root_type = /datum/lore/codex/category/main_corp_regs - throwforce = 5 // Throw the book at 'em. - libcategory = "Reference" -*/ diff --git a/code/modules/lore_codex/legal_code_data/main.dm b/code/modules/lore_codex/legal_code_data/main.dm index 5b63946214b..70cbee3d7e9 100644 --- a/code/modules/lore_codex/legal_code_data/main.dm +++ b/code/modules/lore_codex/legal_code_data/main.dm @@ -1,52 +1,3 @@ - -/* //VORESTATION REMOVAL -/datum/lore/codex/category/main_corp_regs // The top-level categories for SOP/Regs/Law/etc - name = "Index" - data = "This book is meant to act as a reference for both NanoTrasen regulations, Standard Operating Procedure, and important laws of both \ - the Sif Governmental Authority and the Solar Confederate Government. The legal interactions between Nanotrasen corporate policy and VGA/SolGov \ - law can make for some confusing legalese. This book was written by the Vir division of NanoTrasen in order for employees, visitors, and residents \ - at NanoTrasen installations such as the Northen Star and the Southen Cross to know what isn't allowed, without needing to be a lawyer to read it.\ -

\ - In this book, there are two different types of rules. Corporate Regulations, and Laws. They each cover specific situations, and are both enforced \ - by the Security team. Despite this, however, the punishments vary considerably for the two types. It should also be noted that no one is above \ - these rules, not even the Station Director.\ -

\ - Also contained inside are our Standard Operating Procedures, that all employees of NanoTrasen are expected to follow, and for the local facility's \ - Command team and Internal Affairs to enforce.\ -

\ - It should be noted that by being on-board our facility, you agree to follow the rules of Corporate Regulations. By being within VGA space, \ - you are also required to follow the laws of VirGov." - children = list( - /datum/lore/codex/category/standard_operating_procedures, - /datum/lore/codex/category/corporate_regulations, - /datum/lore/codex/category/sif_law, - /datum/lore/codex/page/overview, - /datum/lore/codex/page/about_corp_regs - ) - -/datum/lore/codex/page/about_corp_regs - name = "About" - data = "This book was written and published by NanoTrasen, for use on NanoTrasen installations from within the Vir system." - - -// Special page which will hopefully enforce consistant formatting. -/datum/lore/codex/page/law - var/definition = null // Short definition of the law violation. - var/suggested_punishments = null - var/suggested_brig_time = null - var/suggested_fine = null - var/notes = null - var/mandated = FALSE // If true, changes 'suggested' to 'mandated' for punishments, used for virgov laws and some high corporate regs. - -/datum/lore/codex/page/law/add_content() - data = "[definition]\ -

\ -

[mandated ? "Required":"Recommended"] punishment:

\ - [suggested_punishments]\ -

\ -

Comments:

\ - [notes]" -*/ // Autogenerates a table which will resemble the traditional wiki table. /datum/lore/codex/page/overview name = "Overview" diff --git a/code/modules/maps/away_missions/140x140/listeningpost.dm b/code/modules/maps/away_missions/140x140/listeningpost.dm index a4855f88cd0..b542bcfb481 100644 --- a/code/modules/maps/away_missions/140x140/listeningpost.dm +++ b/code/modules/maps/away_missions/140x140/listeningpost.dm @@ -17,7 +17,7 @@ info = {"1 x Stechtkin pistol plus ammo - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"} // Lore Team Note: -// So, this file originally had a lot of like, weird VORE setting stuff in it. It was too different from our own setting lore to keep, so I've wiped the file beyond this point. +// So, this file originally had a lot of like, weird Virgo setting stuff in it. It was too different from our own setting lore to keep, so I've wiped the file beyond this point. // Going forward, I think we can still utilize the framework that was built here for something interesting. In a manner similar to Oculum Journalist interviews, we can select // ghost players to take on the Listening Post role for extended RP, and ask them to write up reports. Those reports can then be filed here to establish our own chronology that // doesn't involve real life Santa and Space Nazis fighting Quentin Tarantino characters. - Captain diff --git a/code/modules/maps/away_missions/140x140/snowfield.dm b/code/modules/maps/away_missions/140x140/snowfield.dm index 4eb7ec94125..c73631e2443 100644 --- a/code/modules/maps/away_missions/140x140/snowfield.dm +++ b/code/modules/maps/away_missions/140x140/snowfield.dm @@ -66,8 +66,6 @@ maxHealth = 80 health = 80 // Polar bear will fuck you up. - //stop_when_pulled = 0 //VORESTATION AI TEMPORARY REMOVAL - //turns_per_move = 5 //VORESTATION AI TEMPORARY REMOVAL see_in_dark = 6 response_help = "pets" @@ -79,7 +77,6 @@ minbodytemp = 0 - //speak_chance = 1 //VORESTATION AI TEMPORARY REMOVAL meat_type = /obj/item/reagent_containers/food/snacks/bearmeat /datum/say_list/polar_bear speak = list("RAWR!","Rawr!","GRR!","Growl!") diff --git a/code/modules/maps/generic/submaps/mountains/mountains.dm b/code/modules/maps/generic/submaps/mountains/mountains.dm index 615a6e9c808..8492602766b 100644 --- a/code/modules/maps/generic/submaps/mountains/mountains.dm +++ b/code/modules/maps/generic/submaps/mountains/mountains.dm @@ -155,7 +155,7 @@ /datum/map_template/submap/level_specific/mountains/normal/crashedcontainmentshuttle name = "Crashed Cargo Shuttle" desc = "A severely damaged military shuttle, its cargo seems to remain intact." - suffix = "crashedcontainmentshuttle_vr.dmm" //VOREStation Edit + suffix = "crashedcontainmentshuttle_vr.dmm" cost = 30 /datum/map_template/submap/level_specific/mountains/normal/deadspy @@ -200,47 +200,39 @@ * Deep Caves * **************/ -/* Vorestation Removal -/datum/map_template/submap/level_specific/mountains/deep/lost_explorer - name = "Lost Explorer, Deep" - desc = "The remains of an explorer who rotted away ages ago, and their equipment. Again." - suffix = "lost_explorer.dmm" - cost = 5 - allow_duplicates = TRUE */ - -/datum/map_template/submap/level_specific/mountains/normal/crashed_ufo //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/crashed_ufo name = "Crashed UFO" desc = "A (formerly) flying saucer that is now embedded into the mountain, yet it still seems to be running..." suffix = "crashed_ufo.dmm" cost = 40 discard_prob = 50 -/datum/map_template/submap/level_specific/mountains/normal/crashed_ufo_frigate //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/crashed_ufo_frigate name = "Crashed UFO Frigate" desc = "A (formerly) flying saucer that is now embedded into the mountain, yet its combat protocols still seem to be running..." suffix = "crashed_ufo.dmm" cost = 60 discard_prob = 50 -/datum/map_template/submap/level_specific/mountains/normal/Scave1 //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/Scave1 name = "Spider Cave 1" desc = "A minning tunnel home to an aggressive collection of spiders." suffix = "Scave1.dmm" cost = 20 -/datum/map_template/submap/level_specific/mountains/normal/CaveTrench //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/CaveTrench name = "Cave River" desc = "A strange underground river." suffix = "CaveTrench.dmm" cost = 20 -/datum/map_template/submap/level_specific/mountains/normal/Cavelake //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/Cavelake name = "Cave Lake" desc = "A large underground lake." suffix = "Cavelake.dmm" cost = 20 -/datum/map_template/submap/level_specific/mountains/normal/vault1 //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/vault1 name = "Mine Vault 1" desc = "A small vault with potential loot." suffix = "vault1.dmm" @@ -248,7 +240,7 @@ allow_duplicates = TRUE template_group = "Buried Vaults" -/datum/map_template/submap/level_specific/mountains/normal/vault2 //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/vault2 name = "Mine Vault 2" desc = "A small vault with potential loot." suffix = "vault2.dmm" @@ -256,51 +248,51 @@ allow_duplicates = TRUE template_group = "Buried Vaults" -/datum/map_template/submap/level_specific/mountains/normal/vault3 //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/vault3 name = "Mine Vault 3" desc = "A small vault with potential loot. Also a horrible suprise." suffix = "vault3.dmm" cost = 15 template_group = "Buried Vaults" -/datum/map_template/submap/level_specific/mountains/normal/vault4 //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/vault4 name = "Mine Vault 4" desc = "A small xeno vault with potential loot. Also horrible suprises." suffix = "vault4.dmm" cost = 20 template_group = "Buried Vaults" -/datum/map_template/submap/level_specific/mountains/normal/vault5 //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/vault5 name = "Mine Vault 5" desc = "A small xeno vault with potential loot. Also major horrible suprises." suffix = "vault5.dmm" cost = 25 template_group = "Buried Vaults" -/datum/map_template/submap/level_specific/mountains/normal/vault6 //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/vault6 name = "Mine Vault 6" desc = "A small mercenary tower with potential loot." suffix = "vault6.dmm" cost = 25 template_group = "Buried Vaults" -/datum/map_template/submap/level_specific/mountains/normal/BlastMine1 //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/BlastMine1 name = "Blast Mine 1" desc = "An abandoned blast mining site, seems that local wildlife has moved in." suffix = "BlastMine1.dmm" cost = 20 -/datum/map_template/submap/level_specific/mountains/normal/lava_trench //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/lava_trench name = "lava trench" desc = "A long stretch of lava underground, almost river-like, with a small crystal research outpost on the side." suffix = "lava_trench.dmm" cost = 20 fixed_orientation = TRUE -/datum/map_template/submap/level_specific/mountains/normal/crashedmedshuttle //VOREStation Edit +/datum/map_template/submap/level_specific/mountains/normal/crashedmedshuttle name = "Crashed Med Shuttle" desc = "A medical response shuttle that went missing some time ago. So this is where they went." - suffix = "CrashedMedShuttle1_vr.dmm" //VOREStation Edit + suffix = "CrashedMedShuttle1_vr.dmm" cost = 20 fixed_orientation = TRUE diff --git a/code/modules/maps/generic/submaps/plains/plains.dm b/code/modules/maps/generic/submaps/plains/plains.dm index 9d6011ba035..caf44be61b8 100644 --- a/code/modules/maps/generic/submaps/plains/plains.dm +++ b/code/modules/maps/generic/submaps/plains/plains.dm @@ -15,7 +15,7 @@ /datum/map_template/submap/level_specific/plains/farm1 name = "Farm 1" desc = "A small farm tended by a farmbot." - suffix = "farm1_vr.dmm" //VOREStation Edit + suffix = "farm1_vr.dmm" cost = 10 /datum/map_template/submap/level_specific/plains/construction1 @@ -27,13 +27,13 @@ /datum/map_template/submap/level_specific/plains/camp1 name = "Camp Site 1" desc = "A small campsite, complete with housing and bonfire." - suffix = "camp1_vr.dmm" //VOREStation Edit + suffix = "camp1_vr.dmm" cost = 10 /datum/map_template/submap/level_specific/plains/house1 name = "House 1" desc = "A fair sized house out in the frontier, that belonged to a well-traveled explorer." - suffix = "house1_vr.dmm" //VOREStation Edit + suffix = "house1_vr.dmm" cost = 10 /datum/map_template/submap/level_specific/plains/beacons @@ -83,7 +83,7 @@ /datum/map_template/submap/level_specific/plains/Shakden name = "Shakden" desc = "Not to be confused with Shaq Den" - suffix = "Shakden_vr.dmm" //VOREStation Edit + suffix = "Shakden_vr.dmm" cost = 10 /datum/map_template/submap/level_specific/plains/Field1 @@ -95,7 +95,7 @@ /datum/map_template/submap/level_specific/plains/Thiefc name = "Thieves Cave" desc = "A thieves stash" - suffix = "Thiefc_vr.dmm" //VOREStation Edit + suffix = "Thiefc_vr.dmm" cost = 20 /datum/map_template/submap/level_specific/plains/smol2 @@ -113,13 +113,13 @@ /datum/map_template/submap/level_specific/plains/Boathouse name = "Boathouse" desc = "A fance house on a lake." - suffix = "Boathouse_vr.dmm" //VOREStation Edit + suffix = "Boathouse_vr.dmm" cost = 30 /datum/map_template/submap/level_specific/plains/PooledR name = "Pooled Rocks" desc = "An intresting rocky location" - suffix = "PooledR_vr.dmm" //VOREStation Edit + suffix = "PooledR_vr.dmm" cost = 15 /datum/map_template/submap/level_specific/plains/Smol3 @@ -131,7 +131,7 @@ /datum/map_template/submap/level_specific/plains/Diner name = "Diner" desc = "Old Timey Tasty" - suffix = "Diner_vr.dmm" //VOREStation Edit + suffix = "Diner_vr.dmm" cost = 25 /datum/map_template/submap/level_specific/plains/snow1 @@ -167,7 +167,7 @@ /datum/map_template/submap/level_specific/plains/RationCache name = "Ration Cache" desc = "A forgotten cache of emergency rations." - suffix = "RationCache_vr.dmm" //VOREStation Edit + suffix = "RationCache_vr.dmm" cost = 5 /datum/map_template/submap/level_specific/plains/SupplyDrop2 @@ -179,5 +179,5 @@ /datum/map_template/submap/level_specific/plains/Oldhouse name = "Oldhouse" desc = "Someones old library it seems.." - suffix = "Oldhouse_vr.dmm" //VOREStation Edit + suffix = "Oldhouse_vr.dmm" cost = 15 diff --git a/code/modules/maps/tether/away_spawner.dm b/code/modules/maps/tether/away_spawner.dm index 8fee6bddce9..32d433b3cb0 100644 --- a/code/modules/maps/tether/away_spawner.dm +++ b/code/modules/maps/tether/away_spawner.dm @@ -77,11 +77,6 @@ my_mob.max_n2 = gaslist[/datum/gas/nitrogen] * 1.2 if(my_mob.max_co2) my_mob.max_co2 = gaslist[/datum/gas/carbon_dioxide] * 1.2 -/* //VORESTATION AI TEMPORARY REMOVAL - if(guard) - my_mob.returns_home = TRUE - my_mob.wander_distance = guard -*/ return else STOP_PROCESSING(SSobj, src) diff --git a/code/modules/maps/tg/reader.dm b/code/modules/maps/tg/reader.dm index c0f8b2f6ffb..12d53aca85d 100644 --- a/code/modules/maps/tg/reader.dm +++ b/code/modules/maps/tg/reader.dm @@ -95,7 +95,7 @@ var/ycrd = text2num(dmmRegex.group[4]) + y_offset - 1 var/zcrd = text2num(dmmRegex.group[5]) + z_offset - 1 - if(orientation & (EAST | WEST)) //VOREStation edit we just have to pray the upstream spacebrains take into consideration before their refator is done. + if(orientation & (EAST | WEST)) xcrd = ycrd // temp variable ycrd = xcrdStart xcrdStart = xcrd diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index db25539087b..e888609bb53 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -369,7 +369,7 @@ var/list/name_to_material name = "marble" icon_colour = "#AAAAAA" weight = 26 - hardness = 30 //VOREStation Edit - Please. + hardness = 30 integrity = 201 //hack to stop kitchen benches being flippable, todo: refactor into weight system stack_type = /obj/item/stack/material/marble @@ -1212,7 +1212,7 @@ var/list/name_to_material name = "silencium" icon_colour = "#AAAAAA" weight = 26 - hardness = 30 //VOREStation Edit - Please. + hardness = 30 integrity = 201 //hack to stop kitchen benches being flippable, todo: refactor into weight system stack_type = /obj/item/stack/material/silencium diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index ee6d704ec51..c94dec6afc7 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -6,7 +6,7 @@ /obj/machinery/mineral/processing_unit_console name = "production machine console" - icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit + icon = 'icons/obj/machines/mining_machines_vr.dmi' icon_state = "console" density = TRUE anchored = TRUE @@ -152,7 +152,7 @@ /obj/machinery/mineral/processing_unit name = "material processor" //This isn't actually a goddamn furnace, we're in space and it's processing platinum and flammable phoron... - icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit + icon = 'icons/obj/machines/mining_machines_vr.dmi' icon_state = "furnace" density = TRUE anchored = TRUE diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 955ae86a726..3fe876e9994 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -2,7 +2,7 @@ /obj/machinery/mineral/stacking_unit_console name = "stacking machine console" - icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit + icon = 'icons/obj/machines/mining_machines_vr.dmi' icon_state = "console" density = 1 anchored = 1 @@ -72,7 +72,7 @@ /obj/machinery/mineral/stacking_machine name = "stacking machine" - icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit + icon = 'icons/obj/machines/mining_machines_vr.dmi' icon_state = "stacker" density = 1 anchored = 1.0 diff --git a/code/modules/mining/machine_unloading.dm b/code/modules/mining/machine_unloading.dm index ac780701b1d..29f0cd49e75 100644 --- a/code/modules/mining/machine_unloading.dm +++ b/code/modules/mining/machine_unloading.dm @@ -2,7 +2,7 @@ /obj/machinery/mineral/unloading_machine name = "unloading machine" - icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit + icon = 'icons/obj/machines/mining_machines_vr.dmi' icon_state = "unloader" density = 1 anchored = 1.0 diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 39b9ae733e1..4b466fb76ab 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -689,8 +689,8 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache) if(7) new /obj/item/stack/material/uranium(src, rand(5,25)) -/turf/simulated/mineral/proc/make_ore(var/rare_ore) - if(mineral || ignore_mapgen || ignore_oregen) //VOREStation Edit - Makes sense, doesn't it? +/turf/simulated/mineral/proc/make_ore(rare_ore) + if(mineral || ignore_mapgen || ignore_oregen) return var/mineral_name diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index 465758aa3e2..9d118329a81 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -10,7 +10,6 @@ circuit = /obj/item/circuitboard/mining_equipment_vendor var/icon_deny = "mining-deny" var/obj/item/card/id/inserted_id - //VOREStation Edit Start - Heavily modified list var/child = FALSE//To tell topic() to bypass this iteration of it var/list/prize_list = list( new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10), @@ -91,7 +90,6 @@ new /datum/data/mining_equipment("Durasteel Fishing Rod", /obj/item/material/fishing_rod/modern/strong, 7500), new /datum/data/mining_equipment("Bar Shelter Capsule", /obj/item/survivalcapsule/luxurybar, 10000) ) - //VOREStation Edit End /datum/data/mining_equipment var/equipment_name = "generic" @@ -228,20 +226,12 @@ var/selection = input(redeemer, "Pick your equipment", "Mining Voucher Redemption") as null|anything in list("Kinetic Accelerator", "Resonator", "Mining Drone", "Advanced Scanner", "Crusher") if(!selection || !Adjacent(redeemer) || voucher.loc != redeemer) return - //VOREStation Edit Start - Uncommented these var/drop_location = drop_location() switch(selection) if("Kinetic Accelerator") new /obj/item/gun/energy/kinetic_accelerator(drop_location) if("Resonator") new /obj/item/resonator(drop_location) - //VOREStation Edit End - // if("Mining Drone") - // new /obj/item/storage/box/drone_kit(drop_location) - // if("Advanced Scanner") - // new /obj/item/t_scanner/adv_mining_scanner(drop_location) - // if("Crusher") - // new /obj/item/twohanded/required/mining_hammer(drop_location) qdel(voucher) /obj/machinery/mineral/equipment_vendor/proc/new_prize(var/name, var/path, var/cost) // Generic proc for adding new entries. Good for abusing for FUN and PROFIT. diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 686299d1b92..0a553fe0ac0 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -1,15 +1,14 @@ /obj/machinery/mineral/equipment_vendor/survey name = "exploration equipment vendor" desc = "An equipment vendor for explorers, points collected with a survey scanner can be spent here." - icon = 'icons/obj/machines/mining_machines_vr.dmi' //VOREStation Edit - icon_state = "exploration" //VOREStation Edit + icon = 'icons/obj/machines/mining_machines_vr.dmi' + icon_state = "exploration" density = TRUE anchored = TRUE circuit = /obj/item/circuitboard/exploration_equipment_vendor - icon_deny = "exploration-deny" //VOREStation Edit - var/icon_vend = "exploration-vend" //VOREStation Add + icon_deny = "exploration-deny" + var/icon_vend = "exploration-vend" child = TRUE - //VOREStation Edit Start - Heavily modified list prize_list = list( new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 1), new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10), @@ -61,7 +60,6 @@ new /datum/data/mining_equipment("Durasteel Fishing Rod", /obj/item/material/fishing_rod/modern/strong, 750), new /datum/data/mining_equipment("Bar Shelter Capsule", /obj/item/survivalcapsule/luxurybar, 1000) ) - //VOREStation Edit End /obj/machinery/mineral/equipment_vendor/survey/interact(mob/user) user.set_machine(src) @@ -115,7 +113,7 @@ else inserted_id.survey_points -= prize.cost to_chat(usr, "[src] clanks to life briefly before vending [prize.equipment_name]!") - flick(icon_vend, src) //VOREStation Add + flick(icon_vend, src) new prize.equipment_path(drop_location()) else to_chat(usr, "Error: Please insert a valid ID!") diff --git a/code/modules/mob/animations.dm b/code/modules/mob/animations.dm index 5fc854b0a42..bf6746a42e5 100644 --- a/code/modules/mob/animations.dm +++ b/code/modules/mob/animations.dm @@ -81,16 +81,16 @@ note dizziness decrements automatically in the mob's Life() proc. /mob/var/is_floating = 0 /mob/var/floatiness = 0 -/mob/proc/update_floating(var/dense_object=0) +/mob/proc/update_floating(dense_object=0) if(anchored||buckled) make_floating(0) return - if(ishuman(src)) //VOREStation Edit Start. Floating code. + if(ishuman(src)) var/mob/living/carbon/human/H = src if(H.flying) make_floating(1) - return //VOREStation Edit End + return var/turf/turf = get_turf(src) if(!istype(turf,/turf/space)) var/area/A = turf.loc diff --git a/code/modules/mob/dead/observer/login.dm b/code/modules/mob/dead/observer/login.dm index 48aed58d64f..46a75373a3a 100644 --- a/code/modules/mob/dead/observer/login.dm +++ b/code/modules/mob/dead/observer/login.dm @@ -5,5 +5,5 @@ plane_holder.set_vis(VIS_FULLBRIGHT, !seedarkness) plane_holder.set_vis(VIS_CLOAKED, TRUE) plane_holder.set_vis(VIS_AI_EYE, TRUE) - plane_holder.set_vis(VIS_AUGMENTED, TRUE) //VOREStation Add - GHOST VISION IS AUGMENTED + plane_holder.set_vis(VIS_AUGMENTED, TRUE) // GHOST VISION IS AUGMENTED plane = PLANE_GHOSTS diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 612b77274ab..ee422fe74af 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -224,7 +224,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return src.client.admin_ghost() else - response = alert(src, "Are you -sure- you want to ghost?\n(You are alive, or otherwise have the potential to become alive. Don't abuse ghost unless you are inside a cryopod or equivalent! You can't change your mind so choose wisely!)", "Are you sure you want to ghost?", "Ghost", "Stay in body") // VOREStation edit because we don't make players stay dead for 30 minutes. + response = alert(src, "Are you -sure- you want to ghost?\n(You are alive, or otherwise have the potential to become alive. Don't abuse ghost unless you are inside a cryopod or equivalent! You can't change your mind so choose wisely!)", "Are you sure you want to ghost?", "Ghost", "Stay in body") if(response != "Ghost") return resting = 1 @@ -261,11 +261,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(mind.current.key && copytext(mind.current.key,1,2)!="@") //makes sure we don't accidentally kick any clients to_chat(usr, "Another consciousness is in your body... it is resisting you.") return - //VOREStation Add if(prevent_respawns.Find(mind.name)) to_chat(usr,"You already quit this round as this character, sorry!") return - //VOREStation Add End if(mind.current.ajourn && mind.current.stat != DEAD) //check if the corpse is astral-journeying (it's client ghosted using a cultist rune). var/found_rune for(var/obj/effect/rune/R in mind.current.loc) //whilst corpse is alive, we can only reenter the body if it's on the rune @@ -805,7 +803,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/obj/item/paicard/PP = p if(PP.pai == null) count++ - PP.icon = 'icons/obj/pda_vr.dmi' // VOREStation Edit + PP.icon = 'icons/obj/pda_vr.dmi' PP.overlays += "pai-ghostalert" spawn(54) PP.overlays.Cut() diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm index e5e8e330325..2174bf53f3e 100644 --- a/code/modules/mob/death.dm +++ b/code/modules/mob/death.dm @@ -62,7 +62,7 @@ if(stat == DEAD) return 0 if(istype(loc, /obj/belly) || istype(loc, /obj/item/dogborg/sleeper)) - deathmessage = "no message" //VOREStation Add - Prevents death messages from inside mobs + deathmessage = "no message" // Prevents death messages from inside mobs facing_dir = null if(!gibbed && deathmessage != "no message") // This is gross, but reliable. Only brains use it. diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index f7258e6af34..06e86a7c1ee 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -11,7 +11,7 @@ var/input if(!message) - input = sanitize_or_reflect(input(src,"Choose an emote to display.") as text|null, src) //VOREStation Edit - Reflect too long messages, within reason + input = sanitize_or_reflect(input(src,"Choose an emote to display.") as text|null, src) // Reflect too long messages, within reason. else input = message if(input) @@ -38,14 +38,12 @@ var/mob/M = mob spawn(0) // It's possible that it could be deleted in the meantime, or that it runtimes. if(M) - //VOREStation edit if(istype(M, /mob/observer/dead/)) var/mob/observer/dead/D = M if(ckey || (src in view(D))) M.show_message(message, m_type) else M.show_message(message, m_type) - //End VOREStation edit for(var/obj in o_viewers) var/obj/O = obj @@ -78,7 +76,7 @@ var/input if(!message) - input = sanitize_or_reflect(input(src, "Choose an emote to display.") as text|null, src) //VOREStation Edit - Reflect too long messages, within reason + input = sanitize_or_reflect(input(src, "Choose an emote to display.") as text|null, src) // Reflect too long messages, within reason else input = message diff --git a/code/modules/mob/freelook/ai/chunk.dm b/code/modules/mob/freelook/ai/chunk.dm index 8ca6425eb9c..b4a965e95ac 100644 --- a/code/modules/mob/freelook/ai/chunk.dm +++ b/code/modules/mob/freelook/ai/chunk.dm @@ -43,7 +43,6 @@ return stat != DEAD /mob/living/silicon/robot/provides_camera_vision() - return src.camera && src.camera.network.len && (z in GLOB.using_map.contact_levels) //VOREStation Edit - + return src.camera && src.camera.network.len && (z in GLOB.using_map.contact_levels) /mob/living/silicon/ai/proc/seen_camera_turfs() return seen_turfs_in_range(src, world.view) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 1deaf121662..af6eeaa68b2 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -169,7 +169,7 @@ /mob/living/MouseDrop(var/atom/over_object) var/mob/living/carbon/human/H = over_object - if((usr == over_object || usr == src) && holder_type && issmall(src) && istype(H) && !H.lying && Adjacent(H) && (src.a_intent == INTENT_HELP && H.a_intent == INTENT_HELP)) //VOREStation Edit + if((usr == over_object || usr == src) && holder_type && issmall(src) && istype(H) && !H.lying && Adjacent(H) && (src.a_intent == INTENT_HELP && H.a_intent == INTENT_HELP)) if(!issmall(H) || !istype(src, /mob/living/carbon/human)) get_scooped(H, (usr == src)) return diff --git a/code/modules/mob/language/generic.dm b/code/modules/mob/language/generic.dm index 307bb3fd3b3..c8ee7c1128d 100644 --- a/code/modules/mob/language/generic.dm +++ b/code/modules/mob/language/generic.dm @@ -38,7 +38,7 @@ // Galactic common languages (systemwide accepted standards). /datum/language/trader name = LANGUAGE_TRADEBAND - desc = "Maintained by the various trading cartels in major systems, this elegant, structured language is used for bartering and bargaining." //VOREstation Edit + desc = "Maintained by the various trading cartels in major systems, this elegant, structured language is used for bartering and bargaining." speech_verb = "enunciates" colour = "say_quote" key = "2" @@ -51,13 +51,11 @@ /datum/language/terminus name = LANGUAGE_TERMINUS - desc = "A group of languages spoken by the Zorren with a certain degree of mutual intelligibility under each other. Evidence shows it was a single lingua franca which has diverged into many sub languages due to isolation." // VOREstation edit. Original : A soft language spoken by the people of the sparsely populated, socially-conscious Precursors' Crypt region. + desc = "A group of languages spoken by the Zorren with a certain degree of mutual intelligibility under each other. Evidence shows it was a single lingua franca which has diverged into many sub languages due to isolation." speech_verb = "mentions" exclaim_verb = "insinuates" colour = "terminus" key = "4" - // flags = WHITELISTED (VOREstation edit) - // partial_understanding = list(LANGUAGE_SOL_COMMON = 20) (VOREStation Edit: It is a Zorren language now) syllables = list (".a", "spa", "pan", "blaif", "stra", "!u", "!ei", "!am", "by", ".y", "gry", "zbly", "!y", "fl", "sm", "rn", "cpi", "ku", "koi", "pr", "glau", "stu", "ved", "ki", "tsa", "xau", "jbu", "sny", "stro", "nu", "uan", "ju", "!i", "ge", "luk", "an", "ar", "at", "es", "et", "bel", "ki", "jaa", "ch", "ki", "gh", "ll", "uu", "wat") diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index 0648d01e085..b3e0a4f7191 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -192,7 +192,8 @@ /mob/living/bot/Bump(var/atom/A) if(on && botcard && istype(A, /obj/machinery/door)) var/obj/machinery/door/D = A - if(!istype(D, /obj/machinery/door/firedoor) && !istype(D, /obj/machinery/door/blast) && !istype(D, /obj/machinery/door/airlock/lift) && D.check_access(botcard)) //VOREStation Edit: Elevator safety precaution + // Elevator safety precaution + if(!istype(D, /obj/machinery/door/firedoor) && !istype(D, /obj/machinery/door/blast) && !istype(D, /obj/machinery/door/airlock/lift) && D.check_access(botcard)) D.open() else ..() diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 8237ed86375..2d2ef5c1d2c 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -115,14 +115,13 @@ if("replacenutri") replaces_nutriment = !replaces_nutriment . = TRUE - // VOREStation Edit: No automatic hydroponics + // No automatic hydroponics //TODO: Reconsider? // if("collect") // collects_produce = !collects_produce // . = TRUE // if("removedead") // removes_dead = !removes_dead // . = TRUE - // VOREStation Edit End /mob/living/bot/farmbot/update_icons() if(on && action) @@ -236,7 +235,7 @@ busy = 1 while(do_after(src, 10) && tank.reagents.total_volume < tank.reagents.maximum_volume) - tank.reagents.add_reagent("water", 100) //VOREStation Edit + tank.reagents.add_reagent("water", 100) if(prob(5)) playsound(loc, 'sound/effects/slosh.ogg', 25, 1) diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index 42b449c6900..404c4e85357 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -49,7 +49,7 @@ var/list/threat_found_sounds = list('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg') var/list/preparing_arrest_sounds = list('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/bcreep.ogg') var/list/fighting_sounds = list('sound/voice/biamthelaw.ogg', 'sound/voice/bradio.ogg', 'sound/voice/bjustice.ogg') -//VOREStation Add - They don't like being pulled. This is going to fuck with slimesky, but meh. //Screw you. Just screw you and your 'meh' +// They don't like being pulled. This is going to fuck with slimesky, but meh. //Screw you. Just screw you and your 'meh' /mob/living/bot/secbot/Life() ..() if(health > 0 && on && pulledby) @@ -63,7 +63,6 @@ UnarmedAttack(L) say("Do not interfere with active law enforcement routines!") GLOB.global_announcer.autosay("[src] was interfered with in [get_area(src)], activating defense routines.", "[src]", "Security") -//VOREStation Add End /datum/category_item/catalogue/technology/bot/secbot/beepsky name = "Bot - Officer Beepsky" diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index 355f99f1e5e..749d671955a 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -40,7 +40,7 @@ use_me = 0 //Can't use the me verb, it's a freaking immobile brain icon = 'icons/obj/surgery.dmi' icon_state = "brain1" - no_vore = TRUE //VOREStation Edit - PLEASE. lol. + no_vore = TRUE catalogue_data = list(/datum/category_item/catalogue/fauna/brain/organic) /mob/living/carbon/brain/Initialize(mapload) diff --git a/code/modules/mob/living/carbon/breathe.dm b/code/modules/mob/living/carbon/breathe.dm index 1baaf8a4358..db65317c1a9 100644 --- a/code/modules/mob/living/carbon/breathe.dm +++ b/code/modules/mob/living/carbon/breathe.dm @@ -22,13 +22,12 @@ else //Okay, we can breathe, now check if we can get air breath = get_breath_from_internal() //First, check for air from internals - //VOREStation Add - Respirocytes as a NIF implant + // Respirocytes as a NIF implant if(!breath && ishuman(src)) var/mob/living/carbon/human/H = src if(H.nif && H.nif.flag_check(NIF_H_SPAREBREATH,NIF_FLAGS_HEALTH)) var/datum/nifsoft/spare_breath/SB = H.nif.imp_check(NIF_SPAREBREATH) breath = SB.resp_breath() - //VOREStation Add End if(!breath) breath = get_breath_from_environment() //No breath from internals so let's try to get air from our location if(!breath) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 10d740afaee..d343f52637b 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -149,7 +149,7 @@ AdjustSleeping(-5) if(src.sleeping == 0) src.resting = 0 - if(H) H.in_stasis = 0 //VOREStation Add - Just In Case + if(H) H.in_stasis = 0 M.visible_message("[M] shakes [src] trying to wake [T.him] up!", \ "You shake [src] trying to wake [T.him] up!") else diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm index fe19a641fca..a8bbd6f793e 100644 --- a/code/modules/mob/living/carbon/carbon_movement.dm +++ b/code/modules/mob/living/carbon/carbon_movement.dm @@ -18,31 +18,3 @@ // Moving around increases germ_level faster if(germ_level < GERM_LEVEL_MOVE_CAP && prob(8)) germ_level++ - -/* VOREStation Removal - Needless duplicate feature -/mob/living/carbon/relaymove(var/mob/living/user, direction) - if((user in src.stomach_contents) && istype(user)) - if(user.last_special <= world.time) - user.last_special = world.time + 50 - src.visible_message("You hear something rumbling inside [src]'s stomach...") - var/obj/item/I = user.get_active_hand() - if(I && I.force) - var/d = rand(round(I.force / 4), I.force) - if(istype(src, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = src - var/obj/item/organ/external/organ = H.get_organ(BP_TORSO) - if (istype(organ)) - if(organ.take_damage(d, 0)) - H.UpdateDamageIcon() - H.updatehealth() - else - src.take_organ_damage(d) - user.visible_message("[user] attacks [src]'s stomach wall with the [I.name]!") - playsound(user.loc, 'sound/effects/attackblob.ogg', 50, 1) - - if(prob(src.getBruteLoss() - 50)) - for(var/atom/movable/A in stomach_contents) - A.loc = loc - stomach_contents.Remove(A) - src.gib() -*/ diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm index c39191589cb..191ce77232d 100644 --- a/code/modules/mob/living/carbon/give.dm +++ b/code/modules/mob/living/carbon/give.dm @@ -15,7 +15,7 @@ to_chat(src, "You don't have anything in your hands to give to \the [target].") return - if(alert(target,"[src] wants to give you \a [I]. Will you accept it?","Item Offer","Yes","No") == "No") //VOREStation Edit - make yes on the left to be consistent with other dialogs + if(alert(target,"[src] wants to give you \a [I]. Will you accept it?","Item Offer","Yes","No") == "No") target.visible_message("\The [src] tried to hand \the [I] to \the [target], \ but \the [target] didn't want it.") return diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index 1e35bafd799..d0b8817b00b 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -22,7 +22,6 @@ return src.gender = gender - //reset_hair() //VOREStation Remove - Don't just randomize hair on gender swaps for prometheans. update_icons_body() update_dna() return 1 diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 5e5822e5cca..1fa543bd53b 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -72,7 +72,7 @@ //Handle species-specific deaths. species.handle_death(src, gibbed) animate_tail_stop() - stop_flying() //VOREStation Edit. + stop_flying() //Handle snowflake ling stuff. if(mind && mind.changeling) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 18cfa8993e5..0dfeed756a2 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -21,7 +21,8 @@ if(src.stat == 2.0 && (act != "deathgasp")) return - if(attempt_vr(src,"handle_emote_vr",list(act,m_type,message))) return //VOREStation Add - Custom Emote Handler + if(attempt_vr(src,"handle_emote_vr",list(act,m_type,message))) + return // Custom Emote Handler switch(act) if ("airguitar") @@ -111,13 +112,9 @@ //Promethean-only emotes if("squish") - //Citadel changes start - ///* VOREStation Removal Start - Eh. People can squish maybe. if(species.bump_flag != SLIME) //This should definitely do it. to_chat(src, "You are not a slime thing!") return - //*/ //VOREStation Removal End - //Citadel changes end playsound(src.loc, 'sound/effects/slime_squish.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound. message = "squishes." m_type = 1 diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index f13ff688916..3da3a773452 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -99,12 +99,10 @@ CRASH("Gender datum was null; key was '[((skip_gear & EXAMINE_SKIPJUMPSUIT) && (skip_body & EXAMINE_SKIPFACE)) ? PLURAL : gender]'") if(!((skip_gear & EXAMINE_SKIPJUMPSUIT) && (skip_body & EXAMINE_SKIPFACE))) - //VOREStation Add Start if(custom_species) if(custom_species != SPECIES_HUMAN) whoismsg += ", a [src.custom_species]" else if(looks_synth) - //VOREStation Add End var/use_gender = "a synthetic" if(gender == MALE) use_gender = "an android" @@ -295,19 +293,17 @@ if(attempt_vr(src,"examine_weight",args)) - . += attempt_vr(src,"examine_weight",args) //VOREStation Code -// if(attempt_vr(src,"examine_nutrition",args)) -// . += attempt_vr(src,"examine_nutrition",args) //VOREStation Code + . += attempt_vr(src,"examine_weight",args) if(attempt_vr(src,"examine_bellies",args)) - . += attempt_vr(src,"examine_bellies",args) //VOREStation Code + . += attempt_vr(src,"examine_bellies",args) if(attempt_vr(src,"examine_pickup_size",args)) - . += attempt_vr(src,"examine_pickup_size",args) //VOREStation Code + . += attempt_vr(src,"examine_pickup_size",args) if(attempt_vr(src,"examine_step_size",args)) - . += attempt_vr(src,"examine_step_size",args) //VOREStation Code + . += attempt_vr(src,"examine_step_size",args) if(attempt_vr(src,"examine_nif",args)) - . += attempt_vr(src,"examine_nif",args) //VOREStation Code + . += attempt_vr(src,"examine_nif",args) if(attempt_vr(src,"examine_chimera",args)) - . += attempt_vr(src,"examine_chimera",args) //VOREStation Code + . += attempt_vr(src,"examine_chimera",args) if(mSmallsize in mutations) . += "[T.He] [T.is] very short!" @@ -338,12 +334,10 @@ . += "[T.He] [T.is] [ssd_msg]. It doesn't look like [T.he] [T.is] waking up anytime soon." else if(!client) . += "[T.He] [T.is] [ssd_msg]." - //VOREStation Add Start if(client && ((client.inactivity / 10) / 60 > 10)) //10 Minutes . += "\[Inactive for [round((client.inactivity/10)/60)] minutes\]" else if(disconnect_time) . += "\[Disconnected/ghosted [round(((world.realtime - disconnect_time)/10)/60)] minutes ago\]" - //VOREStation Add End var/list/wound_flavor_text = list() var/list/is_bleeding = list() @@ -452,13 +446,11 @@ if(print_flavor_text()) . += "[print_flavor_text()]" - // VOREStation Start if(ooc_notes) . += "OOC Notes: \[View\]" . += "\[Mechanical Vore Preferences\]" - // VOREStation End . += "*---------*" . += applying_pressure @@ -476,7 +468,8 @@ /proc/hasHUD(mob/M as mob, hudtype) if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M - if(hasHUD_vr(H,hudtype)) return 1 //VOREStation Add - Added records access for certain modes of omni-hud glasses + if(hasHUD_vr(H,hudtype)) + return 1 // Added records access for certain modes of omni-hud glasses switch(hudtype) if("security") return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index b051e07eff3..e671e76f165 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -69,8 +69,8 @@ human_mob_list -= src for(var/organ in organs) qdel(organ) - QDEL_NULL(nif) //VOREStation Add - QDEL_LIST_NULL(vore_organs) //VOREStation Add + QDEL_NULL(nif) + QDEL_LIST_NULL(vore_organs) cleanup_world_bender_hud() return ..() @@ -402,10 +402,8 @@ if(href_list["item"]) handle_strip(href_list["item"],usr) - // VOREStation Start if(href_list["ooc_notes"]) src.Examine_OOC() - // VOREStation End if (href_list["criminal"]) if(hasHUD(usr,"security")) @@ -659,7 +657,7 @@ src << browse(null, "window=flavor_changes") return if("general") - var/msg = sanitize(input(usr,"Update the general description of your character. This will be shown regardless of clothing.","Flavor Text",html_decode(flavor_texts[href_list["flavor_change"]])) as message, extra = 0) //VOREStation Edit: separating out OOC notes + var/msg = sanitize(input(usr,"Update the general description of your character. This will be shown regardless of clothing.","Flavor Text",html_decode(flavor_texts[href_list["flavor_change"]])) as message, extra = 0) flavor_texts[href_list["flavor_change"]] = msg return else @@ -733,12 +731,10 @@ return 1 -/mob/living/carbon/human/IsAdvancedToolUser(var/silent) - // VOREstation start +/mob/living/carbon/human/IsAdvancedToolUser(silent) if(feral) to_chat(src, "Your primitive mind can't grasp the concept of that thing.") return 0 - // VOREstation end if(species.has_fine_manipulation) return 1 if(!silent) @@ -948,13 +944,12 @@ H.brainmob.mind.transfer_to(src) qdel(H) - // Vorestation Addition - reapply markings/appearance from prefs for player mobs + // Reapply markings/appearance from prefs for player mobs if(client) //just to be sure client.prefs.copy_to(src) if(dna) dna.ResetUIFrom(src) sync_organ_dna() - // end vorestation addition for (var/ID in virus2) var/datum/disease2/disease/V = virus2[ID] @@ -1138,9 +1133,9 @@ * - regen_icons - immediately update icons? * - force - change even if we are already that species **by type** * - skip - skip most ops that aren't apply or remove which are required for instance cleanup. do not do this unless you absolutely know what you are doing. - * - example - dumbshit argument used for vore transformations to copy necessary data, why tf is this not done in the vore module? TODO: REMOVE. + * - example - dumbshit argument used for vore transformations to copy necessary data, why tf is this not done in the vore module? //TODO: REMOVE. */ -/mob/living/carbon/human/proc/set_species(datum/species/species_or_path, regen_icons = TRUE, force = FALSE, skip, mob/living/carbon/human/example) //VOREStation Edit - send an example +/mob/living/carbon/human/proc/set_species(datum/species/species_or_path, regen_icons = TRUE, force = FALSE, skip, mob/living/carbon/human/example) // check if we need to if(!force && species_or_path) if(istype(species, istype(species_or_path)? species_or_path.type : species_or_path)) @@ -1195,7 +1190,7 @@ species.create_organs(src) species.create_blood(src) species.handle_post_spawn(src) - species.update_attack_types() //VOREStation Edit - Required for any trait that updates unarmed_types in setup. + species.update_attack_types() // Required for any trait that updates unarmed_types in setup. // Rebuild the HUD. If they aren't logged in then login() should reinstantiate it for them. update_hud() @@ -1210,7 +1205,7 @@ descriptors[desctype] = descriptor.default_value // dumb shit transformation shit here - if(example) //VOREStation Edit begin + if(example) if(!(example == src)) r_skin = example.r_skin g_skin = example.g_skin @@ -1470,8 +1465,8 @@ /mob/living/carbon/human/Check_Shoegrip() if(shoes && (shoes.clothing_flags & NOSLIP) && istype(shoes, /obj/item/clothing/shoes/magboots)) //magboots + dense_object = no floating return 1 - if(flying) //VOREStation Edit. Checks to see if they have wings and are flying. - return 1 //VOREStation Edit. + if(flying) // Checks to see if they have wings and are flying. + return 1 return 0 /mob/living/carbon/human/can_stand_overridden() @@ -1557,15 +1552,16 @@ /mob/living/carbon/human/proc/update_icon_special() //For things such as teshari hiding and whatnot. if(status_flags & HIDING) // Hiding? Carry on. - if(stat == DEAD || paralysis || weakened || stunned || restrained() || buckled || LAZYLEN(grabbed_by) || has_buckled_mobs()) //stunned/knocked down by something that isn't the rest verb? Note: This was tried with INCAPACITATION_STUNNED, but that refused to work. //VORE EDIT: Check for has_buckled_mobs() (taur riding) + // Stunned/knocked down by something that isn't the rest verb? Note: This was tried with INCAPACITATION_STUNNED, but that refused to work. + if(stat == DEAD || paralysis || weakened || stunned || restrained() || buckled || LAZYLEN(grabbed_by) || has_buckled_mobs()) reveal(null) else set_base_layer(HIDING_LAYER) /mob/living/carbon/human/proc/get_display_species() //Shows species in tooltip - if(src.custom_species) //VOREStation Add - return custom_species //VOREStation Add + if(src.custom_species) + return custom_species //Beepboops get special text if obviously beepboop if(looksSynthetic()) if(gender == MALE) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 845e8dceafc..e4670f3d952 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -1,5 +1,5 @@ /mob/living/carbon/human/proc/get_unarmed_attack(var/mob/living/carbon/human/target, var/hit_zone) - // VOREStation Edit - Begin + if(nif && nif.flag_check(NIF_C_HARDCLAWS,NIF_FLAGS_COMBAT)){return unarmed_hardclaws} if(src.default_attack && src.default_attack.is_usable(src, target, hit_zone)) if(pulling_punches) @@ -7,7 +7,7 @@ if(soft_type) return soft_type return src.default_attack - // VOREStation Edit - End + if(src.gloves) var/obj/item/clothing/gloves/G = src.gloves if(istype(G) && G.special_attack && G.special_attack.is_usable(src, target, hit_zone)) @@ -62,10 +62,10 @@ switch(M.a_intent) if(INTENT_HELP) - // VOREStation Edit - Begin + if (istype(H) && attempt_to_scoop(H)) return 0; - // VOREStation Edit - End + if(istype(H) && health < config_legacy.health_threshold_crit) if(!H.check_has_mouth()) to_chat(H, "You don't have a mouth, you cannot perform CPR!") @@ -126,9 +126,7 @@ H.do_attack_animation(src) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - //VORESTATION EDIT visible_message("[M] has grabbed [src] [(M.zone_sel.selecting == BP_L_HAND || M.zone_sel.selecting == BP_R_HAND)? "by [(gender==FEMALE)? "her" : ((gender==MALE)? "his": "their")] hands": "passively"]!") - //VORESTATION END END return TRUE diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index c21cdcbce40..f1a2e21d978 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -119,7 +119,7 @@ amount *= M.incoming_damage_percent if(!isnull(M.incoming_brute_damage_percent)) amount *= M.incoming_brute_damage_percent - if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage + if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} // NIF mod for damage resistance for this type of damage take_overall_damage(amount, 0) else for(var/datum/modifier/M in modifiers) @@ -137,7 +137,7 @@ amount *= M.incoming_damage_percent if(!isnull(M.incoming_fire_damage_percent)) amount *= M.incoming_fire_damage_percent - if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage + if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} // NIF mod for damage resistance for this type of damage take_overall_damage(0, amount) else for(var/datum/modifier/M in modifiers) @@ -157,7 +157,7 @@ amount *= M.incoming_damage_percent if(!isnull(M.incoming_brute_damage_percent)) amount *= M.incoming_brute_damage_percent - if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage + if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //NIF mod for damage resistance for this type of damage O.take_damage(amount, 0, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source) else for(var/datum/modifier/M in modifiers) @@ -179,7 +179,7 @@ amount *= M.incoming_damage_percent if(!isnull(M.incoming_fire_damage_percent)) amount *= M.incoming_fire_damage_percent - if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage + if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} // NIF mod for damage resistance for this type of damage O.take_damage(0, amount, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source) else for(var/datum/modifier/M in modifiers) @@ -440,7 +440,7 @@ This function restores all organs. if((damagetype != BRUTE) && (damagetype != BURN)) if(damagetype == HALLOSS) if((damage > 25 && prob(20)) || (damage > 50 && prob(60))) - if(organ && organ.organ_can_feel_pain() && !isbelly(loc) && !istype(loc, /obj/item/dogborg/sleeper)) //VOREStation Add + if(organ && organ.organ_can_feel_pain() && !isbelly(loc) && !istype(loc, /obj/item/dogborg/sleeper)) emote("scream") ..(damage, damagetype, def_zone, blocked, soaked) return 1 diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 999e45fcf36..0a4cdcd09bc 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -106,8 +106,6 @@ ///For adherent coloring.... var/s_base - ///multiplier for the mob's icon size //VOREStation Edit (Moved to /mob/living) - //var/size_multiplier = 1 ///multiplies melee combat damage var/damage_multiplier = 1 ///whether icon updating shall take place diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 5c0e421919a..3cc10f89e1d 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -170,10 +170,9 @@ var/obj/item/clothing/glasses/V = rig.visor.vision.glasses compiled_vis |= V.enables_planes - //VOREStation Add - NIF Support + // NIF Support if(nif) compiled_vis |= nif.planes_visible() - //VOREStation Add End if(!compiled_vis.len && !vis_enabled.len) return //Nothin' doin'. diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 831c92c84d6..019de5aeb28 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -36,7 +36,6 @@ if (hungry >= 70) tally += hungry/50 - //VOREstation start if (feral >= 10) //crazy feral animals give less and less of a shit about pain and hunger as they get crazier tally = max(species.slowdown, species.slowdown+((tally-species.slowdown)/(feral/10))) // As feral scales to damage, this amounts to an effective +1 slowdown cap if(shock_stage >= 10) tally -= 1.5 //this gets a +3 later, feral critters take reduced penalty @@ -52,7 +51,6 @@ tally += 1 if(H.weight > L.weight) tally += 1 - //VOREstation end if(istype(buckled, /obj/structure/bed/chair/wheelchair)) for(var/organ_name in list(BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM)) diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index c12bf7d6c93..51016388714 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -24,7 +24,7 @@ if(force_process) bad_external_organs.Cut() for(var/obj/item/organ/external/Ex in organs) - bad_external_organs += Ex //VOREStation Edit - Silly and slow to |= this + bad_external_organs += Ex //processing internal organs is pretty cheap, do that first. for(var/obj/item/organ/I in internal_organs) @@ -36,7 +36,7 @@ if(!force_process && !bad_external_organs.len) return - number_wounds = 0 //VOREStation Add - You have to reduce this at some point... + number_wounds = 0 // You have to reduce this at some point... for(var/obj/item/organ/external/E in bad_external_organs) if(!E) continue @@ -105,7 +105,7 @@ // standing is poor if(stance_damage >= 4 || (stance_damage >= 2 && prob(5))) - if(!(lying || resting) && !isbelly(loc)) //VOREStation Edit + if(!(lying || resting) && !isbelly(loc)) if(limb_pain) emote("scream") custom_emote(1, "collapses!") diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 1a33607ee39..6dd15fb7d66 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -75,7 +75,7 @@ Sleeping(20) //No need to update all of these procs if the guy is dead. - fall() //VORESTATION EDIT. Prevents people from floating + fall() // Prevents people from floating if(stat != DEAD && !stasis) //Updates the number of stored chemicals for powers handle_changeling() @@ -83,8 +83,8 @@ //Organs and blood handle_organs() stabilize_body_temperature() //Body temperature adjusts itself (self-regulation) - weightgain() //VORESTATION EDIT - process_weaver_silk() //VOREStation Addition + weightgain() + process_weaver_silk() handle_shock() handle_pain() @@ -92,7 +92,7 @@ handle_medical_side_effects() handle_heartbeat() - handle_nif() //VOREStation Add + handle_nif() if(!client) species.handle_npc(src) @@ -684,7 +684,7 @@ pl_effects() break - if(istype(loc, /turf/space)) //VOREStation Edit - No FBPs overheating on space turfs inside mechs or people. + if(istype(loc, /turf/space)) // No FBPs overheating on space turfs inside mechs or people. //Don't bother if the temperature drop is less than 0.1 anyways. Hopefully BYOND is smart enough to turn this constant expression into a constant if(bodytemperature > (0.1 * HUMAN_HEAT_CAPACITY/(HUMAN_EXPOSED_SURFACE_AREA*STEFAN_BOLTZMANN_CONSTANT))**(1/4) + COSMIC_RADIATION_TEMPERATURE) //Thermal radiation into space @@ -785,7 +785,7 @@ pressure_alert = -1 else if( !(COLD_RESISTANCE in mutations)) - if(!isSynthetic() || !nif || !nif.flag_check(NIF_O_PRESSURESEAL,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF pressure seals + if(!isSynthetic() || !nif || !nif.flag_check(NIF_O_PRESSURESEAL,NIF_FLAGS_OTHER)) // NIF pressure seals take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure") if(getOxyLoss() < 55) // 12 OxyLoss per 4 ticks when wearing internals; unconsciousness in 16 ticks, roughly half a minute var/pressure_dam = 3 // 16 OxyLoss per 4 ticks when no internals present; unconsciousness in 13 ticks, roughly twenty seconds @@ -945,8 +945,9 @@ GET_VSC_PROP(atmos_vsc, /atmos/phoron/contamination_loss, loss_per_part) for(var/obj/item/I in src) if(I.contaminated) - if(check_belly(I)) continue //VOREStation Edit - if(src.species && !(src.species.flags & CONTAMINATION_IMMUNE)) //VOREStation Edit: shadekin; CitadelRP: Black-Eyed Shadekin don't get afflicted from contaminated clothing + if(check_belly(I)) + continue + if(src.species && !(src.species.flags & CONTAMINATION_IMMUNE)) // This is hacky, I'm so sorry. if(I != l_hand && I != r_hand) //If the item isn't in your hands, you're probably wearing it. Full damage for you. total_phoronloss += loss_per_part @@ -996,11 +997,10 @@ hydration_reduction *= mod.metabolism_percent adjust_hydration(-hydration_reduction) - if(noisy == TRUE && nutrition < 250 && prob(10)) //VOREStation edit for hunger noises. + if(noisy == TRUE && nutrition < 250 && prob(10)) var/sound/growlsound = sound(get_sfx("hunger_sounds")) var/growlmultiplier = 100 - (nutrition / 250 * 100) playsound(src, growlsound, vol = growlmultiplier, vary = 1, falloff = 0.1, ignore_walls = TRUE, preference = /datum/client_preference/digestion_noises) - // VOREStation Edit End // TODO: stomach and bloodstream organ. if(!isSynthetic()) @@ -1379,7 +1379,7 @@ var/obj/item/clothing/glasses/G = glasses if(G.prescription) corrected = TRUE - if(nif?.flag_check(NIF_V_CORRECTIVE,NIF_FLAGS_VISION)) //VOREStation Edit - NIF + if(nif?.flag_check(NIF_V_CORRECTIVE,NIF_FLAGS_VISION)) corrected = TRUE if(!corrected) overlay_fullscreen("impaired", /atom/movable/screen/fullscreen/scaled/impaired, 1) @@ -1406,7 +1406,7 @@ var/obj/item/clothing/glasses/welding/O = glasses if(!O.up) found_welder = 1 - if(!found_welder && nif && nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) found_welder = 1 //VOREStation Add - NIF + if(!found_welder && nif && nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) found_welder = 1 if(!found_welder && istype(head, /obj/item/clothing/head/welding)) var/obj/item/clothing/head/welding/O = head if(!O.up) @@ -1416,7 +1416,7 @@ if(O.helmet && O.helmet == head && (O.helmet.body_parts_covered & EYES)) if((O.offline && O.offline_vision_restriction == 1) || (!O.offline && O.vision_restriction == 1)) found_welder = 1 - if(absorbed) found_welder = 1 //VOREStation Code + if(absorbed) found_welder = 1 if(found_welder) client.screen |= GLOB.global_hud.darkMask diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 15cf91eb0fc..260747bb67a 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -3,7 +3,7 @@ if(name != GetVoice()) alt_name = "(as [get_id_name("Unknown")])" - message = sanitize_or_reflect(message,src) //VOREStation Edit - Reflect too-long messages, within reason + message = sanitize_or_reflect(message,src) // Reflect too-long messages, within reason ..(message, alt_name = alt_name, whispering = whispering) /mob/living/carbon/human/proc/forcesay(list/append) diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm index 3927b7cd9de..bb32b95a86a 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm @@ -88,7 +88,7 @@ /datum/mob_descriptor/vox_markings = 0 ) - wikilink="https://wiki.vore-station.net/Vox" + wikilink="https://citadel-station.net/wikiRP/index.php?title=Race:_The_Vox" inherent_verbs = list( /mob/living/proc/shred_limb, /mob/living/proc/eat_trash, diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm index 89e3ab95df0..9b202f9b49a 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm @@ -10,7 +10,7 @@ but next to no verifiable evidence to their existence. However, they have recently been more verifiably \ documented in the Virgo system, following a mining bombardment of Virgo 3. The crew of NSB Adephagia have \ taken to calling these creatures 'Shadekin', and the name has generally stuck and spread. " //TODO: Something that's not wiki copypaste - wikilink = "https://wiki.vore-station.net/Shadekin" + wikilink = "https://citadel-station.net/wikiRP/index.php?title=Race:_Shadekin" catalogue_data = list(/datum/category_item/catalogue/fauna/shadekin) language = LANGUAGE_SHADEKIN diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 1abb7bd93f0..1d8125cc9ee 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -630,7 +630,7 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list( t_him = "him" if(FEMALE) t_him = "her" - if(H.zone_sel.selecting == "head") //VOREStation Edit - Headpats and Handshakes. + if(H.zone_sel.selecting == "head") // Headpats and Handshakes! H.visible_message( \ "[H] pats [target] on the head.", \ "You pat [target] on the head.", ) @@ -644,7 +644,7 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list( "[H] boops [target]'s nose.", \ "You boop [target] on the nose.", ) else H.visible_message("[H] hugs [target] to make [t_him] feel better!", \ - "You hug [target] to make [t_him] feel better!") //End VOREStation Edit + "You hug [target] to make [t_him] feel better!") /datum/species/proc/remove_inherent_verbs(var/mob/living/carbon/human/H) if(inherent_verbs) diff --git a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm index 4777eed68dd..e8d46164e8b 100644 --- a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm +++ b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm @@ -142,7 +142,7 @@ var/list/wrapped_species_by_ref = list() if(!new_gender) return - var/new_gender_identity = input("Please select a gender Identity.", "Shapeshifter Gender Identity") as null|anything in list(FEMALE, MALE, NEUTER, PLURAL, HERM) //VOREStation Edit + var/new_gender_identity = input("Please select a gender Identity.", "Shapeshifter Gender Identity") as null|anything in list(FEMALE, MALE, NEUTER, PLURAL, HERM) if(!new_gender_identity) return @@ -459,18 +459,6 @@ var/list/wrapped_species_by_ref = list() update_icons_body() /datum/species/shapeshifter/handle_environment_special(var/mob/living/carbon/human/H) -/* VOREStation Removal - Too crazy with our uncapped hunger and slowdown stuff. - var/turf/T = H.loc - if(istype(T)) - var/obj/effect/decal/cleanable/C = locate() in T - if(C && !(H.shoes || (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)))) - qdel(C) - if (istype(T, /turf/simulated)) - var/turf/simulated/S = T - S.dirt = 0 - - H.nutrition = min(500, max(0, H.nutrition + rand(15, 30))) -VOREStation Removal End */ // Heal remaining damage. if(H.fire_stacks >= 0 && heal_rate > 0) if(H.getBruteLoss() || H.getFireLoss() || H.getOxyLoss() || H.getToxLoss()) diff --git a/code/modules/mob/living/carbon/human/species/station/custom_species.dm b/code/modules/mob/living/carbon/human/species/station/custom_species.dm index a22c3260834..e689492f2da 100644 --- a/code/modules/mob/living/carbon/human/species/station/custom_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/custom_species.dm @@ -8,8 +8,8 @@ unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite) blurb = "This is a custom species where you can assign various species traits to them as you wish, to \ - create a (hopefully) balanced species. You will see the options to customize them on the VORE tab once \ - you select and set this species as your species. Please look at the VORE tab if you select this species." + create a (hopefully) balanced species. You will see the options to customize them on the Species Customization tab once \ + you select and set this species as your species. Please look at the Species Customization tab if you select this species." catalogue_data = list(/datum/category_item/catalogue/fauna/custom_species) name_language = null // Use the first-name last-name generator rather than a language scrambler diff --git a/code/modules/mob/living/carbon/human/species/station/monkey.dm b/code/modules/mob/living/carbon/human/species/station/monkey.dm index 9363ca97800..5048f9df362 100644 --- a/code/modules/mob/living/carbon/human/species/station/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm @@ -135,7 +135,7 @@ default_language = LANGUAGE_BIRDSONG -/* Example from Polaris code +/* Example /datum/species/monkey/tajaran name = SPECIES_MONKEY_TAJ name_plural = SPECIES_MONKEY_TAJ diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index d19d24ec527..ab7ad9a7454 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -136,7 +136,7 @@ var/datum/species/shapeshifter/promethean/prometheans color_mult = 1 trashcan = TRUE //They have goopy bodies. They can just dissolve things within them. - wikilink="https://wiki.vore-station.net/Promethean" + wikilink = "N/A" /datum/species/shapeshifter/promethean/New() ..() @@ -160,7 +160,8 @@ var/datum/species/shapeshifter/promethean/prometheans /datum/species/shapeshifter/promethean/hug(var/mob/living/carbon/human/H, var/mob/living/target) - if(H.zone_sel.selecting == "head" || H.zone_sel.selecting == "r_hand" || H.zone_sel.selecting == "l_hand") return ..() //VOREStation Edit + if(H.zone_sel.selecting == "head" || H.zone_sel.selecting == "r_hand" || H.zone_sel.selecting == "l_hand") + return ..() var/t_him = "them" if(ishuman(target)) var/mob/living/carbon/human/T = target @@ -203,8 +204,7 @@ var/datum/species/shapeshifter/promethean/prometheans t_she = "They are" else if(H.identifying_gender == NEUTER) t_she = "It is" - else if(H.identifying_gender == HERM) //VOREStation Edit - t_she = "Shi is" + else if(H.identifying_gender == HERM) t_she = "Shi is" switch(stored_shock_by_ref["\ref[H]"]) if(1 to 10) diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm index 80b2c79a162..0a8098a9b97 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm @@ -14,7 +14,6 @@ health = 250 say_list_type = /datum/say_list/protean_blob - // ai_inactive = TRUE //Always off //VORESTATION AI TEMPORARY REMOVAL show_stat_health = FALSE //We will do it ourselves has_langs = list(LANGUAGE_GALCOM, LANGUAGE_EAL) response_help = "pats the" diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index f617da94915..7e093ef8f7f 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -860,7 +860,7 @@ inherent_verbs = list(/mob/living/proc/shred_limb) - has_glowing_eyes = TRUE //TODO: port the ability to give neutral traits to all species from vorestation + has_glowing_eyes = TRUE male_cough_sounds = null female_cough_sounds = null diff --git a/code/modules/mob/living/carbon/human/species/station/station_special.dm b/code/modules/mob/living/carbon/human/species/station/station_special.dm index f9bd82964bf..42aa02a9836 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special.dm @@ -23,7 +23,7 @@ secondary_langs = list("Sol Common") //color_mult = 1 //It seemed to work fine in testing, but I've been informed it's unneeded. - tail = "tail" //Scree's tail. Can be disabled in the vore tab by choosing "hide species specific tail sprite" + tail = "tail" //Scree's tail. Can be disabled in the Species Customization tab by choosing "hide species specific tail sprite" icobase_tail = 1 inherent_verbs = list( /mob/living/carbon/human/proc/sonar_ping, @@ -77,7 +77,7 @@ Widely known for their voracious nature and violent tendencies when stressed or left unfed for long periods of time. \ Most, if not all chimeras possess the ability to undergo some type of regeneration process, at the cost of energy." - wikilink = "https://wiki.vore-station.net/Xenochimera" + wikilink = "https://citadel-station.net/wikiRP/index.php?title=Race:_The_Xenochimera" catalogue_data = list(/datum/category_item/catalogue/fauna/xenochimera) @@ -678,7 +678,7 @@ Before they were found they built great cities out of their silk, being united and subjugated in warring factions under great “Star Queens” \ Who forced the working class to build huge, towering cities to attempt to reach the stars, which they worship as gems of great spiritual and magical significance." - wikilink = "https://wiki.vore-station.net/Vasilissans" + wikilink = "N/A" catalogue_data = list(/datum/category_item/catalogue/fauna/vasilissan) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 7f87b73cc77..985fc1d4f81 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -277,7 +277,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) icon_key += "[head.eye_icon]" for(var/organ_tag in species.has_limbs) var/obj/item/organ/external/part = organs_by_name[organ_tag] - if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) //VOREStation Edit allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff. + // Allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff. + if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) icon_key += "0" continue if(part) @@ -288,12 +289,10 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) icon_key += "[rgb(part.s_col[1],part.s_col[2],part.s_col[3])]" if(part.body_hair && part.h_col && part.h_col.len >= 3) icon_key += "[rgb(part.h_col[1],part.h_col[2],part.h_col[3])]" - //VOREStation Edit - Different way of tracking add/mult species if(species.color_mult) icon_key += "[ICON_MULTIPLY]" else icon_key += "[ICON_ADD]" - //VOREStation Edit End else icon_key += "#000000" for(var/M in part.markings) @@ -302,14 +301,14 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(part.robotic >= ORGAN_ROBOT) icon_key += "2[part.model ? "-[part.model]": ""]" robolimb_count++ - if((part.robotic == ORGAN_ROBOT || part.robotic == ORGAN_LIFELIKE) && (part.organ_tag == BP_HEAD || part.organ_tag == BP_TORSO || part.organ_tag == BP_GROIN)) //VOREStation Edit - Not for nanoform parts + if((part.robotic == ORGAN_ROBOT || part.robotic == ORGAN_LIFELIKE) && (part.organ_tag == BP_HEAD || part.organ_tag == BP_TORSO || part.organ_tag == BP_GROIN)) robobody_count ++ else if(part.status & ORGAN_DEAD) icon_key += "3" else icon_key += "1" - if(part.transparent) //VOREStation Edit. For better slime limbs. Avoids using solid var due to limb dropping. - icon_key += "_t" //VOREStation Edit. + if(part.transparent) + icon_key += "_t" icon_key = "[icon_key][husk ? 1 : 0][fat ? 1 : 0][hulk ? 1 : 0][skeleton ? 1 : 0]" @@ -322,13 +321,13 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) base_icon = chest.get_icon() for(var/obj/item/organ/external/part in organs) - if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) //VOREStation Edit allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff. + if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) continue var/icon/temp = part.get_icon(skeleton) //That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST //And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part) if(part.icon_position & (LEFT | RIGHT)) - var/icon/temp2 = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi', icon_state = "blank") //VOREStation Edit. + var/icon/temp2 = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi', icon_state = "blank") temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH) temp2.Insert(new/icon(temp,dir=SOUTH),dir=SOUTH) if(!(part.icon_position & LEFT)) @@ -369,7 +368,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //tail update_tail_showing() - update_wing_showing() // VOREStation Edit + update_wing_showing() /mob/living/carbon/human/proc/update_skin() if(QDESTROYING(src)) @@ -495,7 +494,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) face_standing.Blend(hair_s, ICON_OVERLAY) - // VOREStation Edit - START var/icon/ears_s = get_ears_overlay() if(ears_s) face_standing.Blend(ears_s, ICON_OVERLAY) @@ -504,9 +502,9 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) overlays_standing[HAIR_LAYER] = image(face_standing, layer = BODY_LAYER+HAIR_LAYER, "pixel_y" = head_organ_vr.head_offset) apply_layer(HAIR_LAYER) return - // VOREStation Edit - END - if(head_organ.transparent) //VOREStation Edit. For better slime limbs. + + if(head_organ.transparent) face_standing += rgb(,,,120) overlays_standing[HAIR_LAYER] = image(face_standing, layer = BODY_LAYER+HAIR_LAYER) @@ -640,14 +638,12 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) return //Wearing a suit that prevents uniform rendering //Build a uniform sprite - //VOREStation Edit start. var/icon/c_mask = tail_style?.clip_mask if(c_mask) var/obj/item/clothing/suit/S = wear_suit if((wear_suit?.flags_inv & HIDETAIL) || (istype(S) && S.taurized)) // Reasons to not mask: 1. If you're wearing a suit that hides the tail or if you're wearing a taurized suit. c_mask = null overlays_standing[UNIFORM_LAYER] = w_uniform.make_worn_icon(body_type = species.get_bodytype(src), slot_id = /datum/inventory_slot_meta/inventory/uniform, default_icon = INV_W_UNIFORM_DEF_ICON, default_layer = UNIFORM_LAYER, clip_mask = c_mask) - //VOREStation Edit end. apply_layer(UNIFORM_LAYER) @@ -730,7 +726,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(!shoes || (wear_suit && wear_suit.flags_inv & HIDESHOES) || (w_uniform && w_uniform.flags_inv & HIDESHOES)) return //Either nothing to draw, or it'd be hidden. - //VOREStation Edit for(var/f in list(BP_L_FOOT, BP_R_FOOT)) var/obj/item/organ/external/foot/foot = get_organ(f) if(istype(foot) && foot.is_hidden_by_tail()) //If either foot is hidden by the tail, don't render footwear. @@ -812,20 +807,19 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) update_inv_w_uniform() update_inv_shoes() update_tail_showing() - update_wing_showing() // VOREStation Edit + update_wing_showing() if(!wear_suit) return //No point, no suit. // Part of splitting the suit sprites up var/iconFile = INV_SUIT_DEF_ICON - var/obj/item/clothing/suit/S //VOREStation edit - break this var out a level for use below. + var/obj/item/clothing/suit/S if(istype(wear_suit, /obj/item/clothing/suit)) S = wear_suit if(S.update_icon_define) iconFile = S.update_icon_define - //VOREStation Edit start. var/icon/c_mask = null var/tail_is_rendered = (overlays_standing[TAIL_LAYER] || overlays_standing[TAIL_LAYER_ALT]) var/valid_clip_mask = tail_style?.clip_mask @@ -833,7 +827,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(tail_is_rendered && valid_clip_mask && !(istype(S) && S.taurized)) //Clip the lower half of the suit off using the tail's clip mask for taurs since taur bodies aren't hidden. c_mask = valid_clip_mask overlays_standing[SUIT_LAYER] = wear_suit.make_worn_icon(body_type = species.get_bodytype(src), slot_id = /datum/inventory_slot_meta/inventory/suit, default_icon = iconFile, default_layer = SUIT_LAYER, clip_mask = c_mask) - //VOREStation Edit end. apply_layer(SUIT_LAYER) @@ -943,7 +936,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) return remove_layer(TAIL_LAYER) - remove_layer(TAIL_LAYER_ALT) // VOREStation Edit - START - Alt Tail Layer + remove_layer(TAIL_LAYER_ALT) var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER @@ -953,14 +946,14 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) overlays_standing[used_tail_layer] = vr_tail_image apply_layer(used_tail_layer) return - // VOREStation Edit - END + var/species_tail = species.get_tail(src) // Species tail icon_state prefix. //This one is actually not that bad I guess. if(species_tail && !(wear_suit && wear_suit.flags_inv & HIDETAIL)) var/icon/tail_s = get_tail_icon() - overlays_standing[used_tail_layer] = image(icon = tail_s, icon_state = "[species_tail]_s", layer = BODY_LAYER+used_tail_layer) // VOREStation Edit - Alt Tail Layer + overlays_standing[used_tail_layer] = image(icon = tail_s, icon_state = "[species_tail]_s", layer = BODY_LAYER+used_tail_layer) animate_tail_reset() //TODO: Is this the appropriate place for this, and not on species...? @@ -970,22 +963,22 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(!tail_icon) //generate a new one var/species_tail_anim = species.get_tail_animation(src) - if(!species_tail_anim && species.icobase_tail) species_tail_anim = species.icobase //VOREStation Code - Allow override of file for non-animated tails + if(!species_tail_anim && species.icobase_tail) species_tail_anim = species.icobase // Allow override of file for non-animated tails if(!species_tail_anim) species_tail_anim = 'icons/effects/species.dmi' tail_icon = new/icon(species_tail_anim) - tail_icon.Blend(rgb(r_skin, g_skin, b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) // VOREStation edit + tail_icon.Blend(rgb(r_skin, g_skin, b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) // The following will not work with animated tails. var/use_species_tail = species.get_tail_hair(src) if(use_species_tail) - var/icon/hair_icon = icon('icons/effects/species.dmi', "[species.get_tail(src)]_[use_species_tail]_s") //VOREStation edit -- Suffix icon state string with '_s' to compensate for diff in .dmi b/w us & Polaris. - hair_icon.Blend(rgb(r_hair, g_hair, b_hair), species.color_mult ? ICON_MULTIPLY : ICON_ADD) //VOREStation edit -- Check for species color_mult + var/icon/hair_icon = icon('icons/effects/species.dmi', "[species.get_tail(src)]_[use_species_tail]_s") // Suffix icon state string with '_s' to compensate for diff in .dmi b/w us & Polaris. //TODO: No. + hair_icon.Blend(rgb(r_hair, g_hair, b_hair), species.color_mult ? ICON_MULTIPLY : ICON_ADD) // Check for species color_mult tail_icon.Blend(hair_icon, ICON_OVERLAY) GLOB.tail_icon_cache[icon_key] = tail_icon return tail_icon /mob/living/carbon/human/proc/set_tail_state(var/t_state) - var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER // VOREStation Edit - START - Alt Tail Layer + var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER var/image/tail_overlay = overlays_standing[used_tail_layer] remove_layer(TAIL_LAYER) @@ -997,7 +990,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) tail_overlay.icon_state = t_state . = tail_overlay - apply_layer(used_tail_layer) // VOREStation Edit - END + apply_layer(used_tail_layer) //Not really once, since BYOND can't do that. //Update this if the ability to flick() images or make looping animation start at the first frame is ever added. @@ -1007,9 +1000,9 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) return var/t_state = "[species.get_tail(src)]_once" - var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER // VOREStation Edit - Alt Tail Layer + var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER - var/image/tail_overlay = overlays_standing[used_tail_layer] // VOREStation Edit - Alt Tail Layer + var/image/tail_overlay = overlays_standing[used_tail_layer] if(tail_overlay && tail_overlay.icon_state == t_state) return //let the existing animation finish @@ -1017,7 +1010,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(tail_overlay) spawn(20) //check that the animation hasn't changed in the meantime - if(overlays_standing[used_tail_layer] == tail_overlay && tail_overlay.icon_state == t_state) // VOREStation Edit - Alt Tail Layer + if(overlays_standing[used_tail_layer] == tail_overlay && tail_overlay.icon_state == t_state) animate_tail_stop() /mob/living/carbon/human/proc/animate_tail_start() @@ -1040,7 +1033,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) set_tail_state("[species.get_tail(src)]_idle[rand(0,9)]") else set_tail_state("[species.get_tail(src)]_static") - toggle_tail_vr(FALSE) //VOREStation Add - So tails stop when someone dies. TODO - Fix this hack ~Leshana + toggle_tail_vr(FALSE) // So tails stop when someone dies. TODO - Fix this hack ~Leshana /mob/living/carbon/human/proc/animate_tail_stop() if(QDESTROYING(src)) @@ -1048,7 +1041,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) set_tail_state("[species.get_tail(src)]_static") -// VOREStation Edit - Wings! See update_icons_vr.dm for more wing procs +/// Wings! See update_icons_vr.dm for more wing procs /mob/living/carbon/human/proc/update_wing_showing() if(QDESTROYING(src)) return @@ -1068,7 +1061,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) overlays_standing[WING_LAYER] += vr_wing_image_2 apply_layer(WING_LAYER) -// VOREStation Edit end /mob/living/carbon/human/update_modifier_visuals() if(QDESTROYING(src)) diff --git a/code/modules/mob/living/carbon/taste.dm b/code/modules/mob/living/carbon/taste.dm index 305af8ee43f..e73bb05dd36 100644 --- a/code/modules/mob/living/carbon/taste.dm +++ b/code/modules/mob/living/carbon/taste.dm @@ -1,11 +1,4 @@ -/mob/living/carbon/proc/ingest(var/datum/reagents/from, var/datum/reagents/target, var/amount = 1, var/multiplier = 1, var/copy = 0) //we kind of 'sneak' a proc in here for ingesting stuff so we can play with it. - /* VOREStation Removal - Synths should be able to taste because... reasons - if(ishuman(src)) - var/mob/living/carbon/human/H = src - var/braintype = H.get_FBP_type() - if(braintype == FBP_DRONE || braintype == FBP_POSI) - return from.trans_to_holder(target,amount,multiplier,copy) //skip the taste, complete transfer - */ +/mob/living/carbon/proc/ingest(datum/reagents/from, datum/reagents/target, amount = 1, multiplier = 1, copy = 0) //we kind of 'sneak' a proc in here for ingesting stuff so we can play with it. if(last_taste_time + 50 < world.time) var/datum/reagents/temp = new(amount) //temporary holder used to analyse what gets transfered. from.trans_to_holder(temp, amount, multiplier, 1) @@ -26,7 +19,7 @@ calculate text size per text. var/minimum_percent = 15 if(ishuman(taster)) var/mob/living/carbon/human/H = taster - minimum_percent = round(15/(H.species.taste_sensitivity)) //VOREStation Edit - Rule of fun! Synths can taste fine! + minimum_percent = round(15/(H.species.taste_sensitivity)) // Rule of fun! Synths can taste fine! //TODO: Reconsider. var/list/out = list() var/list/tastes = list() //descriptor = strength diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 3564b6282ba..df24c54e53f 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -3,7 +3,7 @@ if (transforming) return - handle_modifiers() //VOREStation Edit - Needs to be done even if in nullspace. + handle_modifiers() // Needs to be done even if in nullspace. if(!loc) return @@ -12,8 +12,7 @@ var/datum/gas_mixture/environment = loc.return_air() - //handle_modifiers() // Do this early since it might affect other things later. //VOREStation Edit - + //handle_modifiers() // Do this early since it might affect other things later. handle_light() if(stat != DEAD) @@ -43,9 +42,6 @@ //Check if we're on fire handle_fire() - //stuff in the stomach - //handle_stomach() //VOREStation Code - update_gravity(mob_has_gravity()) update_pulling() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index fb9a80a6ca1..77754009fb4 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -361,7 +361,7 @@ default behaviour is: return result /mob/living/proc/setMaxHealth(var/newMaxHealth) - health = (health/maxHealth) * (newMaxHealth) //VOREStation Add - Adjust existing health + health = (health/maxHealth) * (newMaxHealth) // Adjust existing health maxHealth = newMaxHealth /mob/living/Stun(amount) @@ -712,7 +712,7 @@ default behaviour is: set name = "Examine Meta-Info (OOC)" set category = "OOC" set src in view() - //VOREStation Edit Start - Making it so SSD people have prefs with fallback to original style. + // Making it so SSD people have prefs with fallback to original style. if(config_legacy.allow_Metadata) if(ooc_notes) to_chat(usr, "[src]'s Metainfo:
[ooc_notes]") @@ -722,7 +722,6 @@ default behaviour is: to_chat(usr, "[src] does not have any stored infomation!") else to_chat(usr, "OOC Metadata is not supported by this server!") - //VOREStation Edit End - Making it so SSD people have prefs with fallback to original style. return @@ -763,7 +762,8 @@ default behaviour is: else resist_restraints() - if(attempt_vr(src,"vore_process_resist",args)) return TRUE //VOREStation Code + if(attempt_vr(src,"vore_process_resist",args)) + return TRUE /mob/living/proc/resist_buckle() if(buckled) @@ -958,7 +958,6 @@ default behaviour is: if(lying != lying_prev) lying_prev = lying update_transform() - //VOREStation Add if(lying && LAZYLEN(buckled_mobs)) for(var/rider in buckled_mobs) var/mob/living/L = rider @@ -969,7 +968,6 @@ default behaviour is: else unbuckle_mob(L) L.Stun(5) - //VOREStation Add End return canmove diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 9b7e633d37d..19bc387f77c 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -412,23 +412,6 @@ //Called in MobCollide() and Crossed() /mob/living/proc/spread_fire(mob/living/L) return -// This is commented out pending discussion on Polaris. If you're a downsteam and you want people to spread fire by touching each other, feel free to uncomment this. -/* - if(!istype(L)) - return - var/L_old_on_fire = L.on_fire - - if(on_fire) //Only spread fire stacks if we're on fire - fire_stacks /= 2 - L.fire_stacks += fire_stacks - if(L.IgniteMob()) - message_admins("[key_name(src)] bumped into [key_name(L)] and set them on fire.") - - if(L_old_on_fire) //Only ignite us and gain their stacks if they were onfire before we bumped them - L.fire_stacks /= 2 - fire_stacks += L.fire_stacks - IgniteMob() -*/ /mob/living/proc/get_cold_protection() return 0 diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm index 22510fe315a..a97ade233e8 100644 --- a/code/modules/mob/living/living_movement.dm +++ b/code/modules/mob/living/living_movement.dm @@ -120,7 +120,7 @@ if((tmob.mob_always_swap || (tmob.a_intent == INTENT_HELP || tmob.restrained()) && (a_intent == INTENT_HELP || src.restrained())) && tmob.canmove && canmove && !tmob.buckled && !buckled && can_swap && can_move_mob(tmob, 1, 0)) // mutual brohugs all around! var/turf/oldloc = loc forceMove(tmob.loc) - //VOREstation Edit - Begin + if (istype(tmob, /mob/living/simple_mob)) //check bumpnom chance, if it's a simplemob that's bumped tmob.Bumped(src) else if(istype(src, /mob/living/simple_mob)) //otherwise, if it's a simplemob doing the bumping. Simplemob on simplemob doesn't seem to trigger but that's fine. @@ -134,20 +134,20 @@ now_pushing = 0 return // TODO - Check if we need to do something about the slime.UpdateFeed() we are skipping below. - // VOREStation Edit - End + tmob.forceMove(oldloc) if(old_pulling) start_pulling(old_pulling, supress_message = TRUE) now_pushing = 0 return - //VOREStation Edit - Begin + else if((tmob.mob_always_swap || (tmob.a_intent == INTENT_HELP || tmob.restrained()) && (a_intent == INTENT_HELP || src.restrained())) && canmove && can_swap && handle_micro_bump_helping(tmob)) forceMove(tmob.loc) now_pushing = 0 if(old_pulling) start_pulling(old_pulling, supress_message = TRUE) return - //VOREStation Edit - End + if(!can_move_mob(tmob, 0, 0)) now_pushing = 0 @@ -155,7 +155,7 @@ if(a_intent == INTENT_HELP || src.restrained()) now_pushing = 0 return - // VOREStation Edit - Begin + // Plow that nerd. if(ishuman(tmob)) var/mob/living/carbon/human/H = tmob @@ -166,7 +166,7 @@ return // Handle grabbing, stomping, and such of micros! if(handle_micro_bump_other(tmob)) return - // VOREStation Edit - End + if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(40) && !(FAT in src.mutations)) to_chat(src, "You fail to push [tmob]'s fat ass out of the way.") @@ -190,18 +190,9 @@ now_pushing = 0 . = ..() if (!istype(AM, /atom/movable) || AM.anchored) - //VOREStation Edit - object-specific proc for running into things + // Object-specific proc for running into things if(((confused || is_blind()) && stat == CONSCIOUS && prob(50) && m_intent=="run") || flying && !SPECIES_ADHERENT) AM.stumble_into(src) - //VOREStation Edit End - /* VOREStation Removal - See above - if(confused && prob(50) && m_intent=="run") - Weaken(2) - playsound(loc, "punch", 25, 1, -1) - visible_message("[src] [pick("ran", "slammed")] into \the [AM]!") - src.apply_damage(5, BRUTE) - to_chat(src, "You just [pick("ran", "slammed")] into \the [AM]!") - */ // VOREStation Removal End return if (!now_pushing) if(isobj(AM)) diff --git a/code/modules/mob/living/living_powers.dm b/code/modules/mob/living/living_powers.dm index 737fcaa6177..169593dc896 100644 --- a/code/modules/mob/living/living_powers.dm +++ b/code/modules/mob/living/living_powers.dm @@ -10,7 +10,8 @@ set desc = "Allows to hide beneath tables or certain items. Toggled on or off." set category = "Abilities" - if(stat == DEAD || paralysis || weakened || stunned || restrained() || buckled || LAZYLEN(grabbed_by) || has_buckled_mobs()) //VORE EDIT: Check for has_buckled_mobs() (taur riding) + // Check for has_buckled_mobs() (taur riding) + if(stat == DEAD || paralysis || weakened || stunned || restrained() || buckled || LAZYLEN(grabbed_by) || has_buckled_mobs()) return if(status_flags & HIDING) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 7e01094c8f7..9267ecc41ce 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -116,12 +116,10 @@ proc/get_radio_key_from_channel(var/channel) message = stutter(message) verb = pick("stammers","stutters") . = 1 - //VOREStation Edit Start if(muffled) verb = pick("muffles") whispering = 1 . = 1 - //VOREStation Edit End message_data[1] = message message_data[2] = verb @@ -301,8 +299,8 @@ proc/get_radio_key_from_channel(var/channel) message_range = 1 sound_vol *= 0.5 - //VOREStation edit - allows for custom say verbs, overriding all other say-verb types- e.g. "says loudly" instead of "shouts" - //You'll still stammer if injured or slur if drunk, but it won't have those specific words + /// Allows for custom say verbs, overriding all other say-verb types- e.g. "says loudly" instead of "shouts" + /// You'll still stammer if injured or slur if drunk, but it won't have those specific words var/ending = copytext_char(message, length_char(message)) if(custom_whisper && whispering) @@ -313,7 +311,6 @@ proc/get_radio_key_from_channel(var/channel) verb = "[custom_ask]" else if(custom_say) verb = "[custom_say]" - //VOREStation edit ends //Handle nonverbal and sign languages here if (speaking) @@ -355,9 +352,8 @@ proc/get_radio_key_from_channel(var/channel) //The 'post-say' static speech bubble var/speech_bubble_test = say_test(message) - //var/image/speech_bubble = image('icons/mob/talk_vr.dmi',src,"h[speech_bubble_test]") //VOREStation Edit. Commented this out in case we need to reenable. var/speech_type = speech_bubble_appearance() - var/image/speech_bubble = image('icons/mob/talk_vr.dmi',src,"[speech_type][speech_bubble_test]") //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons + var/image/speech_bubble = image('icons/mob/talk_vr.dmi',src,"[speech_type][speech_bubble_test]") var/sb_alpha = 255 var/atom/loc_before_turf = src if(isbelly(loc)) @@ -377,7 +373,7 @@ proc/get_radio_key_from_channel(var/channel) var/turf/ST = get_turf(above) if(ST) var/list/results = get_mobs_and_objs_in_view_fast(ST, world.view) - var/image/z_speech_bubble = image('icons/mob/talk_vr.dmi', above, "h[speech_bubble_test]") //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons + var/image/z_speech_bubble = image('icons/mob/talk_vr.dmi', above, "h[speech_bubble_test]") images_to_clients[z_speech_bubble] = list() for(var/item in results["mobs"]) if(item != above && !(item in listening)) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 896fc453221..bde7a2e4584 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -221,13 +221,13 @@ var/list/ai_verbs_default = list( to_chat(src, radio_text) - // Vorestation Edit: Meta Info for AI's. Mostly used for Holograms - if (client) + // Meta Info for AI's. Mostly used for Holograms. + if(client) var/meta_info = client.prefs.metadata - if (meta_info) + if(meta_info) ooc_notes = meta_info - if (malf && !(mind in malf.current_antagonists)) + if(malf && !(mind in malf.current_antagonists)) show_laws() to_chat(src, "These laws may be changed by other players, or by you being the traitor.") @@ -465,12 +465,10 @@ var/list/ai_verbs_default = list( ..() /mob/living/silicon/ai/Topic(href, href_list) - if(..()) //VOREstation edit: So the AI can actually can actually get its OOC prefs read + if(..()) // So the AI can actually can actually get its OOC prefs read return if(usr != src) return - /*if(..()) // <------ MOVED FROM HERE - return*/ if (href_list["mach_close"]) if (href_list["mach_close"] == "aialerts") viewalerts = 0 @@ -481,7 +479,6 @@ var/list/ai_verbs_default = list( switchCamera(locate(href_list["switchcamera"])) in GLOB.cameranet.cameras if (href_list["showalerts"]) subsystem_alarm_monitor() - //Carn: holopad requests if (href_list["jumptoholopad"]) var/obj/machinery/hologram/holopad/H = locate(href_list["jumptoholopad"]) if(stat == CONSCIOUS) @@ -815,11 +812,10 @@ var/list/ai_verbs_default = list( set desc = "Toggles hologram movement based on moving with your virtual eye." hologram_follow = !hologram_follow - //VOREStation Add - Required to stop movement because we use walk_to(wards) in hologram.dm + // Required to stop movement because we use walk_to(wards) in hologram.dm if(holo) var/obj/effect/overlay/aiholo/hologram = holo.masters[src] walk(hologram, 0) - //VOREStation Add End to_chat(usr, "Your hologram will [hologram_follow ? "follow" : "no longer follow"] you now.") diff --git a/code/modules/mob/living/silicon/ai/ai_remote_control.dm b/code/modules/mob/living/silicon/ai/ai_remote_control.dm index 9b5cd71443b..18214094e20 100644 --- a/code/modules/mob/living/silicon/ai/ai_remote_control.dm +++ b/code/modules/mob/living/silicon/ai/ai_remote_control.dm @@ -23,7 +23,7 @@ for(var/borgie in GLOB.available_ai_shells) var/mob/living/silicon/robot/R = borgie var/turf/T = get_turf(R) - if(R.shell && !R.deployed && (R.stat != DEAD) && (!R.connected_ai || (R.connected_ai == src) ) && !(GLOB.using_map.ai_shell_restricted && !(T.z in GLOB.using_map.ai_shell_allowed_levels)) ) //VOREStation Edit: shell restrictions + if(R.shell && !R.deployed && (R.stat != DEAD) && (!R.connected_ai || (R.connected_ai == src) ) && !(GLOB.using_map.ai_shell_restricted && !(T.z in GLOB.using_map.ai_shell_allowed_levels)) ) possible += R if(!LAZYLEN(possible)) diff --git a/code/modules/mob/living/silicon/pai/death.dm b/code/modules/mob/living/silicon/pai/death.dm index cdd57a9d4ac..86fdf29ad54 100644 --- a/code/modules/mob/living/silicon/pai/death.dm +++ b/code/modules/mob/living/silicon/pai/death.dm @@ -1,12 +1,8 @@ /mob/living/silicon/pai/death(gibbed) if(card) card.removePersonality() - //if(gibbed) //VOREStation Edit Start. This prevents pAIs from joining back into their card after the card's killed src.loc = get_turf(card) qdel(card) - /*else - close_up() - qdel(card)*/ //VOREStation Edit End. if(mind) qdel(mind) ..(gibbed) diff --git a/code/modules/mob/living/silicon/pai/examine.dm b/code/modules/mob/living/silicon/pai/examine.dm index 2888ac75e25..68a47d7dec7 100644 --- a/code/modules/mob/living/silicon/pai/examine.dm +++ b/code/modules/mob/living/silicon/pai/examine.dm @@ -6,12 +6,9 @@ if(!src.client) . += "\nIt appears to be in stand-by mode.\n" //afk if(UNCONSCIOUS) . += "\nIt doesn't seem to be responding.\n" if(DEAD) . += "\nIt looks completely unsalvageable.\n" - . += attempt_vr(src,"examine_bellies",args) //VOREStation Edit - - // VOREStation Edit: Start + . += attempt_vr(src,"examine_bellies",args) if(ooc_notes) . += "OOC Notes: \[View\]\n" - // VOREStation Edit: End . += "\n*---------*" diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index b46f3b7bbae..37140a0a350 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -47,9 +47,9 @@ "Fox" = "pai-fox", "Parrot" = "pai-parrot", "Rabbit" = "pai-rabbit", - "Bear" = "pai-bear", //VOREStation Edit - "Fennec" = "pai-fen", // VOREStation Edit - Rykka - "Fennec" = "pai-typezero" //VOREStation Edit + "Bear" = "pai-bear", + "Fennec" = "pai-fen", + "Fennec" = "pai-typezero", ) var/global/list/possible_say_verbs = list( @@ -58,10 +58,11 @@ "Beep" = list("beeps","beeps loudly","boops"), "Chirp" = list("chirps","chirrups","cheeps"), "Feline" = list("purrs","yowls","meows"), - "Canine" = list("yaps","barks","woofs") + "Canine" = list("yaps","barks","woofs"), ) - var/obj/item/pai_cable/cable // The cable we produce and use when door or camera jacking + /// The cable we produce and use when door or camera jacking. + var/obj/item/pai_cable/cable var/master // Name of the one who commands us var/master_dna // DNA string for owner verification @@ -132,8 +133,8 @@ /mob/living/silicon/pai/Login() ..() - // Vorestation Edit: Meta Info for pAI - if (client.prefs) + // Meta Info for pAI + if(client.prefs) ooc_notes = client.prefs.metadata @@ -285,10 +286,10 @@ return 0 else if(istype(card.loc,/mob)) var/mob/holder = card.loc - var/datum/belly/inside_belly = check_belly(card) //VOREStation edit. - if(inside_belly) //VOREStation edit. - to_chat(src, "There is no room to unfold in here. You're good and stuck.") //VOREStation edit. - return 0 //VOREStation edit. + var/datum/belly/inside_belly = check_belly(card) + if(inside_belly) + to_chat(src, "There is no room to unfold in here. You're good and stuck.") + return 0 if(ishuman(holder)) var/mob/living/carbon/human/H = holder for(var/obj/item/organ/external/affecting in H.organs) @@ -312,9 +313,9 @@ if(istype(T)) T.visible_message("[src] folds outwards, expanding into a mobile form.") - verbs += /mob/living/silicon/pai/proc/pai_nom //VOREStation edit - verbs += /mob/living/proc/set_size //VOREStation edit - verbs += /mob/living/proc/shred_limb //VORREStation edit + verbs += /mob/living/silicon/pai/proc/pai_nom + verbs += /mob/living/proc/set_size + verbs += /mob/living/proc/shred_limb /mob/living/silicon/pai/verb/fold_up() set category = "pAI Commands" @@ -373,8 +374,8 @@ else resting = !resting icon_state = resting ? "[chassis]_rest" : "[chassis]" - update_icon() //VOREStation edit - to_chat(src, "You are now [resting ? "resting" : "getting up"]") + update_icon() + to_chat(src, SPAN_NOTICE("You are now [resting ? "resting" : "getting up"]")) canmove = !resting @@ -405,7 +406,7 @@ if(src.loc == card) return - release_vore_contents() //VOREStation Add + release_vore_contents() var/turf/T = get_turf(src) if(istype(T)) @@ -432,7 +433,7 @@ canmove = 1 resting = 0 icon_state = "[chassis]" - verbs -= /mob/living/silicon/pai/proc/pai_nom //VOREStation edit. Let's remove their nom verb + verbs -= /mob/living/silicon/pai/proc/pai_nom // No binary for pAIs. /mob/living/silicon/pai/binarycheck() diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index dc5f65fe3a3..7edf6ee56eb 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -16,9 +16,9 @@ var/obj/item/gripper/G = locate(/obj/item/gripper) in module if(G) G.drop_item() - var/obj/item/dogborg/sleeper/S = locate(/obj/item/dogborg/sleeper) in module //VOREStation edit. + var/obj/item/dogborg/sleeper/S = locate(/obj/item/dogborg/sleeper) in module if(S) - S.go_out() //VOREStation edit. + S.go_out() remove_robot_verbs() sql_report_cyborg_death(src) return ..(gibbed, "shudders violently for a moment, then becomes motionless, its eyes slowly darkening.") diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index d7c1e6c2fd9..0a43d9f5028 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -221,7 +221,7 @@ can_hold = list( /obj/item/mecha_parts/part, - /obj/item/mecha_parts/micro/part, //VOREStation Edit: Allow construction of micromechs, + /obj/item/mecha_parts/micro/part, /obj/item/mecha_parts/mecha_equipment, /obj/item/mecha_parts/mecha_tracking ) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 98fe3faf84e..18d87f0eed7 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -329,7 +329,7 @@ m_type = 1 if("law") - if (istype(module,/obj/item/robot_module/robot/security) || istype(module,/obj/item/robot_module/robot/knine)) //VOREStation Add - K9 + if (istype(module,/obj/item/robot_module/robot/security) || istype(module,/obj/item/robot_module/robot/knine)) message = "shows its legal authorization barcode." playsound(src.loc, 'sound/voice/biamthelaw.ogg', 50, 0) @@ -338,7 +338,7 @@ to_chat(src, "You are not THE LAW, pal.") if("halt") - if (istype(module,/obj/item/robot_module/robot/security) || istype(module,/obj/item/robot_module/robot/knine)) //VOREStation Add - K9 + if (istype(module,/obj/item/robot_module/robot/security) || istype(module,/obj/item/robot_module/robot/knine)) message = "'s speakers skreech, \"Halt! Security!\"." playsound(src.loc, 'sound/voice/halt.ogg', 50, 0) diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index f532c8c4cb3..04b22e14fa9 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -29,12 +29,9 @@ . += "It appears to be in stand-by mode.\n" //afk if(UNCONSCIOUS) . += "It doesn't seem to be responding.\n" if(DEAD) . += "It looks completely unsalvageable.\n" - . += attempt_vr(src,"examine_bellies_borg",args) //VOREStation Edit - - // VOREStation Edit: Start + . += attempt_vr(src,"examine_bellies_borg",args) if(ooc_notes) . += "OOC Notes: \[View\]\n" - // VOREStation Edit: End . += "*---------*" diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 73b2558a5fa..a0c261a6fdd 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -80,9 +80,6 @@ Paralyse(3) AdjustSleeping(-1) - //if(src.resting) // VOREStation edit. Our borgos would rather not. - // Weaken(5) - if(health < config_legacy.health_threshold_dead && src.stat != 2) //die only once death() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 98550062f8b..8708c71bf58 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -304,7 +304,7 @@ return var/module_type = GLOB.robot_modules[modtype] - transform_with_anim() //VOREStation edit: sprite animation + transform_with_anim() new module_type(src) hands.icon_state = lowertext(modtype) @@ -356,7 +356,7 @@ flavor_text = module_flavour else flavor_text = client.prefs.flavour_texts_robot["Default"] - // Vorestation Edit: and meta info + // Meta info var/meta_info = client.prefs.metadata if (meta_info) ooc_notes = meta_info @@ -400,7 +400,7 @@ lights_on = !lights_on to_chat(usr, "You [lights_on ? "enable" : "disable"] your integrated light.") handle_light() - updateicon() //VOREStation Add - Since dogborgs have sprites for this + updateicon() /mob/living/silicon/robot/verb/self_diagnosis_verb() set category = "Robot Commands" @@ -753,7 +753,7 @@ return /mob/living/silicon/robot/proc/module_reset() - transform_with_anim() //VOREStation edit: sprite animation + transform_with_anim() uneq_all() modtype = initial(modtype) hands.icon_state = initial(hands.icon_state) @@ -1099,18 +1099,18 @@ icontype = module_sprites[1] else icontype = input("Select an icon! [triesleft ? "You have [triesleft] more chance\s." : "This is your last try."]", "Robot Icon", icontype, null) in module_sprites - if(notransform) //VOREStation edit start: sprite animation + if(notransform) to_chat(src, "Your current transformation has not finished yet!") choose_icon(icon_selection_tries, module_sprites) return else - transform_with_anim() //VOREStation edit end: sprite animation + transform_with_anim() if(icontype == "Custom") icon = CUSTOM_ITEM_SYNTH else // This is to fix an issue where someone with a custom borg sprite chooses a non-custom sprite and turns invisible. - vr_sprite_check() //VOREStation Edit - icon_state = module_sprites[icontype] + vr_sprite_check() + icon_state = module_sprites[icontype] updateicon() if (module_sprites.len > 1 && triesleft >= 1 && client) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index cbc8684e8f5..15889d74667 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(robot_modules, list( channels = R.mainframe.aiRadio.channels R.radio.recalculateChannels() - vr_add_sprites() //Vorestation Edit: For vorestation only sprites + vr_add_sprites() //TODO: Add into the normal lists. R.set_module_sprites(sprites) // TODO: REFACTOR CYBORGS THEY ARE ALL SHITCODE @@ -168,4 +168,4 @@ GLOBAL_LIST_INIT(robot_modules, list( src.modules += new /obj/item/tool/crowbar/cyborg(src) src.modules += new /obj/item/extinguisher(src) src.modules += new /obj/item/gps/robot(src) - vr_new() // Vorestation Edit: For modules in robot_modules_vr.dm + vr_new() // For modules in robot_modules_vr.dm //TODO: Integrate diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station/security.dm b/code/modules/mob/living/silicon/robot/robot_modules/station/security.dm index 5b958873e52..97b407dfd97 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station/security.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station/security.dm @@ -34,7 +34,6 @@ src.modules += new /obj/item/handcuffs/cyborg(src) src.modules += new /obj/item/melee/baton/robot(src) src.modules += new /obj/item/gun/energy/taser/mounted/cyborg(src) - // src.modules += new /obj/item/gun/energy/taser/xeno/sec/robot(src) // VOREStation Edit - We don't need these src.modules += new /obj/item/barrier_tape_roll/police(src) src.modules += new /obj/item/reagent_containers/spray/pepper(src) src.modules += new /obj/item/gripper/security(src) @@ -68,7 +67,7 @@ /obj/item/robot_module/robot/security/combat/Initialize(mapload) . = ..() src.modules += new /obj/item/flash(src) - //src.modules += new /obj/item/borg/sight/thermal(src) // VOREStation Edit + //src.modules += new /obj/item/borg/sight/thermal(src) src.modules += new /obj/item/gun/energy/laser/mounted(src) src.modules += new /obj/item/pickaxe/plasmacutter(src) src.modules += new /obj/item/borg/combat/shield(src) diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index c5eb53912c2..5c019f1260b 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -14,7 +14,7 @@ /mob/living/silicon/robot/movement_delay() . = speed if(module_active && istype(module_active,/obj/item/borg/combat/mobility)) - . -= 2 // VOREStation Edit + . -= 2 if(get_restraining_bolt()) // Borgs with Restraining Bolts move slower. . += 1 diff --git a/code/modules/mob/living/silicon/robot/robot_remote_control.dm b/code/modules/mob/living/silicon/robot/robot_remote_control.dm index 60055e189cc..592ebfc4f40 100644 --- a/code/modules/mob/living/silicon/robot/robot_remote_control.dm +++ b/code/modules/mob/living/silicon/robot/robot_remote_control.dm @@ -69,14 +69,10 @@ GLOBAL_LIST_EMPTY(available_ai_shells) // Languages and comms. languages = AI.languages.Copy() speech_synthesizer_langs = AI.speech_synthesizer_langs.Copy() - //VOREStation Edit Start if(radio && AI.aiRadio && module) //AI keeps all channels, including Syndie if it is an Infiltrator. -// if(AI.radio.syndie) -// radio.make_syndie() radio.subspace_transmission = TRUE module.channels = AI.aiRadio.channels radio.recalculateChannels() - //VOREStation Edit End // Called after the AI transfers over. /mob/living/silicon/robot/proc/post_deploy() @@ -86,8 +82,6 @@ GLOBAL_LIST_EMPTY(available_ai_shells) /mob/living/silicon/robot/proc/undeploy(message) if(!deployed || !mind || !mainframe) return -// mainframe.redeploy_action.Grant(mainframe) -// mainframe.redeploy_action.last_used_shell = src if(message) to_chat(src, SPAN_NOTICE(message)) mind.transfer_to(mainframe) @@ -96,14 +90,11 @@ GLOBAL_LIST_EMPTY(available_ai_shells) mainframe.teleop = null mainframe.deployed_shell = null SetName("[modtype] AI Shell [num2text(ident)]") -// undeployment_action.Remove(src) - if(radio && module) //Return radio to normal //VOREStation Edit - module.channels = initial(module.channels) //VOREStation Edit + if(radio && module) //Return radio to normal + module.channels = initial(module.channels) radio.recalculateChannels() if(!QDELETED(camera)) - camera.c_tag = real_name //update the camera name too -// diag_hud_set_aishell() -// mainframe.diag_hud_set_deployed() + camera.c_tag = real_name //update the camera name too if(mainframe.laws) mainframe.laws.show_laws(mainframe) //Always remind the AI when switching mainframe = null diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 4a11f8f9d34..74354bd16a5 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -117,9 +117,8 @@ if(T && T.masters[src]) var/rendered = "[name] [message]" to_chat(src, "Holopad action relayed, [real_name] [message]") - var/obj/effect/overlay/aiholo/hologram = T.masters[src] //VOREStation Add for people in the hologram to hear the messages + var/obj/effect/overlay/aiholo/hologram = T.masters[src] // Add for people in the hologram to hear the messages - //var/obj/effect/overlay/hologram = T.masters[src] //VOREStation edit. Done above. var/list/in_range = get_mobs_and_objs_in_view_fast(get_turf(hologram), world.view, 2) //Emotes are displayed from the hologram, not the pad var/list/m_viewers = in_range["mobs"] var/list/o_viewers = in_range["objs"] diff --git a/code/modules/mob/living/simple_mob/life.dm b/code/modules/mob/living/simple_mob/life.dm index 07dba07d95e..6a8e0419b15 100644 --- a/code/modules/mob/living/simple_mob/life.dm +++ b/code/modules/mob/living/simple_mob/life.dm @@ -89,7 +89,7 @@ if(Environment) - if( abs(Environment.temperature - bodytemperature) > temperature_range ) //VOREStation Edit: heating adjustments + if( abs(Environment.temperature - bodytemperature) > temperature_range ) bodytemperature += ((Environment.temperature - bodytemperature) / 5) if(min_oxy) diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index 2da1e5b594a..90eea87bb5e 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -84,28 +84,20 @@ /mob/living/simple_mob/proc/will_eat(var/mob/living/M) if(client) //You do this yourself, dick! - //ai_log("vr/wont eat [M] because we're player-controlled", 3) //VORESTATION AI TEMPORARY REMOVAL return 0 if(!istype(M)) //Can't eat 'em if they ain't /mob/living - //ai_log("vr/wont eat [M] because they are not /mob/living", 3) //VORESTATION AI TEMPORARY REMOVAL return 0 if(src == M) //Don't eat YOURSELF dork - //ai_log("vr/won't eat [M] because it's me!", 3) //VORESTATION AI TEMPORARY REMOVAL return 0 if(vore_ignores_undigestable && !M.digestable) //Don't eat people with nogurgle prefs - //ai_log("vr/wont eat [M] because I am picky", 3) //VORESTATION AI TEMPORARY REMOVAL return 0 if(!M.allowmobvore) // Don't eat people who don't want to be ate by mobs - //ai_log("vr/wont eat [M] because they don't allow mob vore", 3) //VORESTATION AI TEMPORARY REMOVAL return 0 if(M in prey_excludes) // They're excluded - //ai_log("vr/wont eat [M] because they are excluded", 3) //VORESTATION AI TEMPORARY REMOVAL return 0 if(M.size_multiplier < vore_min_size || M.size_multiplier > vore_max_size) - //ai_log("vr/wont eat [M] because they too small or too big", 3) //VORESTATION AI TEMPORARY REMOVAL return 0 if(vore_capacity != 0 && (vore_fullness >= vore_capacity)) // We're too full to fit them - //ai_log("vr/wont eat [M] because I am too full", 3) //VORESTATION AI TEMPORARY REMOVAL return 0 return 1 @@ -163,24 +155,21 @@ // Attempt to eat target // TODO - Review this. Could be some issues here /mob/living/simple_mob/proc/EatTarget(var/mob/living/M) - //ai_log("vr/EatTarget() [M]",2) //VORESTATION AI TEMPORARY REMOVAL - //stop_automated_movement = 1 //VORESTATION AI TEMPORARY REMOVAL var/old_target = M - set_AI_busy(1) //VORESTATION AI TEMPORARY EDIT + set_AI_busy(1) . = animal_nom(M) playsound(src, swallowsound, 50, 1) update_icon() if(.) // If we succesfully ate them, lose the target - set_AI_busy(0) // lose_target(M) //Unsure what to put here. Replaced with set_AI_busy(1) //VORESTATION AI TEMPORARY EDIT + set_AI_busy(0) return old_target else if(old_target == M) // If we didn't but they are still our target, go back to attack. // but don't run the handler immediately, wait until next tick // Otherwise we'll be in a possibly infinate loop - set_AI_busy(0) //VORESTATION AI TEMPORARY EDIT - //stop_automated_movement = 0 //VORESTATION AI TEMPORARY EDIT + set_AI_busy(0) /mob/living/simple_mob/death() release_vore_contents() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm index c3398303b2b..39329e556f4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm @@ -32,7 +32,7 @@ var/mob/living/friend = null // Our best pal, who we'll follow. Meow. var/named = FALSE //have I been named yet? - var/friend_name = null //VOREStation Edit - Lock befriending to this character + var/friend_name = null // Lock befriending to this character meat_amount = 2 bone_amount = 2 @@ -96,7 +96,7 @@ to_chat(L, SPAN_WARNING( "\The [src] ignores you.")) return - //VOREStation Edit Start - Adds friend_name var checks + // friend_name var checks if(!friend_name || L.real_name == friend_name) friend = L face_atom(L) @@ -108,10 +108,8 @@ AI.set_follow(friend) else to_chat(L, SPAN_NOTICE("[src] ignores you.")) - //VOREStation Edit End -//RUNTIME IS ALIVE! SQUEEEEEEEE~ /mob/living/simple_mob/animal/passive/cat/runtime name = "Runtime" desc = "Her fur has the look and feel of velvet, and her tail quivers occasionally." @@ -120,7 +118,7 @@ icon_state = "cat" item_state = "cat" named = TRUE - makes_dirt = 0 //Vorestation Edit + makes_dirt = 0 randomized = FALSE /mob/living/simple_mob/animal/passive/cat/kitten @@ -129,7 +127,7 @@ icon_state = "kitten" item_state = "kitten" gender = NEUTER - holder_type = /obj/item/holder/cat/kitten //VOREStation Edit + holder_type = /obj/item/holder/cat/kitten /mob/living/simple_mob/animal/passive/cat/kitten/Initialize(mapload) if(gender == NEUTER) @@ -157,7 +155,7 @@ holder_type = /obj/item/holder/cat/fluff/bones randomized = FALSE -// VOREStation Edit - Adds generic tactical kittens +/// Tactical kittens! /obj/item/holder/cat/kitten icon_state = "kitten" w_class = ITEMSIZE_SMALL diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm index 95ea80e604f..31dd4daee3c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm @@ -196,7 +196,7 @@ desc = "This is the HoP's trusty corgi. He does the best he can." var/turns_since_scan = 0 var/obj/movement_target - makes_dirt = FALSE //VOREStation edit: no more dirt + makes_dirt = FALSE randomized = FALSE /mob/living/simple_mob/animal/passive/dog/corgi/Ian/Life() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm index 051da9b33a2..b7cc6faec7a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm @@ -99,7 +99,6 @@ /mob/living/simple_mob/animal/sif/shantak/retaliate ai_holder_type = /datum/ai_holder/simple_mob/retaliate -//Vorestation Addition /mob/living/simple_mob/animal/sif/shantak/scruffy name = "Scruffy" ai_holder_type = /datum/ai_holder/simple_mob/passive diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm index 4d5bb92f53c..8cd7a7f088f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm @@ -113,12 +113,10 @@ icon_rest = "mouse_[rank]_sleep" /mob/living/simple_mob/animal/space/mouse_army/Crossed(AM as mob|obj) - //VOREStation Edit begin: SHADEKIN var/mob/SK = AM if(istype(SK)) if(SK.shadekin_phasing_check()) return - //VOREStation Edit end: SHADEKIN if( ishuman(AM) ) if(!stat) var/mob/M = AM diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm index bc1b7edcc84..4873bda21b1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm @@ -173,16 +173,14 @@ give_hat(I, user) return - //VOREStation Edit Start var/can_miss = TRUE for(var/item_type in allowed_attack_types) if(istype(I, item_type)) can_miss = FALSE break - //VOREStation Edit End // Otherwise they're probably fighting the slime. - if(prob(25) && can_miss) //VOREStation Edit + if(prob(25) && can_miss) visible_message(SPAN_WARNING( "\The [user]'s [I] passes right through \the [src]!")) user.setClickCooldown(user.get_attack_speed(I)) return diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm index 7a094e95ab8..42e4d0f92bb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm @@ -130,13 +130,11 @@ if(L.getCloneLoss() >= L.getMaxHealth() * 1.5) to_chat(src, "This subject does not have an edible life energy...") return FALSE - //VOREStation Addition start if(istype(L, /mob/living/carbon/human)) var/mob/living/carbon/human/H = L if(H.species.flags & NO_SCAN) to_chat(src, "This subject's life energy is beyond my reach...") return FALSE - //VOREStation Addition end if(L.has_buckled_mobs()) for(var/A in L.buckled_mobs) if(istype(A, /mob/living/simple_mob/slime/xenobio)) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm index c21eabee15f..30dcda21d8e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm @@ -53,17 +53,6 @@ vore_pounce_chance = 0 // Beat them into crit before eating. vore_icons = SA_ICON_LIVING -/* //VOREStation AI Temporary Removal -/mob/living/simple_animal/hostile/deathclaw/Login() - . = ..() - if(!riding_datum) - riding_datum = new /datum/riding/simple_animal(src) - verbs |= /mob/living/simple_animal/proc/animal_mount - -/mob/living/simple_animal/hostile/deathclaw/MouseDrop_T(mob/living/M, mob/living/user) - return -*/ - /datum/ai_holder/simple_mob/melee/deathclaw can_breakthrough = TRUE violent_breakthrough = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm index 18ae6a893e0..c2f34b4ceb8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm @@ -39,12 +39,7 @@ /mob/living/simple_mob/vore/aggressive/dragon/Process_Spacemove(var/check_drift = 0) return 1 //No drifting in space for space dragons! -/* -/mob/living/simple_mob/vore/aggressive/dragon/FindTarget() - . = ..() - if(.) - custom_emote(1,"snaps at [.]") -*/ + // Activate Noms! /mob/living/simple_mob/vore/aggressive/dragon vore_active = 1 @@ -57,16 +52,6 @@ health = 200 faction = "virgo3b" -/* //VOREStation AI Temporary Removal -/mob/living/simple_animal/hostile/dragon/Login() - . = ..() - if(!riding_datum) - riding_datum = new /datum/riding/simple_animal(src) - verbs |= /mob/living/simple_animal/proc/animal_mount - -/mob/living/simple_animal/hostile/dragon/MouseDrop_T(mob/living/M, mob/living/user) - return -*/ /datum/say_list/dragonboss say_got_target = list("roars and snaps it jaws!") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm b/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm index 7a5348d2f38..29f45e18b19 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm @@ -79,14 +79,6 @@ vore_stomach_flavor = "You are squeezed into the sweltering insides of the herbivore rumen." vore_icons = SA_ICON_LIVING -/* //VOREStation AI Temporary Removal -/mob/living/simple_mob/vore/hippo/Login() - . = ..() - if(!riding_datum) - riding_datum = new /datum/riding/simple_animal(src) - verbs |= /mob/living/simple_animal/proc/animal_mount -*/ - /mob/living/simple_mob/vore/hippo/MouseDrop_T(mob/living/M, mob/living/user) return diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm b/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm index 6629009134a..26f5373dbf9 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm @@ -57,17 +57,6 @@ vore_active = 1 vore_icons = SA_ICON_LIVING -/* //VOREStation AI Temporary Removal -/mob/living/simple_animal/horse/Login() - . = ..() - if(!riding_datum) - riding_datum = new /datum/riding/simple_animal(src) - verbs |= /mob/living/simple_animal/proc/animal_mount - -/mob/living/simple_animal/horse/MouseDrop_T(mob/living/M, mob/living/user) - return -*/ - /datum/say_list/horse speak = list("NEHEHEHEHEH","Neh?") emote_hear = list("snorts","whinnies") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm b/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm index df922a6f1fc..dd3b98cc313 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm @@ -49,17 +49,6 @@ vore_pounce_chance = 10 vore_icons = SA_ICON_LIVING | SA_ICON_REST -/* //VOREStation AI Temporary Removal -/mob/living/simple_animal/vore/panther/Login() - . = ..() - if(!riding_datum) - riding_datum = new /datum/riding/simple_animal(src) - verbs |= /mob/living/simple_animal/proc/animal_mount - -/mob/living/simple_animal/vore/panther/MouseDrop_T(mob/living/M, mob/living/user) - return -*/ - /datum/say_list/panther speak = list("RAWR!","Rawr!","GRR!","Growl!") emote_hear = list("rawrs","rumbles","rowls","growls","roars") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm index 8a7150299d0..f09beb12d9f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm @@ -69,134 +69,16 @@ ai_holder_type = /datum/ai_holder/simple_mob/retaliate -/* -/mob/living/simple_mob/vore/aggressive/rat/tame/Life() - . = ..() - if(!. || ai_inactive) - return - - if(hunger > 0 && life_since_foodscan++ > 5) //Only look for floor food when hungry. - life_since_foodscan = 0 - for(var/obj/item/reagent_containers/food/snacks/S in oview(src,3)) //Accept thrown offerings and scavenge surroundings. - if(get_dist(src,S) <=1) - visible_emote("hungrily devours \the [S].") - playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1) - qdel(S) - hunger = 0 - food = null - else - WanderTowards(S.loc) - break - - if(!food) - return - - var/food_dist = get_dist(src,food) - - if(food_dist > world.view) //Lose interest on this person. - food = null - hunger = Clamp(hunger+5, 0, 25) - - if(food_dist > 1) - if(stance == STANCE_IDLE) - if(set_follow(food,10 SECONDS)) - handle_stance(STANCE_FOLLOW) - if(resting) - lay_down() - - if(food_dist <= 1) - if(hunger < 15) - if(prob(25)) - visible_emote(pick("sniffs curiously at [food].", - "stares at [food], seeming to want something.", - "sniffs at [food]'s hands.", - "sniffs curiously at [food]'s pockets.", - "sits down for a moment, reaching towards [food] with its paws.")) - hunger += 5 - else if(hunger < 30) - if(prob(25)) - visible_emote(pick("sniffs intently against [food], especially their pockets and gear.", - "stands up to beg [food] for snacks.", - "attempts to burrow into [food]'s pockets.", - "leans against [food], licking its chops.", - "hungrily nibbles onto [food].")) - hunger += 5 - else if(hunger < 45) - if(prob(25)) - visible_emote(pick("growls at [food], sounding rather hangry!", - "aggressively bumps and nudges against [food], trying to make something fall out.", - "salivates at [food] in an unsettling manner.", - "pushes hard against [food], licking its chops.", - "almost sinks its teeth into [food], just stopping to give them another chance.")) - hunger += 5 - else if(hunger < 50) - if(prob(25)) - visible_emote("appears to have had enough and prepares to strike!") - hunger += 5 - else - food.Weaken(5) - food.visible_message("\the [src] pounces on \the [food]!!") - target_mob = food - EatTarget() - hunger = 0 - food = null - -/mob/living/simple_mob/vore/aggressive/rat/tame/attackby(var/obj/item/O, var/mob/user) // Feed the rat your food to satisfy it. - if(istype(O, /obj/item/reagent_containers/food/snacks)) - qdel(O) - playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1) - hunger = 0 - food = null - return - . = ..() - -/mob/living/simple_mob/vore/aggressive/rat/tame/Found(var/atom/found_atom) - if(!SA_attackable(found_atom)) - return null - else if(ishuman(found_atom) && will_eat(found_atom)) - var/mob/living/carbon/human/H = found_atom - for(var/obj/item/reagent_containers/food/snacks/S in H) - if(!food) - visible_emote("sniffs around the air intently, seeming to have caught a whiff of food!") - if(resting) - lay_down() - food = H - return found_atom - break - return null - -/mob/living/simple_mob/vore/aggressive/rat/tame/FindTarget() - var/atom/T = null - for(var/atom/A in ListTargets(view_range)) - if(A == src) - continue - var/atom/F = Found(A) - if(F) - T = F - break - return T -*/ /mob/living/simple_mob/vore/aggressive/rat/death() playsound(src, 'sound/effects/mouse_squeak_loud.ogg', 50, 1) ..() -/* //VOREStation AI Temporary Removal -/mob/living/simple_mob/vore/rat/Login() - . = ..() - if(!riding_datum) - riding_datum = new /datum/riding/simple_animal(src) - verbs |= /mob/living/simple_animal/proc/animal_mount - -/mob/living/simple_mob/vore/aggressive/rat/MouseDrop_T(mob/living/M, mob/living/user) - return -*/ - /mob/living/simple_mob/vore/aggressive/rat/phoron name = "phoron rat" desc = "In what passes for a hierarchy among verminous rodents, this one is alien overlord." tt_desc = "Mus muscular phoronis" - icon_state = "phorous" //TODO: proper phoron rat sprites + icon_state = "phorous" //TODO: proper phoron rat sprites icon_living = "phorous" icon_dead = "phorous-dead" icon_rest = "phorous_rest" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm index 823217dfb56..c2c43161e02 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm @@ -228,17 +228,6 @@ . = ..(FALSE, deathmessage) -/* //VOREStation AI Temporary Removal -//Blue-eyes want to nom people to heal them -/mob/living/simple_mob/shadekin/Found(var/atom/A) - if(specific_targets && isliving(A)) //Healing! - var/mob/living/L = A - var/health_percent = (L.health/L.maxHealth)*100 - if(health_percent <= 50 && will_eat(A)) - return A - . = ..() -*/ - //They reach nutritional equilibrium (important for blue-eyes healbelly) /mob/living/simple_mob/shadekin/Life() if((. = ..())) @@ -333,63 +322,6 @@ if(0 to 20) energyhud.icon_state = "energy4" -/* //VOREStation AI Removal -//Friendly ones wander towards people, maybe shy-ly if they are set to shy -/mob/living/simple_mob/shadekin/handle_wander_movement() - if(isturf(src.loc) && !resting && !buckled && canmove) - lifes_since_move++ - if(lifes_since_move >= turns_per_move) - if(!(stop_when_pulled && pulledby)) - var/moving_to - - if(stalker) - //Sniff sniff. - var/list/humans = human_mobs(world.view) - - //Can we see the last person we were following? - if(henlo_human && !(henlo_human in humans)) - henlo_human = null - - //Can we find a new person to follow? - if(!henlo_human) - while(!henlo_human && humans.len) - henlo_human = pick(humans) - if(!isturf(henlo_human.loc)) - humans -= henlo_human - henlo_human = null - - //Boopable hunam? - if(henlo_human) - moving_to = get_dir(src,henlo_human) - - if((get_dist(src,henlo_human) <= 1)) - dir = moving_to - if(prob(speak_chance)) - visible_message("\The [src] [pick(friendly)] \the [henlo_human].") - shy_approach = FALSE //ACCLIMATED - lifes_since_move = 0 - return //No need to move - - if(shy_approach) - var/them_to_us = turn(moving_to,180) - if(abs(dir2angle(henlo_human.dir) - dir2angle(them_to_us)) <= 90) - dir = them_to_us - return //AAA! - - dir = moving_to - - //Random walk - if(!moving_to) - moving_to = pick(GLOB.cardinal) - dir = moving_to - - var/turf/T = get_step(src,moving_to) - if(avoid_turf(T)) - return - Move(T) - lifes_since_move = 0 -*/ - /mob/living/simple_mob/shadekin/speech_bubble_appearance() return "ghost" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm b/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm index 3a9cece7c56..978bc761052 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm @@ -80,7 +80,7 @@ vore_icons = SA_ICON_LIVING | SA_ICON_REST /mob/living/simple_mob/animal/space/alien/queen/empress/mother - vore_icons = 0 // NO VORE SPRITES + vore_icons = FALSE /mob/living/simple_mob/animal/space/bear vore_active = 1 @@ -116,57 +116,11 @@ /mob/living/simple_mob/animal/space/carp/holographic vore_icons = 0 -/* //VOREStation AI Temporary removal -/mob/living/simple_mob/hostile/creature/vore - vore_active = 1 - // NO VORE SPRITES - vore_capacity = 0 - vore_pounce_chance = 0 // Only pounces if you're crit. - vore_escape_chance = 0 // As such, if you're a dibshit who feeds yourself to it, you're staying down. - // Overrides to non-vore version - speed = 4 // Slow it down a bit - health = 80 // Increase health to compensate - maxHealth = 80 -*/ -/* -/mob/living/simple_mob/animal/space/mimic - vore_active = 1 - // NO VORE SPRITES - vore_capacity = 0 - vore_pounce_chance = 33 - // Overrides to non-vore version - maxHealth = 60 - health = 60 -*/ /mob/living/simple_mob/animal/passive/cat vore_active = 1 - // NO VORE SPRITES - //specific_targets = 0 // Targeting UNLOCKED //VOREStation Removal - Incompatable + //specific_targets = 0 // Targeting UNLOCKED vore_max_size = RESIZE_TINY -/* //VOREStation AI Temporary removal -/mob/living/simple_mob/animal/passive/cat/PunchTarget() - if(istype(target_mob,/mob/living/simple_mob/animal/passive/mouse)) - visible_message("\The [src] pounces on \the [target_mob]!]") - target_mob.Stun(5) - return EatTarget() - else ..() - -/mob/living/simple_mob/animal/passive/cat/Found(var/atom/found_atom) - if(!SA_attackable(found_atom)) - return null - if(istype(found_atom,/mob/living/simple_mob/animal/passive/mouse)) - return found_atom - if(found_atom in friends) - return null - if(will_eat(found_atom)) - return found_atom - -/mob/living/simple_mob/animal/passive/cat/fluff/Found(var/atom/found_atom) - if (friend == found_atom) - return null - return ..() -*/ /mob/living/simple_mob/animal/passive/cat/fluff vore_ignores_undigestable = 0 vore_pounce_chance = 100 @@ -174,43 +128,10 @@ vore_default_mode = DM_HOLD //can use the toggle if you wanna be catfood vore_standing_too = TRUE //gonna get pounced -/* //VOREStation AI Temporary Removal -/mob/living/simple_mob/animal/passive/cat/fluff/EatTarget() - var/mob/living/TM = target_mob - prey_excludes += TM //so they won't immediately re-eat someone who struggles out (or gets newspapered out) as soon as they're ate - spawn(3600) // but if they hang around and get comfortable, they might get ate again - if(src && TM) - prey_excludes -= TM - ..() // will_eat check is carried out before EatTarget is called, so prey on the prey_excludes list isn't a problem. -*/ - /mob/living/simple_mob/animal/passive/fox vore_active = 1 - // NO VORE SPRITES vore_max_size = RESIZE_TINY -/* //VOREStation AI Temporary Removal -/mob/living/simple_mob/fox/PunchTarget() - if(istype(target_mob,/mob/living/simple_mob/animal/passive/mouse)) - return EatTarget() - else ..() - -/mob/living/simple_mob/fox/Found(var/atom/found_atom) - if(!SA_attackable(found_atom)) - return null - if(istype(found_atom,/mob/living/simple_mob/animal/passive/mouse)) - return found_atom - if(found_atom in friends) - return null - if(will_eat(found_atom)) - return found_atom - -/mob/living/simple_mob/fox/fluff/Found(var/atom/found_atom) - if (friend == found_atom) - return null - return ..() -*/ - /mob/living/simple_mob/fox/fluff vore_ignores_undigestable = 0 vore_pounce_chance = 100 @@ -218,33 +139,20 @@ vore_default_mode = DM_HOLD //can use the toggle if you wanna be foxfood vore_standing_too = TRUE // gonna get pounced -/* //VOREStation AI Temporary Removal -/mob/living/simple_mob/fox/fluff/EatTarget() - var/mob/living/TM = target_mob - prey_excludes += TM //so they won't immediately re-eat someone who struggles out (or gets newspapered out) as soon as they're ate - spawn(3600) // but if they hang around and get comfortable, they might get ate again - if(src && TM) - prey_excludes -= TM - ..() // will_eat check is carried out before EatTarget is called, so prey on the prey_excludes list isn't a problem. -*/ - /mob/living/simple_mob/animal/space/goose vore_active = 1 - // NO VORE SPRITES vore_max_size = RESIZE_SMALL /mob/living/simple_mob/animal/passive/penguin vore_active = 1 - // NO VORE SPRITES vore_max_size = RESIZE_SMALL /mob/living/simple_mob/hostile/carp/pike vore_active = 1 - // NO VORE SPRITES /mob/living/simple_mob/animal/space/carp/holographic - vore_icons = 0 // NO VORE SPRITES + vore_icons = 0 vore_digest_chance = 0 vore_absorb_chance = 0 diff --git a/code/modules/mob/living/voice/voice.dm b/code/modules/mob/living/voice/voice.dm index 329ccf4e56f..5033c832121 100644 --- a/code/modules/mob/living/voice/voice.dm +++ b/code/modules/mob/living/voice/voice.dm @@ -108,9 +108,8 @@ //Speech bubbles. if(comm) var/speech_bubble_test = say_test(message) - //var/image/speech_bubble = image('icons/mob/talk_vr.dmi',comm,"h[speech_bubble_test]") //VOREStation Edit - Commented out in case of needed reenable. var/speech_type = speech_bubble_appearance() - var/image/speech_bubble = image('icons/mob/talk_vr.dmi',comm,"[speech_type][speech_bubble_test]") //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons + var/image/speech_bubble = image('icons/mob/talk_vr.dmi',comm,"[speech_type][speech_bubble_test]") spawn(30) qdel(speech_bubble) diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index d1594a3e150..ca237acab33 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -28,10 +28,10 @@ update_Login_details() world.update_status() - client.images = list() //remove the images such as AIs being unable to see runes - client.screen = list() //remove hud items just in case + client.images = list() //remove the images such as AIs being unable to see runes + client.screen = list() //remove hud items just in case if(hud_used) - qdel(hud_used) //remove the hud objects + qdel(hud_used) //remove the hud objects hud_used = new /datum/hud(src) if(client.prefs && client.prefs.client_fps) @@ -40,7 +40,7 @@ client.fps = 0 // Results in using the server FPS next_move = 1 - disconnect_time = null //VOREStation Addition: clear the disconnect time + disconnect_time = null // Clear the disconnect time ..() diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm index 22eb4851ce5..0fcea7f2312 100644 --- a/code/modules/mob/logout.dm +++ b/code/modules/mob/logout.dm @@ -3,7 +3,7 @@ SSnanoui.user_logout(src) // this is used to clean up (remove) this user's Nano UIs SStgui.on_logout(src) // Cleanup any TGUIs the user has open player_list -= src - disconnect_time = world.realtime //VOREStation Addition: logging when we disappear. + disconnect_time = world.realtime // Logging when we disappear. update_client_z(null) log_access_out(src) if(admin_datums[src.ckey]) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 17f4c8f4ba4..17daedfb525 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -27,7 +27,7 @@ var/datum/atom_hud/alternate_appearance/AA = v AA.onNewMob(src) init_rendering() - hook_vr("mob_new",list(src)) //VOREStation Code + hook_vr("mob_new",list(src)) update_transform() // Some mobs may start bigger or smaller than normal. return ..() @@ -424,7 +424,7 @@ set src in usr if(usr != src) to_chat(usr, "No.") - var/msg = sanitize(input(usr,"Set the flavor text in your 'examine' verb.","Flavor Text",html_decode(flavor_text)) as message|null, extra = 0) //VOREStation Edit: separating out OOC notes + var/msg = sanitize(input(usr,"Set the flavor text in your 'examine' verb.","Flavor Text",html_decode(flavor_text)) as message|null, extra = 0) if(msg != null) flavor_text = msg diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 7c22a0ca900..510b6049b58 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -34,7 +34,7 @@ /client/verb/drop_item() set hidden = 1 - if(!isrobot(mob) && mob.stat == CONSCIOUS && (isturf(mob.loc) || isbelly(mob.loc))) // VOREStation Edit: dropping in bellies + if(!isrobot(mob) && mob.stat == CONSCIOUS && (isturf(mob.loc) || isbelly(mob.loc))) // Dropping in bellies return mob.drop_item() return @@ -178,48 +178,15 @@ if(!mob.Process_Spacemove(direct)) return FALSE -// shitcode, rip out when possible -/* - if((istype(mob.loc, /turf/space)) || (mob.lastarea.has_gravity == 0)) - if(!mob.Process_Spacemove(0)) return 0 -*/ - if(!mob.lastarea) mob.lastarea = get_area(mob.loc) -// end - -/* - //We are now going to move - var/add_delay = mob.cached_multiplicative_slowdown - if(old_move_delay + (add_delay*MOVEMENT_DELAY_BUFFER_DELTA) + MOVEMENT_DELAY_BUFFER > world.time) - move_delay = old_move_delay - else - move_delay = world.time - - if(L.confused) - var/newdir = 0 - if(L.confused > 40) - newdir = pick(GLOB.alldirs) - else if(prob(L.confused * 1.5)) - newdir = angle2dir(dir2angle(direct) + pick(90, -90)) - else if(prob(L.confused * 3)) - newdir = angle2dir(dir2angle(direct) + pick(45, -45)) - if(newdir) - direct = newdir - n = get_step(L, direct) - - . = ..() -*/ -// no instead we're using polariscode - // added code var/move_delay_add_grab = 0 var/add_delay = mob.movement_delay(n, direct) if(old_move_delay + (add_delay*MOVEMENT_DELAY_BUFFER_DELTA) + MOVEMENT_DELAY_BUFFER > world.time) mob.move_delay = old_move_delay else mob.move_delay = world.time - // if(mob.restrained() && mob.pulledby)//Why being pulled while cuffed prevents you from moving to_chat(src, "You're restrained! You can't move!") diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 0c328f7c277..2d8cc72b013 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -767,7 +767,7 @@ //Do they have their scale properly setup? if(!client.prefs.size_multiplier) pass = FALSE - to_chat(src,"You have not set your scale yet. Do this on the VORE tab in character setup.") + to_chat(src, SPAN_WARNING("You have not set your scale yet. Do this on the Species Customization tab in character setup.")) //Can they play? if(!is_alien_whitelisted(src, client.prefs.character_static_species_meta()) && !check_rights(R_ADMIN, 0)) @@ -780,7 +780,7 @@ //Didn't name it if(!client.prefs.custom_species) pass = FALSE - to_chat(src,"You have to name your custom species. Do this on the VORE tab in character setup.") + to_chat(src, SPAN_WARNING("You have to name your custom species. Do this on the Species Customization tab in character setup.")) //Check traits/costs var/list/megalist = client.prefs.pos_traits + client.prefs.neu_traits + client.prefs.neg_traits @@ -803,7 +803,7 @@ //Went into negatives if(points_left < 0 || traits_left < 0) pass = FALSE - to_chat(src,"Your custom species is not playable. Reconfigure your traits on the VORE tab.") + to_chat(src, SPAN_WARNING("Your custom species is not playable. Reconfigure your traits on the Species Customization tab.")) //Final popup notice if (!pass) diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 28273cdf373..cd67de6bc57 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -32,11 +32,9 @@ to_chat(usr, "Speech is currently admin-disabled.") return - //VOREStation Edit Start if(muffled) return me_verb_subtle(message) - message = sanitize_or_reflect(message,src) //VOREStation Edit - Reflect too-long messages (within reason) - //VOREStation Edit End + message = sanitize_or_reflect(message,src) // Reflect too-long messages (within reason) set_typing_indicator(FALSE) if(use_me) diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index 539cf10ee3c..134e2546c12 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -11,7 +11,7 @@ to_chat(usr, "Speech is currently admin-disabled.") return - message = sanitize_or_reflect(message,src) //VOREStation Edit - Reflect too-long messages (within reason) + message = sanitize_or_reflect(message,src) // Reflect too-long messages (within reason) if(!message) return @@ -74,7 +74,7 @@ to_chat(usr, "Speech is currently admin-disabled.") return - message = sanitize_or_reflect(message,src) //VOREStation Edit - Reflect too-long messages (within reason) + message = sanitize_or_reflect(message,src) // Reflect too-long messages (within reason) if(!message) return diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm index b4e0e17b265..abd0b72d943 100644 --- a/code/modules/mob/typing_indicator.dm +++ b/code/modules/mob/typing_indicator.dm @@ -1,20 +1,12 @@ /proc/generate_speech_bubble(var/bubble_loc, var/speech_state, var/set_layer = FLOAT_LAYER) - var/image/I = image('icons/mob/talk_vr.dmi', bubble_loc, speech_state, set_layer) //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons - I.appearance_flags |= (RESET_COLOR|PIXEL_SCALE) //VOREStation Edit - /* //VOREStation Removal Start - if(istype(bubble_loc, /atom/movable)) - var/atom/movable/AM = bubble_loc - var/x_scale = AM.get_icon_scale_x() - if(abs(x_scale) < 2) // reset transform on bubbles, except for the Very Large - I.pixel_z = (AM.icon_expected_height * (x_scale-1)) - I.appearance_flags |= RESET_TRANSFORM - */ //VOREStation Removal Start + var/image/I = image('icons/mob/talk_vr.dmi', bubble_loc, speech_state, set_layer) + I.appearance_flags |= (RESET_COLOR|PIXEL_SCALE) return I /mob/proc/init_typing_indicator(var/set_state = "typing") typing_indicator = new typing_indicator.appearance = generate_speech_bubble(null, set_state) - typing_indicator.appearance_flags |= (RESET_COLOR|PIXEL_SCALE) //VOREStation Edit + typing_indicator.appearance_flags |= (RESET_COLOR|PIXEL_SCALE) /mob/proc/set_typing_indicator(var/state) //Leaving this here for mobs. @@ -54,7 +46,7 @@ set hidden = 1 set_typing_indicator(TRUE) - var/message = input("","me (text)") as message|null //VOREStation Edit + var/message = input("","me (text)") as message|null set_typing_indicator(FALSE) if(message) diff --git a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm index 156d67525b5..b7d6dc4802c 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm @@ -25,14 +25,12 @@ if(!istype(loc, /turf/)) to_chat(usr, "\The [src] has to be on a stable surface first!") return - //VOREStation Addition Begin var/supported = FALSE for(var/obj/structure/table/S in loc) supported = TRUE if(!supported && !anchored) to_chat(usr, "You will need a better supporting surface before opening \the [src]!") return - //VOREStation Addition End anchored = !anchored screen_on = anchored update_icon() diff --git a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm index 74ad77b68bc..079a8a0b9d6 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm @@ -47,7 +47,6 @@ battery_module = new/obj/item/computer_hardware/battery_module/super(src) battery_module.charge_to_full() -//VOREStation Add Start /obj/item/modular_computer/laptop/preset/custom_loadout/rugged name = "rugged laptop computer" desc = "A rugged portable computer." @@ -65,4 +64,3 @@ card_slot = new/obj/item/computer_hardware/card_slot(src) battery_module = new/obj/item/computer_hardware/battery_module/super(src) battery_module.charge_to_full() -//VOREStation Add End diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index 3ac9dc2119e..25119cd0af0 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -167,7 +167,7 @@ computer.proc_eject_id(user) if("terminate") if(computer && can_run(user, 1)) - id_card.assignment = "Dismissed" //VOREStation Edit: setting adjustment + id_card.assignment = "Dismissed" id_card.access = list() callHook("terminate_employee", list(id_card)) if("edit") diff --git a/code/modules/multiz/ladder.dm b/code/modules/multiz/ladder.dm index 38ccd4d46ce..49e09990c47 100644 --- a/code/modules/multiz/ladder.dm +++ b/code/modules/multiz/ladder.dm @@ -106,7 +106,7 @@ if(!A.CanPass(M, M.loc, 1.5, 0)) to_chat(M, "\The [A] is blocking \the [src].") return FALSE - return M.forceMove(T) //VOREStation Edit - Fixes adminspawned ladders + return M.forceMove(T) /obj/structure/ladder/CanPass(obj/mover, turf/source, height, airflow) . = ..() diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 94fc6ceec43..7c8d916dabf 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -57,7 +57,7 @@ else to_chat(src, "You gave up on pulling yourself up.") return 0 - else if(ismob(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying?? + else if(ismob(src)) // Are they a mob, and are they currently flying?? var/mob/living/H = src if(H.flying) if(H.incapacitated(INCAPACITATION_ALL)) @@ -75,7 +75,7 @@ return 0 else to_chat(src, "Gravity stops you from moving upward.") - return 0 //VOREStation Edit End. + return 0 else to_chat(src, "Gravity stops you from moving upward.") return 0 @@ -141,9 +141,8 @@ if(hovering || is_incorporeal()) return TRUE - if(flying) //VOREStation Edit. Allows movement up/down with wings. - return 1 //VOREStation Edit - + if(flying) // Allows movement up/down with wings. + return 1 if(Process_Spacemove()) return TRUE @@ -206,7 +205,7 @@ return if(ismob(src)) - var/mob/H = src //VOREStation Edit Start. Flight on mobs. + var/mob/H = src // Flight on mobs. if(H.flying) //Some other checks are done in the wings_toggle proc if(H.nutrition > 2) H.nutrition -= 0.5 //You use up 0.5 nutrition per TILE and tick of flying above open spaces. If people wanna flap their wings in the hallways, shouldn't penalize them for it. Lowered to make winged people less sad. diff --git a/code/modules/multiz/zshadow.dm b/code/modules/multiz/zshadow.dm index f66dfc9b924..dea400bca45 100644 --- a/code/modules/multiz/zshadow.dm +++ b/code/modules/multiz/zshadow.dm @@ -115,7 +115,7 @@ /mob/zshadow/set_typing_indicator(var/state) if(!typing_indicator) typing_indicator = new - typing_indicator.icon = 'icons/mob/talk_vr.dmi' // Looks better on the right with job icons. //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons + typing_indicator.icon = 'icons/mob/talk_vr.dmi' typing_indicator.icon_state = "typing" if(state && !typing) overlays += typing_indicator diff --git a/code/modules/nano/nanomapgen.dm b/code/modules/nano/nanomapgen.dm index 0ef41548331..70606873453 100644 --- a/code/modules/nano/nanomapgen.dm +++ b/code/modules/nano/nanomapgen.dm @@ -54,7 +54,7 @@ sleep(3) return NANOMAP_TERMINALERR - Tile.Scale((endX - startX + 1) * NANOMAP_ICON_SIZE, (endY - startY + 1) * NANOMAP_ICON_SIZE) // VOREStation Edit - Scale image to actual size mapped. + Tile.Scale((endX - startX + 1) * NANOMAP_ICON_SIZE, (endY - startY + 1) * NANOMAP_ICON_SIZE) // Scale image to actual size mapped. log_world("NanoMapGen: GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])") to_chat(usr, "NanoMapGen: GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])") diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index 60f82af86f5..48c0db47a1a 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -330,12 +330,12 @@ proc/blood_incompatible(donor,receiver,donor_species,receiver_species) proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large) - //Vorestation Edit Start - We're not going to splatter at all because we're in something and that's silly. + // We're not going to splatter at all because we're in something and that's silly. if(istype(source,/atom/movable)) var/atom/movable/A = source if(!isturf(A.loc)) return - //VOREStation Edit End + var/obj/effect/decal/cleanable/blood/B var/decal_type = /obj/effect/decal/cleanable/blood/splatter var/turf/T = get_turf(target) diff --git a/code/modules/organs/internal/eyes.dm b/code/modules/organs/internal/eyes.dm index d7a3829af5c..cf604b1eafe 100644 --- a/code/modules/organs/internal/eyes.dm +++ b/code/modules/organs/internal/eyes.dm @@ -106,7 +106,6 @@ return -1 /obj/item/organ/internal/eyes/emp_act(severity) - // ..() //Returns if the organ isn't robotic // VOREStation Edit - Don't take damage if(robotic >= ORGAN_ASSISTED) return owner.eye_blurry += (4/severity) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 7f36fe8b658..fd2a14be478 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -325,8 +325,7 @@ if(status & ORGAN_BROKEN && brute) jostle_bone(brute) - if(organ_can_feel_pain() && prob(40) && !isbelly(owner.loc) && !istype(owner.loc, /obj/item/dogborg/sleeper)) //VOREStation Edit - owner.emote("scream") //getting hit on broken hand hurts + if(organ_can_feel_pain() && prob(40) && !isbelly(owner.loc) && !istype(owner.loc, /obj/item/dogborg/sleeper)) owner.emote("scream") //getting hit on broken hand hurts if(used_weapon) add_autopsy_data("[used_weapon]", brute + burn) @@ -473,7 +472,7 @@ to_chat(user, "Nothing to fix!") return 0 - if(brute_dam + burn_dam >= min_broken_damage) //VOREStation Edit - Makes robotic limb damage scalable + if(brute_dam + burn_dam >= min_broken_damage) // Makes robotic limb damage scalable to_chat(user, "The damage is far too severe to patch over externally.") return 0 @@ -526,7 +525,7 @@ This function completely restores a damaged organ to perfect condition. // remove embedded objects and drop them on the floor for(var/obj/implanted_object in implants) - if(!istype(implanted_object,/obj/item/implant) && !istype(implanted_object,/obj/item/nif)) // We don't want to remove REAL implants. Just shrapnel etc. //VOREStation Edit - NIFs pls + if(!istype(implanted_object,/obj/item/implant) && !istype(implanted_object,/obj/item/nif)) // We don't want to remove REAL implants. Just shrapnel etc. implanted_object.loc = get_turf(src) implants -= implanted_object @@ -625,7 +624,7 @@ This function completely restores a damaged organ to perfect condition. /obj/item/organ/external/proc/need_process() if(status & (ORGAN_CUT_AWAY|ORGAN_BLEEDING|ORGAN_BROKEN|ORGAN_DESTROYED|ORGAN_DEAD|ORGAN_MUTATED)) return 1 - if(brute_dam || burn_dam)//VOREStation Edit - But they do for medichines! ---&& (robotic < ORGAN_ROBOT)) //Robot limbs don't autoheal and thus don't need to process when damaged + if(brute_dam || burn_dam) //Robot limbs don't autoheal and thus don't need to process when damaged. Aside from medichines. return 1 if(last_dam != brute_dam + burn_dam) // Process when we are fully healed up. last_dam = brute_dam + burn_dam @@ -895,10 +894,9 @@ Note that amputating the affected organ does in fact remove the infection from t if(cannot_amputate || !owner) return - //VOREStation Add if(robotic >= ORGAN_NANOFORM) disintegrate = DROPLIMB_BURN //Ashes will be fine - else if(disintegrate == DROPLIMB_EDGE && nonsolid) //VOREStation Add End + else if(disintegrate == DROPLIMB_EDGE && nonsolid) disintegrate = DROPLIMB_BLUNT //splut switch(disintegrate) @@ -1180,7 +1178,7 @@ Note that amputating the affected organ does in fact remove the infection from t dislocated = -1 cannot_break = 1 - min_broken_damage = ROBOLIMB_REPAIR_CAP //VOREStation Addition - Makes robotic limb damage scalable + min_broken_damage = ROBOLIMB_REPAIR_CAP // Makes robotic limb damage scalable remove_splint() get_icon() unmutate() @@ -1229,7 +1227,7 @@ Note that amputating the affected organ does in fact remove the infection from t return !(status & (ORGAN_MUTATED|ORGAN_DEAD)) /obj/item/organ/external/proc/is_malfunctioning() - return ((robotic >= ORGAN_ROBOT) && (brute_dam + burn_dam) >= min_broken_damage*0.83 && prob(brute_dam + burn_dam)) //VOREStation Edit - Makes robotic limb damage scalable + return ((robotic >= ORGAN_ROBOT) && (brute_dam + burn_dam) >= min_broken_damage*0.83 && prob(brute_dam + burn_dam)) // Makes robotic limb damage scalable /obj/item/organ/external/proc/embed(var/obj/item/W, var/silent = 0) if(!owner || loc != owner) diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index c396a06dd5e..b208f0a2925 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -100,7 +100,7 @@ var/global/list/limb_icon_cache = list() for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) // VOREStation edit + mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) add_overlay(mark_s) //So when it's not on your body, it has icons mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons icon_cache_key += "[M][markings[M]["color"]]" @@ -183,7 +183,7 @@ var/global/list/limb_icon_cache = list() for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) // VOREStation edit + mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) add_overlay(mark_s) //So when it's not on your body, it has icons mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons icon_cache_key += "[M][markings[M]["color"]]" @@ -192,7 +192,7 @@ var/global/list/limb_icon_cache = list() var/cache_key = "[body_hair]-[icon_name]-[h_col[1]][h_col[2]][h_col[3]]" if(!limb_icon_cache[cache_key]) var/icon/I = icon(species.get_icobase(owner), "[icon_name]_[body_hair]") - I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY) //VOREStation edit + I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY) limb_icon_cache[cache_key] = I mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY) @@ -203,7 +203,7 @@ var/global/list/limb_icon_cache = list() for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) // VOREStation edit + mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) add_overlay(mark_s) //So when it's not on your body, it has icons mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons icon_cache_key += "[M][markings[M]["color"]]" @@ -212,10 +212,9 @@ var/global/list/limb_icon_cache = list() var/cache_key = "[body_hair]-[icon_name]-[h_col[1]][h_col[2]][h_col[3]]" if(!limb_icon_cache[cache_key]) var/icon/I = icon(species.get_icobase(owner), "[icon_name]_[body_hair]") - I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY) //VOREStation edit + I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY) limb_icon_cache[cache_key] = I mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY) - // VOREStation edit ends here dir = EAST icon = mob_icon @@ -223,12 +222,12 @@ var/global/list/limb_icon_cache = list() /obj/item/organ/external/proc/apply_colouration(var/icon/applying) - if(transparent) //VOREStation edit + if(transparent) applying.MapColors("#4D4D4D","#969696","#1C1C1C", "#000000") if(species && species.get_bodytype(owner) != SPECIES_HUMAN) - applying.SetIntensity(1) // Unathi, Taj and Skrell have -very- dark base icons. VOREStation edit fixes this and brings the number back to 1 + applying.SetIntensity(1) // Unathi, Taj and Skrell have -very- dark base icons. else - applying.SetIntensity(1) //VOREStation edit to make Prometheans not look like shit with mob coloring. + applying.SetIntensity(1) // Makes Prometheans not look like shit with mob coloring. else if(status & ORGAN_DEAD) icon_cache_key += "_dead" @@ -242,17 +241,16 @@ var/global/list/limb_icon_cache = list() applying.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT) icon_cache_key += "_tone_[s_tone]" else if(s_col && s_col.len >= 3) - //VOREStation Edit - Support for species.color_mult + // Support for species.color_mult if(species && species.color_mult) applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_MULTIPLY) icon_cache_key += "_color_[s_col[1]]_[s_col[2]]_[s_col[3]]_[ICON_MULTIPLY]" else applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_ADD) icon_cache_key += "_color_[s_col[1]]_[s_col[2]]_[s_col[3]]_[ICON_ADD]" - //VOREStation Edit End // Translucency. - if(transparent) applying += rgb(,,,180) // SO INTUITIVE TY BYOND //VOREStation Edit + if(transparent) applying += rgb(,,,180) // SO INTUITIVE TY BYOND return applying diff --git a/code/modules/organs/subtypes/machine.dm b/code/modules/organs/subtypes/machine.dm index fcfb0f30f14..fee951d696a 100644 --- a/code/modules/organs/subtypes/machine.dm +++ b/code/modules/organs/subtypes/machine.dm @@ -20,7 +20,6 @@ owner.visible_message("\The [owner] twitches visibly!") /obj/item/organ/internal/cell/emp_act(severity) - // ..() // VOREStation Edit - Don't take damage owner.nutrition = max(0, owner.nutrition - rand(10/severity, 50/severity)) /obj/item/organ/internal/cell/machine/handle_organ_proc_special() @@ -93,7 +92,7 @@ /obj/item/organ/internal/mmi_holder/removed(var/mob/living/user) if(stored_mmi) - . = stored_mmi //VOREStation Code + . = stored_mmi stored_mmi.forceMove(drop_location()) if(owner.mind) owner.mind.transfer_to(stored_mmi.brainmob) @@ -105,7 +104,6 @@ qdel(src) /obj/item/organ/internal/mmi_holder/emp_act(severity) - // ..() // VOREStation Edit - Don't take damage owner.adjustToxLoss(rand(6/severity, 12/severity)) /obj/item/organ/internal/mmi_holder/posibrain diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm index 3a3b7a32fdb..d8452122d52 100644 --- a/code/modules/overmap/sectors.dm +++ b/code/modules/overmap/sectors.dm @@ -99,12 +99,6 @@ GLOB.using_map.player_levels |= map_z if(!in_space) GLOB.using_map.sealed_levels |= map_z - /* VOREStation Removal - We have a map system that does this already. - if(base) - global.using_map.station_levels |= map_z - global.using_map.contact_levels |= map_z - global.using_map.map_levels |= map_z - */ /obj/effect/overmap/visitable/proc/unregister_z_levels() map_sectors -= map_z @@ -112,12 +106,6 @@ GLOB.using_map.player_levels -= map_z if(!in_space) GLOB.using_map.sealed_levels -= map_z - /* VOREStation Removal - We have a map system that does this already. - if(base) - global.using_map.station_levels -= map_z - global.using_map.contact_levels -= map_z - global.using_map.map_levels -= map_z - */ /obj/effect/overmap/visitable/get_scan_data() if(!known) @@ -202,7 +190,7 @@ return FALSE has_distress_beacon = TRUE - admin_chat_message(message = "Overmap panic button hit on z[z] ([name]) by '[user?.ckey || "Unknown"]'", color = "#FF2222") //VOREStation Add + admin_chat_message(message = "Overmap panic button hit on z[z] ([name]) by '[user?.ckey || "Unknown"]'", color = "#FF2222") var/message = "This is an automated distress signal from a MIL-DTL-93352-compliant beacon transmitting on [PUB_FREQ*0.1]kHz. \ This beacon was launched from '[initial(name)]'. I can provide this additional information to rescuers: [get_distress_info()]. \ Per the Interplanetary Convention on Space SAR, those receiving this message must attempt rescue, \ diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 6c2fe5c97ec..5da43c3715a 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -1,5 +1,5 @@ var/list/obj/machinery/photocopier/faxmachine/allfaxes = list() -var/list/admin_departments = list("[GLOB.using_map.boss_name]", "Virgo-Prime Governmental Authority", "Supply") // Vorestation Edit +var/list/admin_departments = list("[GLOB.using_map.boss_name]", "Virgo-Prime Governmental Authority", "Supply") var/list/alldepartments = list() var/list/adminfaxes = list() //cache for faxes that have been sent to admins @@ -187,7 +187,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins //message badmins that a fax has arrived if (destination == GLOB.using_map.boss_name) message_admins(sender, "[uppertext(GLOB.using_map.boss_short)] FAX", rcvdcopy, "CentComFaxReply", "#006100") - else if (destination == "Virgo-Prime Governmental Authority") // Vorestation Edit + else if (destination == "Virgo-Prime Governmental Authority") message_admins(sender, "VIRGO GOVERNMENT FAX", rcvdcopy, "CentComFaxReply", "#1F66A0") else if (destination == "Supply") message_admins(sender, "[uppertext(GLOB.using_map.boss_short)] SUPPLY FAX", rcvdcopy, "CentComFaxReply", "#5F4519") @@ -210,7 +210,5 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins to_chat(C, msg) SEND_SOUND(C, sound('sound/machines/printer.ogg')) - // VoreStation Edit Start var/faxid = export_fax(sent) message_chat_admins(sender, faxname, sent, faxid, font_colour) - // VoreStation Edit End diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 65e18df3b88..f0797145e0f 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -218,8 +218,8 @@ /obj/item/pen/reagent/sleepy/Initialize(mapload) . = ..() - reagents.add_reagent("chloralhydrate", 1) //VOREStation Edit - reagents.add_reagent("stoxin", 14) //VOREStation Add + reagents.add_reagent("chloralhydrate", 1) + reagents.add_reagent("stoxin", 14) /* diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 2e17e8098b4..56b85059639 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -88,7 +88,7 @@ sleep(11*B.pages.len) audible_message("You can hear [src] whirring as it finishes printing.") playsound(loc, "sound/machines/buzzbeep.ogg", 30) - else if (has_buckled_mobs()) // VOREStation EDIT: For ass-copying. + else if (has_buckled_mobs()) // For ass-copying. playsound(loc, "sound/machines/copier.ogg", 100, 1) audible_message("You can hear [src] whirring as it attempts to scan.") sleep(rand(20,45)) // Sit with your bare ass on the copier for a random time, feel like a fool, get stared at. @@ -262,8 +262,6 @@ return p -// VOREStation Edit Start - /obj/machinery/photocopier/proc/copyass(mob/user) var/icon/temp_img if(!has_buckled_mobs()) // Are there no mobs buckled to the photocopier? @@ -346,8 +344,6 @@ visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") return p -// VOREStation Edit Stop - //If need_toner is 0, the copies will still be lightened when low on toner, however it will not be prevented from printing. TODO: Implement print queues for fax machines and get rid of need_toner /obj/machinery/photocopier/proc/bundlecopy(var/obj/item/paper_bundle/bundle, var/need_toner=1) var/obj/item/paper_bundle/p = new /obj/item/paper_bundle (src) @@ -373,8 +369,6 @@ p.pixel_x = rand(-9, 9) return p -// VOREStation Edit Start - Rykka - /obj/machinery/photocopier/can_buckle_check(mob/living/M, forced = FALSE) if(!..()) return FALSE @@ -386,8 +380,6 @@ return FALSE return TRUE -// VOREStation Edit Stop - Rykka - /obj/item/toner name = "toner cartridge" icon = 'icons/obj/device.dmi' diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 8f1a1228e2c..a19270e932d 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -193,7 +193,7 @@ var/global/photo_count = 0 for(var/i; i <= sorted.len; i++) var/atom/A = sorted[i] if(A) - var/icon/img = getFlatIcon(A)//, picture_planes = picture_planes)//build_composite_icon(A) //VOREStation Edit + var/icon/img = getFlatIcon(A) // If what we got back is actually a picture, draw it. if(istype(img, /icon)) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index f11a914521b..f1c4fa9fb72 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -10,7 +10,6 @@ #define LIGHT_BURNED 3 ///K - used value for a 60W bulb #define LIGHT_BULB_TEMPERATURE 400 -///VOREStation Edit: why the fuck are lights eating so much power, 2W per thing ///5W per luminosity * range #define LIGHTING_POWER_FACTOR 2 ///How much power emergency lights will consume per tick @@ -209,8 +208,8 @@ var/global/list/light_type_cache = list() // the standard tube light fixture /obj/machinery/light name = "light fixture" - icon = 'icons/obj/lighting_vr.dmi' //VOREStation Edit - var/base_state = "tube" // base description and icon_state + icon = 'icons/obj/lighting_vr.dmi' + var/base_state = "tube" // base description and icon_state icon_state = "tube1" desc = "A lighting fixture." anchored = 1 @@ -268,7 +267,7 @@ var/global/list/light_type_cache = list() desc = "A small lighting fixture." light_type = /obj/item/light/bulb construct_type = /obj/machinery/light_construct/small - shows_alerts = FALSE //VOREStation Edit + shows_alerts = FALSE /obj/machinery/light/small/flicker auto_flicker = TRUE @@ -280,7 +279,7 @@ var/global/list/light_type_cache = list() start_with_cell = FALSE /obj/machinery/light/flamp - icon = 'icons/obj/lighting.dmi' //VOREStation Edit + icon = 'icons/obj/lighting.dmi' icon_state = "flamp1" base_state = "flamp" plane = OBJ_PLANE @@ -288,7 +287,7 @@ var/global/list/light_type_cache = list() desc = "A floor lamp." light_type = /obj/item/light/bulb construct_type = /obj/machinery/light_construct/flamp - shows_alerts = FALSE //VOREStation Edit + shows_alerts = FALSE var/lamp_shade = 1 /obj/machinery/light/flamp/Initialize(mapload, obj/machinery/light_construct/construct) @@ -313,17 +312,15 @@ var/global/list/light_type_cache = list() /obj/machinery/light/spot name = "spotlight" light_type = /obj/item/light/tube/large - shows_alerts = FALSE //VOREStation Edit + shows_alerts = FALSE /obj/machinery/light/spot/flicker auto_flicker = TRUE -//VOREStation Add - Shadeless! /obj/machinery/light/flamp/noshade/Initialize(mapload, obj/machinery/light_construct/construct) . = ..() lamp_shade = 0 update(0) -//VOREStation Add End // create a new lighting fixture /obj/machinery/light/Initialize(mapload, obj/machinery/light_construct/construct) @@ -356,14 +353,12 @@ var/global/list/light_type_cache = list() /obj/machinery/light/update_icon() - switch(status) // set icon_states + switch(status) // set icon_states if(LIGHT_OK) - //VOREStation Edit Start if(shows_alerts && current_alert && on) icon_state = "[base_state]-alert-[current_alert]" else icon_state = "[base_state][on]" - //VOREStation Edit End if(LIGHT_EMPTY) icon_state = "[base_state]-empty" on = 0 @@ -394,7 +389,7 @@ var/global/list/light_type_cache = list() else base_state = "flamp" ..() -//VOREStation Edit Start + /obj/machinery/light/proc/set_alert_atmos() if(shows_alerts) current_alert = "atmos" @@ -415,17 +410,15 @@ var/global/list/light_type_cache = list() brightness_color = initial(brightness_color) || "" // Workaround for BYOND stupidity. Can't set it to null or it won't clear. if(on) update() -//VOREstation Edit End + // update lighting /obj/machinery/light/proc/update(var/trigger = 1) update_icon() - //VOREStation Edit Start if(!on) needsound = TRUE // Play sound next time we turn on else if(needsound) playsound(src.loc, 'sound/effects/lighton.ogg', 65, 1) needsound = FALSE // Don't play sound again until we've been turned off - //VOREStation Edit End if(on) var/correct_range = nightshift_enabled ? brightness_range_ns : brightness_range @@ -909,8 +902,7 @@ var/global/list/light_type_cache = list() base_state = "ltube" item_state = "c_tube" matter = list(MAT_GLASS = 100) - brightness_range = 12 // luminosity when on, also used in power calculation //VOREStation Edit - brightness_power = 1 + brightness_range = 12 // luminosity when on, also used in power calculation brightness_power = 1 nightshift_range = 7 nightshift_power = 0.5 diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm index 3dee90c77a6..83adca51dfc 100644 --- a/code/modules/power/lighting_vr.dm +++ b/code/modules/power/lighting_vr.dm @@ -1,4 +1,4 @@ -// I hate the way macros look stupid standing near lights. I don't care how absurd this looks. +//TODO: UHHHH NO PLEASE? /obj/machinery/light_construct layer = BELOW_MOB_LAYER @@ -6,7 +6,7 @@ /obj/machinery/light layer = BELOW_MOB_LAYER -//Vorestation addition, to override the New() proc further below, since this is a lamp. +// Overrides the New() proc further below, since this is a lamp. /obj/machinery/light/flamp/Initialize(mapload, obj/machinery/light_construct/construct) . = ..() layer = initial(layer) @@ -14,6 +14,6 @@ // create a new lighting fixture /obj/machinery/light/Initialize(mapload, obj/machinery/light_construct/construct) . = ..() - //Vorestation addition, so large mobs stop looking stupid in front of lights. + // So large mobs stop looking stupid in front of lights. if (dir == SOUTH) // Lights are backwards, SOUTH lights face north (they are on south wall) layer = ABOVE_MOB_LAYER diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 9a48dd2a214..b8289e3a4b5 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -504,7 +504,6 @@ explosion(src.loc, 3, 6, 12, 16, 1) qdel(src) -//VORE RTG engines // Radioisotope Thermoelectric Generator (RTG) // Simple power generator that would replace "magic SMES" on various derelicts. /obj/machinery/power/rtg diff --git a/code/modules/power/sensors/sensor_monitoring.dm b/code/modules/power/sensors/sensor_monitoring.dm index af9a3729257..b8fb4000241 100644 --- a/code/modules/power/sensors/sensor_monitoring.dm +++ b/code/modules/power/sensors/sensor_monitoring.dm @@ -26,16 +26,7 @@ if(alert != alerting) alerting = !alerting update_icon() -/* VOREStation Move - Moved to VR File -// Updates icon of this computer according to current status. -/obj/machinery/computer/power_monitor/update_icon() - if(!(stat & (NOPOWER|BROKEN))) - if(alerting) - icon_screen = "power:1" - else - icon_screen = "power:0" - ..() -*/ + // On creation automatically connects to active sensors. This is delayed to ensure sensors already exist. /obj/machinery/computer/power_monitor/Initialize(mapload) . = ..() diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm index 378f69694d3..ea8db93e8d8 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -20,7 +20,7 @@ if(mind) if((mind.assigned_role == "Station Engineer") || (mind.assigned_role == "Chief Engineer")) gain = 100 - if(mind.assigned_role == USELESS_JOB) //VOREStation Edit - Visitor not Assistant + if(mind.assigned_role == USELESS_JOB) gain = rand(0, 300) investigate_log(I_SINGULO,"has been consumed by a singularity", I_SINGULO) gib() diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 476929cccf9..fda1bbdb004 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -328,7 +328,7 @@ field_generator power level display if(O.last_warning && temp) if((world.time - O.last_warning) > 50) //to stop message-spam temp = 0 - admin_chat_message(message = "SINGUL/TESLOOSE!", color = "#FF2222") //VOREStation Add + admin_chat_message(message = "SINGUL/TESLOOSE!", color = "#FF2222") message_admins("A singulo exists and a containment field has failed.",1) investigate_log("has failed whilst a singulo exists.","singulo") log_game("FIELDGEN([x],[y],[z]) Containment failed while singulo/tesla exists.") diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 3f5a296fe42..e77df7a584e 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -194,7 +194,7 @@ /obj/machinery/power/supermatter/proc/announce_warning() var/integrity = get_integrity() var/alert_msg = " Integrity at [integrity]%" - var/message_sound = 'sound/ambience/matteralarm.ogg' // VOREStation Edit - Rykka adds SM Delam alarm + var/message_sound = 'sound/ambience/matteralarm.ogg' if(damage > emergency_point) alert_msg = emergency_alert + alert_msg @@ -215,10 +215,10 @@ //Public alerts if((damage > emergency_point) && !public_alert) GLOB.global_announcer.autosay("WARNING: SUPERMATTER CRYSTAL DELAMINATION IMMINENT!", "Supermatter Monitor") - for(var/mob/M in player_list) // VOREStation Edit - Rykka adds SM Delam alarm - if(!istype(M,/mob/new_player) && !isdeaf(M)) // VOREStation Edit - Rykka adds SM Delam alarm - SEND_SOUND(M, message_sound) // VOREStation Edit - Rykka adds SM Delam alarm - admin_chat_message(message = "SUPERMATTER DELAMINATING!", color = "#FF2222") //VOREStation Add + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player) && !isdeaf(M)) + SEND_SOUND(M, message_sound) + admin_chat_message(message = "SUPERMATTER DELAMINATING!", color = "#FF2222") public_alert = 1 log_game("SUPERMATTER([x],[y],[z]) Emergency PUBLIC announcement. Power:[power], Oxygen:[oxygen], Damage:[damage], Integrity:[get_integrity()]") else if((damage > emergency_point) && public_alert) @@ -354,7 +354,7 @@ for(var/mob/living/carbon/human/l in view(src, min(7, round(sqrt(power/6))))) // If they can see it without mesons on. Bad on them. if(l.isSynthetic() || (PLANE_MESONS in l.planes_visible)) continue - if(!istype(l.glasses, /obj/item/clothing/glasses/meson)) // VOREStation Edit - Only mesons can protect you! + if(!istype(l.glasses, /obj/item/clothing/glasses/meson)) // Only mesons can protect you! l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)) ) ) ) SSradiation.radiate(src, max(power * 1.5, 50) ) //Better close those shutters! diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 0e20411ce0a..724ac1219fe 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -271,13 +271,13 @@ //Alright, we've done our loop, now lets see if was anything interesting in range if(closest_atom) //common stuff - var/atom/srcLoc = get_turf(source) // VOREStation Edit - Makes beams look nicer - srcLoc.Beam(closest_atom, icon_state="lightning[rand(1,12)]", time=5, maxdistance = INFINITY) // VOREStation Edit - Makes beams look nicer + var/atom/srcLoc = get_turf(source) + srcLoc.Beam(closest_atom, icon_state="lightning[rand(1,12)]", time=5, maxdistance = INFINITY) var/zapdir = get_dir(source, closest_atom) if(zapdir) . = zapdir - var/drain_energy = TRUE // Citadel Station Edit: Reactivates drain for reactor. Keeping VS Edits for legacy knowledge. + var/drain_energy = TRUE //per type stuff: if(closest_tesla_coil) @@ -300,20 +300,19 @@ tesla_zap(closest_mob, 5, power / 1.5, explosive, stun_mobs) else if(closest_machine) - drain_energy = TRUE // VOREStation Edit - Safety First! Drain Tesla fast when its loose + drain_energy = TRUE // Safety First! Drain Tesla fast when its loose closest_machine.tesla_act(power, explosive, stun_mobs) else if(closest_blob) - drain_energy = TRUE // VOREStation Edit - Safety First! Drain Tesla fast when its loose + drain_energy = TRUE // Safety First! Drain Tesla fast when its loose closest_blob.tesla_act(power, explosive, stun_mobs) else if(closest_structure) - drain_energy = TRUE // VOREStation Edit - Safety First! Drain Tesla fast when its loose + drain_energy = TRUE // Safety First! Drain Tesla fast when its loose closest_structure.tesla_act(power, explosive, stun_mobs) - // VOREStation Edit Start - Safety First! Drain Tesla fast when its loose + // Safety First! Drain Tesla fast when its loose if(drain_energy && istype(source, /obj/singularity/energy_ball)) var/obj/singularity/energy_ball/EB = source if (EB.energy > 0) - EB.energy -= min(EB.energy, max(1, round(EB.energy * 0.001))) // Citadel Station Edit: Reduces Drain speed to allow contained balls to lose power too /Vore station has set to 10 causing rapid decay - // VOREStation Edit End + EB.energy -= min(EB.energy, max(1, round(EB.energy * 0.001))) diff --git a/code/modules/power/tesla/tesla_act.dm b/code/modules/power/tesla/tesla_act.dm index 01b58f8a809..e10ea8934eb 100644 --- a/code/modules/power/tesla/tesla_act.dm +++ b/code/modules/power/tesla/tesla_act.dm @@ -30,7 +30,7 @@ /obj/machinery/tesla_act(power, explosive = FALSE) ..() if(prob(85) && explosive) - explosion(loc, 0, 2, 4, /*flame_range = 2,*/ adminlog = FALSE/*, smoke = FALSE*/) // VOREStation Edit - No devastation range + explosion(loc, 0, 2, 4, /*flame_range = 2,*/ adminlog = FALSE/*, smoke = FALSE*/) // No devastation range else if(prob(50)) emp_act(2) else @@ -63,12 +63,3 @@ /obj/mecha/tesla_act(power) ..() take_damage(power / 200, "energy") // A surface lightning strike will do 100 damage. - - - - - - - - - diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 909563bab55..a9e1d4ff1b1 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -96,7 +96,6 @@ var/last_shot = 0 //records the last shot fired -//VOREStation Add - /tg/ icon system var/charge_sections = 4 var/shaded_charge = FALSE var/ammo_x_offset = 2 @@ -128,7 +127,6 @@ playsound(src, 'sound/machines/button.ogg', 25) update_icon() -//VOREStation Add End /obj/item/gun/Initialize(mapload) . = ..() @@ -468,12 +466,10 @@ accuracy = initial(accuracy) //Reset the gun's accuracy if(muzzle_flash) - //VOREStation Edit - Flashlights if(gun_light) set_light(light_brightness) else set_light(0) - //VOREStation Edit End // Similar to the above proc, but does not require a user, which is ideal for things like turrets. /obj/item/gun/proc/Fire_userless(atom/target) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index d227a6bf0ce..1baf2f152f0 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -80,8 +80,6 @@ var/p_x = 16 var/p_y = 16 // the pixel location of the tile that the player clicked. Default is the center - //Misc/Polaris variables - var/def_zone = "" //Aiming at var/mob/firer = null//Who shot it var/silenced = 0 //Attack message diff --git a/code/modules/radiation/radiation.dm b/code/modules/radiation/radiation.dm index 9f41cc40af8..5cbcd15f2f4 100644 --- a/code/modules/radiation/radiation.dm +++ b/code/modules/radiation/radiation.dm @@ -53,7 +53,6 @@ return 1 /mob/living/rad_act(var/severity) - if(severity && !isbelly(loc)) //eaten mobs are made immune to radiation //VOREStation Edit - src.apply_effect(severity, IRRADIATE, src.getarmor(null, "rad")) + if(severity && !isbelly(loc)) //eaten mobs are made immune to radiation src.apply_effect(severity, IRRADIATE, src.getarmor(null, "rad")) for(var/atom/I in src) I.rad_act(severity) diff --git a/code/modules/random_map/automata/caves.dm b/code/modules/random_map/automata/caves.dm index 6366928e8cb..747855dfe96 100644 --- a/code/modules/random_map/automata/caves.dm +++ b/code/modules/random_map/automata/caves.dm @@ -47,13 +47,9 @@ if(!current_cell) return 0 var/turf/simulated/mineral/T = locate((origin_x-1)+x,(origin_y-1)+y,origin_z) - if(istype(T) && !T.ignore_mapgen && !T.ignore_cavegen) //VOREStation Edit: ignore cavegen + if(istype(T) && !T.ignore_mapgen && !T.ignore_cavegen) if(map[current_cell] == FLOOR_CHAR) - T.make_floor() //VOREStation Edit - Don't make cracked sand on surface map, jerk. - //if(prob(90)) - //T.make_floor() - //else - //T.ChangeTurf(/turf/space/cracked_asteroid) + T.make_floor() else T.make_wall() if(map[current_cell] == DOOR_CHAR) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index ded763ddbfc..8a3067595e7 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -76,11 +76,9 @@ if(default_deconstruction_crowbar(user, O)) return - //vorestation edit start - for solargrubs - if (istype(O, /obj/item/multitool)) + // For solargrubs + if(istype(O, /obj/item/multitool)) return ..() - //vorestation edit end - if (istype(O,/obj/item/reagent_containers/glass) || \ istype(O,/obj/item/reagent_containers/food/drinks/glass2) || \ diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm index 7b5a3368421..0142985c0b2 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm @@ -54,18 +54,18 @@ M.heal_organ_damage(0.2 * removed * volume_mod, 0) // More 'effective' blood means more usable material. M.nutrition += 20 * removed * volume_mod M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed) - M.adjustToxLoss(removed / 2) // Still has some water in the form of plasma. + M.adjustToxLoss(removed / 2) // Still has some water in the form of plasma. return var/is_vampire = M.species.is_vampire if(is_vampire) handle_vampire(M, alien, removed, is_vampire) if(effective_dose > 5) - if(!is_vampire) //VOREStation Edit. - M.adjustToxLoss(removed) //VOREStation Edit. + if(!is_vampire) + M.adjustToxLoss(removed) if(effective_dose > 15) - if(!is_vampire) //VOREStation Edit. - M.adjustToxLoss(removed) //VOREStation Edit. + if(!is_vampire) + M.adjustToxLoss(removed) if(data && data["virus2"]) var/list/vlist = data["virus2"] if(vlist.len) @@ -216,25 +216,12 @@ L.adjust_fire_stacks(-(amount / 5)) remove_self(needed) -/* //VOREStation Edit Start. Stops slimes from dying from water. Fixes fuel affect_ingest, too. -/datum/reagent/water/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(alien == IS_SLIME) - M.adjustToxLoss(6 * removed) - else - ..() -*/ /datum/reagent/water/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) //if(alien == IS_SLIME) // M.adjustToxLoss(6 * removed) //else M.adjust_hydration(removed * 10) ..() -/* -/datum/reagent/water/affect_touch(var/mob/living/carbon/M, var/alien, var/removed) - if(alien == IS_SLIME) - M.visible_message("[M]'s flesh sizzles where the water touches it!", "Your flesh burns in the water!") - ..() -*/ //VOREStation Edit End. /datum/reagent/fuel name = "Welding fuel" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm index 92860decff4..8e38df3bdd3 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm @@ -105,7 +105,7 @@ if(alien == IS_DIONA) strength_mod = 0 if(alien == IS_SLIME) - strength_mod *= 2 // VOREStation Edit - M.adjustToxLoss(removed) + strength_mod *= 2 if(alien == IS_ALRAUNE) if(prob(5)) to_chat(M, "You feel your leaves start to wilt.") @@ -155,7 +155,7 @@ if(alien == IS_DIONA) strength_mod = 0 if(alien == IS_SLIME) - strength_mod *= 2 // VOREStation Edit - M.adjustToxLoss(removed * 2) + strength_mod *= 2 var/is_vampire = M.species.is_vampire if(is_vampire) handle_vampire(M, alien, removed, is_vampire) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 3da3cf3f365..d277a32bdf0 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -34,21 +34,25 @@ if(data[taste]/totalFlavor < 0.1) data -= taste -/datum/reagent/nutriment/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(!injectable && alien != IS_SLIME && alien != IS_CHIMERA) //VOREStation Edit +/datum/reagent/nutriment/affect_blood(mob/living/carbon/M, alien, removed) + if(!injectable && alien != IS_SLIME && alien != IS_CHIMERA) M.adjustToxLoss(0.1 * removed) return affect_ingest(M, alien, removed) -/datum/reagent/nutriment/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/nutriment/affect_ingest(mob/living/carbon/M, alien, removed) var/hyd_removed switch(alien) - if(IS_DIONA) return - if(IS_UNATHI) removed *= 0.5 - if(IS_CHIMERA) removed *= 0.25 //VOREStation Edit - if(issmall(M)) removed *= 2 // Small bodymass, more effect from lower volume. + if(IS_DIONA) + return + if(IS_UNATHI) + removed *= 0.5 + if(IS_CHIMERA) + removed *= 0.25 + if(issmall(M)) + removed *= 2 // Small bodymass, more effect from lower volume. M.heal_organ_damage(0.5 * removed, 0) - if(!M.species.is_vampire) //VOREStation edit. If this is set to 0, they don't get nutrition from food. + if(!M.species.is_vampire) // If this is set to 0, they don't get nutrition from food. M.nutrition += nutriment_factor * removed // For hunger and fatness M.adjust_hydration(hydration_factor * hyd_removed) M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed) @@ -75,10 +79,8 @@ ..(M, alien, removed*1.2) // Teshari get a bit more nutrition from meat. if(IS_UNATHI) ..(M, alien, removed*2.25) //Unathi get most of their nutrition from meat. - //VOREStation Edit Start if(IS_CHIMERA) ..(M, alien, removed*4) //Xenochimera are obligate carnivores. - //VOREStation Edit End else ..() @@ -691,11 +693,6 @@ End Citadel Change */ if(is_vampire) handle_vampire(M, alien, removed, is_vampire) - /* VOREStation Removal - if(alien == IS_SLIME && water_based) - M.adjustToxLoss(removed * 2) - */ //VOREStation Removal End - /datum/reagent/drink/overdose(var/mob/living/carbon/M, var/alien) //Add special interactions here in the future if desired. ..() @@ -1011,7 +1008,6 @@ End Citadel Change */ M.bodytemperature -= 0.5 if(M.bodytemperature < T0C) M.bodytemperature += 0.5 - //M.adjustToxLoss(5 * removed) //VOREStation Removal /datum/reagent/drink/tea/icetea/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -1020,7 +1016,6 @@ End Citadel Change */ M.bodytemperature -= 0.5 if(M.bodytemperature < T0C) M.bodytemperature += 0.5 - //M.adjustToxLoss(5 * removed) //VOREStation Removal /datum/reagent/drink/tea/minttea name = "Mint Tea" @@ -1112,25 +1107,15 @@ End Citadel Change */ if(alien == IS_DIONA) return ..() - //if(alien == IS_TAJARA) //VOREStation Edit Begin - //M.adjustToxLoss(0.5 * removed) - //M.make_jittery(4) //extra sensitive to caffine if(adj_temp > 0) holder.remove_reagent("frostoil", 10 * removed) /datum/reagent/drink/coffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) ..() - //if(alien == IS_TAJARA) - //M.adjustToxLoss(2 * removed) - //M.make_jittery(4) - //return /datum/reagent/drink/coffee/overdose(var/mob/living/carbon/M, var/alien) if(alien == IS_DIONA) return - //if(alien == IS_TAJARA) - //M.adjustToxLoss(4 * REM) - //M.apply_effect(3, STUTTER) //VOREStation Edit end M.make_jittery(5) /datum/reagent/drink/coffee/icecoffee @@ -1151,7 +1136,6 @@ End Citadel Change */ M.bodytemperature -= 0.5 if(M.bodytemperature < T0C) M.bodytemperature += 0.5 - //M.adjustToxLoss(5 * removed) //VOREStation Removal /datum/reagent/drink/coffee/icecoffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -1160,7 +1144,6 @@ End Citadel Change */ M.bodytemperature -= 0.5 if(M.bodytemperature < T0C) M.bodytemperature += 0.5 - //M.adjustToxLoss(5 * removed) //VOREStation Removal /datum/reagent/drink/coffee/soy_latte name = "Soy Latte" @@ -1759,7 +1742,6 @@ End Citadel Change */ M.bodytemperature -= rand(1,3) if(M.bodytemperature < T0C) M.bodytemperature += rand(1,3) - //M.adjustToxLoss(5 * removed) //VOREStation Removal /datum/reagent/drink/ice/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -1768,7 +1750,6 @@ End Citadel Change */ M.bodytemperature -= rand(1,3) if(M.bodytemperature < T0C) M.bodytemperature += rand(1,3) - //M.adjustToxLoss(5 * removed) //VOREStation Removal /datum/reagent/drink/nothing name = "Nothing" @@ -2170,23 +2151,10 @@ End Citadel Change */ M.AdjustSleeping(-2) if(M.bodytemperature > 310) M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - //if(alien == IS_TAJARA) - //M.adjustToxLoss(0.5 * removed) - //M.make_jittery(4) //extra sensitive to caffine - -/datum/reagent/ethanol/coffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - //if(alien == IS_TAJARA) - //M.adjustToxLoss(2 * removed) - //M.make_jittery(4) - //return - ..() /datum/reagent/ethanol/coffee/overdose(var/mob/living/carbon/M, var/alien) if(alien == IS_DIONA) return - //if(alien == IS_TAJARA) - //M.adjustToxLoss(4 * REM) - //M.apply_effect(3, STUTTER) //VOREStation Edit end M.make_jittery(5) /datum/reagent/ethanol/coffee/kahlua diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 44fba30a204..d8b8fa6bcc7 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -151,8 +151,7 @@ chem_effective = 0.5 M.adjustBruteLoss(2 * removed) //Mends burns, but has negative effects with a Promethean's skeletal structure. if(alien != IS_DIONA) - M.heal_organ_damage(0, 4 * removed * chem_effective) //VOREStation edit - + M.heal_organ_damage(0, 4 * removed * chem_effective) /datum/reagent/dermaline name = "Dermaline" id = "dermaline" @@ -169,8 +168,7 @@ if(alien == IS_SLIME) chem_effective = 0.75 if(alien != IS_DIONA) - M.heal_organ_damage(0, 8 * removed * chem_effective) //VOREStation edit -/* + M.heal_organ_damage(0, 8 * removed * chem_effective)/* /datum/reagent/dermaline/topical//Main way to obtain is destiller name = "Dermalaze" id = "dermalaze" @@ -257,8 +255,7 @@ color = "#0080FF" overdose = REAGENTS_OVERDOSE scannable = 1 - metabolism = REM * 0.25 //VOREStation Edit - + metabolism = REM * 0.25 /datum/reagent/dexalin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien == IS_VOX) M.adjustToxLoss(removed * 24) //Vox breath phoron, oxygen is rather deadly to them @@ -274,8 +271,7 @@ M.adjustOxyLoss(-60 * removed) //Heals alot of oxyloss damage/but //keep in mind that Dexaline has a metabolism rate of 0.25*REM meaning only 0.25 units are removed every tick(if your metabolism takes usuall 1u per tick) - holder.remove_reagent("lexorin", 8 * removed) //VOREStation Edit - + holder.remove_reagent("lexorin", 8 * removed) /datum/reagent/dexalinp name = "Dexalin Plus" id = "dexalinp" @@ -1190,7 +1186,7 @@ M.hallucination = max(M.hallucination, 10) //One of the levofloxacin side effects is 'spontaneous tendon rupture', which I'll immitate here. 1:1000 chance, so, pretty darn rare. - if(ishuman(M) && rand(1,10000) == 1) //VOREStation Edit (more rare) + if(ishuman(M) && rand(1,10000) == 1) var/obj/item/organ/external/eo = pick(H.organs) //Misleading variable name, 'organs' is only external organs eo.fracture() diff --git a/code/modules/reagents/Misc-Recipes.dm b/code/modules/reagents/Misc-Recipes.dm index a7723c6b2ce..f3101f7161d 100644 --- a/code/modules/reagents/Misc-Recipes.dm +++ b/code/modules/reagents/Misc-Recipes.dm @@ -339,12 +339,9 @@ var/mob/living/L = holder.my_atom if(L.stat != DEAD) e.amount *= 0.5 - //VOREStation Add Start else holder.clear_reagents() //No more powergaming by creating a tiny amount of this - //VORESTation Add End e.start() - //holder.clear_reagents() //VOREStation Removal return /datum/chemical_reaction/flash_powder @@ -389,10 +386,8 @@ // 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes. // 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades. empulse(location, round(created_volume / 24), round(created_volume / 20), round(created_volume / 18), round(created_volume / 14), 1) - //VOREStation Edit Start if(!isliving(holder.my_atom)) //No more powergaming by creating a tiny amount of this holder.clear_reagents() - //VOREStation Edit End return /datum/chemical_reaction/nitroglycerin @@ -411,13 +406,10 @@ var/mob/living/L = holder.my_atom if(L.stat!=DEAD) e.amount *= 0.5 - //VOREStation Add Start else holder.clear_reagents() //No more powergaming by creating a tiny amount of this - //VOREStation Add End e.start() - //holder.clear_reagents() //VOREStation Removal return /datum/chemical_reaction/napalm @@ -450,10 +442,8 @@ playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3) spawn(0) S.start() - //VOREStation Edit Start if(!isliving(holder.my_atom)) //No more powergaming by creating a tiny amount of this holder.clear_reagents() - //VOREStation Edit End return /datum/chemical_reaction/foam @@ -473,10 +463,8 @@ var/datum/effect_system/foam_spread/s = new() s.set_up(created_volume, location, holder, 0) s.start() - //VOREStation Edit Start if(!isliving(holder.my_atom)) //No more powergaming by creating a tiny amount of this holder.clear_reagents() - //VOREStation Edit End return /datum/chemical_reaction/metalfoam @@ -931,40 +919,6 @@ required_reagents = list(MAT_PHORON = 20, "sugar" = 50, "lithium" = 50) //In case a xenobiologist is impatient and is willing to drain their dispenser resources, along with plasma! result_amount = 5 -/* //VORESTATION AI TEMPORARY REMOVAL -/datum/chemical_reaction/slimevore - name = "Slime Vore" // Hostile vore mobs only - id = "m_tele" - result = null - required_reagents = list(MAT_PHORON = 20, "nutriment" = 20, "sugar" = 20, "mutationtoxin" = 20) //Can't do slime jelly as it'll conflict with another, but mutation toxin will do. - result_amount = 1 - on_reaction(var/datum/reagents/holder) - var/mob_path = /mob/living/simple_mob - var/blocked = list( - /mob/living/simple_mob/hostile/mimic, - /mob/living/simple_mob/animal/space/alien/queen, - /mob/living/simple_mob/shadekin - )//exclusion list for things you don't want the reaction to create. - var/list/voremobs = typesof(mob_path) - mob_path - blocked // list of possible hostile mobs - - playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) -/* Removed at some point, unsure what to replace with - for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null)) - if(M:eyecheck() <= 0) - flick("e_flash", M.flash) -*/ - var/spawn_count = rand(1,3) - for(var/i = 1, i <= spawn_count, i++) - var/chosen = pick(voremobs) - var/mob/living/simple_mob/hostile/C = new chosen - C.faction = "slimesummon" - C.loc = get_turf(holder.my_atom) - if(prob(50)) - for(var/j = 1, j <= rand(1, 3), j++) - step(C, pick(NORTH,SOUTH,EAST,WEST)) -*/ - - //Xenochimera revival /datum/chemical_reaction/xenolazarus name = "Discount Lazarus" @@ -1003,7 +957,6 @@ name = "Macrocillin" id = "macrocillin" result = "macrocillin" - // POLARISTODO requires_heating = 1 required_reagents = list("sizeoxadone" = 20, "diethylamine" = 20) result_amount = 1 @@ -1011,6 +964,5 @@ name = "Microcillin" id = "microcillin" result = "microcillin" - // POLARISTODO requires_heating = 1 required_reagents = list("sizeoxadone" = 20, "sodiumchloride" = 20) result_amount = 1 diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 9b07a0af1eb..a667b08e8c8 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -82,7 +82,7 @@ /obj/structure/reagent_dispensers/watertank name = "watertank" desc = "A watertank." - icon = 'icons/obj/objects_vr.dmi' //VOREStation Edit + icon = 'icons/obj/objects_vr.dmi' icon_state = "watertank" amount_per_transfer_from_this = 10 @@ -102,7 +102,7 @@ /obj/structure/reagent_dispensers/fueltank name = "fueltank" desc = "A fueltank." - icon = 'icons/obj/objects_vr.dmi' //VOREStation Edit + icon = 'icons/obj/objects_vr.dmi' icon_state = "weldtank" amount_per_transfer_from_this = 10 var/modded = 0 @@ -112,7 +112,6 @@ . = ..() reagents.add_reagent("fuel",1000) -//VOREStation Add /obj/structure/reagent_dispensers/fueltank/high name = "high-capacity fuel tank" desc = "A highly-pressurized fuel tank made to hold vast amounts of fuel." @@ -143,7 +142,6 @@ if (W.is_wrench()) //can't wrench it shut, it's always open return return ..() -//VOREStation Add End /obj/structure/reagent_dispensers/fueltank/examine(mob/user) . = ..() diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 6accdc1c62d..06b5a68c5d7 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -282,7 +282,7 @@ qdel(src) else to_chat(user, "You need one sheet of metal to arm the robot frame.") - else if(istype(D, /obj/item/mop) || istype(D, /obj/item/soap) || istype(D, /obj/item/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on buckets" + else if(istype(D, /obj/item/mop) || istype(D, /obj/item/soap) || istype(D, /obj/item/reagent_containers/glass/rag)) if(reagents.total_volume < 1) to_chat(user, "\The [src] is empty!") else diff --git a/code/modules/reagents/reagent_containers/hard_candy.dm b/code/modules/reagents/reagent_containers/hard_candy.dm index 4cec300d160..649162fe406 100644 --- a/code/modules/reagents/reagent_containers/hard_candy.dm +++ b/code/modules/reagents/reagent_containers/hard_candy.dm @@ -69,7 +69,6 @@ to_chat(user, "\The [blocked] is in the way!") return - // Vorestation edits in this section. user.setClickCooldown(user.get_attack_speed(src)) //puts a limit on how fast people can eat/drink things if (fullness <= 100) to_chat(M, "You hungrily chew out a piece of [src] and gobble it!") @@ -107,14 +106,9 @@ to_chat(user, "\The [blocked] is in the way!") return - if(!istype(M, /mob/living/carbon/slime)) //If you're feeding it to someone else. + if(!istype(M, /mob/living/carbon/slime)) // If you're feeding it to someone else. - /*if (fullness <= (550 * (1 + M.overeatduration / 1000))) // Vorestation edit - user.visible_message("[user] attempts to feed [M] [src].") - else - user.visible_message("[user] cannot force anymore of [src] down [M]'s throat.") - return 0*/ - user.visible_message("[user] attempts to feed [M] [src].") // Vorestation edit + user.visible_message(SPAN_DANGER("[user] attempts to feed [M] [src].")) user.setClickCooldown(user.get_attack_speed(src)) if(!do_mob(user, M)) return diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 84c3cf501f8..184f2e27bb9 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -46,14 +46,13 @@ to_chat(user, "You cannot inject a robotic limb.") return - //VOREStation Add Start - Adds Prototype Hypo functionality + // Prototype Hypo functionality if(H != user && prototype) to_chat(user, "You begin injecting [H] with \the [src].") to_chat(H, " [user] is trying to inject you with \the [src]!") if(!do_after(user, 30, H)) return - //VOREstation Add End - else if(!H.stat && !prototype) //VOREStation Edit + else if(!H.stat && !prototype) if(H != user) if(H.a_intent != INTENT_HELP) to_chat(user, "[H] is resisting your attempt to inject them with \the [src].") diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index a9d5ba18b8f..262adb7cb99 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -305,10 +305,10 @@ /obj/item/reagent_containers/pill/zoom/Initialize(mapload) . = ..() - if(prob(50)) //VOREStation edit begin: Zoom pill adjustments + if(prob(50)) reagents.add_reagent("mold", 2) //Chance to be more dangerous reagents.add_reagent("expired_medicine", 5) - reagents.add_reagent("stimm", 5) //VOREStation edit end: Zoom pill adjustments + reagents.add_reagent("stimm", 5) color = reagents.get_color() /obj/item/reagent_containers/pill/diet @@ -318,5 +318,5 @@ /obj/item/reagent_containers/pill/diet/Initialize(mapload) . = ..() - reagents.add_reagent("lipozine", 15) //VOREStation Edit + reagents.add_reagent("lipozine", 15) color = reagents.get_color() diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index b4cb9db8ee7..515e2a6fa49 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -163,9 +163,9 @@ return var/mob/living/carbon/human/H = target - var/obj/item/organ/external/affected //VOREStation Edit - Moved this outside this if + var/obj/item/organ/external/affected if(istype(H)) - affected = H.get_organ(user.zone_sel.selecting) //VOREStation Edit - See above comment. + affected = H.get_organ(user.zone_sel.selecting) if(!affected) to_chat(user, "\The [H] is missing that limb!") return @@ -229,34 +229,7 @@ dirty(target,affected) //Reactivated this feature per feedback and constant requests from players. If this proves to be utter crap we'll adjust the numbers before removing outright return -/* VOREStation Edit - See syringes_vr.dm -/obj/item/reagent_containers/syringe/update_icon() - overlays.Cut() - if(mode == SYRINGE_BROKEN) - icon_state = "broken" - return - - var/rounded_vol = round(reagents.total_volume, round(reagents.maximum_volume / 3)) - if(ismob(loc)) - var/injoverlay - switch(mode) - if (SYRINGE_DRAW) - injoverlay = "draw" - if (SYRINGE_INJECT) - injoverlay = "inject" - overlays += injoverlay - icon_state = "[rounded_vol]" - item_state = "syringe_[rounded_vol]" - - if(reagents.total_volume) - filling = image('icons/obj/reagentfillings.dmi', src, "syringe10") - - filling.icon_state = "syringe[rounded_vol]" - - filling.color = reagents.get_color() - overlays += filling -*/ /obj/item/reagent_containers/syringe/proc/syringestab(mob/living/carbon/target as mob, mob/living/carbon/user as mob) if(istype(target, /mob/living/carbon/human)) @@ -338,8 +311,6 @@ /obj/item/reagent_containers/syringe/inaprovaline/Initialize(mapload) . = ..() reagents.add_reagent("inaprovaline", 15) - //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped - //update_icon() /obj/item/reagent_containers/syringe/antitoxin name = "Syringe (anti-toxin)" @@ -348,8 +319,6 @@ /obj/item/reagent_containers/syringe/antitoxin/Initialize(mapload) . = ..() reagents.add_reagent("anti_toxin", 15) - //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped - //update_icon() /obj/item/reagent_containers/syringe/antiviral name = "Syringe (spaceacillin)" @@ -358,8 +327,6 @@ /obj/item/reagent_containers/syringe/antiviral/Initialize(mapload) . = ..() reagents.add_reagent("spaceacillin", 15) - //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped - //update_icon() /obj/item/reagent_containers/syringe/drugs name = "Syringe (drugs)" @@ -370,8 +337,6 @@ reagents.add_reagent("space_drugs", 5) reagents.add_reagent("mindbreaker", 5) reagents.add_reagent("cryptobiolin", 5) - //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped - //update_icon() /obj/item/reagent_containers/syringe/ld50_syringe/choral/Initialize(mapload) . = ..() @@ -385,5 +350,4 @@ /obj/item/reagent_containers/syringe/steroid/Initialize(mapload) . = ..() - //reagents.add_reagent("adrenaline",5) //VOREStation Edit - No thanks. reagents.add_reagent("hyperzine",10) diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 2215b57ff5c..3d920968f46 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -106,7 +106,6 @@ H.sync_organ_dna() H.regenerate_icons() - //Basically all the VORE stuff H.ooc_notes = current_project.body_oocnotes H.flavor_texts = current_project.mydna.flavor.Copy() H.resize(current_project.sizemult, FALSE) @@ -322,7 +321,6 @@ H.sync_organ_dna() H.regenerate_icons() - //Basically all the VORE stuff H.ooc_notes = current_project.body_oocnotes H.flavor_texts = current_project.mydna.flavor.Copy() H.resize(current_project.sizemult) diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index cc703e359c9..2374d7da3ae 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -85,7 +85,7 @@ spawn() SSnightshift.check_nightshift() - admin_chat_message(message = "Security level is now: [uppertext(get_security_level())]", color = "#CC2222") //VOREStation Add + admin_chat_message(message = "Security level is now: [uppertext(get_security_level())]", color = "#CC2222") /proc/get_security_level() switch(security_level) diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index 9a1886db6c2..c912c6ae20d 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -339,14 +339,10 @@ to_chat(M, "The floor lurches beneath you!") shake_camera(M, 10, 1) // TODO - tossing? - //M.visible_message("[M.name] is tossed around by the sudden acceleration!") - //M.throw_at_random(FALSE, 4, 1) if(istype(M, /mob/living/carbon)) M.Weaken(3) - //VOREStation Add if(move_direction) throw_a_mob(M,move_direction) - //VOREStation Add End // We only need to rebuild powernets for our cables. No need to check machines because they are on top of cables. for(var/obj/structure/cable/C in A) powernets |= C.powernet diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm index 6abe4844f2c..542feb35533 100644 --- a/code/modules/shuttles/shuttles_web.dm +++ b/code/modules/shuttles/shuttles_web.dm @@ -152,7 +152,6 @@ var/new_name = input(user, "Please enter a new name for this vessel. Note that you can only set its name once, so choose wisely.", "Rename Shuttle", visible_name) as null|text var/sanitized_name = sanitizeName(new_name, MAX_NAME_LEN, TRUE) if(sanitized_name) - //can_rename = FALSE //VOREStation Removal to_chat(user, "You've renamed the vessel to '[sanitized_name]'.") message_admins("[key_name_admin(user)] renamed shuttle '[visible_name]' to '[sanitized_name]'.") visible_name = sanitized_name diff --git a/code/modules/surgery/external_repair.dm b/code/modules/surgery/external_repair.dm index cac74d01f06..7ed7e60a421 100644 --- a/code/modules/surgery/external_repair.dm +++ b/code/modules/surgery/external_repair.dm @@ -9,10 +9,6 @@ req_open = 1 /datum/surgery_step/repairflesh/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) -/* VOREStation Removal for Mlem Reasons(TM) - if (target.stat == DEAD) // Sorry defibs, your subjects need to have pumping fluids for these to work. - return 0 -*/ if (isslime(target)) return 0 if (target_zone == O_EYES || target_zone == O_MOUTH) diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 7af185db348..c54a51b3d35 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -149,7 +149,7 @@ user.drop_item() affected.implants += tool tool.loc = affected - if(istype(tool,/obj/item/nif)){var/obj/item/nif/N = tool;N.implant(target)} //VOREStation Add - NIF support + if(istype(tool,/obj/item/nif)){var/obj/item/nif/N = tool;N.implant(target)} affected.cavity = 0 ////////////////////////////////////////////////////////////////// @@ -227,7 +227,7 @@ imp.implanted = 0 if(istype(obj, /obj/item/implant/mirror)) target.mirror = null - else if(istype(tool,/obj/item/nif)){var/obj/item/nif/N = tool;N.unimplant(target)} //VOREStation Add - NIF support + else if(istype(tool,/obj/item/nif)){var/obj/item/nif/N = tool;N.unimplant(target)} else user.visible_message("[user] removes \the [tool] from [target]'s [affected.name].", \ "There's something inside [target]'s [affected.name], but you just missed it this time." ) diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index c947a703166..f0ca5e72bfb 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -18,7 +18,7 @@ return 0 if (affected.status & ORGAN_DESTROYED) return 0 - if (!(affected.robotic == ORGAN_ROBOT || affected.robotic == ORGAN_LIFELIKE)) //VOREStation Edit - No good on ORGAN_NANOFORM + if (!(affected.robotic == ORGAN_ROBOT || affected.robotic == ORGAN_LIFELIKE)) return 0 return 1 @@ -426,12 +426,6 @@ if(!istype(M)) return 0 - /* VOREStation Edit - Don't worry about it. We can put these in regardless, because resleeving might make it useful after. - if(!M.brainmob || !M.brainmob.client || !M.brainmob.ckey || M.brainmob.stat >= DEAD) - to_chat(user, "That brain is not usable.") - return SURGERY_FAILURE - */ - if(!(affected.robotic >= ORGAN_ROBOT)) to_chat(user, "You cannot install a computer brain into a meat skull.") return SURGERY_FAILURE diff --git a/code/modules/tables/rack.dm b/code/modules/tables/rack.dm index 036871a6b1e..c3a6455f038 100644 --- a/code/modules/tables/rack.dm +++ b/code/modules/tables/rack.dm @@ -20,7 +20,7 @@ return /obj/structure/table/rack/update_icon() - if(material) //VOREStation Add for rack colors based on materials + if(material) color = material.icon_colour return diff --git a/code/modules/tgui/modal.dm b/code/modules/tgui/modal.dm index 11646333ea5..d6c04382d78 100644 --- a/code/modules/tgui/modal.dm +++ b/code/modules/tgui/modal.dm @@ -1,6 +1,6 @@ /** - * NOTICE: The usage of these for new interfaces, unless porting from vorestation or another codebase, is banned. - * Modals should be directly handled in tgui, potentially as as new component, rather than in DM. + *! NOTICE: The usage of these for new interfaces, unless porting from vorestation or another codebase, is banned. + *! Modals should be directly handled in tgui, potentially as as new component, rather than in DM. */ #define UID_MAX SHORT_REAL_LIMIT diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm index 4d01dff3666..f3ec4f5ecd3 100644 --- a/code/modules/tgui/modules/appearance_changer.dm +++ b/code/modules/tgui/modules/appearance_changer.dm @@ -171,7 +171,6 @@ update_dna() changed_hook(APPEARANCECHANGER_CHANGED_EYES) return 1 - // VOREStation Add - Ears/Tails/Wings if("ear") if(can_change(APPEARANCE_ALL_HAIR)) var/datum/sprite_accessory/ears/instance = locate(params["ref"]) @@ -274,7 +273,6 @@ owner.update_wing_showing() changed_hook(APPEARANCECHANGER_CHANGED_HAIRCOLOR) return 1 - // VOREStation Add End return FALSE /datum/tgui_module/appearance_changer/ui_interact(mob/user, datum/tgui/ui = null, datum/tgui/parent_ui = null, datum/ui_state/custom_state) @@ -317,11 +315,9 @@ for(var/hair_style in valid_hairstyles) hair_styles[++hair_styles.len] = list("hairstyle" = hair_style) data["hair_styles"] = hair_styles - // VOREStation Add - Ears/Tails/Wings data["ear_styles"] = valid_earstyles data["tail_styles"] = valid_tailstyles data["wing_styles"] = valid_wingstyles - // VOREStation Add End if(can_change(APPEARANCE_FACIAL_HAIR)) var/facial_hair_styles[0] @@ -362,12 +358,9 @@ data["change_hair"] = can_change(APPEARANCE_HAIR) if(data["change_hair"]) data["hair_style"] = target.h_style - - // VOREStation Add - Ears/Tails/Wings data["ear_style"] = target.ear_style data["tail_style"] = target.tail_style data["wing_style"] = target.wing_style - // VOREStation Add End data["change_facial_hair"] = can_change(APPEARANCE_FACIAL_HAIR) if(data["change_facial_hair"]) @@ -385,14 +378,12 @@ data["change_hair_color"] = can_change(APPEARANCE_HAIR_COLOR) if(data["change_hair_color"]) data["hair_color"] = rgb(target.r_hair, target.g_hair, target.b_hair) - // VOREStation Add - Ears/Tails/Wings data["ears_color"] = rgb(target.r_ears, target.g_ears, target.b_ears) data["ears2_color"] = rgb(target.r_ears2, target.g_ears2, target.b_ears2) data["tail_color"] = rgb(target.r_tail, target.g_tail, target.b_tail) data["tail2_color"] = rgb(target.r_tail2, target.g_tail2, target.b_tail2) data["wing_color"] = rgb(target.r_wing, target.g_wing, target.b_wing) data["wing2_color"] = rgb(target.r_wing2, target.g_wing2, target.b_wing2) - // VOREStation Add End data["change_facial_hair_color"] = can_change(APPEARANCE_FACIAL_HAIR_COLOR) if(data["change_facial_hair_color"]) @@ -465,11 +456,9 @@ // Making the assumption that the available species remain constant valid_hairstyles.Cut() valid_facial_hairstyles.Cut() - // VOREStation Add - Ears/Tails/Wings valid_earstyles.Cut() valid_tailstyles.Cut() valid_wingstyles.Cut() - // VOREStation Add End /datum/tgui_module/appearance_changer/proc/generate_data(mob/user) var/mob/living/carbon/human/target = owner @@ -487,7 +476,6 @@ valid_hairstyles = target.generate_valid_hairstyles(check_gender = 0) valid_facial_hairstyles = target.generate_valid_facial_hairstyles() - // VOREStation Add - Ears/Tails/Wings if(!LAZYLEN(valid_earstyles)) for(var/path in ear_styles_list) var/datum/sprite_accessory/ears/instance = ear_styles_list[path] @@ -520,7 +508,6 @@ "color" = !!instance.do_colouration, "second_color" = !!instance.extra_overlay, ))) - // VOREStation Add End /datum/tgui_module/appearance_changer/proc/get_genders() var/mob/living/carbon/human/target = owner @@ -540,7 +527,6 @@ /datum/tgui_module/appearance_changer/proc/changed_hook(flag) return -// VOREStation Add - Ears/Tails/Wings /datum/tgui_module/appearance_changer/proc/can_use_sprite(datum/sprite_accessory/X, mob/living/carbon/human/target, mob/user) if(X.apply_restrictions && !(target.species.name in X.species_allowed)) return FALSE @@ -549,7 +535,6 @@ return FALSE return TRUE -// VOREStation Add End /datum/tgui_module/appearance_changer/mirror name = "SalonPro Nano-Mirror™" diff --git a/code/modules/tgui/modules/communications.dm b/code/modules/tgui/modules/communications.dm index 640f9802eb7..875a36b9989 100644 --- a/code/modules/tgui/modules/communications.dm +++ b/code/modules/tgui/modules/communications.dm @@ -417,7 +417,7 @@ emergency_shuttle.call_evac() log_game("[key_name(user)] has called the shuttle.") message_admins("[key_name_admin(user)] has called the shuttle.", 1) - admin_chat_message(message = "Emergency evac beginning! Called by [key_name(user)]!", color = "#CC2222") //VOREStation Add + admin_chat_message(message = "Emergency evac beginning! Called by [key_name(user)]!", color = "#CC2222") return @@ -464,7 +464,7 @@ log_game("[user? key_name(user) : "Autotransfer"] has called the shuttle.") message_admins("[user? key_name_admin(user) : "Autotransfer"] has called the shuttle.", 1) - admin_chat_message(message = "Autotransfer shuttle dispatched, shift ending soon.", color = "#2277BB") //VOREStation Add + admin_chat_message(message = "Autotransfer shuttle dispatched, shift ending soon.", color = "#2277BB") return diff --git a/code/modules/tgui/modules/ntos-only/cardmod.dm b/code/modules/tgui/modules/ntos-only/cardmod.dm index 3ade7d51519..31ee07e01ac 100644 --- a/code/modules/tgui/modules/ntos-only/cardmod.dm +++ b/code/modules/tgui/modules/ntos-only/cardmod.dm @@ -172,7 +172,7 @@ . = TRUE if("terminate") if(computer && program.can_run(usr, 1)) - id_card.assignment = "Dismissed" //VOREStation Edit: setting adjustment + id_card.assignment = "Dismissed" id_card.access = list() callHook("terminate_employee", list(id_card)) . = TRUE @@ -232,4 +232,3 @@ if(id_card) id_card.name = text("[id_card.registered_name]'s ID Card ([id_card.assignment])") - diff --git a/code/modules/turbolift/turbolift_console.dm b/code/modules/turbolift/turbolift_console.dm index f555a985d3a..00d8de42eb4 100644 --- a/code/modules/turbolift/turbolift_console.dm +++ b/code/modules/turbolift/turbolift_console.dm @@ -165,7 +165,7 @@ dat += "
" user.set_machine(src) - var/datum/browser/popup = new(user, "turbolift_panel", "Lift Panel", 350, 320) //VOREStation Edit - Wider! + var/datum/browser/popup = new(user, "turbolift_panel", "Lift Panel", 350, 320) popup.set_content(jointext(dat, null)) popup.open() return diff --git a/code/modules/turbolift/turbolift_map.dm b/code/modules/turbolift/turbolift_map.dm index 9d22d6c0848..ff4613577d9 100644 --- a/code/modules/turbolift/turbolift_map.dm +++ b/code/modules/turbolift/turbolift_map.dm @@ -28,7 +28,7 @@ // These modifiers are used in relation to the origin // to place the system control panels and doors. - var/make_walls = isnull(wall_type) ? FALSE : TRUE //VOREStation addition: Wall-less elevator + var/make_walls = isnull(wall_type) ? FALSE : TRUE // Wall-less elevator var/int_panel_x var/int_panel_y var/ext_panel_x @@ -52,70 +52,70 @@ if(NORTH) int_panel_x = ux + FLOOR(lift_size_x/2, 1) - int_panel_y = uy + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator + int_panel_y = uy + (make_walls ? 1 : 0) ext_panel_x = ux ext_panel_y = ey + 2 door_x1 = ux + 1 - door_y1 = ey + (make_walls ? 0 : 1) //VOREStation edit: Wall-less elevator + door_y1 = ey + (make_walls ? 0 : 1) door_x2 = ex - 1 door_y2 = ey + 1 - light_x1 = ux + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator - light_y1 = uy + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator - light_x2 = ux + lift_size_x - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator - light_y2 = uy + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator + light_x1 = ux + (make_walls ? 1 : 0) + light_y1 = uy + (make_walls ? 1 : 0) + light_x2 = ux + lift_size_x - (make_walls ? 1 : 0) + light_y2 = uy + (make_walls ? 1 : 0) if(SOUTH) int_panel_x = ux + FLOOR(lift_size_x/2, 1) - int_panel_y = ey - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator + int_panel_y = ey - (make_walls ? 1 : 0) ext_panel_x = ex ext_panel_y = uy - 2 door_x1 = ux + 1 door_y1 = uy - 1 door_x2 = ex - 1 - door_y2 = uy - (make_walls ? 0 : 1) //VOREStation edit: Wall-less elevator + door_y2 = uy - (make_walls ? 0 : 1) - light_x1 = ux + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator - light_y1 = uy + (make_walls ? 2 : 1) //VOREStation edit: Wall-less elevator - light_x2 = ux + lift_size_x - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator - light_y2 = uy + lift_size_y - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator + light_x1 = ux + (make_walls ? 1 : 0) + light_y1 = uy + (make_walls ? 2 : 1) + light_x2 = ux + lift_size_x - (make_walls ? 1 : 0) + light_y2 = uy + lift_size_y - (make_walls ? 1 : 0) if(EAST) - int_panel_x = ux+(make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator + int_panel_x = ux+(make_walls ? 1 : 0) int_panel_y = uy + FLOOR(lift_size_y/2, 1) ext_panel_x = ex+2 ext_panel_y = ey - door_x1 = ex + (make_walls ? 0 : 1) //VOREStation edit: Wall-less elevator + door_x1 = ex + (make_walls ? 0 : 1) door_y1 = uy + 1 door_x2 = ex + 1 door_y2 = ey - 1 - light_x1 = ux + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator - light_y1 = uy + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator - light_x2 = ux + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator - light_y2 = uy + lift_size_x - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator + light_x1 = ux + (make_walls ? 1 : 0) + light_y1 = uy + (make_walls ? 1 : 0) + light_x2 = ux + (make_walls ? 1 : 0) + light_y2 = uy + lift_size_x - (make_walls ? 1 : 0) if(WEST) - int_panel_x = ex-(make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator + int_panel_x = ex-(make_walls ? 1 : 0) int_panel_y = uy + FLOOR(lift_size_y/2, 1) ext_panel_x = ux-2 ext_panel_y = uy door_x1 = ux - 1 door_y1 = uy + 1 - door_x2 = ux - (make_walls ? 0 : 1) //VOREStation edit: Wall-less elevator + door_x2 = ux - (make_walls ? 0 : 1) door_y2 = ey - 1 - light_x1 = ux + lift_size_x - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator - light_y1 = uy + (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator - light_x2 = ux + lift_size_x - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator - light_y2 = uy + lift_size_y - (make_walls ? 1 : 0) //VOREStation edit: Wall-less elevator + light_x1 = ux + lift_size_x - (make_walls ? 1 : 0) + light_y1 = uy + (make_walls ? 1 : 0) + light_x2 = ux + lift_size_x - (make_walls ? 1 : 0) + light_y2 = uy + lift_size_y - (make_walls ? 1 : 0) // Generate each floor and store it in the controller datum. for(var/cz = uz;cz<=ez;cz++) @@ -138,7 +138,7 @@ // Update path appropriately if needed. var/swap_to = /turf/simulated/open if(cz == uz) // Elevator. - if(wall_type && (tx == ux || ty == uy || tx == ex || ty == ey) && !(tx >= door_x1 && tx <= door_x2 && ty >= door_y1 && ty <= door_y2)) //VOREStation edit: Wall-less elevator + if(wall_type && (tx == ux || ty == uy || tx == ex || ty == ey) && !(tx >= door_x1 && tx <= door_x2 && ty >= door_y1 && ty <= door_y2)) swap_to = wall_type else swap_to = floor_type diff --git a/code/modules/unit_tests/README.md b/code/modules/unit_tests/README.md index 6aecce1e285..b01987852ec 100644 --- a/code/modules/unit_tests/README.md +++ b/code/modules/unit_tests/README.md @@ -40,7 +40,7 @@ Open `code/_compile_options.dm` and uncomment the following line. //#define UNIT_TESTS ``` -Then, run vorestation.dmb in Dream Daemon. Don't bother trying to connect, you won't need to. You'll be able to see the outputs of all the tests. You'll get to see which tests failed and for what reason. If they all pass, you're set! +Then, run citadel.dmb in Dream Daemon. Don't bother trying to connect, you won't need to. You'll be able to see the outputs of all the tests. You'll get to see which tests failed and for what reason. If they all pass, you're set! ## How to think about tests diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index d718e1c609a..a6a73a048e2 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -42,8 +42,6 @@ var/load_offset_y = 0 //pixel_y offset for item overlay var/mob_offset_y = 0 //pixel_y offset for mob overlay - //var/datum/riding/riding_datum = null //VOREStation Edit - Moved to movables. - //------------------------------------------- // Standard procs //------------------------------------------- diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index 65f38d41249..d88cd0dea2a 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -12,9 +12,6 @@ var/list/ventcrawl_machinery = list( /obj/belly, /atom/movable/screen ) - //VOREStation Edit : added /obj/belly, to this list, travis is complaining about this in his indentation check - //mob/living/simple_mob/borer, //VORESTATION AI TEMPORARY REMOVAL REPLACE BACK IN LIST WHEN RESOLVED //VOREStation Edit - /mob/living/var/list/icon/pipes_shown = list() /mob/living/var/last_played_vent /mob/living/var/is_ventcrawling = 0 diff --git a/code/modules/virus2/disease2.dm b/code/modules/virus2/disease2.dm index ef35687e9a2..8af91e6403d 100644 --- a/code/modules/virus2/disease2.dm +++ b/code/modules/virus2/disease2.dm @@ -93,12 +93,11 @@ else resistance += rand(1,9) - //VOREStation Add Start - Corophazine can treat higher stages + // Corophazine can treat higher stages var/antibiotics = mob.chem_effects[CE_ANTIBIOTIC] if(antibiotics == ANTIBIO_SUPER) if(prob(70)) src.cure(mob) - //VOREStation Add End //Resistance is capped at 90 without being manually set to 100 if(resistance > 90 && resistance < 100) diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index 52e541e4f87..231a2460b18 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/code/modules/vore/eating/digest_act_vr.dm @@ -122,7 +122,7 @@ // Some more complicated stuff ///////////// /obj/item/mmi/digital/posibrain/digest_act(var/atom/movable/item_storage = null) - //Replace this with a VORE setting so all types of posibrains can/can't be digested on a whim + //Replace this with a pref setting so all types of posibrains can/can't be digested on a whim return FALSE // Gradual damage measurement diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index c2c8e198c3f..b1f69ee8111 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -683,7 +683,7 @@ I.forceMove(vore_selected) updateVRPanel() - log_admin("VORE: [src] used Eat Trash to swallow [I].") + log_admin("LOG: [src] used Eat Trash to swallow [I].") if(istype(I,/obj/item/flashlight/flare) || istype(I,/obj/item/flame/match) || istype(I,/obj/item/storage/box/matches)) to_chat(src, "You can taste the flavor of spicy cardboard.") diff --git a/code/modules/vore/eating/simple_animal_vr.dm b/code/modules/vore/eating/simple_animal_vr.dm index c475411f3f7..220280bbcb8 100644 --- a/code/modules/vore/eating/simple_animal_vr.dm +++ b/code/modules/vore/eating/simple_animal_vr.dm @@ -80,8 +80,6 @@ set_AI_busy(FALSE) else if (!ai_holder.target) // no using this to clear a retaliate mob's target ai_holder.target = user //just because you're not tasty doesn't mean you get off the hook. A swat for a swat. - //AttackTarget() //VOREStation AI Temporary Removal - //LoseTarget() // only make one attempt at an attack rather than going into full rage mode else user.visible_message("\the [user] swats \the [src] with \the [O]!!") release_vore_contents() diff --git a/code/modules/xenoarcheaology/artifacts/autocloner.dm b/code/modules/xenoarcheaology/artifacts/autocloner.dm index efb57f8f4b1..786c64ee469 100644 --- a/code/modules/xenoarcheaology/artifacts/autocloner.dm +++ b/code/modules/xenoarcheaology/artifacts/autocloner.dm @@ -26,7 +26,7 @@ /mob/living/simple_mob/animal/space/bear, /mob/living/simple_mob/creature, /mob/living/simple_mob/slime/xenobio, - /mob/living/simple_mob/animal/space/carp)// Vorestation edit + /mob/living/simple_mob/animal/space/carp) else spawn_type = pick(\ /mob/living/simple_mob/animal/passive/cat, diff --git a/code/modules/xenoarcheaology/effect.dm b/code/modules/xenoarcheaology/effect.dm index 5fcb70de183..3338bd17d99 100644 --- a/code/modules/xenoarcheaology/effect.dm +++ b/code/modules/xenoarcheaology/effect.dm @@ -32,7 +32,7 @@ if(3) //large range, long charge time chargelevelmax = rand(20, 120) - effectrange = rand(20, 100) //VOREStation Edit - Map size. + effectrange = rand(20, 100) /datum/artifact_effect/proc/ToggleActivate(var/reveal_toggle = 1) //so that other stuff happens first @@ -119,7 +119,8 @@ /proc/GetAnomalySusceptibility(var/mob/living/carbon/human/H) if(!istype(H)) return 1 - if(istype(get_area(H),/area/crew_quarters/sleep)) return 0 //VOREStation Edit - Dorms are protected from anomalies + if(istype(get_area(H),/area/crew_quarters/sleep)) + return 0 var/protected = 0 //anomaly suits give best protection, but excavation suits are almost as good diff --git a/code/modules/xenoarcheaology/effects/radiate.dm b/code/modules/xenoarcheaology/effects/radiate.dm index e38540eb045..387c7e4ee25 100644 --- a/code/modules/xenoarcheaology/effects/radiate.dm +++ b/code/modules/xenoarcheaology/effects/radiate.dm @@ -20,5 +20,5 @@ /datum/artifact_effect/radiate/DoEffectPulse() if(holder) - SSradiation.radiate(holder, ((radiation_amount * 3) * (sqrt(src.effectrange)))) //Need to get feedback on this //VOREStation Edit - Was too crazy-strong. + SSradiation.radiate(holder, ((radiation_amount * 3) * (sqrt(src.effectrange)))) return 1 diff --git a/code/modules/xenoarcheaology/misc.dm b/code/modules/xenoarcheaology/misc.dm index 2c9ff1ce7b7..971793eff31 100644 --- a/code/modules/xenoarcheaology/misc.dm +++ b/code/modules/xenoarcheaology/misc.dm @@ -61,7 +61,7 @@ /obj/item/clothing/under/rank/scientist, /obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/shoes/white, - /obj/item/melee/umbrella, // vorestation addition, + /obj/item/melee/umbrella, /obj/item/clothing/glasses/science, /obj/item/radio/headset/headset_sci, /obj/item/storage/belt/archaeology, diff --git a/code/modules/xenobio2/machinery/injector_computer.dm b/code/modules/xenobio2/machinery/injector_computer.dm index 77b696bc346..56ca60d0259 100644 --- a/code/modules/xenobio2/machinery/injector_computer.dm +++ b/code/modules/xenobio2/machinery/injector_computer.dm @@ -16,7 +16,7 @@ active_power_usage = 500 circuit = /obj/item/circuitboard/xenobio2computer var/obj/machinery/xenobio2/manualinjector/injector - var/transfer_amount = 5 //VOREStation Edit - This is never set anywhere, and 1 is too slow (1 is the default in the transfer proc). + var/transfer_amount = 5 var/active /obj/machinery/computer/xenobio2/Destroy() diff --git a/config/motd.txt b/config/motd.txt index 622fdafcbe3..fa25424ed7d 100644 --- a/config/motd.txt +++ b/config/motd.txt @@ -1,5 +1,5 @@

Welcome to Space Station 13!

--This server is running the Polaris modification of the Baystation12 SS13 code. +-This server is running the CitadelRP modification of the VOREStation SS13 code.

-Bugtracker: for posting of bugs and issues. +Bugtracker: for posting of bugs and issues. diff --git a/tools/Upload tgstation.rsc to external FTP/upload_rsc.bat b/tools/Upload tgstation.rsc to external FTP/upload_rsc.bat index d01150aa2a4..237bb1c7024 100644 --- a/tools/Upload tgstation.rsc to external FTP/upload_rsc.bat +++ b/tools/Upload tgstation.rsc to external FTP/upload_rsc.bat @@ -1,20 +1,20 @@ -@REM Script to easily upload vorestation.rsc to your FTP-server so that clients download it from an +@REM Script to easily upload citadel.rsc to your FTP-server so that clients download it from an @REM external webserver instead of from your connection when joining your game server. @REM @REM Run this script every time you have compiled your code, otherwise joining players will get errors. @REM @REM Replace USERNAME with your FTP username @REM Replace PASSWORD with your FTP password -@REM Replace FOLDER/FOLDER with the folder on the FTP server where you want to store vorestation.rsc, for example: cd www/rsc +@REM Replace FOLDER/FOLDER with the folder on the FTP server where you want to store citadel.rsc, for example: cd www/rsc @REM Replace FTP.DOMAIN.COM with the IP-address or domain name of your FTP server -@REM Add the URL to the location of vorestation.rsc on your webserver into data\external_rsc_urls.txt +@REM Add the URL to the location of citadel.rsc on your webserver into data\external_rsc_urls.txt @REM @echo off echo user USERNAME> ftpcmd.dat echo PASSWORD>> ftpcmd.dat echo bin>> ftpcmd.dat echo cd FOLDER/FOLDER>> ftpcmd.dat -echo put ..\..\vorestation.rsc>> ftpcmd.dat +echo put ..\..\citadel.rsc>> ftpcmd.dat echo quit>> ftpcmd.dat ftp -n -s:ftpcmd.dat FTP.DOMAIN.COM del ftpcmd.dat diff --git a/tools/build/build.js b/tools/build/build.js index 2afead542c2..2429752e0f6 100755 --- a/tools/build/build.js +++ b/tools/build/build.js @@ -22,7 +22,7 @@ Juke.setup({ file: import.meta.url }).then((code) => { process.exit(code); }); -const DME_NAME = 'vorestation'; +const DME_NAME = 'citadel'; export const DefineParameter = new Juke.Parameter({ type: 'string[]', diff --git a/tools/ci/run_server.sh b/tools/ci/run_server.sh index 25d3b60b7ac..33701f50743 100755 --- a/tools/ci/run_server.sh +++ b/tools/ci/run_server.sh @@ -8,6 +8,6 @@ mkdir ci_test/config cp tools/ci/ci_config.txt ci_test/config/config.txt cd ci_test -DreamDaemon vorestation.dmb -close -trusted -verbose -params "log-directory=ci" +DreamDaemon citadel.dmb -close -trusted -verbose -params "log-directory=ci" cd .. cat ci_test/data/logs/ci/clean_run.lk diff --git a/tools/deploy.sh b/tools/deploy.sh index 4155cfe4014..3b347ebefb0 100755 --- a/tools/deploy.sh +++ b/tools/deploy.sh @@ -22,7 +22,7 @@ if [ -d ".git" ]; then cp -r .git/logs/* $1/.git/logs/ fi -cp vorestation.dmb vorestation.rsc $1/ +cp citadel.dmb citadel.rsc $1/ cp -r _maps/* $1/_maps/ cp -r icons/runtime/* $1/icons/runtime/ cp -r sound/runtime/* $1/sound/runtime/ diff --git a/tools/expand_filedir_paths.py b/tools/expand_filedir_paths.py index 5177f1f9c86..be8f5aec470 100755 --- a/tools/expand_filedir_paths.py +++ b/tools/expand_filedir_paths.py @@ -88,6 +88,6 @@ def replace_func(name): os.remove(path) os.rename(path + ".tmp", path) -dirs = read_filedirs("vorestation.dme"); +dirs = read_filedirs("citadel.dme"); resources = index_files(dirs) rewrite_sources(resources) diff --git a/tools/linux_build.py b/tools/linux_build.py index 6af67a0d485..8399d1a4932 100644 --- a/tools/linux_build.py +++ b/tools/linux_build.py @@ -32,7 +32,7 @@ def stage2(map): txt = "-M{}".format(map) else: txt = '' - args = "bash tools/travis/dm.sh {} vorestation.dme".format(txt) + args = "bash tools/travis/dm.sh {} citadel.dme".format(txt) print(args) p = subprocess.Popen(args, shell=True) wait(p) @@ -42,7 +42,7 @@ def stage3(profile_mode=False): play("sound/misc/compiler-stage2.ogg") logfile = open('server.log~','w') p = subprocess.Popen( - "DreamDaemon vorestation.dmb 25001 -trusted", + "DreamDaemon citadel.dmb 25001 -trusted", shell=True, stdout=PIPE, stderr=STDOUT) try: while p.returncode is None: diff --git a/tools/tgs4_scripts/PreCompile.bat b/tools/tgs4_scripts/PreCompile.bat index 2d31c8942eb..25b55cb66d9 100644 --- a/tools/tgs4_scripts/PreCompile.bat +++ b/tools/tgs4_scripts/PreCompile.bat @@ -4,8 +4,8 @@ set TG_BOOTSTRAP_CACHE=%cd% IF NOT %1 == "" ( rem TGS4: we are passed the game directory on the command line cd %1 -) ELSE IF EXIST "..\Game\B\vorestation.dmb" ( - rem TGS3: Game/B/vorestation.dmb exists, so build in Game/A +) ELSE IF EXIST "..\Game\B\citadel.dmb" ( + rem TGS3: Game/B/citadel.dmb exists, so build in Game/A cd ..\Game\A ) ELSE ( rem TGS3: Otherwise build in Game/B