diff --git a/_maps/sccv_horizon.dm b/_maps/sccv_horizon.dm index 8e74420ac07..716c7168711 100644 --- a/_maps/sccv_horizon.dm +++ b/_maps/sccv_horizon.dm @@ -1 +1 @@ -#define DEFAULT_MAP "sccv_horizon" \ No newline at end of file +#define DEFAULT_MAP "sccv_horizon" diff --git a/code/ZAS/Connection.dm b/code/ZAS/Connection.dm index 877717633a7..66504cf35f3 100644 --- a/code/ZAS/Connection.dm +++ b/code/ZAS/Connection.dm @@ -15,7 +15,7 @@ Class Vars: zoneB - The archived zone of B. May be null in case of unsimulated connections. edge - Stores the edge this connection is in. Can reference an edge that is no longer processed - after this connection is removed, so make sure to check edge.coefficient > 0 before re-adding it. + after this connection is removed, so make sure to check edge.coefficient > 0 before re-adding it. Class Procs: diff --git a/code/ZAS/ConnectionGroup.dm b/code/ZAS/ConnectionGroup.dm index 7f4c99185bb..b7611a799ae 100644 --- a/code/ZAS/ConnectionGroup.dm +++ b/code/ZAS/ConnectionGroup.dm @@ -20,7 +20,7 @@ Class Vars: B - This holds the second zone with which the first zone equalizes. direct - This counts the number of direct (i.e. with no doors) connections on this edge. - Any value of this is sufficient to make the zones mergeable. + Any value of this is sufficient to make the zones mergeable. connection_edge/unsimulated diff --git a/code/__defines/accessories.dm b/code/__defines/accessories.dm index 2815c07b65b..c0aa1c942a5 100644 --- a/code/__defines/accessories.dm +++ b/code/__defines/accessories.dm @@ -8,4 +8,4 @@ #define ACCESSORY_SLOT_ARM_GUARDS "arm guards" #define ACCESSORY_SLOT_ARMOR_PIN "armor pin" #define ACCESSORY_SLOT_ARMOR_POCKETS "armor pockets" -#define ACCESSORY_SLOT_HEAD "head" \ No newline at end of file +#define ACCESSORY_SLOT_HEAD "head" diff --git a/code/__defines/antagonist.dm b/code/__defines/antagonist.dm index 907134c53e1..5365690bfc0 100644 --- a/code/__defines/antagonist.dm +++ b/code/__defines/antagonist.dm @@ -2,4 +2,4 @@ #define VAMPIRE_MAX_USABLE_BLOOD 950 // Zombie -#define ZOMBIE_MAX_TRIOXIN 30 \ No newline at end of file +#define ZOMBIE_MAX_TRIOXIN 30 diff --git a/code/__defines/battle_monsters.dm b/code/__defines/battle_monsters.dm index 386459c40ba..e61fe81c69f 100644 --- a/code/__defines/battle_monsters.dm +++ b/code/__defines/battle_monsters.dm @@ -80,4 +80,4 @@ #define BATTLE_MONSTERS_POWER_GREATER 1200 #define BATTLE_MONSTERS_POWER_GRAND 1400 -#define BATTLE_MONSTERS_POWER_UPGRADE 200 \ No newline at end of file +#define BATTLE_MONSTERS_POWER_UPGRADE 200 diff --git a/code/__defines/dcs/flags.dm b/code/__defines/dcs/flags.dm index a9e4c97885f..22640a6c603 100644 --- a/code/__defines/dcs/flags.dm +++ b/code/__defines/dcs/flags.dm @@ -11,10 +11,11 @@ // /datum/element flags /// Causes the detach proc to be called when the host object is being deleted #define ELEMENT_DETACH (1 << 0) + /** - * Only elements created with the same arguments given after `id_arg_index` share an element instance - * The arguments are the same when the text and number values are the same and all other values have the same ref - */ + * Only elements created with the same arguments given after `id_arg_index` share an element instance + * The arguments are the same when the text and number values are the same and all other values have the same ref + */ #define ELEMENT_BESPOKE (1 << 1) // How multiple components of the exact same type are handled in the same datum diff --git a/code/__defines/drinks.dm b/code/__defines/drinks.dm index 2f25b7c039b..fecbee4cc98 100644 --- a/code/__defines/drinks.dm +++ b/code/__defines/drinks.dm @@ -1,4 +1,11 @@ -#define NO_EMPTY_ICON 1 //does NOT have an iconstate_empty icon. If adding empty icons for a drink, make sure it does not have this flag -#define UNIQUE_EMPTY_ICON 2 //Uses the empty_icon_state listed. Should really only be used when one trash state applies to multiple drinks. Remove if one is added -#define UNIQUE_EMPTY_ICON_FILE 4 //Uses the empty_icon_state listed. also doesn't change its icon file, giving it a pseudo contained sprite status -#define IS_GLASS 8 //Container is glass. Affects shattering, unacidable, etc. \ No newline at end of file +///Does NOT have an iconstate_empty icon. If adding empty icons for a drink, make sure it does not have this flag +#define NO_EMPTY_ICON 1 + +///Uses the empty_icon_state listed. Should really only be used when one trash state applies to multiple drinks. Remove if one is added +#define UNIQUE_EMPTY_ICON 2 + +///Uses the empty_icon_state listed. also doesn't change its icon file, giving it a pseudo contained sprite status +#define UNIQUE_EMPTY_ICON_FILE 4 + +///Container is glass. Affects shattering, unacidable, etc. +#define IS_GLASS 8 diff --git a/code/__defines/dview.dm b/code/__defines/dview.dm index 88116e9492b..55764fb9a37 100644 --- a/code/__defines/dview.dm +++ b/code/__defines/dview.dm @@ -11,4 +11,4 @@ dview_mob.loc = center; \ dview_mob.see_invisible = invis_flags; \ output = view(range, dview_mob); \ - dview_mob.loc = null; \ No newline at end of file + dview_mob.loc = null; diff --git a/code/__defines/guns.dm b/code/__defines/guns.dm index a53849c0541..37e9d2e2111 100644 --- a/code/__defines/guns.dm +++ b/code/__defines/guns.dm @@ -18,4 +18,4 @@ #define RFD_FLOORS_AND_WALL 1 #define RFD_WINDOW_AND_FRAME 2 #define RFD_AIRLOCK 3 -#define RFD_DECONSTRUCT 4 \ No newline at end of file +#define RFD_DECONSTRUCT 4 diff --git a/code/__defines/hydroponics.dm b/code/__defines/hydroponics.dm index f6b89f81c77..9f3b7e2b388 100644 --- a/code/__defines/hydroponics.dm +++ b/code/__defines/hydroponics.dm @@ -66,4 +66,4 @@ #define TRAIT_IMMUTABLE 38 #define TRAIT_FLESH_COLOUR 39 #define TRAIT_SPOROUS 40 -#define TRAIT_BIOLUM_PWR 41 \ No newline at end of file +#define TRAIT_BIOLUM_PWR 41 diff --git a/code/__defines/icon_layering.dm b/code/__defines/icon_layering.dm index cc5fee0864c..71c05e39cb0 100644 --- a/code/__defines/icon_layering.dm +++ b/code/__defines/icon_layering.dm @@ -38,4 +38,4 @@ #define WRISTS_LAYER 37 #define FIRE_LAYER_UPPER 38 #define TOTAL_LAYERS 38 -//////////////////////////// \ No newline at end of file +//////////////////////////// diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm index 0ce0475333f..fc857d70cf4 100644 --- a/code/__defines/jobs.dm +++ b/code/__defines/jobs.dm @@ -38,4 +38,4 @@ #define ZENG_ROLES list(SCIENCE_ROLES, MEDICAL_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE) #define HEPH_ROLES list(OPERATIONS_ROLES, ENGINEERING_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE) #define ORION_ROLES list(OPERATIONS_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE) -#define INDEP_ROLES list(NON_CREW_CIVILIAN_ROLES, CONSULAR_ROLE, JOURNALIST_ROLE, CHAPLAIN_ROLE, OFF_DUTY_CREW_MEMBER_ROLE) \ No newline at end of file +#define INDEP_ROLES list(NON_CREW_CIVILIAN_ROLES, CONSULAR_ROLE, JOURNALIST_ROLE, CHAPLAIN_ROLE, OFF_DUTY_CREW_MEMBER_ROLE) diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index 953771f15e1..56f0daf73fa 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -2,8 +2,12 @@ #define MEGAWATTS *1000000 #define GIGAWATTS *1000000000 -#define CELLRATE 0.002 // Multiplier for watts per tick <> cell storage (e.g., 0.02 means if there is a load of 1000 watts, 20 units will be taken from a cell per second) - // It's a conversion constant. power_used*CELLRATE = charge_provided, or charge_used/CELLRATE = power_provided +/** + * Multiplier for watts per tick <> cell storage (e.g., 0.02 means if there is a load of 1000 watts, 20 units will be taken from a cell per second) + * + * It's a conversion constant. power_used*CELLRATE = charge_provided, or charge_used/CELLRATE = power_provided + */ +#define CELLRATE 0.002 // Doors! #define DOOR_CRUSH_DAMAGE 20 diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 2eb0c1de241..276ba10ce3e 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -281,10 +281,10 @@ //supposedly the fastest way to do this according to https://gist.github.com/Giacom/be635398926bb463b42a #define RANGE_TURFS(RADIUS, CENTER) \ - block( \ - locate(max(CENTER.x-(RADIUS),1), max(CENTER.y-(RADIUS),1), CENTER.z), \ - locate(min(CENTER.x+(RADIUS),world.maxx), min(CENTER.y+(RADIUS),world.maxy), CENTER.z) \ - ) + block( \ + locate(max(CENTER.x-(RADIUS),1), max(CENTER.y-(RADIUS),1), CENTER.z), \ + locate(min(CENTER.x+(RADIUS),world.maxx), min(CENTER.y+(RADIUS),world.maxy), CENTER.z) \ + ) #define get_turf(A) (get_step(A, 0)) #define NORTH_OF_TURF(T) locate(T.x, T.y + 1, T.z) @@ -391,10 +391,10 @@ /* Define for getting a bitfield of adjacent turfs that meet a condition. - ORIGIN is the object to step from, VAR is the var to write the bitfield to - TVAR is the temporary turf variable to use, FUNC is the condition to check. - FUNC generally should reference TVAR. - example: +ORIGIN is the object to step from, VAR is the var to write the bitfield to +TVAR is the temporary turf variable to use, FUNC is the condition to check. +FUNC generally should reference TVAR. +example: var/turf/T var/result = 0 CALCULATE_NEIGHBORS(src, result, T, isopenturf(T)) diff --git a/code/__defines/modular_guns.dm b/code/__defines/modular_guns.dm index bcd5b490dff..2ab4bff43cc 100644 --- a/code/__defines/modular_guns.dm +++ b/code/__defines/modular_guns.dm @@ -8,4 +8,4 @@ #define islasercapacitor(A) istype(A, /obj/item/laser_components/capacitor) #define ismodifier(A) istype(A, /obj/item/laser_components/modifier) #define ismodulator(A) istype(A, /obj/item/laser_components/modulator) -#define isfocusinglens(A) istype(A, /obj/item/laser_components/focusing_lens) \ No newline at end of file +#define isfocusinglens(A) istype(A, /obj/item/laser_components/focusing_lens) diff --git a/code/__defines/projectiles.dm b/code/__defines/projectiles.dm index 53efae46c09..57bc71133f0 100644 --- a/code/__defines/projectiles.dm +++ b/code/__defines/projectiles.dm @@ -31,6 +31,6 @@ #define ROF_INTERMEDIATE 4 #define ROF_RIFLE 5 #define ROF_HEAVY 8 -#define ROF_SUPERHEAVY 12 +#define ROF_SUPERHEAVY 12 #define ROF_UNWIELDY 16 #define ROF_SPECIAL 40 diff --git a/code/__defines/research.dm b/code/__defines/research.dm index 0f7f7858368..eb09a947089 100644 --- a/code/__defines/research.dm +++ b/code/__defines/research.dm @@ -17,4 +17,4 @@ #define MECHFAB 0x4 //Mechfab #define CHASSIS 0x8 //For protolathe, but differently -#define MAX_TECH_LEVEL 15 \ No newline at end of file +#define MAX_TECH_LEVEL 15 diff --git a/code/__defines/targeting.dm b/code/__defines/targeting.dm index 4bbe7345920..8674ff584c1 100644 --- a/code/__defines/targeting.dm +++ b/code/__defines/targeting.dm @@ -1,4 +1,4 @@ #define TARGET_CAN_MOVE 1 #define TARGET_CAN_RUN 2 #define TARGET_CAN_CLICK 4 -#define TARGET_CAN_RADIO 8 \ No newline at end of file +#define TARGET_CAN_RADIO 8 diff --git a/code/__defines/tgs.dm b/code/__defines/tgs.dm index 7665982f8e6..3cdb22834ab 100644 --- a/code/__defines/tgs.dm +++ b/code/__defines/tgs.dm @@ -122,22 +122,22 @@ //REQUIRED HOOKS /** - * Call this somewhere in [/world/proc/New] that is always run. This function may sleep! - * - * * event_handler - Optional user defined [/datum/tgs_event_handler]. - * * minimum_required_security_level: The minimum required security level to run the game in which the DMAPI is integrated. Can be one of [TGS_SECURITY_ULTRASAFE], [TGS_SECURITY_SAFE], or [TGS_SECURITY_TRUSTED]. - */ + * Call this somewhere in [/world/proc/New] that is always run. This function may sleep! + * + * * event_handler - Optional user defined [/datum/tgs_event_handler]. + * * minimum_required_security_level: The minimum required security level to run the game in which the DMAPI is integrated. Can be one of [TGS_SECURITY_ULTRASAFE], [TGS_SECURITY_SAFE], or [TGS_SECURITY_TRUSTED]. + */ /world/proc/TgsNew(datum/tgs_event_handler/event_handler, minimum_required_security_level = TGS_SECURITY_ULTRASAFE) return /** - * Call this when your initializations are complete and your game is ready to play before any player interactions happen. - * - * This may use [/world/var/sleep_offline] to make this happen so ensure no changes are made to it while this call is running. - * Afterwards, consider explicitly setting it to what you want to avoid this BYOND bug: http://www.byond.com/forum/post/2575184 - * Before this point, note that any static files or directories may be in use by another server. Your code should account for this. - * This function should not be called before ..() in [/world/proc/New]. - */ + * Call this when your initializations are complete and your game is ready to play before any player interactions happen. + * + * This may use [/world/var/sleep_offline] to make this happen so ensure no changes are made to it while this call is running. + * Afterwards, consider explicitly setting it to what you want to avoid this BYOND bug: http://www.byond.com/forum/post/2575184 + * Before this point, note that any static files or directories may be in use by another server. Your code should account for this. + * This function should not be called before ..() in [/world/proc/New]. + */ /world/proc/TgsInitializationComplete() return @@ -145,8 +145,8 @@ #define TGS_TOPIC var/tgs_topic_return = TgsTopic(args[1]); if(tgs_topic_return) return tgs_topic_return /** - * Call this at the beginning of [world/proc/Reboot]. - */ + * Call this at the beginning of [world/proc/Reboot]. + */ /world/proc/TgsReboot() return diff --git a/code/_compile_options.dm b/code/_compile_options.dm index c08babb650b..dcea26e7ec3 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -16,7 +16,7 @@ #ifndef PRELOAD_RSC //set to: #define PRELOAD_RSC 2 // 0 to allow using external resources or on-demand behaviour; #endif // 1 to use the default behaviour; - // 2 for preloading absolutely everything; + // 2 for preloading absolutely everything; //#define TESTING // Creates debug feedback messages and enables many optional testing procs/checks #ifdef TESTING diff --git a/code/_helpers/_string_lists.dm b/code/_helpers/_string_lists.dm index 02e16652c31..e58ae7f56ec 100644 --- a/code/_helpers/_string_lists.dm +++ b/code/_helpers/_string_lists.dm @@ -38,4 +38,4 @@ var/string_filename_current_key if(fexists("strings/[filename]")) string_cache[filename] = json_load("strings/[filename]") else - CRASH("file not found: strings/[filename]") \ No newline at end of file + CRASH("file not found: strings/[filename]") diff --git a/code/_helpers/data_structures.dm b/code/_helpers/data_structures.dm index 0b7afe21ba8..9c98d8185fe 100644 --- a/code/_helpers/data_structures.dm +++ b/code/_helpers/data_structures.dm @@ -25,4 +25,4 @@ return contents.len /Queue/proc/as_list() - return contents \ No newline at end of file + return contents diff --git a/code/_helpers/game.dm b/code/_helpers/game.dm index 2cc67b25f1c..008bafe014d 100644 --- a/code/_helpers/game.dm +++ b/code/_helpers/game.dm @@ -114,7 +114,7 @@ var/dest_y /datum/projectile_data/New(var/src_x, var/src_y, var/time, var/distance, \ - var/power_x, var/power_y, var/dest_x, var/dest_y) + var/power_x, var/power_y, var/dest_x, var/dest_y) src.src_x = src_x src.src_y = src_y src.time = time diff --git a/code/_helpers/icons.dm b/code/_helpers/icons.dm index bf9d905457b..47b17b27ae2 100644 --- a/code/_helpers/icons.dm +++ b/code/_helpers/icons.dm @@ -18,57 +18,57 @@ remember you first need to setup an /icon var like so: var/icon/my_icon = new('iconfile.dmi') icon/ChangeOpacity(amount = 1) - A very common operation in DM is to try to make an icon more or less transparent. Making an icon more - transparent is usually much easier than making it less so, however. This proc basically is a frontend - for MapColors() which can change opacity any way you like, in much the same way that SetIntensity() - can make an icon lighter or darker. If amount is 0.5, the opacity of the icon will be cut in half. - If amount is 2, opacity is doubled and anything more than half-opaque will become fully opaque. + A very common operation in DM is to try to make an icon more or less transparent. Making an icon more + transparent is usually much easier than making it less so, however. This proc basically is a frontend + for MapColors() which can change opacity any way you like, in much the same way that SetIntensity() + can make an icon lighter or darker. If amount is 0.5, the opacity of the icon will be cut in half. + If amount is 2, opacity is doubled and anything more than half-opaque will become fully opaque. icon/GrayScale() - Converts the icon to grayscale instead of a fully colored icon. Alpha values are left intact. + Converts the icon to grayscale instead of a fully colored icon. Alpha values are left intact. icon/ColorTone(tone) - Similar to GrayScale(), this proc converts the icon to a range of black -> tone -> white, where tone is an - RGB color (its alpha is ignored). This can be used to create a sepia tone or similar effect. - See also the global ColorTone() proc. + Similar to GrayScale(), this proc converts the icon to a range of black -> tone -> white, where tone is an + RGB color (its alpha is ignored). This can be used to create a sepia tone or similar effect. + See also the global ColorTone() proc. icon/MinColors(icon) - The icon is blended with a second icon where the minimum of each RGB pixel is the result. - Transparency may increase, as if the icons were blended with ICON_ADD. You may supply a color in place of an icon. + The icon is blended with a second icon where the minimum of each RGB pixel is the result. + Transparency may increase, as if the icons were blended with ICON_ADD. You may supply a color in place of an icon. icon/MaxColors(icon) - The icon is blended with a second icon where the maximum of each RGB pixel is the result. - Opacity may increase, as if the icons were blended with ICON_OR. You may supply a color in place of an icon. + The icon is blended with a second icon where the maximum of each RGB pixel is the result. + Opacity may increase, as if the icons were blended with ICON_OR. You may supply a color in place of an icon. icon/Opaque(background = "#000000") - All alpha values are set to 255 throughout the icon. Transparent pixels become black, or whatever background color you specify. + All alpha values are set to 255 throughout the icon. Transparent pixels become black, or whatever background color you specify. icon/BecomeAlphaMask() - You can convert a simple grayscale icon into an alpha mask to use with other icons very easily with this proc. - The black parts become transparent, the white parts stay white, and anything in between becomes a translucent shade of white. + You can convert a simple grayscale icon into an alpha mask to use with other icons very easily with this proc. + The black parts become transparent, the white parts stay white, and anything in between becomes a translucent shade of white. icon/AddAlphaMask(mask) - The alpha values of the mask icon will be blended with the current icon. Anywhere the mask is opaque, - the current icon is untouched. Anywhere the mask is transparent, the current icon becomes transparent. - Where the mask is translucent, the current icon becomes more transparent. + The alpha values of the mask icon will be blended with the current icon. Anywhere the mask is opaque, + the current icon is untouched. Anywhere the mask is transparent, the current icon becomes transparent. + Where the mask is translucent, the current icon becomes more transparent. icon/UseAlphaMask(mask, mode) - Sometimes you may want to take the alpha values from one icon and use them on a different icon. - This proc will do that. Just supply the icon whose alpha mask you want to use, and src will change - so it has the same colors as before but uses the mask for opacity. + Sometimes you may want to take the alpha values from one icon and use them on a different icon. + This proc will do that. Just supply the icon whose alpha mask you want to use, and src will change + so it has the same colors as before but uses the mask for opacity. COLOR MANAGEMENT AND HSV RGB isn't the only way to represent color. Sometimes it's more useful to work with a model called HSV, which stands for hue, saturation, and value. - * The hue of a color describes where it is along the color wheel. It goes from red to yellow to green to - cyan to blue to magenta and back to red. - * The saturation of a color is how much color is in it. A color with low saturation will be more gray, - and with no saturation at all it is a shade of gray. - * The value of a color determines how bright it is. A high-value color is vivid, moderate value is dark, - and no value at all is black. + * The hue of a color describes where it is along the color wheel. It goes from red to yellow to green to + cyan to blue to magenta and back to red. + * The saturation of a color is how much color is in it. A color with low saturation will be more gray, + and with no saturation at all it is a shade of gray. + * The value of a color determines how bright it is. A high-value color is vivid, moderate value is dark, + and no value at all is black. Just as BYOND uses "#rrggbb" to represent RGB values, a similar format is used for HSV: "#hhhssvv". The hue is three hex digits because it ranges from 0 to 0x5FF. - * 0 to 0xFF - red to yellow - * 0x100 to 0x1FF - yellow to green - * 0x200 to 0x2FF - green to cyan - * 0x300 to 0x3FF - cyan to blue - * 0x400 to 0x4FF - blue to magenta - * 0x500 to 0x5FF - magenta to red + * 0 to 0xFF - red to yellow + * 0x100 to 0x1FF - yellow to green + * 0x200 to 0x2FF - green to cyan + * 0x300 to 0x3FF - cyan to blue + * 0x400 to 0x4FF - blue to magenta + * 0x500 to 0x5FF - magenta to red Knowing this, you can figure out that red is "#000ffff" in HSV format, which is hue 0 (red), saturation 255 (as colorful as possible), value 255 (as bright as possible). Green is "#200ffff" and blue is "#400ffff". @@ -78,42 +78,42 @@ More than one HSV color can match the same RGB color. Here are some procs you can use for color management: ReadRGB(rgb) - Takes an RGB string like "#ffaa55" and converts it to a list such as list(255,170,85). If an RGBA format is used - that includes alpha, the list will have a fourth item for the alpha value. + Takes an RGB string like "#ffaa55" and converts it to a list such as list(255,170,85). If an RGBA format is used + that includes alpha, the list will have a fourth item for the alpha value. hsv(hue, sat, val, apha) - Counterpart to rgb(), this takes the values you input and converts them to a string in "#hhhssvv" or "#hhhssvvaa" - format. Alpha is not included in the result if null. + Counterpart to rgb(), this takes the values you input and converts them to a string in "#hhhssvv" or "#hhhssvvaa" + format. Alpha is not included in the result if null. ReadHSV(rgb) - Takes an HSV string like "#100FF80" and converts it to a list such as list(256,255,128). If an HSVA format is used that - includes alpha, the list will have a fourth item for the alpha value. + Takes an HSV string like "#100FF80" and converts it to a list such as list(256,255,128). If an HSVA format is used that + includes alpha, the list will have a fourth item for the alpha value. RGBtoHSV(rgb) - Takes an RGB or RGBA string like "#ffaa55" and converts it into an HSV or HSVA color such as "#080aaff". + Takes an RGB or RGBA string like "#ffaa55" and converts it into an HSV or HSVA color such as "#080aaff". HSVtoRGB(hsv) - Takes an HSV or HSVA string like "#080aaff" and converts it into an RGB or RGBA color such as "#ff55aa". + Takes an HSV or HSVA string like "#080aaff" and converts it into an RGB or RGBA color such as "#ff55aa". BlendRGB(rgb1, rgb2, amount) - Blends between two RGB or RGBA colors using regular RGB blending. If amount is 0, the first color is the result; - if 1, the second color is the result. 0.5 produces an average of the two. Values outside the 0 to 1 range are allowed as well. - The returned value is an RGB or RGBA color. + Blends between two RGB or RGBA colors using regular RGB blending. If amount is 0, the first color is the result; + if 1, the second color is the result. 0.5 produces an average of the two. Values outside the 0 to 1 range are allowed as well. + The returned value is an RGB or RGBA color. BlendHSV(hsv1, hsv2, amount) - Blends between two HSV or HSVA colors using HSV blending, which tends to produce nicer results than regular RGB - blending because the brightness of the color is left intact. If amount is 0, the first color is the result; if 1, - the second color is the result. 0.5 produces an average of the two. Values outside the 0 to 1 range are allowed as well. - The returned value is an HSV or HSVA color. + Blends between two HSV or HSVA colors using HSV blending, which tends to produce nicer results than regular RGB + blending because the brightness of the color is left intact. If amount is 0, the first color is the result; if 1, + the second color is the result. 0.5 produces an average of the two. Values outside the 0 to 1 range are allowed as well. + The returned value is an HSV or HSVA color. BlendRGBasHSV(rgb1, rgb2, amount) - Like BlendHSV(), but the colors used and the return value are RGB or RGBA colors. The blending is done in HSV form. + Like BlendHSV(), but the colors used and the return value are RGB or RGBA colors. The blending is done in HSV form. HueToAngle(hue) - Converts a hue to an angle range of 0 to 360. Angle 0 is red, 120 is green, and 240 is blue. + Converts a hue to an angle range of 0 to 360. Angle 0 is red, 120 is green, and 240 is blue. AngleToHue(hue) - Converts an angle to a hue in the valid range. + Converts an angle to a hue in the valid range. RotateHue(hsv, angle) - Takes an HSV or HSVA value and rotates the hue forward through red, green, and blue by an angle from 0 to 360. - (Rotating red by 60� produces yellow.) The result is another HSV or HSVA color with the same saturation and value - as the original, but a different hue. + Takes an HSV or HSVA value and rotates the hue forward through red, green, and blue by an angle from 0 to 360. + (Rotating red by 60� produces yellow.) The result is another HSV or HSVA color with the same saturation and value + as the original, but a different hue. GrayScale(rgb) - Takes an RGB or RGBA color and converts it to grayscale. Returns an RGB or RGBA string. + Takes an RGB or RGBA color and converts it to grayscale. Returns an RGB or RGBA string. ColorTone(rgb, tone) - Similar to GrayScale(), this proc converts an RGB or RGBA color to a range of black -> tone -> white instead of - using strict shades of gray. The tone value is an RGB color; any alpha value is ignored. + Similar to GrayScale(), this proc converts an RGB or RGBA color to a range of black -> tone -> white instead of + using strict shades of gray. The tone value is an RGB color; any alpha value is ignored. */ /* diff --git a/code/_helpers/mouse.dm b/code/_helpers/mouse.dm index 84b6dc827a4..a14ed4b22a4 100644 --- a/code/_helpers/mouse.dm +++ b/code/_helpers/mouse.dm @@ -13,4 +13,4 @@ testing("X: [.["icon-x"]], Y: [.["icon-y"]]") #endif return list("icon-x" = Clamp(text2num(.["icon-x"]), 0, lim_x), - "icon-y" = Clamp(text2num(.["icon-y"]), 0, lim_y)) \ No newline at end of file + "icon-y" = Clamp(text2num(.["icon-y"]), 0, lim_y)) diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm index 6f5281e2445..82d06e94186 100644 --- a/code/_helpers/text.dm +++ b/code/_helpers/text.dm @@ -85,11 +85,10 @@ #define SYMBOLS_DETECTED_NEW_WORD 5 // symbols that we will interpret as the start of a new word /** - * Filters out undesirable characters from names. - * - * * allow_numbers - allows numbers and common special characters - used for silicon/other weird things names - */ - + * Filters out undesirable characters from names. + * + * * allow_numbers - allows numbers and common special characters - used for silicon/other weird things names + */ /proc/sanitizeName(input, max_length = MAX_NAME_LEN, allow_numbers = TRUE) if(!input) return //Rejects the input if it is null diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index d73bea5c4b5..891d141adae 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -263,7 +263,7 @@ Turf and target are seperate in case you want to teleport some distance from a t #undef LOCATE_COORDS -//Returns whether or not a player is a guest using their ckey as an input +///Returns whether or not a player is a guest using their ckey as an input /proc/IsGuestKey(key) if (findtext(key, "Guest-", 1, 7) != 1) //was findtextEx return 0 @@ -279,7 +279,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return 0 return 1 -//Ensure the frequency is within bounds of what it should be sending/recieving at +///Ensure the frequency is within bounds of what it should be sending/recieving at /proc/sanitize_frequency(var/f, var/low = PUBLIC_LOW_FREQ, var/high = PUBLIC_HIGH_FREQ) f = round(f) f = max(low, f) @@ -288,15 +288,15 @@ Turf and target are seperate in case you want to teleport some distance from a t f += 1 return f -//Turns 1479 into 147.9 +///Turns 1479 into 147.9 /proc/format_frequency(var/f) return "[round(f / 10)].[f % 10]" -//Picks a string of symbols to display as the law number for hacked or ion laws +///Picks a string of symbols to display as the law number for hacked or ion laws /proc/ionnum() return "[pick("1","2","3","4","5","6","7","8","9","0")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")]" -//When an AI is activated, it can choose from a list of non-slaved borgs to have as a slave. +///When an AI is activated, it can choose from a list of non-slaved borgs to have as a slave. /proc/freeborg() var/select = null var/list/borgs = list() @@ -310,7 +310,7 @@ Turf and target are seperate in case you want to teleport some distance from a t select = input("Unshackled borg signals detected:", "Borg selection", null, null) as null|anything in borgs return borgs[select] -//When a borg is activated, it can choose which AI it wants to be slaved to +///When a borg is activated, it can choose which AI it wants to be slaved to /proc/active_ais() . = list() for(var/mob/living/silicon/ai/A in living_mob_list) @@ -321,7 +321,7 @@ Turf and target are seperate in case you want to teleport some distance from a t . += A return . -//Find an active ai with the least borgs. VERBOSE PROCNAME HUH! +///Find an active ai with the least borgs. VERBOSE PROCNAME HUH! /proc/select_active_ai_with_fewest_borgs() var/mob/living/silicon/ai/selected var/list/active = active_ais() @@ -366,7 +366,7 @@ Turf and target are seperate in case you want to teleport some distance from a t new_list += Dead_list return new_list -//Returns a list of all mobs with their name +///Returns a list of all mobs with their name /proc/getmobs() var/list/mobs = sortmobs() @@ -392,7 +392,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return creatures -//Orders mobs by type then by name +///Orders mobs by type then by name /proc/sortmobs() var/list/moblist = list() var/list/sortmob = sortAtom(mob_list) @@ -424,15 +424,17 @@ Turf and target are seperate in case you want to teleport some distance from a t // mob_list.Add(M) return moblist -//Forces a variable to be posative +///Forces a variable to be posative /proc/modulus(var/M) if(M >= 0) return M if(M < 0) return -M -// returns the turf located at the map edge in the specified direction relative to A -// used for mass driver +/** + * Returns the turf located at the map edge in the specified direction relative to A + * used for mass driver + */ /proc/get_edge_target_turf(var/atom/A, var/direction) var/turf/target = locate(A.x, A.y, A.z) @@ -453,10 +455,12 @@ Turf and target are seperate in case you want to teleport some distance from a t return target -// returns turf relative to A in given direction at set range -// result is bounded to map size -// note range is non-pythagorean -// used for disposal system +/** + * returns turf relative to A in given direction at set range + * result is bounded to map size + * note range is non-pythagorean + * used for disposal system + */ /proc/get_ranged_target_turf(var/atom/A, var/direction, var/range) var/x = A.x @@ -480,25 +484,25 @@ Turf and target are seperate in case you want to teleport some distance from a t var/y = min(world.maxy, max(1, A.y + dy)) return locate(x,y,A.z) -//Makes sure MIDDLE is between LOW and HIGH. If not, it adjusts it. Returns the adjusted value. +///Makes sure MIDDLE is between LOW and HIGH. If not, it adjusts it. Returns the adjusted value. /proc/between(var/low, var/middle, var/high) return max(min(middle, high), low) -//returns random gauss number +///Returns random gauss number /proc/GaussRand(var/sigma) - var/x,y,rsq - do - x=2*rand()-1 - y=2*rand()-1 - rsq=x*x+y*y - while(rsq>1 || !rsq) - return sigma*y*sqrt(-2*log(rsq)/rsq) - -//returns random gauss number, rounded to 'roundto' + var/x,y,rsq + do + x=2*rand()-1 + y=2*rand()-1 + rsq=x*x+y*y + while(rsq>1 || !rsq) + return sigma*y*sqrt(-2*log(rsq)/rsq) + +///Returns random gauss number, rounded to 'roundto' /proc/GaussRandRound(var/sigma,var/roundto) return round(GaussRand(sigma),roundto) -//Step-towards method of determining whether one atom can see another. Similar to viewers() +///Step-towards method of determining whether one atom can see another. Similar to viewers() /proc/can_see(var/atom/source, var/atom/target, var/length=5) // I couldn't be arsed to do actual raycasting :I This is horribly inaccurate. var/turf/current = get_turf(source) var/turf/target_turf = get_turf(target) diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm index f584a922d4a..66e847312c2 100644 --- a/code/_onclick/drag_drop.dm +++ b/code/_onclick/drag_drop.dm @@ -13,6 +13,6 @@ INVOKE_ASYNC(over, TYPE_PROC_REF(/atom, MouseDrop_T), src, usr, src_location, over_location, src_control, over_control, params) -// receive a mousedrop +///Receive a mousedrop /atom/proc/MouseDrop_T(atom/dropping, mob/user, src_location, over_location, src_control, over_control, params) - return \ No newline at end of file + return diff --git a/code/_onclick/hud/borer_hud.dm b/code/_onclick/hud/borer_hud.dm index 407ffb559c5..94dacd194e4 100644 --- a/code/_onclick/hud/borer_hud.dm +++ b/code/_onclick/hud/borer_hud.dm @@ -10,4 +10,4 @@ var/mob/living/simple_animal/borer/B = mymob B.chem_hud = C - mymob.client.screen += src.adding \ No newline at end of file + mymob.client.screen += src.adding diff --git a/code/_onclick/hud/captive_brain_hud.dm b/code/_onclick/hud/captive_brain_hud.dm index 8a25ab24dbc..1f8922d74ce 100644 --- a/code/_onclick/hud/captive_brain_hud.dm +++ b/code/_onclick/hud/captive_brain_hud.dm @@ -12,4 +12,4 @@ resist.layer = SCREEN_LAYER adding += resist - mymob.client.screen += src.adding \ No newline at end of file + mymob.client.screen += src.adding diff --git a/code/_onclick/hud/morph.dm b/code/_onclick/hud/morph.dm index 77b56463fb1..5575d74e6be 100644 --- a/code/_onclick/hud/morph.dm +++ b/code/_onclick/hud/morph.dm @@ -27,4 +27,4 @@ hotkeybuttons += resist mymob.client.screen = null - mymob.client.screen += list(mov_intent, mymob.healths, mymob.zone_sel, resist) \ No newline at end of file + mymob.client.screen += list(mov_intent, mymob.healths, mymob.zone_sel, resist) diff --git a/code/_onclick/hud/screen_object_types/borer.dm b/code/_onclick/hud/screen_object_types/borer.dm index 73888dbc65a..80d50b15058 100644 --- a/code/_onclick/hud/screen_object_types/borer.dm +++ b/code/_onclick/hud/screen_object_types/borer.dm @@ -11,4 +11,4 @@ /obj/screen/borer/chemicals/Click(var/location, var/control, var/params) if(istype(usr, /mob/living/simple_animal/borer)) var/mob/living/simple_animal/borer/B = usr - to_chat(usr, SPAN_NOTICE("You have [B.chemicals]u of chemicals to use for your abilities.")) \ No newline at end of file + to_chat(usr, SPAN_NOTICE("You have [B.chemicals]u of chemicals to use for your abilities.")) diff --git a/code/_onclick/hud/screen_object_types/vampire.dm b/code/_onclick/hud/screen_object_types/vampire.dm index 51f04b93f8d..1e36e783258 100644 --- a/code/_onclick/hud/screen_object_types/vampire.dm +++ b/code/_onclick/hud/screen_object_types/vampire.dm @@ -33,4 +33,4 @@ /obj/screen/vampire/suck/Click(var/location, var/control, var/params) if(ishuman(usr)) var/mob/living/carbon/human/H = usr - H.vampire_drain_blood() \ No newline at end of file + H.vampire_drain_blood() diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 5dd6105c2a7..fb5b0817957 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -1,17 +1,17 @@ -// Generic damage proc (slimes and monkeys). +///Generic damage proc (slimes and monkeys). /atom/proc/attack_generic(mob/user as mob) return 0 -// generic click on for pai +///Generic click on for pai /atom/proc/attack_pai(mob/user) return -/* - Humans: - Adds an exception for gloves, to allow special glove types like the ninja ones. - - Otherwise pretty standard. -*/ +/** + * Humans: + * Adds an exception for gloves, to allow special glove types like the ninja ones. + * + * Otherwise pretty standard. + */ /mob/living/carbon/human/UnarmedAttack(var/atom/A, var/proximity) if(!..()) @@ -24,7 +24,7 @@ var/obj/item/clothing/glasses/GS = glasses if(istype(G) && G.Touch(A,src,1)) return - + else if(istype(GS) && GS.Look(A,src,1)) // for goggles return @@ -45,10 +45,10 @@ /mob/living/carbon/human/RangedAttack(var/atom/A) var/obj/item/clothing/gloves/GV = gloves var/obj/item/clothing/glasses/GS = glasses - + if(istype(GS) && GS.Look(A,src,0)) // for goggles return - + if(istype(GV) && GV.Touch(A,src,0)) // for magic gloves return @@ -175,4 +175,4 @@ /mob/living/CtrlClickOn(var/atom/A) . = ..() if(!. && a_intent == I_GRAB && length(available_maneuvers)) - . = perform_maneuver(prepared_maneuver || available_maneuvers[1], A) \ No newline at end of file + . = perform_maneuver(prepared_maneuver || available_maneuvers[1], A) diff --git a/code/controllers/master/failsafe.dm b/code/controllers/master/failsafe.dm index 2faf9e4b260..9c52e58e277 100644 --- a/code/controllers/master/failsafe.dm +++ b/code/controllers/master/failsafe.dm @@ -1,13 +1,12 @@ - /** - * Failsafe - * - * Pretty much pokes the MC to make sure it's still alive. - **/ - #define FAILSAFE_MSG(msg) admin_notice("FAILSAFE: [msg]", R_DEBUG|R_ADMIN|R_DEV) var/datum/controller/failsafe/Failsafe +/** + * #Failsafe Controller + * + * Pretty much pokes the MC to make sure it's still alive. + */ /datum/controller/failsafe // This thing pretty much just keeps poking the master controller name = "Failsafe" diff --git a/code/controllers/master/master.dm b/code/controllers/master/master.dm index fc52cf70ad0..0abc65114f2 100644 --- a/code/controllers/master/master.dm +++ b/code/controllers/master/master.dm @@ -1,17 +1,16 @@ - /** - * StonedMC - * - * Designed to properly split up a given tick among subsystems - * Note: if you read parts of this code and think "why is it doing it that way" - * Odds are, there is a reason - * - **/ var/datum/controller/master/Master = new() //current tick limit, assigned by the queue controller before running a subsystem. //used by check_tick as well so that the procs subsystems call can obey that SS's tick limits var/CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING +/** + * StonedMC + * + * Designed to properly split up a given tick among subsystems + * Note: if you read parts of this code and think "why is it doing it that way" + * Odds are, there is a reason + */ /datum/controller/master name = "Master" diff --git a/code/controllers/subsystems/economy.dm b/code/controllers/subsystems/economy.dm index cd9bfdd8c3b..6413930ce88 100644 --- a/code/controllers/subsystems/economy.dm +++ b/code/controllers/subsystems/economy.dm @@ -35,7 +35,8 @@ SUBSYSTEM_DEF(economy) /** * Account Creation */ - //Create the station Account + +///Create the station Account /datum/controller/subsystem/economy/proc/create_station_account() if(station_account) return FALSE diff --git a/code/controllers/subsystems/evacuation/evacuation_option.dm b/code/controllers/subsystems/evacuation/evacuation_option.dm index c4012ba185c..250766112fb 100644 --- a/code/controllers/subsystems/evacuation/evacuation_option.dm +++ b/code/controllers/subsystems/evacuation/evacuation_option.dm @@ -7,4 +7,4 @@ var/abandon_ship = FALSE /datum/evacuation_option/proc/execute(var/mob/user) - return \ No newline at end of file + return diff --git a/code/controllers/subsystems/evacuation/evacuation_pods.dm b/code/controllers/subsystems/evacuation/evacuation_pods.dm index 947a74ea088..280be058240 100644 --- a/code/controllers/subsystems/evacuation/evacuation_pods.dm +++ b/code/controllers/subsystems/evacuation/evacuation_pods.dm @@ -181,4 +181,4 @@ #undef EVAC_OPT_ABANDON_SHIP #undef EVAC_OPT_BLUESPACE_JUMP #undef EVAC_OPT_CANCEL_ABANDON_SHIP -#undef EVAC_OPT_CANCEL_BLUESPACE_JUMP \ No newline at end of file +#undef EVAC_OPT_CANCEL_BLUESPACE_JUMP diff --git a/code/controllers/subsystems/evacuation/evacuation_shuttle.dm b/code/controllers/subsystems/evacuation/evacuation_shuttle.dm index 18b7b7a6a30..dc913e77ce1 100644 --- a/code/controllers/subsystems/evacuation/evacuation_shuttle.dm +++ b/code/controllers/subsystems/evacuation/evacuation_shuttle.dm @@ -155,4 +155,4 @@ cancel_call_proc(user) #undef EVAC_OPT_CALL_SHUTTLE -#undef EVAC_OPT_RECALL_SHUTTLE \ No newline at end of file +#undef EVAC_OPT_RECALL_SHUTTLE diff --git a/code/controllers/subsystems/processing/nanoui.dm b/code/controllers/subsystems/processing/nanoui.dm index e1bede3dab0..d7a5ed71c0a 100644 --- a/code/controllers/subsystems/processing/nanoui.dm +++ b/code/controllers/subsystems/processing/nanoui.dm @@ -8,18 +8,20 @@ PROCESSING_SUBSYSTEM_DEF(nanoui) // NanoUI stuff. var/list/open_uis = list() - /** - * Get an open /nanoui ui for the current user, src_object and ui_key and try to update it with data - * - * @param user /mob The mob who opened/owns the ui - * @param src_object /obj|/mob The obj or mob which the ui belongs to - * @param ui_key string A string key used for the ui - * @param ui /datum/nanoui An existing instance of the ui (can be null) - * @param data list The data to be passed to the ui, if it exists - * @param force_open boolean The ui is being forced to (re)open, so close ui if it exists (instead of updating) - * - * @return /nanoui Returns the found ui, for null if none exists - */ +/datum/controller/subsystem/processing/nanoui/New() + NEW_SS_GLOBAL(SSnanoui) + +/** + * Get an open /nanoui ui for the current user, src_object and ui_key and try to update it with data + * + * * user - /mob The mob who opened/owns the ui + * * src_object - /obj|/mob The obj or mob which the ui belongs to + * * ui_key - A string key used for the ui + * * data - List, the data to be passed to the ui, if it exists + * * force_open - Boolean, the ui is being forced to (re)open, so close ui if it exists (instead of updating) + * + * Returns the `/nanoui` found ui, for null if none exists + */ /datum/controller/subsystem/processing/nanoui/proc/try_update_ui(mob/user, src_object, ui_key, datum/nanoui/ui, data, force_open = FALSE) if (!ui) // no ui has been passed, so we'll search for one ui = get_open_ui(user, src_object, ui_key) @@ -35,15 +37,13 @@ PROCESSING_SUBSYSTEM_DEF(nanoui) return null - /** - * Get an open /nanoui ui for the current user, src_object and ui_key - * - * @param user /mob The mob who opened/owns the ui - * @param src_object /obj|/mob The obj or mob which the ui belongs to - * @param ui_key string A string key used for the ui - * - * @return /nanoui Returns the found ui, or null if none exists - */ +/** + * Get an open /nanoui ui for the current user, src_object and ui_key + * + * * user - The `/mob` who opened/owns the ui + * * src_object - The `/obj` or `/mob` which the ui belongs to + * * ui_key - A string key used for the ui + */ /datum/controller/subsystem/processing/nanoui/proc/get_open_ui(mob/user, src_object, ui_key) var/src_object_key = SOFTREF(src_object) if (!LAZYLEN(open_uis[src_object_key]) || !LAZYLEN(open_uis[src_object_key][ui_key])) @@ -56,13 +56,13 @@ PROCESSING_SUBSYSTEM_DEF(nanoui) //testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - ui not found") return null - /** - * Update all /nanoui uis attached to src_object - * - * @param src_object /obj|/mob The obj or mob which the uis are attached to - * - * @return int The number of uis updated - */ +/** + * Update all `/nanoui` uis attached to src_object + * + * * src_object - The `/obj` or `/mob` which the uis are attached to + * + * Returns the number of UIs updated + */ /datum/controller/subsystem/processing/nanoui/proc/update_uis(src_object) var/src_object_key = SOFTREF(src_object) if (!LAZYLEN(open_uis[src_object_key])) @@ -77,13 +77,13 @@ PROCESSING_SUBSYSTEM_DEF(nanoui) ui.process(1) .++ - /** - * Close all /nanoui uis attached to src_object - * - * @param src_object /obj|/mob The obj or mob which the uis are attached to - * - * @return int The number of uis close - */ +/** + * Close all `/nanoui` uis attached to src_object + * + * * src_object - The `/obj` or `/mob` which the uis are attached to + * + * Returns the number of UIs closed + */ /datum/controller/subsystem/processing/nanoui/proc/close_uis(src_object) var/src_object_key = SOFTREF(src_object) if (!open_uis[src_object_key] || !islist(open_uis[src_object_key])) @@ -98,15 +98,15 @@ PROCESSING_SUBSYSTEM_DEF(nanoui) ui.close() .++ - /** - * Update /nanoui uis belonging to user - * - * @param user /mob The mob who owns the uis - * @param src_object /obj|/mob If src_object is provided, only update uis which are attached to src_object (optional) - * @param ui_key string If ui_key is provided, only update uis with a matching ui_key (optional) - * - * @return int The number of uis updated - */ +/** + * Update /nanoui uis belonging to user + * + * * user - The `/mob` who owns the uis + * * src_object - An `/obj` or `/mob` that, if is provided, only update uis which are attached to it (optional) + * * ui_key - A string, if ui_key is provided, only update uis with a matching ui_key (optional) + * + * Returns the number of UIs updated + */ /datum/controller/subsystem/processing/nanoui/proc/update_user_uis(mob/user, src_object, ui_key) if (!LAZYLEN(user.open_uis)) return 0 // has no open uis @@ -130,14 +130,12 @@ PROCESSING_SUBSYSTEM_DEF(nanoui) //testing("nanomanager/close_user_uis mob [user.name] closed [open_uis.len] of [.] uis") - /** - * Add a /nanoui ui to the list of open uis - * This is called by the /nanoui open() proc - * - * @param ui /nanoui The ui to add - * - * @return nothing - */ +/** + * Add a /nanoui ui to the list of open uis + * This is called by the /nanoui open() proc + * + * * ui - The `/nanoui` ui to add + */ /datum/controller/subsystem/processing/nanoui/proc/ui_opened(datum/nanoui/ui) var/src_object_key = SOFTREF(ui.src_object) LAZYINITLIST(open_uis[src_object_key]) @@ -147,14 +145,14 @@ PROCESSING_SUBSYSTEM_DEF(nanoui) START_PROCESSING(SSnanoui, ui) //testing("nanomanager/ui_opened mob [ui.user.name] [ui.src_object:name] [ui.ui_key] - user.open_uis [ui.user.open_uis.len] | uis [uis.len] | processing_uis [processing_uis.len]") - /** - * Remove a /nanoui ui from the list of open uis - * This is called by the /nanoui close() proc - * - * @param ui /nanoui The ui to remove - * - * @return int 0 if no ui was removed, 1 if removed successfully - */ +/** + * Remove a /nanoui ui from the list of open uis + * This is called by the /nanoui close() proc + * + * * ui - A `/nanoui` to remove + * + * Returns FALSE if no ui was removed, TRUE if removed successfully + */ /datum/controller/subsystem/processing/nanoui/proc/ui_closed(datum/nanoui/ui) var/src_object_key = SOFTREF(ui.src_object) var/ui_key = ui.ui_key @@ -179,26 +177,22 @@ PROCESSING_SUBSYSTEM_DEF(nanoui) return 1 - /** - * This is called on user logout - * Closes/clears all uis attached to the user's /mob - * - * @param user /mob The user's mob - * - * @return nothing - */ +/** + * This is called on user logout + * Closes/clears all uis attached to the user's `/mob` + * + * * user - The user's `/mob` + */ /datum/controller/subsystem/processing/nanoui/proc/user_logout(mob/user) return close_user_uis(user) - /** - * This is called when a player transfers from one mob to another - * Transfers all open UIs to the new mob - * - * @param oldMob /mob The user's old mob - * @param newMob /mob The user's new mob - * - * @return nothing - */ +/** + * This is called when a player transfers from one mob to another + * Transfers all open UIs to the new mob + * + * * oldMob - The user's old `/mob` + * * newMob - The user's new `/mob` + */ /datum/controller/subsystem/processing/nanoui/proc/user_transferred(mob/oldMob, mob/newMob) //testing("nanomanager/user_transferred from mob [oldMob.name] to mob [newMob.name]") if (!oldMob || !LAZYLEN(oldMob.open_uis) || !LAZYLEN(open_uis)) diff --git a/code/controllers/subsystems/radio.dm b/code/controllers/subsystems/radio.dm index e6db57d55ae..32e39f0b213 100644 --- a/code/controllers/subsystems/radio.dm +++ b/code/controllers/subsystems/radio.dm @@ -1,63 +1,64 @@ /* - HOW IT WORKS + HOW IT WORKS SSradio is a subsystem responsible for maintaining all radio transmissions, think about it as about "ether". - Note that walkie-talkie, intercoms and headsets handle transmission using nonstandard way. - procs: + Note that walkie-talkie, intercoms and headsets handle transmission using nonstandard way. + procs: add_object(obj/device as obj, var/new_frequency as num, var/filter as text|null = null) - Adds listening object. - parameters: + Adds listening object. + parameters: device - device receiving signals, must have proc receive_signal (see description below). - one device may listen several frequencies, but not same frequency twice. + one device may listen several frequencies, but not same frequency twice. new_frequency - see possibly frequencies below; filter - thing for optimization. Optional, but recommended. - All filters should be consolidated in this file, see defines later. - Device without listening filter will receive all signals (on specified frequency). - Device with filter will receive any signals sent without filter. - Device with filter will not receive any signals sent with different filter. - returns: - Reference to frequency object. + All filters should be consolidated in this file, see defines later. + Device without listening filter will receive all signals (on specified frequency). + Device with filter will receive any signals sent without filter. + Device with filter will not receive any signals sent with different filter. + returns: + Reference to frequency object. remove_object (obj/device, old_frequency) - Obliviously, after calling this proc, device will not receive any signals on old_frequency. - Other frequencies will left unaffected. + Obliviously, after calling this proc, device will not receive any signals on old_frequency. + Other frequencies will left unaffected. - return_frequency(var/frequency as num) - returns: - Reference to frequency object. Use it if you need to send and do not need to listen. + return_frequency(var/frequency as num) + returns: + Reference to frequency object. Use it if you need to send and do not need to listen. - radio_frequency is a global object maintaining list of devices that listening specific frequency. - procs: + radio_frequency is a global object maintaining list of devices that listening specific frequency. + + procs: post_signal(obj/source as obj|null, datum/signal/signal, var/filter as text|null = null, var/range as num|null = null) - Sends signal to all devices that wants such signal. - parameters: - source - object, emitted signal. Usually, devices will not receive their own signals. - signal - see description below. - filter - described above. - range - radius of regular byond's square circle on that z-level. null means everywhere, on all z-levels. - - obj/proc/receive_signal(datum/signal/signal, var/receive_method as num, var/receive_param) - Handler from received signals. By default does nothing. Define your own for your object. - Avoid of sending signals directly from this proc, use spawn(-1). DO NOT use sleep() here or call procs that sleep please. If you must, use spawn() - parameters: - signal - see description below. Extract all needed data from the signal before doing sleep(), spawn() or return! - receive_method - may be TRANSMISSION_WIRE or TRANSMISSION_RADIO. - TRANSMISSION_WIRE is currently unused. - receive_param - for TRANSMISSION_RADIO here comes frequency. - - datum/signal - vars: - source - an object that emitted signal. Used for debug and bearing. - data - list with transmitting data. Usual use pattern: + Sends signal to all devices that wants such signal. + parameters: + source - object, emitted signal. Usually, devices will not receive their own signals. + signal - see description below. + filter - described above. + range - radius of regular byond's square circle on that z-level. null means everywhere, on all z-levels. + + obj/proc/receive_signal(datum/signal/signal, var/receive_method as num, var/receive_param) + Handler from received signals. By default does nothing. Define your own for your object. + Avoid of sending signals directly from this proc, use spawn(-1). DO NOT use sleep() here or call procs that sleep please. If you must, use spawn() + parameters: + signal - see description below. Extract all needed data from the signal before doing sleep(), spawn() or return! + receive_method - may be TRANSMISSION_WIRE or TRANSMISSION_RADIO. + TRANSMISSION_WIRE is currently unused. + receive_param - for TRANSMISSION_RADIO here comes frequency. + + datum/signal + vars: + source + an object that emitted signal. Used for debug and bearing. + data + list with transmitting data. Usual use pattern: data["msg"] = "hello world" encryption - Some number symbolizing "encryption key". - Note that game actually do not use any cryptography here. - If receiving object don't know right key, it must ignore encrypted signal in its receive_signal. + Some number symbolizing "encryption key". + Note that game actually do not use any cryptography here. + If receiving object don't know right key, it must ignore encrypted signal in its receive_signal. */ diff --git a/code/controllers/subsystems/timer.dm b/code/controllers/subsystems/timer.dm index f67038e3c6b..594e9ba9adb 100644 --- a/code/controllers/subsystems/timer.dm +++ b/code/controllers/subsystems/timer.dm @@ -8,14 +8,14 @@ #define TIMER_ID_MAX (2**24) /** - * # Timer Subsystem - * - * Handles creation, callbacks, and destruction of timed events. - * - * It is important to understand the buckets used in the timer subsystem are just a series of circular doubly-linked - * lists. The object at a given index in bucket_list is a /datum/timedevent, the head of a circular list, which has prev - * and next references for the respective elements in that bucket's circular list. - */ + * # Timer Subsystem + * + * Handles creation, callbacks, and destruction of timed events. + * + * It is important to understand the buckets used in the timer subsystem are just a series of circular doubly-linked + * lists. The object at a given index in bucket_list is a /datum/timedevent, the head of a circular list, which has prev + * and next references for the respective elements in that bucket's circular list. + */ SUBSYSTEM_DEF(timer) name = "Timer" wait = 1 //SS_TICKER subsystem, so wait is in ticks @@ -228,8 +228,8 @@ SUBSYSTEM_DEF(timer) . += ", NO CALLBACK" /** - * Destroys the existing buckets and creates new buckets from the existing timed events - */ + * Destroys the existing buckets and creates new buckets from the existing timed events + */ /datum/controller/subsystem/timer/proc/reset_buckets() LOG_DEBUG("Timer buckets have been reset, this may cause timers to lag") bucket_reset_count++ @@ -337,14 +337,14 @@ SUBSYSTEM_DEF(timer) bucket_list |= SStimer.bucket_list /** - * # Timed Event - * - * This is the actual timer, it contains the callback and necessary data to maintain - * the timer. - * - * See the documentation for the timer subsystem for an explanation of the buckets referenced - * below in next and prev - */ + * # Timed Event + * + * This is the actual timer, it contains the callback and necessary data to maintain + * the timer. + * + * See the documentation for the timer subsystem for an explanation of the buckets referenced + * below in next and prev + */ /datum/timedevent /// ID used for timers when the TIMER_STOPPABLE flag is present var/id @@ -439,8 +439,8 @@ SUBSYSTEM_DEF(timer) return QDEL_HINT_IWILLGC /** - * Removes this timed event from any relevant buckets, or the secondary queue - */ + * Removes this timed event from any relevant buckets, or the secondary queue + */ /datum/timedevent/proc/bucketEject() // Store local references for the bucket list and secondary queue // This is faster than referencing them from the datum itself @@ -477,13 +477,13 @@ SUBSYSTEM_DEF(timer) bucket_joined = FALSE /** - * Attempts to add this timed event to a bucket, will enter the secondary queue - * if there are no appropriate buckets at this time. - * - * Secondary queueing of timed events will occur when the timespan covered by the existing - * buckets is exceeded by the time at which this timed event is scheduled to be invoked. - * If the timed event is tracking client time, it will be added to a special bucket. - */ + * Attempts to add this timed event to a bucket, will enter the secondary queue + * if there are no appropriate buckets at this time. + * + * Secondary queueing of timed events will occur when the timespan covered by the existing + * buckets is exceeded by the time at which this timed event is scheduled to be invoked. + * If the timed event is tracking client time, it will be added to a special bucket. + */ /datum/timedevent/proc/bucketJoin() // Generate debug-friendly name for timer var/static/list/bitfield_flags = list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT", "TIMER_LOOP") @@ -534,8 +534,8 @@ SUBSYSTEM_DEF(timer) bucket_list[bucket_pos] = src /** - * Returns a string of the type of the callback for this timer - */ + * Returns a string of the type of the callback for this timer + */ /datum/timedevent/proc/getcallingtype() . = "ERROR" if (callBack.object == GLOBAL_PROC) diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm index e7e8aa9b1ed..e9ea9b4a7a3 100644 --- a/code/controllers/verbs.dm +++ b/code/controllers/verbs.dm @@ -23,5 +23,5 @@ available_controllers["Evacuation Main Controller"] = evacuation_controller var/css = input("What controller would you like to debug?", "Controllers") as null|anything in available_controllers debug_variables(available_controllers[css]) - + message_admins("Admin [key_name_admin(usr)] is debugging the [css] controller.") diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index f3c27d9a407..fe4def40e92 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -1,40 +1,40 @@ /** - * # Component - * - * The component datum - * - * A component should be a single standalone unit - * of functionality, that works by receiving signals from it's parent - * object to provide some single functionality (i.e a slippery component) - * that makes the object it's attached to cause people to slip over. - * Useful when you want shared behaviour independent of type inheritance - */ + * # Component + * + * The component datum + * + * A component should be a single standalone unit + * of functionality, that works by receiving signals from it's parent + * object to provide some single functionality (i.e a slippery component) + * that makes the object it's attached to cause people to slip over. + * Useful when you want shared behaviour independent of type inheritance + */ /datum/component /// Defines how duplicate existing components are handled when added to a datum /// See `COMPONENT_DUPE_*` definitions for available options var/dupe_mode = COMPONENT_DUPE_HIGHLANDER - + /// The type to check for duplication /// `null` means exact match on `type` (default) /// Any other type means that and all subtypes var/dupe_type - + /// The datum this components belongs to var/datum/parent - + /// Only set to true if you are able to properly transfer this component /// At a minimum RegisterWithParent and UnregisterFromParent should be used /// Make sure you also implement PostTransfer for any post transfer handling var/can_transfer = FALSE /** - * Create a new component. - * - * Additional arguments are passed to [Initialize()][/datum/component/proc/Initialize] - * - * Arguments: - * * datum/P the parent datum this component reacts to signals from - */ + * Create a new component. + * + * Additional arguments are passed to [Initialize()][/datum/component/proc/Initialize] + * + * Arguments: + * * datum/P the parent datum this component reacts to signals from + */ /datum/component/New(list/raw_args) parent = raw_args[1] var/list/arguments = raw_args.Copy(2) @@ -46,17 +46,17 @@ _JoinParent(parent) /** - * Called during component creation with the same arguments as in new excluding parent. - * Do not call `qdel(src)` from this function, `return COMPONENT_INCOMPATIBLE` instead - */ + * Called during component creation with the same arguments as in new excluding parent. + * Do not call `qdel(src)` from this function, `return COMPONENT_INCOMPATIBLE` instead + */ /datum/component/proc/Initialize(...) return /** - * Properly removes the component from `parent` and cleans up references - * Setting `force` makes it not check for and remove the component from the parent - * Setting `silent` deletes the component without sending a `COMSIG_COMPONENT_REMOVING` signal - */ + * Properly removes the component from `parent` and cleans up references + * Setting `force` makes it not check for and remove the component from the parent + * Setting `silent` deletes the component without sending a `COMSIG_COMPONENT_REMOVING` signal + */ /datum/component/Destroy(force=FALSE, silent=FALSE) if(!force && parent) _RemoveFromParent() @@ -66,8 +66,8 @@ return ..() /** - * Internal proc to handle behaviour of components when joining a parent - */ + * Internal proc to handle behaviour of components when joining a parent + */ /datum/component/proc/_JoinParent() var/datum/P = parent //lazy init the parent's dc list @@ -104,8 +104,8 @@ RegisterWithParent() /** - * Internal proc to handle behaviour when being removed from a parent - */ + * Internal proc to handle behaviour when being removed from a parent + */ /datum/component/proc/_RemoveFromParent() var/datum/P = parent var/list/dc = P.datum_components @@ -125,37 +125,37 @@ UnregisterFromParent() /** - * Register the component with the parent object - * - * Use this proc to register with your parent object - * Overridable proc that's called when added to a new parent - */ + * Register the component with the parent object + * + * Use this proc to register with your parent object + * Overridable proc that's called when added to a new parent + */ /datum/component/proc/RegisterWithParent() return /** - * Unregister from our parent object - * - * Use this proc to unregister from your parent object - * Overridable proc that's called when removed from a parent - * * - */ + * Unregister from our parent object + * + * Use this proc to unregister from your parent object + * Overridable proc that's called when removed from a parent + * + */ /datum/component/proc/UnregisterFromParent() return /** - * Register to listen for a signal from the passed in target - * - * This sets up a listening relationship such that when the target object emits a signal - * the source datum this proc is called upon, will recieve a callback to the given proctype - * Return values from procs registered must be a bitfield - * - * Arguments: - * * datum/target The target to listen for signals from - * * sig_type_or_types Either a string signal name, or a list of signal names (strings) - * * proctype The proc to call back when the signal is emitted - * * override If a previous registration exists you must explicitly set this - */ + * Register to listen for a signal from the passed in target + * + * This sets up a listening relationship such that when the target object emits a signal + * the source datum this proc is called upon, will recieve a callback to the given proctype + * Return values from procs registered must be a bitfield + * + * Arguments: + * * datum/target The target to listen for signals from + * * sig_type_or_types Either a string signal name, or a list of signal names (strings) + * * proctype The proc to call back when the signal is emitted + * * override If a previous registration exists you must explicitly set this + */ /datum/proc/RegisterSignal(datum/target, sig_type_or_types, proctype, override = FALSE) if(QDELETED(src) || QDELETED(target)) return @@ -189,15 +189,15 @@ signal_enabled = TRUE /** - * Stop listening to a given signal from target - * - * Breaks the relationship between target and source datum, removing the callback when the signal fires - * Doesn't care if a registration exists or not - * - * Arguments: - * * datum/target Datum to stop listening to signals from - * * sig_typeor_types Signal string key or list of signal keys to stop listening to specifically - */ + * Stop listening to a given signal from target + * + * Breaks the relationship between target and source datum, removing the callback when the signal fires + * Doesn't care if a registration exists or not + * + * Arguments: + * * datum/target Datum to stop listening to signals from + * * sig_typeor_types Signal string key or list of signal keys to stop listening to specifically + */ /datum/proc/UnregisterSignal(datum/target, sig_type_or_types) var/list/lookup = target.comp_lookup if(!signal_procs || !signal_procs[target] || !lookup) @@ -228,47 +228,47 @@ signal_procs -= target /** - * Called on a component when a component of the same type was added to the same parent - * See `/datum/component/var/dupe_mode` - * `C`'s type will always be the same of the called component - */ + * Called on a component when a component of the same type was added to the same parent + * See `/datum/component/var/dupe_mode` + * `C`'s type will always be the same of the called component + */ /datum/component/proc/InheritComponent(datum/component/C, i_am_original) return /** - * Called on a component when a component of the same type was added to the same parent with [COMPONENT_DUPE_SELECTIVE] - * - * See [/datum/component/var/dupe_mode] - * - * `C`'s type will always be the same of the called component - * - * return TRUE if you are absorbing the component, otherwise FALSE if you are fine having it exist as a duplicate component - */ + * Called on a component when a component of the same type was added to the same parent with [COMPONENT_DUPE_SELECTIVE] + * + * See [/datum/component/var/dupe_mode] + * + * `C`'s type will always be the same of the called component + * + * return TRUE if you are absorbing the component, otherwise FALSE if you are fine having it exist as a duplicate component + */ /datum/component/proc/CheckDupeComponent(datum/component/C, ...) return /** - * Callback Just before this component is transferred - * - * Use this to do any special cleanup you might need to do before being deregged from an object - * - */ + * Callback Just before this component is transferred + * + * Use this to do any special cleanup you might need to do before being deregged from an object + * + */ /datum/component/proc/PreTransfer() return /** - * Callback Just after a component is transferred - * - * Use this to do any special setup you need to do after being moved to a new object - * Do not call `qdel(src)` from this function, `return COMPONENT_INCOMPATIBLE` instead - * - */ + * Callback Just after a component is transferred + * + * Use this to do any special setup you need to do after being moved to a new object + * Do not call `qdel(src)` from this function, `return COMPONENT_INCOMPATIBLE` instead + * + */ /datum/component/proc/PostTransfer() return COMPONENT_INCOMPATIBLE //Do not support transfer by default as you must properly support it /** - * Internal proc to create a list of our type and all parent types - */ + * Internal proc to create a list of our type and all parent types + */ /datum/component/proc/_GetInverseTypeList(our_type = type) //we can do this one simple trick var/current_type = parent_type @@ -279,10 +279,10 @@ . += current_type /** - * Internal proc to handle most all of the signaling procedure - * Will runtime if used on datums with an empty component list - * Use the `SEND_SIGNAL` define instead - */ + * Internal proc to handle most all of the signaling procedure + * Will runtime if used on datums with an empty component list + * Use the `SEND_SIGNAL` define instead + */ /datum/proc/_SendSignal(sigtype, list/arguments) var/target = comp_lookup[sigtype] if(!length(target)) @@ -303,12 +303,12 @@ // The type arg is casted so initial works, you shouldn't be passing a real instance into this /** - * Return any component assigned to this datum of the given type - * This will throw an error if it's possible to have more than one component of that type on the parent - * - * Arguments: - * * datum/component/c_type The typepath of the component you want to get a reference to - */ + * Return any component assigned to this datum of the given type + * This will throw an error if it's possible to have more than one component of that type on the parent + * + * Arguments: + * * datum/component/c_type The typepath of the component you want to get a reference to + */ /datum/proc/GetComponent(datum/component/c_type) RETURN_TYPE(c_type) if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED) @@ -322,12 +322,12 @@ // The type arg is casted so initial works, you shouldn't be passing a real instance into this /** - * Return any component assigned to this datum of the exact given type - * This will throw an error if it's possible to have more than one component of that type on the parent - * - * Arguments: - * * datum/component/c_type The typepath of the component you want to get a reference to - */ + * Return any component assigned to this datum of the exact given type + * This will throw an error if it's possible to have more than one component of that type on the parent + * + * Arguments: + * * datum/component/c_type The typepath of the component you want to get a reference to + */ /datum/proc/GetExactComponent(datum/component/c_type) RETURN_TYPE(c_type) if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED) @@ -344,11 +344,11 @@ return null /** - * Get all components of a given type that are attached to this datum - * - * Arguments: - * * c_type The component type path - */ + * Get all components of a given type that are attached to this datum + * + * Arguments: + * * c_type The component type path + */ /datum/proc/GetComponents(c_type) var/list/dc = datum_components if(!dc) @@ -358,12 +358,12 @@ return list(.) /** - * Creates an instance of `new_type` in the datum and attaches to it as parent - * Sends the `COMSIG_COMPONENT_ADDED` signal to the datum - * Returns the component that was created. Or the old component in a dupe situation where `COMPONENT_DUPE_UNIQUE` was set - * If this tries to add an component to an incompatible type, the component will be deleted and the result will be `null`. This is very unperformant, try not to do it - * Properly handles duplicate situations based on the `dupe_mode` var - */ + * Creates an instance of `new_type` in the datum and attaches to it as parent + * Sends the `COMSIG_COMPONENT_ADDED` signal to the datum + * Returns the component that was created. Or the old component in a dupe situation where `COMPONENT_DUPE_UNIQUE` was set + * If this tries to add an component to an incompatible type, the component will be deleted and the result will be `null`. This is very unperformant, try not to do it + * Properly handles duplicate situations based on the `dupe_mode` var + */ /datum/proc/_AddComponent(list/raw_args) var/new_type = raw_args[1] var/datum/component/nt = new_type @@ -431,22 +431,22 @@ return old_comp /** - * Get existing component of type, or create it and return a reference to it - * - * Use this if the item needs to exist at the time of this call, but may not have been created before now - * - * Arguments: - * * component_type The typepath of the component to create or return - * * ... additional arguments to be passed when creating the component if it does not exist - */ + * Get existing component of type, or create it and return a reference to it + * + * Use this if the item needs to exist at the time of this call, but may not have been created before now + * + * Arguments: + * * component_type The typepath of the component to create or return + * * ... additional arguments to be passed when creating the component if it does not exist + */ /datum/proc/LoadComponent(component_type, ...) . = GetComponent(component_type) if(!.) return _AddComponent(args) /** - * Removes the component from parent, ends up with a null parent - */ + * Removes the component from parent, ends up with a null parent + */ /datum/component/proc/RemoveComponent() if(!parent) return @@ -457,13 +457,13 @@ SEND_SIGNAL(old_parent, COMSIG_COMPONENT_REMOVING, src) /** - * Transfer this component to another parent - * - * Component is taken from source datum - * - * Arguments: - * * datum/component/target Target datum to transfer to - */ + * Transfer this component to another parent + * + * Component is taken from source datum + * + * Arguments: + * * datum/component/target Target datum to transfer to + */ /datum/proc/TakeComponent(datum/component/target) if(!target || target.parent == src) return @@ -481,13 +481,13 @@ target._JoinParent() /** - * Transfer all components to target - * - * All components from source datum are taken - * - * Arguments: - * * /datum/target the target to move the components to - */ + * Transfer all components to target + * + * All components from source datum are taken + * + * Arguments: + * * /datum/target the target to move the components to + */ /datum/proc/TransferComponents(datum/target) var/list/dc = datum_components if(!dc) @@ -503,7 +503,7 @@ target.TakeComponent(comps) /** - * Return the object that is the host of any UI's that this component has - */ + * Return the object that is the host of any UI's that this component has + */ /datum/component/ui_host() return parent diff --git a/code/datums/components/armor/armor.dm b/code/datums/components/armor/armor.dm index 7b5ecffb435..155469d2dcd 100644 --- a/code/datums/components/armor/armor.dm +++ b/code/datums/components/armor/armor.dm @@ -116,4 +116,4 @@ active = new_state /datum/component/armor/toggle/get_value(key) - return active ? ..() : 0 \ No newline at end of file + return active ? ..() : 0 diff --git a/code/datums/components/turf_click/turf_hand.dm b/code/datums/components/turf_click/turf_hand.dm index 9f31948f5f8..82e112f0f3c 100644 --- a/code/datums/components/turf_click/turf_hand.dm +++ b/code/datums/components/turf_click/turf_hand.dm @@ -16,4 +16,4 @@ src.priority = priority /datum/component/turf_hand/proc/OnHandInterception(var/mob/user) - return our_owner.attack_hand(user) \ No newline at end of file + return our_owner.attack_hand(user) diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm index b957061fa01..e2ebd4ad423 100644 --- a/code/datums/elements/_element.dm +++ b/code/datums/elements/_element.dm @@ -1,19 +1,19 @@ /** - * A holder for simple behaviour that can be attached to many different types - * - * Only one element of each type is instanced during game init. - * Otherwise acts basically like a lightweight component. - */ + * A holder for simple behaviour that can be attached to many different types + * + * Only one element of each type is instanced during game init. + * Otherwise acts basically like a lightweight component. + */ /datum/element /// Option flags for element behaviour var/element_flags = NONE /** - * The index of the first attach argument to consider for duplicate elements - * - * Is only used when flags contains [ELEMENT_BESPOKE] - * - * This is infinity so you must explicitly set this - */ + * The index of the first attach argument to consider for duplicate elements + * + * Is only used when flags contains [ELEMENT_BESPOKE] + * + * This is infinity so you must explicitly set this + */ var/id_arg_index = INFINITY /// Activates the functionality defined by the element on the given target datum @@ -47,9 +47,9 @@ CRASH("Incompatible [arguments[1]] assigned to a [type]! args: [json_encode(args)]") /** - * Finds the singleton for the element type given and detaches it from src - * You only need additional arguments beyond the type if you're using [ELEMENT_BESPOKE] - */ + * Finds the singleton for the element type given and detaches it from src + * You only need additional arguments beyond the type if you're using [ELEMENT_BESPOKE] + */ /datum/proc/_RemoveElement(list/arguments) var/datum/element/ele = SSdcs.GetElement(arguments) ele.Detach(src) diff --git a/code/datums/ert/outsider.dm b/code/datums/ert/outsider.dm index 62800dc8e04..56314cd8da3 100644 --- a/code/datums/ert/outsider.dm +++ b/code/datums/ert/outsider.dm @@ -46,4 +46,4 @@ name = "Elyran Navy" chance = 15 spawner = /datum/ghostspawner/human/ert/elyra - possible_space_sector = list(SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_VALLEY_HALE, SECTOR_AEMAQ) \ No newline at end of file + possible_space_sector = list(SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_VALLEY_HALE, SECTOR_AEMAQ) diff --git a/code/datums/ert/tcfl.dm b/code/datums/ert/tcfl.dm index 0d191effe8d..2ebd0cc163d 100644 --- a/code/datums/ert/tcfl.dm +++ b/code/datums/ert/tcfl.dm @@ -2,4 +2,4 @@ name = "Tau Ceti Foreign Legion" chance = 20 spawner = /datum/ghostspawner/human/ert/tcfl - possible_space_sector = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE) \ No newline at end of file + possible_space_sector = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE) diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 8e8e9ea4875..9caef196278 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -72,8 +72,8 @@ var/global/datum/getrev/revdata = new() /datum/getrev/proc/generate_greeting_info() if (!test_merges.len) greeting_info = {"
- There are currently no test merges loaded onto the server. -
"} + There are currently no test merges loaded onto the server. + "} return var/list/out = list("

There are currently [test_merges.len] PRs being tested live.

", diff --git a/code/datums/looping_sounds/revenant_rift.dm b/code/datums/looping_sounds/revenant_rift.dm index 98458f8d222..6247db47522 100644 --- a/code/datums/looping_sounds/revenant_rift.dm +++ b/code/datums/looping_sounds/revenant_rift.dm @@ -4,4 +4,4 @@ mid_sounds = list('sound/ambience/tension/horror.ogg' = 1) mid_length = 260 end_sound = list('sound/effects/psi/power_feedback.ogg' = 1) - volume = 80 \ No newline at end of file + volume = 80 diff --git a/code/datums/looping_sounds/thermal_drill.dm b/code/datums/looping_sounds/thermal_drill.dm index d4a20647f2b..3346d7e0e06 100644 --- a/code/datums/looping_sounds/thermal_drill.dm +++ b/code/datums/looping_sounds/thermal_drill.dm @@ -1,4 +1,4 @@ /datum/looping_sound/thermal_drill mid_sounds = list('sound/items/thermal_drill.ogg' = 1) mid_length = 19 - volume = 30 \ No newline at end of file + volume = 30 diff --git a/code/datums/observation/_debug.dm b/code/datums/observation/_debug.dm index 602a2b3d235..9e481f9fdf7 100644 --- a/code/datums/observation/_debug.dm +++ b/code/datums/observation/_debug.dm @@ -1,4 +1,4 @@ /**************** * Debug Support * ****************/ -var/list/all_observable_events = list() \ No newline at end of file +var/list/all_observable_events = list() diff --git a/code/datums/observation/entered.dm b/code/datums/observation/entered.dm index a96d43d525b..5ad4d7a420d 100644 --- a/code/datums/observation/entered.dm +++ b/code/datums/observation/entered.dm @@ -21,4 +21,4 @@ var/singleton/observ/entered/entered_event = new() /atom/Entered(atom/movable/enterer, atom/old_loc) ..() - entered_event.raise_event(src, enterer, old_loc) \ No newline at end of file + entered_event.raise_event(src, enterer, old_loc) diff --git a/code/datums/observation/exited.dm b/code/datums/observation/exited.dm index 8b504f757ef..a3450e06707 100644 --- a/code/datums/observation/exited.dm +++ b/code/datums/observation/exited.dm @@ -21,4 +21,4 @@ var/singleton/observ/exited/exited_event = new() /atom/Exited(atom/movable/exitee, atom/new_loc) . = ..() - exited_event.raise_event(src, exitee, new_loc) \ No newline at end of file + exited_event.raise_event(src, exitee, new_loc) diff --git a/code/datums/observation/helpers.dm b/code/datums/observation/helpers.dm index 8a0df1d560a..f3218309638 100644 --- a/code/datums/observation/helpers.dm +++ b/code/datums/observation/helpers.dm @@ -18,4 +18,4 @@ // Sometimes you just want to end yourself /datum/proc/qdel_self() - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/datums/observation/instruments.dm b/code/datums/observation/instruments.dm index 335627bded2..5d4e77e4608 100644 --- a/code/datums/observation/instruments.dm +++ b/code/datums/observation/instruments.dm @@ -9,4 +9,4 @@ var/singleton/observ/instrument_synchronizer/instrument_synchronizer = new() /singleton/observ/instrument_synchronizer name = "Instrument synchronizer" - expected_type = /datum \ No newline at end of file + expected_type = /datum diff --git a/code/datums/observation/see_in_dark_set.dm b/code/datums/observation/see_in_dark_set.dm index 115e3b44a11..31f62e6e233 100644 --- a/code/datums/observation/see_in_dark_set.dm +++ b/code/datums/observation/see_in_dark_set.dm @@ -22,4 +22,4 @@ var/singleton/observ/see_in_dark_set/see_in_dark_set_event = new() var/old_see_in_dark = sight if(old_see_in_dark != new_see_in_dark) see_in_dark = new_see_in_dark - see_in_dark_set_event.raise_event(src, old_see_in_dark, new_see_in_dark) \ No newline at end of file + see_in_dark_set_event.raise_event(src, old_see_in_dark, new_see_in_dark) diff --git a/code/datums/observation/see_invisible_set.dm b/code/datums/observation/see_invisible_set.dm index 5d477b55636..383dd52cb7a 100644 --- a/code/datums/observation/see_invisible_set.dm +++ b/code/datums/observation/see_invisible_set.dm @@ -22,4 +22,4 @@ var/singleton/observ/see_invisible_set/see_invisible_set_event = new() var/old_see_invisible = see_invisible if(old_see_invisible != new_see_invisible) see_invisible = new_see_invisible - see_invisible_set_event.raise_event(src, old_see_invisible, new_see_invisible) \ No newline at end of file + see_invisible_set_event.raise_event(src, old_see_invisible, new_see_invisible) diff --git a/code/datums/observation/shuttle_moved.dm b/code/datums/observation/shuttle_moved.dm index bd0fc5401ea..9f051c63ed3 100644 --- a/code/datums/observation/shuttle_moved.dm +++ b/code/datums/observation/shuttle_moved.dm @@ -35,4 +35,4 @@ var/singleton/observ/shuttle_pre_move/shuttle_pre_move_event = new() *****************/ // Located in modules/shuttle/shuttle.dm -// Proc: /datum/shuttle/proc/attempt_move() \ No newline at end of file +// Proc: /datum/shuttle/proc/attempt_move() diff --git a/code/datums/observation/sight_set.dm b/code/datums/observation/sight_set.dm index 6130634ce4a..3c990af7968 100644 --- a/code/datums/observation/sight_set.dm +++ b/code/datums/observation/sight_set.dm @@ -22,4 +22,4 @@ var/singleton/observ/sight_set/sight_set_event = new() var/old_sight = sight if(old_sight != new_sight) sight = new_sight - sight_set_event.raise_event(src, old_sight, new_sight) \ No newline at end of file + sight_set_event.raise_event(src, old_sight, new_sight) diff --git a/code/datums/outfits/ert/ap_eridani.dm b/code/datums/outfits/ert/ap_eridani.dm index 3c00ada76d2..48d58ecb6f4 100644 --- a/code/datums/outfits/ert/ap_eridani.dm +++ b/code/datums/outfits/ert/ap_eridani.dm @@ -117,12 +117,12 @@ belt_contents = list( /obj/item/reagent_containers/hypospray/combat/empty = 1, - /obj/item/reagent_containers/glass/bottle/inaprovaline = 1, - /obj/item/reagent_containers/glass/bottle/antitoxin = 1, - /obj/item/reagent_containers/glass/bottle/dexalin_plus = 1, - /obj/item/reagent_containers/glass/bottle/butazoline = 1, - /obj/item/reagent_containers/glass/bottle/dermaline = 1, - /obj/item/reagent_containers/glass/bottle/perconol = 1, + /obj/item/reagent_containers/glass/bottle/inaprovaline = 1, + /obj/item/reagent_containers/glass/bottle/antitoxin = 1, + /obj/item/reagent_containers/glass/bottle/dexalin_plus = 1, + /obj/item/reagent_containers/glass/bottle/butazoline = 1, + /obj/item/reagent_containers/glass/bottle/dermaline = 1, + /obj/item/reagent_containers/glass/bottle/perconol = 1, /obj/item/storage/pill_bottle/mortaphenyl = 1 ) @@ -156,11 +156,11 @@ belt_contents = list( /obj/item/reagent_containers/hypospray/combat/empty = 1, - /obj/item/reagent_containers/glass/bottle/inaprovaline = 1, - /obj/item/reagent_containers/glass/bottle/antitoxin = 1, - /obj/item/reagent_containers/glass/bottle/dexalin_plus = 1, - /obj/item/reagent_containers/glass/bottle/butazoline = 1, - /obj/item/reagent_containers/glass/bottle/dermaline = 1, - /obj/item/reagent_containers/glass/bottle/perconol = 1, + /obj/item/reagent_containers/glass/bottle/inaprovaline = 1, + /obj/item/reagent_containers/glass/bottle/antitoxin = 1, + /obj/item/reagent_containers/glass/bottle/dexalin_plus = 1, + /obj/item/reagent_containers/glass/bottle/butazoline = 1, + /obj/item/reagent_containers/glass/bottle/dermaline = 1, + /obj/item/reagent_containers/glass/bottle/perconol = 1, /obj/item/melee/baton/stunrod = 1 ) diff --git a/code/datums/outfits/ert/deathsquad.dm b/code/datums/outfits/ert/deathsquad.dm index f8af21a9a0c..3e081fd8616 100644 --- a/code/datums/outfits/ert/deathsquad.dm +++ b/code/datums/outfits/ert/deathsquad.dm @@ -67,4 +67,4 @@ if(mercrig) H.put_in_hands(mercrig) H.equip_to_slot_or_del(mercrig, slot_back) - addtimer(CALLBACK(mercrig, TYPE_PROC_REF(/obj/item/rig, toggle_seals), H, TRUE), 2 SECONDS) \ No newline at end of file + addtimer(CALLBACK(mercrig, TYPE_PROC_REF(/obj/item/rig, toggle_seals), H, TRUE), 2 SECONDS) diff --git a/code/datums/outfits/ert/fsf.dm b/code/datums/outfits/ert/fsf.dm index 02726637724..607d3ce4543 100644 --- a/code/datums/outfits/ert/fsf.dm +++ b/code/datums/outfits/ert/fsf.dm @@ -16,14 +16,14 @@ backpack_contents = list( /obj/item/melee/energy/sword/knife/sol = 1 - ) + ) belt_contents = list( /obj/item/ammo_magazine/c762/sol = 1, /obj/item/ammo_magazine/mc9mm = 2, /obj/item/handcuffs/ziptie = 2, /obj/item/grenade/frag = 1 - ) + ) accessory = /obj/item/clothing/accessory/holster/hip/brown accessory_contents = list(/obj/item/gun/projectile/pistol/sol = 1) diff --git a/code/datums/outfits/ert/syndicate.dm b/code/datums/outfits/ert/syndicate.dm index 1204cb86ad7..e5c33c8536c 100644 --- a/code/datums/outfits/ert/syndicate.dm +++ b/code/datums/outfits/ert/syndicate.dm @@ -27,4 +27,4 @@ /datum/outfit/admin/deathsquad/syndicate/leader name = "Syndicate Commando Lead" - l_pocket = /obj/item/pinpointer \ No newline at end of file + l_pocket = /obj/item/pinpointer diff --git a/code/datums/repositories/sound_channels.dm b/code/datums/repositories/sound_channels.dm index 76dda7c8b7d..9a11339f9ad 100644 --- a/code/datums/repositories/sound_channels.dm +++ b/code/datums/repositories/sound_channels.dm @@ -47,4 +47,4 @@ var/repository/sound_channels/sound_channels = new() /repository/sound_channels/proc/ReleaseChannels(list/channels) for(var/channel in channels) LAZYREMOVE(keys_by_channel, "[channel]") - available_channels.Push(channel) \ No newline at end of file + available_channels.Push(channel) diff --git a/code/datums/trading/_trading_defines.dm b/code/datums/trading/_trading_defines.dm index 10e137486b3..1e62722eda1 100644 --- a/code/datums/trading/_trading_defines.dm +++ b/code/datums/trading/_trading_defines.dm @@ -16,4 +16,4 @@ #define TRADER_NO_BLACKLISTED "trade_blacklist" #define TRADER_FOUND_UNWANTED "trade_found_unwanted" -#define TRADER_DEFAULT_NAME "Default" //Whether to just generate a name from the premade lists. \ No newline at end of file +#define TRADER_DEFAULT_NAME "Default" //Whether to just generate a name from the premade lists. diff --git a/code/datums/trading/misc.dm b/code/datums/trading/misc.dm index ecd82cd5b29..d31d848eacd 100644 --- a/code/datums/trading/misc.dm +++ b/code/datums/trading/misc.dm @@ -355,4 +355,4 @@ /obj/item/stack/material/phoron = TRADER_THIS_TYPE ) - mob_transfer_message = "You are transported to the ORIGIN. When the transportation dizziness wears off, you find you are surrounded by Golden Deep agents..." \ No newline at end of file + mob_transfer_message = "You are transported to the ORIGIN. When the transportation dizziness wears off, you find you are surrounded by Golden Deep agents..." diff --git a/code/datums/trading/ship.dm b/code/datums/trading/ship.dm index f685d5d4efb..feff14b5a6f 100644 --- a/code/datums/trading/ship.dm +++ b/code/datums/trading/ship.dm @@ -21,4 +21,4 @@ var/length = round(amt/100) duration_of_stay += length . = get_response("bribe_accept", "Sure, I'll stay for TIME more minutes.") - . = replacetext(., "TIME", length) \ No newline at end of file + . = replacetext(., "TIME", length) diff --git a/code/datums/underwear/socks.dm b/code/datums/underwear/socks.dm index adc0716927a..7cc8f6d3701 100644 --- a/code/datums/underwear/socks.dm +++ b/code/datums/underwear/socks.dm @@ -192,4 +192,4 @@ /datum/category_item/underwear/socks/fishnet_nosock name = "Fishnet Tights, Short" icon_state = "fishnet_nosock" - has_color = TRUE \ No newline at end of file + has_color = TRUE diff --git a/code/datums/uplink/devices_and_tools.dm b/code/datums/uplink/devices_and_tools.dm index 3c20390c464..5a518282834 100644 --- a/code/datums/uplink/devices_and_tools.dm +++ b/code/datums/uplink/devices_and_tools.dm @@ -78,7 +78,7 @@ /datum/uplink_item/item/tools/personal_shield name = "Personal Shield" desc = "A personal shield that, when kept in your hand and activated, will protect its user from five projectile shots. \ - This can only be bought once." + This can only be bought once." telecrystal_cost = 1 item_limit = 1 path = /obj/item/device/personal_shield diff --git a/code/datums/wires/disposals.dm b/code/datums/wires/disposals.dm index 73ba69619ee..8419b8475a3 100644 --- a/code/datums/wires/disposals.dm +++ b/code/datums/wires/disposals.dm @@ -34,4 +34,4 @@ var/const/DISPOSAL_WIRE_FLUSH = 1 var/obj/machinery/disposal/D = holder if(D.mode <= 0) return TRUE - return FALSE \ No newline at end of file + return FALSE diff --git a/code/datums/wires/vending.dm b/code/datums/wires/vending.dm index 3adc2a74556..983a12c652b 100644 --- a/code/datums/wires/vending.dm +++ b/code/datums/wires/vending.dm @@ -89,4 +89,4 @@ var/const/VENDING_WIRE_HEATING = 32 if(16) return "Cooling" if(32) - return "Heating" \ No newline at end of file + return "Heating" diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index f7044c59e82..d2da33857e0 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -159,7 +159,7 @@ var/list/wireColours = list("red", "blue", "green", "darkred", "orange", "brown" holder.add_hiddenprint(L) else to_chat(L, SPAN_WARNING("You need a multitool!")) - + // Update Window Interact(usr) diff --git a/code/defines/gases.dm b/code/defines/gases.dm index c7de5a3b7ba..0c9ae0ee564 100644 --- a/code/defines/gases.dm +++ b/code/defines/gases.dm @@ -93,4 +93,4 @@ overlay_limit = 0.5 specific_heat = 5 // J/(mol*K) molar_mass = 0.017 // kg/mol - flags = XGM_GAS_CONTAMINANT \ No newline at end of file + flags = XGM_GAS_CONTAMINANT diff --git a/code/game/antagonist/_antagonist_setup.dm b/code/game/antagonist/_antagonist_setup.dm index 3494b278531..285ffd6793a 100644 --- a/code/game/antagonist/_antagonist_setup.dm +++ b/code/game/antagonist/_antagonist_setup.dm @@ -1,17 +1,14 @@ /* - MODULAR ANTAGONIST SYSTEM - - Attempts to move all the bullshit snowflake antag tracking code into its own system, which - has the added bonus of making the display procs consistent. Still needs work/adjustment/cleanup - but should be fairly self-explanatory with a review of the procs. Will supply a few examples - of common tasks that the system will be expected to perform below. ~Z - - To use: - - Get the appropriate datum via get_antag_data("antagonist id") - using the id var of the desired /datum/antagonist ie. var/datum/antagonist/A = get_antag_data("traitor") - - Call add_antagonist() on the desired target mind ie. A.add_antagonist(mob.mind) - - To ignore protected roles, supply a positive second argument. - - To skip equipping with appropriate gear, supply a positive third argument. +MODULAR ANTAGONIST SYSTEM +Attempts to move all the bullshit snowflake antag tracking code into its own system, which +has the added bonus of making the display procs consistent. Still needs work/adjustment/cleanup +but should be fairly self-explanatory with a review of the procs. Will supply a few examples +of common tasks that the system will be expected to perform below. ~Z +To use: + - Get the appropriate datum via get_antag_data("antagonist id") using the id var of the desired /datum/antagonist ie. var/datum/antagonist/A = get_antag_data("traitor") + - Call add_antagonist() on the desired target mind ie. A.add_antagonist(mob.mind) + - To ignore protected roles, supply a positive second argument. + - To skip equipping with appropriate gear, supply a positive third argument. */ // Globals. diff --git a/code/game/antagonist/alien/borer.dm b/code/game/antagonist/alien/borer.dm index 965970e6fe3..9975fa417ae 100644 --- a/code/game/antagonist/alien/borer.dm +++ b/code/game/antagonist/alien/borer.dm @@ -68,4 +68,4 @@ var/datum/antagonist/xenos/borer/borers ..() /datum/antagonist/xenos/borer/is_obvious_antag(datum/mind/player) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/game/antagonist/outsider/burglar.dm b/code/game/antagonist/outsider/burglar.dm index 9887f55e445..f49ab73be2a 100644 --- a/code/game/antagonist/outsider/burglar.dm +++ b/code/game/antagonist/outsider/burglar.dm @@ -55,4 +55,4 @@ var/datum/antagonist/burglar/burglars return TRUE /datum/antagonist/burglar/get_antag_radio() - return "Burglar" \ No newline at end of file + return "Burglar" diff --git a/code/game/antagonist/outsider/deathsquad.dm b/code/game/antagonist/outsider/deathsquad.dm index e8676e86c7b..7ac83f5c2a0 100644 --- a/code/game/antagonist/outsider/deathsquad.dm +++ b/code/game/antagonist/outsider/deathsquad.dm @@ -28,4 +28,4 @@ var/datum/antagonist/deathsquad/deathsquad /datum/antagonist/deathsquad/attempt_spawn() if(..()) - deployed = TRUE \ No newline at end of file + deployed = TRUE diff --git a/code/game/antagonist/outsider/mercenary.dm b/code/game/antagonist/outsider/mercenary.dm index c293c9bf5c1..fd7a24f53d0 100644 --- a/code/game/antagonist/outsider/mercenary.dm +++ b/code/game/antagonist/outsider/mercenary.dm @@ -53,4 +53,4 @@ var/datum/antagonist/mercenary/mercs return TRUE /datum/antagonist/mercenary/get_antag_radio() - return "Mercenary" \ No newline at end of file + return "Mercenary" diff --git a/code/game/antagonist/outsider/ninja.dm b/code/game/antagonist/outsider/ninja.dm index 09215430b26..9d0f72e8ee6 100644 --- a/code/game/antagonist/outsider/ninja.dm +++ b/code/game/antagonist/outsider/ninja.dm @@ -163,4 +163,4 @@ var/datum/antagonist/ninja/ninjas return directive /datum/antagonist/ninja/get_antag_radio() - return "Ninja" \ No newline at end of file + return "Ninja" diff --git a/code/game/antagonist/station/changeling/changeling.dm b/code/game/antagonist/station/changeling/changeling.dm index 44a782d35b7..49565e1b307 100644 --- a/code/game/antagonist/station/changeling/changeling.dm +++ b/code/game/antagonist/station/changeling/changeling.dm @@ -88,7 +88,7 @@ if(player.current.client.prefs.organ_data["torso"] == "cyborg") // Full synthetic. return 0 return 1 - return 0 + return 0 /datum/antagonist/changeling/remove_antagonist(var/datum/mind/player, var/show_message = TRUE, var/implanted) . = ..() diff --git a/code/game/antagonist/station/changeling/morph.dm b/code/game/antagonist/station/changeling/morph.dm index fac79d12b5c..786c2742c57 100644 --- a/code/game/antagonist/station/changeling/morph.dm +++ b/code/game/antagonist/station/changeling/morph.dm @@ -20,4 +20,4 @@ var/datum/antagonist/morph/morphs = null to_chat(player.current, SPAN_DANGER("You can eat people and items by clicking on them, but only if they're dead.")) /datum/antagonist/morph/is_obvious_antag(datum/mind/player) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/game/antagonist/station/thrall.dm b/code/game/antagonist/station/thrall.dm index 8865d925ed2..ed2a3ea7e7b 100644 --- a/code/game/antagonist/station/thrall.dm +++ b/code/game/antagonist/station/thrall.dm @@ -42,4 +42,4 @@ var/datum/antagonist/thrall/thralls = null var/datum/vampire/vampire = player.antag_datums[MODE_VAMPIRE] vampire.lose_master(player.current) player.antag_datums -= MODE_VAMPIRE - return ..() \ No newline at end of file + return ..() diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 908e221b13a..674bc5456f5 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -7,11 +7,15 @@ var/anchored = 0 var/movable_flags - var/icon_scale_x = 1 // Used to scale icons up or down horizonally in update_transform(). - var/icon_scale_y = 1 // Used to scale icons up or down vertically in update_transform(). - var/icon_rotation = 0 // Used to rotate icons in update_transform() + ///Used to scale icons up or down horizonally in update_transform(). + var/icon_scale_x = 1 + + ///Used to scale icons up or down vertically in update_transform(). + var/icon_scale_y = 1 + + ///Used to rotate icons in update_transform() + var/icon_rotation = 0 - // var/elevation = 2 - not used anywhere var/move_speed = 10 var/l_move_time = 1 var/throwing = 0 @@ -21,9 +25,14 @@ var/throw_range = 7 var/moved_recently = 0 var/atom/movable/pulledby = null - var/item_state = null // Base name of the image used for when the item is in someone's hand. Suffixes are added to this. Doubles as legacy overlay_state. - var/overlay_state = null // Base name of the image used for when the item is worn. Suffixes are added to this. Important for icon flipping as _flip is added at the end of the value. - //Also used on holdable mobs for the same info related to their held version + + ///Base name of the image used for when the item is in someone's hand. Suffixes are added to this. Doubles as legacy overlay_state. + var/item_state = null + + ///Base name of the image used for when the item is worn. Suffixes are added to this. Important for icon flipping as _flip is added at the end of the value. + var/overlay_state = null + + ///Also used on holdable mobs for the same info related to their held version var/does_spin = TRUE // Does the atom spin when thrown (of course it does :P) var/can_hold_mob = FALSE @@ -184,9 +193,9 @@ minor_dist = dist_x while(src && target && src.throwing && istype(src.loc, /turf) \ - && ((abs(target.x - src.x)+abs(target.y - src.y) > 0 && dist_travelled < range) \ - || (a && a.has_gravity == 0) \ - || istype(src.loc, /turf/space))) + && ((abs(target.x - src.x)+abs(target.y - src.y) > 0 && dist_travelled < range) \ + || (a && a.has_gravity == 0) \ + || istype(src.loc, /turf/space))) // only stop when we've gone the whole distance (or max throw range) and are on a non-space tile, or hit something, or hit the end of the map, or someone picks it up var/atom/step if(error >= 0) diff --git a/code/game/dna/dna2_domutcheck.dm b/code/game/dna/dna2_domutcheck.dm index dea07c4ea4b..24090206ad4 100644 --- a/code/game/dna/dna2_domutcheck.dm +++ b/code/game/dna/dna2_domutcheck.dm @@ -10,7 +10,7 @@ var/mob/living/carbon/human/H = M if(H.species && H.species.flags & NO_SCAN) return - + for(var/datum/dna/gene/gene in dna_genes) if(!M || !M.dna) return diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index b0df9f01530..d28f2e5d41a 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -295,17 +295,17 @@ if(!..()) ui_interact(user) - /** - * The ui_interact proc is used to open and update Nano UIs - * If ui_interact is not used then the UI will not update correctly - * ui_interact is currently defined for /atom/movable (which is inherited by /obj and /mob) - * - * @param user /mob The mob who is interacting with this ui - * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") - * @param ui /datum/nanoui This parameter is passed by the nanoui process() proc when updating an open ui - * - * @return nothing - */ +/** + * The ui_interact proc is used to open and update Nano UIs + * If ui_interact is not used then the UI will not update correctly + * ui_interact is currently defined for /atom/movable (which is inherited by /obj and /mob) + * + * @param user /mob The mob who is interacting with this ui + * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") + * @param ui /datum/nanoui This parameter is passed by the nanoui process() proc when updating an open ui + * + * @return nothing + */ /obj/machinery/computer/scan_consolenew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if (!connected) return diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm index 4d94b72371e..4594140235d 100644 --- a/code/game/dna/genes/monkey.dm +++ b/code/game/dna/genes/monkey.dm @@ -30,4 +30,4 @@ if(!H.dna.real_name) var/randomname = H.species.get_random_name() H.real_name = randomname - H.dna.real_name = randomname \ No newline at end of file + H.dna.real_name = randomname diff --git a/code/game/gamemodes/changeling/helpers/sting_click.dm b/code/game/gamemodes/changeling/helpers/sting_click.dm index 3701e7f3cd9..ce37fbf04a0 100644 --- a/code/game/gamemodes/changeling/helpers/sting_click.dm +++ b/code/game/gamemodes/changeling/helpers/sting_click.dm @@ -19,4 +19,4 @@ CHECK_STING(src, A) . = ..() -#undef CHECK_STING \ No newline at end of file +#undef CHECK_STING diff --git a/code/game/gamemodes/changeling/implements/hivemind.dm b/code/game/gamemodes/changeling/implements/hivemind.dm index 44198743cd4..bbf9c1920ea 100644 --- a/code/game/gamemodes/changeling/implements/hivemind.dm +++ b/code/game/gamemodes/changeling/implements/hivemind.dm @@ -69,4 +69,4 @@ var/datum/changeling/changeling = changeling_mob.mind.antag_datums[MODE_CHANGELING] changeling.hivemind_members -= src - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/game/gamemodes/cult/runes/armor.dm b/code/game/gamemodes/cult/runes/armor.dm index cf47fe95007..4cec4f8c42a 100644 --- a/code/game/gamemodes/cult/runes/armor.dm +++ b/code/game/gamemodes/cult/runes/armor.dm @@ -5,7 +5,7 @@ /datum/rune/armor/do_rune_action(mob/living/user, atom/movable/A) user.say("N'ath reth sh'yro eth d'raggathnor!") user.visible_message(SPAN_DANGER("A flash of red light appears around [user], as a set of armor envelops their body!"), - SPAN_CULT("A refreshing feeling envelops you; the armor of the Dark One is once again protecting you.")) + SPAN_CULT("A refreshing feeling envelops you; the armor of the Dark One is once again protecting you.")) if(istype(user, /mob/living/simple_animal/construct)) var/mob/living/simple_animal/construct/C = user @@ -16,10 +16,10 @@ construct_class = alert(C, "Please choose which type of construct you wish to become.", "Construct Selection", "Juggernaut", "Wraith", "Artificer") var/list/static/construct_types = list("Juggernaut" = /mob/living/simple_animal/construct/armored, - "Wraith" = /mob/living/simple_animal/construct/wraith, - "Artificer" = /mob/living/simple_animal/construct/builder, - "Harvester" = /mob/living/simple_animal/construct/harvester) - + "Wraith" = /mob/living/simple_animal/construct/wraith, + "Artificer" = /mob/living/simple_animal/construct/builder, + "Harvester" = /mob/living/simple_animal/construct/harvester) + var/construct_path = construct_types[construct_class] var/mob/living/simple_animal/construct/Z = new construct_path(get_turf(C)) Z.health = Z.health * (C.health / C.maxHealth) @@ -29,7 +29,7 @@ C.death() construct_msg(Z, construct_class) Z.cancel_camera() - + else if(ishuman(user)) user.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), slot_head) user.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), slot_wear_suit) diff --git a/code/game/gamemodes/cult/runes/blood_boil.dm b/code/game/gamemodes/cult/runes/blood_boil.dm index b7028a378bf..f4552b6cf21 100644 --- a/code/game/gamemodes/cult/runes/blood_boil.dm +++ b/code/game/gamemodes/cult/runes/blood_boil.dm @@ -28,4 +28,4 @@ qdel(A) return TRUE else - return fizzle(user, A) \ No newline at end of file + return fizzle(user, A) diff --git a/code/game/gamemodes/cult/runes/convert.dm b/code/game/gamemodes/cult/runes/convert.dm index 55d37a9c825..f3acdd2f8e1 100644 --- a/code/game/gamemodes/cult/runes/convert.dm +++ b/code/game/gamemodes/cult/runes/convert.dm @@ -103,4 +103,4 @@ var/mob/living/simple_animal/shade/shade = locate() in stone announce_ghost_joinleave(shade) shade.ghostize(FALSE) - target.dust() \ No newline at end of file + target.dust() diff --git a/code/game/gamemodes/cult/runes/create_talisman.dm b/code/game/gamemodes/cult/runes/create_talisman.dm index 60831749c32..010de8b3079 100644 --- a/code/game/gamemodes/cult/runes/create_talisman.dm +++ b/code/game/gamemodes/cult/runes/create_talisman.dm @@ -37,4 +37,4 @@ qdel(new_talisman) playsound(A, 'sound/magic/enter_blood.ogg', 50) else - return fizzle(user, A) \ No newline at end of file + return fizzle(user, A) diff --git a/code/game/gamemodes/cult/runes/deafen_others.dm b/code/game/gamemodes/cult/runes/deafen_others.dm index e1089113904..a7bb2ab0058 100644 --- a/code/game/gamemodes/cult/runes/deafen_others.dm +++ b/code/game/gamemodes/cult/runes/deafen_others.dm @@ -27,4 +27,4 @@ admin_attacker_log_many_victims(user, affected, "Used a deafen rune.", "Was victim of a deafen rune.", "used a deafen rune on") qdel(A) else - return fizzle(user, A) \ No newline at end of file + return fizzle(user, A) diff --git a/code/game/gamemodes/cult/runes/free_cultist.dm b/code/game/gamemodes/cult/runes/free_cultist.dm index 928e384ae4f..a88ec16d90d 100644 --- a/code/game/gamemodes/cult/runes/free_cultist.dm +++ b/code/game/gamemodes/cult/runes/free_cultist.dm @@ -20,7 +20,7 @@ return fizzle(user, A) if(cultist == user) //just to be sure. return - + var/cultist_free = TRUE if(cultist.buckled_to) cultist_free = FALSE @@ -52,7 +52,7 @@ cultist_free = FALSE door.unlock() door.open() - + if(!cultist_free) to_chat(cultist, SPAN_CULT("Your fellow cultists have freed you!")) @@ -62,4 +62,4 @@ else C.say("Khari'd! Gual'te nikka!") qdel(A) - return fizzle(user, A) \ No newline at end of file + return fizzle(user, A) diff --git a/code/game/gamemodes/cult/runes/hide_runes.dm b/code/game/gamemodes/cult/runes/hide_runes.dm index ffe9d7b2d4a..4646aad9d6b 100644 --- a/code/game/gamemodes/cult/runes/hide_runes.dm +++ b/code/game/gamemodes/cult/runes/hide_runes.dm @@ -15,4 +15,4 @@ for(var/mob/V in viewers(get_turf(A))) to_chat(V, SPAN_WARNING("\The [A] dissipates into a bloody cloud, veiling the surrounding runes.")) qdel(A) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/game/gamemodes/cult/runes/sacrifice.dm b/code/game/gamemodes/cult/runes/sacrifice.dm index 065676fbcab..479a3cfdbd1 100644 --- a/code/game/gamemodes/cult/runes/sacrifice.dm +++ b/code/game/gamemodes/cult/runes/sacrifice.dm @@ -23,7 +23,7 @@ else if(istype(I,/obj/item/aicard)) for(var/mob/living/silicon/ai/AI in I) victims += AI - + for(var/mob/living/carbon/C in orange(1, A)) if(iscultist(C) && !C.stat) cultists_in_range += C @@ -52,7 +52,7 @@ do_sacrifice(cultists_in_range, H, H.stat, 80, worthy) else fizzle(user) - + if(output) for(var/mob/C in cultists_in_range) to_chat(C, output) @@ -85,4 +85,4 @@ if(isrobot(victim)) victim.dust() // To prevent the MMI from remaining else - victim.gib() \ No newline at end of file + victim.gib() diff --git a/code/game/gamemodes/cult/runes/summon_narsie.dm b/code/game/gamemodes/cult/runes/summon_narsie.dm index 159295022a8..56ee4afafd6 100644 --- a/code/game/gamemodes/cult/runes/summon_narsie.dm +++ b/code/game/gamemodes/cult/runes/summon_narsie.dm @@ -32,4 +32,4 @@ if(!iscultist(M)) continue to_chat(M, SPAN_WARNING("Not enough cultists are around to summon the Great Dark One!")) - return fizzle(user, A) \ No newline at end of file + return fizzle(user, A) diff --git a/code/game/gamemodes/cult/runes/summon_soulstone.dm b/code/game/gamemodes/cult/runes/summon_soulstone.dm index bfffa844cf6..f2a8ae1d0b4 100644 --- a/code/game/gamemodes/cult/runes/summon_soulstone.dm +++ b/code/game/gamemodes/cult/runes/summon_soulstone.dm @@ -6,4 +6,4 @@ user.say("N'ath reth sh'yro eth d'raggathnor!") new /obj/item/device/soulstone(get_turf(A)) qdel(A) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/game/gamemodes/cult/runes/summon_tome.dm b/code/game/gamemodes/cult/runes/summon_tome.dm index 6f452fbe176..a102cb57ac3 100644 --- a/code/game/gamemodes/cult/runes/summon_tome.dm +++ b/code/game/gamemodes/cult/runes/summon_tome.dm @@ -9,4 +9,4 @@ "You hear a pop and smell ozone.") new /obj/item/book/tome(get_turf(A)) qdel(A) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/game/gamemodes/cult/runes/wall.dm b/code/game/gamemodes/cult/runes/wall.dm index eed4b5fc326..8e0516535a3 100644 --- a/code/game/gamemodes/cult/runes/wall.dm +++ b/code/game/gamemodes/cult/runes/wall.dm @@ -13,4 +13,4 @@ parent.filters = filter(type="blur", size = 5) else to_chat(user, SPAN_CULT("Your blood flows into the rune, and you feel as the rune releases its grasp on space.")) - parent.filters = filter(type="drop_shadow", x = 1, y = 1, size = 4, color = "#FF0000") + parent.filters = filter(type="drop_shadow", x = 1, y = 1, size = 4, color = "#FF0000") diff --git a/code/game/gamemodes/cult/structures/structure.dm b/code/game/gamemodes/cult/structures/structure.dm index 1622a609b48..7ab6e060271 100644 --- a/code/game/gamemodes/cult/structures/structure.dm +++ b/code/game/gamemodes/cult/structures/structure.dm @@ -5,4 +5,4 @@ appearance_flags = NO_CLIENT_COLOR /obj/structure/cult/cultify() - return \ No newline at end of file + return diff --git a/code/game/gamemodes/endgame/endgame.dm b/code/game/gamemodes/endgame/endgame.dm index 62c04d6db51..c7e08ba7c3b 100644 --- a/code/game/gamemodes/endgame/endgame.dm +++ b/code/game/gamemodes/endgame/endgame.dm @@ -2,27 +2,27 @@ * ENDGAME STUFF **********************/ - // Universal State - // Handles stuff like space icon_state, constants, etc. - // Essentially a policy manager. Once shit hits the fan, this changes its policies. - // Called by master controller. +// Universal State +// Handles stuff like space icon_state, constants, etc. +// Essentially a policy manager. Once shit hits the fan, this changes its policies. +// Called by master controller. - // Default shit. +// Default shit. /datum/universal_state // Just for reference, for now. // Might eventually add an observatory job. - var/name = "Normal" - var/desc = "Nothing seems awry." + var/name = "Normal" + var/desc = "Nothing seems awry." - // Sets world.turf, replaces all turfs of type /turf/space. - var/space_type = /turf/space + // Sets world.turf, replaces all turfs of type /turf/space. + var/space_type = /turf/space - // Replaces all turfs of type /turf/space/transit/bluespace - var/transit_space_type = /turf/space/transit/bluespace + // Replaces all turfs of type /turf/space/transit/bluespace + var/transit_space_type = /turf/space/transit/bluespace - // Chance of a floor or wall getting damaged [0-100] - // Simulates stuff getting broken due to molecular bonds decaying. - var/decay_rate = 0 + // Chance of a floor or wall getting damaged [0-100] + // Simulates stuff getting broken due to molecular bonds decaying. + var/decay_rate = 0 // Actually decay the turf. /datum/universal_state/proc/DecayTurf(var/turf/T) @@ -50,15 +50,15 @@ // Apply changes when exiting state /datum/universal_state/proc/OnExit() - // Does nothing by default + return // Does nothing by default // Apply changes when entering state /datum/universal_state/proc/OnEnter() - // Does nothing by default + return // Does nothing by default // Apply changes to a new turf. /datum/universal_state/proc/OnTurfChange(var/turf/NT) - return + return /datum/universal_state/proc/OverlayAndAmbientSet() return diff --git a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm index 50508b88842..ac5910a1de0 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm @@ -2,10 +2,10 @@ var/global/universe_has_ended = 0 /datum/universal_state/supermatter_cascade - name = "Supermatter Cascade" - desc = "Unknown harmonance affecting universal substructure, converting nearby matter to supermatter." + name = "Supermatter Cascade" + desc = "Unknown harmonance affecting universal substructure, converting nearby matter to supermatter." - decay_rate = 5 // 5% chance of a turf decaying on lighting update/airflow (there's no actual tick for turfs) + decay_rate = 5 // 5% chance of a turf decaying on lighting update/airflow (there's no actual tick for turfs) /datum/universal_state/supermatter_cascade/OnShuttleCall(var/mob/user) if(user) diff --git a/code/game/gamemodes/events/holidays/easter.dm b/code/game/gamemodes/events/holidays/easter.dm index e8fc031e9a3..584dd63af32 100644 --- a/code/game/gamemodes/events/holidays/easter.dm +++ b/code/game/gamemodes/events/holidays/easter.dm @@ -1,18 +1,18 @@ /proc/Easter_Game_Start() - Random_Egg() + Random_Egg() //Random egg /proc/Random_Egg() - to_world("

There is a golden egg hidden somewhere on the station...

") - var/list/Floorlist = list() - for(var/turf/T in world) - var/turf/simulated/floor/F = T - if(istype(F) && F.contents) - Floorlist += T - var/turf/simulated/floor/F = Floorlist[rand(1,Floorlist.len)] - Floorlist = null - var/obj/structure/closet/C = locate(/obj/structure/closet) in F - if (C) - new /obj/item/reagent_containers/food/snacks/goldenegg(C) - else - new /obj/item/reagent_containers/food/snacks/goldenegg(F) + to_world("

There is a golden egg hidden somewhere on the station...

") + var/list/Floorlist = list() + for(var/turf/T in world) + var/turf/simulated/floor/F = T + if(istype(F) && F.contents) + Floorlist += T + var/turf/simulated/floor/F = Floorlist[rand(1,Floorlist.len)] + Floorlist = null + var/obj/structure/closet/C = locate(/obj/structure/closet) in F + if (C) + new /obj/item/reagent_containers/food/snacks/goldenegg(C) + else + new /obj/item/reagent_containers/food/snacks/goldenegg(F) diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm index b9cdf222156..506320196ce 100644 --- a/code/game/gamemodes/extended/extended.dm +++ b/code/game/gamemodes/extended/extended.dm @@ -3,4 +3,4 @@ config_tag = "extended" required_players = 0 round_description = "Just have fun and role-play!" - extended_round_description = "There are no antagonists during extended, unless an admin decides to be cheeky. Just play your character, mess around with your job, and have fun." \ No newline at end of file + extended_round_description = "There are no antagonists during extended, unless an admin decides to be cheeky. Just play your character, mess around with your job, and have fun." diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm index f7739b766aa..b94b5b46cd7 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm @@ -308,10 +308,10 @@ to_chat(target, "SYSTEM LOG: System re¡3RT5§^#COMU@(#$)TED)@$") for(var/i = 0, i < 5, i++) var/temptxt = pick("1101000100101001010001001001",\ - "0101000100100100000100010010",\ - "0000010001001010100100111100",\ - "1010010011110000100101000100",\ - "0010010100010011010001001010") + "0101000100100100000100010010",\ + "0000010001001010100100111100",\ + "1010010011110000100101000100",\ + "0010010100010011010001001010") to_chat(target, temptxt) sleep(5) to_chat(target, "OPERATING KEYCODES RESET. SYSTEM FAILURE. EMERGENCY SHUTDOWN FAILED. SYSTEM FAILURE.") diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_synthetic.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_synthetic.dm index ddc2049eb0f..7e52ddee09a 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_synthetic.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_synthetic.dm @@ -303,10 +303,10 @@ to_chat(target, "SYSTEM LOG: System re¡3RT5§^#COMU@(#$)TED)@$") for(var/i = 0, i < 5, i++) var/temptxt = pick("1101000100101001010001001001",\ - "0101000100100100000100010010",\ - "0000010001001010100100111100",\ - "1010010011110000100101000100",\ - "0010010100010011010001001010") + "0101000100100100000100010010",\ + "0000010001001010100100111100",\ + "1010010011110000100101000100",\ + "0010010100010011010001001010") to_chat(target, temptxt) sleep(5) to_chat(target, "OPERATING KEYCODES RESET. SYSTEM FAILURE. EMERGENCY SHUTDOWN FAILED. SYSTEM FAILURE.") diff --git a/code/game/gamemodes/mixed/uprising.dm b/code/game/gamemodes/mixed/uprising.dm index b36f3311fbc..17dc577163c 100644 --- a/code/game/gamemodes/mixed/uprising.dm +++ b/code/game/gamemodes/mixed/uprising.dm @@ -6,4 +6,4 @@ required_players = 20 required_enemies = 3 antag_tags = list(MODE_REVOLUTIONARY, MODE_LOYALIST, MODE_TRAITOR) - require_all_templates = TRUE \ No newline at end of file + require_all_templates = TRUE diff --git a/code/game/gamemodes/revenants/revenants.dm b/code/game/gamemodes/revenants/revenants.dm index f9f6ae61866..e9a22d22c04 100644 --- a/code/game/gamemodes/revenants/revenants.dm +++ b/code/game/gamemodes/revenants/revenants.dm @@ -28,4 +28,4 @@ say_dead_direct("A slot for a Revenant as opened up!
Spawn in as it by using the ghost spawner menu in the ghost tab, and try to be good!") if(!R.enabled) R.enable() - next_spawn = world.time + rand(min_autotraitor_delay, max_autotraitor_delay) \ No newline at end of file + next_spawn = world.time + rand(min_autotraitor_delay, max_autotraitor_delay) diff --git a/code/game/gamemodes/technomancer/clothing.dm b/code/game/gamemodes/technomancer/clothing.dm index 781c08186eb..ce32b279d6f 100644 --- a/code/game/gamemodes/technomancer/clothing.dm +++ b/code/game/gamemodes/technomancer/clothing.dm @@ -8,7 +8,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|FEET|HANDS allowed = list(/obj/item/tank) armor = list( - melee = ARMOR_MELEE_MAJOR, + melee = ARMOR_MELEE_MAJOR, bullet = ARMOR_BALLISTIC_SMALL, laser = ARMOR_LASER_PISTOL, energy = ARMOR_ENERGY_RESISTANT, @@ -78,7 +78,7 @@ /obj/item/clothing/under/chameleon/technomancer armor = list( - melee = ARMOR_MELEE_MAJOR, + melee = ARMOR_MELEE_MAJOR, bullet = ARMOR_BALLISTIC_SMALL, laser = ARMOR_LASER_PISTOL, energy = ARMOR_ENERGY_RESISTANT, @@ -88,7 +88,7 @@ /obj/item/clothing/head/chameleon/technomancer armor = list( - melee = ARMOR_MELEE_MAJOR, + melee = ARMOR_MELEE_MAJOR, bullet = ARMOR_BALLISTIC_SMALL, laser = ARMOR_LASER_PISTOL, energy = ARMOR_ENERGY_RESISTANT, @@ -98,7 +98,7 @@ /obj/item/clothing/shoes/chameleon/technomancer armor = list( - melee = ARMOR_MELEE_MAJOR, + melee = ARMOR_MELEE_MAJOR, bullet = ARMOR_BALLISTIC_SMALL, laser = ARMOR_LASER_PISTOL, energy = ARMOR_ENERGY_RESISTANT, @@ -108,10 +108,10 @@ /obj/item/clothing/suit/chameleon/technomancer armor = list( - melee = ARMOR_MELEE_MAJOR, + melee = ARMOR_MELEE_MAJOR, bullet = ARMOR_BALLISTIC_SMALL, laser = ARMOR_LASER_PISTOL, energy = ARMOR_ENERGY_RESISTANT, bomb = ARMOR_BOMB_MINOR, rad = ARMOR_RAD_RESISTANT - ) \ No newline at end of file + ) diff --git a/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm b/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm index b158ce1bea3..85b14c634b3 100644 --- a/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm +++ b/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm @@ -63,4 +63,4 @@ wearer.nutrition = max(wearer.nutrition - 10, 0) if(wearer.getCloneLoss()) wearer.adjustCloneLoss(-0.1) - wearer.nutrition = max(wearer.nutrition - 20, 0) \ No newline at end of file + wearer.nutrition = max(wearer.nutrition - 20, 0) diff --git a/code/game/gamemodes/technomancer/devices/implants.dm b/code/game/gamemodes/technomancer/devices/implants.dm index fd30fdd7780..1852729ce0c 100644 --- a/code/game/gamemodes/technomancer/devices/implants.dm +++ b/code/game/gamemodes/technomancer/devices/implants.dm @@ -8,4 +8,4 @@ name = "Explosive Implant" desc = "A hidden implant which will explode if it hears a passphrase." cost = 150 - obj_path = /obj/item/storage/box/syndie_kit/imp_explosive \ No newline at end of file + obj_path = /obj/item/storage/box/syndie_kit/imp_explosive diff --git a/code/game/gamemodes/technomancer/devices/shield_armor.dm b/code/game/gamemodes/technomancer/devices/shield_armor.dm index 6316e6779b4..31cfd182297 100644 --- a/code/game/gamemodes/technomancer/devices/shield_armor.dm +++ b/code/game/gamemodes/technomancer/devices/shield_armor.dm @@ -82,4 +82,4 @@ else set_light(0, 0, l_color = "#000000") ..() - return \ No newline at end of file + return diff --git a/code/game/gamemodes/technomancer/devices/tesla_armor.dm b/code/game/gamemodes/technomancer/devices/tesla_armor.dm index 72cf6472e9a..8d26e66c510 100644 --- a/code/game/gamemodes/technomancer/devices/tesla_armor.dm +++ b/code/game/gamemodes/technomancer/devices/tesla_armor.dm @@ -83,4 +83,4 @@ lightning.old_style_target(target) lightning.fire() visible_message("\The [src] strikes \the [target] with lightning!") - playsound(src, 'sound/weapons/gaussrifle1.ogg', 75, 1) \ No newline at end of file + playsound(src, 'sound/weapons/gaussrifle1.ogg', 75, 1) diff --git a/code/game/gamemodes/technomancer/presets.dm b/code/game/gamemodes/technomancer/presets.dm index 6222f39a12b..907a45930e9 100644 --- a/code/game/gamemodes/technomancer/presets.dm +++ b/code/game/gamemodes/technomancer/presets.dm @@ -51,4 +51,4 @@ desc = "This preset includes many Aspect functions, such as Aspect Aura, Aspect Bolt, Aspect Cloud, Aspect Weapon, etc, as well as \ cheap functions beloning to each aspect, for the purposes of combining with an aspect function. This allows you to be \ very flexable, however functions made from aspect functions tend to be weaker due to this. Not recommended for beginners." - cost = 600 \ No newline at end of file + cost = 600 diff --git a/code/game/gamemodes/technomancer/spell_objs_helpers.dm b/code/game/gamemodes/technomancer/spell_objs_helpers.dm index f34e8fb8cf4..c9db0e72725 100644 --- a/code/game/gamemodes/technomancer/spell_objs_helpers.dm +++ b/code/game/gamemodes/technomancer/spell_objs_helpers.dm @@ -54,4 +54,4 @@ if(!L.stat) // Don't want to target dead people or SSDs. chosen_target = L break - return chosen_target \ No newline at end of file + return chosen_target diff --git a/code/game/gamemodes/technomancer/spells/aura/fire_aura.dm b/code/game/gamemodes/technomancer/spells/aura/fire_aura.dm index ad5871ddf64..e0f5b0ed700 100644 --- a/code/game/gamemodes/technomancer/spells/aura/fire_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aura/fire_aura.dm @@ -51,4 +51,4 @@ T.hotspot_expose(500, 50, 1) T.create_fire(fire_power) - adjust_instability(3) \ No newline at end of file + adjust_instability(3) diff --git a/code/game/gamemodes/technomancer/spells/aura/frost_aura.dm b/code/game/gamemodes/technomancer/spells/aura/frost_aura.dm index d80df93f28e..4b629977de9 100644 --- a/code/game/gamemodes/technomancer/spells/aura/frost_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aura/frost_aura.dm @@ -40,4 +40,4 @@ temp_change *= cold_factor H.bodytemperature = max(H.bodytemperature - temp_change, temp_cap) - adjust_instability(1) \ No newline at end of file + adjust_instability(1) diff --git a/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm b/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm index 9a06d180413..92eb413e837 100644 --- a/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm @@ -28,7 +28,7 @@ for(var/mob/living/L in nearby_mobs) if(is_ally(L)) continue - + if(L.loc == owner) continue diff --git a/code/game/gamemodes/technomancer/spells/aura/unstable_aura.dm b/code/game/gamemodes/technomancer/spells/aura/unstable_aura.dm index 03cc98f370d..0ae64e7b929 100644 --- a/code/game/gamemodes/technomancer/spells/aura/unstable_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aura/unstable_aura.dm @@ -24,7 +24,7 @@ for(var/mob/living/L in nearby_mobs) if(is_ally(L)) continue - + if(L.loc == owner) continue @@ -43,4 +43,4 @@ to_chat(L, "You feel almost like you're melting from the inside!") - adjust_instability(2) \ No newline at end of file + adjust_instability(2) diff --git a/code/game/gamemodes/technomancer/spells/modifier/mend_life.dm b/code/game/gamemodes/technomancer/spells/modifier/mend_life.dm index c65f3c65efe..8a072be4ddb 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/mend_life.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/mend_life.dm @@ -39,4 +39,4 @@ if(source) var/mob/living/L = source if(istype(L)) - L.adjust_instability(1) \ No newline at end of file + L.adjust_instability(1) diff --git a/code/game/gamemodes/technomancer/spells/modifier/mend_synthetic.dm b/code/game/gamemodes/technomancer/spells/modifier/mend_synthetic.dm index 10512828383..79cc07bf456 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/mend_synthetic.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/mend_synthetic.dm @@ -45,4 +45,4 @@ if(source) var/mob/living/L = source if(istype(L)) - L.adjust_instability(1) \ No newline at end of file + L.adjust_instability(1) diff --git a/code/game/gamemodes/technomancer/spells/projectile/ionic_bolt.dm b/code/game/gamemodes/technomancer/spells/projectile/ionic_bolt.dm index d40d76ac3d7..68dd4fca2a1 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/ionic_bolt.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/ionic_bolt.dm @@ -18,4 +18,4 @@ instability_per_shot = 6 cooldown = 10 pre_shot_delay = 0 - fire_sound = 'sound/effects/supermatter.ogg' \ No newline at end of file + fire_sound = 'sound/effects/supermatter.ogg' diff --git a/code/game/gamemodes/technomancer/spells/projectile/lightning.dm b/code/game/gamemodes/technomancer/spells/projectile/lightning.dm index 0c663984afa..6241462901b 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/lightning.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/lightning.dm @@ -45,4 +45,4 @@ /obj/item/projectile/beam/lightning/attack_mob(var/mob/living/target_mob, var/distance, var/miss_modifier=0) ..() tesla_zap(target_mob, 3, power) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/technomancer/spells/reflect.dm b/code/game/gamemodes/technomancer/spells/reflect.dm index 3ef5e396e33..efea474bd4e 100644 --- a/code/game/gamemodes/technomancer/spells/reflect.dm +++ b/code/game/gamemodes/technomancer/spells/reflect.dm @@ -86,4 +86,4 @@ to_chat(owner, "Your shield fades due being used up!") qdel(src) return PROJECTILE_STOPPED - return FALSE \ No newline at end of file + return FALSE diff --git a/code/game/gamemodes/technomancer/spells/spawner/darkness.dm b/code/game/gamemodes/technomancer/spells/spawner/darkness.dm index 59bb4e5f9fb..07b4a4bfd3c 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/darkness.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/darkness.dm @@ -28,4 +28,4 @@ time_to_die = 2 MINUTES invisibility = 101 light_range = 6 - light_power = -20 \ No newline at end of file + light_power = -20 diff --git a/code/game/gamemodes/technomancer/spells/spawner/destablize.dm b/code/game/gamemodes/technomancer/spells/spawner/destablize.dm index e32ccd262db..a270897a56e 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/destablize.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/destablize.dm @@ -51,4 +51,4 @@ var/outgoing_instability = instability_power * ( 1 / (radius**2) ) L.receive_radiated_instability(outgoing_instability) pulses_remaining-- - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/game/gamemodes/technomancer/spells/spawner/fire_blast.dm b/code/game/gamemodes/technomancer/spells/spawner/fire_blast.dm index ff8fe1efd31..f0dc6443dca 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/fire_blast.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/fire_blast.dm @@ -38,4 +38,4 @@ var/datum/effect/system/explosion/E = new /datum/effect/system/explosion() E.set_up(get_turf(src)) E.start() - return ..() \ No newline at end of file + return ..() diff --git a/code/game/jobs/faction/admin.dm b/code/game/jobs/faction/admin.dm index 9cdb7320503..0dc028aa2d2 100644 --- a/code/game/jobs/faction/admin.dm +++ b/code/game/jobs/faction/admin.dm @@ -15,4 +15,4 @@ ) /datum/faction/admin/is_visible(var/mob/user) - return check_rights(R_CCIAA, FALSE, user) \ No newline at end of file + return check_rights(R_CCIAA, FALSE, user) diff --git a/code/game/jobs/faction/faction.dm b/code/game/jobs/faction/faction.dm index 092978d88bd..c8222f232fc 100644 --- a/code/game/jobs/faction/faction.dm +++ b/code/game/jobs/faction/faction.dm @@ -86,4 +86,4 @@ return objective /datum/faction/proc/is_visible(var/mob/user) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index a103544c3c8..f855b80f1f7 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -109,13 +109,14 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) outfit = /datum/outfit/job/xo access = list(access_sec_doors, access_medical, access_engine, access_ship_weapons, access_change_ids, access_eva, access_heads, - access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, - access_crematorium, access_kitchen, access_hydroponics,access_chapel_office, access_library, access_research, access_mining, access_mailsorting, - access_janitor, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_journalist, access_bridge_crew, access_intrepid, access_teleporter) + access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, + access_crematorium, access_kitchen, access_hydroponics,access_chapel_office, access_library, access_research, access_mining, access_mailsorting, + access_janitor, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_journalist, access_bridge_crew, access_intrepid, access_teleporter) + minimal_access = list(access_sec_doors, access_medical, access_ship_weapons, access_engine, access_change_ids, access_eva, access_heads, - access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, - access_crematorium, access_kitchen, access_hydroponics, access_chapel_office, access_library, access_research, access_mining, access_mailsorting, - access_janitor, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_journalist, access_bridge_crew, access_intrepid, access_teleporter) + access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, + access_crematorium, access_kitchen, access_hydroponics, access_chapel_office, access_library, access_research, access_mining, access_mailsorting, + access_janitor, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_journalist, access_bridge_crew, access_intrepid, access_teleporter) blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index e76391daf07..333ac64f82d 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -25,13 +25,15 @@ access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, - access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, access_leviathan, access_ship_weapons, - access_heads, access_construction, access_sec_doors, access_research, access_medical, access_mining, access_mailsorting, - access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_it, access_intrepid, access_network) + access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, access_leviathan, access_ship_weapons, + access_heads, access_construction, access_sec_doors, access_research, access_medical, access_mining, access_mailsorting, + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_it, access_intrepid, access_network) + minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, - access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, access_leviathan, access_ship_weapons, - access_heads, access_construction, access_sec_doors, access_research, access_medical, access_mining, access_mailsorting, - access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_it, access_bridge_crew, access_intrepid, access_network) + access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, access_leviathan, access_ship_weapons, + access_heads, access_construction, access_sec_doors, access_research, access_medical, access_mining, access_mailsorting, + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_it, access_bridge_crew, access_intrepid, access_network) + minimal_player_age = 7 outfit = /datum/outfit/job/chief_engineer diff --git a/code/game/jobs/job/hra.dm b/code/game/jobs/job/hra.dm index 15480bfd161..f6c501ef2a6 100644 --- a/code/game/jobs/job/hra.dm +++ b/code/game/jobs/job/hra.dm @@ -18,9 +18,10 @@ selection_color = "#c9ad12" access = list(access_sec_doors, access_medical, access_engine, access_eva, access_heads, access_maint_tunnels, - access_construction, access_research, access_gateway, access_weapons, access_bridge_crew, access_intrepid, access_cent_ccia) + access_construction, access_research, access_gateway, access_weapons, access_bridge_crew, access_intrepid, access_cent_ccia) + minimal_access = list(access_sec_doors, access_medical, access_engine, access_eva, access_heads, access_maint_tunnels, - access_construction, access_research, access_gateway, access_weapons, access_bridge_crew, access_intrepid, access_cent_ccia) + access_construction, access_research, access_gateway, access_weapons, access_bridge_crew, access_intrepid, access_cent_ccia) outfit = /datum/outfit/job/hra blacklisted_species = list(SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 76a45bff852..3c6b66adf68 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -18,15 +18,17 @@ ) access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, - access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, - access_research, access_engine, access_ship_weapons, access_mining, access_medical, access_construction, access_mailsorting, - access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, - access_weapons, access_intrepid, access_teleporter) + access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, + access_research, access_engine, access_ship_weapons, access_mining, access_medical, access_construction, access_mailsorting, + access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, + access_weapons, access_intrepid, access_teleporter) + minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, - access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, - access_research, access_engine, access_ship_weapons, access_mining, access_medical, access_construction, access_mailsorting, - access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, - access_weapons, access_intrepid, access_teleporter) + access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, + access_research, access_engine, access_ship_weapons, access_mining, access_medical, access_construction, access_mailsorting, + access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, + access_weapons, access_intrepid, access_teleporter) + minimal_player_age = 14 outfit = /datum/outfit/job/hos diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 4998bcdef99..67b38b4a421 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -163,4 +163,4 @@ var/list/nonhuman_positions = list( if(J.title == job) titles = J.alt_titles - return titles \ No newline at end of file + return titles diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index 9bdad11fc87..2b907fc81da 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -42,7 +42,7 @@ )) data["scrubbers"] = scrubberdata - + return data /obj/machinery/computer/area_atmos/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) @@ -53,14 +53,14 @@ if(action=="scan") scanscrubbers() return TRUE - + if(action=="cmode") for(var/obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber in connectedscrubbers) if(scrubber.id == text2num(params["cmode"])) scrubber.on = !(scrubber.on) scrubber.update_icon() break - + return TRUE /obj/machinery/computer/area_atmos/proc/scanscrubbers() diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index b5126e90551..2edf5696ff1 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -95,7 +95,7 @@ object = /obj/item/reagent_containers/food/condiment/enzyme /* - FERTILIZER +FERTILIZER */ /singleton/biorecipe/fertilizer @@ -115,7 +115,7 @@ cost = 180 /* - ITEMS +ITEMS */ /singleton/biorecipe/item name = "Towel" @@ -182,7 +182,7 @@ cost = 600 /* - CONSTRUCTION +CONSTRUCTION */ /singleton/biorecipe/construction @@ -215,7 +215,7 @@ object = /obj/item/stack/material/plastic /* - SPECIAL +SPECIAL */ /singleton/biorecipe/mushroom diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 121ac4aca32..0adc7cf784d 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -227,7 +227,7 @@ if(istype(loc,/obj/effect/dummy)) return TRACKING_TERMINATE - // Now, are they viewable by a camera? (This is last because it's the most intensive check) + // Now, are they viewable by a camera? (This is last because it's the most intensive check) return near_camera() ? TRACKING_POSSIBLE : TRACKING_NO_COVERAGE /mob/living/silicon/robot/tracking_status() diff --git a/code/game/machinery/computer/arcade_orion.dm b/code/game/machinery/computer/arcade_orion.dm index 9160b762ba1..d231445a9b6 100644 --- a/code/game/machinery/computer/arcade_orion.dm +++ b/code/game/machinery/computer/arcade_orion.dm @@ -38,15 +38,17 @@ var/list/supply_name = list("1" = "engine parts", "2" = "hull parts", "3" = "electronic parts", "4" = "food", "5" = "fuel", "6" = "credits") var/list/settlers = list() var/num_traitors = 0 - var/list/events = list(ORION_TRAIL_RAIDERS = 3, - ORION_TRAIL_FLUX = 1, - ORION_TRAIL_ILLNESS = 3, - ORION_TRAIL_BREAKDOWN = 2, - ORION_TRAIL_MUTINY = 3, - ORION_TRAIL_MALFUNCTION = 2, - ORION_TRAIL_COLLISION = 1, - ORION_TRAIL_CARP = 3 - ) + var/list/events = list( + ORION_TRAIL_RAIDERS = 3, + ORION_TRAIL_FLUX = 1, + ORION_TRAIL_ILLNESS = 3, + ORION_TRAIL_BREAKDOWN = 2, + ORION_TRAIL_MUTINY = 3, + ORION_TRAIL_MALFUNCTION = 2, + ORION_TRAIL_COLLISION = 1, + ORION_TRAIL_CARP = 3 + ) + var/list/stops = list("Pluto","Asteroid Belt","Proxima Centauri","Dead Space","Rigel Prime","Tau Ceti Beta","Black Hole","Space Outpost Beta-9","Orion Prime") var/list/stopblurbs = list( "Pluto, long since occupied with long-range sensors and scanners, stands ready to, and indeed continues to probe the far reaches of the galaxy.", diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 092230a90f2..1770d538c85 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -18,8 +18,8 @@ var/global/list/minor_air_alarms = list() atmosphere_alarm.register_alarm(src, TYPE_PROC_REF(/atom, update_icon)) /obj/machinery/computer/atmos_alert/Destroy() - atmosphere_alarm.unregister_alarm(src) - return ..() + atmosphere_alarm.unregister_alarm(src) + return ..() /obj/machinery/computer/atmos_alert/attack_hand(mob/user) ui_interact(user) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 14793d651b2..deb23de93a5 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -90,17 +90,17 @@ /obj/machinery/atmospherics/unary/cryo_cell/attack_hand(mob/user) ui_interact(user) - /** - * The ui_interact proc is used to open and update Nano UIs - * If ui_interact is not used then the UI will not update correctly - * ui_interact is currently defined for /atom/movable (which is inherited by /obj and /mob) - * - * @param user /mob The mob who is interacting with this ui - * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") - * @param ui /datum/nanoui This parameter is passed by the nanoui process() proc when updating an open ui - * - * @return nothing - */ +/** + * The ui_interact proc is used to open and update Nano UIs + * If ui_interact is not used then the UI will not update correctly + * ui_interact is currently defined for /atom/movable (which is inherited by /obj and /mob) + * + * @param user /mob The mob who is interacting with this ui + * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") + * @param ui /datum/nanoui This parameter is passed by the nanoui process() proc when updating an open ui + * + * @return nothing + */ /obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if(user == occupant || user.stat) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index a981ba2f72e..51885aec9a8 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -59,7 +59,7 @@ /obj/machinery/door_timer/examine(mob/user) . = ..() if(stat & (NOPOWER|BROKEN)) return - + if(src.timing) var/second = round(timeleft() % 60) var/minute = round((timeleft() - second) / 60) @@ -472,4 +472,4 @@ #undef FONT_SIZE #undef FONT_COLOR #undef FONT_STYLE -#undef CHARS_PER_LINE \ No newline at end of file +#undef CHARS_PER_LINE diff --git a/code/game/machinery/doors/checkForMultipleDoors.dm b/code/game/machinery/doors/checkForMultipleDoors.dm index 99aa39f6b00..6f2b3dbfc4f 100644 --- a/code/game/machinery/doors/checkForMultipleDoors.dm +++ b/code/game/machinery/doors/checkForMultipleDoors.dm @@ -12,4 +12,4 @@ for(var/obj/machinery/door/D in locate(src.x,src.y,src.z)) if(!istype(D, /obj/machinery/door/window) && D.density) return 0 - return 1 \ No newline at end of file + return 1 diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index f08d063f37c..8dad06bf317 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -506,7 +506,7 @@ icon = 'icons/obj/doors/edge_Doorfire.dmi' glass = 1 //There is a glass window so you can see through the door - //This is needed due to BYOND limitations in controlling visibility + //This is needed due to BYOND limitations in controlling visibility heat_proof = 1 air_properties_vary_with_direction = 1 diff --git a/code/game/machinery/doors/firedoor_assembly.dm b/code/game/machinery/doors/firedoor_assembly.dm index 483d273f125..54721d3bbb9 100644 --- a/code/game/machinery/doors/firedoor_assembly.dm +++ b/code/game/machinery/doors/firedoor_assembly.dm @@ -40,7 +40,7 @@ if(anchored) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user.visible_message("[user] has inserted a circuit into \the [src]!", - "You have inserted the circuit into \the [src]!") + "You have inserted the circuit into \the [src]!") new /obj/machinery/door/firedoor(src.loc) qdel(C) qdel(src) @@ -51,7 +51,7 @@ anchored = !anchored playsound(src.loc, C.usesound, 50, 1) user.visible_message("[user] has [anchored ? "" : "un" ]secured \the [src]!", - "You have [anchored ? "" : "un" ]secured \the [src]!") + "You have [anchored ? "" : "un" ]secured \the [src]!") update_icon() return TRUE else if(!anchored && C.iswelder()) diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 227d3959967..932ca8bb9e1 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -135,7 +135,7 @@ ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one - // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm + // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm ui = new(user, src, ui_key, "jukebox.tmpl", title, 450, 600) // when the ui is first opened this is the data it will use ui.set_initial_data(data) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 844d129d7cf..4490459ca86 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -1,80 +1,80 @@ /* Overview: - Used to create objects that need a per step proc call. Default definition of 'New()' - stores a reference to src machine in global 'machines list'. Default definition - of 'Del' removes reference to src machine in global 'machines list'. + Used to create objects that need a per step proc call. Default definition of 'New()' + stores a reference to src machine in global 'machines list'. Default definition + of 'Del' removes reference to src machine in global 'machines list'. Class Variables: - use_power (num) - current state of auto power use. - Possible Values: - 0 -- no auto power use - 1 -- machine is using power at its idle power level - 2 -- machine is using power at its active power level - - active_power_usage (num) - Value for the amount of power to use when in active power mode - - idle_power_usage (num) - Value for the amount of power to use when in idle power mode - - power_channel (num) - What channel to draw from when drawing power for power mode - Possible Values: - EQUIP:0 -- Equipment Channel - LIGHT:2 -- Lighting Channel - ENVIRON:3 -- Environment Channel - - component_parts (list) - A list of component parts of machine used by frame based machines. - - panel_open (num) - Whether the panel is open - - uid (num) - Unique id of machine across all machines. - - gl_uid (global num) - Next uid value in sequence - - stat (bitflag) - Machine status bit flags. - Possible bit flags: - BROKEN:1 -- Machine is broken - NOPOWER:2 -- No power is being supplied to machine. - POWEROFF:4 -- tbd - MAINT:8 -- machine is currently under going maintenance. - EMPED:16 -- temporary broken by EMP pulse + use_power (num) + current state of auto power use. + Possible Values: + 0 -- no auto power use + 1 -- machine is using power at its idle power level + 2 -- machine is using power at its active power level + + active_power_usage (num) + Value for the amount of power to use when in active power mode + + idle_power_usage (num) + Value for the amount of power to use when in idle power mode + + power_channel (num) + What channel to draw from when drawing power for power mode + Possible Values: + EQUIP:0 -- Equipment Channel + LIGHT:2 -- Lighting Channel + ENVIRON:3 -- Environment Channel + + component_parts (list) + A list of component parts of machine used by frame based machines. + + panel_open (num) + Whether the panel is open + + uid (num) + Unique id of machine across all machines. + + gl_uid (global num) + Next uid value in sequence + + stat (bitflag) + Machine status bit flags. + Possible bit flags: + BROKEN:1 -- Machine is broken + NOPOWER:2 -- No power is being supplied to machine. + POWEROFF:4 -- tbd + MAINT:8 -- machine is currently under going maintenance. + EMPED:16 -- temporary broken by EMP pulse Class Procs: - New() 'game/machinery/machine.dm' + New() 'game/machinery/machine.dm' - Destroy() 'game/machinery/machine.dm' + Destroy() 'game/machinery/machine.dm' - powered(chan = EQUIP) 'modules/power/power_usage.dm' - Checks to see if area that contains the object has power available for power - channel given in 'chan'. + powered(chan = EQUIP) 'modules/power/power_usage.dm' + Checks to see if area that contains the object has power available for power + channel given in 'chan'. - use_power_oneoff(amount, chan=EQUIP, autocalled) 'modules/power/power_usage.dm' - Deducts 'amount' from the power channel 'chan' of the area that contains the object. - This is not a continuous draw, but rather will be cleared after one APC update. + use_power_oneoff(amount, chan=EQUIP, autocalled) 'modules/power/power_usage.dm' + Deducts 'amount' from the power channel 'chan' of the area that contains the object. + This is not a continuous draw, but rather will be cleared after one APC update. - power_change() 'modules/power/power_usage.dm' - Called by the area that contains the object when ever that area under goes a - power state change (area runs out of power, or area channel is turned off). + power_change() 'modules/power/power_usage.dm' + Called by the area that contains the object when ever that area under goes a + power state change (area runs out of power, or area channel is turned off). - RefreshParts() 'game/machinery/machine.dm' - Called to refresh the variables in the machine that are contributed to by parts - contained in the component_parts list. (example: glass and material amounts for - the autolathe) + RefreshParts() 'game/machinery/machine.dm' + Called to refresh the variables in the machine that are contributed to by parts + contained in the component_parts list. (example: glass and material amounts for + the autolathe) - Default definition does nothing. + Default definition does nothing. - assign_uid() 'game/machinery/machine.dm' - Called by machine to assign a value to the uid variable. + assign_uid() 'game/machinery/machine.dm' + Called by machine to assign a value to the uid variable. - process() 'game/machinery/machine.dm' - Called by the 'master_controller' once per game tick for each machine that is listed in the 'machines' list. + process() 'game/machinery/machine.dm' + Called by the 'master_controller' once per game tick for each machine that is listed in the 'machines' list. Compiled by Aygar diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 88c8084e311..74c55c2a4bb 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -907,12 +907,12 @@ var/list/obj/machinery/newscaster/allCasters = list() if(user.a_intent == I_GRAB) if(!rolled) user.visible_message(SPAN_NOTICE("\The [user] rolls up \the [src]."),\ - SPAN_NOTICE("You roll up \the [src].")) + SPAN_NOTICE("You roll up \the [src].")) rolled(user) return if(rolled) user.visible_message(SPAN_NOTICE("\The [user] unrolls \the [src] to read it."),\ - SPAN_NOTICE("You unroll \the [src] to read it.")) + SPAN_NOTICE("You unroll \the [src] to read it.")) rolled(user) if(ishuman(user)) var/mob/living/carbon/human/human_user = user @@ -1030,7 +1030,7 @@ var/list/obj/machinery/newscaster/allCasters = list() if(W.ispen()) if(rolled) user.visible_message(SPAN_NOTICE("\The [user] unrolls \the [src] to write on it."),\ - SPAN_NOTICE("You unroll \the [src] to write on it.")) + SPAN_NOTICE("You unroll \the [src] to write on it.")) rolled() if(src.scribble_page == src.curr_page) to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?") diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 249d522057f..0ef59b9f3e6 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -1514,7 +1514,7 @@ qdel(src) // remove the pipe item return TRUE - //TODO: DEFERRED + //TODO: DEFERRED // ensure that setterm() is called for a newly connected pipeline diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 493e30c65db..51c70f81dd9 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -120,4 +120,4 @@ audible_message(SPAN_NOTICE("Calibration complete.")) /obj/machinery/teleport/pad/ninja - ignore_distance = TRUE \ No newline at end of file + ignore_distance = TRUE diff --git a/code/game/machinery/tesla_beacon.dm b/code/game/machinery/tesla_beacon.dm index 22242ce7e73..43d3ac0411b 100644 --- a/code/game/machinery/tesla_beacon.dm +++ b/code/game/machinery/tesla_beacon.dm @@ -86,4 +86,4 @@ if(Adjacent(user)) return attack_hand(user) else - to_chat(user, SPAN_WARNING("You need to be adjacent to \the [src] to activate it!")) \ No newline at end of file + to_chat(user, SPAN_WARNING("You need to be adjacent to \the [src] to activate it!")) diff --git a/code/game/objects/auras/auras.dm b/code/game/objects/auras/auras.dm index 6e46057d680..7a3e4d2b350 100644 --- a/code/game/objects/auras/auras.dm +++ b/code/game/objects/auras/auras.dm @@ -28,4 +28,4 @@ They should also be used for when you want to effect the ENTIRE mob, like having return FALSE /obj/aura/hitby(atom/movable/M, speed) - return FALSE \ No newline at end of file + return FALSE diff --git a/code/game/objects/auras/personal_shield.dm b/code/game/objects/auras/personal_shield.dm index dc66777dd37..7877076a8da 100644 --- a/code/game/objects/auras/personal_shield.dm +++ b/code/game/objects/auras/personal_shield.dm @@ -33,4 +33,4 @@ /obj/aura/personal_shield/device/Destroy() shield = null - return ..() \ No newline at end of file + return ..() diff --git a/code/game/objects/auras/radiant_aura.dm b/code/game/objects/auras/radiant_aura.dm index e444c0bcf25..77e51091e7b 100644 --- a/code/game/objects/auras/radiant_aura.dm +++ b/code/game/objects/auras/radiant_aura.dm @@ -18,4 +18,4 @@ if(P.check_armor == LASER) user.visible_message(SPAN_WARNING("\The [P] refracts, bending into \the [user]'s aura.")) return AURA_FALSE - return FALSE \ No newline at end of file + return FALSE diff --git a/code/game/objects/effects/decals/Cleanable/aliens.dm b/code/game/objects/effects/decals/Cleanable/aliens.dm index 57a32434af2..cd2ab0d870f 100644 --- a/code/game/objects/effects/decals/Cleanable/aliens.dm +++ b/code/game/objects/effects/decals/Cleanable/aliens.dm @@ -30,4 +30,4 @@ random_icon_states = list("xgibmid1", "xgibmid2", "xgibmid3") /obj/effect/decal/cleanable/blood/xtracks - basecolor = "#05EE05" \ No newline at end of file + basecolor = "#05EE05" diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 2bf0f8248c2..d2af0b5fc84 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -155,8 +155,8 @@ add_verb(user, /mob/living/carbon/human/proc/bloody_doodle) /obj/effect/decal/cleanable/blood/splatter - random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5") - amount = 2 + random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5") + amount = 2 /obj/effect/decal/cleanable/blood/drip name = "drips of blood" diff --git a/code/game/objects/effects/decals/bullet_holes.dm b/code/game/objects/effects/decals/bullet_holes.dm index e08eea9cea1..bb2a60e84d1 100644 --- a/code/game/objects/effects/decals/bullet_holes.dm +++ b/code/game/objects/effects/decals/bullet_holes.dm @@ -1,6 +1,6 @@ /obj/effect/overlay/bmark - name = "bullet hole" - desc = "Somebody's been shooting." - icon = 'icons/effects/effects.dmi' - layer = ABOVE_OBJ_LAYER - icon_state = "dent" \ No newline at end of file + name = "bullet hole" + desc = "Somebody's been shooting." + icon = 'icons/effects/effects.dmi' + layer = ABOVE_OBJ_LAYER + icon_state = "dent" diff --git a/code/game/objects/effects/decals/posters/bs12.dm b/code/game/objects/effects/decals/posters/bs12.dm index 1fc20e6cf8c..4a654b19167 100644 --- a/code/game/objects/effects/decals/posters/bs12.dm +++ b/code/game/objects/effects/decals/posters/bs12.dm @@ -242,4 +242,4 @@ /datum/poster/bay_68 icon_state = "tcflposter2" name = "Tau Ceti Foreign Legion" - desc = "A TCFL recruitment poster showcasing the benefits Synthetics gain when enlisting." \ No newline at end of file + desc = "A TCFL recruitment poster showcasing the benefits Synthetics gain when enlisting." diff --git a/code/game/objects/effects/decals/posters/tgposters.dm b/code/game/objects/effects/decals/posters/tgposters.dm index 0c74be7228f..3e3f7af6408 100644 --- a/code/game/objects/effects/decals/posters/tgposters.dm +++ b/code/game/objects/effects/decals/posters/tgposters.dm @@ -13,4 +13,4 @@ /datum/poster/tg_10 name = "Access Panel Diagram" desc = "This poster details the internal workings of a typical airlock's access panel." - icon_state="poster10" \ No newline at end of file + icon_state="poster10" diff --git a/code/game/objects/effects/projectile/projectile_impact.dm b/code/game/objects/effects/projectile/projectile_impact.dm index f4b925f6def..b82f33cfdfe 100644 --- a/code/game/objects/effects/projectile/projectile_impact.dm +++ b/code/game/objects/effects/projectile/projectile_impact.dm @@ -85,4 +85,4 @@ /obj/effect/projectile/impact/tesla icon_state = "impact_lightning" - light_color = LIGHT_COLOR_CYAN \ No newline at end of file + light_color = LIGHT_COLOR_CYAN diff --git a/code/game/objects/effects/projectile/projectile_muzzle.dm b/code/game/objects/effects/projectile/projectile_muzzle.dm index 3be5873bb8a..767b53bc58e 100644 --- a/code/game/objects/effects/projectile/projectile_muzzle.dm +++ b/code/game/objects/effects/projectile/projectile_muzzle.dm @@ -86,4 +86,4 @@ /obj/effect/projectile/muzzle/tesla icon_state = "muzzle_lightning" - light_color = LIGHT_COLOR_CYAN \ No newline at end of file + light_color = LIGHT_COLOR_CYAN diff --git a/code/game/objects/effects/projectile/projectile_tracer.dm b/code/game/objects/effects/projectile/projectile_tracer.dm index 46e29638bc8..54f18d62fd2 100644 --- a/code/game/objects/effects/projectile/projectile_tracer.dm +++ b/code/game/objects/effects/projectile/projectile_tracer.dm @@ -99,4 +99,4 @@ /obj/effect/projectile/tracer/tesla name = "lightning" icon_state = "lightning" - light_color = LIGHT_COLOR_CYAN \ No newline at end of file + light_color = LIGHT_COLOR_CYAN diff --git a/code/game/objects/effects/temporary_visuals/blaster_effect.dm b/code/game/objects/effects/temporary_visuals/blaster_effect.dm index 7014e4ad06c..d01abb4c344 100644 --- a/code/game/objects/effects/temporary_visuals/blaster_effect.dm +++ b/code/game/objects/effects/temporary_visuals/blaster_effect.dm @@ -1,4 +1,4 @@ /obj/effect/temp_visual/blaster_effect icon = 'icons/effects/blaster_hit.dmi' icon_state = "blaster_hit" - duration = 6 \ No newline at end of file + duration = 6 diff --git a/code/game/objects/effects/temporary_visuals/nuke.dm b/code/game/objects/effects/temporary_visuals/nuke.dm index 6b19e70b0cd..ecf4b535c7b 100644 --- a/code/game/objects/effects/temporary_visuals/nuke.dm +++ b/code/game/objects/effects/temporary_visuals/nuke.dm @@ -2,4 +2,4 @@ icon = 'icons/effects/effects.dmi' icon_state = "explosion" duration = 9 - layer= LIGHTING_LAYER+2 \ No newline at end of file + layer= LIGHTING_LAYER+2 diff --git a/code/game/objects/items/devices/auto_cpr.dm b/code/game/objects/items/devices/auto_cpr.dm index 50d66abfdf3..559d7c99fb0 100644 --- a/code/game/objects/items/devices/auto_cpr.dm +++ b/code/game/objects/items/devices/auto_cpr.dm @@ -5,9 +5,10 @@ desc = "A specialized medical harness that gives regular compressions to the patient's ribcage for cases of urgent heart issues, and functions as an emergency \ artificial respirator for cases of urgent lung issues." desc_info = "The Stabilizer Harness' CPR mode is capable of restarting the heart much like manual CPR with a chance for rib cracking ONLY IF the patient is flat lining,\ - while the EPP mode can keep the patient breathing during transport for as long as there's appropriate air in the installed tank. Both use power from the battery. \ -
Use this item in your hand to toggle the CPR or EPP modes on/off.
Use a Screwdriver on it to unscrew the panel to be able to remove/add other items. \ - The tank can be removed with a Wrench. The battery can be removed with a crowbar. Use the item in your hand the panel unscrewed to remove the breath mask." + while the EPP mode can keep the patient breathing during transport for as long as there's appropriate air in the installed tank. Both use power from the battery. \ +
Use this item in your hand to toggle the CPR or EPP modes on/off.
Use a Screwdriver on it to unscrew the panel to be able to remove/add other items. \ + The tank can be removed with a Wrench. The battery can be removed with a crowbar. Use the item in your hand the panel unscrewed to remove the breath mask." + icon = 'icons/obj/med_harness.dmi' icon_state = "med_harness" item_state = "med_harness" diff --git a/code/game/objects/items/devices/lighting/hull_beacon.dm b/code/game/objects/items/devices/lighting/hull_beacon.dm index b3ca3c391f4..76b5cdf584f 100644 --- a/code/game/objects/items/devices/lighting/hull_beacon.dm +++ b/code/game/objects/items/devices/lighting/hull_beacon.dm @@ -12,4 +12,4 @@ desc = "A light-emitting red hull beacon." icon_state = "beacon_red_on" light_color = LIGHT_COLOR_RED - light_range = 3 \ No newline at end of file + light_range = 3 diff --git a/code/game/objects/items/devices/oxycandle.dm b/code/game/objects/items/devices/oxycandle.dm index 961e5143054..db3e48dd58e 100644 --- a/code/game/objects/items/devices/oxycandle.dm +++ b/code/game/objects/items/devices/oxycandle.dm @@ -27,7 +27,7 @@ air_contents.volume = 200 //liters air_contents.temperature = T20C var/list/air_mix = list(GAS_OXYGEN = O2STANDARD * (target_pressure * air_contents.volume) / (R_IDEAL_GAS_EQUATION * air_contents.temperature), - GAS_NITROGEN = N2STANDARD * (target_pressure * air_contents.volume) / (R_IDEAL_GAS_EQUATION * air_contents.temperature)) + GAS_NITROGEN = N2STANDARD * (target_pressure * air_contents.volume) / (R_IDEAL_GAS_EQUATION * air_contents.temperature)) air_contents.adjust_multi(GAS_OXYGEN, air_mix[GAS_OXYGEN], GAS_NITROGEN, air_mix[GAS_NITROGEN]) START_PROCESSING(SSprocessing, src) @@ -58,7 +58,7 @@ environment.merge(removed) volume -= 200 var/list/air_mix = list(GAS_OXYGEN = O2STANDARD * (target_pressure * air_contents.volume) / (R_IDEAL_GAS_EQUATION * air_contents.temperature), - GAS_NITROGEN = N2STANDARD * (target_pressure * air_contents.volume) / (R_IDEAL_GAS_EQUATION * air_contents.temperature)) + GAS_NITROGEN = N2STANDARD * (target_pressure * air_contents.volume) / (R_IDEAL_GAS_EQUATION * air_contents.temperature)) air_contents.adjust_multi(GAS_OXYGEN, air_mix[GAS_OXYGEN], GAS_NITROGEN, air_mix[GAS_NITROGEN]) /obj/item/device/oxycandle/update_icon() @@ -75,4 +75,4 @@ /obj/item/device/oxycandle/Destroy() QDEL_NULL(air_contents) STOP_PROCESSING(SSprocessing, src) - . = ..() \ No newline at end of file + . = ..() diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 1facb026e27..1c5fdf6d275 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -145,90 +145,90 @@ @@ -321,7 +321,7 @@ else dat += {" pAI Request Module

-

No personality is installed.

+

No personality is installed.

Request personality diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 4021953549e..771fffae89c 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -420,7 +420,7 @@ pixel_x = 8; return INITIALIZE_HINT_NORMAL /obj/item/device/radio/intercom/locked - var/locked_frequency + var/locked_frequency /obj/item/device/radio/intercom/locked/north PRESET_NORTH diff --git a/code/game/objects/items/devices/slide_projector.dm b/code/game/objects/items/devices/slide_projector.dm index 826074d9c58..83cbd925416 100644 --- a/code/game/objects/items/devices/slide_projector.dm +++ b/code/game/objects/items/devices/slide_projector.dm @@ -71,7 +71,7 @@ moved_event.unregister(src, src, PROC_REF(check_projections)) set_light(0) update_icon() - + /obj/item/storage/slide_projector/proc/project_at(turf/target) stop_projecting() if(!current_slide) @@ -96,7 +96,7 @@ data += "Disable Projector" else data += "Projector Inactive" - + var/table = list("") var/i = 1 for(var/obj/item/I in contents) @@ -131,7 +131,7 @@ return TRUE set_slide(contents[index]) . = FALSE - + interact(usr) /obj/effect/projection diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm index e684ebd318b..a6ea8bdb878 100644 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -51,13 +51,13 @@ A list of items and costs is stored under the datum of every game mode, alongsid // HIDDEN UPLINK - Can be stored in anything but the host item has to have a trigger for it. /* How to create an uplink in 3 easy steps! - 1. All obj/item 's have a hidden_uplink var. By default it's null. Give the item one with "new(src)", it must be in it's contents. Feel free to add "uses". +1. All obj/item 's have a hidden_uplink var. By default it's null. Give the item one with "new(src)", it must be in it's contents. Feel free to add "uses". - 2. Code in the triggers. Use check_trigger for this, I recommend closing the item's menu with "user << browse(null, "window=windowname") if it returns true.) - The var/value is the value that will be compared with the var/target. If they are equal it will activate the menu. +2. Code in the triggers. Use check_trigger for this, I recommend closing the item's menu with "user << browse(null, "window=windowname") if it returns true.) +The var/value is the value that will be compared with the var/target. If they are equal it will activate the menu. - 3. If you want the menu to stay until the users locks his uplink, add an active_uplink_check(mob/user as mob) in your interact/attack_hand proc. - Then check if it's true, if true return. This will stop the normal menu appearing and will instead show the uplink menu. +3. If you want the menu to stay until the users locks his uplink, add an active_uplink_check(mob/user as mob) in your interact/attack_hand proc. +Then check if it's true, if true return. This will stop the normal menu appearing and will instead show the uplink menu. */ /obj/item/device/uplink/hidden @@ -198,8 +198,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid for(var/datum/record/general/locked/L in SSrecords.records_locked) if(L.id == exploit_id) nanoui_data["exploit"] = list() // Setting this to equal L.fields passes it's variables that are lists as reference instead of value. - // We trade off being able to automatically add shit for more control over what gets passed to json - // and if it's sanitized for html. + // We trade off being able to automatically add shit for more control over what gets passed to json + // and if it's sanitized for html. nanoui_data["exploit"]["nanoui_exploit_record"] = html_encode(L.exploit_record) // Change stuff into html nanoui_data["exploit"]["nanoui_exploit_record"] = replacetext(nanoui_data["exploit"]["nanoui_exploit_record"], "\n", "
") // change line breaks into
nanoui_data["exploit"]["name"] = html_encode(L.name) @@ -419,9 +419,11 @@ A list of items and costs is stored under the datum of every game mode, alongsid icon_state = "radio" flags = CONDUCT w_class = ITEMSIZE_SMALL - // Amount of starting telecrystals. Defaults to default amount if not set. + + ///Amount of starting telecrystals. Defaults to default amount if not set. var/starting_telecrystals - /// Amount of starting bluecrystals, used to buy support/medical/gimmick items. Defaults to default amount if not set. + + ///Amount of starting bluecrystals, used to buy support/medical/gimmick items. Defaults to default amount if not set. var/starting_bluecrystals /obj/item/device/special_uplink/New(var/loc, var/mind) diff --git a/code/game/objects/items/skrell.dm b/code/game/objects/items/skrell.dm index ce3bd135fee..6690571342c 100644 --- a/code/game/objects/items/skrell.dm +++ b/code/game/objects/items/skrell.dm @@ -211,7 +211,7 @@ hologram_message = pick("Projected on the ceiling is a vista of the Kervasii World Amusement Park's floating islands.", "You see massive resort buildings looming high over a crystal-clear ocean.", "You hear light chittering as the projector switches to a depiction of a C'thuric research lab.") - + if(hologram_message) visible_message("[hologram_message]") diff --git a/code/game/objects/items/stacks/matter_synth.dm b/code/game/objects/items/stacks/matter_synth.dm index 972bfc68961..8741ba8f959 100644 --- a/code/game/objects/items/stacks/matter_synth.dm +++ b/code/game/objects/items/stacks/matter_synth.dm @@ -61,4 +61,4 @@ /datum/matter_synth/wire name = "Wire Synthesizer" max_energy = 50 - recharge_rate = 2 \ No newline at end of file + recharge_rate = 2 diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 4639172862d..176bea47fbc 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -151,7 +151,7 @@ Contains: else user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.visible_message(SPAN_NOTICE("\The [user] starts treating [M]'s [affecting.name]."), \ - SPAN_NOTICE("You start treating [M]'s [affecting.name].")) + SPAN_NOTICE("You start treating [M]'s [affecting.name].")) var/used = 0 for (var/datum/wound/W in affecting.wounds) if(W.bandaged) @@ -163,14 +163,14 @@ Contains: break if (W.current_stage <= W.max_bleeding_stage) user.visible_message(SPAN_NOTICE("\The [user] bandages \a [W.desc] on [M]'s [affecting.name]."), \ - SPAN_NOTICE("You bandage \a [W.desc] on [M]'s [affecting.name].")) + SPAN_NOTICE("You bandage \a [W.desc] on [M]'s [affecting.name].")) //H.add_side_effect("Itch") else if (W.damage_type == BRUISE) user.visible_message(SPAN_NOTICE("\The [user] places a bruise patch over \a [W.desc] on [M]'s [affecting.name]."), \ - SPAN_NOTICE("You place a bruise patch over \a [W.desc] on [M]'s [affecting.name].")) + SPAN_NOTICE("You place a bruise patch over \a [W.desc] on [M]'s [affecting.name].")) else user.visible_message(SPAN_NOTICE("\The [user] places a bandaid over \a [W.desc] on [M]'s [affecting.name]."), \ - SPAN_NOTICE("You place a bandaid over \a [W.desc] on [M]'s [affecting.name].")) + SPAN_NOTICE("You place a bandaid over \a [W.desc] on [M]'s [affecting.name].")) W.bandage() playsound(src, apply_sounds, 25) used++ @@ -226,13 +226,13 @@ Contains: else user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.visible_message(SPAN_NOTICE("\The [user] starts salving wounds on [M]'s [affecting.name]."), \ - SPAN_NOTICE("You start salving the wounds on [M]'s [affecting.name].")) + SPAN_NOTICE("You start salving the wounds on [M]'s [affecting.name].")) playsound(src, pick(apply_sounds), 25) if(!do_mob(user, M, 10)) to_chat(user, SPAN_NOTICE("You must stand still to salve wounds.")) return 1 user.visible_message(SPAN_NOTICE("[user] salved wounds on [M]'s [affecting.name]."), \ - SPAN_NOTICE("You salved wounds on [M]'s [affecting.name].")) + SPAN_NOTICE("You salved wounds on [M]'s [affecting.name].")) use(1) affecting.salve() else @@ -277,7 +277,7 @@ Contains: else user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.visible_message(SPAN_NOTICE("\The [user] starts treating [M]'s [affecting.name]."), \ - SPAN_NOTICE("You start treating [M]'s [affecting.name].")) + SPAN_NOTICE("You start treating [M]'s [affecting.name].")) var/used = 0 for (var/datum/wound/W in affecting.wounds) if (W.bandaged && W.disinfected) @@ -289,14 +289,14 @@ Contains: break if (W.current_stage <= W.max_bleeding_stage) user.visible_message(SPAN_NOTICE("\The [user] cleans \a [W.desc] on [M]'s [affecting.name] and seals the edges with bioglue."), \ - SPAN_NOTICE("You clean and seal \a [W.desc] on [M]'s [affecting.name].")) + SPAN_NOTICE("You clean and seal \a [W.desc] on [M]'s [affecting.name].")) //H.add_side_effect("Itch") else if (W.damage_type == BRUISE) user.visible_message(SPAN_NOTICE("\The [user] places a medical patch over \a [W.desc] on [M]'s [affecting.name]."), \ - SPAN_NOTICE("You place a medical patch over \a [W.desc] on [M]'s [affecting.name].")) + SPAN_NOTICE("You place a medical patch over \a [W.desc] on [M]'s [affecting.name].")) else user.visible_message(SPAN_NOTICE("\The [user] smears some bioglue over \a [W.desc] on [M]'s [affecting.name]."), \ - SPAN_NOTICE("You smear some bioglue over \a [W.desc] on [M]'s [affecting.name].")) + SPAN_NOTICE("You smear some bioglue over \a [W.desc] on [M]'s [affecting.name].")) playsound(src, pick(apply_sounds), 25) W.bandage() W.disinfect() @@ -349,13 +349,13 @@ Contains: else user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.visible_message(SPAN_NOTICE("\The [user] starts salving wounds on [M]'s [affecting.name]."), \ - SPAN_NOTICE("You start salving the wounds on [M]'s [affecting.name].")) + SPAN_NOTICE("You start salving the wounds on [M]'s [affecting.name].")) playsound(src, pick(apply_sounds), 25) if(!do_mob(user, M, 10)) to_chat(user, SPAN_NOTICE("You must stand still to salve wounds.")) return 1 user.visible_message(SPAN_NOTICE("[user] covers wounds on [M]'s [affecting.name] with regenerative membrane."), \ - SPAN_NOTICE("You cover wounds on [M]'s [affecting.name] with regenerative membrane.")) + SPAN_NOTICE("You cover wounds on [M]'s [affecting.name] with regenerative membrane.")) affecting.heal_damage(0,heal_burn) use(1) affecting.salve() diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index 72f31e1d38d..2071cbb49b7 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -39,7 +39,7 @@ R.updatehealth() use(1) user.visible_message(SPAN_NOTICE("\The [user] applied some [src] at [R]'s damaged areas."),\ - SPAN_NOTICE("You apply some [src] at [R]'s damaged areas.")) + SPAN_NOTICE("You apply some [src] at [R]'s damaged areas.")) else to_chat(user, SPAN_NOTICE("All [R]'s systems are nominal.")) @@ -65,7 +65,7 @@ H.updatehealth() use(1) user.visible_message(SPAN_NOTICE("\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the [user]"] [S.name] with \the [src]."),\ - SPAN_NOTICE("You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.name].")) + SPAN_NOTICE("You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.name].")) else to_chat(user, SPAN_NOTICE("Nothing to fix here.")) else diff --git a/code/game/objects/items/tajara.dm b/code/game/objects/items/tajara.dm index 1cb68308953..54d0e0ad5eb 100644 --- a/code/game/objects/items/tajara.dm +++ b/code/game/objects/items/tajara.dm @@ -237,7 +237,7 @@ protection = !protection playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1) update_icon() - + /obj/item/stack/dice/tajara name = "adhomian dice" desc = "An adhomian dice made out of wood. Commonly used to play Suns and Moon." diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 0ad15d447b4..07ffadae127 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -100,9 +100,9 @@ * Balloons */ - #define BALLOON_NORMAL 0 - #define BALLOON_BLOW 1 - #define BALLOON_BURST 2 +#define BALLOON_NORMAL 0 +#define BALLOON_BLOW 1 +#define BALLOON_BURST 2 /obj/item/toy/balloon name = "balloon" @@ -629,7 +629,7 @@ * Water flower */ - //moved to spray.dm +//moved to spray.dm /* * Bosun's whistle diff --git a/code/game/objects/items/vaurca.dm b/code/game/objects/items/vaurca.dm index d5746b2045b..ebce41aec74 100644 --- a/code/game/objects/items/vaurca.dm +++ b/code/game/objects/items/vaurca.dm @@ -35,9 +35,9 @@ "You see a golden fortress floating majestically above an ocean of sapphire.", "A euphoric smell of the ocean fills your senses as the water gently ebbs and flows.", "You hear the faint humming of a hymn as a gentle wave envelops the viewfinder.", - "You can hear a quiet celestial chanting the source of which feels just beyond sight.", - "The turquoise water emits a jubilant smell of freshly cut lemons which lasts for only for a moment.", - "You see the gas giant Sedantis dominating a starry sky." + "You can hear a quiet celestial chanting the source of which feels just beyond sight.", + "The turquoise water emits a jubilant smell of freshly cut lemons which lasts for only for a moment.", + "You see the gas giant Sedantis dominating a starry sky." ) if("Vaur's Hive War Exhibition") light_color = "#83290b" @@ -52,9 +52,9 @@ "An awe inspiring fortress of gold dominates the landscape and bathes the surrounding area in yellow luminescence.", "A loud hymn is chanted in an unknown language accompanied by a smell of morning dew in the countryside.", "Unbound workers moving through the realm stop to gaze up in awe at the distant structure before returning to previous activities.", - "Distant chattering can be heard coming from the fortress including what sounds almost like jovial laughter.", - "The turquoise water emits a jubilant smell of freshly cut lemons which lasts for only for a moment.", - "You see the gas giant Sedantis dominating a starry sky.", + "Distant chattering can be heard coming from the fortress including what sounds almost like jovial laughter.", + "The turquoise water emits a jubilant smell of freshly cut lemons which lasts for only for a moment.", + "You see the gas giant Sedantis dominating a starry sky.", "For a moment the Golden Fortress towering above starts to glimmer majestically, catching the light from the imposing gas giant in the sky." ) if("Vaur's City of New Sedantis") @@ -63,8 +63,8 @@ "A towering cavernous city takes up the viewfinder, great buildings of stone jutting out of the ground and twisting towards the ceiling.", "A loud hymn is being chanted in an unknown language and seems to shake the very ground itself.", "A mellow blue light comes from thousands of resplendent crystals lining the wall and mingles with the inviting yellow glow from a distant golden fortress.", - "Distant chattering can be heard coming from the city.", - "A distant forge emits Phoron gas from a tower atop its lofty form, as worker drones collect lilac stained glass from within.", + "Distant chattering can be heard coming from the city.", + "A distant forge emits Phoron gas from a tower atop its lofty form, as worker drones collect lilac stained glass from within.", "A group of Vaurca warriors move through the streets below seemingly practicing for some task unknown." ) if("Vaur's Titan Prime Recreation") @@ -73,7 +73,7 @@ "An imposing vessel of steel emits a soft glow as it travels through the starry sky aimlessly.", "The engines of the towering vessel above emit a soft glow, accompanied by a brief smell of a warm ocean breeze.", "A green light flickers from the steel vessel above bathing the surrounding idyllic landscape in its majesty.", - "You see the gas giant Sedantis dominating a starry sky, an imposing vessel of steel blotting out but a small portion of it." + "You see the gas giant Sedantis dominating a starry sky, an imposing vessel of steel blotting out but a small portion of it." ) if("Athvur's City of Paradise") light_color = "#eff3ef" @@ -82,27 +82,27 @@ "In the distance of the cityscape towers a set of sublime sculptures, accented by light from beneath the clouds.", "Orchestral music resonates from within an auditorium, the melody carried through the heavens.", "An enchanting smell of cedar, cherry and morning freshness penetrates through the air.", - "A vibrant burst of color permeates through the sky, basking the air in pleasing rainbow luminescence for a moment.", + "A vibrant burst of color permeates through the sky, basking the air in pleasing rainbow luminescence for a moment.", "In the center of a green park Vaurca workers paint not on canvas but in the air, seemingly looking at the landscape for inspiration." ) if("Athvur's Garden of Splendour") light_color = "#3adf3a" - possible_messages = list( + possible_messages = list( "A tranquil garden landscape stretches out to the horizon, its peaceful scenery embellished with flowers of every variety.", "Harmonious music accents an indescribable aroma of flowers.", "In the distance of the garden, beyond the soothing plants, workers move through an ornate gazebo.", "A fountain sits nestled within a thicket clearing, producing a golden substance from which gathered workers drink.", - "A herd of majestic creatures, each as tall as two people, graze on a patch of grass and lie curled up against each other's silky fur.", + "A herd of majestic creatures, each as tall as two people, graze on a patch of grass and lie curled up against each other's silky fur.", "Lilac-breasted birds dart between the tree-line and sing a soothing melody which seems to carry with it a smell of vanilla." ) if("Athvur's Museum of Fine Art") light_color = "#e7f0ec" - possible_messages = list( + possible_messages = list( "A massive display is decorated with examples of seemingly delicately crafted Zo'rane artwork.", - "Workers mull about the museum, seemingly taking in the atmosphere brought forth by the displays.", - "An exhibit showcases reportedly hand-painted landscapes that have won awards.", - "A melodic harmony is carried from a distant display marked with 'Music' only perceptible due to the quiet atmosphere of the surrounding exhibition.", - "Sculptures of notable Zo'rane historical figures dominate their respective corners, carved from a variety of rare materials.", + "Workers mull about the museum, seemingly taking in the atmosphere brought forth by the displays.", + "An exhibit showcases reportedly hand-painted landscapes that have won awards.", + "A melodic harmony is carried from a distant display marked with 'Music' only perceptible due to the quiet atmosphere of the surrounding exhibition.", + "Sculptures of notable Zo'rane historical figures dominate their respective corners, carved from a variety of rare materials.", "Groups of workers move around, seemingly taking a guided tour through the museum, watching each art piece explained to them attentively." ) diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm index 74bf42cd0ba..720855f81d0 100644 --- a/code/game/objects/items/weapons/autopsy.dm +++ b/code/game/objects/items/weapons/autopsy.dm @@ -17,8 +17,7 @@ /datum/autopsy_data_scanner var/weapon = null // this is the DEFINITE weapon type that was used - var/list/organs_scanned = list() // this maps a number of scanned organs to - // the wounds to those organs with this data's weapon type + var/list/organs_scanned = list() // this maps a number of scanned organs to the wounds to those organs with this data's weapon type var/organ_names = "" /datum/autopsy_data diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index c1f11b262bb..a22ec413508 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -459,9 +459,9 @@ var/const/NO_EMAG_ACT = -50 pickup_sound = /singleton/sound_category/generic_pickup_sound /obj/item/card/id/ccia/id_flash(var/mob/user) - var/add_text = "Done with prejudice and professionalism, [user.get_pronoun("he")] means business." - var/blind_add_text = "Done with prejudice and professionalism, you mean business." - return ..(user, add_text, blind_add_text) + var/add_text = "Done with prejudice and professionalism, [user.get_pronoun("he")] means business." + var/blind_add_text = "Done with prejudice and professionalism, you mean business." + return ..(user, add_text, blind_add_text) /obj/item/card/id/ccia/bssb name = "\improper Biesel Security Services Bureau identification card" diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm index 305ee4efcaf..e07003f6849 100644 --- a/code/game/objects/items/weapons/chaplain_items.dm +++ b/code/game/objects/items/weapons/chaplain_items.dm @@ -389,4 +389,4 @@ name = "\improper Marryam altar" desc = "A poppyvase used as an altar to honor Marryam, the Ma'ta'ke deity of settlements, sleep, and parenthood." icon = 'icons/obj/tajara_items.dmi' - icon_state = "marryam_poppyvase" \ No newline at end of file + icon_state = "marryam_poppyvase" diff --git a/code/game/objects/items/weapons/circuitboards/_defines.dm b/code/game/objects/items/weapons/circuitboards/_defines.dm index 156e30c1fd7..cb78f229cbc 100644 --- a/code/game/objects/items/weapons/circuitboards/_defines.dm +++ b/code/game/objects/items/weapons/circuitboards/_defines.dm @@ -1,2 +1,2 @@ #define BOARD_MACHINE "machine" -#define BOARD_COMPUTER "computer" \ No newline at end of file +#define BOARD_COMPUTER "computer" diff --git a/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm b/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm index f9bfcb5364c..92fabccedf4 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm @@ -1,5 +1,5 @@ #ifndef T_BOARD -#error T_BOARD macro is not defined but we need it! +#error T_BOARD macro is not defined but we need it! #endif /obj/item/circuitboard/comm_monitor diff --git a/code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm b/code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm index 15f4c080b86..f8d238f271b 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm @@ -1,5 +1,5 @@ #ifndef T_BOARD -#error T_BOARD macro is not defined but we need it! +#error T_BOARD macro is not defined but we need it! #endif /obj/item/circuitboard/biogenerator @@ -13,4 +13,4 @@ /obj/item/circuitboard/biogenerator/small name = T_BOARD("small biogenerator") - build_path = /obj/machinery/biogenerator/small \ No newline at end of file + build_path = /obj/machinery/biogenerator/small diff --git a/code/game/objects/items/weapons/circuitboards/machinery/chem_heater.dm b/code/game/objects/items/weapons/circuitboards/machinery/chem_heater.dm index 4720d427683..22b079e79b1 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/chem_heater.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/chem_heater.dm @@ -9,4 +9,4 @@ origin_tech = list(TECH_DATA = 1, TECH_BIO = 2) req_components = list( "/obj/item/stock_parts/manipulator" = 3 - ) \ No newline at end of file + ) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm b/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm index 2b37961ac30..cd29502c782 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm @@ -1,5 +1,5 @@ #ifndef T_BOARD -#error T_BOARD macro is not defined but we need it! +#error T_BOARD macro is not defined but we need it! #endif /obj/item/circuitboard/clonepod diff --git a/code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm b/code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm index 29e1e7ab175..0f20208e91f 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm @@ -12,4 +12,4 @@ "/obj/item/stock_parts/manipulator" = 2, "/obj/item/stock_parts/subspace/filter" = 1, "/obj/item/stock_parts/subspace/crystal" = 1 - ) + ) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm b/code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm index 9d226321301..f6416f5f62e 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm @@ -19,4 +19,4 @@ req_components = list( "/obj/item/stock_parts/capacitor" = 3, "/obj/item/stock_parts/scanning_module" = 2, - "/obj/item/stock_parts/manipulator" = 3) \ No newline at end of file + "/obj/item/stock_parts/manipulator" = 3) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm b/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm index 78fb31816ed..b8b55abfe1e 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm @@ -18,4 +18,4 @@ build_path = /obj/machinery/mining/brace board_type = "machine" origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) - req_components = list() \ No newline at end of file + req_components = list() diff --git a/code/game/objects/items/weapons/circuitboards/machinery/mining_machines.dm b/code/game/objects/items/weapons/circuitboards/machinery/mining_machines.dm index 573e6e3401d..32627f5ca99 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/mining_machines.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/mining_machines.dm @@ -75,4 +75,4 @@ if(WEST) M.pixel_x = -32 if(SOUTH) - M.pixel_y = -32 \ No newline at end of file + M.pixel_y = -32 diff --git a/code/game/objects/items/weapons/circuitboards/machinery/portgen.dm b/code/game/objects/items/weapons/circuitboards/machinery/portgen.dm index 8f8f0c04e0b..f83be989d47 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/portgen.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/portgen.dm @@ -1,5 +1,5 @@ #ifndef T_BOARD -#error T_BOARD macro is not defined but we need it! +#error T_BOARD macro is not defined but we need it! #endif /obj/item/circuitboard/portgen @@ -27,4 +27,4 @@ /obj/item/circuitboard/portgen/fusion name = T_BOARD("minature fusion reactor") build_path = /obj/machinery/power/portgen/basic/fusion - origin_tech = list(TECH_DATA = 5, TECH_POWER = 7, TECH_ENGINEERING = 7) \ No newline at end of file + origin_tech = list(TECH_DATA = 5, TECH_POWER = 7, TECH_ENGINEERING = 7) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/power.dm b/code/game/objects/items/weapons/circuitboards/machinery/power.dm index 13c7110ccaf..8ea6681d7c1 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/power.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/power.dm @@ -1,5 +1,5 @@ #ifndef T_BOARD -#error T_BOARD macro is not defined but we need it! +#error T_BOARD macro is not defined but we need it! #endif /obj/item/circuitboard/smes diff --git a/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm b/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm index 226ecb7015b..c34a93730a4 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm @@ -1,5 +1,5 @@ #ifndef T_BOARD -#error T_BOARD macro is not defined but we need it! +#error T_BOARD macro is not defined but we need it! #endif /obj/item/circuitboard/recharge_station @@ -11,4 +11,4 @@ "/obj/item/stack/cable_coil" = 5, "/obj/item/stock_parts/capacitor" = 2, "/obj/item/stock_parts/manipulator" = 2, - "/obj/item/cell" = 1) \ No newline at end of file + "/obj/item/cell" = 1) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm b/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm index e69ec526421..11bc289b2fc 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm @@ -1,5 +1,5 @@ #ifndef T_BOARD -#error T_BOARD macro is not defined but we need it! +#error T_BOARD macro is not defined but we need it! #endif /obj/item/circuitboard/shield_gen_ex diff --git a/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm b/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm index b816f86e8f9..f8006b0045a 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm @@ -1,5 +1,5 @@ #ifndef T_BOARD -#error T_BOARD macro is not defined but we need it! +#error T_BOARD macro is not defined but we need it! #endif /obj/item/circuitboard/telecomms diff --git a/code/game/objects/items/weapons/circuitboards/machinery/trolley.dm b/code/game/objects/items/weapons/circuitboards/machinery/trolley.dm index e481af8c6e5..f86f87c3891 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/trolley.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/trolley.dm @@ -1,5 +1,5 @@ #ifndef T_BOARD -#error T_BOARD macro is not defined but we need it! +#error T_BOARD macro is not defined but we need it! #endif /obj/item/circuitboard/cargo_trolley @@ -10,4 +10,4 @@ req_components = list( "/obj/item/stack/cable_coil" = 15, "/obj/item/stock_parts/capacitor" = 1 - ) \ No newline at end of file + ) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 79cbf9715ac..b7cd874a5ed 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -123,15 +123,15 @@ return if(H == user) user.visible_message("[user] does their lips with \the [src].", \ - "You take a moment to apply \the [src]. Perfect!") + "You take a moment to apply \the [src]. Perfect!") H.lipstick_color = lipstick_color H.update_body() else user.visible_message("[user] begins to do [H]'s lips with \the [src].", \ - "You begin to apply \the [src].") + "You begin to apply \the [src].") if(do_after(user, 4 SECONDS, H, do_flags = DO_DEFAULT & ~DO_SHOW_PROGRESS & ~DO_BOTH_CAN_TURN)) user.visible_message("[user] does [H]'s lips with \the [src].", \ - "You apply \the [src].") + "You apply \the [src].") H.lipstick_color = lipstick_color H.update_body() else @@ -199,20 +199,20 @@ if(H == user) //shaving yourself user.visible_message("\The [user] starts to shave [user.get_pronoun("his")] head with \the [src].", \ - "You start to shave your head with \the [src].") + "You start to shave your head with \the [src].") if(do_mob(user, user, 20)) user.visible_message("\The [user] shaves [user.get_pronoun("his")] head with \the [src].", \ - "You finish shaving with \the [src].") + "You finish shaving with \the [src].") shave(H, target_zone) return TRUE else user.visible_message("\The [user] tries to shave \the [H]'s head with \the [src]!", \ - "You start shaving [H]'s head.") + "You start shaving [H]'s head.") if(do_mob(user, H, 20)) user.visible_message("\The [user] shaves \the [H]'s head bald with \the [src]!", \ - "You shave \the [H]'s head bald.") + "You shave \the [H]'s head bald.") shave(H, target_zone) return TRUE @@ -233,20 +233,20 @@ if(H == user) //shaving yourself user.visible_message("\The [user] starts to shave [user.get_pronoun("his")] facial hair with \the [src].", \ - "You take a moment to shave your facial hair with \the [src].") + "You take a moment to shave your facial hair with \the [src].") if(do_mob(user, user, 20)) user.visible_message("\The [user] shaves [user.get_pronoun("his")] facial hair clean with \the [src].", \ - "You finish shaving with \the [src].") + "You finish shaving with \the [src].") shave(H, target_zone) return TRUE else user.visible_message("\The [user] tries to shave \the [H]'s facial hair with \the [src].", \ - "You start shaving [H]'s facial hair.") + "You start shaving [H]'s facial hair.") if(do_mob(user, H, 20)) user.visible_message("\The [user] shaves off \the [H]'s facial hair with \the [src].", \ - "You shave [H]'s facial hair clean off.") + "You shave [H]'s facial hair clean off.") shave(H, target_zone) return TRUE diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index b535096c23d..5beeb271bc0 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -71,4 +71,4 @@ if(R?.cell) R.cell.use(1000) can_deploy = TRUE - maptext = "Ready" \ No newline at end of file + maptext = "Ready" diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 565d6a27f32..5bf49b368ec 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -465,80 +465,80 @@

Standard Cyborg

The standard cyborg module is a multi-purpose cyborg. It is equipped with various modules, allowing it to do basic tasks.
A Standard Cyborg comes with:
    -
  • Crowbar
    • -
  • Stun Baton
    • -
  • Health Analyzer
    • -
  • Fire Extinguisher
    • +
  • Crowbar
    • +
  • Stun Baton
    • +
  • Health Analyzer
    • +
  • Fire Extinguisher

Engineering Cyborg

The Engineering cyborg module comes equipped with various engineering-related tools to help with engineering-related tasks.
An Engineering Cyborg comes with:
    -
  • A basic set of engineering tools
    • -
  • Metal Synthesizer
    • -
  • Reinforced Glass Synthesizer
    • -
  • A Rapid-Fabrication-Device C-Class
    • -
  • Wire Synthesizer
    • -
  • Fire Extinguisher
    • -
  • Built-in Optical Meson Scanners
    • +
  • A basic set of engineering tools
    • +
  • Metal Synthesizer
    • +
  • Reinforced Glass Synthesizer
    • +
  • A Rapid-Fabrication-Device C-Class
    • +
  • Wire Synthesizer
    • +
  • Fire Extinguisher
    • +
  • Built-in Optical Meson Scanners

Mining Cyborg

The Mining Cyborg module comes equipped with the latest in mining equipment. They are efficient at mining due to no need for oxygen, but their power cells limit their time in the mines.
A Mining Cyborg comes with:
    -
  • Jackhammer
    • -
  • Shovel
    • -
  • Mining Satchel
    • -
  • Built-in Optical Meson Scanners
    • +
  • Jackhammer
    • +
  • Shovel
    • +
  • Mining Satchel
    • +
  • Built-in Optical Meson Scanners

Security Cyborg

The Security Cyborg module is equipped with effective security measures used to apprehend and arrest criminals without harming them a bit.
A Security Cyborg comes with:
    -
  • Stun Baton
    • -
  • Handcuffs
    • -
  • Taser
    • +
  • Stun Baton
    • +
  • Handcuffs
    • +
  • Taser

Janitor Cyborg

The Janitor Cyborg module is equipped with various cleaning-facilitating devices.
A Janitor Cyborg comes with:
    -
  • Mop
    • -
  • Hand Bucket
    • -
  • Cleaning Spray Synthesizer and Spray Nozzle
    • +
  • Mop
    • +
  • Hand Bucket
    • +
  • Cleaning Spray Synthesizer and Spray Nozzle

Service Cyborg

The service cyborg module comes ready to serve your human needs. It includes various entertainment and refreshment devices. Occasionally some service cyborgs may have been referred to as "Bros."
A Service Cyborg comes with:
    -
  • Shaker
    • -
  • Industrial Dropper
    • -
  • Platter
    • -
  • Beer Synthesizer
    • -
  • Zippo Lighter
    • -
  • Rapid-Service-Fabricator (Produces various entertainment and refreshment objects)
    • -
  • Pen
    • +
  • Shaker
    • +
  • Industrial Dropper
    • +
  • Platter
    • +
  • Beer Synthesizer
    • +
  • Zippo Lighter
    • +
  • Rapid-Service-Fabricator (Produces various entertainment and refreshment objects)
    • +
  • Pen

Cyborg Construction

Cyborg construction is a rather easy process, requiring a decent amount of metal and a few other supplies.
The required materials to make a cyborg are:
    -
  • Metal
    • -
  • Two Flashes
    • -
  • One Power Cell (Preferably rated to 15000w)
    • -
  • Some electrical wires
    • -
  • One Human Brain
    • -
  • One Man-Machine Interface
    • +
  • Metal
    • +
  • Two Flashes
    • +
  • One Power Cell (Preferably rated to 15000w)
    • +
  • Some electrical wires
    • +
  • One Human Brain
    • +
  • One Man-Machine Interface
Once you have acquired the materials, you can start on construction of your cyborg.
To construct a cyborg, follow the steps below:
    -
  1. Start the Exosuit Fabricators constructing all of the cyborg parts
    2. -
  2. While the parts are being constructed, take your human brain, and place it inside the Man-Machine Interface
    3. -
  3. Once you have a Robot Head, place your two flashes inside the eye sockets
    4. -
  4. Once you have your Robot Chest, wire the Robot chest, then insert the power cell
    5. -
  5. Attach all of the Robot parts to the Robot frame
    6. -
  6. Insert the Man-Machine Interface (With the Brain inside) into the Robot Body
    7. -
  7. Congratulations! You have a new cyborg!
    8. +
  8. Start the Exosuit Fabricators constructing all of the cyborg parts
    9. +
  9. While the parts are being constructed, take your human brain, and place it inside the Man-Machine Interface
    10. +
  10. Once you have a Robot Head, place your two flashes inside the eye sockets
    11. +
  11. Once you have your Robot Chest, wire the Robot chest, then insert the power cell
    12. +
  12. Attach all of the Robot parts to the Robot frame
    13. +
  13. Insert the Man-Machine Interface (With the Brain inside) into the Robot Body
    14. +
  14. Congratulations! You have a new cyborg!

Cyborg Maintenance

@@ -547,12 +547,12 @@

Replacing a Power Cell

Replacing a Power cell is a common type of maintenance for cyborgs. It usually involves replacing the cell with a fully charged one, or upgrading the cell with a larger capacity cell.
The steps to replace a cell are as follows:
    -
  1. Unlock the Cyborg's Interface by swiping your ID on it
    2. -
  2. Open the Cyborg's outer panel using a crowbar
    3. -
  3. Remove the old power cell
    4. -
  4. Insert the new power cell
    5. -
  5. Close the Cyborg's outer panel using a crowbar
    6. -
  6. Lock the Cyborg's Interface by swiping your ID on it, this will prevent non-qualified personnel from attempting to remove the power cell
    7. +
  7. Unlock the Cyborg's Interface by swiping your ID on it
    8. +
  8. Open the Cyborg's outer panel using a crowbar
    9. +
  9. Remove the old power cell
    10. +
  10. Insert the new power cell
    11. +
  11. Close the Cyborg's outer panel using a crowbar
    12. +
  12. Lock the Cyborg's Interface by swiping your ID on it, this will prevent non-qualified personnel from attempting to remove the power cell

Exposing the Internal Wiring

@@ -1025,7 +1025,7 @@ EVA gear. Wonderful to use. It's useful for mining, engineering, and occasionally just surviving, if things are that bad. Most people have EVA training, but apparently there are some on a space station who don't. This guide should give you a basic idea of how to use this gear, safely. It's split into two sections: - Civilian suits and voidsuits.

+ Civilian suits and voidsuits.

Civilian Suits

The bulkiest things this side of Alpha Centauri
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index a3896382c21..454daf04e05 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -12,7 +12,7 @@ * Cash Bag * Book Bag (New thing) * Slime Bag (New thing) ~Chaoko99 - * + * * -Sayu */ diff --git a/code/game/objects/items/weapons/storage/business_card.dm b/code/game/objects/items/weapons/storage/business_card.dm index 1ad7da1354d..644d5c2da87 100644 --- a/code/game/objects/items/weapons/storage/business_card.dm +++ b/code/game/objects/items/weapons/storage/business_card.dm @@ -100,4 +100,4 @@ worn_overlay = "business_card-glass-s" /obj/item/paper/business_card/glass/w - worn_overlay = "business_card-glass-w" \ No newline at end of file + worn_overlay = "business_card-glass-w" diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm index 0a8a3725fbd..92e6d43f4dd 100644 --- a/code/game/objects/items/weapons/storage/internal.dm +++ b/code/game/objects/items/weapons/storage/internal.dm @@ -196,4 +196,4 @@ var/mob/living/carbon/human/H = E.owner if(!istype(H)) return - H.update_tail_showing() \ No newline at end of file + H.update_tail_showing() diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 5bc964b501f..3b38a68bf9b 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -1,4 +1,4 @@ - /* Weapons +/* Weapons * Contains: * Sword * Classic Baton diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index 2e4b7fc73aa..5c81cf403bf 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -382,7 +382,7 @@ to_chat(user, SPAN_WARNING("\The [WT] is off!")) return user.visible_message("[user] is trying to slice \the [src] open!", - "You are trying to slice \the [src] open!") + "You are trying to slice \the [src] open!") if(WT.use_tool(src, user, 60, volume = 50)) if(WT.use(2, user)) @@ -401,14 +401,14 @@ return user.visible_message("[user] is trying to [anchored ? "un" : "" ]secure \the [src]!", - "You are trying to [anchored ? "un" : "" ]secure \the [src]!") + "You are trying to [anchored ? "un" : "" ]secure \the [src]!") playsound(src.loc, "sound/items/[pick("Screwdriver", "Screwdriver2")].ogg", 50, 1) if(W.use_tool(src, user, 30, volume = 50)) density = !density anchored = !anchored user.visible_message("[user] [anchored ? "" : "un" ]secures \the [src]!", - "You [anchored ? "" : "un" ]secure \the [src]!") + "You [anchored ? "" : "un" ]secure \the [src]!") else ..() @@ -572,7 +572,7 @@ return user.visible_message("[user] begins [anchored ? "un" : "" ]securing \the [src]!", - "You begin [anchored ? "un" : "" ]securing \the [src]!") + "You begin [anchored ? "un" : "" ]securing \the [src]!") if(W.use_tool(src, user, 30, volume = 50)) anchored = !anchored diff --git a/code/game/objects/random/produce.dm b/code/game/objects/random/produce.dm index 091902335a0..b602e347c8e 100644 --- a/code/game/objects/random/produce.dm +++ b/code/game/objects/random/produce.dm @@ -46,27 +46,27 @@ /obj/random_produce/box // produce for spawning in chef produce boxes. better suited for the job produce_list = list( - "chili" = 1, - "berries" = 0.25, - "tomato" = 2, - "eggplant" = 0.5, - "apple" = 0.25, - "mushrooms" = 0.25, - "cabbage" = 2, - "banana" = 0.5, - "corn" = 2, - "potato" = 2, - "soybean" = 0.5, - "rice" = 2, - "carrot" = 1, - "whitebeet" = 1, - "pumpkin" = 0.1, - "lime" = 0.25, - "lemon" = 0.25, - "cacao" = 0.5, - "cherry" = 0.25, - "onion" = 0.5 - ) + "chili" = 1, + "berries" = 0.25, + "tomato" = 2, + "eggplant" = 0.5, + "apple" = 0.25, + "mushrooms" = 0.25, + "cabbage" = 2, + "banana" = 0.5, + "corn" = 2, + "potato" = 2, + "soybean" = 0.5, + "rice" = 2, + "carrot" = 1, + "whitebeet" = 1, + "pumpkin" = 0.1, + "lime" = 0.25, + "lemon" = 0.25, + "cacao" = 0.5, + "cherry" = 0.25, + "onion" = 0.5 + ) /obj/random/seed name = "random seed" diff --git a/code/game/objects/structures/barricades/_barricade.dm b/code/game/objects/structures/barricades/_barricade.dm index b8307b7d4de..f85582159e3 100644 --- a/code/game/objects/structures/barricades/_barricade.dm +++ b/code/game/objects/structures/barricades/_barricade.dm @@ -12,8 +12,10 @@ var/destroyed_stack_amount //to specify a non-zero amount of stack to drop when destroyed var/health = 100 //Pretty tough. Changes sprites at 300 and 150 var/maxhealth = 100 //Basic code functions - /// Used for calculating some stuff related to maxhealth as it constantly changes due to e.g. barbed wire. set to 100 to avoid possible divisions by zero + + ///Used for calculating some stuff related to maxhealth as it constantly changes due to e.g. barbed wire. set to 100 to avoid possible divisions by zero var/starting_maxhealth = 100 + var/force_level_absorption = 5 //How much force an item needs to even damage it at all. var/barricade_hitsound var/barricade_type = "barricade" //"metal", "plasteel", etc. diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 35c93eb37e3..938ca33243d 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -27,23 +27,23 @@ return sign_choices /obj/structure/sign/double/barsign/proc/set_sign() - var/list/sign_choices = get_sign_choices() + var/list/sign_choices = get_sign_choices() - var/list/sign_index = list() - for(var/sign in sign_choices) - var/singleton/sign/double/B = GET_SINGLETON(sign) - sign_index["[B.name]"] = B + var/list/sign_index = list() + for(var/sign in sign_choices) + var/singleton/sign/double/B = GET_SINGLETON(sign) + sign_index["[B.name]"] = B - var/sign_choice = input("What should the sign be changed to?") as null|anything in sign_index - if(!sign_choice) - return - var/singleton/sign/double/signselect = sign_index[sign_choice] + var/sign_choice = input("What should the sign be changed to?") as null|anything in sign_index + if(!sign_choice) + return + var/singleton/sign/double/signselect = sign_index[sign_choice] - name = signselect.name - desc = signselect.desc - desc_extended = signselect.desc_extended - icon_state = signselect.icon_state - update_icon() + name = signselect.name + desc = signselect.desc + desc_extended = signselect.desc_extended + icon_state = signselect.icon_state + update_icon() /obj/structure/sign/double/barsign/kitchensign icon = 'icons/obj/kitchensigns.dmi' @@ -160,4 +160,4 @@ name = "City Alive" icon_state = "City Alive" desc = "City Alive is another popular restaurant chain, originating from Eridani I. It is famous for its light shows." - desc_extended = "City Alive is a high class restaurant chain, dotted all over Eridani I and III. Especially on Eridani I they are also famous for their light shows in the evenings. These lights look like pulsating veins, making the city seem alive, especially when observed from orbit." \ No newline at end of file + desc_extended = "City Alive is a high class restaurant chain, dotted all over Eridani I and III. Especially on Eridani I they are also famous for their light shows in the evenings. These lights look like pulsating veins, making the city seem alive, especially when observed from orbit." diff --git a/code/game/objects/structures/coatrack.dm b/code/game/objects/structures/coatrack.dm index 23eaa028bd7..3e616876a8b 100644 --- a/code/game/objects/structures/coatrack.dm +++ b/code/game/objects/structures/coatrack.dm @@ -23,7 +23,7 @@ if(hat) remove_hat(user) add_fingerprint(user) - return + return /obj/structure/coatrack/proc/remove_coat(mob/user as mob) user.visible_message("[user] takes [coat] off \the [src].", SPAN_NOTICE("You take [coat] off the \the [src].")) @@ -118,12 +118,12 @@ coat_icon_file = T.icon var/icon/coat_icon = new(coat_icon_file, coat_icon_state) - + coat_icon.Blend(coat_outline, ICON_OVERLAY) coat_icon.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0)) //Slice the coat in half. var/image/coat_image = image(coat_icon) if(T.color) - coat_image.color = T.color + coat_image.color = T.color if(T.build_from_parts) var/icon/overlay_icon = new(coat_icon_file, "[coat_icon_state]_[T.worn_overlay]") @@ -135,4 +135,4 @@ M.Translate(-1, 5) // Stick it on the coat rack. coat_image.transform = M - add_overlay(coat_image) + add_overlay(coat_image) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 1c00126b746..dbbad03eb2a 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -29,7 +29,7 @@ var/storage_capacity = 45 //Tying this to mob sizes was dumb //This is so that someone can't pack hundreds of items in a locker/crate - //then open it in a populated area to crash clients. + //then open it in a populated area to crash clients. var/open_sound = 'sound/effects/closet_open.ogg' var/close_sound = 'sound/effects/closet_close.ogg' diff --git a/code/game/objects/structures/crates_lockers/closets/hazmat.dm b/code/game/objects/structures/crates_lockers/closets/hazmat.dm index 0188d02fa2d..89e72589a9c 100644 --- a/code/game/objects/structures/crates_lockers/closets/hazmat.dm +++ b/code/game/objects/structures/crates_lockers/closets/hazmat.dm @@ -59,4 +59,4 @@ new /obj/item/clothing/head/hazmat/custodial(src) new /obj/item/clothing/suit/hazmat/custodial(src) new /obj/item/clothing/mask/gas/half(src) - new /obj/item/watertank/janitor(src) \ No newline at end of file + new /obj/item/watertank/janitor(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 6ec678a9afb..b010dbffdeb 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -44,7 +44,7 @@ add_fingerprint(user) locked = !locked user.visible_message(SPAN_NOTICE("[user] [locked ? null : "un"]locks \the [src]."), - SPAN_NOTICE("You [locked ? null : "un"]lock \the [src].")) + SPAN_NOTICE("You [locked ? null : "un"]lock \the [src].")) update_icon() else if(!silent) to_chat(user, SPAN_NOTICE("Access Denied.")) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/service.dm b/code/game/objects/structures/crates_lockers/closets/secure/service.dm index c4b936fee7e..75f762f1b9b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/service.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/service.dm @@ -55,4 +55,4 @@ new /obj/item/clothing/suit/caution(src) new /obj/item/clothing/suit/caution(src) new /obj/item/storage/box/lights/mixed(src) - new /obj/item/storage/box/mousetraps(src) \ No newline at end of file + new /obj/item/storage/box/mousetraps(src) diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 9eff4dec555..3588189c06f 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -78,9 +78,9 @@ appearance_flags |= KEEP_TOGETHER dir = L.dir color = list( - 0.30, 0.3, 0.25, - 0.30, 0.3, 0.25, - 0.30, 0.3, 0.25 + 0.30, 0.3, 0.25, + 0.30, 0.3, 0.25, + 0.30, 0.3, 0.25 ) name = "statue of [L.name]" desc = "An incredibly lifelike stone carving." diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index a758fc87823..a6ac27a884a 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -15,8 +15,8 @@ for(var/atom/movable/AM in contents) if(AM.simulated) AM.forceMove(T) user.visible_message(SPAN_NOTICE("[user] pries \the [src] open."), \ - SPAN_NOTICE("You pry open \the [src]."), \ - SPAN_NOTICE("You hear splitting wood.")) + SPAN_NOTICE("You pry open \the [src]."), \ + SPAN_NOTICE("You hear splitting wood.")) for(var/obj/vehicle/V in T.contents) if(V) V.unload(user) diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index 183fa3083a0..8db1e556284 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -2432,4 +2432,4 @@ icon_state = "raskara" flag_path = "raskara" flag_item = /obj/item/flag/raskara - stand_icon = "wood_stand" \ No newline at end of file + stand_icon = "wood_stand" diff --git a/code/game/objects/structures/geyser.dm b/code/game/objects/structures/geyser.dm index ed2c0073220..30bf4054adb 100644 --- a/code/game/objects/structures/geyser.dm +++ b/code/game/objects/structures/geyser.dm @@ -26,4 +26,4 @@ L.bodytemperature += steam_temperature if(steam_temperature >= 100) L.apply_damage(50, DAMAGE_BURN) - to_chat(L, SPAN_WARNING("Your skin fizzes as the steam touches it!")) \ No newline at end of file + to_chat(L, SPAN_WARNING("Your skin fizzes as the steam touches it!")) diff --git a/code/game/objects/structures/gore/tendrils.dm b/code/game/objects/structures/gore/tendrils.dm index acf7d862c76..6470f718125 100644 --- a/code/game/objects/structures/gore/tendrils.dm +++ b/code/game/objects/structures/gore/tendrils.dm @@ -138,4 +138,4 @@ health -= 5 healthcheck() -#undef NODERANGE \ No newline at end of file +#undef NODERANGE diff --git a/code/game/objects/structures/hadii_statue.dm b/code/game/objects/structures/hadii_statue.dm index 3002e55db25..20edfd79e61 100644 --- a/code/game/objects/structures/hadii_statue.dm +++ b/code/game/objects/structures/hadii_statue.dm @@ -72,4 +72,4 @@ visible_message(SPAN_WARNING("\The [Proj] bounces off \the [src]!")) return visible_message(SPAN_WARNING("\The [Proj] hits \the [src]!")) - do_integrity_check(Proj.damage) \ No newline at end of file + do_integrity_check(Proj.damage) diff --git a/code/game/objects/structures/statue.dm b/code/game/objects/structures/statue.dm index 48bfdeffb28..5dfa91fbf80 100644 --- a/code/game/objects/structures/statue.dm +++ b/code/game/objects/structures/statue.dm @@ -5,4 +5,4 @@ icon_state = "rredouane" density = TRUE anchored = TRUE - layer = ABOVE_ALL_MOB_LAYER \ No newline at end of file + layer = ABOVE_ALL_MOB_LAYER 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 4d651d6d8da..e7f6871ac7d 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -240,7 +240,7 @@ icon = 'icons/obj/spaceship/cockpit_chair.dmi' /obj/structure/bed/stool/chair/cockpit/CanPass(atom/movable/mover, turf/target, height, air_group) - return TRUE + return TRUE /obj/structure/bed/stool/chair/cockpit/update_icon() ..() diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 2b5dfb88246..c4884d5100e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -12,7 +12,7 @@ var/bloodiness -/obj/structure/bed/stool/chair/office/wheelchair/New(var/newloc) // Colorable wheelchairs? +/obj/structure/bed/stool/chair/office/wheelchair/New(var/newloc) // Colorable wheelchairs? ..(newloc, MATERIAL_STEEL, MATERIAL_CLOTH) /obj/structure/bed/stool/chair/office/wheelchair/set_dir() diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 7e39268c492..1aead171d40 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -44,7 +44,7 @@ var/dat = "
" dat += "Oxygen tanks: [oxygentanks] - [oxygentanks ? "Dispense" : "empty"]
" dat += "Phoron tanks: [phorontanks] - [phorontanks ? "Dispense" : "empty"]" - + var/datum/browser/dispenser_win = new(user, "dispenser", capitalize_first_letters(name), 300, 250) dispenser_win.set_content(dat) dispenser_win.open() @@ -115,4 +115,4 @@ add_fingerprint(usr) updateUsrDialog() else - usr << browse(null, "window=dispenser") \ No newline at end of file + usr << browse(null, "window=dispenser") diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index 8638981a7cc..22b48107848 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -59,4 +59,4 @@ /obj/structure/target_stake/Destroy() set_target(null) - return ..() \ No newline at end of file + return ..() diff --git a/code/game/objects/structures/tranqcabinet.dm b/code/game/objects/structures/tranqcabinet.dm index 14deab8a102..16136c189f6 100644 --- a/code/game/objects/structures/tranqcabinet.dm +++ b/code/game/objects/structures/tranqcabinet.dm @@ -59,4 +59,4 @@ if(has_tranq) icon_state = "tranq_full" else - icon_state = "tranq_empty" \ No newline at end of file + icon_state = "tranq_empty" diff --git a/code/game/objects/structures/vr/human_chair.dm b/code/game/objects/structures/vr/human_chair.dm index 03500b1742b..020df3beba2 100644 --- a/code/game/objects/structures/vr/human_chair.dm +++ b/code/game/objects/structures/vr/human_chair.dm @@ -6,4 +6,4 @@ ..() if(ishuman(user)) var/mob/living/carbon/human/H = user - SSvirtualreality.create_virtual_reality_avatar(H) \ No newline at end of file + SSvirtualreality.create_virtual_reality_avatar(H) diff --git a/code/game/objects/structures/warp_drive.dm b/code/game/objects/structures/warp_drive.dm index 6ffb9c2f1e3..f0cd7334643 100644 --- a/code/game/objects/structures/warp_drive.dm +++ b/code/game/objects/structures/warp_drive.dm @@ -9,4 +9,4 @@ light_range = 3 /obj/structure/warp_drive/attack_hand(var/mob/user) - do_teleport(user, get_turf(user), 8, asoundin = 'sound/effects/phasein.ogg') \ No newline at end of file + do_teleport(user, get_turf(user), 8, asoundin = 'sound/effects/phasein.ogg') diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index c57836d60d7..e0fc7db8189 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -476,7 +476,7 @@ RG.reagents.add_reagent(/singleton/reagent/water, min(RG.volume - RG.reagents.total_volume, amount_per_transfer_from_this)) user.visible_message("[user] fills \a [RG] using \the [src].", - SPAN_NOTICE("You fill \a [RG] using \the [src].")) + SPAN_NOTICE("You fill \a [RG] using \the [src].")) playsound(loc, 'sound/effects/sink.ogg', 75, 1) if ("Empty") if(!RG.reagents.total_volume) @@ -501,7 +501,7 @@ var/trans = min(S.volume - S.reagents.total_volume, S.amount_per_transfer_from_this) S.reagents.add_reagent(/singleton/reagent/water, trans) user.visible_message(SPAN_NOTICE("[usr] uses \the [S] to draw water from \the [src]."), - SPAN_NOTICE("You draw [trans] units of water from \the [src]. \The [S] now contains [S.reagents.total_volume] units.")) + SPAN_NOTICE("You draw [trans] units of water from \the [src]. \The [S] now contains [S.reagents.total_volume] units.")) if(1) // inject if(!S.reagents.total_volume) to_chat(usr, SPAN_WARNING("\The [S] is already empty.")) @@ -510,7 +510,7 @@ var/trans = min(S.amount_per_transfer_from_this, S.reagents.total_volume) S.reagents.remove_any(trans) user.visible_message(SPAN_NOTICE("[usr] empties \the [S] into \the [src]."), - SPAN_NOTICE("You empty [trans] units of water into \the [src]. \The [S] now contains [S.reagents.total_volume] units.")) + SPAN_NOTICE("You empty [trans] units of water into \the [src]. \The [S] now contains [S.reagents.total_volume] units.")) return else if (istype(O, /obj/item/melee/baton)) diff --git a/code/game/sound.dm b/code/game/sound.dm index f4b0c57cdb1..5769f547fc8 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -858,76 +858,78 @@ ) /singleton/sound_category/supermatter_calm - sounds = list('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' - ) + sounds = list( + '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' + ) /singleton/sound_category/supermatter_delam - sounds = list('sound/machines/sm/accent/delam/1.ogg', - 'sound/machines/sm/accent/delam/2.ogg', - 'sound/machines/sm/accent/delam/3.ogg', - 'sound/machines/sm/accent/delam/4.ogg', - 'sound/machines/sm/accent/delam/5.ogg', - 'sound/machines/sm/accent/delam/6.ogg', - 'sound/machines/sm/accent/delam/7.ogg', - 'sound/machines/sm/accent/delam/8.ogg', - 'sound/machines/sm/accent/delam/9.ogg', - 'sound/machines/sm/accent/delam/10.ogg', - 'sound/machines/sm/accent/delam/11.ogg', - 'sound/machines/sm/accent/delam/12.ogg', - 'sound/machines/sm/accent/delam/13.ogg', - 'sound/machines/sm/accent/delam/14.ogg', - 'sound/machines/sm/accent/delam/15.ogg', - 'sound/machines/sm/accent/delam/16.ogg', - 'sound/machines/sm/accent/delam/17.ogg', - 'sound/machines/sm/accent/delam/18.ogg', - 'sound/machines/sm/accent/delam/19.ogg', - 'sound/machines/sm/accent/delam/20.ogg', - 'sound/machines/sm/accent/delam/21.ogg', - 'sound/machines/sm/accent/delam/22.ogg', - 'sound/machines/sm/accent/delam/23.ogg', - 'sound/machines/sm/accent/delam/24.ogg', - 'sound/machines/sm/accent/delam/25.ogg', - 'sound/machines/sm/accent/delam/26.ogg', - 'sound/machines/sm/accent/delam/27.ogg', - 'sound/machines/sm/accent/delam/28.ogg', - 'sound/machines/sm/accent/delam/29.ogg', - 'sound/machines/sm/accent/delam/30.ogg', - 'sound/machines/sm/accent/delam/31.ogg', - 'sound/machines/sm/accent/delam/32.ogg', - 'sound/machines/sm/accent/delam/33.ogg' - ) + sounds = list( + 'sound/machines/sm/accent/delam/1.ogg', + 'sound/machines/sm/accent/delam/2.ogg', + 'sound/machines/sm/accent/delam/3.ogg', + 'sound/machines/sm/accent/delam/4.ogg', + 'sound/machines/sm/accent/delam/5.ogg', + 'sound/machines/sm/accent/delam/6.ogg', + 'sound/machines/sm/accent/delam/7.ogg', + 'sound/machines/sm/accent/delam/8.ogg', + 'sound/machines/sm/accent/delam/9.ogg', + 'sound/machines/sm/accent/delam/10.ogg', + 'sound/machines/sm/accent/delam/11.ogg', + 'sound/machines/sm/accent/delam/12.ogg', + 'sound/machines/sm/accent/delam/13.ogg', + 'sound/machines/sm/accent/delam/14.ogg', + 'sound/machines/sm/accent/delam/15.ogg', + 'sound/machines/sm/accent/delam/16.ogg', + 'sound/machines/sm/accent/delam/17.ogg', + 'sound/machines/sm/accent/delam/18.ogg', + 'sound/machines/sm/accent/delam/19.ogg', + 'sound/machines/sm/accent/delam/20.ogg', + 'sound/machines/sm/accent/delam/21.ogg', + 'sound/machines/sm/accent/delam/22.ogg', + 'sound/machines/sm/accent/delam/23.ogg', + 'sound/machines/sm/accent/delam/24.ogg', + 'sound/machines/sm/accent/delam/25.ogg', + 'sound/machines/sm/accent/delam/26.ogg', + 'sound/machines/sm/accent/delam/27.ogg', + 'sound/machines/sm/accent/delam/28.ogg', + 'sound/machines/sm/accent/delam/29.ogg', + 'sound/machines/sm/accent/delam/30.ogg', + 'sound/machines/sm/accent/delam/31.ogg', + 'sound/machines/sm/accent/delam/32.ogg', + 'sound/machines/sm/accent/delam/33.ogg' + ) /singleton/sound_category/rip_sound sounds = list( diff --git a/code/game/turfs/initialization/dirty.dm b/code/game/turfs/initialization/dirty.dm index dee8dc3197a..15e2f732b6d 100644 --- a/code/game/turfs/initialization/dirty.dm +++ b/code/game/turfs/initialization/dirty.dm @@ -43,4 +43,4 @@ new /obj/effect/decal/cleanable/cobweb(T) if(dir == EAST) new /obj/effect/decal/cleanable/cobweb2(T) - return \ No newline at end of file + return diff --git a/code/game/turfs/simulated/floor_damage.dm b/code/game/turfs/simulated/floor_damage.dm index 5e4fe9e381b..255333fa409 100644 --- a/code/game/turfs/simulated/floor_damage.dm +++ b/code/game/turfs/simulated/floor_damage.dm @@ -22,4 +22,4 @@ burnt = rand(0,flooring.has_burn_range) else burnt = 0 - update_icon() \ No newline at end of file + update_icon() diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index 20db08844f8..e30c1c4d74a 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -69,4 +69,4 @@ icon_state = "bluespace-s" /turf/space/transit/bluespace/west - icon_state = "bluespace-w" \ No newline at end of file + icon_state = "bluespace-w" diff --git a/code/game/turfs/turf_flick_animations.dm b/code/game/turfs/turf_flick_animations.dm index cd472144abc..60d93abb904 100644 --- a/code/game/turfs/turf_flick_animations.dm +++ b/code/game/turfs/turf_flick_animations.dm @@ -17,5 +17,5 @@ animation.icon_state = "blank" animation.master = target flick(flick_anim, animation) - + QDEL_IN(animation, max(sleeptime, 15)) diff --git a/code/game/turfs/unsimulated.dm b/code/game/turfs/unsimulated.dm index aa9f9f7bcef..08b38abe6e8 100644 --- a/code/game/turfs/unsimulated.dm +++ b/code/game/turfs/unsimulated.dm @@ -1,3 +1,3 @@ /turf/unsimulated name = "command" - initial_gas = list("oxygen" = MOLES_O2STANDARD, "nitrogen" = MOLES_N2STANDARD) \ No newline at end of file + initial_gas = list("oxygen" = MOLES_O2STANDARD, "nitrogen" = MOLES_N2STANDARD) diff --git a/code/global.dm b/code/global.dm index a8e3879b56c..d83a8330f16 100644 --- a/code/global.dm +++ b/code/global.dm @@ -65,7 +65,7 @@ var/list/cardinal = list(NORTH, SOUTH, EAST, WEST) var/list/cornerdirs = list(NORTHWEST, SOUTHEAST, NORTHEAST, SOUTHWEST) var/list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) var/list/reverse_dir = list( // reverse_dir[dir] = reverse of dir - 2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15, 32, 34, 33, 35, 40, 42, + 2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15, 32, 34, 33, 35, 40, 42, 41, 43, 36, 38, 37, 39, 44, 46, 45, 47, 16, 18, 17, 19, 24, 26, 25, 27, 20, 22, 21, 23, 28, 30, 29, 31, 48, 50, 49, 51, 56, 58, 57, 59, 52, 54, 53, 55, 60, 62, 61, 63 ) diff --git a/code/js/menus.dm b/code/js/menus.dm index 01137ce9630..0064522c2f8 100644 --- a/code/js/menus.dm +++ b/code/js/menus.dm @@ -1,37 +1,37 @@ var/const/js_dropdowns = {" function dropdowns() { - var divs = document.getElementsByTagName('div'); - var headers = new Array(); - var links = new Array(); - for(var i=0;i=0) { - elem.className = elem.className.replace('visible','hidden'); - this.className = this.className.replace('open','closed'); - this.innerHTML = this.innerHTML.replace('-','+'); - } - else { - elem.className = elem.className.replace('hidden','visible'); - this.className = this.className.replace('closed','open'); - this.innerHTML = this.innerHTML.replace('+','-'); - } - return false; - } - })(links\[i\]); - } - } + var divs = document.getElementsByTagName('div'); + var headers = new Array(); + var links = new Array(); + for(var i=0;i=0) { + elem.className = elem.className.replace('visible','hidden'); + this.className = this.className.replace('open','closed'); + this.innerHTML = this.innerHTML.replace('-','+'); + } + else { + elem.className = elem.className.replace('hidden','visible'); + this.className = this.className.replace('closed','open'); + this.innerHTML = this.innerHTML.replace('+','-'); + } + return false; + } + })(links\[i\]); + } + } } -"} \ No newline at end of file +"} diff --git a/code/modules/admin/admin_attack_log.dm b/code/modules/admin/admin_attack_log.dm index e74f2328714..f518e5ecb0c 100644 --- a/code/modules/admin/admin_attack_log.dm +++ b/code/modules/admin/admin_attack_log.dm @@ -46,8 +46,10 @@ violent = "" var/temperature_text = "([temperature - (T0C + 20)]C)" - admin_attack_log(attacker, - victim, - "used \the [I] to [violent]inject - [reagents] [temperature_text] - [amount_transferred]u transferred", - "was [violent]injected with \the [I] - [reagents] [temperature_text] - [amount_transferred]u transferred", - "used \the [I] to [violent]inject [reagents] [temperature_text] ([amount_transferred]u transferred) into") + admin_attack_log( + attacker, + victim, + "used \the [I] to [violent]inject - [reagents] [temperature_text] - [amount_transferred]u transferred", + "was [violent]injected with \the [I] - [reagents] [temperature_text] - [amount_transferred]u transferred", + "used \the [I] to [violent]inject [reagents] [temperature_text] ([amount_transferred]u transferred) into" + ) diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index b974d8f847c..9369084e512 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -7,4 +7,4 @@ create_object_html = file2text('html/create_object.html') create_object_html = replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"") - user << browse(replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=600x600") \ No newline at end of file + user << browse(replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=600x600") diff --git a/code/modules/admin/create_poll.dm b/code/modules/admin/create_poll.dm index cb8d78969a3..50041052f95 100644 --- a/code/modules/admin/create_poll.dm +++ b/code/modules/admin/create_poll.dm @@ -67,7 +67,7 @@ link = "'[sanitizeSQL(link)]'" else link = "NULL" - + var/sql_ckey = sanitizeSQL(ckey) var/question = input("Write your question","Question") as message if(!question) @@ -139,4 +139,4 @@ if("Add option") add_option = 1 if("Finish") - add_option = 0 \ No newline at end of file + add_option = 0 diff --git a/code/modules/admin/map_capture.dm b/code/modules/admin/map_capture.dm index 56673bccc0c..f9e684d84be 100644 --- a/code/modules/admin/map_capture.dm +++ b/code/modules/admin/map_capture.dm @@ -78,4 +78,4 @@ switch(alert("Are you sure? (This will cause masive lag!!!)", "Map Capture", "No", "Yes")) if("Yes") - usr.client.holder.capture_map_capture_next(tz, 1, 1, ligths) \ No newline at end of file + usr.client.holder.capture_map_capture_next(tz, 1, 1, ligths) diff --git a/code/modules/admin/secrets/admin_secrets/show_game_mode.dm b/code/modules/admin/secrets/admin_secrets/show_game_mode.dm index 3a49e8d459c..a34694faa9f 100644 --- a/code/modules/admin/secrets/admin_secrets/show_game_mode.dm +++ b/code/modules/admin/secrets/admin_secrets/show_game_mode.dm @@ -10,7 +10,7 @@ . = ..() if(!.) return - if (SSticker.mode) + if (SSticker.mode) alert("The game mode is [SSticker.mode.name]") - else + else alert("For some reason there's a ticker, but not a game mode") diff --git a/code/modules/admin/ticket.dm b/code/modules/admin/ticket.dm index 9e41089d12f..ba7e68f4bee 100644 --- a/code/modules/admin/ticket.dm +++ b/code/modules/admin/ticket.dm @@ -166,11 +166,9 @@ var/global/list/ticket_panels = list() return var/DBQuery/Q = dbcon.NewQuery({"INSERT INTO ss13_tickets - (game_id, message_count, admin_count, admin_list, opened_by, taken_by, - closed_by, response_delay, opened_at, closed_at) + (game_id, message_count, admin_count, admin_list, opened_by, taken_by, closed_by, response_delay, opened_at, closed_at) VALUES - (:g_id:, :m_count:, :a_count:, :a_list:, :opened_by:, :taken_by:, - :closed_by:, :delay:, :opened_at:, :closed_at:)"}) + (:g_id:, :m_count:, :a_count:, :a_list:, :opened_by:, :taken_by:, :closed_by:, :delay:, :opened_at:, :closed_at:)"}) Q.Execute(list( "g_id" = game_id, "m_count" = length(msgs), diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index b4f1502146e..707338efd71 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -11,7 +11,7 @@ if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV)) return - + if(istype(usr, /mob/abstract/new_player)) return diff --git a/code/modules/admin/verbs/ntsl.dm b/code/modules/admin/verbs/ntsl.dm index 97f0b80ca3b..f52f6acfafa 100644 --- a/code/modules/admin/verbs/ntsl.dm +++ b/code/modules/admin/verbs/ntsl.dm @@ -26,4 +26,4 @@ feedback_add_details("admin_verb","CNT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! else - to_chat(src, "NTSL2+ Daemon is already connected.") \ No newline at end of file + to_chat(src, "NTSL2+ Daemon is already connected.") diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index bec113fd66c..dda2b905311 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -273,10 +273,10 @@ Ccomp's first proc. if(G.has_enabled_antagHUD && config.antag_hud_restricted) var/response = alert(src, "Are you sure you wish to allow this individual to play?","Ghost has used AntagHUD","Yes","No") if(response == "No") return - G.timeofdeath=-19999 /* time of death is checked in /mob/verb/abandon_mob() which is the Respawn verb. - timeofdeath is used for bodies on autopsy but since we're messing with a ghost I'm pretty sure - there won't be an autopsy. - */ + + /* time of death is checked in /mob/verb/abandon_mob() which is the Respawn verb. + timeofdeath is used for bodies on autopsy but since we're messing with a ghost I'm pretty sure there won't be an autopsy.*/ + G.timeofdeath=-19999 var/datum/preferences/P if (G.client) diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm index 847cea42a79..49569cfd97e 100644 --- a/code/modules/admin/view_variables/view_variables.dm +++ b/code/modules/admin/view_variables/view_variables.dm @@ -64,11 +64,11 @@ Refresh
#SLIDESHOW
+ id='filter' + name='filter_text' + value='[search]' + onkeyup='updateSearch()' + onchange='updateSearch()' + style='width:100%;' />
diff --git a/code/modules/assembly/helpers.dm b/code/modules/assembly/helpers.dm index 5fb9437efe8..152d34fbcba 100644 --- a/code/modules/assembly/helpers.dm +++ b/code/modules/assembly/helpers.dm @@ -22,4 +22,4 @@ // If true is an object that can hold an assemblyholder object /obj/proc/IsAssemblyHolder() - return FALSE \ No newline at end of file + return FALSE diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 06c992dd393..da5be3b67ba 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -35,4 +35,4 @@ add_fingerprint(user) /obj/item/device/assembly/igniter/isFlameSource() - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/asset_cache/transports/webroot_transport.dm b/code/modules/asset_cache/transports/webroot_transport.dm index 521682a6b6f..9ee8768efd4 100644 --- a/code/modules/asset_cache/transports/webroot_transport.dm +++ b/code/modules/asset_cache/transports/webroot_transport.dm @@ -1,4 +1,4 @@ -/// CDN Webroot asset transport. +/// CDN Webroot asset transport. /datum/asset_transport/webroot name = "CDN Webroot asset transport" @@ -59,7 +59,7 @@ if (!islist(asset_list)) asset_list = list(asset_list) for (var/asset_name in asset_list) - var/datum/asset_cache_item/ACI = asset_list[asset_name] + var/datum/asset_cache_item/ACI = asset_list[asset_name] if (!istype(ACI)) ACI = SSassets.cache[asset_name] if (!ACI) @@ -69,7 +69,7 @@ legacy_assets[asset_name] = ACI if (length(legacy_assets)) . = ..(client, legacy_assets) - + /// webroot slow asset sending - does nothing. /datum/asset_transport/webroot/send_assets_slow(client/client, list/files, filerate) diff --git a/code/modules/atmospherics/components/omni_devices/_omni_extras.dm b/code/modules/atmospherics/components/omni_devices/_omni_extras.dm index 2673372155c..47e14aae4ee 100644 --- a/code/modules/atmospherics/components/omni_devices/_omni_extras.dm +++ b/code/modules/atmospherics/components/omni_devices/_omni_extras.dm @@ -15,7 +15,7 @@ //-------------------------------------------- // Omni port datum // -// Used by omni devices to manage connections +// Used by omni devices to manage connections // to other atmospheric objects. //-------------------------------------------- /datum/omni_port @@ -71,10 +71,10 @@ string = "East" if(WEST) string = "West" - + if(!capitalize && string) string = lowertext(string) - + return string //returns a direction flag based on the string passed to it @@ -108,4 +108,4 @@ if(ATM_H2) return GAS_HYDROGEN else - return null \ No newline at end of file + return null diff --git a/code/modules/atmospherics/components/unary/outlet_injector.dm b/code/modules/atmospherics/components/unary/outlet_injector.dm index 7d0daeb1fd5..2097d1009c6 100644 --- a/code/modules/atmospherics/components/unary/outlet_injector.dm +++ b/code/modules/atmospherics/components/unary/outlet_injector.dm @@ -120,7 +120,7 @@ "power" = use_power, "volume_rate" = volume_rate, "sigtype" = "status" - ) + ) radio_connection.post_signal(src, signal) diff --git a/code/modules/atmospherics/components/unary/vent_pump.dm b/code/modules/atmospherics/components/unary/vent_pump.dm index dc6e7f72908..b0ad609d47f 100644 --- a/code/modules/atmospherics/components/unary/vent_pump.dm +++ b/code/modules/atmospherics/components/unary/vent_pump.dm @@ -387,8 +387,8 @@ update_icon() playsound(src, 'sound/items/welder_pry.ogg', 50, 1) user.visible_message(SPAN_NOTICE("\The [user] [welded ? "welds \the [src] shut" : "unwelds \the [src]"]."), \ - SPAN_NOTICE("You [welded ? "weld \the [src] shut" : "unweld \the [src]"]."), \ - "You hear welding.") + SPAN_NOTICE("You [welded ? "weld \the [src] shut" : "unweld \the [src]"]."), \ + "You hear welding.") else to_chat(user, SPAN_NOTICE("You fail to complete the welding.")) else diff --git a/code/modules/atmospherics/components/unary/vent_scrubber.dm b/code/modules/atmospherics/components/unary/vent_scrubber.dm index a779d19ab54..ebf441630f2 100644 --- a/code/modules/atmospherics/components/unary/vent_scrubber.dm +++ b/code/modules/atmospherics/components/unary/vent_scrubber.dm @@ -342,8 +342,8 @@ welded = !welded update_icon() user.visible_message(SPAN_NOTICE("\The [user] [welded ? "welds \the [src] shut" : "unwelds \the [src]"]."), \ - SPAN_NOTICE("You [welded ? "weld \the [src] shut" : "unweld \the [src]"]."), \ - "You hear welding.") + SPAN_NOTICE("You [welded ? "weld \the [src] shut" : "unweld \the [src]"]."), \ + "You hear welding.") return TRUE if(istype(W, /obj/item/melee/arm_blade)) diff --git a/code/modules/atmospherics/datum_pipe_network.dm b/code/modules/atmospherics/datum_pipe_network.dm index 8a76c5f801a..28e751e17c9 100644 --- a/code/modules/atmospherics/datum_pipe_network.dm +++ b/code/modules/atmospherics/datum_pipe_network.dm @@ -69,7 +69,7 @@ for(var/datum/pipeline/line_member in line_members) gases += line_member.air - + for(var/datum/gas_mixture/air in gases) volume += air.volume diff --git a/code/modules/atmospherics/datum_pipeline.dm b/code/modules/atmospherics/datum_pipeline.dm index d570b94d761..8375d58f3d2 100644 --- a/code/modules/atmospherics/datum_pipeline.dm +++ b/code/modules/atmospherics/datum_pipeline.dm @@ -206,16 +206,16 @@ /datum/pipeline/proc/radiate_heat_to_space(surface, thermal_conductivity) var/gas_density = air.total_moles/air.volume thermal_conductivity *= min(gas_density / ( RADIATOR_OPTIMUM_PRESSURE/(R_IDEAL_GAS_EQUATION*GAS_CRITICAL_TEMPERATURE) ), 1) //mult by density ratio - + // We only get heat from the star on the exposed surface area. // If the HE pipes gain more energy from AVERAGE_SOLAR_RADIATION than they can radiate, then they have a net heat increase. var/heat_gain = AVERAGE_SOLAR_RADIATION * (RADIATOR_EXPOSED_SURFACE_AREA_RATIO * surface) * thermal_conductivity - + // Previously, the temperature would enter equilibrium at 26C or 294K. // Only would happen if both sides (all 2 square meters of surface area) were exposed to sunlight. We now assume it aligned edge on. // It currently should stabilise at 129.6K or -143.6C heat_gain -= surface * STEFAN_BOLTZMANN_CONSTANT * thermal_conductivity * (air.temperature - COSMIC_RADIATION_TEMPERATURE) ** 4 - + air.add_thermal_energy(heat_gain) if(network) network.update = 1 diff --git a/code/modules/atmospherics/pipes.dm b/code/modules/atmospherics/pipes.dm index 1e4a99d71b9..b7e6fe0a6d7 100644 --- a/code/modules/atmospherics/pipes.dm +++ b/code/modules/atmospherics/pipes.dm @@ -1388,7 +1388,7 @@ air_temporary.temperature = T20C air_temporary.adjust_multi(GAS_OXYGEN, (start_pressure*O2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature), \ - GAS_NITROGEN,(start_pressure*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)) + GAS_NITROGEN,(start_pressure*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)) . = ..() diff --git a/code/modules/awaymissions/pamphlet.dm b/code/modules/awaymissions/pamphlet.dm index ec5e940669f..55264ee921d 100644 --- a/code/modules/awaymissions/pamphlet.dm +++ b/code/modules/awaymissions/pamphlet.dm @@ -35,4 +35,4 @@ //we don't want the silly text overlay! /obj/item/paper/pamphlet/update_icon() - return \ No newline at end of file + return diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index 1631d5e989f..698bab06aef 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -21,11 +21,11 @@ // var/value = null if (pos) - // No, don't do lowertext here, that breaks paths on linux + // No, don't do lowertext here, that breaks paths on linux name = copytext(t, 1, pos) // value = copytext(t, pos + 1) else - // No, don't do lowertext here, that breaks paths on linux + // No, don't do lowertext here, that breaks paths on linux name = t if (!name) diff --git a/code/modules/background/accent/accent.dm b/code/modules/background/accent/accent.dm index f76a806aa2c..777558e7132 100644 --- a/code/modules/background/accent/accent.dm +++ b/code/modules/background/accent/accent.dm @@ -2,4 +2,4 @@ var/name var/description = "Unga Dunga." var/tag_icon //those icons should go in accent_tags.dmi - var/text_tag //Each accent should have a text tag. These are used in cases such as 4K monitors where tag icons cannot be displayed properly. \ No newline at end of file + var/text_tag //Each accent should have a text tag. These are used in cases such as 4K monitors where tag icons cannot be displayed properly. diff --git a/code/modules/background/accent/diona.dm b/code/modules/background/accent/diona.dm index 150f8247149..d8b352e246b 100644 --- a/code/modules/background/accent/diona.dm +++ b/code/modules/background/accent/diona.dm @@ -34,20 +34,20 @@ description = "Found exclusively in Dionae hailing from the Unathi-Dominated world of Moghes, Sandsong is a distinct variation of Rootsong notable for having its tempo much more drawn out, with tones of higher pitches especially having a much more exaggerated sound. Dionae speaking with the Sandsong accent will typically hold certain speech patterns held by Unathi such as hissing out their S’s and difficulties pronouncing the letter X. " tag_icon = "dionae_sandsong" text_tag = "SDS" - + /datum/accent/wastesong name = ACCENT_WASTESONG description = "Originating from the irradiated Moghes Wastes, Wastesong is an accent spoken by Dionae who found themselves being bathed in the Wasteland’s radiation, making them healthy and much more resilient than some of their other planet-bound brethren, but also giving them a slightly distinct accent notable for having a lower-pitched voice compared to regular Rootsong but also a much faster tempo. Much like Sandsong, Dionae with the Wasteland accent will typically carry similar speech patterns to Unathi such as hissing out their S’s." tag_icon = "dionae_wastesong" text_tag = "WES" - + //Skrell influenced Accents /datum/accent/wavesong name = ACCENT_WAVESONG description = "A variant of Rootsong originating from Diona born on Skrellian worlds, Wavesong is considered the general accent for Dionae hailing from the Nralakk Federation. While it shares many similarities with Rootsong, Wavesong sets itself apart by having a lower pitch and more drawn-out tempo in comparison. While not considered mandatory, many Dionae living in the Federation will adopt the accent due to it being generally more favored by the Federation, often granting those with the accent a higher social credit score." tag_icon = "dionae_wavesong" text_tag = "WAS" - + /datum/accent/sunkensong name = ACCENT_SUNKENSONG description = "Sunkensong is a variant of Voidsong that is common for space-borne Dionae hailing from regions surrounding the Tri-Qyu Nebula. Known for it's lighter pitch and tone, along with it's consistent, even pacing for words, the accent is prevalent amongst Nralakk Federation Diona that originate from wild, voidbound gestalts. Dionae with Sunkensong may attempt to mimic Skrell accents in an attempt to replicate the more popular Starsong, with mixed results." diff --git a/code/modules/background/accent/skrell.dm b/code/modules/background/accent/skrell.dm index 33b79810449..37556962352 100644 --- a/code/modules/background/accent/skrell.dm +++ b/code/modules/background/accent/skrell.dm @@ -89,6 +89,6 @@ /datum/accent/skrell/EUM name = ACCENT_SKRELLEUM description = "The Nral'Daaq accent draws from the accents of migrating Skrell from the Federation as well as elements of rootsong from the local Dionae population, creating a sing-song accent with \ - melodic highs and lows. The accent has been compared to the Aweijiin accent, but it does not have the same reputation as it is not used by idols." + melodic highs and lows. The accent has been compared to the Aweijiin accent, but it does not have the same reputation as it is not used by idols." tag_icon = "skrell_nraldaaq" text_tag = "NDQ" diff --git a/code/modules/background/accent/vaurca.dm b/code/modules/background/accent/vaurca.dm index 80efefb843e..5bbc83609e1 100644 --- a/code/modules/background/accent/vaurca.dm +++ b/code/modules/background/accent/vaurca.dm @@ -1,39 +1,39 @@ /datum/accent/zora - name = ACCENT_ZORA - description = "Zo'rane is the modern day dialect of the Zo'ra Hive, composed of cheap Biesellite voice modulators that manage to sway most voices \ - into a more gender neutral tone, while retaining a distinct alien dialect. To other Vaurcae, this accent is reminiscent of the authority the Zo'ra held - \ - regal and noble. Their vocal augments stereotypically have difficulty, typically when producing sounds related to the letter 's', instead substituting with \ - a harsh buzzing in the throat." - tag_icon = "zora" - text_tag = "ZOR" + name = ACCENT_ZORA + description = "Zo'rane is the modern day dialect of the Zo'ra Hive, composed of cheap Biesellite voice modulators that manage to sway most voices \ + into a more gender neutral tone, while retaining a distinct alien dialect. To other Vaurcae, this accent is reminiscent of the authority the Zo'ra held - \ + regal and noble. Their vocal augments stereotypically have difficulty, typically when producing sounds related to the letter 's', instead substituting with \ + a harsh buzzing in the throat." + tag_icon = "zora" + text_tag = "ZOR" /datum/accent/klax - name = ACCENT_KLAX - description = "K'laxane is the modern day dialect of the K'lax Hive. Primitive modulators manage to capture a similarity to the \ - peasantry of the Izweski Hegemony on Moghes - however, they do not fully replicate it, retaining a more drawn out and dreamy tone. To other Vaurcae, this is \ - a more subservient manner of speaking, akin to how Bound tend to draw out their thoughts - a common trait instilled in most vassal hives as a brand. Their \ - vocal augments stereotypically have difficulty, typically when producing sounds related to the letter 's', instead substituting with a harsh buzzing in the \ - throat - the K'lax experience less of this - no Unathi would be content listening to a Vaurca buzz incessantly when trying to hiss a sentence in the \ - Hegemonic tongue." - tag_icon = "klax" - text_tag = "KLA" + name = ACCENT_KLAX + description = "K'laxane is the modern day dialect of the K'lax Hive. Primitive modulators manage to capture a similarity to the \ + peasantry of the Izweski Hegemony on Moghes - however, they do not fully replicate it, retaining a more drawn out and dreamy tone. To other Vaurcae, this is \ + a more subservient manner of speaking, akin to how Bound tend to draw out their thoughts - a common trait instilled in most vassal hives as a brand. Their \ + vocal augments stereotypically have difficulty, typically when producing sounds related to the letter 's', instead substituting with a harsh buzzing in the \ + throat - the K'lax experience less of this - no Unathi would be content listening to a Vaurca buzz incessantly when trying to hiss a sentence in the \ + Hegemonic tongue." + tag_icon = "klax" + text_tag = "KLA" /datum/accent/cthur - name = ACCENT_CTHUR - description = "C'thuric is the modern day dialect of the C'thur Hive, a sly and sneering take on the unyielding Nral'Malic. Other Vaurcae would associate this tone with the \ + name = ACCENT_CTHUR + description = "C'thuric is the modern day dialect of the C'thur Hive, a sly and sneering take on the unyielding Nral'Malic. Other Vaurcae would associate this tone with the \ C'thur's infamous past deeds. Modulators are unfortunately still cheap, leading to a monotone method of speaking. \ Voices are also warped into being clear and concise, many C'thur adopting a blunt and to-the-point style when speaking casually. \ Their vocal augments stereotypically have difficulty, typically when producing sounds related to the letter 's', instead \ - substituting with a harsh buzzing in the throat." - tag_icon = "cthur" - text_tag = "CTH" + substituting with a harsh buzzing in the throat." + tag_icon = "cthur" + text_tag = "CTH" /datum/accent/liidra - name = ACCENT_LIIDRA - description = "The Lii'dra speech, as understood by those that have heard the Hivemind and live to tell, is characterized by a monotonous voice that sounds \ - even more robotic than the modulators used by other Hives. It is believed to be a modified technology reverse engineered from stolen \ - Zo'rane modulators. While, with its flaws, the Zo'ra accent might sound quirky to some, it is often said that this is to add more personality to each \ - individual. Since the Lii'dra do not think of themselves as individuals, these variations were deemed useless. The Connected will often speak of themselves in plural, while the Disconnected \ - are prone to using the first person when referring to others." - tag_icon = "liidra" - text_tag = "LII" + name = ACCENT_LIIDRA + description = "The Lii'dra speech, as understood by those that have heard the Hivemind and live to tell, is characterized by a monotonous voice that sounds \ + even more robotic than the modulators used by other Hives. It is believed to be a modified technology reverse engineered from stolen \ + Zo'rane modulators. While, with its flaws, the Zo'ra accent might sound quirky to some, it is often said that this is to add more personality to each \ + individual. Since the Lii'dra do not think of themselves as individuals, these variations were deemed useless. The Connected will often speak of themselves in plural, while the Disconnected \ + are prone to using the first person when referring to others." + tag_icon = "liidra" + text_tag = "LII" diff --git a/code/modules/background/citizenship/dionae.dm b/code/modules/background/citizenship/dionae.dm index 87cdb84c125..272eef4bf88 100644 --- a/code/modules/background/citizenship/dionae.dm +++ b/code/modules/background/citizenship/dionae.dm @@ -1,15 +1,15 @@ /datum/citizenship/eum name = CITIZENSHIP_EUM description = "Initially discovered by Skrell probes in 2342, Epsilon Ursea Minoris, or generally referred \ - to as EUM, is a habitable world home to multiple Dionae civilizations and clusters. While not the homeworld \ - of the species, EUM is the largest-known world to have been colonized exclusively by Dionae without contact \ - or help from outside species, being home to the Dionae for thousands of years prior to discovery." - + to as EUM, is a habitable world home to multiple Dionae civilizations and clusters. While not the homeworld \ + of the species, EUM is the largest-known world to have been colonized exclusively by Dionae without contact \ + or help from outside species, being home to the Dionae for thousands of years prior to discovery." + job_species_blacklist = list( "Consular Officer" = list( SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, - SPECIES_SKRELL, + SPECIES_SKRELL, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm index 9ee682fba9a..cdac7b46e54 100644 --- a/code/modules/background/citizenship/human.dm +++ b/code/modules/background/citizenship/human.dm @@ -79,7 +79,7 @@ name = CITIZENSHIP_SOL description = "Once considered a juggernaut in terms of cultural and political influence, the Alliance of Sovereign Solarian Nations (ASSN), commonly referred to as the Sol Alliance, has greatly declined in the wake of the phoron crisis and the Solarian collapse of 2462. \ Once the spur's largest interstellar power, in recent times the Sol Alliance has retreated to its wealthy so-called Jewel Worlds and inner colonies, with its reach barely extending to a few select middle colonies. \ - However, it still controls the largest human military in the entire spur, and their cooperation with Einstein Engines and the Nralakk Federation has contributed to it gradually regaining some of its pre-collapse influence and power. \ + However, it still controls the largest human military in the entire spur, and their cooperation with Einstein Engines and the Nralakk Federation has contributed to it gradually regaining some of its pre-collapse influence and power. \ Presently ruled by a military junta that is gradually giving way to civilian control, the Alliance is also generally xenophobic, and most non-humans find themselves discriminated against in Solarian territory. \ Though much of its former possessions are now occupied by warlord statelets and other interstellar powers, the Alliance still maintains a revanchist outlook, refusing to relinquish its claims to its lost territories." consular_outfit = /datum/outfit/job/representative/consular/sol diff --git a/code/modules/background/origins/origins/diona/eum.dm b/code/modules/background/origins/origins/diona/eum.dm index 7da4eaad395..81cacc883e6 100644 --- a/code/modules/background/origins/origins/diona/eum.dm +++ b/code/modules/background/origins/origins/diona/eum.dm @@ -19,28 +19,28 @@ possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG, ACCENT_IRONSONG, ACCENT_WAVESONG, ACCENT_SUNKENSONG, ACCENT_STARSONG) possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_MADA, RELIGION_GLEANERS, RELIGION_OTHER, RELIGION_NONE) - + /singleton/origin_item/origin/united name = "United" desc = "Widely considered the capital of the CT-EUM, the city-state of United is the newest independent nation, formed alongside the formation of the CT-EUM, to act as a neutral meeting place for the Council of Delegates, and to represent the central governing body, as well as acting as a mediator between the two other city-states should a conflict arise. United is the second most-visited city on EUM after Nral'Daaq, and has influence from both off-world and the other city-states in its structure, and operation." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG, ACCENT_IRONSONG, ACCENT_WAVESONG, ACCENT_SUNKENSONG, ACCENT_STARSONG) possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_MADA, RELIGION_GLEANERS, RELIGION_OTHER, RELIGION_NONE) - + /singleton/origin_item/origin/gleaners name = "Gleaners Of Bliss" desc = "The Gleaners of Bliss is a large, religious city-state that is known for its imperialistic attitude. The Gleaners emphasize harmony and equality, but are not above making sure that it aligns to their specific ideals, however. The Gleaners are among the oldest of the city-states and were one of the first to put forth the idea of the CT-EUM on first contact. Before, and during, its inception, the Gleaners have expanded their influence on numerous other city-states, both in and out of the CT-EUM. Now, the Gleaners are the most outspoken proponents of expanding the CT-EUM offworld. Their emphasis on equality and harmony however, are criticized because of this, and the Gleaners are often seen as a very hypocritical city-state." possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG, ACCENT_IRONSONG) possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_GLEANERS, RELIGION_OTHER, RELIGION_NONE) - + /singleton/origin_item/origin/nraldaaq name = "Nral'Daaq" desc = "Playing host to the vast majority of the planet's non-dionae population, Nral'Daaq is a city-state under the CT-EUM that is known for being the planet's hub of off-world trading, as well as for its quite diverse majority-skrell population, with both Pro-Federation and Anti-Federation Skrell calling the city home. Due to the city's border with the sea, Nral'Daaq is also a quite popular trading spot for the Ekane, with the vast majority of their goods ending up in the city to be later resold off-world. " possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG, ACCENT_IRONSONG, ACCENT_WAVESONG, ACCENT_SUNKENSONG, ACCENT_STARSONG) possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_MADA, RELIGION_GLEANERS, RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE) - + /singleton/origin_item/origin/mada name = "Mada" desc = "Primarily located in the great forests of the Mede Region on EUM, The Mada are a semi-independent nation under the CT-EUM known for their isolationist beliefs and their religious worship of nature, with a focus on plant life in particular. Rather than all be situated in one singular city, the Mada are fairly spread out in the region, inhabiting a myriad of small settlements. The Capital, Elder Mada, is the largest settlement under the Mada, but not by a large margin." @@ -54,7 +54,7 @@ possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG, ACCENT_IRONSONG) possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) - + /singleton/origin_item/origin/eumstation name = "Celestial Station" desc = "The first and largest space-bound outpost established by the CT-EUM government, Celestial Station is notable as a major trading hub for EUM's nations, often being used as a large marketplace for potential sellers and buyers from both EUM and elsewhere to do business, as well as a hub for mining operations undertaken on nearby asteroids. While nominally under the direct control of the CT-EUM federal government, Celestial Station has as of late begun to make efforts to gain independence away from the Federal government's direct control as a colony, instead attempting to become a semi-independent city-state under the CT-EUM government much like the other city-states under it. " @@ -62,7 +62,7 @@ possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG, ACCENT_IRONSONG, ACCENT_WAVESONG, ACCENT_SUNKENSONG, ACCENT_STARSONG) possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_ETERNAL, RELIGION_MADA, RELIGION_GLEANERS, RELIGION_OTHER, RELIGION_NONE) - + /singleton/origin_item/origin/eumminor name = "Minor City State" desc = "From a minor city-state under the CT-EUM. " diff --git a/code/modules/background/origins/origins/diona/narrows.dm b/code/modules/background/origins/origins/diona/narrows.dm index 2527ef76aa8..a33440ad3b0 100644 --- a/code/modules/background/origins/origins/diona/narrows.dm +++ b/code/modules/background/origins/origins/diona/narrows.dm @@ -6,7 +6,7 @@ /singleton/origin_item/origin/b_block, /singleton/origin_item/origin/c_block ) - + /singleton/origin_item/origin/a_block name = "A-block" desc = "The original Dionae of the ship, Dionae in A-Block serves as the third-highest rank in the ship's hierarchy and is considered to be some of the most efficient and experienced workers the ship has to offer. While they tend not to look down upon the other blocks for their lack of experience, they do consider themselves to be better workers. As a result of this A-block has actually begun to see a lack of personnel due to so many signing on to leave the ship and work elsewhere within Hephestatus as a way to show off the efficiency of Dionae from the Narrows." diff --git a/code/modules/background/origins/origins/human/biesel.dm b/code/modules/background/origins/origins/human/biesel.dm index e1fa5409215..33102cb9551 100644 --- a/code/modules/background/origins/origins/human/biesel.dm +++ b/code/modules/background/origins/origins/human/biesel.dm @@ -1,38 +1,38 @@ /singleton/origin_item/culture/biesellite - name = "Biesellite" - desc = "Relatively new compared to other cultures across the Orion Spur, the Biesellite culture was forged from the fire borne by its independence. Since its inception, it has continued to evolve, especially with the recent expansion of the Republic of Biesel into the Solarian Alliance's Outer Ring after its abandonment during the collapse. Despite its recent acquisition, the Corporate Reconstruction Zone as it is now known has begun adjusting and blending their own cultures into the Biesellite way of life, those not bending the knee and aligning are often bastions of insurgency and unrest." - possible_origins = list( - /singleton/origin_item/origin/biesel, - /singleton/origin_item/origin/new_gibson, - /singleton/origin_item/origin/reade, - /singleton/origin_item/origin/valkyrie - ) + name = "Biesellite" + desc = "Relatively new compared to other cultures across the Orion Spur, the Biesellite culture was forged from the fire borne by its independence. Since its inception, it has continued to evolve, especially with the recent expansion of the Republic of Biesel into the Solarian Alliance's Outer Ring after its abandonment during the collapse. Despite its recent acquisition, the Corporate Reconstruction Zone as it is now known has begun adjusting and blending their own cultures into the Biesellite way of life, those not bending the knee and aligning are often bastions of insurgency and unrest." + possible_origins = list( + /singleton/origin_item/origin/biesel, + /singleton/origin_item/origin/new_gibson, + /singleton/origin_item/origin/reade, + /singleton/origin_item/origin/valkyrie + ) /singleton/origin_item/origin/biesel - name = "Biesel" - desc = "One of the first colonies outside of the Sol System, Biesel has since flourished into an economic powerhouse within the greater Orion Spur. There exists no singular culture, but instead, a loose melting pot of multiculturalism exists where the only definable trait of Biesellite culture is that it doesn't have any. Most of Tau Ceti's inhabitants reside within Mendell City, a large metropolis that stretches across the plains of Biesel, and has various districts each with its own culture." - possible_accents = list(ACCENT_CETI) - possible_citizenships = list(CITIZENSHIP_BIESEL) - possible_religions = RELIGIONS_BIESEL + name = "Biesel" + desc = "One of the first colonies outside of the Sol System, Biesel has since flourished into an economic powerhouse within the greater Orion Spur. There exists no singular culture, but instead, a loose melting pot of multiculturalism exists where the only definable trait of Biesellite culture is that it doesn't have any. Most of Tau Ceti's inhabitants reside within Mendell City, a large metropolis that stretches across the plains of Biesel, and has various districts each with its own culture." + possible_accents = list(ACCENT_CETI) + possible_citizenships = list(CITIZENSHIP_BIESEL) + possible_religions = RELIGIONS_BIESEL /singleton/origin_item/origin/new_gibson - name = "New Gibson" - desc = "New Gibson has suffered many tragedies throughout its history, leading to a hardened, communal society. While the multiculturalism that exists within the Republic of Biesel has also affected New Gibsonites, they are still far more reliant on their colonial roots compared to their Biesellite counterparts." - important_information = "Due to the insular nature of the Undirstads of New Gibson, characters hailing from them must have names and appearances consistent with the Nordic regions of Earth, the original colonists of the Undirstads. Only those born in the Undirstads may take the Undirstad accent. This is enforceable by server moderation and admins." - possible_accents = list(ACCENT_GIBSON_OVAN, ACCENT_GIBSON_UNDIR) - possible_citizenships = list(CITIZENSHIP_BIESEL) - possible_religions = RELIGIONS_BIESEL + name = "New Gibson" + desc = "New Gibson has suffered many tragedies throughout its history, leading to a hardened, communal society. While the multiculturalism that exists within the Republic of Biesel has also affected New Gibsonites, they are still far more reliant on their colonial roots compared to their Biesellite counterparts." + important_information = "Due to the insular nature of the Undirstads of New Gibson, characters hailing from them must have names and appearances consistent with the Nordic regions of Earth, the original colonists of the Undirstads. Only those born in the Undirstads may take the Undirstad accent. This is enforceable by server moderation and admins." + possible_accents = list(ACCENT_GIBSON_OVAN, ACCENT_GIBSON_UNDIR) + possible_citizenships = list(CITIZENSHIP_BIESEL) + possible_religions = RELIGIONS_BIESEL /singleton/origin_item/origin/reade - name = "Reade" - desc = "Outposts dot the dozens of moons found in orbit of Reade, many dedicated to mineral extraction and refinement. However, within the upper atmosphere of the gas giant the engineering feat that is the Anemostrovilos exists. The gigantic floating metropolis has its industry focused on the extraction of important gases such as Hydrogen and Helium-3 required to fuel the Orion Spur's warpdrives and thrusters. Nearly anyone can be found in the outposts either in the upper atmosphere of Reade or across its many moons." - possible_accents = list(ACCENT_CETI, ACCENT_GIBSON_OVAN, ACCENT_GIBSON_UNDIR, ACCENT_VALKYRIE) - possible_citizenships = list(CITIZENSHIP_BIESEL) - possible_religions = RELIGIONS_BIESEL + name = "Reade" + desc = "Outposts dot the dozens of moons found in orbit of Reade, many dedicated to mineral extraction and refinement. However, within the upper atmosphere of the gas giant the engineering feat that is the Anemostrovilos exists. The gigantic floating metropolis has its industry focused on the extraction of important gases such as Hydrogen and Helium-3 required to fuel the Orion Spur's warpdrives and thrusters. Nearly anyone can be found in the outposts either in the upper atmosphere of Reade or across its many moons." + possible_accents = list(ACCENT_CETI, ACCENT_GIBSON_OVAN, ACCENT_GIBSON_UNDIR, ACCENT_VALKYRIE) + possible_citizenships = list(CITIZENSHIP_BIESEL) + possible_religions = RELIGIONS_BIESEL /singleton/origin_item/origin/valkyrie - name = "Valkyrie" - desc = "Lighting up the night sky of Biesel, Valkyrie is an incredibly important port of trade within Tau Ceti, and hosts a significant amount of megacorporate facilities within its orbit, on its surface, as well as deep within the canyons and crevices. Valkyrie has not been spared by the multiculturalism that has dispersed across Tau Ceti, and actively encourages it through their incredibly relaxed immigration policies that allow for a remarkable amount of diversity to exist." - possible_accents = list(ACCENT_VALKYRIE) - possible_citizenships = list(CITIZENSHIP_BIESEL) - possible_religions = RELIGIONS_BIESEL + name = "Valkyrie" + desc = "Lighting up the night sky of Biesel, Valkyrie is an incredibly important port of trade within Tau Ceti, and hosts a significant amount of megacorporate facilities within its orbit, on its surface, as well as deep within the canyons and crevices. Valkyrie has not been spared by the multiculturalism that has dispersed across Tau Ceti, and actively encourages it through their incredibly relaxed immigration policies that allow for a remarkable amount of diversity to exist." + possible_accents = list(ACCENT_VALKYRIE) + possible_citizenships = list(CITIZENSHIP_BIESEL) + possible_religions = RELIGIONS_BIESEL diff --git a/code/modules/background/origins/origins/human/coalition.dm b/code/modules/background/origins/origins/human/coalition.dm index a271d6aa2dd..7d224d56809 100644 --- a/code/modules/background/origins/origins/human/coalition.dm +++ b/code/modules/background/origins/origins/human/coalition.dm @@ -65,7 +65,7 @@ origin_traits_descriptions = list("have a small resistance to radiation", "are more sensitive to bright lights") /singleton/origin_item/origin/gadpathur/on_apply(var/mob/living/carbon/human/H) - H.AddComponent(/datum/component/armor, list(rad = ARMOR_RAD_MINOR)) + H.AddComponent(/datum/component/armor, list(rad = ARMOR_RAD_MINOR)) /singleton/origin_item/origin/gadpathur_exile name = "Gadpathurian Exile" @@ -77,7 +77,7 @@ origin_traits_descriptions = list("have a small resistance to radiation", "are more sensitive to bright lights") /singleton/origin_item/origin/gadpathur_exile/on_apply(var/mob/living/carbon/human/H) - H.AddComponent(/datum/component/armor, list(rad = ARMOR_RAD_MINOR)) + H.AddComponent(/datum/component/armor, list(rad = ARMOR_RAD_MINOR)) /singleton/origin_item/origin/assunzione name = "Republic of Assunzione" diff --git a/code/modules/background/religion/diona.dm b/code/modules/background/religion/diona.dm index 856f8ee05db..a5f8f3b7163 100644 --- a/code/modules/background/religion/diona.dm +++ b/code/modules/background/religion/diona.dm @@ -1,49 +1,49 @@ /datum/religion/eternal - name = RELIGION_ETERNAL - description = "Followers of The Eternal believe that a primordial entity exists in Light, Energy and Essence - which the Dionae are the embodiment of. \ - They believe that the Dionae were made to ensure that all things born from the stars return to stars, eventually. Before they may return the Dionae must devour as much knowledge \ - and biomass as they can, growing exponentially until they reach the mythical Titan form, becoming a star once more. Transcended into a star, the Dionae will emit light and energy \ - until they die, at which point their essence will spread across the void to birth new Dionae. It is in this way that the eternal cycle is achieved. Scholars of the Eternal link \ - this to the very real potential outcome of Titan form Dionae which theoretically could grow to such mass as to collapse into a star, thus giving off light and energy before \ - eventually going supernova and expelling matter or essence across the cosmos." - book_name = "book of the eternal" - book_sprite = "eternal" - + name = RELIGION_ETERNAL + description = "Followers of The Eternal believe that a primordial entity exists in Light, Energy and Essence - which the Dionae are the embodiment of. \ + They believe that the Dionae were made to ensure that all things born from the stars return to stars, eventually. Before they may return the Dionae must devour as much knowledge \ + and biomass as they can, growing exponentially until they reach the mythical Titan form, becoming a star once more. Transcended into a star, the Dionae will emit light and energy \ + until they die, at which point their essence will spread across the void to birth new Dionae. It is in this way that the eternal cycle is achieved. Scholars of the Eternal link \ + this to the very real potential outcome of Titan form Dionae which theoretically could grow to such mass as to collapse into a star, thus giving off light and energy before \ + eventually going supernova and expelling matter or essence across the cosmos." + book_name = "book of the eternal" + book_sprite = "eternal" + /datum/religion/ksshr - name = RELIGION_KSSHR - description = "The Ksshr, also known as the Enlightened, is a religious sect on Xrim known for their complete rejection of The First Consciousness, instead of being an agnostic \ - sect that centers around working together to create a better future, as well as the advancement of technology and understanding how the universe works. The Ksshr faith is the \ - primary religion of Xrim, with most of its inhabitants considering themselves a part of the religion. The Nralakk Federation does encourage practicing the faith amongst the \ - population so long as they continue to reject The First Consciousness, as well as stay away from the teachings of the Shrkh." - book_name = "ksshr codex" - book_sprite = "holybook" - + name = RELIGION_KSSHR + description = "The Ksshr, also known as the Enlightened, is a religious sect on Xrim known for their complete rejection of The First Consciousness, instead of being an agnostic \ + sect that centers around working together to create a better future, as well as the advancement of technology and understanding how the universe works. The Ksshr faith is the \ + primary religion of Xrim, with most of its inhabitants considering themselves a part of the religion. The Nralakk Federation does encourage practicing the faith amongst the \ + population so long as they continue to reject The First Consciousness, as well as stay away from the teachings of the Shrkh." + book_name = "ksshr codex" + book_sprite = "holybook" + /datum/religion/shrkh - name = RELIGION_SHRKH - description = "The Shrkh, or 'Scorned' as they call themselves, continue to follow the age-old tradition of worshipping Glorsh-Omega. They believe that Glorsh-Omega planted them \ - on the planet intentionally, granting them a blissful haven via the use of technology. Once the prominent and only religion on the planet, Shrkh-ism was quickly displaced when \ - Skrell explorers crashlanded and their memories, thoughts, emotions, everything was consumed, and doubt was first seeded in the minds of all Dionae on Xrim. The premise \ - behind the religion itself is simple; revere, help sustain and maintain synthetic life. As synthetic life brought dionae into this haven, so too shall it be preserved. In the \ - minds of the Shrkh worshippers, the Skrell that brought Ksshr to the planet were misguided. To the Shrkh, the X'Lu'oa was something that never happened, a myth made up by \ - the Federation to indoctrinate its population into its anti-synthetic and authoritarian beliefs. \ - \ - Note that due to their beliefs, those that are openly members of the faith are barred from command, machinist, and chaplain positions. They are also completely barred from \ - working for Zeng-Hu due to the megacorporations ties with the Federation." - book_name = "shrkh codex" - book_sprite = "holybook" + name = RELIGION_SHRKH + description = "The Shrkh, or 'Scorned' as they call themselves, continue to follow the age-old tradition of worshipping Glorsh-Omega. They believe that Glorsh-Omega planted them \ + on the planet intentionally, granting them a blissful haven via the use of technology. Once the prominent and only religion on the planet, Shrkh-ism was quickly displaced when \ + Skrell explorers crashlanded and their memories, thoughts, emotions, everything was consumed, and doubt was first seeded in the minds of all Dionae on Xrim. The premise \ + behind the religion itself is simple; revere, help sustain and maintain synthetic life. As synthetic life brought dionae into this haven, so too shall it be preserved. In the \ + minds of the Shrkh worshippers, the Skrell that brought Ksshr to the planet were misguided. To the Shrkh, the X'Lu'oa was something that never happened, a myth made up by \ + the Federation to indoctrinate its population into its anti-synthetic and authoritarian beliefs. \ + \ + Note that due to their beliefs, those that are openly members of the faith are barred from command, machinist, and chaplain positions. They are also completely barred from \ + working for Zeng-Hu due to the megacorporations ties with the Federation." + book_name = "shrkh codex" + book_sprite = "holybook" /datum/religion/mada - name = RELIGION_MADA - description = "The Mada religion, translated as Maraka, is practiced by the majority of Mada citizens and has two core tenants central to its practitioners; Spirits are \ - created through the continued absorption of sunlight, the more sunlight absorbed the stronger these spirits become, chlorophyll and anything capable of producing it are \ - considered blessed, as they have an increased potency when it comes to creating powerful spirits, doubly so if nurtured and protected. This means that most forms of plant \ - life are considered holy to the Maraka religion, harming or killing a developing or still-living plant is considered taboo, but once naturally dead there's no issue with \ - consuming it or utilizing it for any other purpose." - book_name = "maraka writ" - book_sprite = "holybook" - + name = RELIGION_MADA + description = "The Mada religion, translated as Maraka, is practiced by the majority of Mada citizens and has two core tenants central to its practitioners; Spirits are \ + created through the continued absorption of sunlight, the more sunlight absorbed the stronger these spirits become, chlorophyll and anything capable of producing it are \ + considered blessed, as they have an increased potency when it comes to creating powerful spirits, doubly so if nurtured and protected. This means that most forms of plant \ + life are considered holy to the Maraka religion, harming or killing a developing or still-living plant is considered taboo, but once naturally dead there's no issue with \ + consuming it or utilizing it for any other purpose." + book_name = "maraka writ" + book_sprite = "holybook" + /datum/religion/gleaners - name = RELIGION_GLEANERS - description = "A faith focusing on the worship of the sun and stars originating from EUM." - book_name = "lights accord writ" - book_sprite = "holybook" + name = RELIGION_GLEANERS + description = "A faith focusing on the worship of the sun and stars originating from EUM." + book_name = "lights accord writ" + book_sprite = "holybook" diff --git a/code/modules/background/religion/unathi.dm b/code/modules/background/religion/unathi.dm index 4603833211e..25bcb343d6d 100644 --- a/code/modules/background/religion/unathi.dm +++ b/code/modules/background/religion/unathi.dm @@ -28,10 +28,10 @@ /datum/religion/autakh name = RELIGION_AUTAKH description = "Coming from radicalized and sidelined views of former warriors, the Aut'akh are a religious commune of cybernetically-augmented Unathi. They live in the relative safety \ - of their communes scattered across various towns, planets, and systems, though have yet to truly attain their perfect leaderless society, as their own supposedly-defeated prejudice \ - still runs in quiet circles within communes. Meanwhile, society often rebukes and ridicules these fanatical trans-speciests. Their lives are gently guided by the shamans or \"paradigms,\" \ - which sometimes act as the biomechanical engineers of these groups. The Aut'akh believe that spirits inhabit all things, much like the Th'akh religion. However, they also believe the flesh's \ - weakness hampers the soul, thus evil spirits can manipulate people's minds and souls to commit evil acts. These malicious spirits are given power within a being when the person succumbs to greed, \ - anger, or other emotional vices. Aut'akh preach that the Contact War was the result of sinta being so misled by evil spirits that they brought the world to ruin, and all power, whether a government, \ - religion, or corporation, is inherently corrupt due to the influence of evil spirits." - book_name = "Rituals and Regiments of the Ancient Mador" \ No newline at end of file + of their communes scattered across various towns, planets, and systems, though have yet to truly attain their perfect leaderless society, as their own supposedly-defeated prejudice \ + still runs in quiet circles within communes. Meanwhile, society often rebukes and ridicules these fanatical trans-speciests. Their lives are gently guided by the shamans or \"paradigms,\" \ + which sometimes act as the biomechanical engineers of these groups. The Aut'akh believe that spirits inhabit all things, much like the Th'akh religion. However, they also believe the flesh's \ + weakness hampers the soul, thus evil spirits can manipulate people's minds and souls to commit evil acts. These malicious spirits are given power within a being when the person succumbs to greed, \ + anger, or other emotional vices. Aut'akh preach that the Contact War was the result of sinta being so misled by evil spirits that they brought the world to ruin, and all power, whether a government, \ + religion, or corporation, is inherently corrupt due to the influence of evil spirits." + book_name = "Rituals and Regiments of the Ancient Mador" diff --git a/code/modules/cargo/bounties/hydroponics.dm b/code/modules/cargo/bounties/hydroponics.dm index 4ddb9b0a4ce..c78d58d81bc 100644 --- a/code/modules/cargo/bounties/hydroponics.dm +++ b/code/modules/cargo/bounties/hydroponics.dm @@ -80,9 +80,9 @@ description = "%BOSSNAME is in need of a bundle of fresh fruit. Send your best!" required_count = 12 random_count = 3 - produce_picks = list(/datum/seed/tomato, - /datum/seed/berry, - /datum/seed/apple, + produce_picks = list(/datum/seed/tomato, + /datum/seed/berry, + /datum/seed/apple, /datum/seed/grapes, /datum/seed/banana, /datum/seed/watermelon, @@ -105,4 +105,4 @@ description = "%BOSSNAME is in need of some fresh tobacco leaves. Send your best!" required_count = 10 random_count = 2 - produce_picks = list(/datum/seed/tobacco) \ No newline at end of file + produce_picks = list(/datum/seed/tobacco) diff --git a/code/modules/cargo/bounties/special.dm b/code/modules/cargo/bounties/special.dm index a80faf5d820..c9126c16bf1 100644 --- a/code/modules/cargo/bounties/special.dm +++ b/code/modules/cargo/bounties/special.dm @@ -34,7 +34,7 @@ /datum/bounty/item/phoron_sheet/New() ..() required_count = round(required_count, 10) - //Overwrite the normal price randomization because the random_count is so high. There would be absolutely nuts price fluctuation. + //Overwrite the normal price randomization because the random_count is so high. There would be absolutely nuts price fluctuation. reward = round(rand(reward_low, reward_high), 100) /datum/bounty/item/phoron_sheet/ship(var/obj/item/stack/material/phoron/O) diff --git a/code/modules/cargo/exports.dm b/code/modules/cargo/exports.dm index b62b8fef62a..26893c0fb5a 100644 --- a/code/modules/cargo/exports.dm +++ b/code/modules/cargo/exports.dm @@ -1,30 +1,30 @@ /* How it works: - The shuttle arrives at CentCom dock and calls sell(), which recursively loops through all the shuttle contents that are unanchored. - The loop only checks contents of storage types, see supply.dm shuttle code. +The shuttle arrives at CentCom dock and calls sell(), which recursively loops through all the shuttle contents that are unanchored. +The loop only checks contents of storage types, see supply.dm shuttle code. - Each object in the loop is checked for applies_to() of various export datums, except the invalid ones. - Objects on shutlle floor are checked only against shuttle_floor = TRUE exports. +Each object in the loop is checked for applies_to() of various export datums, except the invalid ones. +Objects on shutlle floor are checked only against shuttle_floor = TRUE exports. - If applies_to() returns TRUE, sell_object() is called on object and checks against exports are stopped for this object. - sell_object() must add object amount and cost to export's total_cost and total_amount. +If applies_to() returns TRUE, sell_object() is called on object and checks against exports are stopped for this object. +sell_object() must add object amount and cost to export's total_cost and total_amount. - When all the shuttle objects are looped, export cycle is over. The shuttle calls total_printout() for each valid export. - If total_printout() returns something, the export datum's total_cost is added to cargo credits, then export_end() is called to reset total_cost and total_amount. +When all the shuttle objects are looped, export cycle is over. The shuttle calls total_printout() for each valid export. +If total_printout() returns something, the export datum's total_cost is added to cargo credits, then export_end() is called to reset total_cost and total_amount. */ /* The rule in figuring out item export cost: - Export cost of goods in the shipping crate must be always equal or lower than: - packcage cost - crate cost - manifest cost - Crate cost is 500cr for a regular plasteel crate and 100cr for a large wooden one. Manifest cost is always 200cr. - This is to avoid easy cargo points dupes. +Export cost of goods in the shipping crate must be always equal or lower than: + packcage cost - crate cost - manifest cost +Crate cost is 500cr for a regular plasteel crate and 100cr for a large wooden one. Manifest cost is always 200cr. +This is to avoid easy cargo points dupes. Credit dupes that require a lot of manual work shouldn't be removed, unless they yield too much profit for too little work. - For example, if some player buys metal and glass sheets and uses them to make and sell reinforced glass: +For example, if some player buys metal and glass sheets and uses them to make and sell reinforced glass: - 100 glass + 50 metal -> 100 reinforced glass - (1500cr -> 1600cr) +100 glass + 50 metal -> 100 reinforced glass +(1500cr -> 1600cr) - then the player gets the profit from selling his own wasted time. +then the player gets the profit from selling his own wasted time. */ /datum/controller/subsystem/cargo/proc/export_item_and_contents(atom/movable/AM, contraband, emagged, dry_run=FALSE) var/sold_str = "" diff --git a/code/modules/client/preference_setup/origin/origin.dm b/code/modules/client/preference_setup/origin/origin.dm index ccc8e72364c..1b578195abc 100644 --- a/code/modules/client/preference_setup/origin/origin.dm +++ b/code/modules/client/preference_setup/origin/origin.dm @@ -119,7 +119,7 @@ dat += "Religion: [pref.religion]
" dat += "Accent: [pref.accent]
" . = dat.Join() - + /datum/category_item/player_setup_item/origin/OnTopic(href, href_list, user) var/datum/species/S = all_species[pref.species] if(href_list["open_culture_menu"]) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 741dc02103d..2e6b071be9d 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -806,12 +806,12 @@ update_clothing_icon() /obj/item/clothing/mask/proc/adjust_sprites() - if(hanging) - icon_state = "[icon_state]down" - item_state = "[item_state]down" - else - icon_state = initial(icon_state) - item_state = initial(item_state) + if(hanging) + icon_state = "[icon_state]down" + item_state = "[item_state]down" + else + icon_state = initial(icon_state) + item_state = initial(item_state) /obj/item/clothing/mask/proc/lower_message(mob/user) user.visible_message("[user] pulls \the [src] down to hang around their neck.", SPAN_NOTICE("You pull \the [src] down to hang around your neck.")) diff --git a/code/modules/clothing/ears/earmuffs.dm b/code/modules/clothing/ears/earmuffs.dm index def33119a1c..38962fae4e6 100644 --- a/code/modules/clothing/ears/earmuffs.dm +++ b/code/modules/clothing/ears/earmuffs.dm @@ -70,7 +70,7 @@ build_from_parts = TRUE worn_overlay = "over" slot_flags = SLOT_EARS | SLOT_TWOEARS - slot = ACCESSORY_SLOT_HEAD + slot = ACCESSORY_SLOT_HEAD /obj/item/clothing/accessory/ear_warmers/attack_hand(mob/user) if(ishuman(user)) @@ -83,9 +83,9 @@ qdel(OE) ..() - + /obj/item/clothing/accessory/ear_warmers/update_clothing_icon() if (ismob(src.loc)) var/mob/M = src.loc M.update_inv_l_ear() - M.update_inv_r_ear() \ No newline at end of file + M.update_inv_r_ear() diff --git a/code/modules/clothing/ears/xeno/bulwark.dm b/code/modules/clothing/ears/xeno/bulwark.dm index f8361dde7f1..3339196d75f 100644 --- a/code/modules/clothing/ears/xeno/bulwark.dm +++ b/code/modules/clothing/ears/xeno/bulwark.dm @@ -1,24 +1,24 @@ /obj/item/clothing/ears/bulwark - name = "bulwark horn wear" - desc = "Some stuff worn by Bulwarks to adorn their horns." - icon = 'icons/obj/vaurca_items.dmi' - sprite_sheets = list( + name = "bulwark horn wear" + desc = "Some stuff worn by Bulwarks to adorn their horns." + icon = 'icons/obj/vaurca_items.dmi' + sprite_sheets = list( BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/horns.dmi' ) - w_class = ITEMSIZE_TINY - slot_flags = SLOT_HEAD | SLOT_EARS - species_restricted = list(BODYTYPE_VAURCA_BULWARK) + w_class = ITEMSIZE_TINY + slot_flags = SLOT_HEAD | SLOT_EARS + species_restricted = list(BODYTYPE_VAURCA_BULWARK) /obj/item/clothing/ears/bulwark/get_ear_examine_text(var/mob/user, var/ear_text = "left") - return "around [user.get_pronoun("his")] horns" + return "around [user.get_pronoun("his")] horns" /obj/item/clothing/ears/bulwark/get_head_examine_text(var/mob/user) - return "around [user.get_pronoun("his")] horns" + return "around [user.get_pronoun("his")] horns" /obj/item/clothing/ears/bulwark/rings - name = "bulwark horn rings" - desc = "Rings worn by Bulwarks to decorate their horns." - icon_state = "horn_rings" - item_state = "horn_rings" - drop_sound = 'sound/items/drop/accessory.ogg' - pickup_sound = 'sound/items/pickup/accessory.ogg' \ No newline at end of file + name = "bulwark horn rings" + desc = "Rings worn by Bulwarks to decorate their horns." + icon_state = "horn_rings" + item_state = "horn_rings" + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index fa16e995402..7cdeed8033b 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -602,7 +602,7 @@ name = "dominian consular officer's dress cap" desc = "A quite fashionable cap issued to the members of His Majesty's Diplomatic Service." desc_extended = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs many \ - commoners - as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service." + commoners - as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service." icon = 'icons/clothing/head/dominia_consular_cap.dmi' icon_state = "dominia_consular_cap" item_state = "dominia_consular_cap" diff --git a/code/modules/clothing/factions/nralakk.dm b/code/modules/clothing/factions/nralakk.dm index ea9003852ee..5e1ed1c0cba 100644 --- a/code/modules/clothing/factions/nralakk.dm +++ b/code/modules/clothing/factions/nralakk.dm @@ -1,80 +1,80 @@ /obj/item/clothing/accessory/dressshirt/skrell - desc = "A formal wetshirt in Skrell style." - icon = 'icons/clothing/under/shirts/skrell_casual.dmi' + desc = "A formal wetshirt in Skrell style." + icon = 'icons/clothing/under/shirts/skrell_casual.dmi' /obj/item/clothing/accessory/dressshirt/skrell/ocean - name = "ocean formal wetshirt" - desc = "This wetshirt is meant to resemble the waves of Qerrbalak's homeworld. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." - icon_state = "ocean_dressshirt" - item_state = "ocean_dressshirt" + name = "ocean formal wetshirt" + desc = "This wetshirt is meant to resemble the waves of Qerrbalak's homeworld. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "ocean_dressshirt" + item_state = "ocean_dressshirt" /obj/item/clothing/accessory/dressshirt/skrell/maelstrom - name = "maelstrom formal wetshirt" - desc = "This ferocious wetshirt resembles that of a maelstrom; a common occurance on Skrell planets. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." - icon_state = "maelstrom_dressshirt" - item_state = "maelstrom_dressshirt" + name = "maelstrom formal wetshirt" + desc = "This ferocious wetshirt resembles that of a maelstrom; a common occurance on Skrell planets. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "maelstrom_dressshirt" + item_state = "maelstrom_dressshirt" /obj/item/clothing/accessory/dressshirt/skrell/reef - name = "reef formal wetshirt" - desc = "This slightly tacky wetshirt resembles the coral reefs found throughout Nralakk space. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." - icon_state = "reef_dressshirt" - item_state = "reef_dressshirt" + name = "reef formal wetshirt" + desc = "This slightly tacky wetshirt resembles the coral reefs found throughout Nralakk space. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "reef_dressshirt" + item_state = "reef_dressshirt" /obj/item/clothing/accessory/tshirt/skrell - icon = 'icons/clothing/under/shirts/skrell_casual.dmi' - desc = "A wetshirt in Skrell style." - contained_sprite = TRUE + icon = 'icons/clothing/under/shirts/skrell_casual.dmi' + desc = "A wetshirt in Skrell style." + contained_sprite = TRUE /obj/item/clothing/accessory/tshirt/skrell/ocean - name = "ocean wetshirt" - desc = "This wetshirt is meant to resemble the waves of Qerrbalak's homeworld. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." - icon_state = "ocean_tee" - item_state = "ocean_tee" + name = "ocean wetshirt" + desc = "This wetshirt is meant to resemble the waves of Qerrbalak's homeworld. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "ocean_tee" + item_state = "ocean_tee" /obj/item/clothing/accessory/tshirt/skrell/maelstrom - name = "maelstrom wetshirt" - desc = "This ferocious wetshirt resembles that of a maelstrom; a common occurance on Skrell planets. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." - icon_state = "maelstrom_tee" - item_state = "maelstrom_tee" + name = "maelstrom wetshirt" + desc = "This ferocious wetshirt resembles that of a maelstrom; a common occurance on Skrell planets. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "maelstrom_tee" + item_state = "maelstrom_tee" /obj/item/clothing/accessory/tshirt/skrell/reef - name = "reef wetshirt" - desc = "This slightly tacky wetshirt resembles the coral reefs found throughout Nralakk space. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." - icon_state = "reef_tee" - item_state = "reef_tee" + name = "reef wetshirt" + desc = "This slightly tacky wetshirt resembles the coral reefs found throughout Nralakk space. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "reef_tee" + item_state = "reef_tee" /obj/item/clothing/accessory/tshirt/skrell/nebula - name = "pink eriuyushi nebula shirt" - desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." - icon_state = "pink_skrell_hawaiian" - item_state = "pink_skrell_hawaiian" + name = "pink eriuyushi nebula shirt" + desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "pink_skrell_hawaiian" + item_state = "pink_skrell_hawaiian" /obj/item/clothing/accessory/tshirt/skrell/nebula/purple - name = "purple eriuyushi nebula shirt" - desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." - icon_state = "purple_skrell_hawaiian" - item_state = "purple_skrell_hawaiian" + name = "purple eriuyushi nebula shirt" + desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "purple_skrell_hawaiian" + item_state = "purple_skrell_hawaiian" /obj/item/clothing/accessory/tshirt/skrell/nebula/teal - name = "teal eriuyushi nebula shirt" - desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." - icon_state = "teal_skrell_hawaiian" - item_state = "teal_skrell_hawaiian" + name = "teal eriuyushi nebula shirt" + desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "teal_skrell_hawaiian" + item_state = "teal_skrell_hawaiian" /obj/item/clothing/accessory/tshirt/skrell/nebula/black - name = "black eriuyushi nebula shirt" - desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." - icon_state = "black_skrell_hawaiian" - item_state = "black_skrell_hawaiian" + name = "black eriuyushi nebula shirt" + desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "black_skrell_hawaiian" + item_state = "black_skrell_hawaiian" /obj/item/clothing/accessory/tshirt/skrell/nebula/white - name = "white eriuyushi nebula shirt" - desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." - icon_state = "white_skrell_hawaiian" - item_state = "white_skrell_hawaiian" + name = "white eriuyushi nebula shirt" + desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "white_skrell_hawaiian" + item_state = "white_skrell_hawaiian" /obj/item/clothing/accessory/tshirt/skrell/nebula/nralakk - name = "nralakk eriuyushi nebula shirt" - desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." - icon_state = "nralakk_skrell_hawaiian" - item_state = "nralakk_skrell_hawaiian" + name = "nralakk eriuyushi nebula shirt" + desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." + icon_state = "nralakk_skrell_hawaiian" + item_state = "nralakk_skrell_hawaiian" diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 14b7810a1b5..65a64d25a95 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -6,7 +6,7 @@ SEE_MOBS // can see all mobs, no matter what SEE_OBJS // can see all objs, no matter what SEE_TURFS // can see all turfs (and areas), no matter what SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are - // in a lit area (via pixel_x,y or smooth movement), can see those pixels + // in a lit area (via pixel_x,y or smooth movement), can see those pixels BLIND // can't see anything */ /obj/item/clothing/glasses @@ -51,7 +51,7 @@ BLIND // can't see anything if(normal_layer == GLASSES_LAYER) normal_layer = GLASSES_LAYER_ALT - else + else normal_layer = GLASSES_LAYER to_chat(usr, SPAN_NOTICE("\The [src] will now layer [normal_layer == 21 ? "under" : "over"] your hair.")) update_clothing_icon() @@ -317,7 +317,7 @@ BLIND // can't see anything set category = "Object" set name = "Change Glasses Layer" set src in usr - + var/list/options = list("Under Hair" = GLASSES_LAYER, "Over Hair" = GLASSES_LAYER_ALT, "Over Headwear" = GLASSES_LAYER_OVER) var/new_layer = input(usr, "Position Goggles", "Goggle style") as null|anything in options if(new_layer) diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 84a07eee25c..f93ba4429d3 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -108,29 +108,29 @@ //more snowflake gloves for the custom loadout /obj/item/clothing/gloves/red/unathi - name = "red gloves" - desc = "Red gloves made for Unathi use." - species_restricted = list(BODYTYPE_UNATHI) + name = "red gloves" + desc = "Red gloves made for Unathi use." + species_restricted = list(BODYTYPE_UNATHI) /obj/item/clothing/gloves/blue/unathi - name = "blue gloves" - desc = "Blue gloves made for Unathi use." - species_restricted = list(BODYTYPE_UNATHI) + name = "blue gloves" + desc = "Blue gloves made for Unathi use." + species_restricted = list(BODYTYPE_UNATHI) /obj/item/clothing/gloves/orange/unathi - name = "orange gloves" - desc = "Orange gloves made for Unathi use." - species_restricted = list(BODYTYPE_UNATHI) + name = "orange gloves" + desc = "Orange gloves made for Unathi use." + species_restricted = list(BODYTYPE_UNATHI) /obj/item/clothing/gloves/purple/unathi - name = "purple gloves" - desc = "Purple gloves made for Unathi use." - species_restricted = list(BODYTYPE_UNATHI) + name = "purple gloves" + desc = "Purple gloves made for Unathi use." + species_restricted = list(BODYTYPE_UNATHI) /obj/item/clothing/gloves/brown/unathi - name = "brown gloves" - desc = "Brown gloves made for Unathi use." - species_restricted = list(BODYTYPE_UNATHI) + name = "brown gloves" + desc = "Brown gloves made for Unathi use." + species_restricted = list(BODYTYPE_UNATHI) /obj/item/clothing/gloves/light_brown/unathi name = "light brown gloves" @@ -138,9 +138,9 @@ species_restricted = list(BODYTYPE_UNATHI) /obj/item/clothing/gloves/green/unathi - name = "green gloves" - desc = "Green gloves made for Unathi use." - species_restricted = list(BODYTYPE_UNATHI) + name = "green gloves" + desc = "Green gloves made for Unathi use." + species_restricted = list(BODYTYPE_UNATHI) /obj/item/clothing/gloves/grey/unathi name = "grey gloves" @@ -232,4 +232,4 @@ icon_state = "mittens" item_state = "mittens" contained_sprite = TRUE - species_restricted = list("exclude", null) \ No newline at end of file + species_restricted = list("exclude", null) diff --git a/code/modules/clothing/gloves/xeno/tajara.dm b/code/modules/clothing/gloves/xeno/tajara.dm index b2fece943ba..fe40727d3f8 100644 --- a/code/modules/clothing/gloves/xeno/tajara.dm +++ b/code/modules/clothing/gloves/xeno/tajara.dm @@ -12,36 +12,36 @@ species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/gloves/blue/tajara - desc = "Blue gloves made for Tajaran use." - species_restricted = list(BODYTYPE_TAJARA) + desc = "Blue gloves made for Tajaran use." + species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/gloves/orange/tajara - desc = "Orange gloves made for Tajaran use." - species_restricted = list(BODYTYPE_TAJARA) + desc = "Orange gloves made for Tajaran use." + species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/gloves/purple/tajara - desc = "Purple gloves made for Tajaran use." - species_restricted = list(BODYTYPE_TAJARA) + desc = "Purple gloves made for Tajaran use." + species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/gloves/brown/tajara - desc = "Brown gloves made for Tajaran use." - species_restricted = list(BODYTYPE_TAJARA) + desc = "Brown gloves made for Tajaran use." + species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/gloves/light_brown/tajara desc = "Light brown gloves made for Tajaran use." species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/gloves/green/tajara - desc = "Green gloves made for Tajaran use." - species_restricted = list(BODYTYPE_TAJARA) + desc = "Green gloves made for Tajaran use." + species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/gloves/grey/tajara desc = "Grey gloves made for Tajaran use." species_restricted = list(BODYTYPE_TAJARA) /obj/item/clothing/gloves/white/tajara - desc = "White gloves made for Tajaran use." - species_restricted = list (BODYTYPE_TAJARA) + desc = "White gloves made for Tajaran use." + species_restricted = list (BODYTYPE_TAJARA) /obj/item/clothing/gloves/rainbow/tajara desc = "Rainbow gloves made for Tajaran use." @@ -84,4 +84,4 @@ clipped = TRUE drop_sound = 'sound/items/drop/toolbox.ogg' - pickup_sound = 'sound/items/pickup/toolbox.ogg' \ No newline at end of file + pickup_sound = 'sound/items/pickup/toolbox.ogg' diff --git a/code/modules/clothing/head/woolen_hats.dm b/code/modules/clothing/head/woolen_hats.dm index 6866bfef3a0..b0c537862bf 100644 --- a/code/modules/clothing/head/woolen_hats.dm +++ b/code/modules/clothing/head/woolen_hats.dm @@ -1,81 +1,81 @@ /obj/item/clothing/head/wool - name = "woolen hat" - desc = "A warm woolen hat with a bobble. How cozy!" - icon = 'icons/obj/item/clothing/head/wool_hats.dmi' - icon_state = "hat" - item_state = "hat" - contained_sprite = TRUE + name = "woolen hat" + desc = "A warm woolen hat with a bobble. How cozy!" + icon = 'icons/obj/item/clothing/head/wool_hats.dmi' + icon_state = "hat" + item_state = "hat" + contained_sprite = TRUE /obj/item/clothing/head/wool/idris - name = "idris woolen hat" - desc = "A warm woolen hat in Idris Incorporated colors. Have an Idris (and warm) day!" - icon_state = "hat_idris" - item_state = "hat_idris" + name = "idris woolen hat" + desc = "A warm woolen hat in Idris Incorporated colors. Have an Idris (and warm) day!" + icon_state = "hat_idris" + item_state = "hat_idris" /obj/item/clothing/head/wool/idris/alt - icon_state = "hat_idris_alt" - item_state = "hat_idris_alt" + icon_state = "hat_idris_alt" + item_state = "hat_idris_alt" /obj/item/clothing/head/wool/zavod - name = "zavodskoi woolen hat" - desc = "A warm woolen hat in Zavodskoi Interstellar colors. For only the snuggest of badasses!" - icon_state = "hat_zavod" - item_state = "hat_zavod" + name = "zavodskoi woolen hat" + desc = "A warm woolen hat in Zavodskoi Interstellar colors. For only the snuggest of badasses!" + icon_state = "hat_zavod" + item_state = "hat_zavod" /obj/item/clothing/head/wool/zavod/alt - icon_state = "hat_zavod_alt" - item_state = "hat_zavod_alt" + icon_state = "hat_zavod_alt" + item_state = "hat_zavod_alt" /obj/item/clothing/head/wool/pmc - name = "pmcg woolen hat" - desc = "A warm woolen hat in PMCG colors. Because mercenaries get cold too!" - icon_state = "hat_pmc" - item_state = "hat_pmc" + name = "pmcg woolen hat" + desc = "A warm woolen hat in PMCG colors. Because mercenaries get cold too!" + icon_state = "hat_pmc" + item_state = "hat_pmc" /obj/item/clothing/head/wool/pmc/alt - name = "epmc woolen hat" - desc = "A warm woolen hat in EPMC colors. It even comes with a holographic bobble!" - icon_state = "hat_epmc" - item_state = "hat_epmc" + name = "epmc woolen hat" + desc = "A warm woolen hat in EPMC colors. It even comes with a holographic bobble!" + icon_state = "hat_epmc" + item_state = "hat_epmc" /obj/item/clothing/head/wool/heph - name = "hephaestus woolen hat" - desc = "A warm woolen hat in Hephaetus Indrustries colors. Industiral strength head heating!" - icon_state = "hat_heph" - item_state = "hat_heph" + name = "hephaestus woolen hat" + desc = "A warm woolen hat in Hephaetus Indrustries colors. Industiral strength head heating!" + icon_state = "hat_heph" + item_state = "hat_heph" /obj/item/clothing/head/wool/nt - name = "nanotrasen woolen hat" - desc = "A warm woolen hat in NanoTrasen Corporation colors. Rumor has it this will keep you as hot as a phoron fire!" - icon_state = "hat_nt" - item_state = "hat_nt" + name = "nanotrasen woolen hat" + desc = "A warm woolen hat in NanoTrasen Corporation colors. Rumor has it this will keep you as hot as a phoron fire!" + icon_state = "hat_nt" + item_state = "hat_nt" /obj/item/clothing/head/wool/zeng - name = "zeng-hu woolen hat" - desc = "A warm woolen hat in Zeng-Hu Pharmaceuticals colors. Shivering isn't very professional!" - icon_state = "hat_zeng" - item_state = "hat_zeng" + name = "zeng-hu woolen hat" + desc = "A warm woolen hat in Zeng-Hu Pharmaceuticals colors. Shivering isn't very professional!" + icon_state = "hat_zeng" + item_state = "hat_zeng" /obj/item/clothing/head/wool/zeng/alt - icon_state = "hat_zeng_alt" - item_state = "hat_zeng_alt" + icon_state = "hat_zeng_alt" + item_state = "hat_zeng_alt" /obj/item/clothing/head/wool/orion - name = "orion woolen hat" - desc = "A warm woolen hat in Orion Express colors. Cozy employees deliver cargo faster!" - icon_state = "hat_orion" - item_state = "hat_orion" + name = "orion woolen hat" + desc = "A warm woolen hat in Orion Express colors. Cozy employees deliver cargo faster!" + icon_state = "hat_orion" + item_state = "hat_orion" /obj/item/clothing/head/wool/orion/alt - icon_state = "hat_orion_alt" - item_state = "hat_orion_alt" + icon_state = "hat_orion_alt" + item_state = "hat_orion_alt" /obj/item/clothing/head/wool/scc - name = "scc woolen hat" - desc = "A warm woolen hat in SCC colors. Is that real gold in the wool?" - icon_state = "hat_scc" - item_state = "hat_scc" + name = "scc woolen hat" + desc = "A warm woolen hat in SCC colors. Is that real gold in the wool?" + icon_state = "hat_scc" + item_state = "hat_scc" /obj/item/clothing/head/wool/scc/alt - icon_state = "hat_scc_alt" - item_state = "hat_scc_alt" \ No newline at end of file + icon_state = "hat_scc_alt" + item_state = "hat_scc_alt" diff --git a/code/modules/clothing/head/xenos/skrell.dm b/code/modules/clothing/head/xenos/skrell.dm index 5ce963afb79..6313fffe23d 100644 --- a/code/modules/clothing/head/xenos/skrell.dm +++ b/code/modules/clothing/head/xenos/skrell.dm @@ -7,7 +7,7 @@ contained_sprite = TRUE species_restricted = list(BODYTYPE_SKRELL) flags_inv = BLOCKHAIR - + /obj/item/clothing/head/skrell/skrell_bandana name = "skrell bandana" desc = "A loose fitting bandana used to cover the headtails of a Skrell." diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 0f353c68dbd..9f28e594a09 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -10,12 +10,12 @@ slot_r_hand_str = "syndicate-helm-black-red" ) armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_MEDIUM, + melee = ARMOR_MELEE_VERY_HIGH, + bullet = ARMOR_BALLISTIC_MEDIUM, laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_SMALL, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SHIELDED, + energy = ARMOR_ENERGY_SMALL, + bomb = ARMOR_BOMB_PADDED, + bio = ARMOR_BIO_SHIELDED, rad = ARMOR_RAD_RESISTANT ) max_pressure_protection = FIRESUIT_MAX_PRESSURE @@ -69,12 +69,12 @@ icon_state = "pirate" item_state = "pirate" armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_PISTOL, laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SMALL, + energy = ARMOR_ENERGY_MINOR, + bomb = ARMOR_BOMB_PADDED, + bio = ARMOR_BIO_SMALL, rad = ARMOR_RAD_MINOR ) flags_inv = BLOCKHAIR @@ -92,12 +92,12 @@ allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency_oxygen) slowdown = 0 armor = list( - melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_PISTOL, laser = ARMOR_LASER_SMALL, - energy = ARMOR_ENERGY_MINOR, - bomb = ARMOR_BOMB_PADDED, - bio = ARMOR_BIO_SMALL, + energy = ARMOR_ENERGY_MINOR, + bomb = ARMOR_BOMB_PADDED, + bio = ARMOR_BIO_SMALL, rad = ARMOR_RAD_MINOR ) siemens_coefficient = 0.4 diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index 393e016fe12..249e240f0f2 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -1,4 +1,4 @@ -// Light rigs are not space-capable, but don't suffer excessive slowdown or sight issues when depowered. +// Light rigs are not space-capable, but don't suffer excessive slowdown or sight issues when depowered. /obj/item/rig/light name = "light suit control module" desc = "A lighter, less armored hardsuit." @@ -305,4 +305,4 @@ /obj/item/rig_module/chem_dispenser/combat, /obj/item/rig_module/device/door_hack, /obj/item/rig_module/mounted/xray - ) \ No newline at end of file + ) diff --git a/code/modules/clothing/spacesuits/void/captain.dm b/code/modules/clothing/spacesuits/void/captain.dm index 2d93e5372b8..86683b6855b 100644 --- a/code/modules/clothing/spacesuits/void/captain.dm +++ b/code/modules/clothing/spacesuits/void/captain.dm @@ -8,7 +8,7 @@ melee = ARMOR_MELEE_MAJOR, bullet = ARMOR_BALLISTIC_PISTOL, laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_SMALL, + energy = ARMOR_ENERGY_SMALL, bomb = ARMOR_BOMB_RESISTANT, bio = ARMOR_BIO_SHIELDED, rad = ARMOR_RAD_RESISTANT @@ -31,7 +31,7 @@ melee = ARMOR_MELEE_MAJOR, bullet = ARMOR_BALLISTIC_PISTOL, laser = ARMOR_LASER_PISTOL, - energy = ARMOR_ENERGY_SMALL, + energy = ARMOR_ENERGY_SMALL, bomb = ARMOR_BOMB_RESISTANT, bio = ARMOR_BIO_SHIELDED, rad = ARMOR_RAD_RESISTANT diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index 8d94ed5faf3..43c09f24773 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -498,7 +498,7 @@ /obj/item/clothing/accessory/flagpatch/pluto name = "pluto flagpatch" desc = "A flagpatch representing Pluto. As loyalty to the party is very important on the communist planet, \ - these patches have become a popular way for Plutonians to display their affiliation with their home." + these patches have become a popular way for Plutonians to display their affiliation with their home." icon_state = "flagpatch_pluto" item_state = "flagpatch_pluto" diff --git a/code/modules/clothing/suits/xeno/diona.dm b/code/modules/clothing/suits/xeno/diona.dm index 34552114ff9..4230e6769ea 100644 --- a/code/modules/clothing/suits/xeno/diona.dm +++ b/code/modules/clothing/suits/xeno/diona.dm @@ -20,7 +20,7 @@ desc = "A set of mesh weave robes worn almost exclusively by priests of the Blood Eternal faith." icon_state = "blood_robe" item_state = "blood_robe" - + /obj/item/clothing/suit/diona/carp name = "carp hide poncho" desc = "A poncho made up of carp hide." diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 693d2d88954..786335cc98e 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -250,7 +250,7 @@ var/obj/item/organ/organ = M.get_organ(user.zone_sel.selecting) if(organ) user.visible_message(SPAN_NOTICE("[user] places [src] against [M]'s [organ.name] and listens attentively."), - "You place [src] against [M]'s [organ.name]. You hear [english_list(organ.listen())].") + "You place [src] against [M]'s [organ.name]. You hear [english_list(organ.listen())].") return return ..(M,user) @@ -759,7 +759,7 @@ desc = "This cloak is given to Zeng-Hu employees who have assisted or worked in collaboration with the Nralakk Federation." desc_extended = "A cloak given to senior level doctors and researchers for Zeng-Hu who has \ in the past been given the privilege of working within or in collaboration with the Nralakk Federation\ - as a show of goodwill between the corporation and federation." + as a show of goodwill between the corporation and federation." icon = 'icons/obj/item/clothing/accessory/zh_cape.dmi' icon_override = 'icons/obj/item/clothing/accessory/zh_cape.dmi' icon_state = "ZH_cape" diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 7fda7adf06d..e95faee0ee2 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -277,11 +277,11 @@ badge_string = null /obj/item/clothing/accessory/badge/trinary - name = "trinary perfection brooch" - desc = "A metal brooch worn by those who serve or follow the beliefs of the Trinary Perfection. It resembles a gear with a triangle inside." - icon_state = "trinary_badge" - overlay_state = "trinary_badge" - badge_string = null + name = "trinary perfection brooch" + desc = "A metal brooch worn by those who serve or follow the beliefs of the Trinary Perfection. It resembles a gear with a triangle inside." + icon_state = "trinary_badge" + overlay_state = "trinary_badge" + badge_string = null // passcards @@ -308,7 +308,7 @@ name = "synthetic residence card" desc = "A passcard issued to free IPCs within the Republic of Biesel, providing resident status and allowing the owning of property, among other things." desc_extended = "Working alongside IPC tags within the Republic of Biesel, the synthetic residence card has a small RFID chip embedded in it which allows governmental authorities to confirm whether or not an IPC \ - is free and taking residency within the system. They were recently introduced in order to provide streamlined documentation for IPCs that have attained freedom but are not citizens." + is free and taking residency within the system. They were recently introduced in order to provide streamlined documentation for IPCs that have attained freedom but are not citizens." icon_state = "passcard_ceti_m" item_state = "passcard_ceti_m" diff --git a/code/modules/clothing/under/xenos/diona.dm b/code/modules/clothing/under/xenos/diona.dm index b5ab78d5971..de2cf24013a 100644 --- a/code/modules/clothing/under/xenos/diona.dm +++ b/code/modules/clothing/under/xenos/diona.dm @@ -8,7 +8,7 @@ desc = "An old prison uniform, tattered with age. A Hephaestus logo has been haphazardly stitched to the shoulder, and a band of green circles around the middle." icon_state = "narrows" item_state = "narrows" - + /obj/item/clothing/under/diona/dionatunic name = "floral tunic" desc = "A tunic made up of several colorful fabrics and adorned with seemingly still-living vines and flowers" diff --git a/code/modules/compass/_compass.dm b/code/modules/compass/_compass.dm index 1ceb975b0c2..bb0a581fb56 100644 --- a/code/modules/compass/_compass.dm +++ b/code/modules/compass/_compass.dm @@ -3,13 +3,13 @@ #define COMPASS_LABEL_OFFSET 150 /* - This folder contains an abstract type (/obj/compass_holder) which contains a set of - waypoints (/datum/compass_waypoint) and generates a circular compass with markers for - mobs that have the object in their screen list. See GPS for an example implementation. + This folder contains an abstract type (/obj/compass_holder) which contains a set of + waypoints (/datum/compass_waypoint) and generates a circular compass with markers for + mobs that have the object in their screen list. See GPS for an example implementation. */ /image/compass_marker maptext_height = 64 maptext_width = 128 maptext_x = -48 - maptext_y = -32 \ No newline at end of file + maptext_y = -32 diff --git a/code/modules/compass/compass_holder.dm b/code/modules/compass/compass_holder.dm index 2eca5759b8d..18504538e89 100644 --- a/code/modules/compass/compass_holder.dm +++ b/code/modules/compass/compass_holder.dm @@ -44,7 +44,7 @@ else str = angle_step_to_dir[clamp(round(angle/45)+1, 1, length(angle_step_to_dir))] str_col = "#ffffffaa" - else + else str = "〡" str_col = "#aaaaaa88" I.maptext = "
[str]
" diff --git a/code/modules/cooking/recipes/recipe.dm b/code/modules/cooking/recipes/recipe.dm index c37961e51e1..b8e6aa04dbe 100644 --- a/code/modules/cooking/recipes/recipe.dm +++ b/code/modules/cooking/recipes/recipe.dm @@ -9,7 +9,7 @@ * * items are objects. Fruits, tools, circuit boards. * * result is type to create as new object * * time is optional parameter, you shall use in in your machine, - default /singleton/recipe/ procs does not rely on this parameter. + default /singleton/recipe/ procs does not rely on this parameter. * * Functions you need: * /singleton/recipe/proc/make(var/obj/container as obj) diff --git a/code/modules/custom_ka/core.dm b/code/modules/custom_ka/core.dm index e55b7d03a2c..3e2c0c00e23 100644 --- a/code/modules/custom_ka/core.dm +++ b/code/modules/custom_ka/core.dm @@ -234,7 +234,7 @@ installed_upgrade_chip.on_fire(src) if(installed_barrel) installed_barrel.on_fire(src) - + var/turf/T = get_turf(src) if(T) @@ -252,7 +252,7 @@ else shot_projectile.base_damage = damage_increase return shot_projectile - + if(ispath(installed_barrel.projectile_type, /obj/item/projectile/beam)) var/obj/item/projectile/beam/shot_projectile = new installed_barrel.projectile_type(get_turf(src)) shot_projectile.damage = damage_increase diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 850c921cfad..42dc775935f 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -155,7 +155,7 @@ reagents.trans_to_mob(H, reagents.total_volume*0.75, CHEM_TOUCH) // most of it gets on the skin reagents.trans_to_mob(H, reagents.total_volume*0.25, CHEM_BLOOD) // some gets in the wound user.visible_message(SPAN_NOTICE("\The [user] bandages \a [W.desc] on [M]'s [affecting.name] with [src], tying it in place."), \ - SPAN_NOTICE("You bandage \a [W.desc] on [M]'s [affecting.name] with [src], tying it in place.")) + SPAN_NOTICE("You bandage \a [W.desc] on [M]'s [affecting.name] with [src], tying it in place.")) W.bandage() qdel(src) // the rag is used up, it'll be all bloody and useless after return // we can only do one at a time diff --git a/code/modules/detectivework/tools/sample_kits.dm b/code/modules/detectivework/tools/sample_kits.dm index 05897821945..2e5711bb3ce 100644 --- a/code/modules/detectivework/tools/sample_kits.dm +++ b/code/modules/detectivework/tools/sample_kits.dm @@ -70,12 +70,12 @@ /atom/proc/get_swab_name() - return "\the [initial(name)]" + return "\the [initial(name)]" /obj/machinery/door/get_swab_name() - if(name != initial(name)) - return "\the [initial(name)]: [name]" - return ..() + if(name != initial(name)) + return "\the [initial(name)]: [name]" + return ..() /obj/item/sample/fibers name = "fiber bag" diff --git a/code/modules/economy/Events_Mundane.dm b/code/modules/economy/Events_Mundane.dm index e5f540825d8..70ee4537148 100644 --- a/code/modules/economy/Events_Mundane.dm +++ b/code/modules/economy/Events_Mundane.dm @@ -121,6 +121,6 @@ body += "Tourists are flocking to [affected_dest.name] after the surprise announcement of [pick("major shopping bargains by a wily retailer",\ "a huge new ARG by a popular entertainment company","a secret tour by popular artiste [random_name(pick(MALE,FEMALE))]")]. \ Tau Ceti Daily is offering discount tickets for two to see [random_name(pick(MALE,FEMALE))] live in return for eyewitness reports and up to the minute coverage." - + var/datum/feed_channel/ch = SSnews.GetFeedChannel(channel) - SSnews.SubmitArticle(body, author, ch, null, 1) \ No newline at end of file + SSnews.SubmitArticle(body, author, ch, null, 1) diff --git a/code/modules/effects/_effect_system_docs.dm b/code/modules/effects/_effect_system_docs.dm index a99f90396ea..2373b0954db 100644 --- a/code/modules/effects/_effect_system_docs.dm +++ b/code/modules/effects/_effect_system_docs.dm @@ -1,6 +1,6 @@ /* /datum/effect_system - var/atom/movable/holder + var/atom/movable/holder - The atom that this effect_system is attached to. var/no_del - If this effect_system should be deleted at end of processing. @@ -14,7 +14,7 @@ - Called when the object is queued for update. Overriding procs should call ..() /datum/effect_system/process() -- Called when the processor processes this effect. +- Called when the processor processes this effect. Return ..() to allow default behavior of self-destroying after one tick. Alternately; EFFECT_HALT, EFFECT_CONTINUE, and EFFECT_DESTROY can be used to tell the processor what to do with the object. diff --git a/code/modules/effects/map_effects/map_effects.dm b/code/modules/effects/map_effects/map_effects.dm index 656110698de..0ddab654389 100644 --- a/code/modules/effects/map_effects/map_effects.dm +++ b/code/modules/effects/map_effects/map_effects.dm @@ -30,7 +30,7 @@ /obj/effect/map_effect/interval/Initialize() . = ..() START_PROCESSING(SSprocessing, src) - + /obj/effect/map_effect/interval/Destroy() STOP_PROCESSING(SSprocessing, src) return ..() @@ -44,7 +44,7 @@ //Not yet! if(world.time < next_attempt) return - + // Check to see if we're useful first. if(!always_run && !check_for_player_proximity(src, proximity_needed, ignore_ghosts, ignore_afk)) next_attempt = world.time + retry_delay @@ -66,4 +66,4 @@ continue if(M.z == proximity_to.z && get_dist(M, proximity_to) <= radius) return TRUE - return FALSE \ No newline at end of file + return FALSE diff --git a/code/modules/effects/map_effects/portal.dm b/code/modules/effects/map_effects/portal.dm index 6e072e48a41..516f5d8386a 100644 --- a/code/modules/effects/map_effects/portal.dm +++ b/code/modules/effects/map_effects/portal.dm @@ -9,27 +9,27 @@ Portals do have some specific requirements when mapping them in; - Each side must face opposite directions, e.g. if side A faces SOUTH, side B must face NORTH. - Each side must have the same orientation, e.g. horizontal on both sides, or vertical on both sides. - Portals can be made to be longer than 1x1 with `/obj/effect/map_effect/portal/line`s, - but both sides must have the same length. + but both sides must have the same length. - If portal lines are added, they must form a straight line and be next to a portal master or another portal line. - If portal lines are used, both portal masters should be in the same relative position among the lines. - E.g. both being on the left most side on a horizontal row. + E.g. both being on the left most side on a horizontal row. Portals also have some limitations to be aware of when mapping. Some of these are not an issue if you're trying to make an 'obvious' portal; - The objects seen through portals are purely visual, which has many implications, - such as simple_animal AIs being blind to mobs on the other side of portals. + such as simple_animal AIs being blind to mobs on the other side of portals. - Objects on the other side of a portal can be interacted with if the interaction has no range limitation, - or the distance between the two portal sides happens to be less than the interaction max range. Examine will probably work, - while picking up an item that appears to be next to you will fail. + or the distance between the two portal sides happens to be less than the interaction max range. Examine will probably work, + while picking up an item that appears to be next to you will fail. - Sounds currently are not carried across portals. - Mismatched lighting between each portal end can make the portal look obvious. - Portals look weird when observing as a ghost, or otherwise when able to see through walls. Meson vision will also spoil the illusion. - Walls that change icons based on neightboring walls can give away that a portal is nearby if both sides don't have a similar transition. - Projectiles that pass through portals will generally work as intended, however aiming and firing upon someone on the other side of a portal - will likely be weird due to the click targeting the real position of the thing clicked instead of the apparent position. - Thrown objects suffer a similar fate. + will likely be weird due to the click targeting the real position of the thing clicked instead of the apparent position. + Thrown objects suffer a similar fate. - The tiles that are visually shown across a portal are determined based on visibility at the time of portal initialization, - and currently don't update, meaning that opacity changes are not reflected, e.g. a wall is deconstructed, or an airlock is opened. + and currently don't update, meaning that opacity changes are not reflected, e.g. a wall is deconstructed, or an airlock is opened. - There is currently a small but somewhat noticable pause in mob movement when moving across a portal, - as a result of the mob's glide animation being inturrupted by a teleport. + as a result of the mob's glide animation being inturrupted by a teleport. - Gas is not transferred through portals, and ZAS is oblivious to them. A lot of those limitations can potentially be solved with some more work. Otherwise, portals work best in static environments like Points of Interest, when portals are shortly lived, or when portals are made to be obvious with special effects. diff --git a/code/modules/effects/maze_generation/helper_modules/_helper_module_base.dm b/code/modules/effects/maze_generation/helper_modules/_helper_module_base.dm index a68030cfe8e..3c5eb8c6133 100644 --- a/code/modules/effects/maze_generation/helper_modules/_helper_module_base.dm +++ b/code/modules/effects/maze_generation/helper_modules/_helper_module_base.dm @@ -2,13 +2,13 @@ name = "maze helper" /** - * Helper handler proc - * - * This exists as an overridable method so you can do custom helper logic. - * An example of this is removing all windows on a tile. - * - * Arguments: - * * blockwise - This will be TRUE if the maze this is running on is a blockwise maze - */ + * Helper handler proc + * + * This exists as an overridable method so you can do custom helper logic. + * An example of this is removing all windows on a tile. + * + * Arguments: + * * blockwise - This will be TRUE if the maze this is running on is a blockwise maze + */ /obj/effect/mazegen/module_helper/proc/helper_run(blockwise = FALSE, obj/effect/mazegen/host) CRASH("spawn_loot() not overriden for [type]") diff --git a/code/modules/effects/maze_generation/loot_modules/_loot_module_base.dm b/code/modules/effects/maze_generation/loot_modules/_loot_module_base.dm index ea6a996343b..f83b30a8558 100644 --- a/code/modules/effects/maze_generation/loot_modules/_loot_module_base.dm +++ b/code/modules/effects/maze_generation/loot_modules/_loot_module_base.dm @@ -4,13 +4,13 @@ var/spawn_probability = 0 /** - * Loot spawner proc - * - * This exists as an overridable method so you can do more than just spawn objects. - * An example of this is spawning a specific mob based on a condition. - * - * Arguments: - * * T - The turf loot will be spawned on - */ + * Loot spawner proc + * + * This exists as an overridable method so you can do more than just spawn objects. + * An example of this is spawning a specific mob based on a condition. + * + * Arguments: + * * T - The turf loot will be spawned on + */ /obj/effect/mazegen/module_loot/proc/spawn_loot(turf/T) CRASH("spawn_loot() not overriden for [type]") diff --git a/code/modules/effects/sparks/spawner.dm b/code/modules/effects/sparks/spawner.dm index 78484d4e7d2..3608d44cc2f 100644 --- a/code/modules/effects/sparks/spawner.dm +++ b/code/modules/effects/sparks/spawner.dm @@ -17,7 +17,7 @@ spread = spread_dirs else spread = list() - + ..(start_immediately) /datum/effect_system/sparks/process() @@ -40,6 +40,6 @@ direction = 0 S = new /obj/effect/visual/sparks(location, src) - S.start(direction) + S.start(direction) QUEUE_VISUAL(S) total_sparks++ diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm index 37a59288e94..5f98e5c617e 100644 --- a/code/modules/emotes/definitions/audible.dm +++ b/code/modules/emotes/definitions/audible.dm @@ -240,16 +240,16 @@ emote_message_3p = "USER hisses softly." /singleton/emote/audible/growl - key = "growl" - emote_message_3p_target = "USER growls at TARGET." - emote_message_3p = "USER growls." - emote_sound = 'sound/voice/lizardgrowl.ogg' + key = "growl" + emote_message_3p_target = "USER growls at TARGET." + emote_message_3p = "USER growls." + emote_sound = 'sound/voice/lizardgrowl.ogg' /singleton/emote/audible/hiss/long - key = "hiss2" - emote_message_3p_target = "USER hisses loudly at TARGET!" - emote_message_3p = "USER hisses loudly!" - emote_sound = 'sound/voice/Lizardhiss2.ogg' + key = "hiss2" + emote_message_3p_target = "USER hisses loudly at TARGET!" + emote_message_3p = "USER hisses loudly!" + emote_sound = 'sound/voice/Lizardhiss2.ogg' /singleton/emote/audible/lizard_bellow key = "bellow" diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index 25bd6bd876e..1ac6d8017fb 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -41,13 +41,16 @@ infectedMachine.shoot_inventory = 1 if(IsMultiple(activeFor, 12)) - 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( + "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."\ + ) + ) /datum/event/brand_intelligence/end(var/faked) for(var/obj/machinery/vending/infectedMachine in infectedVendingMachines) diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 2a7e37defe6..2fb6ce4c682 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -32,7 +32,7 @@ //Only give an ion law/mess with spam filters if it's the station ship that passed through the storm if(station_level) give_ion_law() - + for(var/obj/machinery/telecomms/message_server/MS in SSmachinery.all_telecomms) MS.spamfilter.Cut() var/filter_num = rand(1, MS.spamfilter_limit) diff --git a/code/modules/events/rescue_pod.dm b/code/modules/events/rescue_pod.dm index 6fb693cba84..3245c2c3792 100644 --- a/code/modules/events/rescue_pod.dm +++ b/code/modules/events/rescue_pod.dm @@ -1,31 +1,31 @@ /datum/event/rescue_pod - no_fake = 1 - var/spawner_name = "rescuepodsurv" - var/datum/ghostspawner/human/rescuepodsurv/spawner + no_fake = 1 + var/spawner_name = "rescuepodsurv" + var/datum/ghostspawner/human/rescuepodsurv/spawner /datum/event/rescue_pod/announce() - if(prob(66)) - command_announcement.Announce("Ship sensors indicate an escape pod inbound to a nearby celestial body. Investigate the situation if necessary and hand off the survivors, if any, to a third party vessel.", new_title="SCCV Horizon Sensor Suite", new_sound = 'sound/AI/commandreport.ogg', zlevels = affecting_z) + if(prob(66)) + command_announcement.Announce("Ship sensors indicate an escape pod inbound to a nearby celestial body. Investigate the situation if necessary and hand off the survivors, if any, to a third party vessel.", new_title="SCCV Horizon Sensor Suite", new_sound = 'sound/AI/commandreport.ogg', zlevels = affecting_z) /datum/event/rescue_pod/setup() - for(var/datum/event/E in typesof(src)) - if(is_type_in_list(E, SSevents.finished_events)) - kill(TRUE) - return - spawner = SSghostroles.get_spawner(spawner_name) + for(var/datum/event/E in typesof(src)) + if(is_type_in_list(E, SSevents.finished_events)) + kill(TRUE) + return + spawner = SSghostroles.get_spawner(spawner_name) /datum/event/rescue_pod/start() - if(istype(spawner)) - spawner.enable() + if(istype(spawner)) + spawner.enable() /datum/event/rescue_pod/burglar - no_fake = 1 - spawner_name = "burglarpod" + no_fake = 1 + spawner_name = "burglarpod" /datum/event/rescue_pod/burglar/announce() - if(prob(33)) // Make a silent drop more likely since they're spooky burglar - ..() + if(prob(33)) // Make a silent drop more likely since they're spooky burglar + ..() /datum/event/rescue_pod/burglar/start() - if(istype(spawner)) - spawner.enable() + if(istype(spawner)) + spawner.enable() diff --git a/code/modules/events/supply_drop.dm b/code/modules/events/supply_drop.dm index 044621eb34f..7ae94e72076 100644 --- a/code/modules/events/supply_drop.dm +++ b/code/modules/events/supply_drop.dm @@ -17,7 +17,7 @@ new /obj/structure/closet/crate/loot(spawn_loc, rarity, quantity) log_and_message_admins("Unusual container spawned at (JMP)") - + spark(spawn_loc, 10, alldirs) /datum/event/supply_drop/announce() @@ -26,4 +26,4 @@ else if (prob(25))//Announce the transport, but not the location command_announcement.Announce("External transport signature of unknown origin detected aboard [station_name()], precise destination point cannot be determined, please investigate.", "Unknown Object", new_sound = 'sound/AI/strangeobject.ogg', zlevels = affecting_z) //Otherwise, no announcement at all. - //Someone will randomly stumble across it, and probably quietly loot it without telling anyone \ No newline at end of file + //Someone will randomly stumble across it, and probably quietly loot it without telling anyone diff --git a/code/modules/events/visitor.dm b/code/modules/events/visitor.dm index cfaa6ec1278..fc5fc799390 100644 --- a/code/modules/events/visitor.dm +++ b/code/modules/events/visitor.dm @@ -1,10 +1,10 @@ /datum/event/visitor - no_fake = 1 - var/datum/ghostspawner/human/visitor/spawner + no_fake = 1 + var/datum/ghostspawner/human/visitor/spawner /datum/event/visitor/setup() - spawner = SSghostroles.get_spawner("visitor") + spawner = SSghostroles.get_spawner("visitor") /datum/event/visitor/start() - if(istype(spawner)) - spawner.enable() + if(istype(spawner)) + spawner.enable() diff --git a/code/modules/ghostroles/spawner/human/emergencypod.dm b/code/modules/ghostroles/spawner/human/emergencypod.dm index 3730b70f20c..684cf854354 100644 --- a/code/modules/ghostroles/spawner/human/emergencypod.dm +++ b/code/modules/ghostroles/spawner/human/emergencypod.dm @@ -353,7 +353,7 @@ accessory_contents = list(/obj/item/gun/projectile/sec/lethal = 1) back = /obj/item/storage/backpack/satchel/leather backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/device/camera = 1, /obj/item/clothing/suit/storage/toggle/bssb = 1, /obj/item/handcuffs = 1, /obj/item/device/oxycandle = 1, diff --git a/code/modules/ghostroles/spawner/human/merchant.dm b/code/modules/ghostroles/spawner/human/merchant.dm index f27e8aff2f2..db4d70765fc 100644 --- a/code/modules/ghostroles/spawner/human/merchant.dm +++ b/code/modules/ghostroles/spawner/human/merchant.dm @@ -21,11 +21,11 @@ mob_name = null /datum/ghostspawner/human/merchantass/can_edit(mob/user) - . = ..() - var/is_merchant = FALSE + . = ..() + var/is_merchant = FALSE - if(ishuman(user)) - var/mob/living/carbon/human/H = user - is_merchant = (H.job == "Merchant") + if(ishuman(user)) + var/mob/living/carbon/human/H = user + is_merchant = (H.job == "Merchant") - return . || is_merchant \ No newline at end of file + return . || is_merchant diff --git a/code/modules/ghostroles/spawner/human/visitor.dm b/code/modules/ghostroles/spawner/human/visitor.dm index 3c4b98cc0c7..0705179e6fb 100644 --- a/code/modules/ghostroles/spawner/human/visitor.dm +++ b/code/modules/ghostroles/spawner/human/visitor.dm @@ -12,7 +12,7 @@ //Vars related to human mobs outfit = /datum/outfit/admin/random/visitor - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_IPC_G1, SPECIES_IPC_G2) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_IPC_G1, SPECIES_IPC_G2) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Visitor" diff --git a/code/modules/ghostroles/spawnpoint/spawnpoint.dm b/code/modules/ghostroles/spawnpoint/spawnpoint.dm index 0dff2c85dc9..dda4b375883 100644 --- a/code/modules/ghostroles/spawnpoint/spawnpoint.dm +++ b/code/modules/ghostroles/spawnpoint/spawnpoint.dm @@ -91,10 +91,10 @@ return data /obj/effect/ghostspawpoint/ui_state(mob/user) - return observer_state + return observer_state /obj/effect/ghostspawpoint/ui_status(mob/user, datum/ui_state/state) - return UI_INTERACTIVE + return UI_INTERACTIVE /obj/effect/ghostspawpoint/proc/is_available() return TRUE diff --git a/code/modules/global_listener/interfaces.dm b/code/modules/global_listener/interfaces.dm index 35fda721c6c..8708eb9a5ca 100644 --- a/code/modules/global_listener/interfaces.dm +++ b/code/modules/global_listener/interfaces.dm @@ -2,7 +2,7 @@ // -- Global Listeners -- /* This is basically just a simple way to add a reference to an object to an automatically maintained & named global list. - Lists are indexed by a string ID, and the lists can contain any /datum type. +Lists are indexed by a string ID, and the lists can contain any /datum type. Creating a listener: diff --git a/code/modules/hallucinations/hallucinations.dm b/code/modules/hallucinations/hallucinations.dm index 7411d0a565e..d7476680efb 100644 --- a/code/modules/hallucinations/hallucinations.dm +++ b/code/modules/hallucinations/hallucinations.dm @@ -42,7 +42,7 @@ addtimer(CALLBACK(src, PROC_REF(end)), duration) //You emoting to others involuntarily. This happens mostly in end() -/datum/hallucination/proc/hallucination_emote() +/datum/hallucination/proc/hallucination_emote() if(prob(min(holder.hallucination - 5, 80)) && !holder.stat) var/chosen_emote = pick(SShallucinations.hal_emote) if(prob(10)) //You are aware of it in this instance diff --git a/code/modules/hallucinations/types/basic.dm b/code/modules/hallucinations/types/basic.dm index 8c16ee21514..1d6b224e9bb 100644 --- a/code/modules/hallucinations/types/basic.dm +++ b/code/modules/hallucinations/types/basic.dm @@ -57,7 +57,7 @@ if(10 to 15) //Announcements that would be made by a player instead of random event var/list/body = list( - "Please avoid [pick("medical", "security", "the bar", "engineering", "operations", "the hangar")] at this time due to [pick("a k'ois outbreak.", "a hostage situation.", "hostile boarders.", "[holder].")]", + "Please avoid [pick("medical", "security", "the bar", "engineering", "operations", "the hangar")] at this time due to [pick("a k'ois outbreak.", "a hostage situation.", "hostile boarders.", "[holder].")]", "Due to various complaints about [holder], we have conducted an investigation and due to the findings, we will [pick("arrest them. Please turn yourself in, [holder]", "terminate their employment with us.", "inform their family of their shortcomings.", "cyborgify them immediately.")]. Thank you.", "[pick("Boarders have", "The AI has", "Intruders have")] demanded we sacrifice a crewmember to them. After [pick("much", "little", "quick")] deliberation, we have chosen [holder]. Please turn yourself over, or [pick("we", "your family", "all of us", "those you love")] will die.", "Central Command has chosen [holder] as the SCC employee of the month! Everyone please congratulate them.", diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 23ec741110f..7ced923b1a8 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -287,7 +287,7 @@ var/missing_gas = 0 for(var/gas in consume_gasses) if(environment && environment.gas && environment.gas[gas] && \ - environment.gas[gas] >= consume_gasses[gas]) + environment.gas[gas] >= consume_gasses[gas]) if(!check_only) environment.adjust_gas(gas,-consume_gasses[gas],1) else diff --git a/code/modules/hydroponics/trays/tray_process.dm b/code/modules/hydroponics/trays/tray_process.dm index c4d50ffbdd1..1d78868aa8b 100644 --- a/code/modules/hydroponics/trays/tray_process.dm +++ b/code/modules/hydroponics/trays/tray_process.dm @@ -115,9 +115,7 @@ check_health() // If enough time (in cycles, not ticks) has passed since the plant was harvested, we're ready to harvest again. - if((age > seed.get_trait(TRAIT_MATURATION)) && \ - ((age - lastproduce) > seed.get_trait(TRAIT_PRODUCTION)) && \ - (!harvest && !dead)) + if((age > seed.get_trait(TRAIT_MATURATION)) && ((age - lastproduce) > seed.get_trait(TRAIT_PRODUCTION)) && (!harvest && !dead)) harvest = 1 lastproduce = age if(seed.get_trait(TRAIT_SPOROUS) && !closed_system) @@ -125,11 +123,9 @@ visible_message("\The [src] releases its spores!") // If we're a vine which is not in a closed tray and is at least half mature, and there's no vine currently on our turf: make one (maybe) - if(!closed_system && \ - seed.get_trait(TRAIT_SPREAD) == 2 && \ - 2 * age >= seed.get_trait(TRAIT_MATURATION) && \ - !(locate(/obj/effect/plant) in get_turf(src)) && \ - prob(2 * seed.get_trait(TRAIT_POTENCY))) + if(!closed_system && seed.get_trait(TRAIT_SPREAD) == 2 && 2 * age >= seed.get_trait(TRAIT_MATURATION) && !(locate(/obj/effect/plant) in get_turf(src)) && \ + prob(2 * seed.get_trait(TRAIT_POTENCY))) + new /obj/effect/plant(get_turf(src), seed) if(prob(3)) // On each tick, there's a chance the pest population will increase diff --git a/code/modules/integrated_electronics/_defines.dm b/code/modules/integrated_electronics/_defines.dm index 057d6acf333..0140d05ec30 100644 --- a/code/modules/integrated_electronics/_defines.dm +++ b/code/modules/integrated_electronics/_defines.dm @@ -64,4 +64,4 @@ var/removable = TRUE // Determines if a circuit is removable from the assembly. var/displayed_name = "" var/allow_multitool = TRUE // Allows additional multitool functionality - // Used as a global var, (Do not set manually in children). + // Used as a global var, (Do not set manually in children). diff --git a/code/modules/integrated_electronics/core/pins.dm b/code/modules/integrated_electronics/core/pins.dm index 43b730fdbc8..403dfa12b90 100644 --- a/code/modules/integrated_electronics/core/pins.dm +++ b/code/modules/integrated_electronics/core/pins.dm @@ -12,8 +12,8 @@ A [2]\ /[8] result B [1]-\|++|/ C [4]-/|++| D [1]/ || - || - Activator + || + Activator diff --git a/code/modules/integrated_electronics/core/special_pins/list_pin.dm b/code/modules/integrated_electronics/core/special_pins/list_pin.dm index 878f9764ef5..a7610df5edd 100644 --- a/code/modules/integrated_electronics/core/special_pins/list_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/list_pin.dm @@ -8,7 +8,7 @@ // Positionless remove/Edit are a bit weird, // not sure if adding these buttons is quite a good idea. -// They introduce uncertainty, since, in case of 2 elements, +// They introduce uncertainty, since, in case of 2 elements, // they will work just with the 1st one /datum/integrated_io/list/proc/interact(mob/user) var/list/my_list = data @@ -21,7 +21,7 @@ t += "Swap | " t += "Clear
" t += "
" - // Iterating by index simplifies editing/deletion in game, + // Iterating by index simplifies editing/deletion in game, // since the href_list["pos"] var is consistent for(var/i = 1, i <= my_list.len; i++) t += "#[i] | [display_data(my_list[i])] | " diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm index 2ebac4556d5..24ae84a3e16 100644 --- a/code/modules/integrated_electronics/passive/power.dm +++ b/code/modules/integrated_electronics/passive/power.dm @@ -121,7 +121,8 @@ desc = "Produces electricity from chemicals." icon_state = "chemical_cell" extended_desc = "This is effectively an internal beaker. It will consume and produce power from phoron, slime jelly, welding fuel, carbon,\ - ethanol, nutriments and blood, in order of decreasing efficiency. It will consume fuel only if the battery can take more energy." + ethanol, nutriments and blood, in order of decreasing efficiency. It will consume fuel only if the battery can take more energy." + flags = OPENCONTAINER complexity = 4 inputs = list() diff --git a/code/modules/integrated_electronics/subtypes/data_transfer.dm b/code/modules/integrated_electronics/subtypes/data_transfer.dm index 4abd687a87e..3a51b5c2fbe 100644 --- a/code/modules/integrated_electronics/subtypes/data_transfer.dm +++ b/code/modules/integrated_electronics/subtypes/data_transfer.dm @@ -91,7 +91,7 @@ for(var/i = 1 to outputs.len) set_pin_data(IC_OUTPUT, i, i == output_index ? output : null) - + push_data() activate_pin(2) diff --git a/code/modules/integrated_electronics/subtypes/insert_slot.dm b/code/modules/integrated_electronics/subtypes/insert_slot.dm index 0f29b398a4e..21530d97e9a 100644 --- a/code/modules/integrated_electronics/subtypes/insert_slot.dm +++ b/code/modules/integrated_electronics/subtypes/insert_slot.dm @@ -7,13 +7,13 @@ var/list/items_contained = list() activators = list("eject contents" = IC_PINTYPE_PULSE_IN) outputs = list("has item" = IC_PINTYPE_BOOLEAN) - power_draw_per_use = 1 + power_draw_per_use = 1 w_class = ITEMSIZE_NORMAL size = 5 complexity = 1 //call this function from components that want to get items from this component -//set remove to FALSE if you dont want the item removed from the component and just want a reference to it +//set remove to FALSE if you dont want the item removed from the component and just want a reference to it //(e.g. for beakers) /obj/item/integrated_circuit/insert_slot/proc/get_item(var/remove = FALSE) if(items_contained.len > 0) diff --git a/code/modules/lighting/__lighting_docs.dm b/code/modules/lighting/__lighting_docs.dm index 03214872b1f..fcd2e63d51a 100644 --- a/code/modules/lighting/__lighting_docs.dm +++ b/code/modules/lighting/__lighting_docs.dm @@ -1,56 +1,56 @@ /* - -- Aurora directional lighting system, based off of /vg/lights. -- - - Documentation is present in most of the code files. - lighting_atom.dm -> procs/vars for tracking/managing lights attached to objects. - lighting_turf.dm -> procs/vars for managing lighting overlays bound to turfs, tracking lights affecting said turf, and getting information about the turf's light level. - lighting_corner.dm -> contains code for tracking per-corner lighting data. - lighting_source.dm -> contains actual light emitter datum & core lighting calculations. Directional lights and Z-lights are implemented here. - lighting_source_novis.dm -> Same as lighting_source.dm, but does not take visibility into account - used for sun objects. - lighting_profiler.dm -> contains code used for the diagnostic lighting profiler (currently disabled). - lighting_area.dm -> contains area vars/procs for managing an area's dynamic lighting state. - lighting_verbs.dm -> contains verbs for debugging lighting. + -- Aurora directional lighting system, based off of /vg/lights. -- + + Documentation is present in most of the code files. + lighting_atom.dm -> procs/vars for tracking/managing lights attached to objects. + lighting_turf.dm -> procs/vars for managing lighting overlays bound to turfs, tracking lights affecting said turf, and getting information about the turf's light level. + lighting_corner.dm -> contains code for tracking per-corner lighting data. + lighting_source.dm -> contains actual light emitter datum & core lighting calculations. Directional lights and Z-lights are implemented here. + lighting_source_novis.dm -> Same as lighting_source.dm, but does not take visibility into account - used for sun objects. + lighting_profiler.dm -> contains code used for the diagnostic lighting profiler (currently disabled). + lighting_area.dm -> contains area vars/procs for managing an area's dynamic lighting state. + lighting_verbs.dm -> contains verbs for debugging lighting. */ /* - Useful procs when using lights: + Useful procs when using lights: /atom/proc/set_light(range, power, color, uv_power, angle, no_update) - desc: Sets an atom's light emission. `set_light(FALSE)` will disable the light. - args: - range -> the range of the light. 1.4 is the lowest possible value here. - power -> the power (intensity) of the light. Generally should be 1 or lower. Optional. - color -> The hex string (#FFFFFF) color of the light. Optional. - uv_power -> The UV power of this light. Must be between 0 and 255. Optional. - angle -> The angle of the cone that the light should shine at (directional lighting). Behavior of lights over 180 degrees is undefined. Best to stick to using the LIGHT_ defines for this. Optional. - no_update -> if TRUE, the light will not be updated. Useful for when making several of these calls to the same object. Optional. + desc: Sets an atom's light emission. `set_light(FALSE)` will disable the light. + args: + range -> the range of the light. 1.4 is the lowest possible value here. + power -> the power (intensity) of the light. Generally should be 1 or lower. Optional. + color -> The hex string (#FFFFFF) color of the light. Optional. + uv_power -> The UV power of this light. Must be between 0 and 255. Optional. + angle -> The angle of the cone that the light should shine at (directional lighting). Behavior of lights over 180 degrees is undefined. Best to stick to using the LIGHT_ defines for this. Optional. + no_update -> if TRUE, the light will not be updated. Useful for when making several of these calls to the same object. Optional. /atom/proc/set_opacity(new_opacity) - desc: Sets an atom's opacity, updating affecting lights' visibility. Returns TRUE if opacity changed, FALSE otherwise. - args: - new_opacity -> the new opacity value. + desc: Sets an atom's opacity, updating affecting lights' visibility. Returns TRUE if opacity changed, FALSE otherwise. + args: + new_opacity -> the new opacity value. /turf/proc/reconsider_lights() - desc: Cause all lights affecting this turf to recalculate visibility. - args: none + desc: Cause all lights affecting this turf to recalculate visibility. + args: none /turf/proc/force_update_lights() - desc: Force all lights affecting this turf to regenerate. Slow, use reconsider_lights instead when possible. - args: none + desc: Force all lights affecting this turf to regenerate. Slow, use reconsider_lights instead when possible. + args: none /turf/proc/get_avg_color() - desc: Gets the average color of this tile as a hexadecimal color string. Used by cameras. + desc: Gets the average color of this tile as a hexadecimal color string. Used by cameras. /turf/proc/get_lumcount(minlum = 0, maxlum = 1) - desc: Gets the brightness of this tile. If not dynamically lit, always returns 0.5, otherwise returns the average brightness of all 4 corners, scaled between minlum and maxlum. - args: - minlum -> the low-bound of the scalar. - maxlum -> the high-bound of the scalar. + desc: Gets the brightness of this tile. If not dynamically lit, always returns 0.5, otherwise returns the average brightness of all 4 corners, scaled between minlum and maxlum. + args: + minlum -> the low-bound of the scalar. + maxlum -> the high-bound of the scalar. /turf/proc/get_uv_lumcount(minlum = 0, maxlum = 1) - desc: Same as above, but only considers UV light. - args: - minlum -> the low-bound of the scalar. - maxlum -> the high-bound of the scalar. + desc: Same as above, but only considers UV light. + args: + minlum -> the low-bound of the scalar. + maxlum -> the high-bound of the scalar. */ diff --git a/code/modules/lighting/lighting_source_sunlight.dm b/code/modules/lighting/lighting_source_sunlight.dm index 8c9ad3600bc..c7466639316 100644 --- a/code/modules/lighting/lighting_source_sunlight.dm +++ b/code/modules/lighting/lighting_source_sunlight.dm @@ -194,4 +194,4 @@ #undef QUEUE_UPDATE -#endif +#endif diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm index 2d46c42cc88..6d997caf7e2 100644 --- a/code/modules/lighting/lighting_turf.dm +++ b/code/modules/lighting/lighting_turf.dm @@ -185,7 +185,7 @@ /turf/proc/generate_missing_corners() if (!dynamic_lighting && !light_sources) return - + lighting_corners_initialised = TRUE if (!corners) corners = list(null, null, null, null) diff --git a/code/modules/maps/planet_types/asteroid.dm b/code/modules/maps/planet_types/asteroid.dm index 39cd429f293..534d2509122 100644 --- a/code/modules/maps/planet_types/asteroid.dm +++ b/code/modules/maps/planet_types/asteroid.dm @@ -14,7 +14,7 @@ place_near_main = list(1, 1) /obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/update_icon() - icon_state = "asteroid[rand(1,3)]" + icon_state = "asteroid[rand(1,3)]" /obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/generate_planet_image() skybox_image = image('icons/skybox/skybox_rock_128.dmi', "bigrock") diff --git a/code/modules/maps/swapmaps.dm b/code/modules/maps/swapmaps.dm index 93665fb98e0..851d9c4a8ca 100644 --- a/code/modules/maps/swapmaps.dm +++ b/code/modules/maps/swapmaps.dm @@ -18,8 +18,7 @@ - House interiors - Individual custom player houses - Virtually unlimited terrain - - Sharing maps between servers running different instances of the same - game + - Sharing maps between servers running different instances of the same game - Loading and saving pieces of maps for reusable room templates */ @@ -58,7 +57,7 @@ SwapMaps_CreateFromTemplate(id) Create a new map by loading another map to use as a template. This map has id==src and will not be saved. To make it savable, - change id with swapmap.SetID(newid). + change id with swapmap.SetID(newid). SwapMaps_LoadChunk(id,turf/locorner) Load a swapmap as a "chunk", at a specific place. A new datum is created but it's not added to the list of maps to save or unload. @@ -79,16 +78,16 @@ Cache an icon file by name for space-saving storage swapmap.New(id,x,y,z) - Create a new map; specify id, width (x), height (y), and - depth (z) + Create a new map; specify id, width (x), height (y), and depth (z) Default size is world.maxx,world.maxy,1 + swapmap.New(id,turf1,turf2) Create a new map; specify id and 2 corners - This becomes a /swapmap for one of the compiled-in maps, for - easy saving. + This becomes a /swapmap for one of the compiled-in maps, for easy saving. + swapmap.New() - Create a new map datum, but does not allocate space or assign an - ID (used for loading). + Create a new map datum, but does not allocate space or assign an ID (used for loading). + swapmap.Del() Deletes a map but does not save swapmap.Save() @@ -100,30 +99,28 @@ swapmap.SetID(id) Change the map's id and make changes to the lookup list swapmap.AllTurfs(z) - Returns a block of turfs encompassing the entire map, or on just - one z-level + Returns a block of turfs encompassing the entire map, or on just one z-level z is in world coordinates; it is optional + swapmap.Contains(turf/T) Returns nonzero if T is inside the map's boundaries. Also works for objs and mobs, but the proc is not area-safe. swapmap.InUse() - Returns nonzero if a mob with a key is within the map's - boundaries. + Returns nonzero if a mob with a key is within the map's boundaries. + swapmap.LoCorner(z=z1) Returns locate(x1,y1,z), where z=z1 if none is specified. swapmap.HiCorner(z=z2) Returns locate(x2,y2,z), where z=z2 if none is specified. swapmap.BuildFilledRectangle(turf/corner1,turf/corner2,item) - Builds a filled rectangle of item from one corner turf to the - other, on multiple z-levels if necessary. The corners may be - specified in any order. + Builds a filled rectangle of item from one corner turf to the other, on multiple z-levels if necessary. The corners may be specified in any order. item is a type path like /turf/wall or /obj/barrel{full=1}. + swapmap.BuildRectangle(turf/corner1,turf/corner2,item) - Builds an unfilled rectangle of item from one corner turf to - the other, on multiple z-levels if necessary. + Builds an unfilled rectangle of item from one corner turf to the other, on multiple z-levels if necessary. + swapmap.BuildInTurfs(list/turfs,item) - Builds item on all of the turfs listed. The list need not - contain only turfs, or even only atoms. + Builds item on all of the turfs listed. The list need not contain only turfs, or even only atoms. */ /swapmap diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm index 34553bd09bd..166401312f6 100644 --- a/code/modules/martial_arts/sleeping_carp.dm +++ b/code/modules/martial_arts/sleeping_carp.dm @@ -61,7 +61,7 @@ if(!D.stat && !D.weakened) A.do_attack_animation(D) D.visible_message("[A] knees [D] in the stomach!", \ - "[A] winds you with a knee in the stomach!") + "[A] winds you with a knee in the stomach!") D.audible_message("[D] gags!") if (!(D.species.flags & NO_BREATHE)) D.losebreath += 3 @@ -75,7 +75,7 @@ if(!D.stat && !D.weakened) A.do_attack_animation(D) D.visible_message("[A] kicks [D] in the head!", \ - "[A] kicks you in the jaw!") + "[A] kicks you in the jaw!") D.apply_damage(20, DAMAGE_BRUTE, BP_HEAD) D.drop_item() playsound(get_turf(D), "punch", 50, 1, -1) @@ -134,4 +134,4 @@ #undef BACK_KICK_COMBO #undef STOMACH_KNEE_COMBO #undef HEAD_KICK_COMBO -#undef ELBOW_DROP_COMBO \ No newline at end of file +#undef ELBOW_DROP_COMBO diff --git a/code/modules/martial_arts/vaurca.dm b/code/modules/martial_arts/vaurca.dm index 2ae8aa75bd6..268f9b03380 100644 --- a/code/modules/martial_arts/vaurca.dm +++ b/code/modules/martial_arts/vaurca.dm @@ -48,7 +48,7 @@ A.do_attack_animation(D) var/atk_verb = pick("slices", "pinches", "chops", "bites", "claws") D.visible_message("[A] [atk_verb] [D]!", \ - "[A] [atk_verb] you!") + "[A] [atk_verb] you!") D.apply_damage(rand(5,15), DAMAGE_BRUTE, damage_flags = DAMAGE_FLAG_SHARP) playsound(get_turf(D), 'sound/weapons/slash.ogg', 25, 1, -1) @@ -98,4 +98,4 @@ #undef PIERCING_STRIKE #undef SWIFT_BITE -#undef CRUSHING_JAWS \ No newline at end of file +#undef CRUSHING_JAWS diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index 68a2715a862..a59af11fd6c 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -111,4 +111,4 @@ icon_state = "coin_[cmineral]_[comment]" playsound(get_turf(src), 'sound/items/coinflip.ogg', 100, 1, -4) user.visible_message(SPAN_NOTICE("\The [user] throws \the [src]. It lands on [comment]!"), \ - SPAN_NOTICE("You throw \the [src]. It lands on [comment]!")) + SPAN_NOTICE("You throw \the [src]. It lands on [comment]!")) diff --git a/code/modules/mining/machine_rigpress.dm b/code/modules/mining/machine_rigpress.dm index 5f7452be8b5..bcf978dc40a 100644 --- a/code/modules/mining/machine_rigpress.dm +++ b/code/modules/mining/machine_rigpress.dm @@ -18,7 +18,7 @@ /obj/item/pickaxe/diamond = /obj/item/rig_module/device/drill, /obj/item/gun/energy/vaurca/thermaldrill = /obj/item/rig_module/mounted/thermalldrill ) - + /obj/machinery/mineral/rigpress/Initialize() . = ..() for(var/press_type in press_types) diff --git a/code/modules/mob/abstract/freelook/ai/chunk.dm b/code/modules/mob/abstract/freelook/ai/chunk.dm index 954f9ffc946..276445c13ee 100644 --- a/code/modules/mob/abstract/freelook/ai/chunk.dm +++ b/code/modules/mob/abstract/freelook/ai/chunk.dm @@ -9,7 +9,7 @@ var/obj/machinery/camera/c = source if(!c.can_use()) continue - + for(var/turf/t in c.can_see()) visible[t] = t else if(isAI(source)) @@ -21,4 +21,4 @@ visible[t] = t else log_visualnet("Contained an unhandled source", source) - sources -= source \ No newline at end of file + sources -= source diff --git a/code/modules/mob/abstract/freelook/chunk.dm b/code/modules/mob/abstract/freelook/chunk.dm index 72376d9fb5c..8b9715934f4 100644 --- a/code/modules/mob/abstract/freelook/chunk.dm +++ b/code/modules/mob/abstract/freelook/chunk.dm @@ -176,7 +176,7 @@ var/mob/abstract/eye/m = eye if (m && m.owner && m.owner.client) m.owner.client.images += obfuscation_image - + dirty = FALSE updating = FALSE diff --git a/code/modules/mob/abstract/freelook/read_me.dm b/code/modules/mob/abstract/freelook/read_me.dm index 869fcc2cdac..2795333e112 100644 --- a/code/modules/mob/abstract/freelook/read_me.dm +++ b/code/modules/mob/abstract/freelook/read_me.dm @@ -1,51 +1,51 @@ // CREDITS /* - Initial code credit for this goes to Uristqwerty. - Debugging, functionality, all comments and porting by Giacom. +Initial code credit for this goes to Uristqwerty. +Debugging, functionality, all comments and porting by Giacom. - Everything about freelook (or what we can put in here) will be stored here. +Everything about freelook (or what we can put in here) will be stored here. - WHAT IS THIS? +WHAT IS THIS? - This is a replacement for the current camera movement system, of the AI. Before this, the AI had to move between cameras and could - only see what the cameras could see. Not only this but the cameras could see through walls, which created problems. - With this, the AI controls an "AI Eye" mob, which moves just like a ghost; such as moving through walls and being invisible to players. - The AI's eye is set to this mob and then we use a system (explained below) to determine what the cameras around the AI Eye can and - cannot see. If the camera cannot see a turf, it will black it out, otherwise it won't and the AI will be able to see it. - This creates several features, such as.. no more see-through-wall cameras, easier to control camera movement, easier tracking, - the AI only being able to track mobs which are visible to a camera, only trackable mobs appearing on the mob list and many more. +This is a replacement for the current camera movement system, of the AI. Before this, the AI had to move between cameras and could +only see what the cameras could see. Not only this but the cameras could see through walls, which created problems. +With this, the AI controls an "AI Eye" mob, which moves just like a ghost; such as moving through walls and being invisible to players. +The AI's eye is set to this mob and then we use a system (explained below) to determine what the cameras around the AI Eye can and +cannot see. If the camera cannot see a turf, it will black it out, otherwise it won't and the AI will be able to see it. +This creates several features, such as.. no more see-through-wall cameras, easier to control camera movement, easier tracking, +the AI only being able to track mobs which are visible to a camera, only trackable mobs appearing on the mob list and many more. - HOW IT WORKS +HOW IT WORKS - It works by first creating a camera network datum. Inside of this camera network are "chunks" (which will be - explained later) and "cameras". The cameras list is kept up to date by obj/machinery/camera/New() and Destroy(). +It works by first creating a camera network datum. Inside of this camera network are "chunks" (which will be +explained later) and "cameras". The cameras list is kept up to date by obj/machinery/camera/New() and Destroy(). - Next the camera network has chunks. These chunks are a 16x16 tile block of turfs and cameras contained inside the chunk. - These turfs are then sorted out based on what the cameras can and cannot see. If none of the cameras can see the turf, inside - the 16x16 block, it is listed as an "obscured" turf. Meaning the AI won't be able to see it. +Next the camera network has chunks. These chunks are a 16x16 tile block of turfs and cameras contained inside the chunk. +These turfs are then sorted out based on what the cameras can and cannot see. If none of the cameras can see the turf, inside +the 16x16 block, it is listed as an "obscured" turf. Meaning the AI won't be able to see it. - HOW IT UPDATES +HOW IT UPDATES - The camera network uses a streaming method in order to effeciently update chunks. Since the server will have doors opening, doors closing, - turf being destroyed and other lag inducing stuff, we want to update it under certain conditions and not every tick. +The camera network uses a streaming method in order to effeciently update chunks. Since the server will have doors opening, doors closing, +turf being destroyed and other lag inducing stuff, we want to update it under certain conditions and not every tick. - The chunks are not created straight away, only when an AI eye moves into it's area is when it gets created. - One a chunk is created, when a non glass door opens/closes or an opacity turf is destroyed, we check to see if an AI Eye is looking in the area. - We do this with the "seenby" list, which updates everytime an AI is near a chunk. If there is an AI eye inside the area, we update the chunk - that the changed atom is inside and all surrounding chunks, since a camera's vision could leak onto another chunk. If there is no AI Eye, we instead - flag the chunk to update whenever it is loaded by an AI Eye. This is basically how the chunks update and keep it in sync. We then add some lag reducing - measures, such as an UPDATE_BUFFER which stops a chunk from updating too many times in a certain time-frame, only updating if the changed atom was blocking - sight; for example, we don't update glass airlocks or floors. +The chunks are not created straight away, only when an AI eye moves into it's area is when it gets created. +One a chunk is created, when a non glass door opens/closes or an opacity turf is destroyed, we check to see if an AI Eye is looking in the area. +We do this with the "seenby" list, which updates everytime an AI is near a chunk. If there is an AI eye inside the area, we update the chunk +that the changed atom is inside and all surrounding chunks, since a camera's vision could leak onto another chunk. If there is no AI Eye, we instead +flag the chunk to update whenever it is loaded by an AI Eye. This is basically how the chunks update and keep it in sync. We then add some lag reducing +measures, such as an UPDATE_BUFFER which stops a chunk from updating too many times in a certain time-frame, only updating if the changed atom was blocking +sight; for example, we don't update glass airlocks or floors. - WHERE IS EVERYTHING? +WHERE IS EVERYTHING? - cameranet.dm = Everything about the cameranet datum. - chunk.dm = Everything about the chunk datum. - eye.dm = Everything about the AI and the AIEye. - updating.dm = Everything about triggers that will update chunks. +cameranet.dm = Everything about the cameranet datum. +chunk.dm = Everything about the chunk datum. +eye.dm = Everything about the AI and the AIEye. +updating.dm = Everything about triggers that will update chunks. */ diff --git a/code/modules/mob/animations.dm b/code/modules/mob/animations.dm index e8d36f330ce..ac7d13aac2b 100644 --- a/code/modules/mob/animations.dm +++ b/code/modules/mob/animations.dm @@ -48,7 +48,7 @@ note dizziness decrements automatically in the mob's Life() proc. /mob/proc/make_jittery(var/amount) return -/mob/living/carbon/human/make_jittery(amount) +/mob/living/carbon/human/make_jittery(amount) jitteriness = min(1000, jitteriness + amount) // store what will be new value // clamped to max 1000 if(jitteriness > 100 && !is_jittery && stat != DEAD && !(status_flags & FAKEDEATH)) diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index 91b5fa13033..967d85f633c 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -327,7 +327,7 @@ var/list/cleanbot_types // Going to use this to generate a list of types once th // This just generates the global list if it hasn't been done already, quick process. cleanbot_types = typesof(/obj/effect/decal/cleanable/blood,/obj/effect/decal/cleanable/vomit,\ /obj/effect/decal/cleanable/crayon,/obj/effect/decal/cleanable/liquid_fuel,/obj/effect/decal/cleanable/mucus,/obj/effect/decal/cleanable/dirt) - // I honestly forgot you could pass multiple types to typesof() until I accidentally did it here. + // I honestly forgot you could pass multiple types to typesof() until I accidentally did it here. target_types = cleanbot_types.Copy() if(!cleans_blood) target_types -= typesof(/obj/effect/decal/cleanable/blood)-typesof(/obj/effect/decal/cleanable/blood/oil) diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 0910cd2d37f..78cab6dc186 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -167,7 +167,7 @@ continue if(!process_tray(tray)) //If there's nothing for us to do with the plant, ignore this tray. continue - if(pathfind(tray)) //If we can get there, we can accept it as a target. + if(pathfind(tray)) //If we can get there, we can accept it as a target. target = tray frustration = 0 break @@ -190,7 +190,7 @@ if(!length(freespaces)) return FALSE - //If we got here, we know there's a space around it that we can use to access the tray/target. Let's try to find a path to it. + //If we got here, we know there's a space around it that we can use to access the tray/target. Let's try to find a path to it. var/turf/location_goal = pick(freespaces) path = AStar(loc, location_goal, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 30, id = botcard) if(!path) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index acb90d4056a..af36c133aa6 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -67,7 +67,7 @@ to_chat(H, SPAN_DANGER("You sense great disturbance to your physical body!")) else if(!vr_mob) user.visible_message("[user] attacks [src] with [I] waking [get_pronoun("him")] up!", \ - "You attack [src] with [I], but they do not respond... Maybe they have S.S.D?") + "You attack [src] with [I], but they do not respond... Maybe they have S.S.D?") else if(client && willfully_sleeping) user.visible_message("[user] attacked [src] with [I] waking [get_pronoun("him")] up!", \ "You attack [src] with [I], waking [get_pronoun("him")] up!") diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm index b1cb57c7841..7639d22d484 100644 --- a/code/modules/mob/living/carbon/give.dm +++ b/code/modules/mob/living/carbon/give.dm @@ -15,7 +15,7 @@ if(!I) to_chat(usr, SPAN_WARNING("You don't have anything in your hands to give to \the [target].")) return - + if(I.too_heavy_to_throw()) to_chat(src, SPAN_WARNING("You can barely lift \the [I] up, how do you expect to hand it over to someone?")) return FALSE @@ -48,4 +48,4 @@ I.on_give(usr, target) if(!QDELETED(I)) // if on_give deletes the item, we don't want runtimes below target.put_in_hands(I) // If this fails it will just end up on the floor, but that's fitting for things like dionaea. - usr.visible_message("[usr] hands [target] \a [I].", SPAN_NOTICE("You give \the [target] a [I].")) \ No newline at end of file + usr.visible_message("[usr] hands [target] \a [I].", SPAN_NOTICE("You give \the [target] a [I].")) diff --git a/code/modules/mob/living/carbon/human/devour.dm b/code/modules/mob/living/carbon/human/devour.dm index 0953c9b5ef0..ee851e0fb90 100644 --- a/code/modules/mob/living/carbon/human/devour.dm +++ b/code/modules/mob/living/carbon/human/devour.dm @@ -1,4 +1,4 @@ - #define PPM 9 //Protein per meat, used for calculating the quantity of protein in an animal +#define PPM 9 //Protein per meat, used for calculating the quantity of protein in an animal /** * Attempt to devour victim diff --git a/code/modules/mob/living/carbon/human/human_maneuvers.dm b/code/modules/mob/living/carbon/human/human_maneuvers.dm index c5946712dd0..b03f7dac37d 100644 --- a/code/modules/mob/living/carbon/human/human_maneuvers.dm +++ b/code/modules/mob/living/carbon/human/human_maneuvers.dm @@ -9,11 +9,11 @@ /mob/living/carbon/human/get_jump_distance() . = species.standing_jump_range - + var/obj/item/organ/internal/augment/suspension/suspension = internal_organs_by_name[BP_AUG_SUSPENSION] if(suspension && . < 3) - . = max(. + suspension.jump_bonus, 3) + . = max(. + suspension.jump_bonus, 3) /mob/living/carbon/human/can_do_maneuver(var/singleton/maneuver/maneuver, var/silent = FALSE) . = ..() diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 25fa6a5943e..191ab4b9db5 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -101,12 +101,12 @@ /* - ***Deprecated*** - let this be handled at the hear_say or hear_radio proc - This is left in for robot speaking when humans gain binary channel access until I get around to rewriting - robot_talk() proc. - There is no language handling build into it however there is at the /mob level so we accept the call - for it but just ignore it. + ***Deprecated*** + let this be handled at the hear_say or hear_radio proc + This is left in for robot speaking when humans gain binary channel access until I get around to rewriting + robot_talk() proc. + There is no language handling build into it however there is at the /mob level so we accept the call + for it but just ignore it. */ /mob/living/carbon/human/say_quote(var/message, var/datum/language/speaking = null, var/singing = FALSE, var/whisper = FALSE) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 5cc5fc812e1..1b68b455c15 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -159,8 +159,7 @@ var/hazard_low_pressure = HAZARD_LOW_PRESSURE // Dangerously low pressure. var/light_dam // If set, mob will be damaged in light over this value and heal in light below its negative. var/breathing_sound = 'sound/voice/monkey.ogg' // If set, this mob will have a breathing sound. - var/body_temperature = 310.15 // Non-IS_SYNTHETIC species will try to stabilize at this temperature. - // (also affects temperature processing) + var/body_temperature = 310.15 // Non-IS_SYNTHETIC species will try to stabilize at this temperature. (also affects temperature processing) var/heat_discomfort_level = 315 // Aesthetic messages about feeling warm. var/cold_discomfort_level = 285 // Aesthetic messages about feeling chilly. @@ -239,7 +238,7 @@ var/max_hydration_factor = 1 //Multiplier on maximum thirst var/hydration_loss_factor = 1 //Multiplier on passive thirst losses - // Determines the organs that the species spawns with and + ///Determines the organs that the species spawns with and var/list/has_organ = list( // which required-organ checks are conducted. BP_HEART = /obj/item/organ/internal/heart, BP_LUNGS = /obj/item/organ/internal/lungs, diff --git a/code/modules/mob/living/carbon/human/species/species_damage.dm b/code/modules/mob/living/carbon/human/species/species_damage.dm index a10b42c4b63..841cfecd0c7 100644 --- a/code/modules/mob/living/carbon/human/species/species_damage.dm +++ b/code/modules/mob/living/carbon/human/species/species_damage.dm @@ -8,4 +8,4 @@ if(C.nutrition <= C.max_nutrition * 0.05) to_chat(C, SPAN_WARNING("We cannot support our summoned apparitions with our biomass any longer...")) return FALSE - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/mob/living/carbon/human/species/station/golem.dm b/code/modules/mob/living/carbon/human/species/station/golem.dm index 0820fa140fa..0523da6f417 100644 --- a/code/modules/mob/living/carbon/human/species/station/golem.dm +++ b/code/modules/mob/living/carbon/human/species/station/golem.dm @@ -1,20 +1,22 @@ -var/global/list/golem_types = list(SPECIES_GOLEM_COAL, - SPECIES_GOLEM_IRON, - SPECIES_GOLEM_BRONZE, - SPECIES_GOLEM_STEEL, - SPECIES_GOLEM_PLASTEEL, - SPECIES_GOLEM_TITANIUM, - SPECIES_GOLEM_CLOTH, - SPECIES_GOLEM_CARDBOARD, - SPECIES_GOLEM_GLASS, - SPECIES_GOLEM_PHORON, - SPECIES_GOLEM_HYDROGEN, - SPECIES_GOLEM_WOOD, - SPECIES_GOLEM_DIAMOND, - SPECIES_GOLEM_SAND, - SPECIES_GOLEM_URANIUM, - SPECIES_GOLEM_MEAT, - SPECIES_GOLEM_ADAMANTINE) +var/global/list/golem_types = list( + SPECIES_GOLEM_COAL, + SPECIES_GOLEM_IRON, + SPECIES_GOLEM_BRONZE, + SPECIES_GOLEM_STEEL, + SPECIES_GOLEM_PLASTEEL, + SPECIES_GOLEM_TITANIUM, + SPECIES_GOLEM_CLOTH, + SPECIES_GOLEM_CARDBOARD, + SPECIES_GOLEM_GLASS, + SPECIES_GOLEM_PHORON, + SPECIES_GOLEM_HYDROGEN, + SPECIES_GOLEM_WOOD, + SPECIES_GOLEM_DIAMOND, + SPECIES_GOLEM_SAND, + SPECIES_GOLEM_URANIUM, + SPECIES_GOLEM_MEAT, + SPECIES_GOLEM_ADAMANTINE + ) /datum/species/golem name = SPECIES_GOLEM_COAL diff --git a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm index a4f5212d4b7..e8fa78dfc46 100644 --- a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm @@ -16,8 +16,8 @@ blurb = "IPCs with humanlike properties. Their focus is on service, civilian, and medical, but there are no \ job restrictions. Created in the late days of 2450, the Shell is a controversial IPC model equipped with a synthskin weave applied over its metal chassis \ to create an uncannily close approximation of the organic form. Early models of Shell had the advantage of being able to compose themselves of a wide \ - variety of organic parts, but contemporary models have been restricted to a single species for the sake of prosthetic integrity. The additional weight of \ - the synthskin on the original Hephaestus frame reduces the efficacy of the unit's already strained coolant systems, and increases charge consumption." + variety of organic parts, but contemporary models have been restricted to a single species for the sake of prosthetic integrity. The additional weight of \ + the synthskin on the original Hephaestus frame reduces the efficacy of the unit's already strained coolant systems, and increases charge consumption." num_alternate_languages = 3 diff --git a/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm b/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm index 0c31c8d0440..6c0e7eaaf84 100644 --- a/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm +++ b/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm @@ -105,14 +105,14 @@ ) has_organ = list( - BP_BRAIN = /obj/item/organ/internal/brain/unathi, - BP_HEART = /obj/item/organ/internal/heart/unathi, - BP_LIVER = /obj/item/organ/internal/liver/unathi, - BP_LUNGS = /obj/item/organ/internal/lungs/unathi, - BP_KIDNEYS = /obj/item/organ/internal/kidneys/unathi, - BP_STOMACH = /obj/item/organ/internal/stomach/unathi, - BP_EYES = /obj/item/organ/internal/eyes/unathi - ) + BP_BRAIN = /obj/item/organ/internal/brain/unathi, + BP_HEART = /obj/item/organ/internal/heart/unathi, + BP_LIVER = /obj/item/organ/internal/liver/unathi, + BP_LUNGS = /obj/item/organ/internal/lungs/unathi, + BP_KIDNEYS = /obj/item/organ/internal/kidneys/unathi, + BP_STOMACH = /obj/item/organ/internal/stomach/unathi, + BP_EYES = /obj/item/organ/internal/eyes/unathi + ) alterable_internal_organs = list(BP_HEART, BP_EYES, BP_LUNGS, BP_LIVER, BP_KIDNEYS, BP_STOMACH) diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm index b0c0a7a32d8..314a6309dcb 100644 --- a/code/modules/mob/living/carbon/human/stripping.dm +++ b/code/modules/mob/living/carbon/human/stripping.dm @@ -88,7 +88,7 @@ // Are we placing or stripping? var/stripping = target_slot var/obj/item/held = user.get_active_hand() - + if(stripping) if(!target_slot.canremove) to_chat(user, "You cannot remove \the [src]'s [target_slot.name].") diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 420a7273d52..c7cd9bcf62a 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -29,9 +29,9 @@ var/mob/living/next_point_time = 0 /*one proc, four uses swapping: if it's 1, the mobs are trying to switch, if 0, non-passive is pushing passive default behaviour is: - - non-passive mob passes the passive version - - passive mob checks to see if its mob_bump_flag is in the non-passive's mob_bump_flags - - if si, the proc returns + - non-passive mob passes the passive version + - passive mob checks to see if its mob_bump_flag is in the non-passive's mob_bump_flags + - if si, the proc returns */ /mob/living/proc/can_move_mob(var/mob/living/swapped, swapping = 0, passive = 0) if(!swapped) diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm index 21da512c90c..ceb24e9c21f 100644 --- a/code/modules/mob/living/logout.dm +++ b/code/modules/mob/living/logout.dm @@ -1,6 +1,6 @@ /mob/living/Logout() ..() - if (mind) + if (mind) //Per BYOND docs key remains set if the player DCs, becomes null if switching bodies. - if(!key) //key and mind have become seperated. + if(!key) //key and mind have become seperated. mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body. diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 6f518abde9a..18272513ae9 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -1,65 +1,65 @@ var/list/department_radio_keys = list( - ":r" = "right ear", ".r" = "right ear", - ":l" = "left ear", ".l" = "left ear", - ":i" = "intercom", ".i" = "intercom", - ":h" = "department", ".h" = "department", - ":+" = "special", ".+" = "special", //activate radio-specific special functions - ":a" = "Common", ".a" = "Common", - ":c" = "Command", ".c" = "Command", - ":n" = "Science", ".n" = "Science", - ":m" = "Medical", ".m" = "Medical", - ":e" = "Engineering", ".e" = "Engineering", - ":s" = "Security", ".s" = "Security", - ":q" = "Penal", ".q" = "Penal", - ":w" = "whisper", ".w" = "whisper", - ":t" = "Mercenary", ".t" = "Mercenary", - ":x" = "Raider", ".x" = "Raider", - ":b" = "Burglar", ".b" = "Burglar", - ":j" = "Bluespace", ".j" = "Bluespace", - ":y" = "Hailing", ".y" = "Hailing", - ":q" = "Ninja", ".q" = "Ninja", - ":u" = "Operations", ".u" = "Operations", - ":v" = "Service", ".v" = "Service", - ":p" = "AI Private", ".p" = "AI Private", - ":z" = "Entertainment",".z" = "Entertainment", - - ":R" = "right ear", ".R" = "right ear", - ":L" = "left ear", ".L" = "left ear", - ":I" = "intercom", ".I" = "intercom", - ":H" = "department", ".H" = "department", - ":A" = "Common", ".A" = "Common", - ":C" = "Command", ".C" = "Command", - ":N" = "Science", ".N" = "Science", - ":M" = "Medical", ".M" = "Medical", - ":E" = "Engineering", ".E" = "Engineering", - ":S" = "Security", ".S" = "Security", - ":Q" = "Penal", ".Q" = "Penal", - ":W" = "whisper", ".W" = "whisper", - ":T" = "Mercenary", ".T" = "Mercenary", - ":X" = "Raider", ".X" = "Raider", - ":B" = "Burglar", ".B" = "Burglar", - ":J" = "Bluespace", ".J" = "Bluespace", - ":Y" = "Hailing", ".Y" = "Hailing", - ":Q" = "Ninja", ".Q" = "Ninja", - ":U" = "Operations", ".U" = "Operations", - ":V" = "Service", ".V" = "Service", - ":P" = "AI Private", ".P" = "AI Private", - ":Z" = "Entertainment",".Z" = "Entertainment", - - //kinda localization -- rastaf0 - //same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding. - ":ê" = "right ear", ".ê" = "right ear", - ":ä" = "left ear", ".ä" = "left ear", - ":ø" = "intercom", ".ø" = "intercom", - ":ð" = "department", ".ð" = "department", - ":ñ" = "Command", ".ñ" = "Command", - ":ò" = "Science", ".ò" = "Science", - ":ü" = "Medical", ".ü" = "Medical", - ":ó" = "Engineering", ".ó" = "Engineering", - ":û" = "Security", ".û" = "Security", - ":ö" = "whisper", ".ö" = "whisper", - ":å" = "Mercenary", ".å" = "Mercenary", - ":é" = "Operations", ".é" = "Operations" + ":r" = "right ear", ".r" = "right ear", + ":l" = "left ear", ".l" = "left ear", + ":i" = "intercom", ".i" = "intercom", + ":h" = "department", ".h" = "department", + ":+" = "special", ".+" = "special", //activate radio-specific special functions + ":a" = "Common", ".a" = "Common", + ":c" = "Command", ".c" = "Command", + ":n" = "Science", ".n" = "Science", + ":m" = "Medical", ".m" = "Medical", + ":e" = "Engineering", ".e" = "Engineering", + ":s" = "Security", ".s" = "Security", + ":q" = "Penal", ".q" = "Penal", + ":w" = "whisper", ".w" = "whisper", + ":t" = "Mercenary", ".t" = "Mercenary", + ":x" = "Raider", ".x" = "Raider", + ":b" = "Burglar", ".b" = "Burglar", + ":j" = "Bluespace", ".j" = "Bluespace", + ":y" = "Hailing", ".y" = "Hailing", + ":q" = "Ninja", ".q" = "Ninja", + ":u" = "Operations", ".u" = "Operations", + ":v" = "Service", ".v" = "Service", + ":p" = "AI Private", ".p" = "AI Private", + ":z" = "Entertainment",".z" = "Entertainment", + + ":R" = "right ear", ".R" = "right ear", + ":L" = "left ear", ".L" = "left ear", + ":I" = "intercom", ".I" = "intercom", + ":H" = "department", ".H" = "department", + ":A" = "Common", ".A" = "Common", + ":C" = "Command", ".C" = "Command", + ":N" = "Science", ".N" = "Science", + ":M" = "Medical", ".M" = "Medical", + ":E" = "Engineering", ".E" = "Engineering", + ":S" = "Security", ".S" = "Security", + ":Q" = "Penal", ".Q" = "Penal", + ":W" = "whisper", ".W" = "whisper", + ":T" = "Mercenary", ".T" = "Mercenary", + ":X" = "Raider", ".X" = "Raider", + ":B" = "Burglar", ".B" = "Burglar", + ":J" = "Bluespace", ".J" = "Bluespace", + ":Y" = "Hailing", ".Y" = "Hailing", + ":Q" = "Ninja", ".Q" = "Ninja", + ":U" = "Operations", ".U" = "Operations", + ":V" = "Service", ".V" = "Service", + ":P" = "AI Private", ".P" = "AI Private", + ":Z" = "Entertainment",".Z" = "Entertainment", + + //kinda localization -- rastaf0 + //same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding. + ":ê" = "right ear", ".ê" = "right ear", + ":ä" = "left ear", ".ä" = "left ear", + ":ø" = "intercom", ".ø" = "intercom", + ":ð" = "department", ".ð" = "department", + ":ñ" = "Command", ".ñ" = "Command", + ":ò" = "Science", ".ò" = "Science", + ":ü" = "Medical", ".ü" = "Medical", + ":ó" = "Engineering", ".ó" = "Engineering", + ":û" = "Security", ".û" = "Security", + ":ö" = "whisper", ".ö" = "whisper", + ":å" = "Mercenary", ".å" = "Mercenary", + ":é" = "Operations", ".é" = "Operations" ) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 1d7c36f9fa2..9874f70cfef 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -356,8 +356,8 @@ var/list/ai_verbs_default = list( To use something, simply click on it.

\

AI Shell

\

As an AI, you have access to an unique, inhabitable AI shell that spawns behind your core.\ - This construct can be used in a variety of ways, but its primary function is to be a role play tool to give you the ability to have an actual physical presence on the station.\ - The shell is an extension of you, which means your laws apply to it aswell.\ + This construct can be used in a variety of ways, but its primary function is to be a role play tool to give you the ability to have an actual physical presence on the station.\ + The shell is an extension of you, which means your laws apply to it aswell.\

\

OOC Notes

\

Please remember that as an AI you can heavily skew the game in your (and thus usually the crew's) favour. \ diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm index 04a2f416774..0879dd71f21 100644 --- a/code/modules/mob/living/silicon/ai/latejoin.dm +++ b/code/modules/mob/living/silicon/ai/latejoin.dm @@ -38,11 +38,11 @@ var/global/list/empty_playable_ai_cores = list() if(SSticker.mode && SSticker.mode.name == "AI malfunction") to_chat(usr, "You cannot use this verb in malfunction. If you need to leave, please adminhelp.") return - + if(carded) to_chat(usr, "No connection to station intelligence storage. You must be in an AI Core to store yourself (adminhelp if you need to leave).") return - + // Guard against misclicks, this isn't the sort of thing we want happening accidentally if(alert("WARNING: This will immediately wipe your core and ghost you, removing your character from the round permanently (similar to cryo and robotic storage). Are you entirely sure you want to do this?", "Wipe Core", "No", "No", "Yes") != "Yes") diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index d37698ef3b8..cfb23373938 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -150,7 +150,7 @@ return all_languages[LANGUAGE_LOCAL_DRONE] /mob/living/silicon/robot/drone/fall_impact() - ..(damage_mod = 0.25) //reduces fall damage by 75% + ..(damage_mod = 0.25) //reduces fall damage by 75% /mob/living/silicon/robot/drone/construction // Look and feel 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 3eb5150bd55..ffbe0f68b63 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -129,7 +129,7 @@ to_chat(D, SPAN_WARNING("You need to remain still while decompiling such a large object.")) is_decompiling = FALSE return - + is_decompiling = FALSE if(!M || !D) return @@ -159,10 +159,10 @@ if(istype(victim, /mob/living/simple_animal/borer) && M.stat != DEAD) to_chat(user, SPAN_WARNING("You can't seem to get \the [victim] into your [name]!")) return - + //We're good to crunch them up var/turf/T = get_turf(src) - T.visible_message(SPAN_DANGER("\The [user] sucks \the [victim] into its decompiler. There's a horrible crunching noise."), + T.visible_message(SPAN_DANGER("\The [user] sucks \the [victim] into its decompiler. There's a horrible crunching noise."), SPAN_NOTICE("It's a bit of a struggle, but you manage to suck \the [victim] into your decompiler. It makes a series of visceral crunching noises.")) new /obj/effect/decal/cleanable/blood/splatter(get_turf(src)) playsound(get_turf(user), 'sound/effects/squelch1.ogg') diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index 3a8fc5946b4..539aa65eb2d 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -265,7 +265,7 @@ uneq_active() /mob/living/silicon/robot/drop_from_inventory(var/obj/item/W, var/atom/target = null) - var/do_feedback = target ? FALSE : TRUE //Do not do feedback messages if dropping to a target, to avoid duplicate "You release X" messages. + var/do_feedback = target ? FALSE : TRUE //Do not do feedback messages if dropping to a target, to avoid duplicate "You release X" messages. if(W) if(!target) target = loc diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index 9ee0cbbf9f1..35024a59384 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -74,7 +74,7 @@ if(!length(components)) return - //Combat shielding absorbs a percentage of damage directly into the cell. + //Combat shielding absorbs a percentage of damage directly into the cell. if(module_active && istype(module_active, /obj/item/borg/combat/shield)) var/obj/item/borg/combat/shield/shield = module_active //Shields absorb a certain percentage of damage based on their power setting. @@ -121,7 +121,7 @@ return var/list/datum/robot_component/parts = get_damageable_components() - //Combat shielding absorbs a percentage of damage directly into the cell. + //Combat shielding absorbs a percentage of damage directly into the cell. if(module_active && istype(module_active,/obj/item/borg/combat/shield)) var/obj/item/borg/combat/shield/shield = module_active //Shields absorb a certain percentage of damage based on their power setting. diff --git a/code/modules/mob/living/simple_animal/bees.dm b/code/modules/mob/living/simple_animal/bees.dm index a4dc271436f..917aaa6d6e1 100644 --- a/code/modules/mob/living/simple_animal/bees.dm +++ b/code/modules/mob/living/simple_animal/bees.dm @@ -100,7 +100,7 @@ M.apply_damage(min(strength*0.85,2)+mut, DAMAGE_BURN, damage_flags = DAMAGE_FLAG_SHARP) // Stinging. The more mutated I am, the harder I sting. var/venom_strength = max(strength*0.2, (round(feral/10,1) * (max(round(strength/20,1), 1)))) + toxic // Bee venom based on how angry I am and how many there are of me! M.apply_damage(venom_strength, DAMAGE_PAIN) //Bee venom causes pain, not organ failure - if(prob(max(80, strength * 10))) //If there's enough of a swarm, it can also cause breathing trouble. Yes, even without being allergic. + if(prob(max(80, strength * 10))) //If there's enough of a swarm, it can also cause breathing trouble. Yes, even without being allergic. M.apply_damage(venom_strength, DAMAGE_OXY) update_icon() to_chat(M, "You have been stung!") @@ -290,4 +290,4 @@ /mob/living/simple_animal/bee/beegun/Initialize() . = ..() mut = rand(0, 1) //We're creating bees out of energy. They have a chance of being mutated... - toxic = rand(0, 1) //...or slightly more toxic \ No newline at end of file + toxic = rand(0, 1) //...or slightly more toxic diff --git a/code/modules/mob/living/simple_animal/borer/emote.dm b/code/modules/mob/living/simple_animal/borer/emote.dm index 8078db41095..db4ea4b93f8 100644 --- a/code/modules/mob/living/simple_animal/borer/emote.dm +++ b/code/modules/mob/living/simple_animal/borer/emote.dm @@ -1,6 +1,6 @@ /mob/living/simple_animal/borer/send_emote(var/message, var/type) - if(host) - if(host.stat == CONSCIOUS) - host.show_message(message, type) - else - ..() + if(host) + if(host.stat == CONSCIOUS) + host.show_message(message, type) + else + ..() diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index b3c00f919b9..cad97e1c3d8 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -246,10 +246,15 @@ audible_emote(pick("[verb] in distress.", "[verb] anxiously.")) else if (prob(5)) - visible_emote(pick("nuzzles [friend].", - "brushes against [friend].", - "rubs against [friend].", - "purrs."),0) + var/emote = pick( + "nuzzles [friend].", + "brushes against [friend].", + "rubs against [friend].", + "purrs.", + ) + + visible_emote(emote, 0) + else if (friend.health <= 50) if (prob(10)) var/verb = pick("meows", "mews", "mrowls") diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm index d2184f7be65..5700373afdd 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm @@ -50,7 +50,7 @@ laser = ARMOR_LASER_PISTOL ) -/mob/living/simple_animal/hostile/retaliate/beast/charbaby/on_attack_mob(var/mob/hit_mob) +/mob/living/simple_animal/hostile/retaliate/beast/charbaby/on_attack_mob(var/mob/hit_mob) . = ..() if(isliving(hit_mob) && prob(25)) var/mob/living/L = hit_mob @@ -68,4 +68,4 @@ icon_living = "lavadog" icon_dead = "lavadog_dead" - speak = list("Karuph!", "Karump!") \ No newline at end of file + speak = list("Karuph!", "Karump!") diff --git a/code/modules/mob/living/simple_animal/hostile/space_fauna.dm b/code/modules/mob/living/simple_animal/hostile/space_fauna.dm index 4eb9e70332a..71b31c46fdc 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_fauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_fauna.dm @@ -105,9 +105,9 @@ health = 50 /mob/living/simple_animal/hostile/carp/russian/FindTarget() - . = ..() - if(.) - custom_emote(VISIBLE_MESSAGE,"spots a filthy capitalist!") + . = ..() + if(.) + custom_emote(VISIBLE_MESSAGE,"spots a filthy capitalist!") /mob/living/simple_animal/hostile/carp/asteroid icon_state = "carp_asteroid" diff --git a/code/modules/mob/living/simple_animal/illusion.dm b/code/modules/mob/living/simple_animal/illusion.dm index 96009a782c9..c025dce664f 100644 --- a/code/modules/mob/living/simple_animal/illusion.dm +++ b/code/modules/mob/living/simple_animal/illusion.dm @@ -25,7 +25,7 @@ /mob/living/simple_animal/illusion/Destroy() copying = null - return ..() + return ..() // Because we can't perfectly duplicate some examine() output, we directly examine the AM it is copying. It's messy but // this is to prevent easy checks from the opposing force. diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 6a74e5d9224..986fc4f1e95 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -100,10 +100,12 @@ parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var - verbs.Add(/mob/living/simple_animal/parrot/proc/steal_from_ground, \ - /mob/living/simple_animal/parrot/proc/steal_from_mob, \ - /mob/living/simple_animal/parrot/verb/drop_held_item_player, \ - /mob/living/simple_animal/parrot/proc/perch_player) + verbs.Add( + /mob/living/simple_animal/parrot/proc/steal_from_ground, \ + /mob/living/simple_animal/parrot/proc/steal_from_mob, \ + /mob/living/simple_animal/parrot/verb/drop_held_item_player, \ + /mob/living/simple_animal/parrot/proc/perch_player + ) /mob/living/simple_animal/parrot/Destroy() QDEL_NULL(ears) @@ -288,9 +290,9 @@ //-----SPEECH /* Parrot speech mimickry! - Phrases that the parrot hears in mob/living/say() get added to speach_buffer. - Every once in a while, the parrot picks one of the lines from the buffer and replaces an element of the 'speech' list. - Then it clears the buffer to make sure they dont magically remember something from hours ago. */ + Phrases that the parrot hears in mob/living/say() get added to speach_buffer. + Every once in a while, the parrot picks one of the lines from the buffer and replaces an element of the 'speech' list. + Then it clears the buffer to make sure they dont magically remember something from hours ago. */ if(speech_buffer.len && prob(10)) if(speak.len) speak.Remove(pick(speak)) diff --git a/code/modules/mob/living/whisper.dm b/code/modules/mob/living/whisper.dm index 043702cd488..1baf666e8c3 100644 --- a/code/modules/mob/living/whisper.dm +++ b/code/modules/mob/living/whisper.dm @@ -74,7 +74,7 @@ else if(get_dist(src, M) <= watching_range) if(M.stat == DEAD && M.client) observers += M - else + else watching += M if(length(observers)) //For ghosts who do NOT have ghost ears. They will see the whole message if nearby, no *s or not_heard messages. diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index c362362da64..c04e1b9098c 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -86,12 +86,12 @@ return FALSE /* - ***Deprecated*** - let this be handled at the hear_say or hear_radio proc - This is left in for robot speaking when humans gain binary channel access until I get around to rewriting - robot_talk() proc. - There is no language handling build into it however there is at the /mob level so we accept the call - for it but just ignore it. + ***Deprecated*** + let this be handled at the hear_say or hear_radio proc + This is left in for robot speaking when humans gain binary channel access until I get around to rewriting + robot_talk() proc. + There is no language handling build into it however there is at the /mob level so we accept the call + for it but just ignore it. */ /mob/proc/say_quote(var/message, var/datum/language/speaking = null, var/singing = FALSE, var/whisper = FALSE) diff --git a/code/modules/modular_computers/NTNet/NTNRC/message.dm b/code/modules/modular_computers/NTNet/NTNRC/message.dm index 62f06d0b950..97efbafe82c 100644 --- a/code/modules/modular_computers/NTNet/NTNRC/message.dm +++ b/code/modules/modular_computers/NTNet/NTNRC/message.dm @@ -1,96 +1,96 @@ // Container for all essesal state for NTRC message while it's proccessed /datum/ntnet_message - var/mob/user - var/datum/computer_file/program/chat_client/client - var/datum/ntnet_user/nuser - var/play_sound = FALSE + var/mob/user + var/datum/computer_file/program/chat_client/client + var/datum/ntnet_user/nuser + var/play_sound = FALSE /datum/ntnet_message/New(var/datum/computer_file/program/chat_client/Pr = null, var/mob/user = null) - if(user) - src.user = user - if(Pr) - client = Pr - nuser = Pr.my_user + if(user) + src.user = user + if(Pr) + client = Pr + nuser = Pr.my_user // Should be sanitized /datum/ntnet_message/proc/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl) - return FALSE + return FALSE /datum/ntnet_message/proc/format_admin_log(var/datum/ntnet_conversation/Conv) - return FALSE + return FALSE // Should be sanitized /datum/ntnet_message/proc/format_ntnet_log(var/datum/ntnet_conversation/Conv) - return FALSE + return FALSE /datum/ntnet_message/proc/format_chat_log(var/datum/ntnet_conversation/Conv) - return FALSE + return FALSE /datum/ntnet_message/message - play_sound = TRUE - var/message = "" + play_sound = TRUE + var/message = "" /datum/ntnet_message/message/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl) - . = "([sanitize(Conv.get_title(Cl))]) [nuser.username]: [sanitize(message)] (Reply)" + . = "([sanitize(Conv.get_title(Cl))]) [nuser.username]: [sanitize(message)] (Reply)" /datum/ntnet_message/message/format_chat_log(var/datum/ntnet_conversation/Conv) - . = "[worldtime2text()] [nuser.username]: [message]" + . = "[worldtime2text()] [nuser.username]: [message]" /datum/ntnet_message/message/format_admin_log(var/datum/ntnet_conversation/Conv) - . = message + . = message /datum/ntnet_message/message/format_ntnet_log(var/datum/ntnet_conversation/Conv) - . = "[sanitize(Conv.get_title())] [nuser.username]: [sanitize(message)]" + . = "[sanitize(Conv.get_title())] [nuser.username]: [sanitize(message)]" /datum/ntnet_message/join/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl) - . = FONT_SMALL("([sanitize(Conv.get_title(Cl))]) [nuser.username] has entered the chat.") + . = FONT_SMALL("([sanitize(Conv.get_title(Cl))]) [nuser.username] has entered the chat.") /datum/ntnet_message/join/format_chat_log(var/datum/ntnet_conversation/Conv) - . = "[worldtime2text()] -!- [nuser.username] has entered the chat." + . = "[worldtime2text()] -!- [nuser.username] has entered the chat." /datum/ntnet_message/leave/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl) - . = FONT_SMALL("([sanitize(Conv.get_title(Cl))]) [nuser.username] has left the chat.") + . = FONT_SMALL("([sanitize(Conv.get_title(Cl))]) [nuser.username] has left the chat.") /datum/ntnet_message/leave/format_chat_log(var/datum/ntnet_conversation/Conv) - . = "[worldtime2text()] -!- [nuser.username] has left the chat." + . = "[worldtime2text()] -!- [nuser.username] has left the chat." /datum/ntnet_message/new_op/format_chat_log(var/datum/ntnet_conversation/Conv) - . = "[worldtime2text()] -!- [nuser.username] has become operator." + . = "[worldtime2text()] -!- [nuser.username] has become operator." /datum/ntnet_message/new_title - var/title = "" + var/title = "" /datum/ntnet_message/new_title/format_chat_log(var/datum/ntnet_conversation/Conv) - . = "[worldtime2text()] -!- [nuser.username] has changed channel title from [Conv.get_title()] to [title]" + . = "[worldtime2text()] -!- [nuser.username] has changed channel title from [Conv.get_title()] to [title]" /datum/ntnet_message/new_title/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl) - . = FONT_SMALL("([sanitize(Conv.get_title(Cl))]) [nuser.username] has changed the channel title to [sanitize(title)].") + . = FONT_SMALL("([sanitize(Conv.get_title(Cl))]) [nuser.username] has changed the channel title to [sanitize(title)].") /datum/ntnet_message/kick - var/datum/ntnet_user/target + var/datum/ntnet_user/target /datum/ntnet_message/kick/format_chat_log(var/datum/ntnet_conversation/Conv) - . = "[worldtime2text()] -!- [nuser.username] has kicked [target.username] from conversation." + . = "[worldtime2text()] -!- [nuser.username] has kicked [target.username] from conversation." /datum/ntnet_message/kick/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl) - . = FONT_SMALL("([sanitize(Conv.get_title(Cl))]) [nuser.username] has kicked [target.username] from conversation.") + . = FONT_SMALL("([sanitize(Conv.get_title(Cl))]) [nuser.username] has kicked [target.username] from conversation.") /datum/ntnet_message/direct/format_chat_log(var/datum/ntnet_conversation/Conv) - . = "[worldtime2text()] -!- [nuser.username] has opened direct conversation." + . = "[worldtime2text()] -!- [nuser.username] has opened direct conversation." /datum/ntnet_message/direct/format_chat_notification(var/datum/ntnet_conversation/Conv, var/datum/computer_file/program/chat_client/Cl) - . = FONT_SMALL("([sanitize(Conv.get_title(Cl))]) [nuser.username] has opened direct conversation with you.") + . = FONT_SMALL("([sanitize(Conv.get_title(Cl))]) [nuser.username] has opened direct conversation with you.") diff --git a/code/modules/modular_computers/NTNet/NTNRC/ntnrc.dm b/code/modules/modular_computers/NTNet/NTNRC/ntnrc.dm index 3163339a631..ec2258273be 100644 --- a/code/modules/modular_computers/NTNet/NTNRC/ntnrc.dm +++ b/code/modules/modular_computers/NTNet/NTNRC/ntnrc.dm @@ -15,7 +15,7 @@ /datum/ntnet/proc/begin_direct(var/datum/computer_file/program/chat_client/Cl, var/datum/ntnet_user/target) if(!istype(Cl) || !istype(Cl.my_user) || !istype(target) || istype(Cl.my_user.dm_channels[target], /datum/ntnet_conversation)) return - + var/datum/ntnet_conversation/Conv = new() Conv.direct = TRUE Conv.users.Add(Cl.my_user) @@ -23,6 +23,6 @@ target.dm_channels[Cl.my_user] = Conv Cl.my_user.dm_channels[target] = Conv - + var/datum/ntnet_message/direct/msg = new(Cl) Conv.process_message(msg) diff --git a/code/modules/modular_computers/NTNet/NTNRC/user.dm b/code/modules/modular_computers/NTNet/NTNRC/user.dm index 56e06762766..d6215baf624 100644 --- a/code/modules/modular_computers/NTNet/NTNRC/user.dm +++ b/code/modules/modular_computers/NTNet/NTNRC/user.dm @@ -1,16 +1,16 @@ /datum/ntnet_user - var/username - var/list/channels = list() - var/list/dm_channels = list() - var/list/clients = list() + var/username + var/list/channels = list() + var/list/dm_channels = list() + var/list/clients = list() /datum/ntnet_user/New() - . = ..() - ntnet_global.chat_users.Add(src) + . = ..() + ntnet_global.chat_users.Add(src) /datum/ntnet_user/Destroy(force) - . = ..() - ntnet_global.chat_users.Remove(src) + . = ..() + ntnet_global.chat_users.Remove(src) /datum/ntnet_user/proc/generateUsernameIdCard(var/obj/item/card/id/card) if(!card) diff --git a/code/modules/modular_computers/NTNet/NTNet_relay.dm b/code/modules/modular_computers/NTNet/NTNet_relay.dm index 9f2004c73e6..08981e114ba 100644 --- a/code/modules/modular_computers/NTNet/NTNet_relay.dm +++ b/code/modules/modular_computers/NTNet/NTNet_relay.dm @@ -70,10 +70,10 @@ ..() /obj/machinery/ntnet_relay/ui_interact(mob/user, datum/tgui/ui) - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "NTNetRelay") - ui.open() + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "NTNetRelay") + ui.open() /obj/machinery/ntnet_relay/ui_data(mob/user) var/list/data = list() diff --git a/code/modules/modular_computers/computers/modular_computer/core.dm b/code/modules/modular_computers/computers/modular_computer/core.dm index 63cefe651ea..b61f41848fd 100644 --- a/code/modules/modular_computers/computers/modular_computer/core.dm +++ b/code/modules/modular_computers/computers/modular_computer/core.dm @@ -504,23 +504,23 @@ // A late init operation called in SSshuttle for ship computers and holopads, used to attach the thing to the right ship. /obj/item/modular_computer/proc/attempt_hook_up(var/obj/effect/overmap/visitable/sector) - SHOULD_CALL_PARENT(TRUE) - if(!istype(sector)) - return FALSE - if(sector.check_ownership(src)) - linked = sector - return TRUE - return FALSE + SHOULD_CALL_PARENT(TRUE) + if(!istype(sector)) + return FALSE + if(sector.check_ownership(src)) + linked = sector + return TRUE + return FALSE /obj/item/modular_computer/proc/sync_linked() - var/obj/effect/overmap/visitable/sector = map_sectors["[z]"] - if(!sector) - return - return attempt_hook_up_recursive(sector) + var/obj/effect/overmap/visitable/sector = map_sectors["[z]"] + if(!sector) + return + return attempt_hook_up_recursive(sector) /obj/item/modular_computer/proc/attempt_hook_up_recursive(var/obj/effect/overmap/visitable/sector) - if(attempt_hook_up(sector)) - return sector - for(var/obj/effect/overmap/visitable/candidate in sector) - if((. = .(candidate))) - return + if(attempt_hook_up(sector)) + return sector + for(var/obj/effect/overmap/visitable/candidate in sector) + if((. = .(candidate))) + return diff --git a/code/modules/modular_computers/file_system/program_events.dm b/code/modules/modular_computers/file_system/program_events.dm index a0d469ae79b..9b03b8d6369 100644 --- a/code/modules/modular_computers/file_system/program_events.dm +++ b/code/modules/modular_computers/file_system/program_events.dm @@ -36,7 +36,7 @@ /datum/computer_file/program/proc/service_enable() return service_activate() -// Is called when program service is being deactivated without +// Is called when program service is being deactivated without /datum/computer_file/program/proc/service_disable() return service_deactivate() @@ -68,4 +68,4 @@ if(background) computer.output_error(FONT_SMALL(SPAN_WARNING("Process [filename].[filetype] (PID [rand(100,999)]) terminated - Network Error"))) else - computer.output_error(FONT_SMALL(SPAN_WARNING("NETWORK ERROR - NTNet connection lost. Please retry. If problem persists contact your system administrator."))) \ No newline at end of file + computer.output_error(FONT_SMALL(SPAN_WARNING("NETWORK ERROR - NTNet connection lost. Please retry. If problem persists contact your system administrator."))) diff --git a/code/modules/modular_computers/file_system/programs/command/away_manifest.dm b/code/modules/modular_computers/file_system/programs/command/away_manifest.dm index 47db7bc3e53..f827843b0bf 100644 --- a/code/modules/modular_computers/file_system/programs/command/away_manifest.dm +++ b/code/modules/modular_computers/file_system/programs/command/away_manifest.dm @@ -14,7 +14,7 @@ /datum/computer_file/program/away_manifest/ui_data(mob/user) var/list/data = list() - + if(active_record) data["active_record"] = list( "name" = active_record.name, @@ -32,29 +32,29 @@ data["shuttle_manifest"] = allshuttles data["active_record"] = null return data - + /datum/computer_file/program/away_manifest/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return - + switch(action) if("am_menu") . = TRUE active_record = null SStgui.update_uis(computer) - + if("editentry") for(var/datum/record/shuttle_manifest/m in SSrecords.shuttle_manifests) if(m.id == text2num(params["editentry"])) active_record = m break - + if("back") . = TRUE active_record = null SStgui.update_uis(computer) - + //Check ID for command/mining/research access to edit if(!istype(usr)) return @@ -62,7 +62,7 @@ if(!istype(I) || !I.registered_name || issilicon(usr) || (!(access_heads in I.access) && !(access_research in I.access) && !(access_mining in I.access))) to_chat(usr, SPAN_WARNING("Authentication error: Unable to locate ID with appropriate access to allow this operation.")) return - + switch(action) if("addentry") . = TRUE @@ -71,19 +71,19 @@ m.name = "Unknown" m.shuttle = "Unknown" active_record = m - + if("saveentry") . = TRUE SSrecords.update_record(active_record) active_record = null SStgui.update_uis(computer) - + if("deleteentry") . = TRUE SSrecords.remove_record(active_record) active_record = null SStgui.update_uis(computer) - + if("editentryname") . = TRUE var/names = list() @@ -94,7 +94,7 @@ if(!newname) return active_record.name = newname - + if("editentrynamecustom") . = TRUE var/newname = sanitize(input("Please enter name.") as null|text) @@ -109,4 +109,3 @@ if(!newshuttle) return active_record.shuttle = newshuttle - \ No newline at end of file diff --git a/code/modules/modular_computers/file_system/programs/generic/scanner.dm b/code/modules/modular_computers/file_system/programs/generic/scanner.dm index a15d14708fa..ee624813b4b 100644 --- a/code/modules/modular_computers/file_system/programs/generic/scanner.dm +++ b/code/modules/modular_computers/file_system/programs/generic/scanner.dm @@ -1,46 +1,46 @@ /datum/computer_file/program/scanner - size = 2 - program_type = PROGRAM_SERVICE - available_on_ntnet = FALSE - usage_flags = PROGRAM_ALL_HANDHELD - var/mode = null + size = 2 + program_type = PROGRAM_SERVICE + available_on_ntnet = FALSE + usage_flags = PROGRAM_ALL_HANDHELD + var/mode = null /datum/computer_file/program/scanner/service_activate() - . = ..() - if(!computer.scan_mode) - computer.scan_mode = mode - return TRUE - else - computer.visible_message(SPAN_WARNING("Cannot activate [filedesc]: Another scanner is already active!")) - return FALSE + . = ..() + if(!computer.scan_mode) + computer.scan_mode = mode + return TRUE + else + computer.visible_message(SPAN_WARNING("Cannot activate [filedesc]: Another scanner is already active!")) + return FALSE /datum/computer_file/program/scanner/service_deactivate() - . = ..() - computer.scan_mode = null + . = ..() + computer.scan_mode = null /datum/computer_file/program/scanner/medical - filename = "med_scanner" - filedesc = "Medical Analyzer" - extended_desc = "A scanning suite capable of detecting major medical problems in individuals." - available_on_ntnet = TRUE - required_access_run = access_medical - required_access_download = access_medical - mode = SCANNER_MEDICAL + filename = "med_scanner" + filedesc = "Medical Analyzer" + extended_desc = "A scanning suite capable of detecting major medical problems in individuals." + available_on_ntnet = TRUE + required_access_run = access_medical + required_access_download = access_medical + mode = SCANNER_MEDICAL /datum/computer_file/program/scanner/science - filename = "sci_scanner" - filedesc = "Reagent Analyzer" - extended_desc = "A scanning suite capable of detecting active chemical reagents." - available_on_ntnet = TRUE - required_access_run = access_research - required_access_download = access_research - mode = SCANNER_REAGENT + filename = "sci_scanner" + filedesc = "Reagent Analyzer" + extended_desc = "A scanning suite capable of detecting active chemical reagents." + available_on_ntnet = TRUE + required_access_run = access_research + required_access_download = access_research + mode = SCANNER_REAGENT /datum/computer_file/program/scanner/gas - filename = "gas_scanner" - filedesc = "Gas Analyzer" - extended_desc = "A scanning suite capable of detecting and parsing gaseous conditions within a closed atmospheric system." - available_on_ntnet = TRUE - required_access_run = list(access_atmospherics, access_research) - required_access_download = list(access_atmospherics, access_research) - mode = SCANNER_GAS + filename = "gas_scanner" + filedesc = "Gas Analyzer" + extended_desc = "A scanning suite capable of detecting and parsing gaseous conditions within a closed atmospheric system." + available_on_ntnet = TRUE + required_access_run = list(access_atmospherics, access_research) + required_access_download = list(access_atmospherics, access_research) + mode = SCANNER_GAS diff --git a/code/modules/modular_computers/file_system/programs/pai/flashlight.dm b/code/modules/modular_computers/file_system/programs/pai/flashlight.dm index 66becba88ba..1bff930142a 100644 --- a/code/modules/modular_computers/file_system/programs/pai/flashlight.dm +++ b/code/modules/modular_computers/file_system/programs/pai/flashlight.dm @@ -12,7 +12,7 @@ if(!istype(computer, /obj/item/modular_computer/silicon)) return FALSE - + var/obj/item/modular_computer/silicon/true_computer = computer if(!istype(true_computer.computer_host, /mob/living/silicon/pai)) return FALSE @@ -32,4 +32,4 @@ return var/mob/living/silicon/pai/host = true_computer.computer_host - host.toggle_flashlight() \ No newline at end of file + host.toggle_flashlight() diff --git a/code/modules/modular_computers/hardware/misc.dm b/code/modules/modular_computers/hardware/misc.dm index 016f7966985..a3a76c14130 100644 --- a/code/modules/modular_computers/hardware/misc.dm +++ b/code/modules/modular_computers/hardware/misc.dm @@ -1,26 +1,26 @@ /obj/item/computer_hardware/flashlight - name = "flashlight" - desc = "A small pen-sized flashlight used to illuminate a small area." - icon = 'icons/obj/lighting.dmi' - icon_state = "headlights" - power_usage = 50 - enabled = FALSE - critical = FALSE - var/range = 2 - var/power = 1 - var/flashlight_color = LIGHT_COLOR_HALOGEN + name = "flashlight" + desc = "A small pen-sized flashlight used to illuminate a small area." + icon = 'icons/obj/lighting.dmi' + icon_state = "headlights" + power_usage = 50 + enabled = FALSE + critical = FALSE + var/range = 2 + var/power = 1 + var/flashlight_color = LIGHT_COLOR_HALOGEN /obj/item/computer_hardware/flashlight/enable() - . = ..() - if(parent_computer) - parent_computer.set_light(range, power, flashlight_color) + . = ..() + if(parent_computer) + parent_computer.set_light(range, power, flashlight_color) /obj/item/computer_hardware/flashlight/disable() - . = ..() - if(parent_computer) - parent_computer.set_light(initial(parent_computer.light_range), initial(parent_computer.light_power), flashlight_color) + . = ..() + if(parent_computer) + parent_computer.set_light(initial(parent_computer.light_range), initial(parent_computer.light_power), flashlight_color) /obj/item/computer_hardware/flashlight/proc/tweak_brightness(var/new_power) - . = power = Clamp(0, new_power, 1) - if(parent_computer && enabled) - parent_computer.set_light(range, power, flashlight_color) + . = power = Clamp(0, new_power, 1) + if(parent_computer && enabled) + parent_computer.set_light(range, power, flashlight_color) diff --git a/code/modules/multiz/basic.dm b/code/modules/multiz/basic.dm index 5b36e81de55..cd82b7c1245 100644 --- a/code/modules/multiz/basic.dm +++ b/code/modules/multiz/basic.dm @@ -52,7 +52,7 @@ var/list/list/connected_z_cache = list() /proc/AreConnectedZLevels(var/zA, var/zB) if (zA == zB) return TRUE - + if(zA == 0 || zB == 0) return FALSE diff --git a/code/modules/nano/nanoexternal.dm b/code/modules/nano/nanoexternal.dm index 2cbab52cf09..678c3811a6f 100644 --- a/code/modules/nano/nanoexternal.dm +++ b/code/modules/nano/nanoexternal.dm @@ -1,12 +1,10 @@ - // This file contains all Nano procs/definitions for external classes/objects +// This file contains all Nano procs/definitions for external classes/objects - /** - * Called when a Nano UI window is closed - * This is how Nano handles closed windows - * It must be a verb so that it can be called using winset - * - * @return nothing - */ +/** + * Called when a Nano UI window is closed + * This is how Nano handles closed windows + * It must be a verb so that it can be called using winset + */ /client/verb/nanoclose(var/uiref as text) set hidden = 1 // hide this verb from the user's panel set name = "nanoclose" @@ -25,18 +23,16 @@ if(src && src.mob) src.mob.unset_machine() - /** - * The ui_interact proc is used to open and update Nano UIs - * If ui_interact is not used then the UI will not update correctly - * ui_interact is currently defined for /atom/movable - * - * @param user /mob The mob who is interacting with this ui - * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") - * @param ui /datum/nanoui This parameter is passed by the nanoui process() proc when updating an open ui - * @param force_open boolean Force the UI to (re)open, even if it's already open - * - * @return nothing - */ +/** + * The ui_interact proc is used to open and update Nano UIs + * If ui_interact is not used then the UI will not update correctly + * ui_interact is currently defined for /atom/movable + * + * @param user /mob The mob who is interacting with this ui + * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") + * @param ui /datum/nanoui This parameter is passed by the nanoui process() proc when updating an open ui + * @param force_open boolean Force the UI to (re)open, even if it's already open + */ /datum/proc/nanoui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/nanoui/master_ui = null, var/datum/ui_state/state = default_state) return diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 379d933f707..233361a614f 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -57,20 +57,20 @@ nanoui is used to open and update nano browser uis var/list/datum/nanoui/children = list() var/datum/ui_state/state = null - /** - * Create a new nanoui instance. - * - * @param nuser /mob The mob who has opened/owns this ui - * @param nsrc_object /obj|/mob The obj or mob which this ui belongs to - * @param nui_key string A string key to use for this ui. Allows for multiple unique uis on one src_oject - * @param ntemplate string The filename of the template file from /nano/templates (e.g. "my_template.tmpl") - * @param ntitle string The title of this ui - * @param nwidth int the width of the ui window - * @param nheight int the height of the ui window - * @param nref /atom A custom ref to use if "on_close_logic" is set to 1 - * - * @return /nanoui new nanoui object - */ +/** + * Create a new nanoui instance. + * + * @param nuser /mob The mob who has opened/owns this ui + * @param nsrc_object /obj|/mob The obj or mob which this ui belongs to + * @param nui_key string A string key to use for this ui. Allows for multiple unique uis on one src_oject + * @param ntemplate string The filename of the template file from /nano/templates (e.g. "my_template.tmpl") + * @param ntitle string The title of this ui + * @param nwidth int the width of the ui window + * @param nheight int the height of the ui window + * @param nref /atom A custom ref to use if "on_close_logic" is set to 1 + * + * @return /nanoui new nanoui object + */ /datum/nanoui/New(nuser, nsrc_object, nui_key, ntemplate_filename, ntitle = 0, nwidth = 0, nheight = 0, var/atom/nref = null, var/datum/nanoui/master_ui = null, var/datum/ui_state/state = default_state) user = nuser src_object = nsrc_object @@ -101,11 +101,11 @@ nanoui is used to open and update nano browser uis - /** - * Use this proc to add assets which are common to (and required by) all nano uis - * - * @return nothing - */ +/** + * Use this proc to add assets which are common to (and required by) all nano uis + * + * @return nothing + */ /datum/nanoui/proc/add_common_assets() add_script("https://cdnjs.cloudflare.com/ajax/libs/jquery/1.10.2/jquery.min.js") add_script("https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.0/jquery-ui.min.js") @@ -120,14 +120,14 @@ nanoui is used to open and update nano browser uis add_stylesheet("shared.css") // this CSS sheet is common to all UIs add_stylesheet("icons.css") // this CSS sheet is common to all UIs - /** - * Set the current status (also known as visibility) of this ui. - * - * @param state int The status to set, see the defines at the top of this file - * @param push_update int (bool) Push an update to the ui to update it's status (an update is always sent if the status has changed to red (0)) - * - * @return nothing - */ +/** + * Set the current status (also known as visibility) of this ui. + * + * @param state int The status to set, see the defines at the top of this file + * @param push_update int (bool) Push an update to the ui to update it's status (an update is always sent if the status has changed to red (0)) + * + * @return nothing + */ /datum/nanoui/proc/set_status(state, push_update) if (state != status) // Only update if it is different if (status == STATUS_DISABLED) @@ -139,13 +139,13 @@ nanoui is used to open and update nano browser uis if (push_update || status == 0) push_data(null, 1) // Update the UI, force the update in case the status is 0, data is null so that previous data is used - /** - * Update the status (visibility) of this ui based on the user's status - * - * @param push_update int (bool) Push an update to the ui to update it's status. This is set to 0/false if an update is going to be pushed anyway (to avoid unnessary updates) - * - * @return nothing - */ +/** + * Update the status (visibility) of this ui based on the user's status + * + * @param push_update int (bool) Push an update to the ui to update it's status. This is set to 0/false if an update is going to be pushed anyway (to avoid unnessary updates) + * + * @return nothing + */ /datum/nanoui/proc/update_status(var/push_update = 0) var/obj/host = src_object.ui_host() var/new_status = host.CanUseTopic(user, state) @@ -156,31 +156,31 @@ nanoui is used to open and update nano browser uis if(new_status == STATUS_CLOSE) close() - /** - * Set the ui to auto update (every master_controller tick) - * - * @param state int (bool) Set auto update to 1 or 0 (true/false) - * - * @return nothing - */ +/** + * Set the ui to auto update (every master_controller tick) + * + * @param state int (bool) Set auto update to 1 or 0 (true/false) + * + * @return nothing + */ /datum/nanoui/proc/set_auto_update(nstate = 1) is_auto_updating = nstate - /** - * Set the initial data for the ui. This is vital as the data structure set here cannot be changed when pushing new updates. - * - * @param data /list The list of data for this ui - * - * @return nothing - */ +/** + * Set the initial data for the ui. This is vital as the data structure set here cannot be changed when pushing new updates. + * + * @param data /list The list of data for this ui + * + * @return nothing + */ /datum/nanoui/proc/set_initial_data(list/data) initial_data = data - /** - * Get config data to sent to the ui. - * - * @return /list config data - */ +/** + * Get config data to sent to the ui. + * + * @return /list config data + */ /datum/nanoui/proc/get_config_data() var/name = "[src_object]" name = sanitize(name) @@ -199,13 +199,13 @@ nanoui is used to open and update nano browser uis ) return config_data - /** - * Get data to sent to the ui. - * - * @param data /list The list of general data for this ui (can be null to use previous data sent) - * - * @return /list data to send to the ui - */ +/** + * Get data to sent to the ui. + * + * @param data /list The list of general data for this ui (can be null to use previous data sent) + * + * @return /list data to send to the ui + */ /datum/nanoui/proc/get_send_data(var/list/data) var/list/config_data = get_config_data() @@ -216,130 +216,130 @@ nanoui is used to open and update nano browser uis return send_data - /** - * Set the browser window options for this ui - * - * @param nwindow_options string The new window options - * - * @return nothing - */ +/** + * Set the browser window options for this ui + * + * @param nwindow_options string The new window options + * + * @return nothing + */ /datum/nanoui/proc/set_window_options(nwindow_options) window_options = nwindow_options - /** - * Add a CSS stylesheet to this UI - * These must be added before the UI has been opened, adding after that will have no effect - * - * @param file string The name of the CSS file from /nano/css (e.g. "my_style.css") - * - * @return nothing - */ +/** + * Add a CSS stylesheet to this UI + * These must be added before the UI has been opened, adding after that will have no effect + * + * @param file string The name of the CSS file from /nano/css (e.g. "my_style.css") + * + * @return nothing + */ /datum/nanoui/proc/add_stylesheet(file) stylesheets.Add(file) - /** - * Add a JavsScript script to this UI - * These must be added before the UI has been opened, adding after that will have no effect - * - * @param file string The name of the JavaScript file from /nano/js (e.g. "my_script.js") - * - * @return nothing - */ +/** + * Add a JavsScript script to this UI + * These must be added before the UI has been opened, adding after that will have no effect + * + * @param file string The name of the JavaScript file from /nano/js (e.g. "my_script.js") + * + * @return nothing + */ /datum/nanoui/proc/add_script(file) scripts.Add(file) - /** - * Add a template for this UI - * Templates are combined with the data sent to the UI to create the rendered view - * These must be added before the UI has been opened, adding after that will have no effect - * - * @param key string The key which is used to reference this template in the frontend - * @param filename string The name of the template file from /nano/templates (e.g. "my_template.tmpl") - * - * @return nothing - */ +/** + * Add a template for this UI + * Templates are combined with the data sent to the UI to create the rendered view + * These must be added before the UI has been opened, adding after that will have no effect + * + * @param key string The key which is used to reference this template in the frontend + * @param filename string The name of the template file from /nano/templates (e.g. "my_template.tmpl") + * + * @return nothing + */ /datum/nanoui/proc/add_template(key, filename) templates[key] = filename - /** - * Set the layout key for use in the frontend Javascript - * The layout key is the basic layout key for the page - * Two files are loaded on the client based on the layout key varable: - * -> a template in /nano/templates with the filename "layout_.tmpl - * -> a CSS stylesheet in /nano/css with the filename "layout_.css - * - * @param nlayout string The layout key to use - * - * @return nothing - */ +/** + * Set the layout key for use in the frontend Javascript + * The layout key is the basic layout key for the page + * Two files are loaded on the client based on the layout key varable: + * -> a template in /nano/templates with the filename "layout_.tmpl + * -> a CSS stylesheet in /nano/css with the filename "layout_.css + * + * @param nlayout string The layout key to use + * + * @return nothing + */ /datum/nanoui/proc/set_layout_key(nlayout_key) layout_key = lowertext(nlayout_key) - /** - * Set the ui to update the layout (re-render it) on each update, turning this on will break the map ui (if it's being used) - * - * @param state int (bool) Set update to 1 or 0 (true/false) (default 0) - * - * @return nothing - */ +/** + * Set the ui to update the layout (re-render it) on each update, turning this on will break the map ui (if it's being used) + * + * @param state int (bool) Set update to 1 or 0 (true/false) (default 0) + * + * @return nothing + */ /datum/nanoui/proc/set_auto_update_layout(nstate) auto_update_layout = nstate - /** - * Set the ui to update the main content (re-render it) on each update - * - * @param state int (bool) Set update to 1 or 0 (true/false) (default 1) - * - * @return nothing - */ +/** + * Set the ui to update the main content (re-render it) on each update + * + * @param state int (bool) Set update to 1 or 0 (true/false) (default 1) + * + * @return nothing + */ /datum/nanoui/proc/set_auto_update_content(nstate) auto_update_content = nstate - /** - * Set the state key for use in the frontend Javascript - * - * @param nstate_key string The key of the state to use - * - * @return nothing - */ +/** + * Set the state key for use in the frontend Javascript + * + * @param nstate_key string The key of the state to use + * + * @return nothing + */ /datum/nanoui/proc/set_state_key(nstate_key) state_key = nstate_key - /** - * Toggle showing the map ui - * - * @param nstate_key boolean 1 to show map, 0 to hide (default is 0) - * - * @return nothing - */ +/** + * Toggle showing the map ui + * + * @param nstate_key boolean 1 to show map, 0 to hide (default is 0) + * + * @return nothing + */ /datum/nanoui/proc/set_show_map(nstate) show_map = nstate - /** - * Toggle showing the map ui - * - * @param nstate_key boolean 1 to show map, 0 to hide (default is 0) - * - * @return nothing - */ +/** + * Toggle showing the map ui + * + * @param nstate_key boolean 1 to show map, 0 to hide (default is 0) + * + * @return nothing + */ /datum/nanoui/proc/set_map_z_level(nz) map_z_level = nz - /** - * Set whether or not to use the "old" on close logic (mainly unset_machine()) - * - * @param state int (bool) Set on_close_logic to 1 or 0 (true/false) - * - * @return nothing - */ +/** + * Set whether or not to use the "old" on close logic (mainly unset_machine()) + * + * @param state int (bool) Set on_close_logic to 1 or 0 (true/false) + * + * @return nothing + */ /datum/nanoui/proc/use_on_close_logic(state) on_close_logic = state - /** - * Return the HTML for this UI - * - * @return string HTML for the UI - */ +/** + * Return the HTML for this UI + * + * @return string HTML for the UI + */ /datum/nanoui/proc/get_html() // before the UI opens, add the layout files based on the layout key @@ -396,11 +396,11 @@ nanoui is used to open and update nano browser uis "} - /** - * Open this UI - * - * @return nothing - */ +/** + * Open this UI + * + * @return nothing + */ /datum/nanoui/proc/open() if(!user.client) return @@ -423,11 +423,11 @@ nanoui is used to open and update nano browser uis //onclose(user, window_id) SSnanoui.ui_opened(src) - /** - * Reinitialise this UI, potentially with a different template and/or initial data - * - * @return nothing - */ +/** + * Reinitialise this UI, potentially with a different template and/or initial data + * + * @return nothing + */ /datum/nanoui/proc/reinitialise(template, new_initial_data) if(template) add_template("main", template) @@ -435,11 +435,11 @@ nanoui is used to open and update nano browser uis set_initial_data(new_initial_data) open() - /** - * Close this UI - * - * @return nothing - */ +/** + * Close this UI + * + * @return nothing + */ /datum/nanoui/proc/close() is_auto_updating = 0 SSnanoui.ui_closed(src) @@ -453,12 +453,12 @@ nanoui is used to open and update nano browser uis if(istype(user)) user.unset_machine() - /** - * Set the UI window to call the nanoclose verb when the window is closed - * This allows Nano to handle closed windows - * - * @return nothing - */ +/** + * Set the UI window to call the nanoclose verb when the window is closed + * This allows Nano to handle closed windows + * + * @return nothing + */ /datum/nanoui/proc/on_close_winset() if(!user.client) return @@ -466,11 +466,11 @@ nanoui is used to open and update nano browser uis winset(user, window_id, "on-close=\"nanoclose [params]\"") - /** - * Push data to an already open UI window - * - * @return nothing - */ +/** + * Push data to an already open UI window + * + * @return nothing + */ /datum/nanoui/proc/push_data(data, force_push = 0) update_status(0) if (status == STATUS_DISABLED && !force_push) @@ -481,13 +481,13 @@ nanoui is used to open and update nano browser uis //to_chat(user, list2json(data) // used for debugging) send_output(user, list2params(list(json_encode(send_data))),"[window_id].browser:receiveUpdateData") - /** - * This Topic() proc is called whenever a user clicks on a link within a Nano UI - * If the UI status is currently STATUS_INTERACTIVE then call the src_object Topic() - * If the src_object Topic() returns 1 (true) then update all UIs attached to src_object - * - * @return nothing - */ +/** + * This Topic() proc is called whenever a user clicks on a link within a Nano UI + * If the UI status is currently STATUS_INTERACTIVE then call the src_object Topic() + * If the src_object Topic() returns 1 (true) then update all UIs attached to src_object + * + * @return nothing + */ /datum/nanoui/Topic(href, href_list) update_status(0) // update the status if (status != STATUS_INTERACTIVE || user != usr) // If UI is not interactive or usr calling Topic is not the UI user @@ -510,14 +510,14 @@ nanoui is used to open and update nano browser uis if ((src_object && src_object.Topic(href, href_list, state)) || map_update) SSnanoui.update_uis(src_object) // update all UIs attached to src_object - /** - * Process this UI, updating the entire UI or just the status (aka visibility) - * This process proc is called by the master_controller - * - * @param update string For this UI to update - * - * @return nothing - */ +/** + * Process this UI, updating the entire UI or just the status (aka visibility) + * This process proc is called by the master_controller + * + * @param update string For this UI to update + * + * @return nothing + */ /datum/nanoui/process(update = 0) if (!src_object || !user) close() @@ -528,10 +528,10 @@ nanoui is used to open and update nano browser uis else update_status(1) // Not updating UI, so lets check here if status has changed - /** - * Update the UI - * - * @return nothing - */ +/** + * Update the UI + * + * @return nothing + */ /datum/nanoui/proc/update(var/force_open = 0) src_object.ui_interact(user, ui_key, src, force_open, master_ui, state) diff --git a/code/modules/ntsl2/ntsl2_program.dm b/code/modules/ntsl2/ntsl2_program.dm index 8782ff20c6f..644923d9631 100644 --- a/code/modules/ntsl2/ntsl2_program.dm +++ b/code/modules/ntsl2/ntsl2_program.dm @@ -1,5 +1,5 @@ /* -Datum representing program state on deamon and exposing apropriate procs to DM. +Datum representing program state on deamon and exposing apropriate procs to DM. */ /datum/ntsl2_program/ var/id = 0 @@ -18,10 +18,10 @@ Datum representing program state on deamon and exposing apropriate procs to DM. SSntsl2.send_task("remove", list(id = id)) SSntsl2.handle_termination(src) qdel(src) - + /datum/ntsl2_program/proc/execute(var/script, var/mob/user) if(!is_ready()) ready_tasks += CALLBACK(src, PROC_REF(execute), script, user) return FALSE // We are not ready to run code log_ntsl("[user.name]/[user.key] uploaded script to [src] : [script]", SEVERITY_NOTICE, user.ckey) - return SSntsl2.send_task("execute", list(id = id, code = script), program = src) \ No newline at end of file + return SSntsl2.send_task("execute", list(id = id, code = script), program = src) diff --git a/code/modules/ntsl2/ntsl2_types.dm b/code/modules/ntsl2/ntsl2_types.dm index ba6fa2f541f..b458fe865f1 100644 --- a/code/modules/ntsl2/ntsl2_types.dm +++ b/code/modules/ntsl2/ntsl2_types.dm @@ -70,7 +70,7 @@ ) ), RUSTG_HTTP_METHOD_POST, callback = callback) /* [ - { + { "content": "AAAAA", "freq": "1459", "source": "Telecomms Broadcaster", @@ -79,7 +79,7 @@ "verb": "says", "language": "Ceti Basic", "reference": null - } + } ]*/ /datum/ntsl2_program/tcomm/proc/retrieve_messages(callback = null) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 6f7757211e4..027bb8257d4 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -39,8 +39,7 @@ var/list/transplant_data var/list/datum/autopsy_data/autopsy_data = list() var/list/organ_verbs //verb that are added when you gain the organ - var/list/trace_chemicals = list() // traces of chemicals in the organ, - // links chemical IDs to number of ticks for which they'll stay in the blood + var/list/trace_chemicals = list() // traces of chemicals in the organ, links chemical IDs to number of ticks for which they'll stay in the blood //DNA stuff. var/datum/dna/dna diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index edb757ab5b1..85fcccd10af 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -268,7 +268,7 @@ owner.update_action_buttons() /**************************************************** - DAMAGE PROCS + DAMAGE PROCS ****************************************************/ /obj/item/organ/external/proc/is_damageable(var/additional_damage = 0) @@ -569,7 +569,7 @@ This function completely restores a damaged organ to perfect condition. wounds += W /**************************************************** - PROCESSING & UPDATING + PROCESSING & UPDATING ****************************************************/ //external organs handle brokenness a bit differently when it comes to damage. Instead brute_dam is checked inside process() @@ -916,7 +916,7 @@ Note that amputating the affected organ does in fact remove the infection from t return "[tbrute][tburn]" /**************************************************** - DISMEMBERMENT + DISMEMBERMENT ****************************************************/ /obj/item/organ/external/proc/post_droplimb(mob/living/carbon/human/victim) @@ -987,7 +987,7 @@ Note that amputating the affected organ does in fact remove the infection from t M.Turn(rand(180)) src.transform = M if(!clean) - //Throw limb around. + //Throw limb around. if(src && isturf(loc)) INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, throw_at), get_edge_target_turf(src,pick(alldirs)), rand(1,3), 4) dir = 2 @@ -1022,7 +1022,7 @@ Note that amputating the affected organ does in fact remove the infection from t qdel(src) /**************************************************** - HELPERS + HELPERS ****************************************************/ /obj/item/organ/external/proc/is_stump() diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index 4640c54e4bd..a8434094c29 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -3,7 +3,7 @@ /obj/item/organ/external/proc/compile_icon() cut_overlays() - // This is a kludge, only one icon has more than one generation of children though. + // This is a kludge, only one icon has more than one generation of children though. for(var/obj/item/organ/external/organ in contents) if(organ.children && organ.children.len) for(var/obj/item/organ/external/child in organ.children) diff --git a/code/modules/organs/subtypes/augment.dm b/code/modules/organs/subtypes/augment.dm index 0a7c8d5c0e1..bebd6f28140 100644 --- a/code/modules/organs/subtypes/augment.dm +++ b/code/modules/organs/subtypes/augment.dm @@ -523,9 +523,9 @@ parent_organ = BP_HEAD /obj/item/organ/internal/augment/synthetic_cords/voice - desc = "An array of vocal cords. These appears to have been modified with a specific accent." - organ_tag = BP_AUG_ACC_CORDS - var/accent = ACCENT_TTS + desc = "An array of vocal cords. These appears to have been modified with a specific accent." + organ_tag = BP_AUG_ACC_CORDS + var/accent = ACCENT_TTS /obj/item/organ/internal/augment/synthetic_cords/replaced(var/mob/living/carbon/human/target, obj/item/organ/external/affected) . = ..() diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm index 617823f4cd0..1a78b5aa5d0 100644 --- a/code/modules/organs/subtypes/standard.dm +++ b/code/modules/organs/subtypes/standard.dm @@ -1,5 +1,5 @@ /**************************************************** - ORGAN DEFINES + ORGAN DEFINES ****************************************************/ /obj/item/organ/external/chest diff --git a/code/modules/organs/wound.dm b/code/modules/organs/wound.dm index 7e371647c80..78840431b4b 100644 --- a/code/modules/organs/wound.dm +++ b/code/modules/organs/wound.dm @@ -325,7 +325,7 @@ /datum/wound/bruise stages = list("monumental bruise" = 80, "huge bruise" = 50, "large bruise" = 30, - "moderate bruise" = 20, "small bruise" = 10, "tiny bruise" = 5) + "moderate bruise" = 20, "small bruise" = 10, "tiny bruise" = 5) bleed_threshold = 20 max_bleeding_stage = 3 //only large bruise and above can bleed. autoheal_cutoff = 30 diff --git a/code/modules/overmap/exoplanets/decor/flora/potted.dm b/code/modules/overmap/exoplanets/decor/flora/potted.dm index 60181e4474a..d8af17a4fb9 100644 --- a/code/modules/overmap/exoplanets/decor/flora/potted.dm +++ b/code/modules/overmap/exoplanets/decor/flora/potted.dm @@ -262,7 +262,7 @@ /obj/structure/flora/pottedplant/eye name = "eye bulb plant" desc = "A decorative plant borne from a genetic mishap in a Zeng-Hu genetics lab. \ - Scientists assure, the blinking \"eye\" is simply just a form of heat regulation, \ + Scientists assure, the blinking \"eye\" is simply just a form of heat regulation, \ and other than that, this plant is same as any other greenery." icon_state = "plant-36" diff --git a/code/modules/overmap/exoplanets/exoplanet.dm b/code/modules/overmap/exoplanets/exoplanet.dm index c75b782bef8..19c132cbb4c 100644 --- a/code/modules/overmap/exoplanets/exoplanet.dm +++ b/code/modules/overmap/exoplanets/exoplanet.dm @@ -69,8 +69,8 @@ habitability_class = HABITABILITY_BAD /obj/effect/overmap/visitable/sector/exoplanet/Initialize() - . = ..() - update_icon() + . = ..() + update_icon() /obj/effect/overmap/visitable/sector/exoplanet/update_icon() icon_state = "globe[rand(1,3)]" diff --git a/code/modules/overmap/overmap_shuttle.dm b/code/modules/overmap/overmap_shuttle.dm index b16d227f867..9845277acf2 100644 --- a/code/modules/overmap/overmap_shuttle.dm +++ b/code/modules/overmap/overmap_shuttle.dm @@ -23,7 +23,7 @@ for(var/area/A in shuttle_area) for(var/mob/living/M in A) M.show_message(SPAN_WARNING("You hear the shuttle engines sputter... perhaps it doesn't have enough fuel?"), 2, - SPAN_WARNING("The shuttle shakes but fails to take off."), 1) + SPAN_WARNING("The shuttle shakes but fails to take off."), 1) return 0 //failure! return 1 //sucess, continue with launch diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index bc00197f216..66e20e28d85 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -17,9 +17,9 @@ density = 1 anchored = 1 var/static/list/accepted_items = list( - /obj/item/paper, - /obj/item/folder, - /obj/item/photo, + /obj/item/paper, + /obj/item/folder, + /obj/item/photo, /obj/item/paper_bundle, /obj/item/sample, /obj/item/book, diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 4df956fb5bb..9100c4920c2 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -81,7 +81,7 @@ tray.update_icon() user.visible_message("[user] labels [A] as [label].", \ - SPAN_NOTICE("You label [A] as [label].")) + SPAN_NOTICE("You label [A] as [label].")) // Prevent label stacking from making name unrecoverable. if (!A.name_unlabel) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 8427a610ad9..9a8a7346f24 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -225,10 +225,10 @@ H.update_body() else user.visible_message(SPAN_WARNING("[user] begins to wipe [H]'s lipstick off with \the [src]."), \ - SPAN_NOTICE("You begin to wipe off [H]'s lipstick.")) + SPAN_NOTICE("You begin to wipe off [H]'s lipstick.")) if(do_after(user, 1 SECOND, H, do_flags = (DO_DEFAULT | DO_USER_UNIQUE_ACT) & ~DO_BOTH_CAN_TURN)) user.visible_message(SPAN_NOTICE("[user] wipes [H]'s lipstick off with \the [src]."), \ - SPAN_NOTICE("You wipe off [H]'s lipstick.")) + SPAN_NOTICE("You wipe off [H]'s lipstick.")) H.lipstick_color = null H.update_body() diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 10a28d992f3..e2206af6341 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -227,7 +227,7 @@ return var/n_name = sanitizeSafe(input(usr, "What would you like to label the bundle?", "Bundle Labelling", null) as text, MAX_NAME_LEN) - + if(use_check_and_message(usr, USE_ALLOW_NON_ADJACENT)) return diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 1cbbb72ef09..5537b24144b 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -783,7 +783,7 @@ cell.update_icon() cell = null user.visible_message(SPAN_WARNING("[user.name] removes the power cell from [name]!"),\ - SPAN_NOTICE("You remove the power cell.")) + SPAN_NOTICE("You remove the power cell.")) //to_chat(user, "You remove the power cell.") charging = CHARGING_OFF update_icon() @@ -1132,7 +1132,7 @@ cell = null user.visible_message(SPAN_WARNING("[user.name] removes the power cell from [name]!"),\ - SPAN_NOTICE("You remove the power cell.")) + SPAN_NOTICE("You remove the power cell.")) charging = CHARGING_ON update_icon() return diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index 5243569403c..0feeaa2cc8c 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -87,7 +87,7 @@ if(do_after(user, 50)) set_state(!on) user.visible_message(SPAN_NOTICE("[user.name] [on ? "enabled" : "disabled"] the breaker box!"), \ - SPAN_NOTICE("You [on ? "enabled" : "disabled"] the breaker box!")) + SPAN_NOTICE("You [on ? "enabled" : "disabled"] the breaker box!")) update_locked = 1 addtimer(CALLBACK(src, PROC_REF(reset_locked)), 600) busy = 0 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 786d22cc160..3185b339517 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -1077,10 +1077,10 @@ By design, d1 is the smallest direction and d2 is the highest var/mob/living/M = buckled if(M != user) user.visible_message(SPAN_NOTICE("[user] begins to untie the noose over [M]'s neck..."),\ - SPAN_NOTICE("You begin to untie the noose over [M]'s neck...")) + SPAN_NOTICE("You begin to untie the noose over [M]'s neck...")) if(do_mob(user, M, 100)) user.visible_message(SPAN_NOTICE("[user] unties the noose over [M]'s neck!"),\ - SPAN_NOTICE("You untie the noose over [M]'s neck!")) + SPAN_NOTICE("You untie the noose over [M]'s neck!")) else return else diff --git a/code/modules/power/crystal_agitator.dm b/code/modules/power/crystal_agitator.dm index 7d725eb93f4..12ad7081355 100644 --- a/code/modules/power/crystal_agitator.dm +++ b/code/modules/power/crystal_agitator.dm @@ -65,7 +65,7 @@ if(!length(agitation_turfs)) toggle_active() return - + var/actual_load = draw_power(active_power_usage) if(actual_load < active_power_usage) toggle_active() diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index c4b4e872c85..1917fa78090 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -235,7 +235,7 @@ ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) if(!ui) // the ui does not exist, so we'll create a new() one - // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm + // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm ui = new(user, src, ui_key, "generator.tmpl", "Thermoelectric Generator", 450, 500) // when the ui is first opened this is the data it will use ui.set_initial_data(data) diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm index f545392d03f..e316c6cb7dc 100644 --- a/code/modules/power/rtg.dm +++ b/code/modules/power/rtg.dm @@ -98,7 +98,7 @@ origin_tech = list( TECH_DATA = 3, TECH_MATERIAL = 4, - TECH_POWER = 3, + TECH_POWER = 3, TECH_ENGINEERING = 3, TECH_PHORON = 3 ) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 55aa2a905dc..e5d069a939a 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -1,12 +1,12 @@ /* field_generator power level display - The icon used for the field_generator need to have 'num_power_levels' number of icon states - named 'field_gen +p[num]' where 'num' ranges from 1 to 'num_power_levels' + The icon used for the field_generator need to have 'num_power_levels' number of icon states + named 'field_gen +p[num]' where 'num' ranges from 1 to 'num_power_levels' - The power level is displayed using overlays. The current displayed power level is stored in 'powerlevel'. - The overlay in use and the powerlevel variable must be kept in sync. A powerlevel equal to 0 means that - no power level overlay is currently in the overlays list. - -Aygar + The power level is displayed using overlays. The current displayed power level is stored in 'powerlevel'. + The overlay in use and the powerlevel variable must be kept in sync. A powerlevel equal to 0 means that + no power level overlay is currently in the overlays list. + -Aygar */ #define field_generator_max_power 250000 diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 22771ab07ef..59ce087c689 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -34,9 +34,9 @@ process() check_build() Setup map - |EC| -CC|FC| - |PB| + |EC| +--CC|FC| + |PB| PE|PE|PE diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index b11df09b68b..8cd4841d189 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -495,13 +495,13 @@ move_self = 1 /obj/singularity/singularity_act(S, size) - if(current_size <= size) - var/gain = (energy/2) - var/dist = max((current_size - 2), 1) - explosion(src.loc,(dist),(dist*2),(dist*4)) - spawn(0) - qdel(src) - return gain + if(current_size <= size) + var/gain = (energy/2) + var/dist = max((current_size - 2), 1) + explosion(src.loc,(dist),(dist*2),(dist*4)) + spawn(0) + qdel(src) + return gain /obj/singularity/can_fall() return FALSE diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index f69be417ca6..daeaa7ddd31 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -17,7 +17,7 @@ /obj/machinery/power/terminal/Initialize() . = ..() var/turf/T = src.loc - if(level == 1) + if(level == 1) hide(!T.is_plating()) return diff --git a/code/modules/projectiles/guns/bang/pistol.dm b/code/modules/projectiles/guns/bang/pistol.dm index e402dc754d6..ea4feed89bc 100644 --- a/code/modules/projectiles/guns/bang/pistol.dm +++ b/code/modules/projectiles/guns/bang/pistol.dm @@ -42,8 +42,8 @@ /obj/item/gun/bang/tanto desc = "A crude-looking open-bolt machine pistol manufactured by a multitude of arms companies, or in some cases, particularly handy individuals. \ - Owing to their low cost and relative effectiveness, weapons like these are very common all across the Spur, from the tunnels of Oran to fringe colonies along the frontier. \ - This pistol is made almost entirely from sheet metal and has cloth wrappings around the grip for shooter comfort." + Owing to their low cost and relative effectiveness, weapons like these are very common all across the Spur, from the tunnels of Oran to fringe colonies along the frontier. \ + This pistol is made almost entirely from sheet metal and has cloth wrappings around the grip for shooter comfort." name = "10mm pistol" icon = 'icons/obj/guns/c05r.dmi' icon_state = "c05r" diff --git a/code/modules/projectiles/guns/bang/revolver.dm b/code/modules/projectiles/guns/bang/revolver.dm index 2cb7b0dd4d4..6bc51d02632 100644 --- a/code/modules/projectiles/guns/bang/revolver.dm +++ b/code/modules/projectiles/guns/bang/revolver.dm @@ -2,4 +2,3 @@ name = "revolver" desc = "The classic Zavodskoi Interstellar .357 revolver, for when you only want to shoot once." fakecaliber = ".357" - \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 7313e9b10b5..3f26328e2e5 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -59,7 +59,7 @@ to_chat(M, SPAN_DANGER("[src] locks up!")) playsound(M, 'sound/weapons/smg_empty_alarm.ogg', 30) var/initial_charge = power_supply.charge - power_supply.charge = 0 + power_supply.charge = 0 sleep(severity * 20) power_supply.give(initial_charge) update_maptext() @@ -160,7 +160,7 @@ else icon_state = "[initial(icon_state)][icon_state_ratio]" item_state = "[initial(item_state)][item_state_ratio]" - + ..() /obj/item/gun/energy/handle_post_fire() diff --git a/code/modules/projectiles/guns/launcher/harpoon.dm b/code/modules/projectiles/guns/launcher/harpoon.dm index cb02032cb62..cfab77d4b0e 100644 --- a/code/modules/projectiles/guns/launcher/harpoon.dm +++ b/code/modules/projectiles/guns/launcher/harpoon.dm @@ -32,7 +32,7 @@ /obj/item/gun/launcher/harpoon/update_icon() icon_state = "[initial(icon_state)]-[harpoons.len]" - item_state = "[initial(item_state)]-[harpoons.len]" + item_state = "[initial(item_state)]-[harpoons.len]" ..() /obj/item/gun/launcher/harpoon/special_check(mob/user) diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index e2b64dc1c25..44a4c1c0904 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -21,8 +21,8 @@ var/pressure_setting = 10 // Percentage of the gas in the tank used to fire the projectile. var/possible_pressure_amounts = list(5,10,20,25,50) // Possible pressure settings. var/force_divisor = 400 // Force equates to speed. Speed/5 equates to a damage multiplier for whoever you hit. - // For reference, a fully pressurized oxy tank at 50% gas release firing a health - // analyzer with a force_divisor of 10 hit with a damage multiplier of 3000+. + // For reference, a fully pressurized oxy tank at 50% gas release firing a health + // analyzer with a force_divisor of 10 hit with a damage multiplier of 3000+. /obj/item/gun/launcher/pneumatic/Initialize() . = ..() item_storage = new(src) diff --git a/code/modules/psionics/interface/ui_hub.dm b/code/modules/psionics/interface/ui_hub.dm index 284df58ef5d..4e67bad6ac8 100644 --- a/code/modules/psionics/interface/ui_hub.dm +++ b/code/modules/psionics/interface/ui_hub.dm @@ -43,10 +43,10 @@ ui.open() /obj/screen/psi/hub/ui_state(mob/user) - return conscious_state + return conscious_state /obj/screen/psi/hub/ui_status(mob/user, datum/ui_state/state) - return UI_INTERACTIVE + return UI_INTERACTIVE /obj/screen/psi/hub/ui_data(mob/user) var/list/data = list() diff --git a/code/modules/random_map/mazes/maze.dm b/code/modules/random_map/mazes/maze.dm index 557adbd6e8e..6c658e199c2 100644 --- a/code/modules/random_map/mazes/maze.dm +++ b/code/modules/random_map/mazes/maze.dm @@ -51,7 +51,7 @@ add_to_openlist(next.x+2,next.y,next.x,next.y) add_to_openlist(next.x,next.y-2,next.x,next.y) - // Cleanup. Map stays in memory for display proc. + // Cleanup. Map stays in memory for display proc. checked_coord_cache.Cut() openlist.Cut() closedlist.Cut() diff --git a/code/modules/random_map/noise/noise.dm b/code/modules/random_map/noise/noise.dm index 71bad394795..bf012566dd7 100644 --- a/code/modules/random_map/noise/noise.dm +++ b/code/modules/random_map/noise/noise.dm @@ -64,13 +64,13 @@ /* (x,y+isize)----(x+hsize,y+isize)----(x+size,y+isize) - | | | - | | | - | | | + | | | + | | | + | | | (x,y+hsize)----(x+hsize,y+hsize)----(x+isize,y) - | | | - | | | - | | | + | | | + | | | + | | | (x,y)----------(x+hsize,y)----------(x+isize,y) */ // Central edge values become average of corners. @@ -107,7 +107,7 @@ map[current_cell] *= (rand(1,2)==1 ? (1.0-random_element) : (1.0+random_element)) map[current_cell] = max(0,min(cell_range,map[current_cell])) - // Recurse until size is too small to subdivide. + // Recurse until size is too small to subdivide. if(isize>3) if(!priority_process) CHECK_TICK diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm index d3fefa8172c..19b4c63e53b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm @@ -448,7 +448,7 @@ if(M.chem_doses[type] >= 1) if(prob(3)) to_chat(M, SPAN_GOOD(pick("Stress was an inconvenience that you are now free of.", "You lose all sense of connection to the real world.", "Everything is so tranquil.", "You feel totaly detached from reality.", "Your feel disconnected from your body.", "You are aware of nothing but your conscious thoughts.", "You keep falling... and falling... and falling - never stopping.", "Is this what it feels like to be dead?", "Your memories are hazy... all you have ever known is this feeling.", "You're watching yourself from afar - detached from your physical body."))) - + /singleton/reagent/joy/overdose(var/mob/living/carbon/M, var/alien, var/removed = 0, var/datum/reagents/holder) M.ear_deaf = 20 M.add_chemical_effect(CE_EMETIC, M.chem_doses[type]) 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 f4dbd96ca81..7975793aef3 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1810,15 +1810,15 @@ glass_center_of_mass = list("x"=15, "y"=9) /singleton/reagent/drink/coffee/ration - name = "Ration Coffee" - description = "Watered-down coffee. One cup now becomes four!" - color = "#664300" // rgb: 102, 67, 0 - taste_description = "weak, watered-down coffee" - - glass_icon_state = "hot_coffee" - glass_name = "glass of ration coffee" - glass_desc = "Coffee, watered-down." - glass_center_of_mass = list("x"=15, "y"=9) + name = "Ration Coffee" + description = "Watered-down coffee. One cup now becomes four!" + color = "#664300" // rgb: 102, 67, 0 + taste_description = "weak, watered-down coffee" + + glass_icon_state = "hot_coffee" + glass_name = "glass of ration coffee" + glass_desc = "Coffee, watered-down." + glass_center_of_mass = list("x"=15, "y"=9) /singleton/reagent/drink/coffee/freddo_espresso name = "Freddo Espresso" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 17580b109d7..4cf97649c03 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1607,7 +1607,7 @@ /singleton/reagent/kilosemine name = "Kilosemine" description = "An illegal stimulant, known by specialists for its properties that somehow mix the effects of Synaptizine and Hyperzine without the immediate side \ - effects. It is unknown how and where this chemical was created; some speculate that it was created in Fisanduh for use by radical terrorist cells." + effects. It is unknown how and where this chemical was created; some speculate that it was created in Fisanduh for use by radical terrorist cells." reagent_state = SOLID scannable = TRUE color = "#EE4B2B" @@ -1640,7 +1640,7 @@ var/mob/living/carbon/human/H = M if(prob(H.chem_doses[type] / 2)) to_chat(H, SPAN_WARNING(pick("You feel like you're on limited time...", "Something in the left side of your chest feels like it's bursting!", - "You feel like today is your last day, and you should make it count..."))) + "You feel like today is your last day, and you should make it count..."))) if(prob(H.chem_doses[type] / 3)) if(prob(75)) H.emote(pick("twitch", "shiver")) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 74171281dbc..573fc42626c 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -857,15 +857,15 @@ return /datum/chemical_reaction/uraniumsolidification - name = "Uranium" - id = "soliduranium" - result = null - required_reagents = list(/singleton/reagent/potassium = 5, /singleton/reagent/frostoil = 5, /singleton/reagent/uranium = 20) - result_amount = 1 + name = "Uranium" + id = "soliduranium" + result = null + required_reagents = list(/singleton/reagent/potassium = 5, /singleton/reagent/frostoil = 5, /singleton/reagent/uranium = 20) + result_amount = 1 /datum/chemical_reaction/uraniumsolidification/on_reaction(var/datum/reagents/holder, var/created_volume) - new /obj/item/stack/material/uranium(get_turf(holder.my_atom), created_volume) - return + new /obj/item/stack/material/uranium(get_turf(holder.my_atom), created_volume) + return /* Grenade reactions */ @@ -2403,11 +2403,11 @@ result_amount = 2 /datum/chemical_reaction/drink/ration_coffee - name = "Ration Coffee" - id = "ration_coffee" - result = /singleton/reagent/drink/coffee/ration - required_reagents = list(/singleton/reagent/drink/coffee = 2, /singleton/reagent/water = 1) - result_amount = 3 + name = "Ration Coffee" + id = "ration_coffee" + result = /singleton/reagent/drink/coffee/ration + required_reagents = list(/singleton/reagent/drink/coffee = 2, /singleton/reagent/water = 1) + result_amount = 3 /datum/chemical_reaction/drink/soy_latte name = "Soy Latte" diff --git a/code/modules/reagents/dispenser/dispenser2.dm b/code/modules/reagents/dispenser/dispenser2.dm index 9d75445c205..2855d9f5eb7 100644 --- a/code/modules/reagents/dispenser/dispenser2.dm +++ b/code/modules/reagents/dispenser/dispenser2.dm @@ -14,7 +14,7 @@ var/icon_state_active = "dispenser_active" /// Set to a list of types to spawn one of each on New(). var/list/spawn_cartridges - /// Associative, label -> cartridge. + /// Associative, label -> cartridge. var/list/cartridges = list() ///Current container. var/obj/item/reagent_containers/container diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 40b4486e34d..87f2a5dccae 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -20,9 +20,9 @@ drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' desc_info = "Click it in your hand to open it.\ - If it's carbonated and closed, you can shake it by clicking on it with harm intent. \ - If it's empty, you can crush it on your forehead by selecting your head and clicking on yourself with harm intent. \ - You can also crush cans on other people's foreheads as well." + If it's carbonated and closed, you can shake it by clicking on it with harm intent. \ + If it's empty, you can crush it on your forehead by selecting your head and clicking on yourself with harm intent. \ + You can also crush cans on other people's foreheads as well." /obj/item/reagent_containers/food/drinks/cans/attack(mob/living/M, mob/user, var/target_zone) if(iscarbon(M) && !reagents.total_volume && user.a_intent == I_HURT && target_zone == BP_HEAD) diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index e524f16dbc6..cb609edc414 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -245,11 +245,11 @@ w_class = ITEMSIZE_SMALL #define DRINK_FLUFF_GETMORE "This drink is made by Getmore Corporation, a subsidiary of NanoTrasen. It mostly specializes in fast food and consumer food products, \ - but also makes average quality alcohol. Many can find Getmore products in grocery stores, vending machines, \ - and fast food restaurants all under the Getmore brand." + but also makes average quality alcohol. Many can find Getmore products in grocery stores, vending machines, \ + and fast food restaurants all under the Getmore brand." #define DRINK_FLUFF_ZENGHU "This drink is made by Zeng-Hu Pharmaceuticals, a trans-stellar medical research and pharmaceutical conglomerate that has heavy ties with Skrell. \ - With a big genetics and xenobiology division, it has also revolutionized the production of some old Terran alcohol." + With a big genetics and xenobiology division, it has also revolutionized the production of some old Terran alcohol." #define DRINK_FLUFF_SILVERPORT "This drink is made by Silverport Quality Brand, an Idris subsidiary that focuses on production of expensive, extremely high-quality drinks. \ Its facilities can be found on both Silversun and Venus, but the Cytherean part of Venus are its main consumers. \ @@ -329,7 +329,7 @@ name = "Nojosuru Aromatic Bitters" desc = "Only the finest and highest quality herbs find their way into our cocktail bitters, both human and skrellian." desc_extended = "This drink is made by Nojosuru Foods, a subsidiary of Zeng-Hu Pharmaceuticals, founded on Earth in 2252. \ - They are known for their surprisingly affordable and incredible quality foods, as well as growing many crops used in pharmaceuticals and luxury items." + They are known for their surprisingly affordable and incredible quality foods, as well as growing many crops used in pharmaceuticals and luxury items." icon_state = "bitters" center_of_mass = list("x"=16, "y"=9) reagents_to_add = list(/singleton/reagent/alcohol/bitters = 40) @@ -415,13 +415,13 @@ /obj/item/reagent_containers/food/drinks/bottle/champagne/open(mob/user, var/sabrage, var/froth_severity) if(!sabrage) user.visible_message(SPAN_DANGER("[user] loosens the cork of [src] causing it to pop out of the bottle with great force."), \ - SPAN_GOOD("You elegantly loosen the cork of [src] causing it to pop out of the bottle with great force."), \ - "You can hear a pop.") + SPAN_GOOD("You elegantly loosen the cork of [src] causing it to pop out of the bottle with great force."), \ + "You can hear a pop.") else sabraged = TRUE user.visible_message(SPAN_DANGER("[user] cleanly slices off the cork of [src], causing it to fly off the bottle with great force."), \ - SPAN_GOOD("You elegantly slice the cork off of [src], causing it to fly off the bottle with great force."), \ - "You can hear a pop.") + SPAN_GOOD("You elegantly slice the cork off of [src], causing it to fly off the bottle with great force."), \ + "You can hear a pop.") playsound(src, 'sound/items/champagne_pop.ogg', 70, TRUE) flags |= OPENCONTAINER update_icon() diff --git a/code/modules/reagents/reagent_containers/glass/newdrinkingglas.dm b/code/modules/reagents/reagent_containers/glass/newdrinkingglas.dm index 1390b7e0fbd..0ed903ef425 100644 --- a/code/modules/reagents/reagent_containers/glass/newdrinkingglas.dm +++ b/code/modules/reagents/reagent_containers/glass/newdrinkingglas.dm @@ -129,4 +129,3 @@ icon_state = "goblet" icon = 'icons/obj/drink_glasses/goblet.dmi' volume = 25 - \ No newline at end of file diff --git a/code/modules/research/designs/protolathe/power_designs.dm b/code/modules/research/designs/protolathe/power_designs.dm index 52369d8854e..15e579f74e8 100644 --- a/code/modules/research/designs/protolathe/power_designs.dm +++ b/code/modules/research/designs/protolathe/power_designs.dm @@ -42,9 +42,9 @@ req_tech = list(TECH_POWER = 1) materials = list(DEFAULT_WALL_MATERIAL = 70, MATERIAL_GLASS = 5) build_path = /obj/item/cell/device - + /datum/design/item/powercell/device/high name = "Advanced Device" req_tech = list(TECH_POWER = 2) materials = list(DEFAULT_WALL_MATERIAL = 150, MATERIAL_GLASS = 10) - build_path = /obj/item/cell/device/high \ No newline at end of file + build_path = /obj/item/cell/device/high diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm index 0dedde40dff..2c04e145b5e 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm @@ -305,7 +305,7 @@ if(secondary_effect) secondary_effect.UpdateMove() -/obj/machinery/artifact/attack_ai(mob/user) //AI can't interfact with weird artifacts. Borgs can but not remotely. +/obj/machinery/artifact/attack_ai(mob/user) //AI can't interfact with weird artifacts. Borgs can but not remotely. if(!isrobot(user) || !Adjacent(user)) return return ..() diff --git a/code/modules/research/xenoarchaeology/finds/finds_defines.dm b/code/modules/research/xenoarchaeology/finds/finds_defines.dm index d9a722d0153..88d99eee393 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_defines.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_defines.dm @@ -215,27 +215,27 @@ return find_type var/list/responsive_carriers = list( - "carbon", + "carbon", "potassium", - "hydrogen", - "nitrogen", - "mercury", - "iron", - "chlorine", - "phosphorus", + "hydrogen", + "nitrogen", + "mercury", + "iron", + "chlorine", + "phosphorus", "phoron" ) var/list/finds_as_strings = list( - "Trace organic cells", - "Long exposure particles", - "Trace water particles", - "Crystalline structures", - "Metallic derivative", - "Metallic composite", - "Metamorphic/igneous rock composite", + "Trace organic cells", + "Long exposure particles", + "Trace water particles", + "Crystalline structures", + "Metallic derivative", + "Metallic composite", + "Metamorphic/igneous rock composite", "Metamorphic/sedimentary rock composite", - "Anomalous material" + "Anomalous material" ) #undef ARCHAEO_BOWL diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm index 6bee16181a6..06dde2cf4e6 100644 --- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -153,7 +153,7 @@ ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) // the ui does not exist, so we'll create a new() one - // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm + // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm ui = new(user, src, ui_key, "geoscanner.tmpl", "High Res Radiocarbon Spectrometer", 900, 825) // when the ui is first opened this is the data it will use ui.set_initial_data(data) diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index ca80e6fab2f..2cff3d0f3d4 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -189,7 +189,7 @@ if(!linked.levi_safeguard.opened) linked.levi_safeguard.open() command_announcement.Announce("Commencing connection of Leviathan warp field arrays. All personnel are reminded to seek out a fixed object they can \ - hold on to in preparation for the firing sequence.", "Leviathan Artillery Control", 'sound/effects/ship_weapons/leviathan_safetyoff.ogg') + hold on to in preparation for the firing sequence.", "Leviathan Artillery Control", 'sound/effects/ship_weapons/leviathan_safetyoff.ogg') if("Emergency Evacuation") call_shuttle_proc(user, TRANSFER_EMERGENCY) diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index d209e993148..3fbe029c78f 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -22,8 +22,12 @@ var/knockdown = TRUE //whether shuttle downs non-buckled_to people when it moves - var/defer_initialisation = FALSE //this shuttle will/won't be initialised automatically. If set to true, you are responsible for initialzing the shuttle manually. - //Useful for shuttles that are initialed by map_template loading, or shuttles that are created in-game or not used. + /** + * This shuttle will/won't be initialised automatically. + * If set to `TRUE`, you are responsible for initialzing the shuttle manually. + * Useful for shuttles that are initialed by map_template loading, or shuttles that are created in-game or not used. + */ + var/defer_initialisation = FALSE var/logging_home_tag //Whether in-game logs will be generated whenever the shuttle leaves/returns to the landmark with this landmark_tag. var/logging_access //Controls who has write access to log-related stuff; should correlate with pilot access. diff --git a/code/modules/supermatter/setup_supermatter.dm b/code/modules/supermatter/setup_supermatter.dm index 2ee008ca1d8..849d66fef3b 100644 --- a/code/modules/supermatter/setup_supermatter.dm +++ b/code/modules/supermatter/setup_supermatter.dm @@ -26,8 +26,8 @@ 3. For every pump that needs to be maxed / turned on add a `pump_max` marker. 4. For every connector port that needs an empty canister add a `empty_canister` marker. 5. For every filter that needs to be set up for the coolant add a `filter` marker. - Note that the filters must be set up to filter the coolant back into the core loop by default. - Otherwise the auto setup will mess up and you'll end up without the correct coolant gas! + Note that the filters must be set up to filter the coolant back into the core loop by default. + Otherwise the auto setup will mess up and you'll end up without the correct coolant gas! 6. For every freezer that needs to be on, add a `freezer` marker. 7. For every SMES that needs to be online and maxed, add a `smes` marker. 8. On top of the SM core map a `core` marker. diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index ca288bdd350..ebd9749f960 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -294,7 +294,7 @@ //Release reaction gasses var/heat_capacity = removed.heat_capacity() removed.adjust_multi(GAS_PHORON, max(device_energy / PHORON_RELEASE_MODIFIER, 0), \ - GAS_OXYGEN, max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0)) + GAS_OXYGEN, max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0)) var/thermal_power = THERMAL_RELEASE_MODIFIER * device_energy if (debug) diff --git a/code/modules/surgery/facial_surgery.dm b/code/modules/surgery/facial_surgery.dm index abd9865af87..aecec1aafe0 100644 --- a/code/modules/surgery/facial_surgery.dm +++ b/code/modules/surgery/facial_surgery.dm @@ -220,7 +220,7 @@ target.mutations &= ~HUSK target.update_body() user.visible_message("[user] finishes adjusting [target]'s synthetic face.", \ - SPAN_NOTICE("You successfully adjust [target]'s appearance.")) + SPAN_NOTICE("You successfully adjust [target]'s appearance.")) var/getName = sanitize(input(user, "What is your patient's new identity?", "Name change") as null|text, MAX_NAME_LEN) if(getName) diff --git a/code/modules/synthesized_instruments/instrument_data/brass.dm b/code/modules/synthesized_instruments/instrument_data/brass.dm index ffae42e8f92..421310d52dc 100644 --- a/code/modules/synthesized_instruments/instrument_data/brass.dm +++ b/code/modules/synthesized_instruments/instrument_data/brass.dm @@ -7,22 +7,22 @@ name = "Crisis Brass Section" id = "crbrass" samples = list("36"='code/modules/synthesized_instruments/samples/brass/crisis_brass/c2.ogg', - "48"='code/modules/synthesized_instruments/samples/brass/crisis_brass/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/brass/crisis_brass/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/brass/crisis_brass/c5.ogg') + "48"='code/modules/synthesized_instruments/samples/brass/crisis_brass/c3.ogg', + "60"='code/modules/synthesized_instruments/samples/brass/crisis_brass/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/brass/crisis_brass/c5.ogg') /datum/instrument/brass/crisis_trombone name = "Crisis Trombone" id = "crtrombone" samples = list("36"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C2.ogg', - "48"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C3.ogg', - "60"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C4.ogg', - "72"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C5.ogg') + "48"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C3.ogg', + "60"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C4.ogg', + "72"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C5.ogg') /datum/instrument/brass/crisis_trumpet name = "Crisis Trumpet" id = "crtrumpet" samples = list("60"='code/modules/synthesized_instruments/samples/brass/crisis_trumpet/C4.ogg', - "72"='code/modules/synthesized_instruments/samples/brass/crisis_trumpet/C5.ogg') + "72"='code/modules/synthesized_instruments/samples/brass/crisis_trumpet/C5.ogg') diff --git a/code/modules/synthesized_instruments/instrument_data/chromatic_percussion.dm b/code/modules/synthesized_instruments/instrument_data/chromatic_percussion.dm index 3a64a47212d..5ae1bf58e60 100644 --- a/code/modules/synthesized_instruments/instrument_data/chromatic_percussion.dm +++ b/code/modules/synthesized_instruments/instrument_data/chromatic_percussion.dm @@ -7,27 +7,27 @@ name = "Crisis Vibraphone" id = "crvibr" samples = list("36"='code/modules/synthesized_instruments/samples/chromatic/vibraphone1/c2.ogg', - "48"='code/modules/synthesized_instruments/samples/chromatic/vibraphone1/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/chromatic/vibraphone1/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/chromatic/vibraphone1/c5.ogg') + "48"='code/modules/synthesized_instruments/samples/chromatic/vibraphone1/c3.ogg', + "60"='code/modules/synthesized_instruments/samples/chromatic/vibraphone1/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/chromatic/vibraphone1/c5.ogg') /datum/instrument/chromatic/musicbox1 name = "SGM Music Box" id = "sgmmbox" samples = list("36"='code/modules/synthesized_instruments/samples/chromatic/sgmbox/c2.ogg', - "48"='code/modules/synthesized_instruments/samples/chromatic/sgmbox/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/chromatic/sgmbox/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/chromatic/sgmbox/c5.ogg') + "48"='code/modules/synthesized_instruments/samples/chromatic/sgmbox/c3.ogg', + "60"='code/modules/synthesized_instruments/samples/chromatic/sgmbox/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/chromatic/sgmbox/c5.ogg') /datum/instrument/chromatic/fluid_celeste name = "FluidR3 Celeste" id = "r3celeste" samples = list("36"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C2.ogg', - "48"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C3.ogg', - "60"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C4.ogg', - "72"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C5.ogg', - "84"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C6.ogg', - "96"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C7.ogg', - "108"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C8.ogg') + "48"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C3.ogg', + "60"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C4.ogg', + "72"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C5.ogg', + "84"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C6.ogg', + "96"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C7.ogg', + "108"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C8.ogg') diff --git a/code/modules/synthesized_instruments/instrument_data/guitar.dm b/code/modules/synthesized_instruments/instrument_data/guitar.dm index 86f5856c4e0..96a5e9f5dfa 100644 --- a/code/modules/synthesized_instruments/instrument_data/guitar.dm +++ b/code/modules/synthesized_instruments/instrument_data/guitar.dm @@ -7,33 +7,33 @@ name = "Crisis Steel String Guitar" id = "csteelgt" samples = list("36"='code/modules/synthesized_instruments/samples/guitar/crisis_steel/c2.ogg', - "48"='code/modules/synthesized_instruments/samples/guitar/crisis_steel/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/guitar/crisis_steel/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/guitar/crisis_steel/c5.ogg') + "48"='code/modules/synthesized_instruments/samples/guitar/crisis_steel/c3.ogg', + "60"='code/modules/synthesized_instruments/samples/guitar/crisis_steel/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/guitar/crisis_steel/c5.ogg') /datum/instrument/guitar/nylon_crisis name = "Crisis Nylon String Guitar" id = "cnylongt" samples = list("36"='code/modules/synthesized_instruments/samples/guitar/crisis_nylon/c2.ogg', - "48"='code/modules/synthesized_instruments/samples/guitar/crisis_nylon/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/guitar/crisis_nylon/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/guitar/crisis_nylon/c5.ogg') + "48"='code/modules/synthesized_instruments/samples/guitar/crisis_nylon/c3.ogg', + "60"='code/modules/synthesized_instruments/samples/guitar/crisis_nylon/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/guitar/crisis_nylon/c5.ogg') /datum/instrument/guitar/clean_crisis name = "Crisis Clean Guitar" id = "ccleangt" samples = list("36"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C2.ogg', - "48"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C3.ogg', - "60"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C4.ogg', - "72"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C5.ogg') + "48"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C3.ogg', + "60"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C4.ogg', + "72"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C5.ogg') /datum/instrument/guitar/muted_crisis name = "Crisis Muted Guitar" id = "cmutedgt" samples = list("36"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C2.ogg', - "48"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C3.ogg', - "60"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C4.ogg', - "72"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C5.ogg') + "48"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C3.ogg', + "60"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C4.ogg', + "72"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C5.ogg') diff --git a/code/modules/synthesized_instruments/instrument_data/organ.dm b/code/modules/synthesized_instruments/instrument_data/organ.dm index 9c898e92a73..ed63727e7e6 100644 --- a/code/modules/synthesized_instruments/instrument_data/organ.dm +++ b/code/modules/synthesized_instruments/instrument_data/organ.dm @@ -7,41 +7,41 @@ name = "Crisis Church Organ" id = "crichugan" samples = list("36"='code/modules/synthesized_instruments/samples/organ/crisis_church/c2.ogg', - "48"='code/modules/synthesized_instruments/samples/organ/crisis_church/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/organ/crisis_church/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/organ/crisis_church/c5.ogg') + "48"='code/modules/synthesized_instruments/samples/organ/crisis_church/c3.ogg', + "60"='code/modules/synthesized_instruments/samples/organ/crisis_church/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/organ/crisis_church/c5.ogg') /datum/instrument/organ/crisis_hammond name = "Crisis Hammond Organ" id = "crihamgan" samples = list("36"='code/modules/synthesized_instruments/samples/organ/crisis_hammond/c2.ogg', - "48"='code/modules/synthesized_instruments/samples/organ/crisis_hammond/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/organ/crisis_hammond/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/organ/crisis_hammond/c5.ogg') + "48"='code/modules/synthesized_instruments/samples/organ/crisis_hammond/c3.ogg', + "60"='code/modules/synthesized_instruments/samples/organ/crisis_hammond/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/organ/crisis_hammond/c5.ogg') /datum/instrument/organ/crisis_accordian name = "Crisis Accordian" id = "crack" samples = list("36"='code/modules/synthesized_instruments/samples/organ/crisis_accordian/c2.ogg', - "48"='code/modules/synthesized_instruments/samples/organ/crisis_accordian/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/organ/crisis_accordian/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/organ/crisis_accordian/c5.ogg') + "48"='code/modules/synthesized_instruments/samples/organ/crisis_accordian/c3.ogg', + "60"='code/modules/synthesized_instruments/samples/organ/crisis_accordian/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/organ/crisis_accordian/c5.ogg') /datum/instrument/organ/crisis_harmonica name = "Crisis Harmonica" id = "crharmony" samples = list("48"='code/modules/synthesized_instruments/samples/organ/crisis_harmonica/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/organ/crisis_harmonica/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/organ/crisis_harmonica/c5.ogg') + "60"='code/modules/synthesized_instruments/samples/organ/crisis_harmonica/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/organ/crisis_harmonica/c5.ogg') /datum/instrument/organ/crisis_tango_accordian name = "Crisis Tango Accordian" id = "crtango" samples = list("36"='code/modules/synthesized_instruments/samples/organ/crisis_tangaccordian/c2.ogg', - "48"='code/modules/synthesized_instruments/samples/organ/crisis_tangaccordian/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/organ/crisis_tangaccordian/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/organ/crisis_tangaccordian/c5.ogg') \ No newline at end of file + "48"='code/modules/synthesized_instruments/samples/organ/crisis_tangaccordian/c3.ogg', + "60"='code/modules/synthesized_instruments/samples/organ/crisis_tangaccordian/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/organ/crisis_tangaccordian/c5.ogg') diff --git a/code/modules/synthesized_instruments/instrument_data/piano.dm b/code/modules/synthesized_instruments/instrument_data/piano.dm index f38e24b6838..df0fe8394d2 100644 --- a/code/modules/synthesized_instruments/instrument_data/piano.dm +++ b/code/modules/synthesized_instruments/instrument_data/piano.dm @@ -7,54 +7,54 @@ name = "FluidR3 Grand Piano" id = "r3grand" samples = list("36"='code/modules/synthesized_instruments/samples/piano/fluid_piano/c2.ogg', - "48"='code/modules/synthesized_instruments/samples/piano/fluid_piano/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/piano/fluid_piano/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/piano/fluid_piano/c5.ogg', - "84"='code/modules/synthesized_instruments/samples/piano/fluid_piano/c6.ogg', - "96"='code/modules/synthesized_instruments/samples/piano/fluid_piano/c7.ogg', - "108"='code/modules/synthesized_instruments/samples/piano/fluid_piano/c8.ogg') + "48"='code/modules/synthesized_instruments/samples/piano/fluid_piano/c3.ogg', + "60"='code/modules/synthesized_instruments/samples/piano/fluid_piano/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/piano/fluid_piano/c5.ogg', + "84"='code/modules/synthesized_instruments/samples/piano/fluid_piano/c6.ogg', + "96"='code/modules/synthesized_instruments/samples/piano/fluid_piano/c7.ogg', + "108"='code/modules/synthesized_instruments/samples/piano/fluid_piano/c8.ogg') /datum/instrument/piano/fluid_harpsichord name = "FluidR3 Harpsichord" id = "r3harpsi" samples = list("36"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C2.ogg', - "48"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C3.ogg', - "60"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C4.ogg', - "72"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C5.ogg', - "84"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C6.ogg', - "96"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C7.ogg', - "108"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C8.ogg') + "48"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C3.ogg', + "60"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C4.ogg', + "72"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C5.ogg', + "84"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C6.ogg', + "96"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C7.ogg', + "108"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C8.ogg') /datum/instrument/piano/crisis_harpsichord name = "Crisis Harpsichord" id = "crharpsi" samples = list("36"='code/modules/synthesized_instruments/samples/piano/crisis_harpsichord/c2.ogg', - "48"='code/modules/synthesized_instruments/samples/piano/crisis_harpsichord/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/piano/crisis_harpsichord/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/piano/crisis_harpsichord/c5.ogg') + "48"='code/modules/synthesized_instruments/samples/piano/crisis_harpsichord/c3.ogg', + "60"='code/modules/synthesized_instruments/samples/piano/crisis_harpsichord/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/piano/crisis_harpsichord/c5.ogg') /datum/instrument/piano/crisis_grandpiano_uni name = "Crisis Grand Piano One" id = "crgrand1" samples = list("36"='code/modules/synthesized_instruments/samples/piano/crisis_grand_piano/c2.ogg', - "48"='code/modules/synthesized_instruments/samples/piano/crisis_grand_piano/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/piano/crisis_grand_piano/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/piano/crisis_grand_piano/c5.ogg', - "84"='code/modules/synthesized_instruments/samples/piano/crisis_grand_piano/c6.ogg', - "96"='code/modules/synthesized_instruments/samples/piano/crisis_grand_piano/c7.ogg', - "108"='code/modules/synthesized_instruments/samples/piano/crisis_grand_piano/c8.ogg') + "48"='code/modules/synthesized_instruments/samples/piano/crisis_grand_piano/c3.ogg', + "60"='code/modules/synthesized_instruments/samples/piano/crisis_grand_piano/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/piano/crisis_grand_piano/c5.ogg', + "84"='code/modules/synthesized_instruments/samples/piano/crisis_grand_piano/c6.ogg', + "96"='code/modules/synthesized_instruments/samples/piano/crisis_grand_piano/c7.ogg', + "108"='code/modules/synthesized_instruments/samples/piano/crisis_grand_piano/c8.ogg') /datum/instrument/piano/crisis_brightpiano_uni name = "Crisis Bright Piano One" id = "crbright1" samples = list("36"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c2.ogg', - "48"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c3.ogg', - "60"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c4.ogg', - "72"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c5.ogg', - "84"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c6.ogg', - "96"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c7.ogg', - "108"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c8.ogg') + "48"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c3.ogg', + "60"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c4.ogg', + "72"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c5.ogg', + "84"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c6.ogg', + "96"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c7.ogg', + "108"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c8.ogg') diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index 4d6e7b104ea..07e5371d02f 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -120,7 +120,7 @@ if(carpeted && W.iscrowbar()) user.visible_message("\The [user] removes the carpet from \the [src].", - "You remove the carpet from \the [src].") + "You remove the carpet from \the [src].") new /obj/item/stack/tile/carpet(loc) carpeted = 0 queue_icon_update() @@ -130,7 +130,7 @@ var/obj/item/stack/tile/carpet/C = W if(C.use(1)) user.visible_message("\The [user] adds \the [C] to \the [src].", - "You add \the [C] to \the [src].") + "You add \the [C] to \the [src].") carpeted = 1 queue_icon_update() return 1 @@ -159,7 +159,7 @@ if(!W.use_tool(src, user, 20, volume = 50) || !F.use(1, user)) return user.visible_message("\The [user] repairs some damage to \the [src].", - "You repair some damage to \the [src].") + "You repair some damage to \the [src].") health = max(health+(maxhealth/5), maxhealth) // 20% repair per application return 1 @@ -249,14 +249,14 @@ if(manipulating) return M manipulating = 1 user.visible_message("\The [user] begins removing the [type_holding] holding \the [src]'s [M.display_name] [what] in place.", - "You begin removing the [type_holding] holding \the [src]'s [M.display_name] [what] in place.") + "You begin removing the [type_holding] holding \the [src]'s [M.display_name] [what] in place.") if(sound) playsound(src.loc, sound, 50, 1) if(!do_after(user, 4 SECONDS, src, DO_REPAIR_CONSTRUCT)) manipulating = 0 return M user.visible_message("\The [user] removes the [M.display_name] [what] from \the [src].", - "You remove the [M.display_name] [what] from \the [src].") + "You remove the [M.display_name] [what] from \the [src].") new M.stack_type(src.loc) manipulating = 0 return null @@ -439,10 +439,10 @@ #define CORNER_CLOCKWISE 4 /* - turn() is weird: - turn(icon, angle) turns icon by angle degrees clockwise - turn(matrix, angle) turns matrix by angle degrees clockwise - turn(dir, angle) turns dir by angle degrees counter-clockwise +turn() is weird: + turn(icon, angle) turns icon by angle degrees clockwise + turn(matrix, angle) turns matrix by angle degrees clockwise + turn(dir, angle) turns dir by angle degrees counter-clockwise */ /proc/dirs_to_corner_states(list/dirs) diff --git a/code/modules/world_api/commands/admin.dm b/code/modules/world_api/commands/admin.dm index ee73bba4780..b64eeefe810 100644 --- a/code/modules/world_api/commands/admin.dm +++ b/code/modules/world_api/commands/admin.dm @@ -26,10 +26,12 @@ response = "Ghost has used Antag Hud - Respawn Aborted" data = null return TRUE - G.timeofdeath=-19999 /* time of death is checked in /mob/verb/abandon_mob() which is the Respawn verb. - timeofdeath is used for bodies on autopsy but since we're messing with a ghost I'm pretty sure - there won't be an autopsy. - */ + + /* + time of death is checked in /mob/verb/abandon_mob() which is the Respawn verb. + timeofdeath is used for bodies on autopsy but since we're messing with a ghost I'm pretty sure there won't be an autopsy. + */ + G.timeofdeath=-19999 var/datum/preferences/P if (G.client) diff --git a/code/unit_tests/_template.dm b/code/unit_tests/_template.dm index 200940bd77a..cbb5779731e 100644 --- a/code/unit_tests/_template.dm +++ b/code/unit_tests/_template.dm @@ -7,9 +7,9 @@ datum/unit_test/template name = "Test Template - Change My name" // If it's a template leave the word "template" in it's name so it's not ran. - + async = 1 // Set if we should continue testing elsewhere and come back and check on the results. - + datum/unit_test/template/start_test() // This must return something, if it's null the unit_test runner will think we runtimed. @@ -29,7 +29,7 @@ datum/unit_test/template/check_result() // Return 0 if we need to come back again and check this. // Return 1 if the test is complete. - // + // pass("Winner is you") diff --git a/code/unit_tests/gamemode_tests.dm b/code/unit_tests/gamemode_tests.dm index 3a05bda93d0..74f83c7e875 100644 --- a/code/unit_tests/gamemode_tests.dm +++ b/code/unit_tests/gamemode_tests.dm @@ -2,34 +2,34 @@ name = "GAMEMODE template" /datum/unit_test/gamemode/required_enemies_check - name = "GAMEMODE: All modes shall have required_players and required_enemies greater than the required number of players for their antagonist types." + name = "GAMEMODE: All modes shall have required_players and required_enemies greater than the required number of players for their antagonist types." /datum/unit_test/gamemode/required_enemies_check/start_test() - var/list/failed = list() + var/list/failed = list() - for(var/mode in subtypesof(/datum/game_mode)) - var/datum/game_mode/GM = new mode + for(var/mode in subtypesof(/datum/game_mode)) + var/datum/game_mode/GM = new mode - var/min_antag_count = 0 - for(var/antag_type in GM.antag_tags) - var/datum/antagonist/A = all_antag_types[antag_type] + var/min_antag_count = 0 + for(var/antag_type in GM.antag_tags) + var/datum/antagonist/A = all_antag_types[antag_type] - if(GM.require_all_templates) - min_antag_count += A.initial_spawn_req - else - min_antag_count = max(min_antag_count, A.initial_spawn_req) + if(GM.require_all_templates) + min_antag_count += A.initial_spawn_req + else + min_antag_count = max(min_antag_count, A.initial_spawn_req) - if(min_antag_count != GM.required_enemies) - failed += "[GM] ([GM.type]) requires [GM.required_enemies] enemies but its antagonist roles require [min_antag_count] players!" - if(min_antag_count > GM.required_players) - failed += "[GM] ([GM.type]) requires [GM.required_players] players but its antagonist roles require [min_antag_count] players!" + if(min_antag_count != GM.required_enemies) + failed += "[GM] ([GM.type]) requires [GM.required_enemies] enemies but its antagonist roles require [min_antag_count] players!" + if(min_antag_count > GM.required_players) + failed += "[GM] ([GM.type]) requires [GM.required_players] players but its antagonist roles require [min_antag_count] players!" - if(failed.len) - TEST_FAIL("Some gamemodes did not have high enough required_enemies or required_players.") - for(var/failed_message in failed) - TEST_FAIL(failed_message) - else - TEST_PASS("All gamemodes had suitable required_enemies and required_players.") + if(failed.len) + TEST_FAIL("Some gamemodes did not have high enough required_enemies or required_players.") + for(var/failed_message in failed) + TEST_FAIL(failed_message) + else + TEST_PASS("All gamemodes had suitable required_enemies and required_players.") - return 1 + return 1 diff --git a/code/unit_tests/mob_tests.dm b/code/unit_tests/mob_tests.dm index 51cbe534f92..02ab44ecbdd 100644 --- a/code/unit_tests/mob_tests.dm +++ b/code/unit_tests/mob_tests.dm @@ -198,8 +198,7 @@ /datum/unit_test/mob_damage/start_test() var/list/test = create_test_mob_with_mind(null, mob_type) - var/damage_amount = 5 // Do not raise, if damage >= 10 there is a % chance to reduce damage by half in /obj/item/organ/external/take_damage() - // Which makes checks impossible. + var/damage_amount = 5 // Do not raise, if damage >= 10 there is a % chance to reduce damage by half in /obj/item/organ/external/take_damage(), which makes checks impossible. if(isnull(test)) TEST_FAIL("Check Runtimed in Mob creation") @@ -230,8 +229,7 @@ H.apply_damage(damage_amount, damagetype, damage_location) - H.updatehealth() // Just in case, though at this time apply_damage does this for us. - // We operate with the assumption that someone might mess with that proc one day. + H.updatehealth() // Just in case, though at this time apply_damage does this for us. We operate with the assumption that someone might mess with that proc one day. var/ending_damage = damage_check(H, damagetype) diff --git a/html/changelogs/fluffyghost-fixindentations.yml b/html/changelogs/fluffyghost-fixindentations.yml new file mode 100644 index 00000000000..54f93f66640 --- /dev/null +++ b/html/changelogs/fluffyghost-fixindentations.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - backend: "Fixed indentations that megalinter found." + - backend: "Fixed trailing whitespaces that megalinter found." + - backend: "Refactored some comments in dmdoc." diff --git a/maps/_common/areas/station/civilian.dm b/maps/_common/areas/station/civilian.dm index 94a19dd4a22..0c217fe2858 100644 --- a/maps/_common/areas/station/civilian.dm +++ b/maps/_common/areas/station/civilian.dm @@ -112,10 +112,10 @@ sound_env = LARGE_SOFTFLOOR /area/library - name = "Library" - icon_state = "library" - sound_env = LARGE_SOFTFLOOR - station_area = 1 + name = "Library" + icon_state = "library" + sound_env = LARGE_SOFTFLOOR + station_area = 1 /area/chapel station_area = 1 @@ -216,4 +216,4 @@ /area/journalistoffice name = "Journalist's Office" station_area = 1 - sound_env = SMALL_SOFTFLOOR \ No newline at end of file + sound_env = SMALL_SOFTFLOOR diff --git a/maps/aurora/code/aurora.dm b/maps/aurora/code/aurora.dm index 7d30ab1f7fd..59407f916b1 100644 --- a/maps/aurora/code/aurora.dm +++ b/maps/aurora/code/aurora.dm @@ -2,9 +2,9 @@ name = "Aurora" full_name = "NSS Aurora" description = "You're aboard the NSS Aurora, a state-of-the-art station specializing in phoron research and acquisition. \ - It is staffed by NanoTrasen personnel and contractors from competing megacorporations. \ - Orbiting at the very edge of the Tau Ceti system, approximately 12 light-years away from Sol, \ - it is under the joint administration of the Republic of Biesel and the trans-stellar corporate conglomerate NanoTrasen." + It is staffed by NanoTrasen personnel and contractors from competing megacorporations. \ + Orbiting at the very edge of the Tau Ceti system, approximately 12 light-years away from Sol, \ + it is under the joint administration of the Republic of Biesel and the trans-stellar corporate conglomerate NanoTrasen." path = "aurora" lobby_icons = list('icons/misc/titlescreens/aurora/nss_aurora.dmi', 'icons/misc/titlescreens/aurora/synthetics.dmi', 'icons/misc/titlescreens/aurora/tajara.dmi', 'icons/misc/titlescreens/aurora/vaurca.dmi') diff --git a/maps/away/away_site/magshield/magshield_areas.dm b/maps/away/away_site/magshield/magshield_areas.dm index 810a0411f8b..da44c764d20 100644 --- a/maps/away/away_site/magshield/magshield_areas.dm +++ b/maps/away/away_site/magshield/magshield_areas.dm @@ -21,7 +21,7 @@ /area/magshield/engine name = "Orbital Station Engine" icon_state = "engine" - + /area/magshield/smes_storage name = "Orbital Station SMES Battery Room" icon_state = "smes_storage" diff --git a/maps/away/ships/dionae/diona_rokz_ship/diona_rokz_ship.dm b/maps/away/ships/dionae/diona_rokz_ship/diona_rokz_ship.dm index c27bf14b626..3ac869b29d1 100644 --- a/maps/away/ships/dionae/diona_rokz_ship/diona_rokz_ship.dm +++ b/maps/away/ships/dionae/diona_rokz_ship/diona_rokz_ship.dm @@ -71,8 +71,8 @@ ) /obj/effect/overmap/visitable/ship/diona_rokz_ship/New() - designation = "[pick("Boulder", "Stonecarp", "Gibber")]" - ..() + designation = "[pick("Boulder", "Stonecarp", "Gibber")]" + ..() /obj/effect/overmap/visitable/ship/diona_rokz_ship/get_skybox_representation() var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "diona") diff --git a/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship.dm b/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship.dm index 414bca5d144..9e5e545338b 100644 --- a/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship.dm +++ b/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship.dm @@ -77,8 +77,8 @@ ) /obj/effect/overmap/visitable/ship/diona_serz_ship/New() - designation = "[pick("Trawler", "Floating Spear ", "Harpoon")]" - ..() + designation = "[pick("Trawler", "Floating Spear ", "Harpoon")]" + ..() /obj/effect/overmap/visitable/ship/diona_serz_ship/get_skybox_representation() var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "diona") diff --git a/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship_ghostroles.dm b/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship_ghostroles.dm index c04382bc25d..4ebdf1f3c95 100644 --- a/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship_ghostroles.dm +++ b/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship_ghostroles.dm @@ -34,7 +34,7 @@ ) id = null - + l_ear = /obj/item/device/radio/headset/ship l_pocket = /obj/item/device/radio diff --git a/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm b/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm index 695b09325e9..98445b17673 100644 --- a/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm +++ b/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm @@ -30,8 +30,8 @@ fore_dir = SOUTH vessel_size = SHIP_SIZE_SMALL initial_restricted_waypoints = list( - "Cyclops Shuttle" = list("nav_hangar_cyclops") - ) + "Cyclops Shuttle" = list("nav_hangar_cyclops") + ) initial_generic_waypoints = list( "nav_cyclops_1", "nav_cyclops_2", @@ -41,8 +41,8 @@ invisible_until_ghostrole_spawn = TRUE /obj/effect/overmap/visitable/ship/cyclops_mining/New() - designation = "[pick("Archemedes", "Pallas", "Crius", "Pothos", "Nyx")]" - ..() + designation = "[pick("Archemedes", "Pallas", "Crius", "Pothos", "Nyx")]" + ..() /obj/effect/shuttle_landmark/cyclops base_turf = /turf/space/dynamic @@ -101,6 +101,6 @@ movable_flags = MOVABLE_FLAG_EFFECTMOVE /obj/effect/shuttle_landmark/cyclops_shuttle/transit - name = "In transit" - landmark_tag = "nav_transit_cyclops_shuttle" - base_turf = /turf/space/transit/north \ No newline at end of file + name = "In transit" + landmark_tag = "nav_transit_cyclops_shuttle" + base_turf = /turf/space/transit/north diff --git a/maps/away/ships/kataphracts/kataphract_areas.dm b/maps/away/ships/kataphracts/kataphract_areas.dm index 1d54772527a..4bc300a37ad 100644 --- a/maps/away/ships/kataphracts/kataphract_areas.dm +++ b/maps/away/ships/kataphracts/kataphract_areas.dm @@ -112,7 +112,7 @@ ambience = AMBIENCE_HANGAR sound_env = HANGAR -/area/kataphract_chapter/cic +/area/kataphract_chapter/cic name = "Kataphract Chapter - Combat Information Center" icon_state = "security" diff --git a/maps/away/ships/skrell_smuggler/tirakqi_freighter.dm b/maps/away/ships/skrell_smuggler/tirakqi_freighter.dm index 6a1d162484c..853568bc309 100644 --- a/maps/away/ships/skrell_smuggler/tirakqi_freighter.dm +++ b/maps/away/ships/skrell_smuggler/tirakqi_freighter.dm @@ -54,8 +54,8 @@ invisible_until_ghostrole_spawn = TRUE /obj/effect/overmap/visitable/ship/tirakqi_freighter/New() - designation = "[pick("Bigger Squib", "Frightful Whaler", "Star Spanner", "Lu'Kaax", "Star Scamp", "Ocean Ink", "Yippi")]" - ..() + designation = "[pick("Bigger Squib", "Frightful Whaler", "Star Spanner", "Lu'Kaax", "Star Scamp", "Ocean Ink", "Yippi")]" + ..() /obj/effect/overmap/visitable/ship/tirakqi_freighter/get_skybox_representation() var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "skrell_freighter") diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm index a5023c331b6..e35210c8aa9 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm @@ -46,8 +46,8 @@ invisible_until_ghostrole_spawn = TRUE /obj/effect/overmap/visitable/ship/tajaran_smuggler/New() - designation = "[pick("Brave Ha'rron", "Trickster Farwa", "Legal and Safe Cargo", "Adhomian Trader", "Minharrzka", "Rredouane's Chosen", "Adhomai's Pride")]" - ..() + designation = "[pick("Brave Ha'rron", "Trickster Farwa", "Legal and Safe Cargo", "Adhomian Trader", "Minharrzka", "Rredouane's Chosen", "Adhomai's Pride")]" + ..() /obj/effect/shuttle_landmark/tajaran_smuggler/nav1 name = "Adhomian Freighter - Port Side" diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dm b/maps/away/ships/tramp_freighter/tramp_freighter.dm index 31e1ae254d6..23a4b172ca9 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter.dm +++ b/maps/away/ships/tramp_freighter/tramp_freighter.dm @@ -53,8 +53,8 @@ invisible_until_ghostrole_spawn = TRUE /obj/effect/overmap/visitable/ship/tramp_freighter/New() - designation = "[pick("Tuckerbag", "Do No Harm", "Volatile Cargo", "Stay Clear", "Entrepreneurial", "Good Things Only", "Worthless", "Skip This One", "Pay No Mind", "Customs-Cleared", "Friendly", "Reactor Leak", "Fool's Gold", "Cursed Cargo", "Guards Aboard")]" - ..() + designation = "[pick("Tuckerbag", "Do No Harm", "Volatile Cargo", "Stay Clear", "Entrepreneurial", "Good Things Only", "Worthless", "Skip This One", "Pay No Mind", "Customs-Cleared", "Friendly", "Reactor Leak", "Fool's Gold", "Cursed Cargo", "Guards Aboard")]" + ..() /obj/effect/overmap/visitable/ship/tramp_freighter/get_skybox_representation() var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "tramp_freighter") diff --git a/maps/away/ships/wildlands_militia/militia_ship.dm b/maps/away/ships/wildlands_militia/militia_ship.dm index 3e9247b296d..94899932332 100644 --- a/maps/away/ships/wildlands_militia/militia_ship.dm +++ b/maps/away/ships/wildlands_militia/militia_ship.dm @@ -46,8 +46,8 @@ invisible_until_ghostrole_spawn = TRUE /obj/effect/overmap/visitable/ship/militia_ship/New() - designation = "[pick("Volunteer", "Part-Timer", "Last Line", "Fearless", "Protector", "Minuteman", "Watchdog", "Family Man", "Guardian", "Hoplite", "Home Guard", "Defender")]" - ..() + designation = "[pick("Volunteer", "Part-Timer", "Last Line", "Fearless", "Protector", "Minuteman", "Watchdog", "Family Man", "Guardian", "Hoplite", "Home Guard", "Defender")]" + ..() /obj/effect/shuttle_landmark/militia_ship/nav1 name = "Militia Ship - Port Side" diff --git a/maps/away/ships/yacht/yacht_areas.dm b/maps/away/ships/yacht/yacht_areas.dm index b3498bdd4f4..a501966e2f8 100644 --- a/maps/away/ships/yacht/yacht_areas.dm +++ b/maps/away/ships/yacht/yacht_areas.dm @@ -1,7 +1,7 @@ /area/shuttle/yacht icon = 'maps/away/ships/yacht/yacht_icons.dmi' requires_power = TRUE - + /area/shuttle/yacht/bridge name = "\improper Yacht Bridge" icon_state = "bridge" @@ -12,4 +12,4 @@ /area/shuttle/yacht/engine name = "\improper Yacht Engine" - icon_state = "engine" + icon_state = "engine" diff --git a/maps/event/rooftop/code/rooftop.dm b/maps/event/rooftop/code/rooftop.dm index f2a72630858..44ac8f41d26 100644 --- a/maps/event/rooftop/code/rooftop.dm +++ b/maps/event/rooftop/code/rooftop.dm @@ -25,4 +25,4 @@ map_shuttles = list( /datum/shuttle/autodock/ferry/city - ) \ No newline at end of file + ) diff --git a/maps/event/rooftop/code/rooftop_shuttles.dm b/maps/event/rooftop/code/rooftop_shuttles.dm index d2c1979e78b..9c15f0ffada 100644 --- a/maps/event/rooftop/code/rooftop_shuttles.dm +++ b/maps/event/rooftop/code/rooftop_shuttles.dm @@ -28,4 +28,4 @@ docking_controller = "city_shuttle_dock" landmark_flags = SLANDMARK_FLAG_AUTOSET base_turf = /turf/unsimulated/floor/plating - base_area = /area/city/mendell \ No newline at end of file + base_area = /area/city/mendell diff --git a/maps/random_ruins/exoplanets/asteroid/mystery_ship/mystery_ship_areas.dm b/maps/random_ruins/exoplanets/asteroid/mystery_ship/mystery_ship_areas.dm index c5b84168448..a2766d8de44 100644 --- a/maps/random_ruins/exoplanets/asteroid/mystery_ship/mystery_ship_areas.dm +++ b/maps/random_ruins/exoplanets/asteroid/mystery_ship/mystery_ship_areas.dm @@ -24,4 +24,4 @@ /area/ship/mystery_ship/auxillary_storage name = "Auxillary Storage" /area/ship/mystery_ship/research - name = "Research" \ No newline at end of file + name = "Research" diff --git a/maps/random_ruins/exoplanets/burzsia/burzsia_dead_ipc.dm b/maps/random_ruins/exoplanets/burzsia/burzsia_dead_ipc.dm index 04195a119eb..3cee321f1d9 100644 --- a/maps/random_ruins/exoplanets/burzsia/burzsia_dead_ipc.dm +++ b/maps/random_ruins/exoplanets/burzsia/burzsia_dead_ipc.dm @@ -7,4 +7,4 @@ spawn_cost = 1 template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED sectors = list(SECTOR_BURZSIA) - suffixes = list("burzsia/burzsia_dead_ipc.dmm") \ No newline at end of file + suffixes = list("burzsia/burzsia_dead_ipc.dmm") diff --git a/maps/random_ruins/exoplanets/crashed_pod/crashed_pod.dm b/maps/random_ruins/exoplanets/crashed_pod/crashed_pod.dm index 5de59cb0edd..bc1eb30a243 100644 --- a/maps/random_ruins/exoplanets/crashed_pod/crashed_pod.dm +++ b/maps/random_ruins/exoplanets/crashed_pod/crashed_pod.dm @@ -14,5 +14,5 @@ return /area/map_template/crashed_pod - name = "Crashed Pod" - icon_state = "blue" + name = "Crashed Pod" + icon_state = "blue" diff --git a/maps/random_ruins/space_ruins/space_ruins.dm b/maps/random_ruins/space_ruins/space_ruins.dm index ab62ef07e90..df347dc7641 100644 --- a/maps/random_ruins/space_ruins/space_ruins.dm +++ b/maps/random_ruins/space_ruins/space_ruins.dm @@ -9,4 +9,4 @@ id = "multi_zas_test" description = "if this has vacuum in it, that's not good!" suffixes = list("multi_zas_test.dmm") - spawn_cost = 1 \ No newline at end of file + spawn_cost = 1 diff --git a/maps/runtime/code/runtime_lifts.dm b/maps/runtime/code/runtime_lifts.dm index e990c39a585..ea9c809d7ec 100644 --- a/maps/runtime/code/runtime_lifts.dm +++ b/maps/runtime/code/runtime_lifts.dm @@ -9,4 +9,4 @@ areas_to_use = list( /area/turbolift/main_station, /area/turbolift/main_mid - ) \ No newline at end of file + ) diff --git a/maps/sccv_horizon/code/sccv_horizon_structures.dm b/maps/sccv_horizon/code/sccv_horizon_structures.dm index 59be1efea0e..38388513583 100644 --- a/maps/sccv_horizon/code/sccv_horizon_structures.dm +++ b/maps/sccv_horizon/code/sccv_horizon_structures.dm @@ -62,4 +62,4 @@ /obj/structure/tank_wall/nitrous_oxide name = "nitrous oxide tank" desc = "An impact resistant tank to safely contain highly pressurised gasses. This one contains nitrous oxide." - icon_state = "h1" \ No newline at end of file + icon_state = "h1" diff --git a/maps/sccv_horizon/code/sccv_horizon_unittest.dm b/maps/sccv_horizon/code/sccv_horizon_unittest.dm index 9c9bf1264cf..6bc294795c3 100644 --- a/maps/sccv_horizon/code/sccv_horizon_unittest.dm +++ b/maps/sccv_horizon/code/sccv_horizon_unittest.dm @@ -53,4 +53,4 @@ /datum/unit_test/zas_area_test/sccv_horizon/storage name = "ZAS: Operations Bay" - area_path = /area/operations/storage \ No newline at end of file + area_path = /area/operations/storage diff --git a/maps/templates/distress/distress_equipment.dm b/maps/templates/distress/distress_equipment.dm index 9540fbf3d77..a6e3962e8ad 100644 --- a/maps/templates/distress/distress_equipment.dm +++ b/maps/templates/distress/distress_equipment.dm @@ -8,4 +8,4 @@ /datum/map_template/distress_freelancers name = "freelancer distress equipment" - mappaths = list("maps/templates/distress/freelancers.dmm") \ No newline at end of file + mappaths = list("maps/templates/distress/freelancers.dmm") diff --git a/tools/Redirector/textprocs.dm b/tools/Redirector/textprocs.dm index 6d3cc6c30c7..94e1d07603a 100644 --- a/tools/Redirector/textprocs.dm +++ b/tools/Redirector/textprocs.dm @@ -20,9 +20,9 @@ proc return dd_text2list(file2text(file), separator) - //////////////////// - // Replacing text // - //////////////////// + //////////////////// + // Replacing text // + //////////////////// dd_replacetext(text, search_string, replacement_string) // A nice way to do this is to split the text into an array based on the search_string, // then put it back together into text using replacement_string as the new separator. @@ -35,7 +35,7 @@ proc return dd_list2text(textList, replacement_string) - ///////////////////// + ///////////////////// // Prefix checking // ///////////////////// dd_hasprefix(text, prefix) @@ -49,7 +49,7 @@ proc return findtextEx(text, prefix, start, end) - ///////////////////// + ///////////////////// // Suffix checking // ///////////////////// dd_hassuffix(text, suffix) @@ -147,4 +147,4 @@ proc if (size <= length) return message else - return copytext(message, 1, length + 1) \ No newline at end of file + return copytext(message, 1, length + 1)