diff --git a/code/__DEFINES/voreconstants.dm b/code/__DEFINES/voreconstants.dm index 773a70f424..4252972c6f 100644 --- a/code/__DEFINES/voreconstants.dm +++ b/code/__DEFINES/voreconstants.dm @@ -46,7 +46,7 @@ var/global/list/death_sounds = list( #define isrodent(A) (is_species(A, /datum/species/rodent)) #define isherbivorous(A) (is_species(A, /datum/species/herbivorous)) #define isexotic(A) (is_species(A, /datum/species/exotic)) - +/* var/list/canine_species = list ( anubis, corgi, @@ -147,4 +147,4 @@ var/global/list/wings_list = list() for(var/client/C in admins) if(C.prefs.toggles & CHAT_DEBUGLOGS) - C << "DEBUG: [text]" \ No newline at end of file + C << "DEBUG: [text]" */ \ No newline at end of file diff --git a/code/citadel/races.dm b/code/citadel/races.dm index 18dd713421..f70da17210 100644 --- a/code/citadel/races.dm +++ b/code/citadel/races.dm @@ -278,8 +278,6 @@ datum adjective="scaled" taur="naga" tail=1 - - murid // i have no idea what this is //name="murid" id="murid" @@ -556,16 +554,9 @@ datum adjective="rocky" restricted=2 zombie - //name="zombie" + //name = "High Functioning Zombie" id="zombie" - generic="undead" - adjective="rotten" - restricted=2 - cosmetic_zombie // considering renaming to zombie/cosmetic - //name="zombie" - id="zombie" - generic="undead" - adjective="particularly rotten" + say_mod="moans" restricted=2 plasmaman //name="Plasmabone" @@ -612,6 +603,19 @@ datum tail=0 eyes="jelleyes" restricted=2 + synth + //name = "Synth" //inherited from the real species, for health scanners and things + id = "synth" + say_mod = "beep boops" //inherited from a user's real species + restricted=2 + synth/military + //name = "Military Synth" + id = "military_synth" + restricted=2 + corporate + //name = "Corporate Agent" + id = "agent" + restricted=2 /* var/list/kpcode_race_list diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 62441e5f59..1ff1e29ba5 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -1,4 +1,4 @@ -//Configuraton defines //TODO: Move all yes/no switches into bitflags +f//Configuraton defines //TODO: Move all yes/no switches into bitflags //Used by jobs_have_maint_access #define ASSISTANTS_HAVE_MAINT_ACCESS 1 diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index a500b3841d..b6cbccb883 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -119,7 +119,9 @@ Thus, the two variables affect pump operation are set in New(): switch(action) if("power") on = !on - investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos") + investigate_log("Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos") + message_admins("Pump, [src.name], turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [loc.loc]") + log_admin("[key_name(usr)] manipulated a pump at [x], [y], [z]") . = TRUE if("pressure") var/pressure = params["pressure"] @@ -135,7 +137,9 @@ Thus, the two variables affect pump operation are set in New(): . = TRUE if(.) target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE) - investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", "atmos") + investigate_log("Pump, [src.name], was set to [target_pressure] kPa by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos") + message_admins("Pump, [src.name], was set to [target_pressure] kPa by [key_name(usr)] at [x], [y], [z], [loc.loc]") + log_admin("[key_name(usr)] manipulated a pump at [x], [y], [z]") update_icon() /obj/machinery/atmospherics/components/binary/pump/atmosinit() @@ -178,5 +182,8 @@ Thus, the two variables affect pump operation are set in New(): if(!(stat & NOPOWER) && on) user << "You cannot unwrench this [src], turn it off first!" else + investigate_log("Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos") + message_admins("Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [loc.loc]") + log_admin("[key_name(usr)] unwrenched a pump at [x], [y], [z]") return 1 diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index d9b89d82e2..cd5c8cf123 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -289,7 +289,7 @@ var/list/preferences_datums = list() dat += "" - if(config.mutant_races) //We don't allow mutant bodyparts for humans either unless this is true. + /*if(config.mutant_races) //We don't allow mutant bodyparts for humans either unless this is true. if((MUTCOLORS in pref_species.specflags) || (MUTCOLORS_PARTSONLY in pref_species.specflags)) @@ -382,7 +382,7 @@ var/list/preferences_datums = list() dat += "[features["wings"]]
" - dat += "" + dat += ""*/ dat += "" @@ -1019,6 +1019,7 @@ var/list/preferences_datums = list() //if("be_taur") // be_taur = !be_taur + /* if("tail_lizard") var/new_tail new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in tails_list_lizard @@ -1072,6 +1073,7 @@ var/list/preferences_datums = list() new_body_markings = input(user, "Choose your character's body markings:", "Character Preference") as null|anything in body_markings_list if(new_body_markings) features["body_markings"] = new_body_markings + */ if("s_tone") var/new_s_tone = input(user, "Choose your character's skin-tone:", "Character Preference") as null|anything in skin_tones diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 959890e109..ed2d5c2b1a 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -413,6 +413,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car eye_color = sanitize_hexcolor(eye_color, 3, 0) skin_tone = sanitize_inlist(skin_tone, skin_tones) backbag = sanitize_inlist(backbag, backbaglist, initial(backbag)) + /* features["mcolor"] = sanitize_hexcolor(features["mcolor"], 3, 0) features["tail_lizard"] = sanitize_inlist(features["tail_lizard"], tails_list_lizard) features["tail_human"] = sanitize_inlist(features["tail_human"], tails_list_human, "None") @@ -421,7 +422,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car features["ears"] = sanitize_inlist(features["ears"], ears_list, "None") features["frills"] = sanitize_inlist(features["frills"], frills_list) features["spines"] = sanitize_inlist(features["spines"], spines_list) - features["body_markings"] = sanitize_inlist(features["body_markings"], body_markings_list) + features["body_markings"] = sanitize_inlist(features["body_markings"], body_markings_list)*/ + + mutant_tail = sanitize_text(mutant_tail, initial(mutant_tail)) + mutant_wing = sanitize_text(mutant_wing, initial(mutant_wing)) + wingcolor = sanitize_hexcolor(wingcolor, 3, 0) + character_size = sanitize_text(character_size, initial(character_size)) +// mutant_color = sanitize_hexcolor(mutant_color, 3, 0) vore_ability=sanitize_vore_list(vore_ability) if(isnull(vore_banned_methods))vore_banned_methods=0 diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 4389dfacc7..108b2f320f 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -182,6 +182,7 @@ travelDir = -90 roundstart_move = "emergency_away" var/sound_played = 0 //If the launch sound has been sent to all players on the shuttle itself + var/end_sound_played = 0 //so it doesn't loop annoyingly /obj/docking_port/mobile/emergency/register() . = ..() @@ -299,7 +300,7 @@ if(SHUTTLE_DOCKED) - if(time_left <= 50 && !sound_played) //4 seconds left:REV UP THOSE ENGINES BOYS. - should sync up with the launch + if(time_left <= 60 && !sound_played) //4 seconds left:REV UP THOSE ENGINES BOYS. - should sync up with the launch sound_played = 1 //Only rev them up once. for(var/area/shuttle/escape/E in world) E << 'sound/effects/hyperspace_begin.ogg' @@ -327,8 +328,8 @@ priority_announce("The Emergency Shuttle has left the station. Estimate [timeLeft(600)] minutes until the shuttle docks at Central Command.", null, null, "Priority") if(SHUTTLE_ESCAPE) - if(time_left <= 50 && sound_played) //4 seconds left:Hyperspace trip completed. - should sync up with the landing - sound_played = 1 //Only rev them up once. + if(time_left <= 50 && !end_sound_played) //4 seconds left:Hyperspace trip completed. - should sync up with the landing + end_sound_played = 1 //Only rev them up once. for(var/area/shuttle/escape/E in world) E << 'sound/effects/hyperspace_end.ogg' @@ -343,8 +344,8 @@ continue //Mapping a new docking point for each ship mappers could potentially want docking with centcomm would take up lots of space, just let them keep flying off into the sunset for their greentext //now move the actual emergency shuttle to centcomm - for(var/area/shuttle/escape/E in world) - E << 'sound/effects/hyperspace_end.ogg' + // for(var/area/shuttle/escape/E in world) + // E << 'sound/effects/hyperspace_end.ogg' dock(SSshuttle.getDock("emergency_away")) mode = SHUTTLE_ENDGAME timer = 0 diff --git a/icons/mob/human_parts.dmi b/icons/mob/human_parts.dmi index 53d85d3abc..8c508fc181 100644 Binary files a/icons/mob/human_parts.dmi and b/icons/mob/human_parts.dmi differ diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi index be12e23f03..242d566ce9 100644 Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 4682841cde..68a92acf5f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -51,6 +51,7 @@ #include "code\__DEFINES\tablecrafting.dm" #include "code\__DEFINES\tgui.dm" #include "code\__DEFINES\tick.dm" +#include "code\__DEFINES\voreconstants.dm" #include "code\__DEFINES\wires.dm" #include "code\__HELPERS\_logging.dm" #include "code\__HELPERS\_string_lists.dm"