From 24cd190989f109bafed393ee305eb74379d1706e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Mon, 1 May 2023 20:53:13 +0300 Subject: [PATCH 01/20] All the colors (#2) * making them colorful * fixing --- cev_eris.dme | 6 + code/__DEFINES/colors.dm | 3 + code/game/objects/effects/chem/water.dm | 3 +- proxima/code/game/atoms.dm | 10 + proxima/code/game/objects/effects/misc.dm | 149 +++++ .../objects/items/devices/paint_sprayer.dm | 202 ++++++ .../code/game/objects/structures/window.dm | 8 + .../game/turf/flooring/flooring_decals.dm | 617 ++++++++++++++++++ proxima/code/game/turf/simulated/walls.dm | 9 + 9 files changed, 1006 insertions(+), 1 deletion(-) create mode 100644 proxima/code/game/atoms.dm create mode 100644 proxima/code/game/objects/effects/misc.dm create mode 100644 proxima/code/game/objects/items/devices/paint_sprayer.dm create mode 100644 proxima/code/game/objects/structures/window.dm create mode 100644 proxima/code/game/turf/flooring/flooring_decals.dm create mode 100644 proxima/code/game/turf/simulated/walls.dm diff --git a/cev_eris.dme b/cev_eris.dme index b72dd7f049e..6b4fa151cb6 100644 --- a/cev_eris.dme +++ b/cev_eris.dme @@ -2836,4 +2836,10 @@ #include "maps\submaps\planetary_ruins\radshrine\radshrine.dm" #include "maps\submaps\planetary_ruins\spider_nest\spider_nest.dm" #include "maps\submaps\planetary_ruins\tar_anomaly\tar_anomaly.dm" +#include "proxima\code\game\atoms.dm" +#include "proxima\code\game\turf\simulated\walls.dm" +#include "proxima\code\game\objects\structures\window.dm" +#include "proxima\code\game\turf\flooring\flooring_decals.dm" +#include "proxima\code\game\objects\effects\misc.dm" +#include "proxima\code\game\objects\items\devices\paint_sprayer.dm" // END_INCLUDE diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 2780c6da196..9577b3941dc 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -44,6 +44,7 @@ #define COLOR_BOTTLE_GREEN "#1f6b4f" #define COLOR_PALE_BTL_GREEN "#57967f" #define COLOR_GUNMETAL "#545c68" +#define COLOR_WALL_GUNMETAL "#353a42" #define COLOR_MUZZLE_FLASH "#ffffb2" #define COLOR_CHESTNUT "#996633" #define COLOR_BEASTY_BROWN "#663300" @@ -52,6 +53,7 @@ #define COLOR_LIGHT_CYAN "#66ccff" #define COLOR_PAKISTAN_GREEN "#006600" #define COLOR_HULL "#436b8e" +#define COLOR_HULL_BLUE "#436b8e" #define COLOR_AMBER "#ffbf00" #define COLOR_COMMAND_BLUE "#46698c" #define COLOR_SKY_BLUE "#5ca1cc" @@ -60,6 +62,7 @@ #define COLOR_TITANIUM "#d1e6e3" #define COLOR_DARK_GUNMETAL "#4c535b" #define COLOR_INDIGO "#4b0082" +#define COLOR_ALUMINIUM "#bbbbbb" #define COLOR_DARK_BLUE_GRAY "#3e4855" #define COLOR_ASTEROID_ROCK "#735555" #define COLOR_PALE_YELLOW "#c1bb7a" diff --git a/code/game/objects/effects/chem/water.dm b/code/game/objects/effects/chem/water.dm index 03fce10777a..47e26247944 100644 --- a/code/game/objects/effects/chem/water.dm +++ b/code/game/objects/effects/chem/water.dm @@ -11,7 +11,8 @@ if(src) qdel(src) -/obj/effect/effect/water/proc/set_color() // Call it after you move reagents to it +// PRX - was a separate proc now moved to /atom/proc/set_color() +/obj/effect/effect/water/set_color() // Call it after you move reagents to it icon += reagents.get_color() /obj/effect/effect/water/proc/set_up(var/turf/target, var/step_count = 5, var/delay = 5) diff --git a/proxima/code/game/atoms.dm b/proxima/code/game/atoms.dm new file mode 100644 index 00000000000..4c442ca531b --- /dev/null +++ b/proxima/code/game/atoms.dm @@ -0,0 +1,10 @@ +/atom + var/paint_color + var/can_paint = FALSE + +/atom/proc/get_color() + return paint_color + +/atom/proc/set_color(var/color) + paint_color = color + update_icon() diff --git a/proxima/code/game/objects/effects/misc.dm b/proxima/code/game/objects/effects/misc.dm new file mode 100644 index 00000000000..51234565b67 --- /dev/null +++ b/proxima/code/game/objects/effects/misc.dm @@ -0,0 +1,149 @@ +//The effect when you wrap a dead body in gift wrap +/obj/effect/spresent + name = "strange present" + desc = "It's a ... present?" + icon = 'icons/obj/items.dmi' + icon_state = "strangepresent" + density = TRUE + anchored = FALSE + +//Paints the wall it spawns on, then dies +/obj/effect/paint + name = "coat of paint" + icon = 'icons/effects/effects.dmi' + icon_state = "wall_paint_effect" + layer = TURF_PLATING_DECAL_LAYER + blend_mode = BLEND_MULTIPLY + +/obj/effect/paint/Initialize() + . = ..() + return INITIALIZE_HINT_LATELOAD + +/obj/effect/paint/LateInitialize() + var/turf/simulated/wall/W = get_turf(src) + if(istype(W)) + W.paint_color = color + W.update_icon() + qdel(src) + +/obj/effect/paint/pink + color = COLOR_PINK + +/obj/effect/paint/sun + color = COLOR_SUN + +/obj/effect/paint/red + color = COLOR_RED + +/obj/effect/paint/silver + color = COLOR_SILVER + +/obj/effect/paint/black + color = COLOR_DARK_GRAY + +/obj/effect/paint/green + color = COLOR_GREEN_GRAY + +/obj/effect/paint/blue + color = COLOR_NAVY_BLUE + +/obj/effect/paint/ocean + color = COLOR_OCEAN + +/obj/effect/paint/palegreengray + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/paint/brown + color = COLOR_DARK_BROWN + +/obj/effect/paint/gunmetal_dark + color = COLOR_WALL_GUNMETAL + +/obj/effect/paint/hull_blue + color = COLOR_HULL_BLUE + +//Stripes the wall it spawns on, then dies +/obj/effect/paint_stripe + name = "stripe of paint" + icon = 'icons/effects/effects.dmi' + icon_state = "white" + layer = TURF_PLATING_DECAL_LAYER + blend_mode = BLEND_MULTIPLY + +/obj/effect/paint_stripe/Initialize() + . = ..() + return INITIALIZE_HINT_LATELOAD + +/obj/effect/paint_stripe/LateInitialize() + var/turf/simulated/wall/W = get_turf(src) + if(istype(W)) + W.stripe_color = color + W.update_icon() + qdel(src) + +/obj/effect/paint_stripe/green + color = COLOR_GREEN_GRAY + +/obj/effect/paint_stripe/red + color = COLOR_RED_GRAY + +/obj/effect/paint_stripe/paleblue + color = COLOR_PALE_BLUE_GRAY + +/obj/effect/paint_stripe/yellow + color = COLOR_BROWN + +/obj/effect/paint_stripe/blue + color = COLOR_BLUE_GRAY + +/obj/effect/paint_stripe/brown + color = COLOR_DARK_BROWN + +/obj/effect/paint_stripe/mauve + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/paint_stripe/white + color = COLOR_SILVER + +/obj/effect/paint_stripe/gunmetal + color = COLOR_GUNMETAL + +/obj/effect/paint_stripe/gunmetal_dark + color = COLOR_WALL_GUNMETAL + +/obj/effect/paint_stripe/hull_blue + color = COLOR_HULL_BLUE +/* +/obj/effect/gas_setup //cryogenic + icon = 'icons/mob/screen1.dmi' + icon_state = "x3" + var/tempurature = 70 + var/pressure = 20* ONE_ATMOSPHERE + +/obj/effect/gas_setup/Initialize() + SHOULD_CALL_PARENT(FALSE) + atom_flags |= ATOM_FLAG_INITIALIZED + var/obj/machinery/atmospherics/pipe/P = locate() in loc + if(P && !P.air_temporary) + P.air_temporary = new(P.volume, tempurature) + var/datum/gas_mixture/G = P.air_temporary + G.adjust_gas(GAS_OXYGEN,((pressure*P.volume)/(R_IDEAL_GAS_EQUATION*temperature))) + return INITIALIZE_HINT_QDEL + + +/obj/effect/heat + icon = 'icons/effects/fire.dmi' + icon_state = "3" + render_target = HEAT_EFFECT_TARGET + mouse_opacity = MOUSE_OPACITY_UNCLICKABLE + +/// Example of a warp filter +/obj/effect/effect/warp + plane = WARP_EFFECT_PLANE + appearance_flags = PIXEL_SCALE + icon = 'icons/effects/352x352.dmi' + icon_state = "singularity_s11" + pixel_x = -176 + pixel_y = -176 + z_flags = ZMM_IGNORE +*/ diff --git a/proxima/code/game/objects/items/devices/paint_sprayer.dm b/proxima/code/game/objects/items/devices/paint_sprayer.dm new file mode 100644 index 00000000000..4a767bb2a92 --- /dev/null +++ b/proxima/code/game/objects/items/devices/paint_sprayer.dm @@ -0,0 +1,202 @@ +/obj/item/device/floor_painter + name = "wall painter" + + decals = list( + "Quarter-turf" = list("path" = /obj/effect/floor_decal/corner, "precise" = 1, "colored" = 1), + "Monotile full" = list("path" = /obj/effect/floor_decal/corner/white/mono, "colored" = 1), + "Monotile halved" = list("path" = /obj/effect/floor_decal/corner/white/half, "colored" = 1), + "hazard stripes" = list("path" = /obj/effect/floor_decal/industrial/warning), + "corner, hazard" = list("path" = /obj/effect/floor_decal/industrial/warning/corner), + "hatched marking" = list("path" = /obj/effect/floor_decal/industrial/hatch, "coloured" = 1), + "dotted outline" = list("path" = /obj/effect/floor_decal/industrial/outline, "coloured" = 1), + "loading sign" = list("path" = /obj/effect/floor_decal/industrial/loading), + "mosaic, large" = list("path" = /obj/effect/floor_decal/chapel), + "1" = list("path" = /obj/effect/floor_decal/sign), + "2" = list("path" = /obj/effect/floor_decal/sign/two), + "A" = list("path" = /obj/effect/floor_decal/sign/a), + "B" = list("path" = /obj/effect/floor_decal/sign/b), + "C" = list("path" = /obj/effect/floor_decal/sign/c), + "D" = list("path" = /obj/effect/floor_decal/sign/d), + "M" = list("path" = /obj/effect/floor_decal/sign/m), + "V" = list("path" = /obj/effect/floor_decal/sign/v), + "CMO" = list("path" = /obj/effect/floor_decal/sign/cmo), + "Ex" = list("path" = /obj/effect/floor_decal/sign/ex), + "Psy" = list("path" = /obj/effect/floor_decal/sign/p), + "remove all decals" = list("path" = /obj/effect/floor_decal/reset) + ) + paint_dirs = list( + "north" = NORTH, + "northwest" = NORTHWEST, + "west" = WEST, + "southwest" = SOUTHWEST, + "south" = SOUTH, + "southeast" = SOUTHEAST, + "east" = EAST, + "northeast" = NORTHEAST, + "precise" = 0 + ) + var/list/preset_colors = list( + "Beasty brown" = COLOR_BEASTY_BROWN, + "Blue" = COLOR_BLUE_GRAY, + "Civvie green" = COLOR_CIVIE_GREEN, + "Command blue" = COLOR_COMMAND_BLUE, + "Cyan" = COLOR_CYAN, + "Green" = COLOR_GREEN, + "Bottle green" = COLOR_PALE_BTL_GREEN, + "Nanotrasen red" = COLOR_NT_RED, + "Orange" = COLOR_ORANGE, + "Pale orange" = COLOR_PALE_ORANGE, + "Red" = COLOR_RED, + "Sky blue" = COLOR_DEEP_SKY_BLUE, + "Titanium" = COLOR_TITANIUM, + "Aluminium"= COLOR_ALUMINIUM, + "Violet" = COLOR_VIOLET, + "White" = COLOR_WHITE, + "Yellow" = COLOR_AMBER, + "Sol blue" = COLOR_HULL_BLUE, + "Bulkhead black" = COLOR_WALL_GUNMETAL, + "Remove all colors"=null + ) + +/obj/item/device/floor_painter/afterattack(var/atom/A, var/mob/user, proximity, params) + if(!proximity) + return + + if(istype(A, /turf/simulated/wall)) + paint_wall() + return + + if(istype(A, /turf/simulated/floor)) + paint_floor() + return + return + +/obj/item/device/floor_painter/proc/paint_wall(/var/atom/A, var/mob/user) + if ((A.can_paint == TRUE) && paint_colour) + A.set_color(paint_color) + add_fingerprint(user) + . = TRUE + +/obj/item/device/floor_painter/proc/paint_floor(/var/turf/simulated/floor/F, var/mob/user, params) + if(!F.flooring || !F.flooring.can_paint || F.broken || F.burnt) + to_chat(user, SPAN_WARNING("\The [src] cannot paint broken or missing tiles.")) + return + + var/list/decal_data = decals[decal] + var/config_error + if(!islist(decal_data)) + config_error = 1 + var/painting_decal + if(!config_error) + painting_decal = decal_data["path"] + if(!ispath(painting_decal)) + config_error = 1 + + if(config_error) + to_chat(user, SPAN_WARNING("\The [src] flashes an error light. You might need to reconfigure it.")) + return + + if(F.decals && F.decals.len > 5 && painting_decal != /obj/effect/floor_decal/reset) + to_chat(user, SPAN_WARNING("\The [F] has been painted too much; you need to clear it off.")) + return + var/painting_dir = 0 + + if(paint_dir == "precise") + if(!decal_data["precise"]) + painting_dir = user.dir + else + var/list/mouse_control = params2list(params) + var/mouse_x = text2num(mouse_control["icon-x"]) + var/mouse_y = text2num(mouse_control["icon-y"]) + if(isnum(mouse_x) && isnum(mouse_y)) + if(mouse_x <= 16) + if(mouse_y <= 16) + painting_dir = WEST + else + painting_dir = NORTH + else + if(mouse_y <= 16) + painting_dir = SOUTH + else + painting_dir = EAST + else + painting_dir = user.dir + else if(paint_dirs[paint_dir]) + painting_dir = paint_dirs[paint_dir] + + var/painting_colour + if(decal_data["coloured"] && paint_colour) + painting_colour = paint_colour + + new painting_decal(F, painting_dir, painting_colour) + +/obj/item/device/floor_painter/attack_self(var/mob/user) + var/choice = input("Do you wish to change the decal type, paint direction, or paint colour?") as null|anything in list("Decal","Direction", "Colour Selector", "Colour Presets") + if(choice == "Decal") + choose_decal() + else if(choice == "Direction") + choose_direction() + else if(choice == "Colour Selector") + choose_colour() + else if(choice == "Colour Presets") + choose_preset_color() + +/obj/item/device/floor_painter/examine(mob/user) + ..(user) + to_chat(user, "It is configured to produce the '[decal]' decal with a direction of '[paint_dir]' using [paint_colour] paint.") + +/obj/item/device/floor_painter/choose_colour() + set name = "Choose Colour" + set desc = "Choose a floor painter colour." + set category = "Object" + set src in usr + + if(usr.incapacitated()) + return + var/new_colour = input(usr, "Choose a colour.", "Floor painter", paint_colour) as color|null + if(new_colour && new_colour != paint_colour) + paint_colour = new_colour + to_chat(usr, SPAN_NOTICE("You set \the [src] to paint with a new colour.")) + +/obj/item/device/floor_painter/choose_decal() + set name = "Choose Decal" + set desc = "Choose a floor painter decal." + set category = "Object" + set src in usr + + if(usr.incapacitated()) + return + + var/new_decal = input("Select a decal.") as null|anything in decals + if(new_decal && !isnull(decals[new_decal])) + decal = new_decal + to_chat(usr, SPAN_NOTICE("You set \the [src] decal to '[decal]'.")) + +/obj/item/device/floor_painter/choose_direction() + set name = "Choose Direction" + set desc = "Choose a floor painter direction." + set category = "Object" + set src in usr + + if(usr.incapacitated()) + return + + var/new_dir = input("Select a direction.") as null|anything in paint_dirs + if(new_dir && !isnull(paint_dirs[new_dir])) + paint_dir = new_dir + to_chat(usr, SPAN_NOTICE("You set \the [src] direction to '[paint_dir]'.")) + +/obj/item/device/floor_painter/verb/choose_preset_color() + set name = "Choose Preset color" + set desc = "Choose a preset color." + set category = "Object" + set src in usr + + if(usr.incapacitated()) + return + var/preset = input(usr, "Choose a color.", name, paint_color) as null|anything in preset_colors + if(usr.incapacitated()) + return + if(preset && preset != paint_colour) + paint_colour = preset + to_chat(usr, SPAN_NOTICE("You set \the [src] to paint with a new colour.")) diff --git a/proxima/code/game/objects/structures/window.dm b/proxima/code/game/objects/structures/window.dm new file mode 100644 index 00000000000..d9bb75b6ad5 --- /dev/null +++ b/proxima/code/game/objects/structures/window.dm @@ -0,0 +1,8 @@ +/obj/structure/window + can_paint = TRUE + +/turf/structure/window/examine(mob/user) + . = ..() + + if(paint_color) + to_chat(user, "It has a coat of paint applied.") diff --git a/proxima/code/game/turf/flooring/flooring_decals.dm b/proxima/code/game/turf/flooring/flooring_decals.dm new file mode 100644 index 00000000000..a543edb4e62 --- /dev/null +++ b/proxima/code/game/turf/flooring/flooring_decals.dm @@ -0,0 +1,617 @@ +/obj/effect/floor_decal/corner + icon_state = "corner_white" + alpha = 229 + +/obj/effect/floor_decal/corner/black + name = "black corner" + color = "#333333" + +/obj/effect/floor_decal/corner/black/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/black/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/black/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/black/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/black/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/black/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/black/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/black/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/black/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/black/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/blue + name = "blue corner" + color = COLOR_BLUE_GRAY + +/obj/effect/floor_decal/corner/blue/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/blue/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/blue/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/blue/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/blue/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/blue/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/blue/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/blue/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/blue/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/blue/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/paleblue + name = "pale blue corner" + color = COLOR_PALE_BLUE_GRAY + +/obj/effect/floor_decal/corner/paleblue/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/paleblue/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/paleblue/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/paleblue/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/paleblue/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/paleblue/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/paleblue/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/paleblue/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/paleblue/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/paleblue/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/green + name = "green corner" + color = COLOR_GREEN_GRAY + +/obj/effect/floor_decal/corner/green/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/green/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/green/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/green/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/green/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/green/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/green/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/green/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/green/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/green/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/lime + name = "lime corner" + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/floor_decal/corner/lime/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/lime/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/lime/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/lime/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/lime/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/lime/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/lime/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/lime/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/lime/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/lime/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/yellow + name = "yellow corner" + color = COLOR_BROWN + +/obj/effect/floor_decal/corner/yellow/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/yellow/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/yellow/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/yellow/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/yellow/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/yellow/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/yellow/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/yellow/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/yellow/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/yellow/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/beige + name = "beige corner" + color = COLOR_BEIGE + +/obj/effect/floor_decal/corner/beige/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/beige/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/beige/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/beige/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/beige/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/beige/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/beige/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/beige/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/beige/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/beige/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/red + name = "red corner" + color = COLOR_RED_GRAY + +/obj/effect/floor_decal/corner/red/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/red/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/red/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/red/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/red/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/red/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/red/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/red/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/red/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/red/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/pink + name = "pink corner" + color = COLOR_PALE_RED_GRAY + +/obj/effect/floor_decal/corner/pink/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/pink/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/pink/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/pink/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/pink/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/pink/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/pink/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/pink/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/pink/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/pink/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/purple + name = "purple corner" + color = COLOR_PURPLE_GRAY + +/obj/effect/floor_decal/corner/purple/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/purple/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/purple/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/purple/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/purple/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/purple/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/purple/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/purple/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/purple/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/purple/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/mauve + name = "mauve corner" + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/floor_decal/corner/mauve/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/mauve/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/mauve/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/mauve/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/mauve/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/mauve/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/mauve/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/mauve/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/mauve/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/mauve/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/orange + name = "orange corner" + color = COLOR_DARK_ORANGE + +/obj/effect/floor_decal/corner/orange/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/orange/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/orange/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/orange/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/orange/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/orange/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/orange/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/orange/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/orange/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/orange/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/brown + name = "brown corner" + color = COLOR_DARK_BROWN + +/obj/effect/floor_decal/corner/brown/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/brown/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/brown/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/brown/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/brown/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/brown/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/brown/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/brown/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/brown/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/brown/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/white + name = "white corner" + icon_state = "corner_white" + +/obj/effect/floor_decal/corner/white/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/white/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/white/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/white/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/white/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/grey + name = "grey corner" + color = "#8d8c8c" + +/obj/effect/floor_decal/corner/grey/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/grey/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/grey/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/white/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/grey/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/grey/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/white/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/white/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/white/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/white/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/grey/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/grey/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/grey/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/grey/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/grey/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/grey/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/grey/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/lightgrey + name = "lightgrey corner" + color = "#a8b2b6" + +/obj/effect/floor_decal/corner/lightgrey/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/lightgrey/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/lightgrey/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/lightgrey/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/lightgrey/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/lightgrey/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/lightgrey/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/lightgrey/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/lightgrey/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/lightgrey/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/b_green + name = "bottle green corner" + color = COLOR_PALE_BTL_GREEN + +/obj/effect/floor_decal/corner/b_green/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/b_green/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/b_green/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/b_green/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/b_green/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/b_green/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/b_green/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/b_green/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/b_green/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/b_green/bordercee + icon_state = "bordercolorcee" + +/obj/effect/floor_decal/corner/research/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/floor_decal/corner/research/three_quarters + icon_state = "corner_white_three_quarters" + +/obj/effect/floor_decal/corner/research/full + icon_state = "corner_white_full" + +/obj/effect/floor_decal/corner/research/border + icon_state = "bordercolor" + +/obj/effect/floor_decal/corner/research/half + icon_state = "bordercolorhalf" + +/obj/effect/floor_decal/corner/research/mono + icon_state = "bordercolormonofull" + +/obj/effect/floor_decal/corner/research/bordercorner + icon_state = "bordercolorcorner" + +/obj/effect/floor_decal/corner/research/bordercorner2 + icon_state = "bordercolorcorner2" + +/obj/effect/floor_decal/corner/research/borderfull + icon_state = "bordercolorfull" + +/obj/effect/floor_decal/corner/research/bordercee + icon_state = "bordercolorcee" diff --git a/proxima/code/game/turf/simulated/walls.dm b/proxima/code/game/turf/simulated/walls.dm new file mode 100644 index 00000000000..6d04297dfdb --- /dev/null +++ b/proxima/code/game/turf/simulated/walls.dm @@ -0,0 +1,9 @@ +/turf/simulated/wall + var/stripe_color + can_paint = TRUE + +/turf/simulated/wall/examine(mob/user) + . = ..() + + if(paint_color) + to_chat(user, "It has a coat of paint applied.") From fecc7c6b28762991a218238f141e91304426d132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Mon, 1 May 2023 21:00:18 +0300 Subject: [PATCH 02/20] All the colors round two (#5) * making them colorful * fixing * let be commented for now --- cev_eris.dme | 2 +- proxima/code/game/objects/items/devices/paint_sprayer.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cev_eris.dme b/cev_eris.dme index 6b4fa151cb6..657290fa22a 100644 --- a/cev_eris.dme +++ b/cev_eris.dme @@ -2841,5 +2841,5 @@ #include "proxima\code\game\objects\structures\window.dm" #include "proxima\code\game\turf\flooring\flooring_decals.dm" #include "proxima\code\game\objects\effects\misc.dm" -#include "proxima\code\game\objects\items\devices\paint_sprayer.dm" +// #include "proxima\code\game\objects\items\devices\paint_sprayer.dm" // END_INCLUDE diff --git a/proxima/code/game/objects/items/devices/paint_sprayer.dm b/proxima/code/game/objects/items/devices/paint_sprayer.dm index 4a767bb2a92..b4d53db3b2c 100644 --- a/proxima/code/game/objects/items/devices/paint_sprayer.dm +++ b/proxima/code/game/objects/items/devices/paint_sprayer.dm @@ -71,9 +71,9 @@ return return -/obj/item/device/floor_painter/proc/paint_wall(/var/atom/A, var/mob/user) - if ((A.can_paint == TRUE) && paint_colour) - A.set_color(paint_color) +/obj/item/device/floor_painter/proc/paint_wall(/turf/simulated/wall/W, var/mob/user) + if ((W.can_paint == TRUE) && paint_colour) + W.set_color(paint_color) add_fingerprint(user) . = TRUE From f149150f1a9123810297fc4c398458fdd4bf92bc Mon Sep 17 00:00:00 2001 From: Archemagus <32466328+Archemagus@users.noreply.github.com> Date: Mon, 1 May 2023 21:01:07 +0300 Subject: [PATCH 03/20] TGS integration (#1) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: евиё <71145590+Evie7056@users.noreply.github.com> --- cev_eris.dme | 24 + proxima/code/modules/TGS/TGDMAPI/tgs.dm | 483 ++++++++++++++++++ proxima/code/modules/TGS/TGDMAPI/tgs/LICENSE | 24 + .../code/modules/TGS/TGDMAPI/tgs/README.md | 13 + .../modules/TGS/TGDMAPI/tgs/core/README.md | 9 + .../TGS/TGDMAPI/tgs/core/_definitions.dm | 2 + .../code/modules/TGS/TGDMAPI/tgs/core/core.dm | 156 ++++++ .../modules/TGS/TGDMAPI/tgs/core/datum.dm | 59 +++ .../TGS/TGDMAPI/tgs/core/tgs_version.dm | 28 + .../code/modules/TGS/TGDMAPI/tgs/includes.dm | 21 + .../modules/TGS/TGDMAPI/tgs/v3210/README.md | 6 + .../code/modules/TGS/TGDMAPI/tgs/v3210/api.dm | 244 +++++++++ .../modules/TGS/TGDMAPI/tgs/v3210/commands.dm | 58 +++ .../code/modules/TGS/TGDMAPI/tgs/v4/README.md | 6 + .../code/modules/TGS/TGDMAPI/tgs/v4/api.dm | 312 +++++++++++ .../modules/TGS/TGDMAPI/tgs/v4/commands.dm | 44 ++ .../code/modules/TGS/TGDMAPI/tgs/v5/README.md | 13 + .../TGS/TGDMAPI/tgs/v5/__interop_version.dm | 1 + .../modules/TGS/TGDMAPI/tgs/v5/_defines.dm | 115 +++++ .../code/modules/TGS/TGDMAPI/tgs/v5/api.dm | 228 +++++++++ .../code/modules/TGS/TGDMAPI/tgs/v5/bridge.dm | 95 ++++ .../modules/TGS/TGDMAPI/tgs/v5/chunking.dm | 43 ++ .../modules/TGS/TGDMAPI/tgs/v5/commands.dm | 60 +++ .../modules/TGS/TGDMAPI/tgs/v5/serializers.dm | 59 +++ .../code/modules/TGS/TGDMAPI/tgs/v5/topic.dm | 258 ++++++++++ .../code/modules/TGS/TGDMAPI/tgs/v5/undefs.dm | 112 ++++ .../TGS/TGSIntegration/TGSChatCommands.dm | 469 +++++++++++++++++ .../TGS/TGSIntegration/TGSChatHelpers.dm | 171 +++++++ .../TGS/TGSIntegration/TGSChatHooks.dm | 164 ++++++ .../TGS/TGSIntegration/TGSIntegrationFiles.dm | 15 + proxima/code/modules/TGS/_TGSDefines.dm | 40 ++ 31 files changed, 3332 insertions(+) create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/LICENSE create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/README.md create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/core/README.md create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/core/_definitions.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/core/core.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/core/datum.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/core/tgs_version.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/includes.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v3210/README.md create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v3210/api.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v3210/commands.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v4/README.md create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v4/api.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v4/commands.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v5/README.md create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v5/__interop_version.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v5/_defines.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v5/api.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v5/bridge.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v5/chunking.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v5/commands.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v5/serializers.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v5/topic.dm create mode 100644 proxima/code/modules/TGS/TGDMAPI/tgs/v5/undefs.dm create mode 100644 proxima/code/modules/TGS/TGSIntegration/TGSChatCommands.dm create mode 100644 proxima/code/modules/TGS/TGSIntegration/TGSChatHelpers.dm create mode 100644 proxima/code/modules/TGS/TGSIntegration/TGSChatHooks.dm create mode 100644 proxima/code/modules/TGS/TGSIntegration/TGSIntegrationFiles.dm create mode 100644 proxima/code/modules/TGS/_TGSDefines.dm diff --git a/cev_eris.dme b/cev_eris.dme index 657290fa22a..42740f5e867 100644 --- a/cev_eris.dme +++ b/cev_eris.dme @@ -2836,6 +2836,30 @@ #include "maps\submaps\planetary_ruins\radshrine\radshrine.dm" #include "maps\submaps\planetary_ruins\spider_nest\spider_nest.dm" #include "maps\submaps\planetary_ruins\tar_anomaly\tar_anomaly.dm" +#include "proxima\code\modules\TGS\_TGSDefines.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\includes.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\core\_definitions.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\core\core.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\core\datum.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\core\tgs_version.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\v3210\api.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\v3210\commands.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\v4\api.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\v4\commands.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\__interop_version.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\_defines.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\api.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\bridge.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\chunking.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\commands.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\serializers.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\topic.dm" +#include "proxima\code\modules\TGS\TGDMAPI\tgs\v5\undefs.dm" +#include "proxima\code\modules\TGS\TGSIntegration\TGSChatCommands.dm" +#include "proxima\code\modules\TGS\TGSIntegration\TGSChatHelpers.dm" +#include "proxima\code\modules\TGS\TGSIntegration\TGSChatHooks.dm" +#include "proxima\code\modules\TGS\TGSIntegration\TGSIntegrationFiles.dm" #include "proxima\code\game\atoms.dm" #include "proxima\code\game\turf\simulated\walls.dm" #include "proxima\code\game\objects\structures\window.dm" diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs.dm b/proxima/code/modules/TGS/TGDMAPI/tgs.dm new file mode 100644 index 00000000000..855fdc42854 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs.dm @@ -0,0 +1,483 @@ +// tgstation-server DMAPI + +#define TGS_DMAPI_VERSION "6.4.0" + +// All functions and datums outside this document are subject to change with any version and should not be relied on. + +// CONFIGURATION + +/// Create this define if you want to do TGS configuration outside of this file. +#ifndef TGS_EXTERNAL_CONFIGURATION + +// Comment this out once you've filled in the below. +#error TGS API unconfigured + +// Uncomment this if you wish to allow the game to interact with TGS 3. +// This will raise the minimum required security level of your game to TGS_SECURITY_TRUSTED due to it utilizing call()() +//#define TGS_V3_API + +// Required interfaces (fill in with your codebase equivalent): + +/// Create a global variable named `Name` and set it to `Value`. +#define TGS_DEFINE_AND_SET_GLOBAL(Name, Value) + +/// Read the value in the global variable `Name`. +#define TGS_READ_GLOBAL(Name) + +/// Set the value in the global variable `Name` to `Value`. +#define TGS_WRITE_GLOBAL(Name, Value) + +/// Disallow ANYONE from reflecting a given `path`, security measure to prevent in-game use of DD -> TGS capabilities. +#define TGS_PROTECT_DATUM(Path) + +/// Display an announcement `message` from the server to all players. +#define TGS_WORLD_ANNOUNCE(message) + +/// Notify current in-game administrators of a string `event`. +#define TGS_NOTIFY_ADMINS(event) + +/// Write an info `message` to a server log. +#define TGS_INFO_LOG(message) + +/// Write an warning `message` to a server log. +#define TGS_WARNING_LOG(message) + +/// Write an error `message` to a server log. +#define TGS_ERROR_LOG(message) + +/// Get the number of connected /clients. +#define TGS_CLIENT_COUNT + +#endif + +// EVENT CODES + +/// Before a reboot mode change, extras parameters are the current and new reboot mode enums +#define TGS_EVENT_REBOOT_MODE_CHANGE -1 +/// Before a port change is about to happen, extra parameters is new port +#define TGS_EVENT_PORT_SWAP -2 +/// Before the instance is renamed, extra parameter is the new name +#define TGS_EVENT_INSTANCE_RENAMED -3 +/// After the watchdog reattaches to DD, extra parameter is the new [/datum/tgs_version] of the server +#define TGS_EVENT_WATCHDOG_REATTACH -4 + +/// When the repository is reset to its origin reference. Parameters: Reference name, Commit SHA +#define TGS_EVENT_REPO_RESET_ORIGIN 0 +/// When the repository performs a checkout. Parameters: Checkout git object +#define TGS_EVENT_REPO_CHECKOUT 1 +/// When the repository performs a fetch operation. No parameters +#define TGS_EVENT_REPO_FETCH 2 +/// When the repository test merges. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user +#define TGS_EVENT_REPO_MERGE_PULL_REQUEST 3 +/// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path +#define TGS_EVENT_REPO_PRE_SYNCHRONIZE 4 +/// Before a BYOND install operation begins. Parameters: [/datum/tgs_version] of the installing BYOND +#define TGS_EVENT_BYOND_INSTALL_START 5 +/// When a BYOND install operation fails. Parameters: Error message +#define TGS_EVENT_BYOND_INSTALL_FAIL 6 +/// When the active BYOND version changes. Parameters: (Nullable) [/datum/tgs_version] of the current BYOND, [/datum/tgs_version] of the new BYOND +#define TGS_EVENT_BYOND_ACTIVE_VERSION_CHANGE 7 +/// When the compiler starts running. Parameters: Game directory path, origin commit SHA +#define TGS_EVENT_COMPILE_START 8 +/// When a compile is cancelled. No parameters +#define TGS_EVENT_COMPILE_CANCELLED 9 +/// When a compile fails. Parameters: Game directory path, [TRUE]/[FALSE] based on if the cause for failure was DMAPI validation +#define TGS_EVENT_COMPILE_FAILURE 10 +/// When a compile operation completes. Note, this event fires before the new .dmb is loaded into the watchdog. Consider using the [TGS_EVENT_DEPLOYMENT_COMPLETE] instead. Parameters: Game directory path +#define TGS_EVENT_COMPILE_COMPLETE 11 +/// When an automatic update for the current instance begins. No parameters +#define TGS_EVENT_INSTANCE_AUTO_UPDATE_START 12 +/// When the repository encounters a merge conflict: Parameters: Base SHA, target SHA, base reference, target reference +#define TGS_EVENT_REPO_MERGE_CONFLICT 13 +/// When a deployment completes. No Parameters +#define TGS_EVENT_DEPLOYMENT_COMPLETE 14 +/// Before the watchdog shuts down. Not sent for graceful shutdowns. No parameters. +#define TGS_EVENT_WATCHDOG_SHUTDOWN 15 +/// Before the watchdog detaches for a TGS update/restart. No parameters. +#define TGS_EVENT_WATCHDOG_DETACH 16 +// We don't actually implement these 4 events as the DMAPI can never receive them. +// #define TGS_EVENT_WATCHDOG_LAUNCH 17 +// #define TGS_EVENT_WATCHDOG_CRASH 18 +// #define TGS_EVENT_WORLD_END_PROCESS 19 +// #define TGS_EVENT_WORLD_REBOOT 20 +/// Watchdog event when TgsInitializationComplete() is called. No parameters. +#define TGS_EVENT_WORLD_PRIME 21 +// DMAPI also doesnt implement this +// #define TGS_EVENT_DREAM_DAEMON_LAUNCH 22 + +// OTHER ENUMS + +/// The server will reboot normally. +#define TGS_REBOOT_MODE_NORMAL 0 +/// The server will stop running on reboot. +#define TGS_REBOOT_MODE_SHUTDOWN 1 +/// The watchdog will restart on reboot. +#define TGS_REBOOT_MODE_RESTART 2 + +/// DreamDaemon Trusted security level. +#define TGS_SECURITY_TRUSTED 0 +/// DreamDaemon Safe security level. +#define TGS_SECURITY_SAFE 1 +/// DreamDaemon Ultrasafe security level. +#define TGS_SECURITY_ULTRASAFE 2 + +//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]. + */ +/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 + * This function should not be called before ..() in [/world/proc/New]. + */ +/world/proc/TgsInitializationComplete() + return + +/// Put this at the start of [/world/proc/Topic]. +#define TGS_TOPIC var/tgs_topic_return = TgsTopic(args[1]); if(tgs_topic_return) return tgs_topic_return + +/** + * Call this as late as possible in [world/proc/Reboot]. + */ +/world/proc/TgsReboot() + return + +// DATUM DEFINITIONS +// All datums defined here should be considered read-only + +/// Represents git revision information. +/datum/tgs_revision_information + /// Full SHA of the commit. + var/commit + /// ISO 8601 timestamp of when the commit was created + var/timestamp + /// Full sha of last known remote commit. This may be null if the TGS repository is not currently tracking a remote branch. + var/origin_commit + +/// Represents a version. +/datum/tgs_version + /// The suite/major version number + var/suite + + // This group of variables can be null to represent a wild card + /// The minor version number. null for wildcards + var/minor + /// The patch version number. null for wildcards + var/patch + + /// Legacy version number. Generally null + var/deprecated_patch + + /// Unparsed string value + var/raw_parameter + /// String value minus prefix + var/deprefixed_parameter + +/** + * Returns [TRUE]/[FALSE] based on if the [/datum/tgs_version] contains wildcards. + */ +/datum/tgs_version/proc/Wildcard() + return + +/** + * Returns [TRUE]/[FALSE] based on if the [/datum/tgs_version] equals some other version. + * + * other_version - The [/datum/tgs_version] to compare against. + */ +/datum/tgs_version/proc/Equals(datum/tgs_version/other_version) + return + +/// Represents a merge of a GitHub pull request. +/datum/tgs_revision_information/test_merge + /// The test merge number. + var/number + /// The test merge source's title when it was merged. + var/title + /// The test merge source's body when it was merged. + var/body + /// The Username of the test merge source's author. + var/author + /// An http URL to the test merge source. + var/url + /// The SHA of the test merge when that was merged. + var/head_commit + /// Optional comment left by the TGS user who initiated the merge. + var/comment + +/// Represents a connected chat channel. +/datum/tgs_chat_channel + /// TGS internal channel ID. + var/id + /// User friendly name of the channel. + var/friendly_name + /// Name of the chat connection. This is the IRC server address or the Discord guild. + var/connection_name + /// [TRUE]/[FALSE] based on if the server operator has marked this channel for game admins only. + var/is_admin_channel + /// [TRUE]/[FALSE] if the channel is a private message channel for a [/datum/tgs_chat_user]. + var/is_private_channel + /// Tag string associated with the channel in TGS + var/custom_tag + /// [TRUE]/[FALSE] if the channel supports embeds + var/embeds_supported + +// Represents a chat user +/datum/tgs_chat_user + /// TGS internal user ID. + var/id + // The user's display name. + var/friendly_name + // The string to use to ping this user in a message. + var/mention + /// The [/datum/tgs_chat_channel] the user was from + var/datum/tgs_chat_channel/channel + +/** + * User definable callback for handling TGS events. + * + * event_code - One of the TGS_EVENT_ defines. Extra parameters will be documented in each + */ +/datum/tgs_event_handler/proc/HandleEvent(event_code, ...) + set waitfor = FALSE + return + +/// User definable chat command +/datum/tgs_chat_command + /// The string to trigger this command on a chat bot. e.g `@bot name ...` or `!tgs name ...` + var/name = "" + /// The help text displayed for this command + var/help_text = "" + /// If this command should be available to game administrators only + var/admin_only = FALSE + /// A subtype of [/datum/tgs_chat_command] that is ignored when enumerating available commands. Use this to create shared base /datums for commands. + var/ignore_type + +/** + * Process command activation. Should return a [/datum/tgs_message_content] to respond to the issuer with. + * + * sender - The [/datum/tgs_chat_user] who issued the command. + * params - The trimmed string following the command `/datum/tgs_chat_command/var/name]. + */ +/datum/tgs_chat_command/proc/Run(datum/tgs_chat_user/sender, params) + CRASH("[type] has no implementation for Run()") + +/// User definable chat message +/datum/tgs_message_content + /// The tring content of the message. Must be provided in New(). + var/text + + /// The [/datum/tgs_chat_embed] to embed in the message. Not supported on all chat providers. + var/datum/tgs_chat_embed/structure/embed + +/datum/tgs_message_content/New(text) + if(!istext(text)) + TGS_ERROR_LOG("[/datum/tgs_message_content] created with no text!") + text = null + + src.text = text + +/// User definable chat embed. Currently mirrors Discord chat embeds. See https://discord.com/developers/docs/resources/channel#embed-object-embed-structure for details. +/datum/tgs_chat_embed/structure + var/title + var/description + var/url + + /// Timestamp must be encoded as: time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss"). Use the active timezone. + var/timestamp + + /// Colour must be #AARRGGBB or #RRGGBB hex string + var/colour + + /// See https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure for details. + var/datum/tgs_chat_embed/media/image + + /// See https://discord.com/developers/docs/resources/channel#embed-object-embed-thumbnail-structure for details. + var/datum/tgs_chat_embed/media/thumbnail + + /// See https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure for details. + var/datum/tgs_chat_embed/media/video + + var/datum/tgs_chat_embed/footer/footer + var/datum/tgs_chat_embed/provider/provider + var/datum/tgs_chat_embed/provider/author/author + + var/list/datum/tgs_chat_embed/field/fields + +/// Common datum for similar discord embed medias +/datum/tgs_chat_embed/media + /// Must be set in New(). + var/url + var/width + var/height + var/proxy_url + +/datum/tgs_chat_embed/media/New(url) + if(!istext(url)) + CRASH("[/datum/tgs_chat_embed/media] created with no url!") + + src.url = url + +/// See https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure for details. +/datum/tgs_chat_embed/footer + /// Must be set in New(). + var/text + var/icon_url + var/proxy_icon_url + +/datum/tgs_chat_embed/footer/New(text) + if(!istext(text)) + CRASH("[/datum/tgs_chat_embed/footer] created with no text!") + + src.text = text + +/// See https://discord.com/developers/docs/resources/channel#embed-object-embed-provider-structure for details. +/datum/tgs_chat_embed/provider + var/name + var/url + +/// See https://discord.com/developers/docs/resources/channel#embed-object-embed-author-structure for details. Must have name set in New(). +/datum/tgs_chat_embed/provider/author + var/icon_url + var/proxy_icon_url + +/datum/tgs_chat_embed/provider/author/New(name) + if(!istext(name)) + CRASH("[/datum/tgs_chat_embed/provider/author] created with no name!") + + src.name = name + +/// See https://discord.com/developers/docs/resources/channel#embed-object-embed-field-structure for details. Must have name and value set in New(). +/datum/tgs_chat_embed/field + var/name + var/value + var/is_inline + +/datum/tgs_chat_embed/field/New(name, value) + if(!istext(name)) + CRASH("[/datum/tgs_chat_embed/field] created with no name!") + + if(!istext(value)) + CRASH("[/datum/tgs_chat_embed/field] created with no value!") + + src.name = name + src.value = value + +// API FUNCTIONS + +/// Returns the maximum supported [/datum/tgs_version] of the DMAPI. +/world/proc/TgsMaximumApiVersion() + return + +/// Returns the minimum supported [/datum/tgs_version] of the DMAPI. +/world/proc/TgsMinimumApiVersion() + return + +/** + * Returns [TRUE] if DreamDaemon was launched under TGS, the API matches, and was properly initialized. [FALSE] will be returned otherwise. + */ +/world/proc/TgsAvailable() + return + +// No function below this succeeds if it TgsAvailable() returns FALSE or if TgsNew() has yet to be called. + +/** + * Forces a hard reboot of DreamDaemon by ending the process. + * + * Unlike del(world) clients will try to reconnect. + * If TGS has not requested a [TGS_REBOOT_MODE_SHUTDOWN] DreamDaemon will be launched again + */ +/world/proc/TgsEndProcess() + return + +/** + * Send a message to connected chats. + * + * message - The [/datum/tgs_message_content] to send. + * admin_only: If [TRUE], message will be sent to admin connected chats. Vice-versa applies. + */ +/world/proc/TgsTargetedChatBroadcast(datum/tgs_message_content/message, admin_only = FALSE) + return + +/** + * Send a private message to a specific user. + * + * message - The [/datum/tgs_message_content] to send. + * user: The [/datum/tgs_chat_user] to PM. + */ +/world/proc/TgsChatPrivateMessage(datum/tgs_message_content/message, datum/tgs_chat_user/user) + return + +// The following functions will sleep if a call to TgsNew() is sleeping + +/** + * Send a message to connected chats that are flagged as game-related in TGS. + * + * message - The [/datum/tgs_message_content] to send. + * channels - Optional list of [/datum/tgs_chat_channel]s to restrict the message to. + */ +/world/proc/TgsChatBroadcast(datum/tgs_message_content/message, list/channels = null) + return + +/// Returns the current [/datum/tgs_version] of TGS if it is running the server, null otherwise. +/world/proc/TgsVersion() + return + +/// Returns the current [/datum/tgs_version] of the DMAPI being used if it was activated, null otherwise. +/world/proc/TgsApiVersion() + return + +/// Returns the name of the TGS instance running the game if TGS is present, null otherwise. +/world/proc/TgsInstanceName() + return + +/// Return the current [/datum/tgs_revision_information] of the running server if TGS is present, null otherwise. +/world/proc/TgsRevision() + return + +/// Returns the current BYOND security level as a TGS_SECURITY_ define if TGS is present, null otherwise. +/world/proc/TgsSecurityLevel() + return + +/// Returns a list of active [/datum/tgs_revision_information/test_merge]s if TGS is present, null otherwise. +/world/proc/TgsTestMerges() + return + +/// Returns a list of connected [/datum/tgs_chat_channel]s if TGS is present, null otherwise. +/world/proc/TgsChatChannelInfo() + return + +/* +The MIT License + +Copyright (c) 2017 Jordan Brown + +Permission is hereby granted, free of charge, +to any person obtaining a copy of this software and +associated documentation files (the "Software"), to +deal in the Software without restriction, including +without limitation the rights to use, copy, modify, +merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom +the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/LICENSE b/proxima/code/modules/TGS/TGDMAPI/tgs/LICENSE new file mode 100644 index 00000000000..221f9e1deb2 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/LICENSE @@ -0,0 +1,24 @@ +The MIT License + +Copyright (c) 2017 Jordan Brown + +Permission is hereby granted, free of charge, +to any person obtaining a copy of this software and +associated documentation files (the "Software"), to +deal in the Software without restriction, including +without limitation the rights to use, copy, modify, +merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom +the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/README.md b/proxima/code/modules/TGS/TGDMAPI/tgs/README.md new file mode 100644 index 00000000000..6319028d810 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/README.md @@ -0,0 +1,13 @@ +# DMAPI Internals + +This folder should be placed on it's own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified. + +- [includes.dm](./includes.dm) is the file that should be included by DM code, it handles including the rest. +- The [core](./core) folder includes all code not directly part of any API version. +- The other versioned folders contain code for the different DMAPI versions. + - [v3210](./v3210) contains the final TGS3 API. + - [v4](./v4) is the legacy DMAPI 4 (Used in TGS 4.0.X versions). + - [v5](./v5) is the current DMAPI version used by TGS >=4.1. +- [LICENSE](./LICENSE) is the MIT license for the DMAPI. + +APIs communicate with TGS in two ways. All versions implement TGS -> DM communication using /world/Topic. DM -> TGS communication, called the bridge method, is different for each version. diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/core/README.md b/proxima/code/modules/TGS/TGDMAPI/tgs/core/README.md new file mode 100644 index 00000000000..b82d8f49e29 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/core/README.md @@ -0,0 +1,9 @@ +# Core DMAPI functions + +This folder contains all DMAPI code not directly involved in an API. + +- [_definitions.dm](./definitions.dm) contains defines needed across DMAPI internals. +- [core.dm](./core.dm) contains the implementations of the `/world/proc/TgsXXX()` procs. Many map directly to the `/datum/tgs_api` functions. It also contains the /datum selection and setup code. +- [datum.dm](./datum.dm) contains the `/datum/tgs_api` declarations that all APIs must implement. +- [tgs_version.dm](./tgs_version.dm) contains the `/datum/tgs_version` definition +- diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/core/_definitions.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/core/_definitions.dm new file mode 100644 index 00000000000..ebf6d17c2a0 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/core/_definitions.dm @@ -0,0 +1,2 @@ +#define TGS_UNIMPLEMENTED "___unimplemented" +#define TGS_VERSION_PARAMETER "server_service_version" diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/core/core.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/core/core.dm new file mode 100644 index 00000000000..41a04733945 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/core/core.dm @@ -0,0 +1,156 @@ +/world/TgsNew(datum/tgs_event_handler/event_handler, minimum_required_security_level = TGS_SECURITY_ULTRASAFE) + var/current_api = TGS_READ_GLOBAL(tgs) + if(current_api) + TGS_ERROR_LOG("API datum already set (\ref[current_api] ([current_api]))! Was TgsNew() called more than once?") + return + + if(!(minimum_required_security_level in list(TGS_SECURITY_ULTRASAFE, TGS_SECURITY_SAFE, TGS_SECURITY_TRUSTED))) + TGS_ERROR_LOG("Invalid minimum_required_security_level: [minimum_required_security_level]!") + return + +#ifdef TGS_V3_API + if(minimum_required_security_level != TGS_SECURITY_TRUSTED) + TGS_WARNING_LOG("V3 DMAPI requires trusted security!") + minimum_required_security_level = TGS_SECURITY_TRUSTED +#endif + var/raw_parameter = world.params[TGS_VERSION_PARAMETER] + if(!raw_parameter) + return + + var/datum/tgs_version/version = new(raw_parameter) + if(!version.Valid(FALSE)) + TGS_ERROR_LOG("Failed to validate DMAPI version parameter: [raw_parameter]!") + return + + var/api_datum + switch(version.suite) + if(3) +#ifndef TGS_V3_API + TGS_ERROR_LOG("Detected V3 API but TGS_V3_API isn't defined!") + return +#else + switch(version.minor) + if(2) + api_datum = /datum/tgs_api/v3210 +#endif + if(4) + switch(version.minor) + if(0) + api_datum = /datum/tgs_api/v4 + if(5) + api_datum = /datum/tgs_api/v5 + + var/datum/tgs_version/max_api_version = TgsMaximumApiVersion(); + if(version.suite != null && version.minor != null && version.patch != null && version.deprecated_patch != null && version.deprefixed_parameter > max_api_version.deprefixed_parameter) + TGS_ERROR_LOG("Detected unknown API version! Defaulting to latest. Update the DMAPI to fix this problem.") + api_datum = /datum/tgs_api/latest + + if(!api_datum) + TGS_ERROR_LOG("Found unsupported API version: [raw_parameter]. If this is a valid version please report this, backporting is done on demand.") + return + + TGS_INFO_LOG("Activating API for version [version.deprefixed_parameter]") + + if(event_handler && !istype(event_handler)) + TGS_ERROR_LOG("Invalid parameter for event_handler: [event_handler]") + event_handler = null + + var/datum/tgs_api/new_api = new api_datum(event_handler, version) + + TGS_WRITE_GLOBAL(tgs, new_api) + + var/result = new_api.OnWorldNew(minimum_required_security_level) + if(!result || result == TGS_UNIMPLEMENTED) + TGS_WRITE_GLOBAL(tgs, null) + TGS_ERROR_LOG("Failed to activate API!") + +/world/TgsMaximumApiVersion() + return new /datum/tgs_version("5.x.x") + +/world/TgsMinimumApiVersion() + return new /datum/tgs_version("3.2.x") + +/world/TgsInitializationComplete() + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + api.OnInitializationComplete() + +/world/proc/TgsTopic(T) + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + var/result = api.OnTopic(T) + if(result != TGS_UNIMPLEMENTED) + return result + +/world/TgsRevision() + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + var/result = api.Revision() + if(result != TGS_UNIMPLEMENTED) + return result + +/world/TgsReboot() + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + api.OnReboot() + +/world/TgsAvailable() + return TGS_READ_GLOBAL(tgs) != null + +/world/TgsVersion() + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + return api.version + +/world/TgsApiVersion() + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + return api.ApiVersion() + +/world/TgsInstanceName() + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + var/result = api.InstanceName() + if(result != TGS_UNIMPLEMENTED) + return result + +/world/TgsTestMerges() + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + var/result = api.TestMerges() + if(result != TGS_UNIMPLEMENTED) + return result + return list() + +/world/TgsEndProcess() + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + api.EndProcess() + +/world/TgsChatChannelInfo() + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + var/result = api.ChatChannelInfo() + if(result != TGS_UNIMPLEMENTED) + return result + return list() + +/world/TgsChatBroadcast(message, list/channels) + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + api.ChatBroadcast(message, channels) + +/world/TgsTargetedChatBroadcast(message, admin_only) + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + api.ChatTargetedBroadcast(message, admin_only) + +/world/TgsChatPrivateMessage(message, datum/tgs_chat_user/user) + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + api.ChatPrivateMessage(message, user) + +/world/TgsSecurityLevel() + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + api.SecurityLevel() diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/core/datum.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/core/datum.dm new file mode 100644 index 00000000000..68b0330fe86 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/core/datum.dm @@ -0,0 +1,59 @@ +TGS_DEFINE_AND_SET_GLOBAL(tgs, null) + +/datum/tgs_api + var/datum/tgs_version/version + var/datum/tgs_event_handler/event_handler + + var/list/warned_deprecated_command_runs + +/datum/tgs_api/New(datum/tgs_event_handler/event_handler, datum/tgs_version/version) + . = ..() + src.event_handler = event_handler + src.version = version + +/datum/tgs_api/latest + parent_type = /datum/tgs_api/v5 + +TGS_PROTECT_DATUM(/datum/tgs_api) + +/datum/tgs_api/proc/ApiVersion() + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/OnWorldNew(datum/tgs_event_handler/event_handler) + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/OnInitializationComplete() + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/OnTopic(T) + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/OnReboot() + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/InstanceName() + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/TestMerges() + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/EndProcess() + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/Revision() + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/ChatChannelInfo() + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/ChatBroadcast(message, list/channels) + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/ChatTargetedBroadcast(message, admin_only) + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/ChatPrivateMessage(message, datum/tgs_chat_user/user) + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/SecurityLevel() + return TGS_UNIMPLEMENTED diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/core/tgs_version.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/core/tgs_version.dm new file mode 100644 index 00000000000..a5dae1241a3 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/core/tgs_version.dm @@ -0,0 +1,28 @@ +/datum/tgs_version/New(raw_parameter) + src.raw_parameter = raw_parameter + deprefixed_parameter = replacetext(raw_parameter, "/tg/station 13 Server v", "") + var/list/version_bits = splittext(deprefixed_parameter, ".") + + suite = text2num(version_bits[1]) + if(version_bits.len > 1) + minor = text2num(version_bits[2]) + if(version_bits.len > 2) + patch = text2num(version_bits[3]) + if(version_bits.len == 4) + deprecated_patch = text2num(version_bits[4]) + +/datum/tgs_version/proc/Valid(allow_wildcards = FALSE) + if(suite == null) + return FALSE + if(allow_wildcards) + return TRUE + return !Wildcard() + +/datum/tgs_version/Wildcard() + return minor == null || patch == null + +/datum/tgs_version/Equals(datum/tgs_version/other_version) + if(!istype(other_version)) + return FALSE + + return suite == other_version.suite && minor == other_version.minor && patch == other_version.patch && deprecated_patch == other_version.deprecated_patch diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/includes.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/includes.dm new file mode 100644 index 00000000000..23b714f9d06 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/includes.dm @@ -0,0 +1,21 @@ +#include "core\_definitions.dm" +#include "core\core.dm" +#include "core\datum.dm" +#include "core\tgs_version.dm" + +#ifdef TGS_V3_API +#include "v3210\api.dm" +#include "v3210\commands.dm" +#endif + +#include "v4\api.dm" +#include "v4\commands.dm" + +#include "v5\_defines.dm" +#include "v5\api.dm" +#include "v5\bridge.dm" +#include "v5\chunking.dm" +#include "v5\commands.dm" +#include "v5\serializers.dm" +#include "v5\topic.dm" +#include "v5\undefs.dm" diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v3210/README.md b/proxima/code/modules/TGS/TGDMAPI/tgs/v3210/README.md new file mode 100644 index 00000000000..f96e7cf3b31 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v3210/README.md @@ -0,0 +1,6 @@ +# DMAPI V3 + +This DMAPI implements bridge using file output which TGS monitors for. + +- [api.dm](./api.dm) contains the bulk of the API code. +- [commands.dm](./commands.dm) contains functions relating to `/datum/tgs_chat_command`s. diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v3210/api.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/v3210/api.dm new file mode 100644 index 00000000000..b881662d71c --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v3210/api.dm @@ -0,0 +1,244 @@ +#define REBOOT_MODE_NORMAL 0 +#define REBOOT_MODE_HARD 1 +#define REBOOT_MODE_SHUTDOWN 2 + +#define SERVICE_WORLD_PARAM "server_service" +#define SERVICE_INSTANCE_PARAM "server_instance" +#define SERVICE_PR_TEST_JSON "prtestjob.json" +#define SERVICE_INTERFACE_DLL "TGDreamDaemonBridge.dll" +#define SERVICE_INTERFACE_FUNCTION "DDEntryPoint" + +#define SERVICE_CMD_HARD_REBOOT "hard_reboot" +#define SERVICE_CMD_GRACEFUL_SHUTDOWN "graceful_shutdown" +#define SERVICE_CMD_WORLD_ANNOUNCE "world_announce" +#define SERVICE_CMD_LIST_CUSTOM "list_custom_commands" +#define SERVICE_CMD_API_COMPATIBLE "api_compat" +#define SERVICE_CMD_PLAYER_COUNT "client_count" + +#define SERVICE_CMD_PARAM_KEY "serviceCommsKey" +#define SERVICE_CMD_PARAM_COMMAND "command" +#define SERVICE_CMD_PARAM_SENDER "sender" +#define SERVICE_CMD_PARAM_CUSTOM "custom" + +#define SERVICE_REQUEST_KILL_PROCESS "killme" +#define SERVICE_REQUEST_IRC_BROADCAST "irc" +#define SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE "send2irc" +#define SERVICE_REQUEST_WORLD_REBOOT "worldreboot" +#define SERVICE_REQUEST_API_VERSION "api_ver" + +#define SERVICE_RETURN_SUCCESS "SUCCESS" + +#define TGS_FILE2LIST(filename) (splittext(trim_left(trim_right(file2text(filename))), "\n")) + +/datum/tgs_api/v3210 + var/reboot_mode = REBOOT_MODE_NORMAL + var/comms_key + var/instance_name + var/originmastercommit + var/commit + var/list/cached_custom_tgs_chat_commands + var/warned_revison = FALSE + var/warned_custom_commands = FALSE + +/datum/tgs_api/v3210/ApiVersion() + return new /datum/tgs_version("3.2.1.3") + +/datum/tgs_api/v3210/proc/trim_left(text) + for (var/i = 1 to length(text)) + if (text2ascii(text, i) > 32) + return copytext(text, i) + return "" + +/datum/tgs_api/v3210/proc/trim_right(text) + for (var/i = length(text), i > 0, i--) + if (text2ascii(text, i) > 32) + return copytext(text, 1, i + 1) + return "" + +/datum/tgs_api/v3210/OnWorldNew(minimum_required_security_level) + . = FALSE + + comms_key = world.params[SERVICE_WORLD_PARAM] + instance_name = world.params[SERVICE_INSTANCE_PARAM] + if(!instance_name) + instance_name = "TG Station Server" //maybe just upgraded + + var/list/logs = TGS_FILE2LIST(".git/logs/HEAD") + if(logs.len) + logs = splittext(logs[logs.len], " ") + if (logs.len >= 2) + commit = logs[2] + else + TGS_ERROR_LOG("Error parsing commit logs") + + logs = TGS_FILE2LIST(".git/logs/refs/remotes/origin/master") + if(logs.len) + logs = splittext(logs[logs.len], " ") + if (logs.len >= 2) + originmastercommit = logs[2] + else + TGS_ERROR_LOG("Error parsing origin commmit logs") + + if(world.system_type != MS_WINDOWS) + TGS_ERROR_LOG("This API version is only supported on Windows. Not running on Windows. Aborting initialization!") + return + ListServiceCustomCommands(TRUE) + var/datum/tgs_version/api_version = ApiVersion() + ExportService("[SERVICE_REQUEST_API_VERSION] [api_version.deprefixed_parameter]", TRUE) + return TRUE + +//nothing to do for v3 +/datum/tgs_api/v3210/OnInitializationComplete() + return + +/datum/tgs_api/v3210/InstanceName() + return world.params[SERVICE_INSTANCE_PARAM] + +/datum/tgs_api/v3210/proc/ExportService(command, skip_compat_check = FALSE) + . = FALSE + if(skip_compat_check && !fexists(SERVICE_INTERFACE_DLL)) + TGS_ERROR_LOG("Service parameter present but no interface DLL detected. This is symptomatic of running a service less than version 3.1! Please upgrade.") + return + #if DM_VERSION >= 515 + call_ext(SERVICE_INTERFACE_DLL, SERVICE_INTERFACE_FUNCTION)(instance_name, command) //trust no retval + #else + call(SERVICE_INTERFACE_DLL, SERVICE_INTERFACE_FUNCTION)(instance_name, command) //trust no retval + #endif + return TRUE + +/datum/tgs_api/v3210/OnTopic(T) + var/list/params = params2list(T) + var/their_sCK = params[SERVICE_CMD_PARAM_KEY] + if(!their_sCK) + return FALSE //continue world/Topic + + if(their_sCK != comms_key) + return "Invalid comms key!"; + + var/command = params[SERVICE_CMD_PARAM_COMMAND] + if(!command) + return "No command!" + + switch(command) + if(SERVICE_CMD_API_COMPATIBLE) + return SERVICE_RETURN_SUCCESS + if(SERVICE_CMD_HARD_REBOOT) + if(reboot_mode != REBOOT_MODE_HARD) + reboot_mode = REBOOT_MODE_HARD + TGS_INFO_LOG("Hard reboot requested by service") + TGS_NOTIFY_ADMINS("The world will hard reboot at the end of the game. Requested by TGS.") + if(SERVICE_CMD_GRACEFUL_SHUTDOWN) + if(reboot_mode != REBOOT_MODE_SHUTDOWN) + reboot_mode = REBOOT_MODE_SHUTDOWN + TGS_INFO_LOG("Shutdown requested by service") + TGS_NOTIFY_ADMINS("The world will shutdown at the end of the game. Requested by TGS.") + if(SERVICE_CMD_WORLD_ANNOUNCE) + var/msg = params["message"] + if(!istext(msg) || !msg) + return "No message set!" + TGS_WORLD_ANNOUNCE(msg) + return SERVICE_RETURN_SUCCESS + if(SERVICE_CMD_PLAYER_COUNT) + return "[TGS_CLIENT_COUNT]" + if(SERVICE_CMD_LIST_CUSTOM) + return json_encode(ListServiceCustomCommands(FALSE)) + else + var/custom_command_result = HandleServiceCustomCommand(lowertext(command), params[SERVICE_CMD_PARAM_SENDER], params[SERVICE_CMD_PARAM_CUSTOM]) + if(custom_command_result) + return istext(custom_command_result) ? custom_command_result : SERVICE_RETURN_SUCCESS + return "Unknown command: [command]" + +/datum/tgs_api/v3210/OnReboot() + switch(reboot_mode) + if(REBOOT_MODE_HARD) + TGS_WORLD_ANNOUNCE("Hard reboot triggered, you will automatically reconnect...") + EndProcess() + if(REBOOT_MODE_SHUTDOWN) + TGS_WORLD_ANNOUNCE("The server is shutting down...") + EndProcess() + else + ExportService(SERVICE_REQUEST_WORLD_REBOOT) //just let em know + +/datum/tgs_api/v3210/TestMerges() + //do the best we can here as the datum can't be completed using the v3 api + . = list() + if(!fexists(SERVICE_PR_TEST_JSON)) + return + var/list/json = json_decode(file2text(SERVICE_PR_TEST_JSON)) + if(!json) + return + for(var/I in json) + var/datum/tgs_revision_information/test_merge/tm = new + tm.number = text2num(I) + var/list/entry = json[I] + tm.head_commit = entry["commit"] + tm.author = entry["author"] + tm.title = entry["title"] + . += tm + +/datum/tgs_api/v3210/Revision() + if(!warned_revison) + var/datum/tgs_version/api_version = ApiVersion() + TGS_ERROR_LOG("Use of TgsRevision on [api_version.deprefixed_parameter] origin_commit only points to master!") + warned_revison = TRUE + var/datum/tgs_revision_information/ri = new + ri.commit = commit + ri.origin_commit = originmastercommit + return ri + +/datum/tgs_api/v3210/EndProcess() + sleep(world.tick_lag) //flush the buffers + ExportService(SERVICE_REQUEST_KILL_PROCESS) + +/datum/tgs_api/v3210/ChatChannelInfo() + return list() // :omegalul: + +/datum/tgs_api/v3210/ChatBroadcast(datum/tgs_message_content/message, list/channels) + if(channels) + return TGS_UNIMPLEMENTED + message = UpgradeDeprecatedChatMessage(message) + ChatTargetedBroadcast(message, TRUE) + ChatTargetedBroadcast(message, FALSE) + +/datum/tgs_api/v3210/ChatTargetedBroadcast(datum/tgs_message_content/message, admin_only) + message = UpgradeDeprecatedChatMessage(message) + ExportService("[admin_only ? SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE : SERVICE_REQUEST_IRC_BROADCAST] [message.text]") + +/datum/tgs_api/v3210/ChatPrivateMessage(message, datum/tgs_chat_user/user) + UpgradeDeprecatedChatMessage(message) + return TGS_UNIMPLEMENTED + +/datum/tgs_api/v3210/SecurityLevel() + return TGS_SECURITY_TRUSTED + +#undef REBOOT_MODE_NORMAL +#undef REBOOT_MODE_HARD +#undef REBOOT_MODE_SHUTDOWN + +#undef SERVICE_WORLD_PARAM +#undef SERVICE_INSTANCE_PARAM +#undef SERVICE_PR_TEST_JSON +#undef SERVICE_INTERFACE_DLL +#undef SERVICE_INTERFACE_FUNCTION + +#undef SERVICE_CMD_HARD_REBOOT +#undef SERVICE_CMD_GRACEFUL_SHUTDOWN +#undef SERVICE_CMD_WORLD_ANNOUNCE +#undef SERVICE_CMD_LIST_CUSTOM +#undef SERVICE_CMD_API_COMPATIBLE +#undef SERVICE_CMD_PLAYER_COUNT + +#undef SERVICE_CMD_PARAM_KEY +#undef SERVICE_CMD_PARAM_COMMAND +#undef SERVICE_CMD_PARAM_SENDER +#undef SERVICE_CMD_PARAM_CUSTOM + +#undef SERVICE_REQUEST_KILL_PROCESS +#undef SERVICE_REQUEST_IRC_BROADCAST +#undef SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE +#undef SERVICE_REQUEST_WORLD_REBOOT +#undef SERVICE_REQUEST_API_VERSION + +#undef SERVICE_RETURN_SUCCESS + +#undef TGS_FILE2LIST diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v3210/commands.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/v3210/commands.dm new file mode 100644 index 00000000000..d9bd287465b --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v3210/commands.dm @@ -0,0 +1,58 @@ +#define SERVICE_JSON_PARAM_HELPTEXT "help_text" +#define SERVICE_JSON_PARAM_ADMINONLY "admin_only" +#define SERVICE_JSON_PARAM_REQUIREDPARAMETERS "required_parameters" + +/datum/tgs_api/v3210/proc/ListServiceCustomCommands(warnings_only) + if(!warnings_only) + . = list() + var/list/command_name_types = list() + var/list/warned_command_names = warnings_only ? list() : null + var/warned_about_the_dangers_of_robutussin = !warnings_only + for(var/I in typesof(/datum/tgs_chat_command) - /datum/tgs_chat_command) + if(!warned_about_the_dangers_of_robutussin) + TGS_WARNING_LOG("Custom chat commands in [ApiVersion()] lacks the /datum/tgs_chat_user/sender.channel field!") + warned_about_the_dangers_of_robutussin = TRUE + var/datum/tgs_chat_command/stc = I + if(stc.ignore_type == I) + continue + + var/command_name = initial(stc.name) + if(!command_name || findtext(command_name, " ") || findtext(command_name, "'") || findtext(command_name, "\"")) + if(warnings_only && !warned_command_names[command_name]) + TGS_ERROR_LOG("Custom command [command_name] can't be used as it is empty or contains illegal characters!") + warned_command_names[command_name] = TRUE + continue + + if(command_name_types[command_name]) + if(warnings_only) + TGS_ERROR_LOG("Custom commands [command_name_types[command_name]] and [stc] have the same name, only [command_name_types[command_name]] will be available!") + continue + command_name_types[stc] = command_name + + if(!warnings_only) + .[command_name] = list(SERVICE_JSON_PARAM_HELPTEXT = initial(stc.help_text), SERVICE_JSON_PARAM_ADMINONLY = initial(stc.admin_only), SERVICE_JSON_PARAM_REQUIREDPARAMETERS = 0) + +/datum/tgs_api/v3210/proc/HandleServiceCustomCommand(command, sender, params) + if(!cached_custom_tgs_chat_commands) + cached_custom_tgs_chat_commands = list() + for(var/I in typesof(/datum/tgs_chat_command) - /datum/tgs_chat_command) + var/datum/tgs_chat_command/stc = I + cached_custom_tgs_chat_commands[lowertext(initial(stc.name))] = stc + + var/command_type = cached_custom_tgs_chat_commands[command] + if(!command_type) + return FALSE + var/datum/tgs_chat_command/stc = new command_type + var/datum/tgs_chat_user/user = new + user.friendly_name = sender + + // Discord hack, fix the mention if it's only numbers (fuck you IRC trolls) + var/regex/discord_id_regex = regex(@"^[0-9]+$") + if(findtext(sender, discord_id_regex)) + sender = "<@[sender]>" + + user.mention = sender + var/datum/tgs_message_content/result = stc.Run(user, params) + result = UpgradeDeprecatedCommandResponse(result, command) + + return result?.text || TRUE diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v4/README.md b/proxima/code/modules/TGS/TGDMAPI/tgs/v4/README.md new file mode 100644 index 00000000000..78191447b27 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v4/README.md @@ -0,0 +1,6 @@ +# DMAPI V4 + +This DMAPI implements bridge requests using file output which TGS monitors for. It has a safe mode restriction. + +- [api.dm](./api.dm) contains the bulk of the API code. +- [commands.dm](./commands.dm) contains functions relating to `/datum/tgs_chat_command`s. diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v4/api.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/v4/api.dm new file mode 100644 index 00000000000..2f05c386338 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v4/api.dm @@ -0,0 +1,312 @@ +#define TGS4_PARAM_INFO_JSON "tgs_json" + +#define TGS4_INTEROP_ACCESS_IDENTIFIER "tgs_tok" + +#define TGS4_RESPONSE_SUCCESS "tgs_succ" + +#define TGS4_TOPIC_CHANGE_PORT "tgs_port" +#define TGS4_TOPIC_CHANGE_REBOOT_MODE "tgs_rmode" +#define TGS4_TOPIC_CHAT_COMMAND "tgs_chat_comm" +#define TGS4_TOPIC_EVENT "tgs_event" +#define TGS4_TOPIC_INTEROP_RESPONSE "tgs_interop" + +#define TGS4_COMM_NEW_PORT "tgs_new_port" +#define TGS4_COMM_VALIDATE "tgs_validate" +#define TGS4_COMM_SERVER_PRIMED "tgs_prime" +#define TGS4_COMM_WORLD_REBOOT "tgs_reboot" +#define TGS4_COMM_END_PROCESS "tgs_kill" +#define TGS4_COMM_CHAT "tgs_chat_send" + +#define TGS4_PARAMETER_COMMAND "tgs_com" +#define TGS4_PARAMETER_DATA "tgs_data" + +#define TGS4_PORT_CRITFAIL_MESSAGE " Must exit to let watchdog reboot..." + +#define EXPORT_TIMEOUT_DS 200 + +/datum/tgs_api/v4 + var/access_identifier + var/instance_name + var/json_path + var/chat_channels_json_path + var/chat_commands_json_path + var/server_commands_json_path + var/reboot_mode = TGS_REBOOT_MODE_NORMAL + var/security_level + + var/requesting_new_port = FALSE + + var/list/intercepted_message_queue + + var/list/custom_commands + + var/list/cached_test_merges + var/datum/tgs_revision_information/cached_revision + + var/export_lock = FALSE + var/list/last_interop_response + +/datum/tgs_api/v4/ApiVersion() + return new /datum/tgs_version("4.0.0.0") + +/datum/tgs_api/v4/OnWorldNew(minimum_required_security_level) + if(minimum_required_security_level == TGS_SECURITY_ULTRASAFE) + TGS_WARNING_LOG("V4 DMAPI requires safe security!") + minimum_required_security_level = TGS_SECURITY_SAFE + + json_path = world.params[TGS4_PARAM_INFO_JSON] + if(!json_path) + TGS_ERROR_LOG("Missing [TGS4_PARAM_INFO_JSON] world parameter!") + return + var/json_file = file2text(json_path) + if(!json_file) + TGS_ERROR_LOG("Missing specified json file: [json_path]") + return + var/cached_json = json_decode(json_file) + if(!cached_json) + TGS_ERROR_LOG("Failed to decode info json: [json_file]") + return + + access_identifier = cached_json["accessIdentifier"] + server_commands_json_path = cached_json["serverCommandsJson"] + + if(cached_json["apiValidateOnly"]) + TGS_INFO_LOG("Validating API and exiting...") + Export(TGS4_COMM_VALIDATE, list(TGS4_PARAMETER_DATA = "[minimum_required_security_level]")) + del(world) + + security_level = cached_json["securityLevel"] + chat_channels_json_path = cached_json["chatChannelsJson"] + chat_commands_json_path = cached_json["chatCommandsJson"] + instance_name = cached_json["instanceName"] + + ListCustomCommands() + + var/list/revisionData = cached_json["revision"] + if(revisionData) + cached_revision = new + cached_revision.commit = revisionData["commitSha"] + cached_revision.origin_commit = revisionData["originCommitSha"] + + cached_test_merges = list() + var/list/json = cached_json["testMerges"] + for(var/entry in json) + var/datum/tgs_revision_information/test_merge/tm = new + tm.timestamp = text2num(entry["timeMerged"]) + + var/list/revInfo = entry["revision"] + if(revInfo) + tm.commit = revInfo["commitSha"] + tm.origin_commit = revInfo["originCommitSha"] + + tm.title = entry["titleAtMerge"] + tm.body = entry["bodyAtMerge"] + tm.url = entry["url"] + tm.author = entry["author"] + tm.number = entry["number"] + tm.head_commit = entry["pullRequestRevision"] + tm.comment = entry["comment"] + + cached_test_merges += tm + + return TRUE + +/datum/tgs_api/v4/OnInitializationComplete() + Export(TGS4_COMM_SERVER_PRIMED) + +/datum/tgs_api/v4/OnTopic(T) + var/list/params = params2list(T) + var/their_sCK = params[TGS4_INTEROP_ACCESS_IDENTIFIER] + if(!their_sCK) + return FALSE //continue world/Topic + + if(their_sCK != access_identifier) + return "Invalid comms key!"; + + var/command = params[TGS4_PARAMETER_COMMAND] + if(!command) + return "No command!" + + . = TGS4_RESPONSE_SUCCESS + + switch(command) + if(TGS4_TOPIC_CHAT_COMMAND) + var/result = HandleCustomCommand(params[TGS4_PARAMETER_DATA]) + if(result == null) + result = "Error running chat command!" + return result + if(TGS4_TOPIC_EVENT) + intercepted_message_queue = list() + var/list/event_notification = json_decode(params[TGS4_PARAMETER_DATA]) + var/list/event_parameters = event_notification["Parameters"] + + var/list/event_call = list(event_notification["Type"]) + if(event_parameters) + event_call += event_parameters + + if(event_handler != null) + event_handler.HandleEvent(arglist(event_call)) + + . = json_encode(intercepted_message_queue) + intercepted_message_queue = null + return + if(TGS4_TOPIC_INTEROP_RESPONSE) + last_interop_response = json_decode(params[TGS4_PARAMETER_DATA]) + return + if(TGS4_TOPIC_CHANGE_PORT) + var/new_port = text2num(params[TGS4_PARAMETER_DATA]) + if (!(new_port > 0)) + return "Invalid port: [new_port]" + + //the topic still completes, miraculously + //I honestly didn't believe byond could do it + if(event_handler != null) + event_handler.HandleEvent(TGS_EVENT_PORT_SWAP, new_port) + if(!world.OpenPort(new_port)) + return "Port change failed!" + return + if(TGS4_TOPIC_CHANGE_REBOOT_MODE) + var/new_reboot_mode = text2num(params[TGS4_PARAMETER_DATA]) + if(event_handler != null) + event_handler.HandleEvent(TGS_EVENT_REBOOT_MODE_CHANGE, reboot_mode, new_reboot_mode) + reboot_mode = new_reboot_mode + return + + return "Unknown command: [command]" + +/datum/tgs_api/v4/proc/Export(command, list/data, override_requesting_new_port = FALSE) + if(!data) + data = list() + data[TGS4_PARAMETER_COMMAND] = command + var/json = json_encode(data) + + while(requesting_new_port && !override_requesting_new_port) + sleep(1) + + //we need some port open at this point to facilitate return communication + if(!world.port) + requesting_new_port = TRUE + if(!world.OpenPort(0)) //open any port + TGS_ERROR_LOG("Unable to open random port to retrieve new port![TGS4_PORT_CRITFAIL_MESSAGE]") + del(world) + + //request a new port + export_lock = FALSE + var/list/new_port_json = Export(TGS4_COMM_NEW_PORT, list(TGS4_PARAMETER_DATA = "[world.port]"), TRUE) //stringify this on purpose + + if(!new_port_json) + TGS_ERROR_LOG("No new port response from server![TGS4_PORT_CRITFAIL_MESSAGE]") + del(world) + + var/new_port = new_port_json[TGS4_PARAMETER_DATA] + if(!isnum(new_port) || new_port <= 0) + TGS_ERROR_LOG("Malformed new port json ([json_encode(new_port_json)])![TGS4_PORT_CRITFAIL_MESSAGE]") + del(world) + + if(new_port != world.port && !world.OpenPort(new_port)) + TGS_ERROR_LOG("Unable to open port [new_port]![TGS4_PORT_CRITFAIL_MESSAGE]") + del(world) + requesting_new_port = FALSE + + while(export_lock) + sleep(1) + export_lock = TRUE + + last_interop_response = null + fdel(server_commands_json_path) + text2file(json, server_commands_json_path) + + for(var/I = 0; I < EXPORT_TIMEOUT_DS && !last_interop_response; ++I) + sleep(1) + + if(!last_interop_response) + TGS_ERROR_LOG("Failed to get export result for: [json]") + else + . = last_interop_response + + export_lock = FALSE + +/datum/tgs_api/v4/OnReboot() + var/list/result = Export(TGS4_COMM_WORLD_REBOOT) + if(!result) + return + + //okay so the standard TGS4 proceedure is: right before rebooting change the port to whatever was sent to us in the above json's data parameter + + var/port = result[TGS4_PARAMETER_DATA] + if(!isnum(port)) + return //this is valid, server may just want use to reboot + + if(port == 0) + //to byond 0 means any port and "none" means close vOv + port = "none" + + if(!world.OpenPort(port)) + TGS_ERROR_LOG("Unable to set port to [port]!") + +/datum/tgs_api/v4/InstanceName() + return instance_name + +/datum/tgs_api/v4/TestMerges() + return cached_test_merges.Copy() + +/datum/tgs_api/v4/EndProcess() + Export(TGS4_COMM_END_PROCESS) + +/datum/tgs_api/v4/Revision() + return cached_revision + +/datum/tgs_api/v4/ChatBroadcast(datum/tgs_message_content/message, list/channels) + var/list/ids + if(length(channels)) + ids = list() + for(var/I in channels) + var/datum/tgs_chat_channel/channel = I + ids += channel.id + message = UpgradeDeprecatedChatMessage(message) + message = list("message" = message.text, "channelIds" = ids) + if(intercepted_message_queue) + intercepted_message_queue += list(message) + else + Export(TGS4_COMM_CHAT, message) + +/datum/tgs_api/v4/ChatTargetedBroadcast(datum/tgs_message_content/message, admin_only) + var/list/channels = list() + for(var/I in ChatChannelInfo()) + var/datum/tgs_chat_channel/channel = I + if (!channel.is_private_channel && ((channel.is_admin_channel && admin_only) || (!channel.is_admin_channel && !admin_only))) + channels += channel.id + message = UpgradeDeprecatedChatMessage(message) + message = list("message" = message.text, "channelIds" = channels) + if(intercepted_message_queue) + intercepted_message_queue += list(message) + else + Export(TGS4_COMM_CHAT, message) + +/datum/tgs_api/v4/ChatPrivateMessage(datum/tgs_message_content/message, datum/tgs_chat_user/user) + message = UpgradeDeprecatedChatMessage(message) + message = list("message" = message.text, "channelIds" = list(user.channel.id)) + if(intercepted_message_queue) + intercepted_message_queue += list(message) + else + Export(TGS4_COMM_CHAT, message) + +/datum/tgs_api/v4/ChatChannelInfo() + . = list() + //no caching cause tgs may change this + var/list/json = json_decode(file2text(chat_channels_json_path)) + for(var/I in json) + . += DecodeChannel(I) + +/datum/tgs_api/v4/proc/DecodeChannel(channel_json) + var/datum/tgs_chat_channel/channel = new + channel.id = channel_json["id"] + channel.friendly_name = channel_json["friendlyName"] + channel.connection_name = channel_json["connectionName"] + channel.is_admin_channel = channel_json["isAdminChannel"] + channel.is_private_channel = channel_json["isPrivateChannel"] + channel.custom_tag = channel_json["tag"] + return channel + +/datum/tgs_api/v4/SecurityLevel() + return security_level diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v4/commands.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/v4/commands.dm new file mode 100644 index 00000000000..d6d3d718d47 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v4/commands.dm @@ -0,0 +1,44 @@ +/datum/tgs_api/v4/proc/ListCustomCommands() + var/results = list() + custom_commands = list() + for(var/I in typesof(/datum/tgs_chat_command) - /datum/tgs_chat_command) + var/datum/tgs_chat_command/stc = new I + if(stc.ignore_type == I) + continue + + var/command_name = stc.name + if(!command_name || findtext(command_name, " ") || findtext(command_name, "'") || findtext(command_name, "\"")) + TGS_ERROR_LOG("Custom command [command_name] ([I]) can't be used as it is empty or contains illegal characters!") + continue + + if(results[command_name]) + var/datum/other = custom_commands[command_name] + TGS_ERROR_LOG("Custom commands [other.type] and [I] have the same name (\"[command_name]\"), only [other.type] will be available!") + continue + results += list(list("name" = command_name, "help_text" = stc.help_text, "admin_only" = stc.admin_only)) + custom_commands[command_name] = stc + + var/commands_file = chat_commands_json_path + if(!commands_file) + return + text2file(json_encode(results), commands_file) + +/datum/tgs_api/v4/proc/HandleCustomCommand(command_json) + var/list/data = json_decode(command_json) + var/command = data["command"] + var/user = data["user"] + var/params = data["params"] + + var/datum/tgs_chat_user/u = new + u.id = user["id"] + u.friendly_name = user["friendlyName"] + u.mention = user["mention"] + u.channel = DecodeChannel(user["channel"]) + + var/datum/tgs_chat_command/sc = custom_commands[command] + if(sc) + var/datum/tgs_message_content/result = sc.Run(u, params) + result = UpgradeDeprecatedCommandResponse(result, command) + + return result?.text + return "Unknown command: [command]!" diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v5/README.md b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/README.md new file mode 100644 index 00000000000..a8a0c748e7b --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/README.md @@ -0,0 +1,13 @@ +# DMAPI V5 + +This DMAPI implements bridge requests using HTTP GET requests to TGS. It has no security restrictions. + +- [__interop_version.dm](./__interop_version.dm) contains the version of the API used between the DMAPI and TGS. +- [_defines.dm](./_defines.dm) contains constant definitions. +- [api.dm](./api.dm) contains the bulk of the API code. +- [bridge.dm](./bridge.dm) contains functions related to making bridge requests. +- [chunking.dm](./chunking.dm) contains common function for splitting large raw data sets into chunks BYOND can natively process. +- [commands.dm](./commands.dm) contains functions relating to `/datum/tgs_chat_command`s. +- [serializers.dm](./serializers.dm) contains function to help convert interop `/datum`s into a JSON encodable `list()` format. +- [topic.dm](./topic.dm) contains functions related to processing topic requests. +- [undefs.dm](./undefs.dm) Undoes the work of `_defines.dm`. diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v5/__interop_version.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/__interop_version.dm new file mode 100644 index 00000000000..6ef7c86ef75 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/__interop_version.dm @@ -0,0 +1 @@ +"5.6.0" diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v5/_defines.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/_defines.dm new file mode 100644 index 00000000000..a3f949081f1 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/_defines.dm @@ -0,0 +1,115 @@ +#define DMAPI5_PARAM_SERVER_PORT "tgs_port" +#define DMAPI5_PARAM_ACCESS_IDENTIFIER "tgs_key" + +#define DMAPI5_BRIDGE_DATA "data" +#define DMAPI5_TOPIC_DATA "tgs_data" + +#define DMAPI5_BRIDGE_REQUEST_LIMIT 8198 +#define DMAPI5_TOPIC_REQUEST_LIMIT 65529 +#define DMAPI5_TOPIC_RESPONSE_LIMIT 65528 + +#define DMAPI5_BRIDGE_COMMAND_PORT_UPDATE 0 +#define DMAPI5_BRIDGE_COMMAND_STARTUP 1 +#define DMAPI5_BRIDGE_COMMAND_PRIME 2 +#define DMAPI5_BRIDGE_COMMAND_REBOOT 3 +#define DMAPI5_BRIDGE_COMMAND_KILL 4 +#define DMAPI5_BRIDGE_COMMAND_CHAT_SEND 5 +#define DMAPI5_BRIDGE_COMMAND_CHUNK 6 + +#define DMAPI5_PARAMETER_ACCESS_IDENTIFIER "accessIdentifier" +#define DMAPI5_PARAMETER_CUSTOM_COMMANDS "customCommands" + +#define DMAPI5_CHUNK "chunk" +#define DMAPI5_CHUNK_PAYLOAD "payload" +#define DMAPI5_CHUNK_TOTAL "totalChunks" +#define DMAPI5_CHUNK_SEQUENCE_ID "sequenceId" +#define DMAPI5_CHUNK_PAYLOAD_ID "payloadId" + +#define DMAPI5_MISSING_CHUNKS "missingChunks" + +#define DMAPI5_RESPONSE_ERROR_MESSAGE "errorMessage" + +#define DMAPI5_BRIDGE_PARAMETER_COMMAND_TYPE "commandType" +#define DMAPI5_BRIDGE_PARAMETER_CURRENT_PORT "currentPort" +#define DMAPI5_BRIDGE_PARAMETER_VERSION "version" +#define DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE "chatMessage" +#define DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL "minimumSecurityLevel" + +#define DMAPI5_BRIDGE_RESPONSE_NEW_PORT "newPort" +#define DMAPI5_BRIDGE_RESPONSE_RUNTIME_INFORMATION "runtimeInformation" + +#define DMAPI5_CHAT_MESSAGE_CHANNEL_IDS "channelIds" + +#define DMAPI5_RUNTIME_INFORMATION_ACCESS_IDENTIFIER "accessIdentifier" +#define DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION "serverVersion" +#define DMAPI5_RUNTIME_INFORMATION_SERVER_PORT "serverPort" +#define DMAPI5_RUNTIME_INFORMATION_API_VALIDATE_ONLY "apiValidateOnly" +#define DMAPI5_RUNTIME_INFORMATION_INSTANCE_NAME "instanceName" +#define DMAPI5_RUNTIME_INFORMATION_REVISION "revision" +#define DMAPI5_RUNTIME_INFORMATION_TEST_MERGES "testMerges" +#define DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL "securityLevel" + +#define DMAPI5_CHAT_UPDATE_CHANNELS "channels" + +#define DMAPI5_TEST_MERGE_TIME_MERGED "timeMerged" +#define DMAPI5_TEST_MERGE_REVISION "revision" +#define DMAPI5_TEST_MERGE_TITLE_AT_MERGE "titleAtMerge" +#define DMAPI5_TEST_MERGE_BODY_AT_MERGE "bodyAtMerge" +#define DMAPI5_TEST_MERGE_URL "url" +#define DMAPI5_TEST_MERGE_AUTHOR "author" +#define DMAPI5_TEST_MERGE_NUMBER "number" +#define DMAPI5_TEST_MERGE_PULL_REQUEST_REVISION "pullRequestRevision" +#define DMAPI5_TEST_MERGE_COMMENT "comment" + +#define DMAPI5_CHAT_COMMAND_NAME "name" +#define DMAPI5_CHAT_COMMAND_PARAMS "params" +#define DMAPI5_CHAT_COMMAND_USER "user" + +#define DMAPI5_EVENT_NOTIFICATION_TYPE "type" +#define DMAPI5_EVENT_NOTIFICATION_PARAMETERS "parameters" + +#define DMAPI5_TOPIC_COMMAND_CHAT_COMMAND 0 +#define DMAPI5_TOPIC_COMMAND_EVENT_NOTIFICATION 1 +#define DMAPI5_TOPIC_COMMAND_CHANGE_PORT 2 +#define DMAPI5_TOPIC_COMMAND_CHANGE_REBOOT_STATE 3 +#define DMAPI5_TOPIC_COMMAND_INSTANCE_RENAMED 4 +#define DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE 5 +#define DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE 6 +#define DMAPI5_TOPIC_COMMAND_HEARTBEAT 7 +#define DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH 8 +#define DMAPI5_TOPIC_COMMAND_SEND_CHUNK 9 +#define DMAPI5_TOPIC_COMMAND_RECEIVE_CHUNK 10 + +#define DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE "commandType" +#define DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND "chatCommand" +#define DMAPI5_TOPIC_PARAMETER_EVENT_NOTIFICATION "eventNotification" +#define DMAPI5_TOPIC_PARAMETER_NEW_PORT "newPort" +#define DMAPI5_TOPIC_PARAMETER_NEW_REBOOT_STATE "newRebootState" +#define DMAPI5_TOPIC_PARAMETER_NEW_INSTANCE_NAME "newInstanceName" +#define DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE "chatUpdate" +#define DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION "newServerVersion" + +#define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE "commandResponse" +#define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE "commandResponseMessage" +#define DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES "chatResponses" + +#define DMAPI5_REVISION_INFORMATION_COMMIT_SHA "commitSha" +#define DMAPI5_REVISION_INFORMATION_TIMESTAMP "timestamp" +#define DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA "originCommitSha" + +#define DMAPI5_CHAT_USER_ID "id" +#define DMAPI5_CHAT_USER_FRIENDLY_NAME "friendlyName" +#define DMAPI5_CHAT_USER_MENTION "mention" +#define DMAPI5_CHAT_USER_CHANNEL "channel" + +#define DMAPI5_CHAT_CHANNEL_ID "id" +#define DMAPI5_CHAT_CHANNEL_FRIENDLY_NAME "friendlyName" +#define DMAPI5_CHAT_CHANNEL_CONNECTION_NAME "connectionName" +#define DMAPI5_CHAT_CHANNEL_IS_ADMIN_CHANNEL "isAdminChannel" +#define DMAPI5_CHAT_CHANNEL_IS_PRIVATE_CHANNEL "isPrivateChannel" +#define DMAPI5_CHAT_CHANNEL_TAG "tag" +#define DMAPI5_CHAT_CHANNEL_EMBEDS_SUPPORTED "embedsSupported" + +#define DMAPI5_CUSTOM_CHAT_COMMAND_NAME "name" +#define DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT "helpText" +#define DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY "adminOnly" diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v5/api.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/api.dm new file mode 100644 index 00000000000..517240f12f8 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/api.dm @@ -0,0 +1,228 @@ +/datum/tgs_api/v5 + var/server_port + var/access_identifier + + var/instance_name + var/security_level + + var/reboot_mode = TGS_REBOOT_MODE_NORMAL + + var/list/intercepted_message_queue + + var/list/custom_commands + + var/list/test_merges + var/datum/tgs_revision_information/revision + var/list/chat_channels + + var/initialized = FALSE + + var/chunked_requests = 0 + var/list/chunked_topics = list() + + var/detached = FALSE + +/datum/tgs_api/v5/ApiVersion() + return new /datum/tgs_version( + #include "__interop_version.dm" + ) + +/datum/tgs_api/v5/OnWorldNew(minimum_required_security_level) + server_port = world.params[DMAPI5_PARAM_SERVER_PORT] + access_identifier = world.params[DMAPI5_PARAM_ACCESS_IDENTIFIER] + + var/datum/tgs_version/api_version = ApiVersion() + version = null + var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands())) + if(!istype(bridge_response)) + TGS_ERROR_LOG("Failed initial bridge request!") + return FALSE + + var/list/runtime_information = bridge_response[DMAPI5_BRIDGE_RESPONSE_RUNTIME_INFORMATION] + if(!istype(runtime_information)) + TGS_ERROR_LOG("Failed to decode runtime information from bridge response: [json_encode(bridge_response)]!") + return FALSE + + if(runtime_information[DMAPI5_RUNTIME_INFORMATION_API_VALIDATE_ONLY]) + TGS_INFO_LOG("DMAPI validation, exiting...") + del(world) + + version = new /datum/tgs_version(runtime_information[DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION]) + security_level = runtime_information[DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL] + instance_name = runtime_information[DMAPI5_RUNTIME_INFORMATION_INSTANCE_NAME] + + var/list/revisionData = runtime_information[DMAPI5_RUNTIME_INFORMATION_REVISION] + if(istype(revisionData)) + revision = new + revision.commit = revisionData[DMAPI5_REVISION_INFORMATION_COMMIT_SHA] + revision.timestamp = revisionData[DMAPI5_REVISION_INFORMATION_TIMESTAMP] + revision.origin_commit = revisionData[DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA] + else + TGS_ERROR_LOG("Failed to decode [DMAPI5_RUNTIME_INFORMATION_REVISION] from runtime information!") + + test_merges = list() + var/list/test_merge_json = runtime_information[DMAPI5_RUNTIME_INFORMATION_TEST_MERGES] + if(istype(test_merge_json)) + for(var/entry in test_merge_json) + var/datum/tgs_revision_information/test_merge/tm = new + tm.number = entry[DMAPI5_TEST_MERGE_NUMBER] + + var/list/revInfo = entry[DMAPI5_TEST_MERGE_REVISION] + if(revInfo) + tm.commit = revisionData[DMAPI5_REVISION_INFORMATION_COMMIT_SHA] + tm.origin_commit = revisionData[DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA] + tm.timestamp = entry[DMAPI5_REVISION_INFORMATION_TIMESTAMP] + else + TGS_WARNING_LOG("Failed to decode [DMAPI5_TEST_MERGE_REVISION] from test merge #[tm.number]!") + + if(!tm.timestamp) + tm.timestamp = entry[DMAPI5_TEST_MERGE_TIME_MERGED] + + tm.title = entry[DMAPI5_TEST_MERGE_TITLE_AT_MERGE] + tm.body = entry[DMAPI5_TEST_MERGE_BODY_AT_MERGE] + tm.url = entry[DMAPI5_TEST_MERGE_URL] + tm.author = entry[DMAPI5_TEST_MERGE_AUTHOR] + tm.head_commit = entry[DMAPI5_TEST_MERGE_PULL_REQUEST_REVISION] + tm.comment = entry[DMAPI5_TEST_MERGE_COMMENT] + + test_merges += tm + else + TGS_WARNING_LOG("Failed to decode [DMAPI5_RUNTIME_INFORMATION_TEST_MERGES] from runtime information!") + + chat_channels = list() + DecodeChannels(runtime_information) + + initialized = TRUE + return TRUE + +/datum/tgs_api/v5/proc/RequireInitialBridgeResponse() + while(!version) + sleep(1) + +/datum/tgs_api/v5/OnInitializationComplete() + Bridge(DMAPI5_BRIDGE_COMMAND_PRIME) + +/datum/tgs_api/v5/OnTopic(T) + RequireInitialBridgeResponse() + var/list/params = params2list(T) + var/json = params[DMAPI5_TOPIC_DATA] + if(!json) + return FALSE // continue to /world/Topic + + if(!initialized) + TGS_WARNING_LOG("Missed topic due to not being initialized: [json]") + return TRUE // too early to handle, but it's still our responsibility + + return ProcessTopicJson(json, TRUE) + +/datum/tgs_api/v5/OnReboot() + var/list/result = Bridge(DMAPI5_BRIDGE_COMMAND_REBOOT) + if(!result) + return + + //okay so the standard TGS proceedure is: right before rebooting change the port to whatever was sent to us in the above json's data parameter + + var/port = result[DMAPI5_BRIDGE_RESPONSE_NEW_PORT] + if(!isnum(port)) + return //this is valid, server may just want use to reboot + + if(port == 0) + //to byond 0 means any port and "none" means close vOv + port = "none" + + if(!world.OpenPort(port)) + TGS_ERROR_LOG("Unable to set port to [port]!") + +/datum/tgs_api/v5/InstanceName() + RequireInitialBridgeResponse() + return instance_name + +/datum/tgs_api/v5/TestMerges() + RequireInitialBridgeResponse() + return test_merges.Copy() + +/datum/tgs_api/v5/EndProcess() + Bridge(DMAPI5_BRIDGE_COMMAND_KILL) + +/datum/tgs_api/v5/Revision() + RequireInitialBridgeResponse() + return revision + +// Common proc b/c it's used by the V3/V4 APIs +/datum/tgs_api/proc/UpgradeDeprecatedChatMessage(datum/tgs_message_content/message) + if(!istext(message)) + return message + + TGS_WARNING_LOG("Received legacy string when a [/datum/tgs_message_content] was expected. Please audit all calls to TgsChatBroadcast, TgsChatTargetedBroadcast, and TgsChatPrivateMessage to ensure they use the new /datum.") + return new /datum/tgs_message_content(message) + +/datum/tgs_api/v5/ChatBroadcast(datum/tgs_message_content/message, list/channels) + if(!length(channels)) + channels = ChatChannelInfo() + + var/list/ids = list() + for(var/I in channels) + var/datum/tgs_chat_channel/channel = I + ids += channel.id + + message = UpgradeDeprecatedChatMessage(message) + message = message._interop_serialize() + message[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = ids + if(intercepted_message_queue) + intercepted_message_queue += list(message) + else + Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = message)) + +/datum/tgs_api/v5/ChatTargetedBroadcast(datum/tgs_message_content/message, admin_only) + var/list/channels = list() + for(var/I in ChatChannelInfo()) + var/datum/tgs_chat_channel/channel = I + if (!channel.is_private_channel && ((channel.is_admin_channel && admin_only) || (!channel.is_admin_channel && !admin_only))) + channels += channel.id + + message = UpgradeDeprecatedChatMessage(message) + message = message._interop_serialize() + message[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channels + if(intercepted_message_queue) + intercepted_message_queue += list(message) + else + Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = message)) + +/datum/tgs_api/v5/ChatPrivateMessage(datum/tgs_message_content/message, datum/tgs_chat_user/user) + message = UpgradeDeprecatedChatMessage(message) + message = message._interop_serialize() + message[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = list(user.channel.id) + if(intercepted_message_queue) + intercepted_message_queue += list(message) + else + Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = message)) + +/datum/tgs_api/v5/ChatChannelInfo() + RequireInitialBridgeResponse() + return chat_channels.Copy() + +/datum/tgs_api/v5/proc/DecodeChannels(chat_update_json) + var/list/chat_channels_json = chat_update_json[DMAPI5_CHAT_UPDATE_CHANNELS] + if(istype(chat_channels_json)) + chat_channels.Cut() + for(var/channel_json in chat_channels_json) + var/datum/tgs_chat_channel/channel = DecodeChannel(channel_json) + if(channel) + chat_channels += channel + else + TGS_WARNING_LOG("Failed to decode [DMAPI5_CHAT_UPDATE_CHANNELS] from channel update!") + +/datum/tgs_api/v5/proc/DecodeChannel(channel_json) + var/datum/tgs_chat_channel/channel = new + channel.id = channel_json[DMAPI5_CHAT_CHANNEL_ID] + channel.friendly_name = channel_json[DMAPI5_CHAT_CHANNEL_FRIENDLY_NAME] + channel.connection_name = channel_json[DMAPI5_CHAT_CHANNEL_CONNECTION_NAME] + channel.is_admin_channel = channel_json[DMAPI5_CHAT_CHANNEL_IS_ADMIN_CHANNEL] + channel.is_private_channel = channel_json[DMAPI5_CHAT_CHANNEL_IS_PRIVATE_CHANNEL] + channel.custom_tag = channel_json[DMAPI5_CHAT_CHANNEL_TAG] + channel.embeds_supported = channel_json[DMAPI5_CHAT_CHANNEL_EMBEDS_SUPPORTED] + return channel + +/datum/tgs_api/v5/SecurityLevel() + RequireInitialBridgeResponse() + return security_level diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v5/bridge.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/bridge.dm new file mode 100644 index 00000000000..b3cf7759397 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/bridge.dm @@ -0,0 +1,95 @@ +/datum/tgs_api/v5/proc/Bridge(command, list/data) + if(!data) + data = list() + + var/single_bridge_request = CreateBridgeRequest(command, data) + if(length(single_bridge_request) <= DMAPI5_BRIDGE_REQUEST_LIMIT) + return PerformBridgeRequest(single_bridge_request) + + // chunking required + var/payload_id = ++chunked_requests + + var/raw_data = CreateBridgeData(command, data, FALSE) + + var/list/chunk_requests = GenerateChunks(raw_data, TRUE) + + var/list/response + for(var/bridge_request in chunk_requests) + response = PerformBridgeRequest(bridge_request) + if(!response) + // Abort + return + + var/list/missing_sequence_ids = response[DMAPI5_MISSING_CHUNKS] + if(length(missing_sequence_ids)) + do + TGS_WARNING_LOG("Server is still missing some chunks of bridge P[payload_id]! Sending missing chunks...") + if(!istype(missing_sequence_ids)) + TGS_ERROR_LOG("Did not receive a list() for [DMAPI5_MISSING_CHUNKS]!") + return + + for(var/missing_sequence_id in missing_sequence_ids) + if(!isnum(missing_sequence_id)) + TGS_ERROR_LOG("Did not receive a num in [DMAPI5_MISSING_CHUNKS]!") + return + + var/missing_chunk_request = chunk_requests[missing_sequence_id + 1] + response = PerformBridgeRequest(missing_chunk_request) + if(!response) + // Abort + return + + missing_sequence_ids = response[DMAPI5_MISSING_CHUNKS] + while(length(missing_sequence_ids)) + + return response + +/datum/tgs_api/v5/proc/CreateBridgeRequest(command, list/data) + var/json = CreateBridgeData(command, data, TRUE) + var/encoded_json = url_encode(json) + + var/url = "http://127.0.0.1:[server_port]/Bridge?[DMAPI5_BRIDGE_DATA]=[encoded_json]" + return url + +/datum/tgs_api/v5/proc/CreateBridgeData(command, list/data, needs_auth) + data[DMAPI5_BRIDGE_PARAMETER_COMMAND_TYPE] = command + if(needs_auth) + data[DMAPI5_PARAMETER_ACCESS_IDENTIFIER] = access_identifier + + var/json = json_encode(data) + return json + +/datum/tgs_api/v5/proc/PerformBridgeRequest(bridge_request) + if(detached) + // Wait up to one minute + for(var/i in 1 to 600) + sleep(1) + if(!detached) + break + + // dad went out for milk cigarettes 20 years ago... + if(i == 600) + detached = FALSE + + // This is an infinite sleep until we get a response + var/export_response = world.Export(bridge_request) + if(!export_response) + TGS_ERROR_LOG("Failed bridge request: [bridge_request]") + return + + var/response_json = file2text(export_response["CONTENT"]) + if(!response_json) + TGS_ERROR_LOG("Failed bridge request, missing content!") + return + + var/list/bridge_response = json_decode(response_json) + if(!bridge_response) + TGS_ERROR_LOG("Failed bridge request, bad json: [response_json]") + return + + var/error = bridge_response[DMAPI5_RESPONSE_ERROR_MESSAGE] + if(error) + TGS_ERROR_LOG("Failed bridge request, bad request: [error]") + return + + return bridge_response diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v5/chunking.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/chunking.dm new file mode 100644 index 00000000000..af4cd6cc80b --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/chunking.dm @@ -0,0 +1,43 @@ +/datum/tgs_api/v5/proc/GenerateChunks(payload, bridge) + var/limit = bridge ? DMAPI5_BRIDGE_REQUEST_LIMIT : DMAPI5_TOPIC_RESPONSE_LIMIT + + var/payload_id = ++chunked_requests + var/data_length = length(payload) + + var/chunk_count + var/list/chunk_requests + for(chunk_count = 2; !chunk_requests; ++chunk_count); + var/max_chunk_size = -round(-(data_length / chunk_count)) + if(max_chunk_size > limit) + continue + + chunk_requests = list() + for(var/i in 1 to chunk_count) + var/start_index = 1 + ((i - 1) * max_chunk_size) + if (start_index > data_length) + break + + var/end_index = min(1 + (i * max_chunk_size), data_length + 1) + + var/chunk_payload = copytext(payload, start_index, end_index) + + // sequence IDs in interop chunking are always zero indexed + var/list/chunk = list(DMAPI5_CHUNK_PAYLOAD_ID = payload_id, DMAPI5_CHUNK_SEQUENCE_ID = (i - 1), DMAPI5_CHUNK_TOTAL = chunk_count, DMAPI5_CHUNK_PAYLOAD = chunk_payload) + + var/chunk_request = list(DMAPI5_CHUNK = chunk) + var/chunk_length + if(bridge) + chunk_request = CreateBridgeRequest(DMAPI5_BRIDGE_COMMAND_CHUNK, chunk_request) + chunk_length = length(chunk_request) + else + chunk_request = list(chunk_request) // wrap for adding to list + chunk_length = length(json_encode(chunk_request)) + + if(chunk_length > limit) + // Screwed by encoding, no way to preempt it though + chunk_requests = null + break + + chunk_requests += chunk_request + + return chunk_requests diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v5/commands.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/commands.dm new file mode 100644 index 00000000000..a832c81f172 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/commands.dm @@ -0,0 +1,60 @@ +/datum/tgs_api/v5/proc/ListCustomCommands() + var/results = list() + custom_commands = list() + for(var/I in typesof(/datum/tgs_chat_command) - /datum/tgs_chat_command) + var/datum/tgs_chat_command/stc = new I + if(stc.ignore_type == I) + continue + + var/command_name = stc.name + if(!command_name || findtext(command_name, " ") || findtext(command_name, "'") || findtext(command_name, "\"")) + TGS_ERROR_LOG("Custom command [command_name] ([I]) can't be used as it is empty or contains illegal characters!") + continue + + if(results[command_name]) + var/datum/other = custom_commands[command_name] + TGS_ERROR_LOG("Custom commands [other.type] and [I] have the same name (\"[command_name]\"), only [other.type] will be available!") + continue + results += list(list(DMAPI5_CUSTOM_CHAT_COMMAND_NAME = command_name, DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT = stc.help_text, DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY = stc.admin_only)) + custom_commands[command_name] = stc + + return results + +/datum/tgs_api/v5/proc/HandleCustomCommand(list/command_json) + var/command = command_json[DMAPI5_CHAT_COMMAND_NAME] + var/user = command_json[DMAPI5_CHAT_COMMAND_USER] + var/params = command_json[DMAPI5_CHAT_COMMAND_PARAMS] + + var/datum/tgs_chat_user/u = new + u.id = user[DMAPI5_CHAT_USER_ID] + u.friendly_name = user[DMAPI5_CHAT_USER_FRIENDLY_NAME] + u.mention = user[DMAPI5_CHAT_USER_MENTION] + u.channel = DecodeChannel(user[DMAPI5_CHAT_USER_CHANNEL]) + + var/datum/tgs_chat_command/sc = custom_commands[command] + if(sc) + var/datum/tgs_message_content/response = sc.Run(u, params) + response = UpgradeDeprecatedCommandResponse(response, command) + + var/list/topic_response = TopicResponse() + topic_response[DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE] = response?.text + topic_response[DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE] = response?._interop_serialize() + return topic_response + return TopicResponse("Unknown custom chat command: [command]!") + +// Common proc b/c it's used by the V3/V4 APIs +/datum/tgs_api/proc/UpgradeDeprecatedCommandResponse(datum/tgs_message_content/response, command) + // Backwards compatibility, used to return a string + if(istext(response)) + warned_deprecated_command_runs = warned_deprecated_command_runs || list() + if(!warned_deprecated_command_runs[command]) + TGS_WARNING_LOG("Custom chat command \"[command]\" is still returning a string. This behaviour is deprecated, please upgrade it to return a [/datum/tgs_message_content].") + warned_deprecated_command_runs[command] = TRUE + + return new /datum/tgs_message_content(response) + + if(!istype(response)) + TGS_ERROR_LOG("Custom chat command \"[command]\" should return a [/datum/tgs_message_content]! Got: \"[response]\"") + return null + + return response diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v5/serializers.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/serializers.dm new file mode 100644 index 00000000000..7f9bc731b79 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/serializers.dm @@ -0,0 +1,59 @@ +/datum/tgs_message_content/proc/_interop_serialize() + return list("text" = text, "embed" = embed?._interop_serialize()) + +/datum/tgs_chat_embed/proc/_interop_serialize() + CRASH("Base /proc/interop_serialize called on [type]!") + +/datum/tgs_chat_embed/structure/_interop_serialize() + var/list/serialized_fields + if(islist(fields)) + serialized_fields = list() + for(var/datum/tgs_chat_embed/field/field as anything in fields) + serialized_fields += list(field._interop_serialize()) + return list( + "title" = title, + "description" = description, + "url" = url, + "timestamp" = timestamp, + "colour" = colour, + "image" = image?._interop_serialize(), + "thumbnail" = thumbnail?._interop_serialize(), + "video" = video?._interop_serialize(), + "footer" = footer?._interop_serialize(), + "provider" = provider?._interop_serialize(), + "author" = author?._interop_serialize(), + "fields" = serialized_fields + ) + +/datum/tgs_chat_embed/media/_interop_serialize() + return list( + "url" = url, + "width" = width, + "height" = height, + "proxyUrl" = proxy_url + ) + +/datum/tgs_chat_embed/provider/_interop_serialize() + return list( + "url" = url, + "name" = name + ) + +/datum/tgs_chat_embed/provider/author/_interop_serialize() + . = ..() + .["iconUrl"] = icon_url + .["proxyIconUrl"] = proxy_icon_url + +/datum/tgs_chat_embed/footer/_interop_serialize() + return list( + "text" = text, + "iconUrl" = icon_url, + "proxyIconUrl" = proxy_icon_url + ) + +/datum/tgs_chat_embed/field/_interop_serialize() + return list( + "name" = name, + "value" = value, + "isInline" = is_inline + ) diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v5/topic.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/topic.dm new file mode 100644 index 00000000000..28fcc14aef8 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/topic.dm @@ -0,0 +1,258 @@ +/datum/tgs_api/v5/proc/TopicResponse(error_message = null) + var/list/response = list() + if(error_message) + response[DMAPI5_RESPONSE_ERROR_MESSAGE] = error_message + return response + +/datum/tgs_api/v5/proc/ProcessTopicJson(json, check_access_identifier) + var/list/result = ProcessRawTopic(json, check_access_identifier) + if(!result) + result = TopicResponse("Runtime error!") + else if(!length(result)) + return "{}" // quirk of json_encode is an empty list returns "[]" + + var/response_json = json_encode(result) + if(length(response_json) > DMAPI5_TOPIC_RESPONSE_LIMIT) + // cache response chunks and send the first + var/list/chunks = GenerateChunks(response_json, FALSE) + var/payload_id = chunks[1][DMAPI5_CHUNK][DMAPI5_CHUNK_PAYLOAD_ID] + var/cache_key = ResponseTopicChunkCacheKey(payload_id) + + chunked_topics[cache_key] = chunks + + response_json = json_encode(chunks[1]) + + return response_json + +/datum/tgs_api/v5/proc/ProcessRawTopic(json, check_access_identifier) + var/list/topic_parameters = json_decode(json) + if(!topic_parameters) + return TopicResponse("Invalid topic parameters json: [json]!"); + + var/their_sCK = topic_parameters[DMAPI5_PARAMETER_ACCESS_IDENTIFIER] + if(check_access_identifier && their_sCK != access_identifier) + return TopicResponse("Failed to decode [DMAPI5_PARAMETER_ACCESS_IDENTIFIER]!") + + var/command = topic_parameters[DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE] + if(!isnum(command)) + return TopicResponse("Failed to decode [DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE]!") + + return ProcessTopicCommand(command, topic_parameters) + +/datum/tgs_api/v5/proc/ResponseTopicChunkCacheKey(payload_id) + return "response[payload_id]" + +/datum/tgs_api/v5/proc/ProcessTopicCommand(command, list/topic_parameters) + switch(command) + + if(DMAPI5_TOPIC_COMMAND_CHAT_COMMAND) + intercepted_message_queue = list() + var/list/result = HandleCustomCommand(topic_parameters[DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND]) + if(!result) + result = TopicResponse("Error running chat command!") + result[DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES] = intercepted_message_queue + intercepted_message_queue = null + return result + + if(DMAPI5_TOPIC_COMMAND_EVENT_NOTIFICATION) + intercepted_message_queue = list() + var/list/event_notification = topic_parameters[DMAPI5_TOPIC_PARAMETER_EVENT_NOTIFICATION] + if(!istype(event_notification)) + return TopicResponse("Invalid [DMAPI5_TOPIC_PARAMETER_EVENT_NOTIFICATION]!") + + var/event_type = event_notification[DMAPI5_EVENT_NOTIFICATION_TYPE] + if(!isnum(event_type)) + return TopicResponse("Invalid or missing [DMAPI5_EVENT_NOTIFICATION_TYPE]!") + + var/list/event_parameters = event_notification[DMAPI5_EVENT_NOTIFICATION_PARAMETERS] + if(event_parameters && !istype(event_parameters)) + return TopicResponse("Invalid or missing [DMAPI5_EVENT_NOTIFICATION_PARAMETERS]!") + + var/list/event_call = list(event_type) + if (event_type == TGS_EVENT_WATCHDOG_DETACH) + detached = TRUE + + if(event_parameters) + event_call += event_parameters + + if(event_handler != null) + event_handler.HandleEvent(arglist(event_call)) + + var/list/response = TopicResponse() + response[DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES] = intercepted_message_queue + intercepted_message_queue = null + return response + + if(DMAPI5_TOPIC_COMMAND_CHANGE_PORT) + var/new_port = topic_parameters[DMAPI5_TOPIC_PARAMETER_NEW_PORT] + if (!isnum(new_port) || !(new_port > 0)) + return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_PORT]]") + + if(event_handler != null) + event_handler.HandleEvent(TGS_EVENT_PORT_SWAP, new_port) + + //the topic still completes, miraculously + //I honestly didn't believe byond could do it without exploding + if(!world.OpenPort(new_port)) + return TopicResponse("Port change failed!") + + return TopicResponse() + + if(DMAPI5_TOPIC_COMMAND_CHANGE_REBOOT_STATE) + var/new_reboot_mode = topic_parameters[DMAPI5_TOPIC_PARAMETER_NEW_REBOOT_STATE] + if(!isnum(new_reboot_mode)) + return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_REBOOT_STATE]!") + + if(event_handler != null) + event_handler.HandleEvent(TGS_EVENT_REBOOT_MODE_CHANGE, reboot_mode, new_reboot_mode) + + reboot_mode = new_reboot_mode + return TopicResponse() + + if(DMAPI5_TOPIC_COMMAND_INSTANCE_RENAMED) + var/new_instance_name = topic_parameters[DMAPI5_TOPIC_PARAMETER_NEW_INSTANCE_NAME] + if(!istext(new_instance_name)) + return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_INSTANCE_NAME]!") + + if(event_handler != null) + event_handler.HandleEvent(TGS_EVENT_INSTANCE_RENAMED, new_instance_name) + + instance_name = new_instance_name + return TopicResponse() + + if(DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE) + var/list/chat_update_json = topic_parameters[DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE] + if(!istype(chat_update_json)) + return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE]!") + + DecodeChannels(chat_update_json) + return TopicResponse() + + if(DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE) + var/new_port = topic_parameters[DMAPI5_TOPIC_PARAMETER_NEW_PORT] + if (!isnum(new_port) || !(new_port > 0)) + return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_PORT]]") + + server_port = new_port + return TopicResponse() + + if(DMAPI5_TOPIC_COMMAND_HEARTBEAT) + return TopicResponse() + + if(DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH) + detached = FALSE + var/new_port = topic_parameters[DMAPI5_TOPIC_PARAMETER_NEW_PORT] + var/error_message = null + if (new_port != null) + if (!isnum(new_port) || !(new_port > 0)) + error_message = "Invalid [DMAPI5_TOPIC_PARAMETER_NEW_PORT]]" + else + server_port = new_port + + var/new_version_string = topic_parameters[DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION] + if (!istext(new_version_string)) + if(error_message != null) + error_message += ", " + error_message += "Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION]]" + else + var/datum/tgs_version/new_version = new(new_version_string) + if (event_handler) + event_handler.HandleEvent(TGS_EVENT_WATCHDOG_REATTACH, new_version) + + version = new_version + + var/list/reattach_response = TopicResponse(error_message) + reattach_response[DMAPI5_PARAMETER_CUSTOM_COMMANDS] = ListCustomCommands() + return reattach_response + + if(DMAPI5_TOPIC_COMMAND_SEND_CHUNK) + var/list/chunk = topic_parameters[DMAPI5_CHUNK] + if(!istype(chunk)) + return TopicResponse("Invalid [DMAPI5_CHUNK]!") + + var/payload_id = chunk[DMAPI5_CHUNK_PAYLOAD_ID] + if(!isnum(payload_id)) + return TopicResponse("[DMAPI5_CHUNK_PAYLOAD_ID] is not a number!") + + // Always updated the highest known payload ID + chunked_requests = max(chunked_requests, payload_id) + + var/sequence_id = chunk[DMAPI5_CHUNK_SEQUENCE_ID] + if(!isnum(sequence_id)) + return TopicResponse("[DMAPI5_CHUNK_SEQUENCE_ID] is not a number!") + + var/total_chunks = chunk[DMAPI5_CHUNK_TOTAL] + if(!isnum(total_chunks)) + return TopicResponse("[DMAPI5_CHUNK_TOTAL] is not a number!") + + if(total_chunks == 0) + return TopicResponse("[DMAPI5_CHUNK_TOTAL] is zero!") + + var/payload = chunk[DMAPI5_CHUNK_PAYLOAD] + if(!istext(payload)) + return TopicResponse("[DMAPI5_CHUNK_PAYLOAD] is not text!") + + var/cache_key = "request[payload_id]" + var/payloads = chunked_topics[cache_key] + + if(!payloads) + payloads = new /list(total_chunks) + chunked_topics[cache_key] = payloads + + if(total_chunks != length(payloads)) + chunked_topics -= cache_key + return TopicResponse("Received differing total chunks for same [DMAPI5_CHUNK_PAYLOAD_ID]! Invalidating [DMAPI5_CHUNK_PAYLOAD_ID]!") + + var/pre_existing_chunk = payloads[sequence_id + 1] + if(pre_existing_chunk && pre_existing_chunk != payload) + chunked_topics -= cache_key + return TopicResponse("Received differing payload for same [DMAPI5_CHUNK_SEQUENCE_ID]! Invalidating [DMAPI5_CHUNK_PAYLOAD_ID]!") + + payloads[sequence_id + 1] = payload + + var/list/missing_sequence_ids = list() + for(var/i in 1 to total_chunks) + if(!payloads[i]) + missing_sequence_ids += i - 1 + + if(length(missing_sequence_ids)) + return list(DMAPI5_MISSING_CHUNKS = missing_sequence_ids) + + chunked_topics -= cache_key + var/full_json = jointext(payloads, "") + + return ProcessRawTopic(full_json, FALSE) + + if(DMAPI5_TOPIC_COMMAND_RECEIVE_CHUNK) + var/payload_id = topic_parameters[DMAPI5_CHUNK_PAYLOAD_ID] + if(!isnum(payload_id)) + return TopicResponse("[DMAPI5_CHUNK_PAYLOAD_ID] is not a number!") + + // Always updated the highest known payload ID + chunked_requests = max(chunked_requests, payload_id) + + var/list/missing_chunks = topic_parameters[DMAPI5_MISSING_CHUNKS] + if(!istype(missing_chunks) || !length(missing_chunks)) + return TopicResponse("Missing or empty [DMAPI5_MISSING_CHUNKS]!") + + var/sequence_id_to_send = missing_chunks[1] + if(!isnum(sequence_id_to_send)) + return TopicResponse("[DMAPI5_MISSING_CHUNKS] contained a non-number!") + + var/cache_key = ResponseTopicChunkCacheKey(payload_id) + var/list/chunks = chunked_topics[cache_key] + if(!chunks) + return TopicResponse("Unknown response chunk set: P[payload_id]!") + + // sequence IDs in interop chunking are always zero indexed + var/chunk_to_send = chunks[sequence_id_to_send + 1] + if(!chunk_to_send) + return TopicResponse("Sequence ID [sequence_id_to_send] is not present in response chunk P[payload_id]!") + + if(length(missing_chunks) == 1) + // sending last chunk, purge the cache + chunked_topics -= cache_key + + return chunk_to_send + + return TopicResponse("Unknown command: [command]") diff --git a/proxima/code/modules/TGS/TGDMAPI/tgs/v5/undefs.dm b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/undefs.dm new file mode 100644 index 00000000000..2e3b7ae7713 --- /dev/null +++ b/proxima/code/modules/TGS/TGDMAPI/tgs/v5/undefs.dm @@ -0,0 +1,112 @@ +#undef DMAPI5_PARAM_SERVER_PORT +#undef DMAPI5_PARAM_ACCESS_IDENTIFIER + +#undef DMAPI5_BRIDGE_DATA +#undef DMAPI5_TOPIC_DATA + +#undef DMAPI5_BRIDGE_REQUEST_LIMIT +#undef DMAPI5_TOPIC_REQUEST_LIMIT +#undef DMAPI5_TOPIC_RESPONSE_LIMIT + +#undef DMAPI5_BRIDGE_COMMAND_PORT_UPDATE +#undef DMAPI5_BRIDGE_COMMAND_STARTUP +#undef DMAPI5_BRIDGE_COMMAND_PRIME +#undef DMAPI5_BRIDGE_COMMAND_REBOOT +#undef DMAPI5_BRIDGE_COMMAND_KILL +#undef DMAPI5_BRIDGE_COMMAND_CHAT_SEND + +#undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER +#undef DMAPI5_PARAMETER_CUSTOM_COMMANDS + +#undef DMAPI5_CHUNK +#undef DMAPI5_CHUNK_PAYLOAD +#undef DMAPI5_CHUNK_TOTAL +#undef DMAPI5_CHUNK_SEQUENCE_ID +#undef DMAPI5_CHUNK_PAYLOAD_ID + +#undef DMAPI5_MISSING_CHUNKS + +#undef DMAPI5_RESPONSE_ERROR_MESSAGE + +#undef DMAPI5_BRIDGE_PARAMETER_COMMAND_TYPE +#undef DMAPI5_BRIDGE_PARAMETER_CURRENT_PORT +#undef DMAPI5_BRIDGE_PARAMETER_VERSION +#undef DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE +#undef DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL + +#undef DMAPI5_BRIDGE_RESPONSE_NEW_PORT +#undef DMAPI5_BRIDGE_RESPONSE_RUNTIME_INFORMATION + +#undef DMAPI5_CHAT_MESSAGE_CHANNEL_IDS + +#undef DMAPI5_RUNTIME_INFORMATION_ACCESS_IDENTIFIER +#undef DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION +#undef DMAPI5_RUNTIME_INFORMATION_SERVER_PORT +#undef DMAPI5_RUNTIME_INFORMATION_API_VALIDATE_ONLY +#undef DMAPI5_RUNTIME_INFORMATION_INSTANCE_NAME +#undef DMAPI5_RUNTIME_INFORMATION_REVISION +#undef DMAPI5_RUNTIME_INFORMATION_TEST_MERGES +#undef DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL + +#undef DMAPI5_CHAT_UPDATE_CHANNELS + +#undef DMAPI5_TEST_MERGE_TIME_MERGED +#undef DMAPI5_TEST_MERGE_REVISION +#undef DMAPI5_TEST_MERGE_TITLE_AT_MERGE +#undef DMAPI5_TEST_MERGE_BODY_AT_MERGE +#undef DMAPI5_TEST_MERGE_URL +#undef DMAPI5_TEST_MERGE_AUTHOR +#undef DMAPI5_TEST_MERGE_NUMBER +#undef DMAPI5_TEST_MERGE_PULL_REQUEST_REVISION +#undef DMAPI5_TEST_MERGE_COMMENT + +#undef DMAPI5_CHAT_COMMAND_NAME +#undef DMAPI5_CHAT_COMMAND_PARAMS +#undef DMAPI5_CHAT_COMMAND_USER + +#undef DMAPI5_EVENT_NOTIFICATION_TYPE +#undef DMAPI5_EVENT_NOTIFICATION_PARAMETERS + +#undef DMAPI5_TOPIC_COMMAND_CHAT_COMMAND +#undef DMAPI5_TOPIC_COMMAND_EVENT_NOTIFICATION +#undef DMAPI5_TOPIC_COMMAND_CHANGE_PORT +#undef DMAPI5_TOPIC_COMMAND_CHANGE_REBOOT_STATE +#undef DMAPI5_TOPIC_COMMAND_INSTANCE_RENAMED +#undef DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE +#undef DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE +#undef DMAPI5_TOPIC_COMMAND_HEARTBEAT +#undef DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH + +#undef DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE +#undef DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND +#undef DMAPI5_TOPIC_PARAMETER_EVENT_NOTIFICATION +#undef DMAPI5_TOPIC_PARAMETER_NEW_PORT +#undef DMAPI5_TOPIC_PARAMETER_NEW_REBOOT_STATE +#undef DMAPI5_TOPIC_PARAMETER_NEW_INSTANCE_NAME +#undef DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE +#undef DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION + +#undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE +#undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE +#undef DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES + +#undef DMAPI5_REVISION_INFORMATION_COMMIT_SHA +#undef DMAPI5_REVISION_INFORMATION_TIMESTAMP +#undef DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA + +#undef DMAPI5_CHAT_USER_ID +#undef DMAPI5_CHAT_USER_FRIENDLY_NAME +#undef DMAPI5_CHAT_USER_MENTION +#undef DMAPI5_CHAT_USER_CHANNEL + +#undef DMAPI5_CHAT_CHANNEL_ID +#undef DMAPI5_CHAT_CHANNEL_FRIENDLY_NAME +#undef DMAPI5_CHAT_CHANNEL_CONNECTION_NAME +#undef DMAPI5_CHAT_CHANNEL_IS_ADMIN_CHANNEL +#undef DMAPI5_CHAT_CHANNEL_IS_PRIVATE_CHANNEL +#undef DMAPI5_CHAT_CHANNEL_TAG +#undef DMAPI5_CHAT_CHANNEL_EMBEDS_SUPPORTED + +#undef DMAPI5_CUSTOM_CHAT_COMMAND_NAME +#undef DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT +#undef DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY diff --git a/proxima/code/modules/TGS/TGSIntegration/TGSChatCommands.dm b/proxima/code/modules/TGS/TGSIntegration/TGSChatCommands.dm new file mode 100644 index 00000000000..12b95b0f551 --- /dev/null +++ b/proxima/code/modules/TGS/TGSIntegration/TGSChatCommands.dm @@ -0,0 +1,469 @@ +#define IRC_STATUS_THROTTLE 5 +#define NON_BYOND_URL "https://bay.proxima.fun/" + +/proc/Uptime(from_zero) + var/static/days = 0 + var/static/result = 0 + var/static/started = world.timeofday + var/static/last_time = started + var/time = world.timeofday + if (time == last_time) + return result + if (time < last_time) + ++days + last_time = time + result = time + days DAYS + if (from_zero) + result -= started + return result + +/datum/tgs_chat_embed/provider/author/glob + name = "Сервер 'PRX'" + url = NON_BYOND_URL + icon_url = "https://media.discordapp.net/attachments/1019304147671076975/1062958307096154172/Logo-Proxima-Mini.png" + +/datum/tgs_chat_command/ircstatus + name = "status" + help_text = "Показывает админов, кол-во игроков, игровой режим и настоящий игровой режим на сервере" + admin_only = TRUE + var/last_irc_status = 0 + +/datum/tgs_chat_command/ircstatus/Run(datum/tgs_chat_user/sender, params) + var/rtod = Uptime() + if(rtod - last_irc_status < IRC_STATUS_THROTTLE) + return + last_irc_status = rtod + var/list/adm = get_admin_counts() + var/list/allmins = adm["total"] + + var/datum/tgs_message_content/message = new ("") + var/datum/tgs_chat_embed/structure/embed = new() + message.embed = embed + var/datum/tgs_chat_embed/field/adminCount = new ("Админы", "[allmins.len]") + var/datum/tgs_chat_embed/field/afk = new ("АФК", "[english_list(adm["afk"])]") + var/datum/tgs_chat_embed/field/activeAdmins = new ("Активные админы", "[english_list(adm["present"])]") + var/datum/tgs_chat_embed/field/stealth = new ("Скрыты", "[english_list(adm["stealth"])]") + var/datum/tgs_chat_embed/field/useless = new ("Сотрудники без флага +BAN", "[english_list(adm["noflags"])]") + var/datum/tgs_chat_embed/field/players = new ("Игроки", "[clients.len]") + var/datum/tgs_chat_embed/field/activePlayers= new ("Активные игроки", "[get_active_player_count(0,1,0)]") + var/datum/tgs_chat_embed/field/modeReal = new ("Рассказчик", "||[GLOB.storyteller ? GLOB.storyteller.name : "Выбирается"]||") + adminCount.is_inline = TRUE + afk.is_inline = TRUE + stealth.is_inline = TRUE + players.is_inline = TRUE + activePlayers.is_inline = TRUE + //modePublic.is_inline = TRUE + modeReal.is_inline = TRUE + embed.fields = list(adminCount, activeAdmins, afk, stealth, useless, players, activePlayers, modeReal) + embed.colour = "#00ff8c" + + embed.title = "Статус сервера Proxima" + embed.author = new /datum/tgs_chat_embed/provider/author/glob("Сервер 'PRX'") + //embed.footer = new /datum/tgs_chat_embed/footer("Сервер 'PRX'") + //embed.url = NON_BYOND_URL + + return message + +/datum/tgs_chat_command/irccheck + name = "check" + help_text = "Показывает онлайн, текущий режим и адрес сервера" + var/last_irc_check = 0 + +/datum/tgs_chat_command/irccheck/Run(datum/tgs_chat_user/sender, params) + var/rtod = Uptime() + if(rtod - last_irc_check < IRC_STATUS_THROTTLE) + return + last_irc_check = rtod + + var/datum/tgs_message_content/message = new ("") + var/datum/tgs_chat_embed/structure/embed = new() + message.embed = embed + var/datum/tgs_chat_embed/field/round = new ("Раунд №", "[game_id ? "[game_id]" : "НЕТ АЙДИ"]") + var/datum/tgs_chat_embed/field/players = new ("Игроки", "[clients.len]") + var/datum/tgs_chat_embed/field/map = new ("Карта", "CEV ERIS")//"[GLOB.using_map.full_name]") + var/datum/tgs_chat_embed/field/modePublic = new ("Рассказчик", "||[GLOB.storyteller ? GLOB.storyteller.name : "Выбирается"]||") + var/datum/tgs_chat_embed/field/gameStatus = new ("Статус игры", "[Master.current_runlevel != RUNLEVEL_LOBBY ? (Master.current_runlevel != RUNLEVEL_POSTGAME ? "Активен" : "Заканчивается") : "Подготавливается"]") + + round.is_inline = TRUE + players.is_inline = TRUE + //map.is_inline = TRUE + modePublic.is_inline = TRUE + gameStatus.is_inline = TRUE + embed.fields = list(round, players, map, modePublic, gameStatus) + embed.colour = "#ffae00" + + + embed.title = "Статус сервера Proxima" + embed.author = new /datum/tgs_chat_embed/provider/author/glob("Сервер 'PRX'") + //embed.footer = new /datum/tgs_chat_embed/footer("Сервер 'PRX'") + //embed.url = NON_BYOND_URL + + return message + +/datum/tgs_chat_command/ircmanifest + name = "manifest" + help_text = "Показывает список членов экипажа с их должностями" + var/last_irc_check = 0 + +/datum/tgs_chat_command/ircmanifest/Run(datum/tgs_chat_user/sender, params) + var/rtod = Uptime() + if(rtod - last_irc_check < IRC_STATUS_THROTTLE) + return + last_irc_check = rtod + + if(Master.current_runlevel == RUNLEVEL_LOBBY) + return new /datum/tgs_message_content("Раунд еще подготавливается...") + + var/datum/tgs_message_content/message = new ("") + var/datum/tgs_chat_embed/structure/embed = new() + message.embed = embed + + embed.colour = "#ff003c" + embed.fields = list() + + embed.title = "Манифест экипажа на сервере Proxima" + embed.author = new /datum/tgs_chat_embed/provider/author/glob("Сервер 'PRX'") + //embed.footer = new /datum/tgs_chat_embed/footer("Сервер 'PRX'") + //embed.url = NON_BYOND_URL + + var/list/msg = list() + var/list/positions = list() + var/list/nano_crew_manifest = nano_crew_manifest() + // We rebuild the list in the format external tools expect + for(var/dept in nano_crew_manifest) + var/list/dept_list = nano_crew_manifest[dept] + if(dept_list.len > 0) + positions[dept] = list() + var/depString + switch(dept) + if ("heads") depString = "Командование" + if ("spt") depString = "Поддержка командования" + if ("sci") depString = "Научный отдел" + if ("sec") depString = "Отдел безопасности" + if ("eng") depString = "Инженерный отдел" + if ("med") depString = "Медицинский отдел" + if ("sup") depString = "Отдел снабжения" + if ("exp") depString = "Экспедиционный отдел" + if ("srv") depString = "Отдел обслуживания" + if ("bot") depString = "Синтетики" + if ("civ") depString = "Гражданские" + else depString = dept + for(var/list/person in dept_list) + //var/datum/mil_branch/branch_obj = GLOB.mil_branches.get_branch(person["branch"]) + //var/datum/mil_rank/rank_obj = GLOB.mil_branches.get_rank(person["branch"], person["milrank"]) + //msg += "*[person["rank"]]* - `[((branch_obj != null) && (branch_obj.name_short) && (branch_obj.name_short != "")) ? "[branch_obj.name_short] " : ""][((rank_obj != null) && (rank_obj.name_short) && (rank_obj.name_short != "")) ? "[rank_obj.name_short] " : ""][replacetext_char(person["name"], "'", "'")]`" + msg += "*[person["rank"]]* - `[replacetext_char(person["name"], "'", "'")]`" + + var/datum/tgs_chat_embed/field/depEntry = new ("[depString]", jointext(msg, "\n")) + embed.fields += depEntry + + msg = list() + return message + +/** -- Отвечать на тикеты из дискорда? Я подумаю над этим +/datum/tgs_chat_command/ahelp + name = "ahelp" + help_text = "" + admin_only = TRUE + +/datum/tgs_chat_command/ahelp/Run(datum/tgs_chat_user/sender, params) + var/list/all_params = splittext(params, " ") + if(all_params.len < 2) + return "Insufficient parameters" + var/target = all_params[1] + all_params.Cut(1, 2) + var/id = text2num(target) + if(id != null) + var/datum/admin_help/AH = GLOB.ahelp_tickets.TicketByID(id) + if(AH) + target = AH.initiator_ckey + else + return "Ticket #[id] not found!" + var/res = IrcPm(target, all_params.Join(" "), sender.friendly_name) + if(res != "Message Successful") + return res +**/ + +/datum/tgs_chat_command/adminwho + name = "adminwho" + help_text = "Перечисляет администраторов, находящихся на сервере" + +/datum/tgs_chat_command/adminwho/Run(datum/tgs_chat_user/sender, params) + var/list/msg = list() + var/active_staff = 0 + var/total_staff = 0 + var/can_investigate = sender.channel.is_admin_channel + + for(var/client/C in admins) + var/line = list() + if(!can_investigate && C.holder.fakekey) + continue + total_staff++ + if(check_rights(R_ADMIN,0,C)) + line += "*[C]* в ранге ***["\improper[C.holder.rank]"]***" + else + line += "*[C]* в ранге *["\improper[C.holder.rank]"]*" + if(!C.is_afk()) + active_staff++ + if(can_investigate) + if(C.is_afk()) + line += " *(АФК - [C.inactivity2text()])*" + if(isghost(C.mob)) + line += " - *Наблюдает*" + else if(istype(C.mob,/mob/new_player)) + line += " - *В Лобби*" + else + line += " - *Играет*" + if(C.holder.fakekey) + line += " *(Скрыт)*" + line = jointext(line, null) + if(check_rights(R_ADMIN,0,C)) + msg.Insert(1, line) + else + msg += line + + var/datum/tgs_message_content/message = new ("") + var/datum/tgs_chat_embed/structure/embed = new() + message.embed = embed + + embed.colour = "#ff0000" + + embed.title = "Список администрации на сервере Proxima" + embed.author = new /datum/tgs_chat_embed/provider/author/glob("Сервер 'PRX'") + //embed.footer = new /datum/tgs_chat_embed/footer("Сервер 'PRX'") + //embed.url = NON_BYOND_URL + + var/datum/tgs_chat_embed/field/adminCount = new ("Админы онлайн", "[can_investigate?"[active_staff]/[total_staff]":"[active_staff]"]") + var/datum/tgs_chat_embed/field/adminList = new ("Список администрации", jointext(msg, "\n")) + embed.fields = list(adminCount, adminList) + + return message + +GLOBAL_LIST(round_end_notifiees) + +/datum/tgs_chat_command/notify + name = "notify" + help_text = "Уведомляет вызвавшего по окончанию раунда" + //admin_only = TRUE + +/datum/tgs_chat_command/notify/Run(datum/tgs_chat_user/sender, params) + if(Master.current_runlevel == RUNLEVEL_POSTGAME) + return new /datum/tgs_message_content("[sender.mention], раунд уже закончился!") + LAZYINITLIST(GLOB.round_end_notifiees) + GLOB.round_end_notifiees[sender.mention] = TRUE + return new /datum/tgs_message_content("Я уведомлю [sender.mention] когда раунд закончится.") +/* +/datum/tgs_chat_command/fax + name = "fax" + help_text = "Используется для просмотра, создания и овтетов на факсы. Используйте без параметров для помощи" + admin_only = TRUE + +/datum/tgs_chat_command/fax/Run(datum/tgs_chat_user/sender, params) + var/textTrue = copytext_char(params, findtext_char(params, "```")) + if (textTrue!=null && textTrue!="") + params = replacetext_char(params, textTrue, "") + textTrue = replacetext_char(textTrue, "```", "") + var/list/tmpList = splittext_char(params, " ") + var/command = tmpList.len ? tmpList[1] : null + if (command == null || command == "") + return "Дорогой [sender.mention], пожалуйста, ознакомься с тем как использовать эту команду.\n\nИспользование `fax комманда, аргументы(через запятую!!!)`\n\n__Команды:__\n\n1. **view \[ID\]** - без *ID* показывает список факсов полученных админами и посланных. С *ID* - показывает конкретный факс и его данные.\n\n2. **send \[\[FROM\] \[DESTINATION\] \[TITLE\] \[STAMP\] \[LANGUAGE\] \[HEADER_LOGO\] \[FOOTER\] \[PEN_MODE\] \[TEXT\]\]** - без аргументов - получить подсказку по написанию факсов, в том числе доступные __адреса для отправки__. С параметрами - написать факс все аргументы обязательны:\n*DESTINATION* - куда отправить факс (адрес должен существовать)\n*FROM* - от кого, ЦК, НаноТрейзн, Родная и любимая Бабушка - все что угодно\n*TITLE* - заголовок для факса\n*STAMP* - нужна ли печать (учтите печать принадлежит адресату то есть может быть 'Печать Квантового Реле Родной и любимой Бабушки'. Значения `TRUE`/`FALSE` или 1/0\n*LANGUAGE* - язык на котором написан факс, должен быть в списке\n*HEADER_LOGO* - логотип для заголовка. Так же может быть в значении `EMPTY` для заголовка без логотипа и `NULL` для факса без заголовка\n*FOOTER* - нужен ли мелкий текст (...уведомите отправителя и ЦК если хешключ не совпададает ля-ля...) значения `TRUE`/`FALSE` или 1/0\n*PEN_MODE* - зачем вы пишите факс мелком? Вы клоуны? Значения `PEN`/`CRAYON`\n*TEXT* - сообственно текст факса. Форматирование такое же как и в игре, НО перед текстом и после него добавьте ```\n\n*Использование тэга \[field\] недоступно.*" + else + params = copytext_char(params, length_char(command)+1) + var/list/parampampam = splittext_char(params, ", ") + + // Копируем инфомрацию по логотипам из /obj/item/paper/admin + var/obj/item/paper/admin/adminPaper = new /obj/item/paper/admin( null ) + var/list/logo_list = adminPaper.logo_list + logo_list = logo_list.Copy() + QDEL_IN(adminPaper, 100) + + switch(command) + // Просмотр факсов + if("view") + // Без аргументов + if(parampampam.len == 0) + if(GLOB.adminfaxes && GLOB.adminfaxes.len) + var/list/msg = list() + msg += "**Вот доступные факсы:**" + for(var/i = 1, i <= GLOB.adminfaxes.len, i++) + var/obj/item/obj = GLOB.adminfaxes[i] + msg += "№ `[i]` | [obj.name]" + return jointext(msg, "\n") + else + return "В этом раунде факсов для админов не было" + // С айди, и айди существует + else if(text2num(parampampam[1]) != null && text2num(parampampam[1]) <= GLOB.adminfaxes.len) + var/obj/item/item = GLOB.adminfaxes[text2num(parampampam[1])] + if (istype(item, /obj/item/paper)) + return paper2text(item) + + else if (istype(item, /obj/item/photo)) + return photo2text(item) + + else if (istype(item, /obj/item/paper_bundle)) + var/list/pack = bundle2text(item) + var/i = 0 + for(var/string in pack) + i += 10 + addtimer(CALLBACK(world, /world/proc/TgsChatPrivateMessage, string, sender), i) + return "Отправлено в личные сообщения [sender.mention]" + + else return "Не удалось определить тип факса. Это баг сообщите куда подальше. Тип факса `[item.type]`" + // Нет факса с айди + else return "Не удалось найти факс под номером № `[parampampam[1]]`" + + // Отправка факса + if("send") + // Без аргументов - подсказка + if(parampampam.len == 0) + var/list/msg = list() + msg += "__**Помощь по адресам и логотипам**__" + msg += "__*Доступные логотипы:*__ NULL | EMPTY | [jointext(logo_list, " | ")]\n" + var/list/selectable_languages = list() + for (var/key in global.all_languages) + var/datum/language/L = global.all_languages[key] + if (L.has_written_form) + selectable_languages += L.name + msg += "__*Доступные языки:*__ [jointext(selectable_languages, " | ")]\n" + msg += "__*Доступные адресаты:*__ [jointext(GLOB.alldepartments, " | ")]" + return jointext(msg, "\n") + + // Не хватает аргументов + else if(parampampam.len < 8 || textTrue == null) return "Недостаточно кол-во аргументов. Требуется `8` (без send и текста) получено `[parampampam.len][textTrue == null?" и текст не найден":" и текст был найден"]`" + // Отправка факса + else + var/from = parampampam[1] + var/destination = parampampam[2] + var/title = parampampam[3] + var/stamp = parampampam[4] + var/language = parampampam[5] + var/headerLogo = parampampam[6] + var/footer = parampampam[7] + var/penMode = parampampam[8] + var/text = textTrue + // PARAMS CHECK START + + // Destination + var/list/reciever = list() + for(var/obj/machinery/photocopier/faxmachine/sendto in GLOB.allfaxes) + if (sendto.department == destination) + reciever += sendto + if(reciever.len == 0) + return "Не удалось найти ни один факс по адресу `[destination]`" + + // Language + var/datum/language/lang + lang = global.all_languages[language] + if(!lang) + return "Не удалось найти указанный язык `[language]`" + if(!lang.has_written_form) + return "У языка `[language]` нет письменной формы. Укажите другой язык." + + // Header - Logo + if (!(headerLogo in logo_list)) + if (!(headerLogo in list("NULL","EMPTY"))) + return "Не удалось найти логотип `[headerLogo]`" + + // Stamp + if(stamp == "TRUE" || stamp == "1" || stamp == TRUE) + stamp = TRUE + else if(stamp == "FALSE" || stamp == "0" || stamp == FALSE) + stamp = FALSE + else return "Неизвестное состояние штампа `[stamp]`" + + // Footer + if(footer == "TRUE" || footer == "1" || footer == TRUE) + footer = TRUE + else if(footer == "FALSE" || footer == "0" || footer == FALSE) + footer = FALSE + else return "Неизвестное состояние нижнего текста `[footer]`" + + // Pen Mode + if(penMode == "PEN") + penMode = TRUE + else if(penMode == "CRAYON") + penMode = FALSE + else return "Неизвестное состояние ручки или мелка `[penMode]`" + + // Text + var/t = sanitize(text, MAX_PAPER_MESSAGE_LEN, extra = 0) + if(!t) + return "Ваш текст был уничтожен санитайзером. GGWP" + t = replacetext_char(t, "\n", "
") + t = replacetext_char(t, "\[field\]", "") // No fields sorry + + // PARAMS CHECK FINISH + + // Fax creation + var/obj/item/paper/admin/adminfax = new /obj/item/paper/admin( null ) + adminfax.admindatum = null // May be it need to be reworked + + adminfax.set_language(lang, TRUE) // Нужен только язык и Лого. Остальное, де факто - мусор + adminfax.logo = headerLogo == "NULL" ? "" : headerLogo == "EMPTY" ? "" : headerLogo + adminfax.origin = from + adminfax.isCrayon = !penMode + adminfax.headerOn = headerLogo != "NULL" + adminfax.footerOn = footer + adminfax.info = t + + // Это делается при отправке так или иначе + adminfax.generateHeader() + adminfax.generateFooter() + adminfax.info = adminfax.parsepencode(adminfax.info, null, null, !penMode, null, TRUE) // Encode everything from pencode to html + + if (adminfax.headerOn) + adminfax.info = adminfax.header + adminfax.info + if (adminfax.footerOn) + adminfax.info += adminfax.footer + + adminfax.SetName("[adminfax.origin] - [title]") + adminfax.desc = "This is a paper titled '" + adminfax.name + "'." + + // Я не знаю зачем так сложно с печатью + if (stamp) + adminfax.stamps += "
This paper has been stamped by the [adminfax.origin] Quantum Relay." + + var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') + var/x + var/y + x = rand(-2, 0) + y = rand(-1, 2) + adminfax.offset_x += x + adminfax.offset_y += y + stampoverlay.pixel_x = x + stampoverlay.pixel_y = y + + if(!adminfax.ico) + adminfax.ico = new + adminfax.ico += "paper_stamp-boss" + stampoverlay.icon_state = "paper_stamp-boss" + + if(!adminfax.stamped) + adminfax.stamped = new + adminfax.stamped += /obj/item/stamp/boss + adminfax.overlays += stampoverlay + + // А вы знали, что когда админ печатает вам факс, то копия которая сохраняется в админских датумах так же жрет тоннер? + var/obj/item/rcvdcopy + var/obj/machinery/photocopier/faxmachine/cloner = pick(reciever) + rcvdcopy = cloner.copy(adminfax) + rcvdcopy.forceMove(null) //hopefully this shouldn't cause trouble + GLOB.adminfaxes += rcvdcopy + + var/list/failure = list() + var/list/success = list() + for (var/obj/machinery/photocopier/faxmachine/machine in reciever) + if (machine.recievefax(adminfax)) + success += machine.department + else + failure += machine.department + + QDEL_IN(adminfax, 100 * reciever.len) + + return "[success.len == 0 ? "Факс не удалось доставить до адресата (сломан/обесточен)" : failure.len == 0 ? "Факс успешно доставлен до всех адресатов" : "Факс был *доставлен* до: [jointext(success, ", ")]\nФакс *не был доставлен* до [jointext(failure, ", ")] - (сломан/обесточен)"]" + else + // Я могу только прочитать или написать факс + return "Не удалось распознать аргумент `[parampampam[1]]`" +*/ + +#undef PUBLIC_GAME_MODE diff --git a/proxima/code/modules/TGS/TGSIntegration/TGSChatHelpers.dm b/proxima/code/modules/TGS/TGSIntegration/TGSChatHelpers.dm new file mode 100644 index 00000000000..fdae7a6e0a3 --- /dev/null +++ b/proxima/code/modules/TGS/TGSIntegration/TGSChatHelpers.dm @@ -0,0 +1,171 @@ +/** +sends a message to chat + +config_setting should be one of the following: + +- null - noop +- empty string - use TgsTargetBroadcast with `admin_only = FALSE` +- other string - use TgsChatBroadcast with the tag that matches config_setting, only works with TGS4, if using TGS3 the above method is used +*/ +/proc/send2chat(datum/tgs_message_content/message, config_setting) + if(config_setting == null || !world.TgsAvailable()) + return + + var/datum/tgs_version/version = world.TgsVersion() + if(config_setting == "" || version.suite == 3) + world.TgsTargetedChatBroadcast(message, FALSE) + return + + var/list/channels_to_use = list() + for(var/I in world.TgsChatChannelInfo()) + var/datum/tgs_chat_channel/channel = I + if(channel.custom_tag == config_setting) + channels_to_use += channel + + if(channels_to_use.len) + world.TgsChatBroadcast(message, channels_to_use) + +/proc/get_active_player_count(var/alive_check = 0, var/afk_check = 0, var/human_check = 0) + // Get active players who are playing in the round + var/active_players = 0 + for(var/i = 1; i <= GLOB.player_list.len; i++) + var/mob/M = GLOB.player_list[i] + if(M && M.client) + if(alive_check && M.stat) + continue + else if(afk_check && M.client.is_afk()) + continue + else if(human_check && !ishuman(M)) + continue + else if(isnewplayer(M)) // exclude people in the lobby + continue + else if(isghost(M)) // Ghosts are fine if they were playing once (didn't start as observers) + var/mob/observer/ghost/O = M + if(O.started_as_observer) // Exclude people who started as observers + continue + active_players++ + return active_players + +/proc/fax2TGS(var/o3, var/from3, var/to3, var/by3, var/intercepted3 = null) + var/list/admins = get_admin_counts()["present"] + var/obj/item/item = o3 + + var/datum/tgs_message_content/message = new("[admins.len = 0 ? "<@&984927384513953852> активных админов с Банхамером нет\n" : null]") + var/datum/tgs_chat_embed/structure/embed = new() + message.embed = embed + embed.title = "Перехват факса" + embed.colour = "#00d0ff" + embed.author = new /datum/tgs_chat_embed/provider/author/glob("Сервер 'PRX'") + //embed.footer = new /datum/tgs_chat_embed/footer("Сервер 'PRX'") + //embed.url = NON_BYOND_URL + if (intercepted3) + embed.description = "***ФАКС БЫЛ ПЕРЕХВАЧЕН, ПОЛУЧАТЕЛЬ ЕГО __НЕ ВИДИТ__***" + var/datum/tgs_chat_embed/field/from = new ("ОТ", "[from3]") + var/datum/tgs_chat_embed/field/where = new ("КУДА", "[to3]") + var/datum/tgs_chat_embed/field/sentBy = new ("ОТПРАВИЛ", "[by3]") + from.is_inline = TRUE + where.is_inline = TRUE + sentBy.is_inline = TRUE + embed.fields = list(from, where, sentBy) + + if(istype(item, /obj/item/paper)) + var/obj/item/paper/paper = item + embed.fields += paper2embed(paper) + + else if (istype(item, /obj/item/photo)) + var/obj/item/photo/photo = item + embed.fields += photo2embed(photo) + + else if (istype(item, /obj/item/paper_bundle)) + var/obj/item/paper_bundle/bundle = item + var/list/pack = bundle2embed(bundle) + var/i = 10 + for(var/subMessage in pack) + i += 10 + addtimer(CALLBACK(world, /world/proc/TgsTargetedChatBroadcast, subMessage, TRUE), i) + + world.TgsTargetedChatBroadcast(message, TRUE) + return TRUE + +// Костыль для превращения факса в эмбед +/proc/paper2embed(var/obj/item/paper/paper) + . = list() + + var/datum/tgs_chat_embed/field/paper_name = new ("Название бумаги", "*[paper.name]*") + //var/datum/tgs_chat_embed/field/paper_language = new ("Язык написания", "*[paper.language.name]*") + var/datum/tgs_chat_embed/field/paper_content = new ("Содержимое (чистый HTML)", "```html\n[paper.info]```") + var/datum/tgs_chat_embed/field/paper_stamps = new ("Стоят печати", "[replacetext_char(replacetext_char(replacetext_char(paper.stamps, "
", "\n"), "", "*"), "", "*")]") + + . += paper_name + //. += paper_language + . += paper_content + if (paper.stamps) + . += paper_stamps + +// Костыль для превращения фото в эмбед +/proc/photo2embed(var/obj/item/photo/photo) + . = list() + + var/datum/tgs_chat_embed/field/photo_name = new ("Название фото", "*[photo.name]*") + var/datum/tgs_chat_embed/field/photo_scribble + if (photo.scribble) + photo_scribble = new ("Подпись с обратной стороны", "*[photo.scribble]*") + var/datum/tgs_chat_embed/field/photo_size = new ("Размер фото в (тайлах)", "*[photo.photo_size]X[photo.photo_size]*") + var/datum/tgs_chat_embed/field/photo_desc + if (photo.desc) + photo_desc = new ("Описание", "*[photo.desc]*") + . += photo_name + if (photo_scribble) + . += photo_scribble + . += photo_size + if (photo_desc) + . += photo_desc + +/proc/bundle2embed(var/obj/item/paper_bundle/bundle) + . = list() + + for (var/page = 1, page <= bundle.pages.len, page++) + var/datum/tgs_message_content/message = new("") + var/datum/tgs_chat_embed/structure/embed = new() + message.embed = embed + embed.title = "===== Страница [page]/[bundle.pages.len] =====" + embed.colour = "#00d0ff" + var/obj/item/obj = bundle.pages[page] + embed.fields = istype(obj, /obj/item/paper) ? paper2embed(obj) : istype(obj, /obj/item/photo) ? photo2embed(obj) : list(new /datum/tgs_chat_embed/field("НЕИЗВЕСТНЫЙ ТИП БЮРОКРАТИЧЕСКОГО ОРУДИЯ ПЫТОК.", "[obj.type]")) + embed.author = new /datum/tgs_chat_embed/provider/author/glob("Сервер 'PRX'") + //embed.footer = new /datum/tgs_chat_embed/footer("Сервер 'PRX'") + //embed.url = NON_BYOND_URL + . += message + +// +// Костыль для превращения факса в текст +/proc/paper2text(var/obj/item/paper/paper) + . = list() + . += "**Название:** [paper.name]" + //. += "**Язык написания:** [paper.language.name]" + // TODO пропарсить HTML в разметку, принимаемую дискордом? + . += "**Содержимое:**\n*Внимание - чистый HTML*\n```html\n[paper.info]```" + . = jointext(., "\n") + +// Костыль для превращения фото в текст +/proc/photo2text(var/obj/item/photo/photo) + . = list() + . += "__*Просмотр фото не может быть имплементирован, но вот некоторые данные о нем*__" + . += "**Название:** [photo.name]" + if(photo.scribble) + . += "**Подпись с обратной стороны:** [photo.scribble]" + . += "**Размер фото (в тайлах):** [photo.photo_size]X[photo.photo_size]" + . += "**Описание:** [photo.desc == null ? "*Нет описания фото*" : photo.desc]" + . = jointext(., "\n") + +/proc/bundle2text(var/obj/item/paper_bundle/bundle) + . = list() + . += "__*Пачка документов*__" + for (var/page = 1, page <= bundle.pages.len, page++) + var/list/msg = list() + msg += "===== Страница № `[page]` =====" + var/obj/item/obj = bundle.pages[page] + msg += istype(obj, /obj/item/paper) ? paper2text(obj) : istype(obj, /obj/item/photo) ? photo2text(obj) : "НЕИЗВЕСТНЫЙ ТИП БЮРОКРАТИЧЕСКОГО ОРУДИЯ ПЫТОК. ТИП: [obj.type]" + msg += "--------------------------" + . += jointext(msg, "\n") + . += "__*Конец пачки документов*__" diff --git a/proxima/code/modules/TGS/TGSIntegration/TGSChatHooks.dm b/proxima/code/modules/TGS/TGSIntegration/TGSChatHooks.dm new file mode 100644 index 00000000000..7da8d33f0f6 --- /dev/null +++ b/proxima/code/modules/TGS/TGSIntegration/TGSChatHooks.dm @@ -0,0 +1,164 @@ +/proc/get_world_url() + . = "byond://" + if(config.serverurl) + . += config.serverurl + else if(config.server) + . += config.server + else + . += "[world.address]:[world.port]" + +// Server startup. Please proceed to the Lobby. +/world/TgsInitializationComplete() + . = ..() + var/name = "CEV ERIS"//GLOB.using_map.full_name + var/datum/tgs_message_content/message = new ("**Дорогие, <@&839057002046947329>, заходите к нам.**\n\nУ нас эксперементальный запуск __**CEV-ERIS**__") + var/datum/tgs_chat_embed/structure/embed = new() + message.embed = embed + embed.title = "Начинается смена на [name]" + embed.description = "Вы можете кликнуть \[cюда\](<[get_world_url()]>) или на фразу \"Сервер 'PRX'\" любого сообщения от меня, чтобы зайти на сервер" + embed.colour = "#6590fe" + embed.author = new /datum/tgs_chat_embed/provider/author/glob("Сервер 'PRX'") + //embed.footer = new /datum/tgs_chat_embed/footer("Сервер 'PRX'") + //embed.url = NON_BYOND_URL + send2chat(message, "launch-alert") + +// The round has been ended +/hook/roundend/proc/SendTGSRoundEnd() + var/list/data = null//GLOB.using_map.roundend_statistics() + var/name = "CEV ERIS"//GLOB.using_map.full_name + var/datum/tgs_message_content/message = new ("") + var/datum/tgs_chat_embed/structure/embed = new() + message.embed = embed + embed.title = "Раунд на [name] завершен" + embed.colour = "#fffb00" + embed.author = new /datum/tgs_chat_embed/provider/author/glob("Сервер 'PRX'") + //embed.footer = new /datum/tgs_chat_embed/footer("Сервер 'PRX'") + //embed.url = NON_BYOND_URL + + if (data != null) + embed.description = "Статистика подготовлена" + var/datum/tgs_chat_embed/field/clients = new ("Всего игроков", "[data["clients"]]") + var/datum/tgs_chat_embed/field/survHuman = new ("Выжило экипажа", "[data["surviving_humans"]]") + var/datum/tgs_chat_embed/field/survTotal = new ("Выжило органиков", "[data["surviving_total"]]") //required field for roundend webhook! + var/datum/tgs_chat_embed/field/ghosts = new ("Наблюдателей", "[data["ghosts"]]") //required field for roundend webhook! + var/datum/tgs_chat_embed/field/evacHuman = new ("Эвакуировано экипажа", "[data["escaped_humans"]]") + var/datum/tgs_chat_embed/field/evacTotal = new ("Эвакуировано органиков", "[data["escaped_total"]]") + var/datum/tgs_chat_embed/field/left = new ("Брошены на произвол судьбы", "[data["left_behind_total"]]") //players who didnt escape and aren't on the station. + var/datum/tgs_chat_embed/field/survMisc = new ("Выжило не членов экипажа", "[data["offship_players"]]") + clients.is_inline = TRUE + survHuman.is_inline = TRUE + survTotal.is_inline = TRUE + ghosts.is_inline = TRUE + //evacHuman.is_inline = TRUE + evacTotal.is_inline = TRUE + //left.is_inline = TRUE + survMisc.is_inline = TRUE + embed.fields = list(survHuman, survTotal, evacHuman, evacTotal, left, survMisc, clients, ghosts) + else + embed.description = "Статистики нет" + + send2chat(message, "launch-alert") + + if (LAZYLEN(GLOB.round_end_notifiees)) + send2chat(new /datum/tgs_message_content("*Раунд закончился, ребятки. Всем по слапу!*\n[GLOB.round_end_notifiees.Join(", ")]"), "bot-spam") + return TRUE + +/hook/banned/proc/SendTGSBan(bantype, admin, target, jobs, duration, reason) + var/datum/tgs_message_content/message = new ("") + var/datum/tgs_chat_embed/structure/embed = new() + message.embed = embed + var/datum/tgs_chat_embed/field/Fadmin = new ("Администратор", "[admin]") + var/datum/tgs_chat_embed/field/Ftarget = new ("Забаненный", "[target]") + var/datum/tgs_chat_embed/field/Freason = new ("Причина", "[reason]") + Fadmin.is_inline = TRUE + Ftarget.is_inline = TRUE + embed.fields = list(Ftarget, Fadmin) + embed.colour = "#ff0000" + embed.author = new /datum/tgs_chat_embed/provider/author/glob("Сервер 'PRX'") + //embed.footer = new /datum/tgs_chat_embed/footer("Сервер 'PRX'") + //embed.url = NON_BYOND_URL + + switch(bantype) + if (BANTYPE_JOB_PERMA) + embed.title = "ПЕРМАНЕНТНАЯ ВРЕМЕННАЯ БЛОКИРОВКА ПРОФЕССИЙ" + embed.description = "Пользователь потерял эти роли навсегда" + var/datum/tgs_chat_embed/field/Fjobs = new ("Заблокированные профессии", "[jobs]") + embed.fields += Fjobs + if (BANTYPE_JOB_TEMP) + embed.title = "ВРЕМЕННАЯ БЛОКИРОВКА ПРОФЕССИЙ" + embed.description = "Пользователь потерял эти роли на время" + var/datum/tgs_chat_embed/field/Ftime = new ("Длительность", "[duration]") + var/datum/tgs_chat_embed/field/Fjobs = new ("Заблокированные профессии", "[jobs]") + Ftime.is_inline = TRUE + embed.fields += Ftime + embed.fields += Fjobs + if (BANTYPE_PERMA) + embed.title = "ПЕРМАНЕНТНАЯ БЛОКИРОВКА" + embed.description = "Пользователь был забанен навсегда" + if (BANTYPE_TEMP) + embed.title = "ВРЕМЕННАЯ БЛОКИРОВКА" + embed.description = "Пользователь был забанен на время" + var/datum/tgs_chat_embed/field/Ftime = new ("Длительность", "[duration]") + Ftime.is_inline = TRUE + embed.fields += Ftime + else + embed.title = "Странный бан" + embed.description = "Забанил так забанил..." + + embed.fields += Freason + send2chat(message, "notes-hub") + return TRUE + +/hook/unbanned/proc/SendTGSUnBan(admin, target) + var/datum/tgs_message_content/message = new ("") + var/datum/tgs_chat_embed/structure/embed = new() + message.embed = embed + var/datum/tgs_chat_embed/field/Fadmin = new ("Покровитель", "[admin]") + var/datum/tgs_chat_embed/field/Ftarget = new ("Помилованный", "[target]") + Fadmin.is_inline = TRUE + Ftarget.is_inline = TRUE + embed.fields = list(Ftarget, Fadmin) + embed.colour = "#00ff00" + embed.title = "Амнистия" + embed.author = new /datum/tgs_chat_embed/provider/author/glob("Сервер 'PRX'") + //embed.footer = new /datum/tgs_chat_embed/footer("Сервер 'PRX'") + //embed.url = NON_BYOND_URL + + send2chat(message, "notes-hub") + return TRUE + +/hook/playerNotes/proc/SendTGSNotes(admin, target, note) + if (findtext_char(note, "banned") || findtext_char(note, "(MANUAL BAN)")) + return TRUE // Это бан (или может быть анбан), нефиг дублировать + + var/datum/tgs_message_content/message = new ("") + var/datum/tgs_chat_embed/structure/embed = new() + message.embed = embed + var/datum/tgs_chat_embed/field/Fadmin = new ("Доносчик", "[admin]") + var/datum/tgs_chat_embed/field/Ftarget = new ("Обвиняемый", "[target]") + var/datum/tgs_chat_embed/field/Freason = new ("Доносик", "[note]") + Fadmin.is_inline = TRUE + Ftarget.is_inline = TRUE + embed.fields = list(Ftarget, Fadmin, Freason) + embed.colour = "#e1ff00" + embed.author = new /datum/tgs_chat_embed/provider/author/glob("Сервер 'PRX'") + //embed.footer = new /datum/tgs_chat_embed/footer("Сервер 'PRX'") + //embed.url = NON_BYOND_URL + + send2chat(message, "notes-hub") + return TRUE + +/hook/oocMessage/proc/SendOOCMsg(ckey, message, admin_rank) + if (findtext_char(message, "@")) + var/mob/M = get_mob_by_key(ckey) + if(!M || !M.client || M.client.holder || M.client.deadmin_holder) + message_admins("Говно - [ckey] пытался сделать слап. Но я не могу его замутить") + return TRUE + if(!(M.client.prefs.muted & MUTE_OOC)) + M.client.prefs.muted |= MUTE_OOC + message_admins("Кусок абузера на [ckey] пытался сделать слап. Теперь у него нет ООС") + return TRUE + send2chat(new /datum/tgs_message_content("**[admin_rank == null ? null : admin_rank][ckey]:** *[replacetext_char(replacetext_char(message, "'", "'"), " "", "\"")]*"), "ooc-chat") + return TRUE + +#undef NON_BYOND_URL diff --git a/proxima/code/modules/TGS/TGSIntegration/TGSIntegrationFiles.dm b/proxima/code/modules/TGS/TGSIntegration/TGSIntegrationFiles.dm new file mode 100644 index 00000000000..6b54375ad36 --- /dev/null +++ b/proxima/code/modules/TGS/TGSIntegration/TGSIntegrationFiles.dm @@ -0,0 +1,15 @@ +/hook/startup/proc/InitTgs() + world.TgsNew() + return TRUE + +/world/New() + . = ..() + world.TgsInitializationComplete() + +/world/Reboot() + TgsReboot() + ..() + +/world/Topic() + TGS_TOPIC + ..() diff --git a/proxima/code/modules/TGS/_TGSDefines.dm b/proxima/code/modules/TGS/_TGSDefines.dm new file mode 100644 index 00000000000..9f9ff4a8d3e --- /dev/null +++ b/proxima/code/modules/TGS/_TGSDefines.dm @@ -0,0 +1,40 @@ +#define TGS_EXTERNAL_CONFIGURATION + +// Comment this out once you've filled in the below. +// #error TGS API unconfigured + +// Uncomment this if you wish to allow the game to interact with TGS 3. +// This will raise the minimum required security level of your game to TGS_SECURITY_TRUSTED due to it utilizing call()() +//#define TGS_V3_API + +// Required interfaces (fill in with your codebase equivalent): + +/// Create a global variable named `Name` and set it to `Value`. +#define TGS_DEFINE_AND_SET_GLOBAL(Name, Value) var/global/_tgs_##Name = ##Value + +/// Read the value in the global variable `Name`. +#define TGS_READ_GLOBAL(Name) global._tgs_##Name + +/// Set the value in the global variable `Name` to `Value`. +#define TGS_WRITE_GLOBAL(Name, Value) global._tgs_##Name = ##Value + +/// Disallow ANYONE from reflecting a given `path`, security measure to prevent in-game use of DD -> TGS capabilities. +#define TGS_PROTECT_DATUM(Path) + +/// Display an announcement `message` from the server to all players. +#define TGS_WORLD_ANNOUNCE(message) to_world(html_encode(message)) + +/// Notify current in-game administrators of a string `event`. +#define TGS_NOTIFY_ADMINS(event) message_admins(##event) + +/// Write an info `message` to a server log. +#define TGS_INFO_LOG(message) log_debug("[##message]") + +/// Write an warning `message` to a server log. +#define TGS_WARNING_LOG(message) error("TGS warning: [##message]") + +/// Write an error `message` to a server log. +#define TGS_ERROR_LOG(message) error("TGS error: [##message]") + +/// Get the number of connected /clients. +#define TGS_CLIENT_COUNT global.clients.len From 53aea058270883d20df25ce203b1590dd37ee0aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Mon, 1 May 2023 20:53:13 +0300 Subject: [PATCH 04/20] All the colors (#2) * making them colorful * fixing --- proxima/code/game/objects/items/devices/paint_sprayer.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proxima/code/game/objects/items/devices/paint_sprayer.dm b/proxima/code/game/objects/items/devices/paint_sprayer.dm index b4d53db3b2c..4a767bb2a92 100644 --- a/proxima/code/game/objects/items/devices/paint_sprayer.dm +++ b/proxima/code/game/objects/items/devices/paint_sprayer.dm @@ -71,9 +71,9 @@ return return -/obj/item/device/floor_painter/proc/paint_wall(/turf/simulated/wall/W, var/mob/user) - if ((W.can_paint == TRUE) && paint_colour) - W.set_color(paint_color) +/obj/item/device/floor_painter/proc/paint_wall(/var/atom/A, var/mob/user) + if ((A.can_paint == TRUE) && paint_colour) + A.set_color(paint_color) add_fingerprint(user) . = TRUE From fe8dfb89782f1af398e23c44d81be84cb600622e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Mon, 1 May 2023 21:00:18 +0300 Subject: [PATCH 05/20] All the colors round two (#5) * making them colorful * fixing * let be commented for now --- proxima/code/game/objects/items/devices/paint_sprayer.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proxima/code/game/objects/items/devices/paint_sprayer.dm b/proxima/code/game/objects/items/devices/paint_sprayer.dm index 4a767bb2a92..b4d53db3b2c 100644 --- a/proxima/code/game/objects/items/devices/paint_sprayer.dm +++ b/proxima/code/game/objects/items/devices/paint_sprayer.dm @@ -71,9 +71,9 @@ return return -/obj/item/device/floor_painter/proc/paint_wall(/var/atom/A, var/mob/user) - if ((A.can_paint == TRUE) && paint_colour) - A.set_color(paint_color) +/obj/item/device/floor_painter/proc/paint_wall(/turf/simulated/wall/W, var/mob/user) + if ((W.can_paint == TRUE) && paint_colour) + W.set_color(paint_color) add_fingerprint(user) . = TRUE From a4d33b82c23581fa57e29a722c560d81face11c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Sun, 18 Jun 2023 17:40:51 +0300 Subject: [PATCH 06/20] Titanium material (#8) * adding titanium may the god forgive me for editing base * fixes my fuck ups --- code/__DEFINES/materials.dm | 6 +++- code/modules/materials/material_sheets.dm | 33 ++++++++++++++++++ code/modules/materials/materials.dm | 20 +++++++---- code/modules/mining/alloys.dm | 12 +++++++ code/modules/mining/ore.dm | 7 ++++ code/modules/mining/ore_datum.dm | 10 ++++++ icons/obj/mining.dmi | Bin 37120 -> 31357 bytes proxima/icons/obj/stack/material_titanium.dmi | Bin 0 -> 1117 bytes 8 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 proxima/icons/obj/stack/material_titanium.dmi diff --git a/code/__DEFINES/materials.dm b/code/__DEFINES/materials.dm index 5e2e9e9ace7..e90acc11a7e 100644 --- a/code/__DEFINES/materials.dm +++ b/code/__DEFINES/materials.dm @@ -29,6 +29,7 @@ #define MATERIAL_CARPET "carpet" #define MATERIAL_BIOMATTER "biomatter" #define MATERIAL_COMPRESSED "compressed matter" +#define MATERIAL_PLASTAN "plastan" #define MATERIAL_LIST list(\ MATERIAL_STEEL,\ @@ -76,6 +77,7 @@ #define ORE_GOLD "o_gold" #define ORE_PLATINUM "o_platinum" #define ORE_HYDROGEN "o_hydrogen" +#define ORE_TITANIUM "o_titanium" #define ORE_LIST list(\ ORE_CARBON,\ @@ -86,4 +88,6 @@ ORE_DIAMOND,\ ORE_SILVER,\ ORE_GOLD,\ - ORE_PLATINUM) + ORE_PLATINUM,\ + ORE_TITANIUM\ + ) diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index 6fb3abeeb7c..debefa1a9a2 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -425,3 +425,36 @@ item_state = "rcdammo" default_type = MATERIAL_COMPRESSED price_tag = 30 + +/obj/item/stack/material/titanium + name = "titanium" + icon = 'proxima/icons/obj/stack/material_titanium.dmi' + icon_state = "sheet-titanium" + item_state = "sheet-metal" + price_tag = 25 + default_type = MATERIAL_TITANIUM + +/obj/item/stack/material/titanium/full + amount = 120 + +/obj/item/stack/material/titanium/random + rand_min = 3 + rand_max = 20 + spawn_tags = SPAWN_TAG_MATERIAL_BUILDING + rarity_value = 5 + +/obj/item/stack/material/plastan + name = "plastan" + icon_state = "sheet-plasteel" + item_state = "sheet-metal" + price_tag = 50 + default_type = MATERIAL_PLASTAN + +/obj/item/stack/material/plastan/full + amount = 120 + +/obj/item/stack/material/plastan/random + rand_min = 3 + rand_max = 20 + spawn_tags = SPAWN_TAG_MATERIAL_BUILDING + rarity_value = 5 diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index 8e96fae6eff..283da9a2e13 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -375,12 +375,20 @@ var/list/name_to_material hitsound = 'sound/weapons/genhit.ogg' /material/plasteel/titanium - name = "titanium" - stack_type = null - icon_base = "metal" - door_icon_base = "metal" - icon_colour = "#D1E6E3" - icon_reinf = "reinf_metal" + name = MATERIAL_TITANIUM + stack_type = /obj/item/stack/material/titanium + icon_colour = COLOR_TITANIUM // "#6c7274" can be used as alternative, i dunno + weight = 10 + +/material/plasteel/titanium/plastan + name = MATERIAL_PLASTAN + stack_type = /obj/item/stack/material/plastan + icon_colour = "#6c7274" + integrity = 1000 + melting_point = 10000 + hardness = 150 + weight = 20 + stack_origin_tech = list(TECH_MATERIAL = 5) /material/glass name = MATERIAL_GLASS diff --git a/code/modules/mining/alloys.dm b/code/modules/mining/alloys.dm index 997d556bde6..ceffd61c9f8 100644 --- a/code/modules/mining/alloys.dm +++ b/code/modules/mining/alloys.dm @@ -42,3 +42,15 @@ ) product = /obj/item/stack/material/glass/plasmaglass +/datum/alloy/plastan + name = "Plastitanium" + metaltag = MATERIAL_PLASTAN + ore_input = 5 + requires = list( + ORE_PLASMA = 1, + ORE_CARBON = 1, + ORE_IRON = 1, + ORE_TITANIUM = 2, + ) + product = /obj/item/stack/material/plastan + product_mod = 0.5 diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index 4db44988dfa..3832c268bed 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -93,6 +93,13 @@ rarity_value = 50 price_tag = 5 +/obj/item/ore/titanium + name = "raw titanium" + icon_state = "ore_titanium" + material = ORE_TITANIUM + rarity_value = 50 + price_tag = 5 + /obj/item/ore/hydrogen name = "raw hydrogen" icon_state = "ore_hydrogen" diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm index 9baa97bd405..7170a90899e 100644 --- a/code/modules/mining/ore_datum.dm +++ b/code/modules/mining/ore_datum.dm @@ -126,6 +126,16 @@ var/global/list/ore_data = list() ore = /obj/item/ore/osmium scan_icon = "mineral_rare" +/ore/titanium + name = ORE_TITANIUM + display_name = "raw titanium" + smelts_to = MATERIAL_TITANIUM + alloy = 1 + result_amount = 5 + spread_chance = 10 + ore = /obj/item/ore/titanium + scan_icon = "mineral_rare" + /ore/hydrogen name = ORE_HYDROGEN display_name = "metallic hydrogen" diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index 28cfd53b612348ddacda0e29fbe75ef3fd9c3494..f5212a27120686e170fed68fe421a0b2e2b16f7f 100644 GIT binary patch literal 31357 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 P00000NkvXXu0mjfa>ebR diff --git a/proxima/icons/obj/stack/material_titanium.dmi b/proxima/icons/obj/stack/material_titanium.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5dde70c18b718fa6a5123127657643cabc9c3722 GIT binary patch literal 1117 zcmV-j1fu(iP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sW>AwwM4fhvm`Muvou$Ui!&v&s2C_=$i-hsrZ{=FY*8@0c^;_b8X<- zG;=K*@^$Wr7Qlvlxx4xR*ylVF?{=4#hySX8763@ukcWXw_v&%MWl`# zl~m2qn<6jIo_w7j@f<}y8!PJF5hZ|bCe;=BvVG_Q z01SDPI~rGmpd6@u_we${?#t=%$^e|R-}7hQzIn~I?>sOSZ$#C8)@CO1uo{H*06bSW z2nLwAz>Al!oL+0spFQ<55K8-;N6Y2#N3jxAq1f`U5|kpr{q0GptPg5Gz!wo$Nc*t4 zv4~^k#KzSfop*#N(1tsrT%b?z?T&-$0RZ3bIQqcIS^(+_P-86sbp@y~dI4%*gVa&s zE}#{FIx5^1v@Sp$748b?nV|2eY+ry9ppB?(Ux0cGv=No<3!D~18h0pP55gUc0+hFt z%I=Us?$CsTbB9_NP(@|S?vNc!97A*mtpJ=y;*1S*HAzySgj0ry?!If10wvG_$f#@? zK10Ra6%6KadBYdO-FqC+|B+ff81OAduwTf06BFIn_L}iQcnWR7o z^nL)ecD@Y8Cn*%;^nCV@QlNzOju3UukZ(98NKoet`GnJ+ jU>}LNV)U`W(F^bw$4c>5nQT;T00000NkvXXu0mjf;HL&u literal 0 HcmV?d00001 From 0020ce79ebaf59e82108edb52365ca4f5c18f0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Thu, 22 Jun 2023 01:29:28 +0300 Subject: [PATCH 07/20] =?UTF-8?q?=D1=81=D1=82=D0=B5=D0=BD=D1=8B=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=82=D0=BE=D1=80=D1=87=D0=B0=20(#9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/turfs/simulated/wall_types.dm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index 0be1a09a142..3a43c23d310 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -116,8 +116,19 @@ return /turf/simulated/wall/titanium/New(var/newloc) - ..(newloc, MATERIAL_VOXALLOY) + ..(newloc, MATERIAL_TITANIUM) + +/turf/simulated/wall/titanium/reinforced/New(var/newloc) + ..(newloc, MATERIAL_TITANIUM, MATERIAL_TITANIUM) + +/turf/simulated/wall/plastan/New(var/newloc) + ..(newloc, MATERIAL_PLASTAN) + +/turf/simulated/wall/plastan/reinforced/New(var/newloc) + ..(newloc, MATERIAL_PLASTAN, MATERIAL_PLASTAN) +/turf/simulated/wall/plastan/reinforced/hull + paint_color = COLOR_HULL_BLUE //Untinted walls have white color, all their coloring is built into their sprite and they should really not be given a tint, it'd look awful /turf/simulated/wall/untinted From 414e07ffcddf2cf8a04e0207fe24733c2952ebc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Thu, 22 Jun 2023 03:26:48 +0300 Subject: [PATCH 08/20] =?UTF-8?q?=D0=B2=D0=B5=D0=B9-=D0=BC=D0=B5=D0=B4=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=82=D0=B5=D0=B7=D1=8B=20(#11)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * вей-мед протезы * #include'd * фиксики --- cev_eris.dme | 1 + .../organs/external/subtypes/vey_med_limbs.dm | 37 ++++++++++++++++++ proxima/icons/mob/human_races/vey-med.dmi | Bin 0 -> 6828 bytes 3 files changed, 38 insertions(+) create mode 100644 proxima/code/modules/organs/external/subtypes/vey_med_limbs.dm create mode 100644 proxima/icons/mob/human_races/vey-med.dmi diff --git a/cev_eris.dme b/cev_eris.dme index 42740f5e867..3a3ea9f5c3d 100644 --- a/cev_eris.dme +++ b/cev_eris.dme @@ -2836,6 +2836,7 @@ #include "maps\submaps\planetary_ruins\radshrine\radshrine.dm" #include "maps\submaps\planetary_ruins\spider_nest\spider_nest.dm" #include "maps\submaps\planetary_ruins\tar_anomaly\tar_anomaly.dm" +#include "proxima\code\modules\organs\external\subtypes\vey_med_limbs.dm" #include "proxima\code\modules\TGS\_TGSDefines.dm" #include "proxima\code\modules\TGS\TGDMAPI\tgs.dm" #include "proxima\code\modules\TGS\TGDMAPI\tgs\includes.dm" diff --git a/proxima/code/modules/organs/external/subtypes/vey_med_limbs.dm b/proxima/code/modules/organs/external/subtypes/vey_med_limbs.dm new file mode 100644 index 00000000000..70498dc5687 --- /dev/null +++ b/proxima/code/modules/organs/external/subtypes/vey_med_limbs.dm @@ -0,0 +1,37 @@ +/obj/item/organ/external/robotic/veymed + name = "\"Vey-Med\"" + desc = "Fragile, sophisticated, and hell of expensive." + armor = list(melee = -1, bullet = -1, energy = -1, bomb = -10, bio = 100, rad = 100) + force_icon = 'proxima/icons/mob/human_races/vey-med.dmi' + model = "veymed" + min_broken_damage = 20 + min_malfunction_damage = 10 + price_tag = 10000 + bad_type = /obj/item/organ/external/robotic/veymed + +/obj/item/organ/external/robotic/veymed/l_arm + default_description = /datum/organ_description/arm/left + +/obj/item/organ/external/robotic/veymed/r_arm + default_description = /datum/organ_description/arm/right + +/obj/item/organ/external/robotic/veymed/l_leg + default_description = /datum/organ_description/leg/left + +/obj/item/organ/external/robotic/veymed/r_leg + default_description = /datum/organ_description/leg/right + +/obj/item/organ/external/robotic/veymed/groin + default_description = /datum/organ_description/groin + +/obj/item/organ/external/robotic/veymed/torso + default_description = /datum/organ_description/chest + +/obj/item/organ/external/robotic/veymed/head + default_description = /datum/organ_description/head + +/datum/body_modification/limb/prosthesis/veymed + id = "prosthesis_veymed" + replace_limb = /obj/item/organ/external/robotic/veymed + body_parts = list(BP_L_ARM, BP_R_ARM, BP_L_LEG, BP_R_LEG, BP_CHEST, BP_GROIN, BP_HEAD) + icon = 'proxima/icons/mob/human_races/vey-med.dmi' diff --git a/proxima/icons/mob/human_races/vey-med.dmi b/proxima/icons/mob/human_races/vey-med.dmi new file mode 100644 index 0000000000000000000000000000000000000000..892d0443c6e7fd14766541e07470c5555fbc8f8c GIT binary patch literal 6828 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 F{{xv(!k7R6 literal 0 HcmV?d00001 From d809157712e6c229851cb1fb64f8de44337a6b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Thu, 22 Jun 2023 03:38:54 +0300 Subject: [PATCH 09/20] literally done (#12) --- .../trade_stations_presets/1-common/material_refine.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/trade/datums/trade_stations_presets/1-common/material_refine.dm b/code/modules/trade/datums/trade_stations_presets/1-common/material_refine.dm index e03beeaeae7..7a4a3cfcc64 100644 --- a/code/modules/trade/datums/trade_stations_presets/1-common/material_refine.dm +++ b/code/modules/trade/datums/trade_stations_presets/1-common/material_refine.dm @@ -23,7 +23,8 @@ /obj/item/stack/material/plasteel/full = good_data("plasteel sheets (x120)", list(3, 5), null), /obj/item/stack/material/wood/full = good_data("wood planks (x120)", list(3, 5), null), /obj/item/stack/material/glass/full = good_data("glass sheets (x120)", list(3, 5), null), - /obj/item/stack/material/plasma/full = good_data("plasma sheets (x120)", list(3, 5), null) + /obj/item/stack/material/plasma/full = good_data("plasma sheets (x120)", list(3, 5), null), + /obj/item/stack/material/titanium/full = good_data("titanium sheets (x120)", list(3,5), null) ) ) hidden_inventory = list( @@ -36,7 +37,8 @@ /obj/item/stack/material/osmium/full = good_data("osmium ingots (x120)", list(1, 2), null), /obj/item/stack/material/mhydrogen/full = good_data("metallic hydrogen sheets (x120)", list(1, 2), null), /obj/item/stack/material/tritium/full = good_data("tritium ingots (x120)", list(1, 2), null), - /obj/item/stack/material/uranium/full = good_data("uranium sheets (x120)", list(1, 2), null) + /obj/item/stack/material/uranium/full = good_data("uranium sheets (x120)", list(1, 2), null), + /obj/item/stack/material/titanium/full = good_data("plastan sheets (x120)", list(1,3), null) ) ) offer_types = list( @@ -50,4 +52,5 @@ /obj/item/ore/diamond = offer_data("diamonds", 550, 0), /obj/item/ore/osmium = offer_data("raw platinum", 330, 0), /obj/item/ore/hydrogen = offer_data("raw hydrogen", 250, 0), + /obj/item/ore/titanium = offer_data("raw titanium", 300, 0) ) From c4c0f224f275b2e583efd47faffde65bb1fe3b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Thu, 22 Jun 2023 04:57:10 +0300 Subject: [PATCH 10/20] =?UTF-8?q?=D0=9F=D0=A0=D0=9E=D0=9A=D0=A1=D0=98?= =?UTF-8?q?=D0=9C=D0=98=D0=A4=D0=98=D0=9A=D0=90=D0=A6=D0=98=D0=AF=20=D0=92?= =?UTF-8?q?=D0=9F=D0=95=D0=A0=D0=94=D0=95-=20(#10)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ПРОКСИМИФИКАЦИЯ ВПЕРДЕ- * Lawson Arms * pcrc * АаААаААаАААААААА * церковь забыть спрсили * даемае --- code/__DEFINES/jobs.dm | 28 +- code/__DEFINES/species_languages.dm | 14 +- code/__HELPERS/manifest.dm | 14 +- code/controllers/subsystems/supply.dm | 2 +- code/controllers/subsystems/trade.dm | 8 +- code/game/gamemodes/scores.dm | 2 +- code/game/machinery/recycle_vendor.dm | 2 +- code/modules/mob/living/bot/cleanbot.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 21 +- .../organs/external/subtypes/robotic_types.dm | 4 +- .../guns/projectile/modular/modular_AK.dm | 6 +- .../projectile/modular/modular_wintermute.dm | 4 +- .../1-common/hellcat.dm | 4 +- .../1-common/suit_up.dm | 2 +- .../2-uncommon/tb_cheapammofactorys.dm | 4 +- .../modules/TGS/factions/avalon/church.dm | 24 ++ proxima/code/modules/TGS/factions/ftu/ftu.dm | 14 + .../TGS/factions/hephestus/engineering.dm | 5 + .../modules/TGS/factions/include_factions.dm | 15 + .../TGS/factions/lawson_arms/lawson_arms.dm | 367 ++++++++++++++++++ .../modules/TGS/factions/mirania/mirania.dm | 106 +++++ .../modules/TGS/factions/nt/nanotrasens.dm | 128 ++++++ .../code/modules/TGS/factions/pcrc/jobs.dm | 110 ++++++ .../code/modules/TGS/factions/pcrc/pcrc.dm | 3 + .../modules/TGS/factions/zeng-hu/medical.dm | 18 + .../modules/TGS/factions/zeng-hu/science.dm | 14 + 26 files changed, 865 insertions(+), 56 deletions(-) create mode 100644 proxima/code/modules/TGS/factions/avalon/church.dm create mode 100644 proxima/code/modules/TGS/factions/ftu/ftu.dm create mode 100644 proxima/code/modules/TGS/factions/hephestus/engineering.dm create mode 100644 proxima/code/modules/TGS/factions/include_factions.dm create mode 100644 proxima/code/modules/TGS/factions/lawson_arms/lawson_arms.dm create mode 100644 proxima/code/modules/TGS/factions/mirania/mirania.dm create mode 100644 proxima/code/modules/TGS/factions/nt/nanotrasens.dm create mode 100644 proxima/code/modules/TGS/factions/pcrc/jobs.dm create mode 100644 proxima/code/modules/TGS/factions/pcrc/pcrc.dm create mode 100644 proxima/code/modules/TGS/factions/zeng-hu/medical.dm create mode 100644 proxima/code/modules/TGS/factions/zeng-hu/science.dm diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index b7920ea1a7d..ef83046a006 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -1,28 +1,28 @@ #define ASSISTANT_TITLE "Vagabond" //Jobs depatment lists for use in constant expressions -#define JOBS_SECURITY "Ironhammer Commander","Ironhammer Gunnery Sergeant","Ironhammer Inspector","Ironhammer Medical Specialist","Ironhammer Operative" -#define JOBS_COMMAND "Captain","First Officer","Ironhammer Commander","Guild Merchant","Technomancer Exultant","Moebius Biolab Officer","Moebius Expedition Overseer","NeoTheology Preacher" -#define JOBS_ENGINEERING "Technomancer Exultant","Technomancer" -#define JOBS_MEDICAL "Moebius Biolab Officer","Moebius Doctor","Moebius Psychiatrist","Moebius Chemist","Moebius Paramedic","Moebius Bio-Engineer" -#define JOBS_SCIENCE "Moebius Expedition Overseer","Moebius Scientist","Moebius Roboticist" -#define JOBS_MOEBIUS "Moebius Biolab Officer","Moebius Doctor","Moebius Psychiatrist","Moebius Chemist","Moebius Paramedic","Moebius Bio-Engineer","Moebius Expedition Overseer","Moebius Scientist","Moebius Roboticist" -#define JOBS_CARGO "Guild Merchant","Guild Technician","Guild Miner", +#define JOBS_SECURITY "PCRC Commander","PCRC Gunnery Sergeant","PCRC Inspector","PCRC Medical Specialist","PCRC Operative" +#define JOBS_COMMAND "Captain","First Mate","PCRC Commander","FTU Merchant","Hephaestus Exultant","Zeng-Hu Biolab Officer","Zeng-Hu Expedition Overseer","NeoChristianity Preacher" +#define JOBS_ENGINEERING "Hephaestus Foreman","Hephaestus Engineer" +#define JOBS_MEDICAL "Zeng-Hu Biolab Officer","Zeng-Hu Doctor","Zeng-Hu Psychiatrist","Zeng-Hu Chemist","Zeng-Hu Paramedic","Zeng-Hu Bio-Engineer" +#define JOBS_SCIENCE "Zeng-Hu Expedition Overseer","Zeng-Hu Scientist","Zeng-Hu Roboticist" +#define JOBS_MOEBIUS "Zeng-Hu Biolab Officer","Zeng-Hu Doctor","Zeng-Hu Psychiatrist","Zeng-Hu Chemist","Zeng-Hu Paramedic","Zeng-Hu Bio-Engineer","Zeng-Hu Expedition Overseer","Zeng-Hu Scientist","Zeng-Hu Roboticist" +#define JOBS_CARGO "FTU Merchant","FTU Technician","Guild Miner", #define JOBS_CIVILIAN "Club Manager","Club Worker","Club Artist",ASSISTANT_TITLE -#define JOBS_CHURCH "NeoTheology Preacher","NeoTheology Acolyte","NeoTheology Agrolyte","NeoTheology Custodian" +#define JOBS_CHURCH "Neo-Christianity Preacher","Neo-Christianity Acolyte","Neo-Christianity Agrolyte","Neo-Christianity Custodian" #define JOBS_NONHUMAN "AI","Robot","pAI" #define CREDITS "¢" #define CREDS "¢" #define DEPARTMENT_COMMAND "Command" -#define DEPARTMENT_MEDICAL "Medical" -#define DEPARTMENT_ENGINEERING "Engineering" -#define DEPARTMENT_SCIENCE "Science" -#define DEPARTMENT_SECURITY "Security" -#define DEPARTMENT_GUILD "Guild" +#define DEPARTMENT_MEDICAL "Zeng-Hu Medical" +#define DEPARTMENT_ENGINEERING "Hephaestus Industries" +#define DEPARTMENT_SCIENCE "Zeng-Hu Science" +#define DEPARTMENT_SECURITY "Proxima Centauri Risk Control" +#define DEPARTMENT_GUILD "Free Trade Union" #define DEPARTMENT_CIVILIAN "Civilian" -#define DEPARTMENT_CHURCH "Church" +#define DEPARTMENT_CHURCH "Neo-Christianity" #define DEPARTMENT_OFFSHIP "Offship" #define DEPARTMENT_SILICON "Silicon" diff --git a/code/__DEFINES/species_languages.dm b/code/__DEFINES/species_languages.dm index 3ae87d64c79..1e54ab6ceb6 100644 --- a/code/__DEFINES/species_languages.dm +++ b/code/__DEFINES/species_languages.dm @@ -23,13 +23,13 @@ #define HAS_HAIR_COLOR 0x20 // Hair colour selectable in chargen. (RGB) // Languages. -#define LANGUAGE_COMMON "English Common" -#define LANGUAGE_CYRILLIC "Techno-Russian" -#define LANGUAGE_SERBIAN "Serbian" -#define LANGUAGE_JIVE "Jive" -#define LANGUAGE_GERMAN "German" -#define LANGUAGE_NEOHONGO "Neohongo" -#define LANGUAGE_LATIN "Latin" +#define LANGUAGE_COMMON "Спейсер" +#define LANGUAGE_CYRILLIC "Пан-Славик" +#define LANGUAGE_SERBIAN "Сербский" +#define LANGUAGE_JIVE "Гаттер" +#define LANGUAGE_GERMAN "Миранийский" +#define LANGUAGE_NEOHONGO "Янгуй" +#define LANGUAGE_LATIN "Алаин" #define LANGUAGE_ROBOT "Robot Talk" diff --git a/code/__HELPERS/manifest.dm b/code/__HELPERS/manifest.dm index 334e07960d3..7d32f6947fb 100644 --- a/code/__HELPERS/manifest.dm +++ b/code/__HELPERS/manifest.dm @@ -16,14 +16,14 @@ var/list/dept_data = list( list("names" = list(), "header" = "Command Staff", "flag" = COMMAND), - list("names" = list(), "header" = "Ironhammer Security", "flag" = IRONHAMMER), - list("names" = list(), "header" = "Moebius Medical", "flag" = MEDICAL), - list("names" = list(), "header" = "Moebius Research", "flag" = SCIENCE), - list("names" = list(), "header" = "Church of NeoTheology", "flag" = CHURCH), - list("names" = list(), "header" = "Asters Guild", "flag" = GUILD), + list("names" = list(), "header" = "Proxima Centauri Risk Control", "flag" = IRONHAMMER), + list("names" = list(), "header" = "Zeng-Hu Medical", "flag" = MEDICAL), + list("names" = list(), "header" = "Zeng-Hu Research", "flag" = SCIENCE), + list("names" = list(), "header" = "Church of Neo-Christianity", "flag" = CHURCH), + list("names" = list(), "header" = "Free Trade Union", "flag" = GUILD), list("names" = list(), "header" = "Civilian", "flag" = CIVILIAN), list("names" = list(), "header" = "Service", "flag" = SERVICE), - list("names" = list(), "header" = "Technomancer League", "flag" = ENGINEERING), + list("names" = list(), "header" = "Hephaestus Industries", "flag" = ENGINEERING), list("names" = list(), "header" = "Miscellaneous", "flag" = MISC), list("names" = list(), "header" = "Silicon") ) @@ -151,4 +151,4 @@ /proc/flat_nano_crew_manifest() . = list() . += filtered_nano_crew_manifest(null, TRUE) - . += silicon_nano_crew_manifest(nonhuman_positions) \ No newline at end of file + . += silicon_nano_crew_manifest(nonhuman_positions) diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm index b717e75e545..db3d03079a7 100644 --- a/code/controllers/subsystems/supply.dm +++ b/code/controllers/subsystems/supply.dm @@ -74,7 +74,7 @@ SUBSYSTEM_DEF(supply) exports.Cut() var/datum/money_account/GA = department_accounts[DEPARTMENT_GUILD] - var/datum/transaction/T = new(points, "Asters Guild", "Exports", "Asters Automated Trading System") + var/datum/transaction/T = new(points, "FTU", "Exports", "Free Trade Union Trading System") T.apply_to(GA) centcom_message = msg diff --git a/code/controllers/subsystems/trade.dm b/code/controllers/subsystems/trade.dm index f7005ef5738..30e2fa22d86 100644 --- a/code/controllers/subsystems/trade.dm +++ b/code/controllers/subsystems/trade.dm @@ -1,4 +1,4 @@ -#define TRADE_SYSTEM_IC_NAME "Asters Automated Trading System" +#define TRADE_SYSTEM_IC_NAME "Free Trade Union Trading System" GLOBAL_LIST_EMPTY(price_cache) SUBSYSTEM_DEF(trade) name = "Trade" @@ -249,7 +249,7 @@ SUBSYSTEM_DEF(trade) if(!current_container.reagents) // If the previous check fails, we are looking for a container with reagents or a specific reagent return FALSE // If the container is empty, fail - for(var/datum/reagent/current_reagent in current_container.reagents?.reagent_list) + for(var/datum/reagent/current_reagent in current_container.reagents?.reagent_list) if(current_reagent.volume >= target_volume && istype(current_reagent, target_reagent)) // Check volume and reagent type return TRUE @@ -531,7 +531,7 @@ SUBSYSTEM_DEF(trade) // The max is a soft cap if(export_count > EXPORT_COUNT_MAXIMUM) break - + senderBeacon.start_export() var/datum/money_account/guild_account = department_accounts[DEPARTMENT_GUILD] var/datum/transaction/T = new(cost, guild_account.get_name(), "Export", TRADE_SYSTEM_IC_NAME) @@ -552,7 +552,7 @@ SUBSYSTEM_DEF(trade) // Junk tags override hockable tags and offer types override both if(target_hockable_tags.len) - . = HOCKABLE + . = HOCKABLE if(target_junk_tags.len) . = JUNK for(var/offer_type in offer_types) diff --git a/code/game/gamemodes/scores.dm b/code/game/gamemodes/scores.dm index 80097318c85..d3e4ba5781b 100644 --- a/code/game/gamemodes/scores.dm +++ b/code/game/gamemodes/scores.dm @@ -284,7 +284,7 @@ GLOBAL_VAR_INIT(score_technomancer_faction_item_loss, 0) Antagonist contracts completed: [GLOB.completed_antag_contracts] ([to_score_color(GLOB.score_antag_contracts)] Points)
Antagonists killed or captured: [GLOB.captured_or_dead_antags] ([to_score_color(GLOB.captured_or_dead_antags_score)] Points)
Escaped Antagonists: [GLOB.ironhammer_escaped_antagonists] ([to_score_color(GLOB.ironhammer_escaped_antagonists_score)] Points)
- IH operatives killed: [GLOB.ironhammer_operative_dead] ([to_score_color(GLOB.ironhammer_operative_dead_score)] Points)
+ PCRC operatives killed: [GLOB.ironhammer_operative_dead] ([to_score_color(GLOB.ironhammer_operative_dead_score)] Points)
Final Ironhammer score: [get_color_score(GLOB.ironhammer_score, GLOB.ironhammer_score)] Points

"} diff --git a/code/game/machinery/recycle_vendor.dm b/code/game/machinery/recycle_vendor.dm index 86956ed6729..23ab6e73481 100644 --- a/code/game/machinery/recycle_vendor.dm +++ b/code/game/machinery/recycle_vendor.dm @@ -166,7 +166,7 @@ stored_item_value += round(S.get_item_cost(), 2) / 2 stored_item_fluff += "
[i] - [stored_item_materials[i]] units, worth [round(S.get_item_cost(), 2) / 2] credits." else - stored_item_fluff += "
Payouts for [i] suspended by Aster Guild representative." + stored_item_fluff += "
Payouts for [i] suspended by FTU representative." else // Bay leftover materials stored_item_fluff += "
[i] recycling is not supported." diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index 699fb78ebd6..f4ce7637178 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -364,7 +364,7 @@ "Born to clean!", "I HATE VAGABONDS I HATE VAGABONDS!!", "It is always morally correct to perform field execution.", - "But being as this is a RMB-A 2000, the most expensive robot in Frozen Star catalogue!", + "But being as this is a RMB-A 2000, the most expensive robot in PCRC catalogue!", "Do I feel lucky? Well, do you, operative?", "Those neotheologist fucks are up to something...", "None of them know my true power!") diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 6a5ecaba5ff..fbd2e142485 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -238,15 +238,20 @@ //Trust me I'm an engineer //I think we'll put this shit right here var/list/rank_prefix = list(\ - "Ironhammer Operative" = "Operative",\ - "Ironhammer Inspector" = "Inspector",\ - "Ironhammer Medical Specialist" = "Specialist",\ - "Ironhammer Gunnery Sergeant" = "Sergeant",\ - "Ironhammer Commander" = "Lieutenant",\ - "NeoTheology Preacher" = "Reverend",\ - "Moebius Expedition Overseer" = "Overseer",\ - "Moebius Biolab Officer" = "Doctor",\ + "PCRC Operative" = "Operative",\ + "PCRC Inspector" = "Inspector",\ + "PCRC Medical Specialist" = "Specialist",\ + "PCRC Gunnery Sergeant" = "Sergeant",\ + "PCRC Commander" = "Commander",\ + "Neo-Christianity Preacher" = "Reverend",\ + "Zeng-Hu Expedition Overseer" = "Overseer",\ + "Zeng-Hu Biolab Officer" = "Overseer",\ "Captain" = "Captain",\ + "Fisrt Mate" = "Adjutant",\ + "Zeng-Hu Doctor" = "Doctor",\ + "Zeng-Hu Scientist" = "Researcher",\ + "FTU Merchant" = "Merchant",\ + "Hephaestus Foreman" = "Foreman" ) /mob/living/carbon/human/proc/rank_prefix_name(name) diff --git a/code/modules/organs/external/subtypes/robotic_types.dm b/code/modules/organs/external/subtypes/robotic_types.dm index b919b4637e3..df9c8582ed5 100644 --- a/code/modules/organs/external/subtypes/robotic_types.dm +++ b/code/modules/organs/external/subtypes/robotic_types.dm @@ -41,8 +41,8 @@ default_description = /datum/organ_description/leg/right /obj/item/organ/external/robotic/technomancer - name = "Technomancer \"Homebrew\"" - desc = "Technomancer \"branded\" \"functional\" prosthesis." + name = "\"Hephaestus Industries\"" + desc = "Hephaestus Industries prosthesis." armor = list(melee = 2, bullet = 2, energy = 2, bomb = 10, bio = 100, rad = 100) force_icon = 'icons/mob/human_races/cyberlimbs/technomancer.dmi' model = "technomancer" diff --git a/code/modules/projectiles/guns/projectile/modular/modular_AK.dm b/code/modules/projectiles/guns/projectile/modular/modular_AK.dm index cf4df68a673..593b3771108 100644 --- a/code/modules/projectiles/guns/projectile/modular/modular_AK.dm +++ b/code/modules/projectiles/guns/projectile/modular/modular_AK.dm @@ -22,7 +22,7 @@ gun_tags = list(GUN_SILENCABLE) - serial_type = "FS" + serial_type = "LA" required_parts = list(/obj/item/part/gun/modular/mechanism/autorifle = 0, /obj/item/part/gun/modular/barrel = 0, /obj/item/part/gun/modular/grip = 0, /obj/item/part/gun/modular/stock = -1) @@ -31,11 +31,11 @@ if(grip_type) switch(grip_type) if("wood") - return "FS [stock_type] [caliber] \"Vipr\"" + return "LA [stock_type] [caliber] \"Vipr\"" if("black") return "BM [stock_type] [caliber] \"MPi-K\"" // Name of East-German AKs if("rubber") - return "FS [stock_type] [caliber] \"Venger\"" + return "LA [stock_type] [caliber] \"Venger\"" if("excelsior") return "Excelsior [stock_type] [caliber] \"Kalashnikov\"" if("serbian") diff --git a/code/modules/projectiles/guns/projectile/modular/modular_wintermute.dm b/code/modules/projectiles/guns/projectile/modular/modular_wintermute.dm index 15056acd935..5372308f9f4 100644 --- a/code/modules/projectiles/guns/projectile/modular/modular_wintermute.dm +++ b/code/modules/projectiles/guns/projectile/modular/modular_wintermute.dm @@ -33,11 +33,11 @@ if(grip_type) switch(grip_type) if("wood") - return "FS AR [caliber] \"Fall\"" + return "LA AR [caliber] \"Fall\"" if("black") return "BM AR [caliber] \"Wintersun\"" if("rubber") - return "FS AR [caliber] \"Wintermute\"" + return "LA AR [caliber] \"Wintermute\"" if("excelsior") return "Excelsior AR [caliber] \"Commute\"" if("serbian") diff --git a/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm b/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm index ff584de11b7..1dcb4723f19 100644 --- a/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm +++ b/code/modules/trade/datums/trade_stations_presets/1-common/hellcat.dm @@ -21,8 +21,8 @@ stations_recommended = list("fs_ammo", "style") inventory = list( "Design Disks" = list( - /obj/item/computer_hardware/hard_drive/portable/design/nonlethal_ammo = good_data("Frozen Star Nonlethal Magazines Pack", list(1, 10), 500), - /obj/item/computer_hardware/hard_drive/portable/design/lethal_ammo = good_data("Frozen Star Lethal Magazines Pack", list(1, 10), 1000) + /obj/item/computer_hardware/hard_drive/portable/design/nonlethal_ammo = good_data("Lawson Arms Nonlethal Magazines Pack", list(1, 10), 500), + /obj/item/computer_hardware/hard_drive/portable/design/lethal_ammo = good_data("Lawson Arms Lethal Magazines Pack", list(1, 10), 1000) ), "Enforce Equipment" = list( /obj/item/handcuffs, diff --git a/code/modules/trade/datums/trade_stations_presets/1-common/suit_up.dm b/code/modules/trade/datums/trade_stations_presets/1-common/suit_up.dm index dd74f254954..a0f56bba1e1 100644 --- a/code/modules/trade/datums/trade_stations_presets/1-common/suit_up.dm +++ b/code/modules/trade/datums/trade_stations_presets/1-common/suit_up.dm @@ -144,7 +144,7 @@ /obj/item/clothing/suit/space/void/security = custom_good_price(520), /obj/item/clothing/suit/space/void/hazardsuit = custom_good_price(312) ), - "Oberth Attire" = list( + "Miranian Attire" = list( //I fucking hate reinitialize lists /obj/item/clothing/gloves/german, /obj/item/clothing/head/beret/german, /obj/item/clothing/mask/gas/german, diff --git a/code/modules/trade/datums/trade_stations_presets/2-uncommon/tb_cheapammofactorys.dm b/code/modules/trade/datums/trade_stations_presets/2-uncommon/tb_cheapammofactorys.dm index 9d240f2770b..d9dbd1dc515 100644 --- a/code/modules/trade/datums/trade_stations_presets/2-uncommon/tb_cheapammofactorys.dm +++ b/code/modules/trade/datums/trade_stations_presets/2-uncommon/tb_cheapammofactorys.dm @@ -1,7 +1,7 @@ /datum/trade_station/tb_cheapammofactory name_pool = list( - "FSTB \'Zeus\'" = "Frozen Star Trade Beacon \'Zeus\': \"Cheap ammunition! Almost free! If we don\'t have it, that means it doesn't exists or it isn\'t legal enough!\"", - "FSTB \'Hispa\'" = "Frozen Star Trade Beacon \'Hispa\': \"All ammunition in existence is here! Buy all calibers, all types! Cheap as breathing!\"" + "LATB \'Zeus\'" = "Lawson Arms Trade Beacon \'Zeus\': \"Cheap ammunition! Almost free! If we don\'t have it, that means it doesn't exists or it isn\'t legal enough!\"", + "LATB \'Hispa\'" = "Lawson Arms Trade Beacon \'Hispa\': \"All ammunition in existence is here! Buy all calibers, all types! Cheap as breathing!\"" ) icon_states = list("htu_station", "station") uid = "fs_ammo" diff --git a/proxima/code/modules/TGS/factions/avalon/church.dm b/proxima/code/modules/TGS/factions/avalon/church.dm new file mode 100644 index 00000000000..f794fc83f54 --- /dev/null +++ b/proxima/code/modules/TGS/factions/avalon/church.dm @@ -0,0 +1,24 @@ +/datum/job/chaplain + title = "Neo-Christianity Preacher" + +/datum/job/acolyte + title = "Neo-Christianity Acolyte" + +/datum/job/hydro + title = "Neo-Christianity Agrolyte" + +/datum/job/janitor + title = "Neo-Christianity Custodian" + +/datum/category_item/setup_option/background/origin/new_rome + name = "Авалон" + desc = "Население этой планеты имеет простую жизнь, не сильно беспокоясь о передовых технологиях,\ + существующих в других частях известной галактики. Еда здесь в большом количестве и, следовательно, дёшева,\ + что позволяет населению поддерживать гораздо более крупные семьи. Большинство нелюдей, которые прилетают сюда,\ + склонны легко адаптироваться к этому простому образу жизни, что позволяет обеспечить относительно более высокую степень стабильности и благополучия.\ + \ + Политический строй Авалонского Королевства восходит к временам раннего средневековья людей на Земле и представляет собой феодальную монархию. \ + Возглавляет королевство король, который действует как глава государства на мировой арене, обладает правом собирать налоги с территорий королевства \ + через своих вассалов, а также собирает ополчение и созывает армию в военное время, однако власть короля где-либо за пределами его феода максимально формальна.\ + \ + Авалон - родина Нео-Христианства. Вы получаете бонусный Язык Алаин" diff --git a/proxima/code/modules/TGS/factions/ftu/ftu.dm b/proxima/code/modules/TGS/factions/ftu/ftu.dm new file mode 100644 index 00000000000..69793d35bf0 --- /dev/null +++ b/proxima/code/modules/TGS/factions/ftu/ftu.dm @@ -0,0 +1,14 @@ +/datum/job/merchant + title = "FTU Merchant" + +/datum/job/cargo_tech + title = "FTU Technician" + +/obj/landmark/join/start/cargo_tech + name = "FTU Technician" + +/datum/job/mining + title = "FTU Miner" + +/datum/department/guild + name = "Free Trade Union" diff --git a/proxima/code/modules/TGS/factions/hephestus/engineering.dm b/proxima/code/modules/TGS/factions/hephestus/engineering.dm new file mode 100644 index 00000000000..eb695f06d05 --- /dev/null +++ b/proxima/code/modules/TGS/factions/hephestus/engineering.dm @@ -0,0 +1,5 @@ +/datum/job/chief_engineer + title = "Hephaestus Foreman" + +/datum/job/technomancer + title = "Hephaestus Engineer" diff --git a/proxima/code/modules/TGS/factions/include_factions.dm b/proxima/code/modules/TGS/factions/include_factions.dm new file mode 100644 index 00000000000..731e7efefd2 --- /dev/null +++ b/proxima/code/modules/TGS/factions/include_factions.dm @@ -0,0 +1,15 @@ +#include "proxima\code\modules\TGS\factions\mirania\mirania.dm" + +#include "proxima\code\modules\TGS\factions\lawson_arms\lawson_arms.dm" +#include "proxima\code\modules\TGS\factions\pcrc\pcrc.dm" +#include "proxima\code\modules\TGS\factions\pcrc\jobs.dm" + +#include "proxima\code\modules\TGS\factions\zeng-hu\medical.dm" +#include "proxima\code\modules\TGS\factions\zeng-hu\science.dm" + +#include "proxima\code\modules\TGS\factions\ftu\ftu.dm" +#include "proxima\code\modules\TGS\factions\nt\nanotrasens.dm" + +#include "proxima\code\modules\TGS\factions\hephestus\engineering.dm" + +#include "proxima\code\modules\TGS\factions\avalon\church.dm" diff --git a/proxima/code/modules/TGS/factions/lawson_arms/lawson_arms.dm b/proxima/code/modules/TGS/factions/lawson_arms/lawson_arms.dm new file mode 100644 index 00000000000..d545d43cd66 --- /dev/null +++ b/proxima/code/modules/TGS/factions/lawson_arms/lawson_arms.dm @@ -0,0 +1,367 @@ +/obj/item/gun/projectile/boltgun/levergun + name = "LA BR .40 \"Svengali\"" + +/datum/design/autolathe/ammo/fs_stinger + name = "LA sting shell" + +/datum/design/autolathe/gun/colt + name = "LA HG .35 Auto \"Colt M1911\"" + +/datum/design/autolathe/gun/havelock + name = "LA REV .35 \"Havelock\"" + build_path = /obj/item/gun/projectile/revolver/havelock + +// .40 handguns + +/datum/design/autolathe/gun/revolver + name = "LA REV .40 \"Miller\"" + +/datum/design/autolathe/gun/revolver_consul + name = "LA REV .40 \"Consul\"" + +/datum/design/autolathe/gun/revolver_deckard + name = "LA REV .40 \"Deckard\"" + +/datum/design/autolathe/gun/revolver_mateba + name = "LA REV .40 Magnum \"Mateba\"" + +/datum/design/autolathe/gun/lamia + name = "LA HG .40 \"Lamia\"" + +/datum/design/autolathe/gun/avasarala + name = "LA HG .40 \"Avasarala\"" + +/datum/design/autolathe/gun/pump_shotgun + name = "LA SG \"Kammerer\"" + +/datum/design/autolathe/gun/gladstone + name = "LA SG \"Gladstone\"" + +/datum/design/autolathe/gun/atreides + name = "LA SMG .35 \"Atreides\"" + +/datum/design/autolathe/gun/straylight + name = "LA SMG .35 \"Straylight\"" + +/datum/design/autolathe/gun/molly + name = "LA MP .35 \"Molly\"" + +/datum/design/autolathe/gun/slaught_o_matic //alledgedly a handgun, but practically an SMG + name = "LA HG .35 \"Slaught-o-Matic\"" + +/datum/design/autolathe/gun/wintermute + name = "LA AR .20 \"Wintermute\"" + +/datum/design/autolathe/gun/boltgun_fs + name = "LA BR .20 \"Kadmin\"" + +/datum/design/autolathe/gun/sol + name = "LA CAR .25 CS \"Sol\"" + +/datum/design/autolathe/gun/ak47_fs + name = "LA AR .30 \"Vipr\"" + +/datum/design/autolathe/gun/ak47_fs_ih + name = "LA AR .30 \"Venger\"" + +/datum/design/autolathe/gun/lmg_tk + name = "LA LMG .25 \"Takeshi\"" + +/datum/design/autolathe/gun/grenade_launcher_lenar + name = "LA GL \"Lenar\"" + +/datum/design/autolathe/gun/energygun + name = "LA PDW E \"Spider Rose\"" + +/datum/design/autolathe/gun/energygun_martin + name = "LA PDW E \"Martin\"" + +/datum/design/autolathe/gun/plasma/cassad + name = "LA PR \"Cassad\"" + +/datum/uplink_item/item/visible_weapons/revolver + name = "LA REV .40 Magnum \"Miller\" Revolver" + +/datum/uplink_item/item/visible_weapons/winchesterrifle + name = "LA BR .40 \"Svengali\"" + +/datum/uplink_item/item/visible_weapons/lshotgun + name = "LA BR \"Sogekihei\"" + +/obj/item/grenade/chem_grenade/incendiary + name = "LA IG \"River\"" + +/obj/item/grenade/chem_grenade/teargas + name = "LA TGG \"Simon\"" + +/obj/item/grenade/empgrenade + name = "LA EMPG \"Frye\"" + +/obj/item/grenade/empgrenade/low_yield + name = "LA EMPG \"Frye\" - C" + +/obj/item/grenade/flashbang + name = "LA FBG \"Serra\"" + desc = "A \"Lawson Arms\" flashbang grenade. If in any doubt - use it." + +/obj/item/grenade/frag/sting + name = "LA SG \"Hornet\"" + desc = "A high-grade \"Lawson Arms\" sting grenade, for use against unruly crowds." + +/obj/item/grenade/heatwave + name = "LA HG \"Phoenix\"" + +/obj/item/grenade/smokebomb + name = "LA SG \"Reynolds\"" + + +/obj/item/tool/hammer/sledgehammer/ironhammer //triple hammer! + name = "LA \"Ironhammer\" Breaching Hammer" + desc = "A modified sledgehammer produced by Lawson Arms for PMC forces. This tool can take down standard walls and if the user is strong enough, reinforced walls." + +/obj/item/gun/energy/chameleon + name = "LA HG .40 Magnum \"Avasarala\"" + +/obj/item/clothing/gloves/stungloves + name = "LA Power Glove" + +/obj/item/ammo_casing/grenade + name = "LA SR \"Sasumata\"" + desc = "A high-grade Lawson Arms sting round, for use against unruly crowds." + +/obj/item/gun/energy/gun + name = "LA PDW E \"Spider Rose\"" + +/obj/item/gun/energy/gun/martin + name = "LA PDW E \"Martin\"" + desc = "Martin is essentialy downscaled Spider Rose, made for PMC employees and civilians to use it as personal self defence weapon." + +/obj/item/gun/energy/plasma/cassad + name = "LA PR \"Cassad\"" + desc = "\"Lawson Arms\" brand energy assault rifle, capable of prolonged combat. When surrender is not an option." + +/obj/item/gun/projectile/shotgun/pump/grenade/lenar + name = "LA GL \"Lenar\"" + +/obj/item/gun/projectile/automatic/atreides + name = "LA SMG .35 Auto \"Atreides\"" + +/obj/item/gun/projectile/automatic/lmg/tk + name = "LA LMG .25 CS Takeshi" + desc = "The \"Takeshi LMG\" is LA's answer to PMC's needs for mass supression and meat grinding, a fine oiled machine of war and death." + +/obj/item/gun/projectile/automatic/molly + name = "LA MP .35 Auto \"Molly\"" + +/obj/item/gun/projectile/automatic/slaught_o_matic + name = "LA HG .35 Auto \"Slaught-o-Matic\"" + desc = "This disposable plastic handgun is mass-produced by \"Lawson Arms\" for civilian use. It often is used by street urchin, thugs, or terrorists on a budget. For what it's worth, it's not an awful handgun - but you only get one magazine before the gun locks up and becomes useless." + +/obj/item/gun/projectile/automatic/sol + name = "LA CAR .25 CS \"Sol\"" + desc = "A standard-issue weapon often used by PCRC operatives. Compact and reliable. Uses .25 Caseless rounds." + +/obj/item/gun/projectile/automatic/straylight + name = "LA SMG .35 Auto \"Straylight\"" + desc = "A compact, lightweight and cheap rapid-firing submachine gun. In past was primarily used for testing ammunition and weapon modifications, \ + nowadays mass produced for PMC or security forces. Suffers from poor recoil control and underperforming ballistic impact, \ + but makes up for this through sheer firerate. Especially effective with rubber ammunition. Uses .35 Auto rounds." + +/obj/item/gun/projectile/boltgun/fs + name = "LA BR .20 \"Kadmin\"" + +/obj/item/gun/projectile/boltgun/fs/civilian + name = "LA BR .20 \"Arasaka\"" + +/obj/item/gun/projectile/boltgun/levergun + name = "LA BR .40 \"Svengali\"" + +/obj/item/gun/projectile/boltgun/levergun/sawn + name = "sawn-off LA BR .40 \"Svengali\"" + +/obj/item/gun/projectile/boltgun/levergun/shotgun + name = "LA BR \"Sogekihei\"" + +/obj/item/gun/projectile/boltgun/levergun/shotgun/sawn + name = "sawn-off LA BR \"Sogekihei\"" + +/obj/item/gun/projectile/giskard + name = "LA HG .35 Auto \"Giskard\"" + desc = "A popular \"Lawson Arms\" brand pocket pistol chambered for the ubiquitous .35 auto round. Uses standard capacity magazines." + +/obj/item/gun/projectile/lamia + name = "LA HG .40 Magnum \"Lamia\"" + desc = "LA HG .40 Magnum \"Lamia\", a heavy pistol of PMC enforcers. Uses 40 Magnum rounds." + +/obj/item/gun/projectile/olivaw + name = "LA MP .35 Auto \"Olivaw\"" + desc = "A popular \"Lawson Arms\" machine pistol. This one has a two-round burst-fire mode and is chambered for .35 auto. It can use normal and high capacity magazines." + +/obj/item/gun/projectile/paco + name = "LA HG .35 Auto \"Paco\"" + desc = "A modern and reliable sidearm for the soldier in the field. Commonly issued as a sidearm to PCRC Operatives. Uses standard .35 and high capacity magazines." + +/obj/item/gun/projectile/revolver/capgun + name = "LA REV .357 \"Miller\"" //for that epic clown robbery meme + +/obj/item/gun/projectile/revolver/consul + name = "LA REV .40 Magnum \"Consul\"" + +/obj/item/gun/projectile/revolver/deckard + name = "LA REV .40 Magnum \"Deckard\"" + +/obj/item/gun/projectile/revolver/havelock + name = "LA REV .35 Auto \"Havelock\"" + desc = "A cheap \"Lawson Arms\" knock-off of a Smith & Wesson Model 10. Uses .35 Auto rounds." + +/obj/item/gun/projectile/revolver/mateba + name = "LA REV .40 Magnum \"Mateba\"" + +/obj/item/gun/projectile/revolver + name = "LA REV .40 Magnum \"Miller\"" + desc = "The \"Lawson Arms\" \"Miller\" is a revolver of choice when you absolutely, positively need to make a hole in someone. Uses .40 Magnum ammo." + +/obj/item/gun/projectile/shotgun/bull + name = "LA SG \"Bull\"" + desc = "A \"Lawson Arms\" double-barreled pump-action shotgun. Marvel of engineering, this gun is often used by PMC tactical units. \ + Due to shorter than usual barrels, damage are somewhat lower and recoil kicks slightly harder, but possibility to fire two barrels at once overshadows all bad design flaws. Can hold up to 7+2 shells." + +/obj/item/gun/projectile/shotgun/pump/gladstone + name = "LA SG \"Gladstone\"" + desc = "It is a next-generation Lawson Arms shotgun intended as a cost-effective competitor to the aging NT \"Regulator 1000\". It has a semi-rifled lightweight full-length barrel which gives it exceptional projectile velocity and armor piercing capabilites with slugs, with a high-capacity magazine tube below it. Can hold up to 9+1 shells in a tube magazine." + +/obj/item/gun/projectile/shotgun/pump + name = "LA SG \"Kammerer\"" + +/datum/design/autolathe/sec/watchman + name = "Lawson Arms \"Watchman\" scope" + +/datum/category_item/setup_option/background/origin/shimatengoku + name = "Тау Кита" + desc = "Кита Эпсилон - обитаемая планета с умеренным и тёплым климатом расположенная в системе Тау-Сети. \ + Планета представляет собой большой урбанистический город под названием Верлиз, поделенный несколько отдельных районов. \ + \"Кита\", как называют ее жители, является пристанищем для многочисленных корпоративных заводов, офисов и штаб квартир, \ + а так же имеет при себе крупнейшее и самое престижное учебное заведение во всём ЦПСС - \"Технологический Университет Тау-Кита\".\ + \ + Дает бонусный доступ к языку Янгуй." + +/datum/uplink_item/item/visible_weapons/dna_trigger + name = "Lawson Arms \"DNA lock\" trigger" + +/obj/machinery/vending/weapon_machine + name = "Lawson Arms Guns&Ammo" + desc = "A self-defense equipment vending machine. When you need to take care of that clown." + product_slogans = "The best defense is good offense!;Buy for your whole family today!;Nobody can outsmart bullet!;God created man - Lawson Arms made them EQUAL!;Stupidity can be cured! By LEAD.;Dead kids can't bully your children!" + +/obj/item/computer_hardware/hard_drive/portable/design/nonlethal_ammo + disk_name = "Lawson Arms Nonlethal Magazines Pack" + +/obj/item/computer_hardware/hard_drive/portable/design/lethal_ammo + disk_name = "Lawson Arms Lethal Magazines Pack" + +/obj/item/computer_hardware/hard_drive/portable/design/ammo_boxes_smallarms + disk_name = "Lawson Arms .35 and .40 Ammunition" + +/obj/item/computer_hardware/hard_drive/portable/design/ammo_boxes_rifle + disk_name = "Lawson Arms Rifle Ammunition" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_cheap_guns + disk_name = "Lawson Arms Basic - .35 Civilian Pack" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_colt + disk_name = "Lawson Arms - .35 Colt 1911" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_revolver_miller + disk_name = "Lawson Arms- .40 Miller Revolver" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_revolver_consul + disk_name = "Lawson Arms - .40 Consul Revolver" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_revolver_deckard + disk_name = "Lawson Arms - .40 Deckard Revolver" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_revolver_mateba + disk_name = "Lawson Arms - .40 Mateba Revolver" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_lamia + disk_name = "Lawson Arms - .40 Lamia Handgun" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_deagle + disk_name = "Lawson Arms - .40 Avasarala Handgun" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_doublebarrel + disk_name = "Lawson Arms - .50 Double Barrel Shotgun" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_kammerer + disk_name = "Lawson Arms - .50 Kammerer Shotgun" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_gladstone + disk_name = "Lawson Arms - .50 Gladstone Shotgun" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_paco + disk_name = "Lawson Arms - .35 Paco HG" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_straylight + disk_name = "Lawson Arms - .35 Straylight SMG" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_molly + disk_name = "Lawson Arms - .35 Molly SMG" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_atreides + disk_name = "Lawson Arms - .35 Atreides SMG" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_slaught_o_matic + disk_name = "Lawson Arms - .35 Slaught-o-Matic HG" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_wintermute + disk_name = "Lawson Arms - .20 Wintermute Assault Rifle" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_sol + disk_name = "Lawson Arms - .25 Sol Caseless SMG Pack" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_kalashnikov + disk_name = "Lawson Arms - .30 Hunting Rifle Pack" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_kalashnikov_ih + disk_name = "Lawson Arms - .30 PD Rifle Pack" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_lenar + disk_name = "Lawson Arms - Lenar Grenade Launcher" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_spiderrose + disk_name = "Lawson Arms - Spider Rose PDW E" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_martin + disk_name = "Lawson Arms - Martin PDW E" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_cassad + disk_name = "Lawson Arms - Cassad Plasma Rifle" + +/obj/structure/sign/faction/frozenstar + name = "Lawson Arms" + +/datum/language/neohongo + name = LANGUAGE_NEOHONGO + desc = "The language widely used by Pan-Asian population" + +/obj/item/organ/external/robotic/frozen_star + name = "\"Lawson Arms\"" + desc = "Tactical \"Lawson Arms\" blue and gray prosthesis for dangerous environment." + +/obj/item/gun_upgrade/trigger/dangerzone + name = "Lawson Arms \"Danger Zone\" Trigger" + +/obj/item/gun_upgrade/trigger/cop_block + name = "Lawson Arms \"Cop Block\" Trigger" + +/obj/item/gun_upgrade/trigger/dnalock + name = "Lawson Arms \"DNA lock\" Trigger" + +/obj/item/gun_upgrade/mechanism/overshooter + name = "Lawson Arms \"Overshooter\" internal magazine kit" + +/obj/item/gun_upgrade/mechanism/weintraub + name = "Lawson Arms \"Weintraub\" full auto kit" + +/obj/item/gun_upgrade/scope/watchman + name = "Lawson Arms \"Watchman\" scope" diff --git a/proxima/code/modules/TGS/factions/mirania/mirania.dm b/proxima/code/modules/TGS/factions/mirania/mirania.dm new file mode 100644 index 00000000000..6fef83bb517 --- /dev/null +++ b/proxima/code/modules/TGS/factions/mirania/mirania.dm @@ -0,0 +1,106 @@ +/datum/category_item/setup_option/background/origin/oberth + name = "Мирания" + desc = "Мираниане очень гордые. Их происхождение как аграрной и чрезвычайно изолированной колонии выработало \ + у народа горделивый характер, поскольку всё на планете воспринимается как работа рук миранианов, которые сделали колонию \ + великой. Новеньким здесь приходится несладко, и многих из иммигрантов направляют на “черные” рабочие места и неквалифицированный труд. \ + Потомки первоначальных колонистов составляют класс “Старые Мираниане”, являющиеся богатыми лицами и занимающие непропорционально \ + большое количество правительственных должностей.\ + \ + Дает бонусный доступ к Миранийскому языку." + +/obj/machinery/jammer + name = "Miranian Portable Signal Jammer" + +/obj/item/device/jammer + name = "Miranian Mobile Jammer" + +/obj/item/bluespace_harpoon/mounted/blitz + desc = "Reverse engineered version of harpoon developed by old Nanotrasen, remounted for robotic use only by Miranian Republic." + +/obj/item/computer_hardware/hard_drive/portable/design/guns/or_silenced + disk_name = "Miraian Republic - .25 Mandella" + +/obj/item/computer_hardware/hard_drive/portable/design/guns/fs_bulldog + disk_name = "Miraian Republic - .20 Bulldog Carabine" + +/datum/gear/gloves/german + display_name = "gloves, Mirania" + +/datum/gear/head/beret/oberth + display_name = "beret, Mirania" //Uberth + +/datum/gear/uniform/battledress_german + display_name = "battle dress uniform, Mirania" + +/obj/item/clothing/gloves/german + name = "Miranian Republic gloves" + +/obj/item/clothing/head/beret/german + name = "Miranian Republic beret" + +/obj/item/clothing/mask/gas/german + name = "Miranian Republic gas mask" + +/obj/item/clothing/shoes/jackboots/german + name = "Miranian Republic boots" + +/obj/item/clothing/suit/storage/greatcoat/german_overcoat + name = "Miranian Republic uniform overcoat" + +/obj/item/clothing/under/germansuit + name = "Miranian Republic Battle Dress Uniform" + +/datum/language/german + name = LANGUAGE_GERMAN + desc = "Language used by the inhabitants of Mirania." + +/obj/item/gun/energy/shrapnel + name = "MR ESG \"Shellshock\" energy shotgun" + desc = "An Miranian Republic Self Defence Force design, this mat-fab shotgun tends to burn through cells with use. The matter contained in empty cells can be converted directly into ammunition as well, if the safety bolts are loosened." + +/obj/item/gun_upgrade/barrel/blender + name = "MR \"Bullet Blender\" barrel" + desc = "A curious-looking barrel bearing the Mirania insignia. A small label reads \"No refunds for any collateral damage caused\"." + +/obj/item/gun/projectile/automatic/sts35 + name = "MR SDF AR .30 \"STS-35\"" + desc = "The rugged STS-35 is a durable automatic weapon, made by Miranian Republic Self Defence Force. \ + Extremely efficient rifle design that was put in service right before collapse of the Republic, this weapon can be found almost anywhere in the galaxy by now. \ + Uses .30 Rifle rounds." + +/obj/item/gun/projectile/automatic/z8 + name = "MR CAR .20 \"Z8 Bulldog\"" + desc = "The Z8 Bulldog is an older bullpup carbine model, made by \"Miranian Republic\". It includes an underbarrel grenade launcher which is compatible with most modern grenade types. Uses .20 Rifle rounds." + +/obj/item/gun/projectile/boltgun/levergun + desc = "A perfect modernization of an old earth classic hailing popular use with gun ho lawmen and bounty hunters. \ + Marketed as the number one choice for crack shots on Miranian colonies and large vessels." + +/obj/item/gun/projectile/revolver/hornet + name = "MR REV .20 \"LBR-8 Hornet\"" + desc = "An attempt by Mirania to replicate lost Terran Commonwealth tech. In order to achieve satisfactory ballistic \ + performance, it sports an usually long barrel and overpressurized chamber. Uses .20 rifle rounds." + +/datum/design/autolathe/gun/mandella + name = "MR HG .25 CS \"Mandella\"" + +/datum/design/autolathe/gun/z8 + name = "MR CAR .20 \"Z8 Bulldog\"" + +/datum/design/autolathe/gun/sts35 + name = "MR SDF AR .30 \"STS-35\"" + +/datum/uplink_item/item/visible_weapons/pistol + name = "MR HG .25 CS \"Mandella\" Silenced Handgun" + +/datum/uplink_item/item/visible_weapons/hornet + name = "MR REV .20 \"LBR-8 Hornet\" Revolver" + +/datum/uplink_item/item/visible_weapons/assaultrifle + name = "MR BR \"STS-35\" Battle Rifle" + +/datum/uplink_item/item/visible_weapons/blender + name = "MR \"Bullet Blender\" barrel" + +/obj/item/ammo_casing/grenade/blast + name = "MR OBR \"Puff\"" diff --git a/proxima/code/modules/TGS/factions/nt/nanotrasens.dm b/proxima/code/modules/TGS/factions/nt/nanotrasens.dm new file mode 100644 index 00000000000..426feb4955d --- /dev/null +++ b/proxima/code/modules/TGS/factions/nt/nanotrasens.dm @@ -0,0 +1,128 @@ +/datum/design/autolathe/cell/large + name = "NanoTrasen \"Robustcell 1000L\"" + +/datum/design/autolathe/cell/large/high + name = "NanoTrasen \"Robustcell 5000L\"" + +/datum/design/autolathe/cell/medium + name = "NanoTrasen \"Robustcell 600M\"" + build_path = /obj/item/cell/medium + +/datum/design/autolathe/cell/medium/high + name = "NanoTrasen \"Robustcell 800M\"" + build_path = /obj/item/cell/medium/high + +/datum/design/autolathe/cell/small + name = "NanoTrasen \"Robustcell 100S\"" + build_path = /obj/item/cell/small + +/datum/design/autolathe/cell/small/high + name = "NanoTrasen \"Robustcell 200S\"" + build_path = /obj/item/cell/small/high + +/datum/design/autolathe/part/laserguide + name = "NanoTrasen \"Guiding Light\" laser guide" + build_path = /obj/item/tool_upgrade/refinement/laserguide + +/datum/design/autolathe/part/diamondblade + name = "NanoTrasen \"Gleaming Edge\": Diamond blade" + build_path = /obj/item/tool_upgrade/productivity/diamond_blade + +/obj/machinery/vending/powermat + name = "Nanotrasen Power-Mat" + +/obj/machinery/vending/printomat + name = "Nanotrasen Print-o-Mat" + +/obj/machinery/vending/style + name = "Gilthari Exports Style-o-matic" + desc = "Gilthari Exports vendor selling, possibly stolen, most likely overpriced, stylish clothing." + + +/obj/item/cell/large + name = "Nanotrasen \"Robustcell 1000L\"" + desc = "Nanotrasen branded rechargeable L-standardized power cell. This one is the cheapest you can find." + +/obj/item/cell/large/high + name = "Nanotrasen \"Robustcell 5000L\"" + desc = "Nanotrasen branded rechargeable L-standardized power cell. Popular and reliable version." + +/obj/item/cell/large/super + name = "Nanotrasen \"Robustcell 15000L\"" + desc = "Nanotrasen branded rechargeable L-standardized power cell. This advanced version can store even more energy." + +/obj/item/cell/large/hyper + name = "Nanotrasen \"Robustcell-X 20000L\"" + desc = "Nanotrasen branded rechargeable L-standardized power cell. Looks like this is a rare and powerful prototype." + +/obj/item/cell/medium + name = "Nanotrasen \"Robustcell 600M\"" + desc = "Nanotrasen branded rechargeable M-standardized power cell. This one is the cheapest you can find." + + +/obj/item/cell/medium/high + name = "Nanotrasen \"Robustcell 800M\"" + desc = "Nanotrasen branded rechargeable M-standardized power cell. Popular and reliable version." + + +/obj/item/cell/medium/super + name = "Nanotrasen \"Robustcell 1000M\"" + desc = "Nanotrasen branded rechargeable M-standardized power cell. This advanced version can store even more energy." + + +/obj/item/cell/medium/hyper + name = "Nanotrasen \"Robustcell-X 1500M\"" + desc = "Nanotrasen branded rechargeable M-standardized power cell. Looks like this is a rare and powerful prototype." + +/obj/item/cell/small + name = "Nanotrasen \"Robustcell 100S\"" + desc = "Nanotrasen branded rechargeable S-standardized power cell. This one is the cheapest you can find." + +/obj/item/cell/small/high + name = "Nanotrasen \"Robustcell 200S\"" + desc = "Nanotrasen branded rechargeable S-standardized power cell. Popular and reliable version." + + +/obj/item/cell/small/super + name = "Nanotrasen \"Robustcell 300S\"" + desc = "Nanotrasen branded rechargeable S-standardized power cell. This advanced version can store even more energy." + +/obj/item/cell/small/hyper + name = "Nanotrasen \"Robustcell-X 500S\"" + desc = "Nanotrasen branded rechargeable S-standardized power cell. Looks like this is a rare and powerful prototype." + +/obj/item/computer_hardware/hard_drive/portable/design/tools + disk_name = "Nanotrasen Basic Tool Pack" + +/obj/item/computer_hardware/hard_drive/portable/design/misc + disk_name = "Nanotrasen Miscellaneous Pack" + +/obj/item/computer_hardware/hard_drive/portable/design/devices + disk_name = "Nanotrasen Devices and Instruments" + +/obj/item/computer_hardware/hard_drive/portable/design/robustcells + disk_name = "Nanotrasen Robustcells" + +/obj/item/computer_hardware/hard_drive/portable/design/armor/asters + disk_name = "Nanotrasen Enforcement Armor Pack" + +/obj/item/grenade/chem_grenade/metalfoam + name = "Nanotrasen \"Stop-Space\"" + +/obj/item/grenade/chem_grenade/antiweed + name = "Nanotrasen \"Flora Armageddon\"" + +/obj/item/grenade/chem_grenade/cleaner + name = "Nanotrasen \"Shit-Be-Gone\"" + +/obj/item/tool/omnitool + name = "Nanotrasen \"Munchkin 5000\"" + +/obj/item/tool_upgrade/productivity/diamond_blade + name = "Nanotrasen \"Gleaming Edge\": Diamond blade" + +/obj/item/tool_upgrade/refinement/laserguide + name = "Nanotrasen \"Guiding Light\" laser guide" + +/obj/item/clothing/accessory/armband/cargo + name = "Free Trade Union armband" diff --git a/proxima/code/modules/TGS/factions/pcrc/jobs.dm b/proxima/code/modules/TGS/factions/pcrc/jobs.dm new file mode 100644 index 00000000000..e19e8dd2e63 --- /dev/null +++ b/proxima/code/modules/TGS/factions/pcrc/jobs.dm @@ -0,0 +1,110 @@ +/datum/job/ihc + title = "PCRC Commander" + description = "You are the commander of the local regiment of the Proxima Centauri Risk Control company, contracted to protect and serve aboard the IEV Hyperion. PCRC serves as both an internal security force, and as a guard for expeditions outwith the ship.
\ +
\ + Your goal is to keep everyone aboard the ship as safe as possible, and to eliminate any threats to safety.
\ + The Gunnery Sergeant is your second in command, and any of your duties can be delegated to him at your discretion" + + duties = " Coordinate operatives in the field, assigning them to threats and distress calls as needed.
\ + Allocate department funds for necessary supplies, equipment, armor, weapons, upgrades, etc. Spend your money as required to ensure your troops are at peak combat performance
\ + Plan assaults on entrenched threats, ensure each operative knows their roles and carries them out precisely.
\ + Oversee performance of the operatives under your command, and punish any that are insubordinate or incompetent
\ + Advise the captain on threats to ship security, and counsel him towards choices that will minimise exposure to threats." + + loyalties = " As commander, your first loyalty is to the safety of the troops under your command. They are elite professional soldiers, not cannon fodder. Do not allow them to be sent on suicide missions. Any killings of your men should be repaid in blood
\ +
\ + Your second loyalty is to the name and reputation of the Proxima Centauri Risk Control company. You are often the captain's primary tool in keeping order and you must pride yourself on ensuring commands are carried out, threats extinguished and safety preserved. You may need to carry out unsavory orders like executions, and must balance your professional pride versus your conscience.
\ +
\ + Your third loyalty is to the crew. As the strongest military force on the ship, any mutiny attempt is likely at your mercy, and if unjustified, it will fall to you to put it down. If the captain has gone mad and a mutiny is justified, your support will be the difference between a peaceful arrest and a bloody civil war in the halls. Without your guns, an insane captain will usually be forced to surrender." + +/obj/landmark/join/start/ihc + name = "PCRC Commander" + +/datum/job/gunserg + title = "PCRC Gunnery Sergeant" + supervisors = "the PCRC Commander" + description = "You are the Second-in-Command of the local Proxima Centauri Risk Control company regiment, and the defacto leader if the commander isn't around.
\ + Within PCRC you largely hold a desk job, your duties will rarely take you outside of the PCRC wing, and you are not expected to interact with civilians. You have enough to deal with as is, and are probably the hardest working member of PCRC.
\ +
\ + You have several core duties:
\ + 1. As second in command, any of the commander's duties may be delegated to you, if they decide to do so. This means that at any time, you may be expected to handle funding, paperwork, disciplinary matters, planning combat tactics, or even carrying out executions. If there's no commander, these duties fall naturally to you. If there is a commander on site though, you shouldn't make these kind of decisions without consulting them.
\ +
\ + 2. You serve as the PCRC quartermaster. And as such, it is your job to maintain the armoury, and stocks of other equipment. You should keep track of its contents, and who has what. Make sure weapons and equipment are returned at the end of a shift, and procure new armaments from the guild or from scavengers as necessary to keep supplies up and respond to new threat s.
\ +
\ + 3. You are the defacto warden, and if there are any prisoners being kept in the PCRC brig, it is your responsibility to ensure they are fed, treated appropriately with regard to their legal rights, and ensure they have access to medical care. If necessary you may need to suppress riots or escape attempts within the brig too.
\ +
\ + 4. In times of peace, prepare for war. To this end, you are also the onsite military instructor. If the ship is in a lull and there are no outstanding threats, you should take the initiative to order training drills. Allow junior operatives to train and learn with less conventional weapons and tactics, give lessons on aiming, trigger discipline, hand to hand combat. Conduct drills on threat response, squad tactics, and EVA manoeuvres.
\ " + + loyalties = "You're a military man through and through. As such, your first loyalty is to the Commander, and thusly to the chain of command" + +/obj/landmark/join/start/gunserg + name = "PCRC Gunnery Sergeant" + +/datum/job/inspector + title = "PCRC Inspector" + supervisors = "the PCRC Commander" + description = "You are the ship's detective, here to take care of the cases that aren't always what they seem, and suspects that aren't always caught red handed or ready to confess.
\ + The inspector's job is to interrogate suspects, gather witness statements, harvest evidence and reach a conclusion about the nature and culprit of a crime.
\ +
\ + You are a higher ranking Proxima Centauri Risk Control officer, and you can give commands to operatives. But this doesn't mean you should be commanding assaults. You're not any kind of tactical commander
\ +
\ + When there are no outstanding cases, your job is to go look for them. Mingle with civilians, interact and converse, sniff out leads about potential criminal activity. The PCRC budget can often include stipends to pay informers for any useful info" + + duties = " Interview suspects and witnesses after a crime. Record important details of their statements, and look for inconsistencies.
\ + Gather evidence and bring it back for processing
\ + Send out operatives to bring suspects in for questioning
\ + Interact with civilians and be on the lookout for criminal activity" + + loyalties = " As a detective, your loyalty is firstly, to the truth and justice. Seek to uncover the true events of any crime.
\ +
\ + Secondly, you are loyal to PCRC and to the commander. Follow the chain of command" + +/obj/landmark/join/start/inspector + name = "PCRC Inspector" + +/datum/job/medspec + title = "PCRC Medical Specialist" + supervisors = "the PCRC Commander" + description = "You are a highly trained specialist within Proxima Centauri Risk Control. You were probably a medical student or inexperienced doctor when you joined PCRC, and you thusly have a combination of medical and military training. You are not quite as knowledgeable as a civilian career doctor, not quite as much of a fighter as a dedicated PCRC operative, but strike a balance inbetween. Balance is the nature of your existence.
\ +
\ + Within PCRC, you have three roles to undertake. All of your roles can be delegated to others when needed - Moebius Medical for roles 1 and 2, the PCRC Inspector for role 3. But you are often the best positioned to carry out these tasks, especially when time is short
\ +
\ + 1. Field Medic.
\ + You may be expected to serve on the backlines in a combat situation, treating and stabilising the wounded, making the call as to whether they can return to combat or leave by medivac. You may need to perform emergency trauma surgery in undesireable conditions.
\ + You are allowed to be armed, but remember that saving lives, not taking them, is your first duty. Don't be afraid to send patients to moebius medical for proper specialist care.
\ +
\ + 2. Prison Doctor.
\ + During quiet times, when inmates are serving in the brig, you will often be required to treat prisoners, criminal suspects, and the condemned. Suicide attempts are common in prison, and you will often be treating a patient against their will, who is attempting to escape. When serving in this role, stay on guard, work closely with the gunnery sergeant, and keep control of the situation
\ +
\ + 3. Forensic Specialist.
\ + Solving crimes often requires scientific analysis, and expert rulings from a trusted source within PCRC. You will often be expected to analyze blood, chemicals and fingerprints, conduct autopsies, and submit your findings to help track down elusive culprits. In this task, you will work closely with the inspector, and if necessary, he often has the talents to perform these tasks. But his time is better spent questioning and interrogating people" + +/obj/landmark/join/start/medspec + name = "PCRC Medical Specialist" + +/datum/job/ihoper + title = "PCRC Operative" + description = "You are the boots on the ground, the rifle in the window, the long arm of the law. You are the hand of Proxima Centauri Risk Control, and the frontline against criminals, terrorists, and xenos.
\ +
\ + You are a professional soldier and a hardened mercenary, no stranger to violence. You are required to employ your talents in order to bring an end to threats and conflict situations. As a consummate professional, you're often expected to put your pride aside, and work with others. Tactics and teamwork are vital.
\ +
\ + You are paid to act, not to think. When in doubt, follow orders, and leave the hard choices to someone else. Trust in your chain of command. Remember that you are the lowest rank in PCRC, and you report to everyone else in your organisation. Inspector, medspec, gunnery sergeant and commander, are all your superior officers, their orders should be obeyed.
\ +
\ + When there are no standing orders, your ongoing task is to patrol the ship and be on the lookout for threats. Check in at departments, ask if there are any concerns, break up fights and do your best to prevent trouble before it spirals out of control. Wipe out roaches and other dangerous creatures wherever you encounter them.
\ +
\ + You have almost-total access to the ship in order to carry out your duties and reach threats quickly. Do not abuse this. It does not mean you can walk into anywhere you like, many areas are full of sensitive machinery and entering unnanounced can be harmful to your health. Do not steal from departments either. If it's not in the PCRC wing, it doesn't belong to you. Stealing from the Guild is a good way to get shot in the back" + + duties = " Patrol the ship, provide a security presence, and look for trouble
\ + Subdue and arrest criminals, terrorists, and other threats
\ + Exterminate monsters, giant vermin and hostile xenos
\ + Follow orders from the chain of command
\ + Obey the law. You are not above it" + + loyalties = " As a soldier, your first loyalty is to the chain of command, which ends with the PCRC Commander. Their orders are supreme over all, even if they're currently leading a mutiny against the captain.
\ +
\ + Your second loyalty is to your fellow PCRC brothers in arms. As long as the company takes care of you, you should follow orders. But if you start being sent on suicide missions and treated as expendable fodder, that should change.
\ +
\ + Your third loyalty is to humanity. You are still human under all that armour. If you're being ordered to slaughter civilians en masse, it may be time to start thinking for yourself." + +/obj/landmark/join/start/ihoper + name = "PCRC Operative" diff --git a/proxima/code/modules/TGS/factions/pcrc/pcrc.dm b/proxima/code/modules/TGS/factions/pcrc/pcrc.dm new file mode 100644 index 00000000000..1ec891ce2ab --- /dev/null +++ b/proxima/code/modules/TGS/factions/pcrc/pcrc.dm @@ -0,0 +1,3 @@ +/datum/design/autolathe/container/ammocan_ih + name = "PCRC Ammo Can" + build_path = /obj/item/storage/hcases/ammo/ih diff --git a/proxima/code/modules/TGS/factions/zeng-hu/medical.dm b/proxima/code/modules/TGS/factions/zeng-hu/medical.dm new file mode 100644 index 00000000000..5f8200fc8c5 --- /dev/null +++ b/proxima/code/modules/TGS/factions/zeng-hu/medical.dm @@ -0,0 +1,18 @@ +/datum/job/cmo + title = "Zeng-Hu Biolab Officer" + supervisors = "the Zeng-Hu Expedition Overseer" + +/datum/job/doctor + title = "Zeng-Hu Doctor" + +/datum/job/chemist + title = "Zeng-Hu Pharmacist" + +/datum/job/paramedic + title = "Zeng-Hu Lifeline Technician" + +/datum/job/bioengineer + title = "Zeng-Hu Bio-Engineer" + +/obj/item/clothing/accessory/armband/medgreen + name = "Zeng-Hu medical armband" diff --git a/proxima/code/modules/TGS/factions/zeng-hu/science.dm b/proxima/code/modules/TGS/factions/zeng-hu/science.dm new file mode 100644 index 00000000000..092fee4f6ca --- /dev/null +++ b/proxima/code/modules/TGS/factions/zeng-hu/science.dm @@ -0,0 +1,14 @@ +/datum/job/rd + title = "Zeng-Hu Expedition Overseer" + +/datum/job/scientist + title = "Zeng-Hu Scientist" + +/datum/job/roboticist + title = "Zeng-Hu Roboticist" + +/datum/job/psychiatrist + title = "Zeng-Hu Psychiatrist" + +/obj/item/clothing/accessory/armband/science + name = "Zeng-Hu research armband" From 1efc6410a60532d53ba1cf0bc58519638479a334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Thu, 22 Jun 2023 13:47:44 +0300 Subject: [PATCH 11/20] maging veymed have black eyes (#13) --- cev_eris.dme | 11 +++++------ proxima/icons/mob/human_races/vey-med.dmi | Bin 6828 -> 2991 bytes 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cev_eris.dme b/cev_eris.dme index 3a3ea9f5c3d..e9cc1e93402 100644 --- a/cev_eris.dme +++ b/cev_eris.dme @@ -2836,6 +2836,11 @@ #include "maps\submaps\planetary_ruins\radshrine\radshrine.dm" #include "maps\submaps\planetary_ruins\spider_nest\spider_nest.dm" #include "maps\submaps\planetary_ruins\tar_anomaly\tar_anomaly.dm" +#include "proxima\code\game\atoms.dm" +#include "proxima\code\game\objects\effects\misc.dm" +#include "proxima\code\game\objects\structures\window.dm" +#include "proxima\code\game\turf\flooring\flooring_decals.dm" +#include "proxima\code\game\turf\simulated\walls.dm" #include "proxima\code\modules\organs\external\subtypes\vey_med_limbs.dm" #include "proxima\code\modules\TGS\_TGSDefines.dm" #include "proxima\code\modules\TGS\TGDMAPI\tgs.dm" @@ -2861,10 +2866,4 @@ #include "proxima\code\modules\TGS\TGSIntegration\TGSChatHelpers.dm" #include "proxima\code\modules\TGS\TGSIntegration\TGSChatHooks.dm" #include "proxima\code\modules\TGS\TGSIntegration\TGSIntegrationFiles.dm" -#include "proxima\code\game\atoms.dm" -#include "proxima\code\game\turf\simulated\walls.dm" -#include "proxima\code\game\objects\structures\window.dm" -#include "proxima\code\game\turf\flooring\flooring_decals.dm" -#include "proxima\code\game\objects\effects\misc.dm" -// #include "proxima\code\game\objects\items\devices\paint_sprayer.dm" // END_INCLUDE diff --git a/proxima/icons/mob/human_races/vey-med.dmi b/proxima/icons/mob/human_races/vey-med.dmi index 892d0443c6e7fd14766541e07470c5555fbc8f8c..0ed8d080155962dcc5efe4d99c9090b3f81d1458 100644 GIT binary patch delta 2782 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 literal 6828 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 F{{xv(!k7R6 From 7c9ca5a5d96b3354b6af6527599c4b120de005b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Thu, 22 Jun 2023 14:46:17 +0300 Subject: [PATCH 12/20] =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D1=81=D1=82=D0=B0=D0=BB=D1=8C=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BB=D0=B6=D0=BD=D0=B0=20=D0=B1=D1=8B=D1=82=D1=8C=20=D0=B1?= =?UTF-8?q?=D0=BE=D0=BB=D0=B5=D0=B5=20=D1=87=D0=B5=D1=80=D0=BD=D0=BE=D0=B9?= =?UTF-8?q?=20(#14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/machinery/autolathe/nanoforge.dm | 3 ++- code/modules/materials/material_sheets.dm | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/autolathe/nanoforge.dm b/code/game/machinery/autolathe/nanoforge.dm index e24fc98d4a0..bb42b8a3475 100644 --- a/code/game/machinery/autolathe/nanoforge.dm +++ b/code/game/machinery/autolathe/nanoforge.dm @@ -30,7 +30,8 @@ MATERIAL_CARDBOARD = 0.1, MATERIAL_RGLASS = 0.4, MATERIAL_LEATHER = 0.1, - MATERIAL_TITANIUM = 0.6) + MATERIAL_TITANIUM = 0.6, + MATERIAL_PLASTAN= 0.9) mat_efficiency = 0.6 // 40% more efficient than normal autolathes storage_capacity = 240 diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index debefa1a9a2..efb0230cad9 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -447,6 +447,7 @@ name = "plastan" icon_state = "sheet-plasteel" item_state = "sheet-metal" + color = COLOR_DARK_GUNMETAL price_tag = 50 default_type = MATERIAL_PLASTAN From c83160924b812b86459d2590c96da3fea05a461d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Thu, 22 Jun 2023 14:53:18 +0300 Subject: [PATCH 13/20] =?UTF-8?q?=D0=90=D0=A5=D0=90=D0=A5=D0=90=D0=A5?= =?UTF-8?q?=D0=90,=20=D0=A0=D0=AB=D0=A6=D0=90=D0=A0=D0=98=20=D0=90=D0=92?= =?UTF-8?q?=D0=90=D0=9B=D0=9E=D0=9D=D0=90=20(#15)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cev_eris.dme | 1 + code/__DEFINES/jobs.dm | 2 +- code/__HELPERS/manifest.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 21 +++++++------------ .../modules/TGS/factions/include_factions.dm | 15 ------------- .../{TGS => }/factions/avalon/church.dm | 2 +- .../modules/{TGS => }/factions/ftu/ftu.dm | 0 .../factions/hephestus/engineering.dm | 0 .../code/modules/factions/include_factions.dm | 17 +++++++++++++++ proxima/code/modules/factions/job_tittles.dm | 17 +++++++++++++++ .../factions/lawson_arms/lawson_arms.dm | 0 .../{TGS => }/factions/mirania/mirania.dm | 0 .../{TGS => }/factions/nt/nanotrasens.dm | 0 .../modules/{TGS => }/factions/pcrc/jobs.dm | 0 .../modules/{TGS => }/factions/pcrc/pcrc.dm | 0 .../{TGS => }/factions/zeng-hu/medical.dm | 0 .../{TGS => }/factions/zeng-hu/science.dm | 0 17 files changed, 46 insertions(+), 31 deletions(-) delete mode 100644 proxima/code/modules/TGS/factions/include_factions.dm rename proxima/code/modules/{TGS => }/factions/avalon/church.dm (98%) rename proxima/code/modules/{TGS => }/factions/ftu/ftu.dm (100%) rename proxima/code/modules/{TGS => }/factions/hephestus/engineering.dm (100%) create mode 100644 proxima/code/modules/factions/include_factions.dm create mode 100644 proxima/code/modules/factions/job_tittles.dm rename proxima/code/modules/{TGS => }/factions/lawson_arms/lawson_arms.dm (100%) rename proxima/code/modules/{TGS => }/factions/mirania/mirania.dm (100%) rename proxima/code/modules/{TGS => }/factions/nt/nanotrasens.dm (100%) rename proxima/code/modules/{TGS => }/factions/pcrc/jobs.dm (100%) rename proxima/code/modules/{TGS => }/factions/pcrc/pcrc.dm (100%) rename proxima/code/modules/{TGS => }/factions/zeng-hu/medical.dm (100%) rename proxima/code/modules/{TGS => }/factions/zeng-hu/science.dm (100%) diff --git a/cev_eris.dme b/cev_eris.dme index e9cc1e93402..17adc5ffaaf 100644 --- a/cev_eris.dme +++ b/cev_eris.dme @@ -2842,6 +2842,7 @@ #include "proxima\code\game\turf\flooring\flooring_decals.dm" #include "proxima\code\game\turf\simulated\walls.dm" #include "proxima\code\modules\organs\external\subtypes\vey_med_limbs.dm" +#include "proxima\code\modules\factions\include_factions.dm" #include "proxima\code\modules\TGS\_TGSDefines.dm" #include "proxima\code\modules\TGS\TGDMAPI\tgs.dm" #include "proxima\code\modules\TGS\TGDMAPI\tgs\includes.dm" diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index ef83046a006..a6c73fe4e86 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -9,7 +9,7 @@ #define JOBS_MOEBIUS "Zeng-Hu Biolab Officer","Zeng-Hu Doctor","Zeng-Hu Psychiatrist","Zeng-Hu Chemist","Zeng-Hu Paramedic","Zeng-Hu Bio-Engineer","Zeng-Hu Expedition Overseer","Zeng-Hu Scientist","Zeng-Hu Roboticist" #define JOBS_CARGO "FTU Merchant","FTU Technician","Guild Miner", #define JOBS_CIVILIAN "Club Manager","Club Worker","Club Artist",ASSISTANT_TITLE -#define JOBS_CHURCH "Neo-Christianity Preacher","Neo-Christianity Acolyte","Neo-Christianity Agrolyte","Neo-Christianity Custodian" +#define JOBS_CHURCH "Neo-Christianity Preacher","Alanian Knight","Neo-Christianity Agrolyte","Neo-Christianity Custodian" #define JOBS_NONHUMAN "AI","Robot","pAI" #define CREDITS "¢" #define CREDS "¢" diff --git a/code/__HELPERS/manifest.dm b/code/__HELPERS/manifest.dm index 7d32f6947fb..34276c673d3 100644 --- a/code/__HELPERS/manifest.dm +++ b/code/__HELPERS/manifest.dm @@ -19,7 +19,7 @@ list("names" = list(), "header" = "Proxima Centauri Risk Control", "flag" = IRONHAMMER), list("names" = list(), "header" = "Zeng-Hu Medical", "flag" = MEDICAL), list("names" = list(), "header" = "Zeng-Hu Research", "flag" = SCIENCE), - list("names" = list(), "header" = "Church of Neo-Christianity", "flag" = CHURCH), + list("names" = list(), "header" = "Alanian Church of Neo-Christianity", "flag" = CHURCH), list("names" = list(), "header" = "Free Trade Union", "flag" = GUILD), list("names" = list(), "header" = "Civilian", "flag" = CIVILIAN), list("names" = list(), "header" = "Service", "flag" = SERVICE), diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index fbd2e142485..6a5ecaba5ff 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -238,20 +238,15 @@ //Trust me I'm an engineer //I think we'll put this shit right here var/list/rank_prefix = list(\ - "PCRC Operative" = "Operative",\ - "PCRC Inspector" = "Inspector",\ - "PCRC Medical Specialist" = "Specialist",\ - "PCRC Gunnery Sergeant" = "Sergeant",\ - "PCRC Commander" = "Commander",\ - "Neo-Christianity Preacher" = "Reverend",\ - "Zeng-Hu Expedition Overseer" = "Overseer",\ - "Zeng-Hu Biolab Officer" = "Overseer",\ + "Ironhammer Operative" = "Operative",\ + "Ironhammer Inspector" = "Inspector",\ + "Ironhammer Medical Specialist" = "Specialist",\ + "Ironhammer Gunnery Sergeant" = "Sergeant",\ + "Ironhammer Commander" = "Lieutenant",\ + "NeoTheology Preacher" = "Reverend",\ + "Moebius Expedition Overseer" = "Overseer",\ + "Moebius Biolab Officer" = "Doctor",\ "Captain" = "Captain",\ - "Fisrt Mate" = "Adjutant",\ - "Zeng-Hu Doctor" = "Doctor",\ - "Zeng-Hu Scientist" = "Researcher",\ - "FTU Merchant" = "Merchant",\ - "Hephaestus Foreman" = "Foreman" ) /mob/living/carbon/human/proc/rank_prefix_name(name) diff --git a/proxima/code/modules/TGS/factions/include_factions.dm b/proxima/code/modules/TGS/factions/include_factions.dm deleted file mode 100644 index 731e7efefd2..00000000000 --- a/proxima/code/modules/TGS/factions/include_factions.dm +++ /dev/null @@ -1,15 +0,0 @@ -#include "proxima\code\modules\TGS\factions\mirania\mirania.dm" - -#include "proxima\code\modules\TGS\factions\lawson_arms\lawson_arms.dm" -#include "proxima\code\modules\TGS\factions\pcrc\pcrc.dm" -#include "proxima\code\modules\TGS\factions\pcrc\jobs.dm" - -#include "proxima\code\modules\TGS\factions\zeng-hu\medical.dm" -#include "proxima\code\modules\TGS\factions\zeng-hu\science.dm" - -#include "proxima\code\modules\TGS\factions\ftu\ftu.dm" -#include "proxima\code\modules\TGS\factions\nt\nanotrasens.dm" - -#include "proxima\code\modules\TGS\factions\hephestus\engineering.dm" - -#include "proxima\code\modules\TGS\factions\avalon\church.dm" diff --git a/proxima/code/modules/TGS/factions/avalon/church.dm b/proxima/code/modules/factions/avalon/church.dm similarity index 98% rename from proxima/code/modules/TGS/factions/avalon/church.dm rename to proxima/code/modules/factions/avalon/church.dm index f794fc83f54..b8ecd89df4a 100644 --- a/proxima/code/modules/TGS/factions/avalon/church.dm +++ b/proxima/code/modules/factions/avalon/church.dm @@ -2,7 +2,7 @@ title = "Neo-Christianity Preacher" /datum/job/acolyte - title = "Neo-Christianity Acolyte" + title = "Alanian Knight" /datum/job/hydro title = "Neo-Christianity Agrolyte" diff --git a/proxima/code/modules/TGS/factions/ftu/ftu.dm b/proxima/code/modules/factions/ftu/ftu.dm similarity index 100% rename from proxima/code/modules/TGS/factions/ftu/ftu.dm rename to proxima/code/modules/factions/ftu/ftu.dm diff --git a/proxima/code/modules/TGS/factions/hephestus/engineering.dm b/proxima/code/modules/factions/hephestus/engineering.dm similarity index 100% rename from proxima/code/modules/TGS/factions/hephestus/engineering.dm rename to proxima/code/modules/factions/hephestus/engineering.dm diff --git a/proxima/code/modules/factions/include_factions.dm b/proxima/code/modules/factions/include_factions.dm new file mode 100644 index 00000000000..a5e69277dea --- /dev/null +++ b/proxima/code/modules/factions/include_factions.dm @@ -0,0 +1,17 @@ +#include "proxima\code\modules\factions\mirania\mirania.dm" + +#include "proxima\code\modules\factions\job_tittles.dm" + +#include "proxima\code\modules\factions\lawson_arms\lawson_arms.dm" +#include "proxima\code\modules\factions\pcrc\pcrc.dm" +#include "proxima\code\modules\factions\pcrc\jobs.dm" + +#include "proxima\code\modules\factions\zeng-hu\medical.dm" +#include "proxima\code\modules\factions\zeng-hu\science.dm" + +#include "proxima\code\modules\factions\ftu\ftu.dm" +#include "proxima\code\modules\factions\nt\nanotrasens.dm" + +#include "proxima\code\modules\factions\hephestus\engineering.dm" + +#include "proxima\code\modules\factions\avalon\church.dm" diff --git a/proxima/code/modules/factions/job_tittles.dm b/proxima/code/modules/factions/job_tittles.dm new file mode 100644 index 00000000000..8aa6f3359c9 --- /dev/null +++ b/proxima/code/modules/factions/job_tittles.dm @@ -0,0 +1,17 @@ +/list/rank_prefix = list(\ + "PCRC Operative" = "Operative",\ + "PCRC Inspector" = "Inspector",\ + "PCRC Medical Specialist" = "Specialist",\ + "PCRC Gunnery Sergeant" = "Sergeant",\ + "PCRC Commander" = "Commander",\ + "Neo-Christianity Preacher" = "Reverend",\ + "Alanian Knight" = "Sir",\ + "Zeng-Hu Expedition Overseer" = "Overseer",\ + "Zeng-Hu Biolab Officer" = "Overseer",\ + "Captain" = "Captain",\ + "Fisrt Mate" = "Adjutant",\ + "Zeng-Hu Doctor" = "Doctor",\ + "Zeng-Hu Scientist" = "Researcher",\ + "FTU Merchant" = "Merchant",\ + "Hephaestus Foreman" = "Foreman" + ) diff --git a/proxima/code/modules/TGS/factions/lawson_arms/lawson_arms.dm b/proxima/code/modules/factions/lawson_arms/lawson_arms.dm similarity index 100% rename from proxima/code/modules/TGS/factions/lawson_arms/lawson_arms.dm rename to proxima/code/modules/factions/lawson_arms/lawson_arms.dm diff --git a/proxima/code/modules/TGS/factions/mirania/mirania.dm b/proxima/code/modules/factions/mirania/mirania.dm similarity index 100% rename from proxima/code/modules/TGS/factions/mirania/mirania.dm rename to proxima/code/modules/factions/mirania/mirania.dm diff --git a/proxima/code/modules/TGS/factions/nt/nanotrasens.dm b/proxima/code/modules/factions/nt/nanotrasens.dm similarity index 100% rename from proxima/code/modules/TGS/factions/nt/nanotrasens.dm rename to proxima/code/modules/factions/nt/nanotrasens.dm diff --git a/proxima/code/modules/TGS/factions/pcrc/jobs.dm b/proxima/code/modules/factions/pcrc/jobs.dm similarity index 100% rename from proxima/code/modules/TGS/factions/pcrc/jobs.dm rename to proxima/code/modules/factions/pcrc/jobs.dm diff --git a/proxima/code/modules/TGS/factions/pcrc/pcrc.dm b/proxima/code/modules/factions/pcrc/pcrc.dm similarity index 100% rename from proxima/code/modules/TGS/factions/pcrc/pcrc.dm rename to proxima/code/modules/factions/pcrc/pcrc.dm diff --git a/proxima/code/modules/TGS/factions/zeng-hu/medical.dm b/proxima/code/modules/factions/zeng-hu/medical.dm similarity index 100% rename from proxima/code/modules/TGS/factions/zeng-hu/medical.dm rename to proxima/code/modules/factions/zeng-hu/medical.dm diff --git a/proxima/code/modules/TGS/factions/zeng-hu/science.dm b/proxima/code/modules/factions/zeng-hu/science.dm similarity index 100% rename from proxima/code/modules/TGS/factions/zeng-hu/science.dm rename to proxima/code/modules/factions/zeng-hu/science.dm From cd7ddcc2968e452b89e21abbed0e4c20c77ec766 Mon Sep 17 00:00:00 2001 From: Evie7056 Date: Thu, 22 Jun 2023 15:02:36 +0300 Subject: [PATCH 14/20] I fucking hate lists --- cev_eris.dme | 12 +++++++++- code/modules/mob/living/carbon/human/human.dm | 22 ++++++++++++------- .../code/modules/factions/include_factions.dm | 6 ----- proxima/code/modules/factions/job_tittles.dm | 17 -------------- 4 files changed, 25 insertions(+), 32 deletions(-) delete mode 100644 proxima/code/modules/factions/job_tittles.dm diff --git a/cev_eris.dme b/cev_eris.dme index 17adc5ffaaf..adaf1eadd27 100644 --- a/cev_eris.dme +++ b/cev_eris.dme @@ -2842,7 +2842,17 @@ #include "proxima\code\game\turf\flooring\flooring_decals.dm" #include "proxima\code\game\turf\simulated\walls.dm" #include "proxima\code\modules\organs\external\subtypes\vey_med_limbs.dm" -#include "proxima\code\modules\factions\include_factions.dm" +// #include "proxima\code\modules\factions\include_factions.dm" +#include "proxima\code\modules\factions\mirania\mirania.dm" +#include "proxima\code\modules\factions\lawson_arms\lawson_arms.dm" +#include "proxima\code\modules\factions\pcrc\pcrc.dm" +#include "proxima\code\modules\factions\pcrc\jobs.dm" +#include "proxima\code\modules\factions\zeng-hu\medical.dm" +#include "proxima\code\modules\factions\zeng-hu\science.dm" +#include "proxima\code\modules\factions\ftu\ftu.dm" +#include "proxima\code\modules\factions\nt\nanotrasens.dm" +#include "proxima\code\modules\factions\hephestus\engineering.dm" +#include "proxima\code\modules\factions\avalon\church.dm" #include "proxima\code\modules\TGS\_TGSDefines.dm" #include "proxima\code\modules\TGS\TGDMAPI\tgs.dm" #include "proxima\code\modules\TGS\TGDMAPI\tgs\includes.dm" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 6a5ecaba5ff..25f895d3926 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -238,15 +238,21 @@ //Trust me I'm an engineer //I think we'll put this shit right here var/list/rank_prefix = list(\ - "Ironhammer Operative" = "Operative",\ - "Ironhammer Inspector" = "Inspector",\ - "Ironhammer Medical Specialist" = "Specialist",\ - "Ironhammer Gunnery Sergeant" = "Sergeant",\ - "Ironhammer Commander" = "Lieutenant",\ - "NeoTheology Preacher" = "Reverend",\ - "Moebius Expedition Overseer" = "Overseer",\ - "Moebius Biolab Officer" = "Doctor",\ + "PCRC Operative" = "Operative",\ + "PCRC Inspector" = "Inspector",\ + "PCRC Medical Specialist" = "Specialist",\ + "PCRC Gunnery Sergeant" = "Sergeant",\ + "PCRC Commander" = "Commander",\ + "Neo-Christianity Preacher" = "Reverend",\ + "Alanian Knight" = "Sir",\ + "Zeng-Hu Expedition Overseer" = "Overseer",\ + "Zeng-Hu Biolab Officer" = "Overseer",\ "Captain" = "Captain",\ + "Fisrt Mate" = "Adjutant",\ + "Zeng-Hu Doctor" = "Doctor",\ + "Zeng-Hu Scientist" = "Researcher",\ + "FTU Merchant" = "Merchant",\ + "Hephaestus Foreman" = "Foreman" ) /mob/living/carbon/human/proc/rank_prefix_name(name) diff --git a/proxima/code/modules/factions/include_factions.dm b/proxima/code/modules/factions/include_factions.dm index a5e69277dea..362cf7a7cb0 100644 --- a/proxima/code/modules/factions/include_factions.dm +++ b/proxima/code/modules/factions/include_factions.dm @@ -1,17 +1,11 @@ #include "proxima\code\modules\factions\mirania\mirania.dm" - #include "proxima\code\modules\factions\job_tittles.dm" - #include "proxima\code\modules\factions\lawson_arms\lawson_arms.dm" #include "proxima\code\modules\factions\pcrc\pcrc.dm" #include "proxima\code\modules\factions\pcrc\jobs.dm" - #include "proxima\code\modules\factions\zeng-hu\medical.dm" #include "proxima\code\modules\factions\zeng-hu\science.dm" - #include "proxima\code\modules\factions\ftu\ftu.dm" #include "proxima\code\modules\factions\nt\nanotrasens.dm" - #include "proxima\code\modules\factions\hephestus\engineering.dm" - #include "proxima\code\modules\factions\avalon\church.dm" diff --git a/proxima/code/modules/factions/job_tittles.dm b/proxima/code/modules/factions/job_tittles.dm deleted file mode 100644 index 8aa6f3359c9..00000000000 --- a/proxima/code/modules/factions/job_tittles.dm +++ /dev/null @@ -1,17 +0,0 @@ -/list/rank_prefix = list(\ - "PCRC Operative" = "Operative",\ - "PCRC Inspector" = "Inspector",\ - "PCRC Medical Specialist" = "Specialist",\ - "PCRC Gunnery Sergeant" = "Sergeant",\ - "PCRC Commander" = "Commander",\ - "Neo-Christianity Preacher" = "Reverend",\ - "Alanian Knight" = "Sir",\ - "Zeng-Hu Expedition Overseer" = "Overseer",\ - "Zeng-Hu Biolab Officer" = "Overseer",\ - "Captain" = "Captain",\ - "Fisrt Mate" = "Adjutant",\ - "Zeng-Hu Doctor" = "Doctor",\ - "Zeng-Hu Scientist" = "Researcher",\ - "FTU Merchant" = "Merchant",\ - "Hephaestus Foreman" = "Foreman" - ) From a778a9ee68f7143f91928543a4019c93b69b944a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Thu, 22 Jun 2023 15:28:32 +0300 Subject: [PATCH 15/20] first mate (#16) --- proxima/code/modules/factions/command/command.dm | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 proxima/code/modules/factions/command/command.dm diff --git a/proxima/code/modules/factions/command/command.dm b/proxima/code/modules/factions/command/command.dm new file mode 100644 index 00000000000..6db64601263 --- /dev/null +++ b/proxima/code/modules/factions/command/command.dm @@ -0,0 +1,5 @@ +/datum/job/captain + title = "Captain" + +/datum/job/hop + title = "First Mate" From dc168e9bc1efe5fd513deeadb34857b461691fab Mon Sep 17 00:00:00 2001 From: Evie7056 Date: Thu, 22 Jun 2023 16:15:15 +0300 Subject: [PATCH 16/20] =?UTF-8?q?=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20?= =?UTF-8?q?=D0=B0=D0=B2=D0=B0=D0=BB=D0=BE=D0=BD=D1=81=D0=BA=D0=B8=D1=85=20?= =?UTF-8?q?=D1=81=D0=BC=D0=B5=D1=88=D0=BD=D1=8F=D0=B2=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/__DEFINES/jobs.dm | 2 +- proxima/code/modules/factions/avalon/church.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index a6c73fe4e86..b8611e40b69 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -9,7 +9,7 @@ #define JOBS_MOEBIUS "Zeng-Hu Biolab Officer","Zeng-Hu Doctor","Zeng-Hu Psychiatrist","Zeng-Hu Chemist","Zeng-Hu Paramedic","Zeng-Hu Bio-Engineer","Zeng-Hu Expedition Overseer","Zeng-Hu Scientist","Zeng-Hu Roboticist" #define JOBS_CARGO "FTU Merchant","FTU Technician","Guild Miner", #define JOBS_CIVILIAN "Club Manager","Club Worker","Club Artist",ASSISTANT_TITLE -#define JOBS_CHURCH "Neo-Christianity Preacher","Alanian Knight","Neo-Christianity Agrolyte","Neo-Christianity Custodian" +#define JOBS_CHURCH "Neo-Christianity Preacher","Alanian Knight","Alanian Herbalist","Alanian Custodian" #define JOBS_NONHUMAN "AI","Robot","pAI" #define CREDITS "¢" #define CREDS "¢" diff --git a/proxima/code/modules/factions/avalon/church.dm b/proxima/code/modules/factions/avalon/church.dm index b8ecd89df4a..5c161b37d76 100644 --- a/proxima/code/modules/factions/avalon/church.dm +++ b/proxima/code/modules/factions/avalon/church.dm @@ -5,10 +5,10 @@ title = "Alanian Knight" /datum/job/hydro - title = "Neo-Christianity Agrolyte" + title = "Alanian Herbalist" /datum/job/janitor - title = "Neo-Christianity Custodian" + title = "Alanian Sentiel" /datum/category_item/setup_option/background/origin/new_rome name = "Авалон" From 82bb01d67d08e392cc59d01fdaac988a5c5a3e55 Mon Sep 17 00:00:00 2001 From: Evie7056 Date: Thu, 22 Jun 2023 17:26:25 +0300 Subject: [PATCH 17/20] =?UTF-8?q?=D0=B8=D0=BD=D0=BA=D0=BB=D1=8E=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cev_eris.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/cev_eris.dme b/cev_eris.dme index adaf1eadd27..cc3197ae70c 100644 --- a/cev_eris.dme +++ b/cev_eris.dme @@ -2844,6 +2844,7 @@ #include "proxima\code\modules\organs\external\subtypes\vey_med_limbs.dm" // #include "proxima\code\modules\factions\include_factions.dm" #include "proxima\code\modules\factions\mirania\mirania.dm" +#include "proxima\code\modules\factions\command\command.dm" #include "proxima\code\modules\factions\lawson_arms\lawson_arms.dm" #include "proxima\code\modules\factions\pcrc\pcrc.dm" #include "proxima\code\modules\factions\pcrc\jobs.dm" From 55c89b4b57b897c43aa4a725a72b33f7016f245d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=91?= <71145590+Evie7056@users.noreply.github.com> Date: Sat, 1 Jul 2023 16:39:40 +0300 Subject: [PATCH 18/20] I have zero idea about what I'm doing (#18) --- cev_eris.dme | 15 +++++++-------- .../components/trinary_devices/filter.dm | 8 ++++++++ .../components/unary/vent_scrubber.dm | 8 +++++++- code/ATMOSPHERICS/pipes.dm | 15 +++++++++++++++ code/ZAS/Controller.dm | 1 + code/ZAS/Turf.dm | 1 + code/__DEFINES/atmos.dm | 1 + code/controllers/subsystems/air.dm | 2 ++ code/game/machinery/alarm.dm | 3 +++ code/game/machinery/atmo_control.dm | 6 ++++++ code/game/machinery/atmoalter/canister.dm | 13 +++++++++++-- code/game/objects/items/devices/PDA/PDA.dm | 2 ++ code/game/turfs/flooring/flooring_premade.dm | 6 ++++++ code/game/turfs/turf.dm | 1 + .../trade_stations_presets/1-common/zarya.dm | 2 ++ icons/atmos/tank.dmi | Bin 3113 -> 3639 bytes icons/obj/atmos.dmi | Bin 19775 -> 21124 bytes proxima/code/defines/gases.dm | 7 +++++++ 18 files changed, 80 insertions(+), 11 deletions(-) create mode 100644 proxima/code/defines/gases.dm diff --git a/cev_eris.dme b/cev_eris.dme index cc3197ae70c..ca95fe6cc98 100644 --- a/cev_eris.dme +++ b/cev_eris.dme @@ -2841,19 +2841,18 @@ #include "proxima\code\game\objects\structures\window.dm" #include "proxima\code\game\turf\flooring\flooring_decals.dm" #include "proxima\code\game\turf\simulated\walls.dm" -#include "proxima\code\modules\organs\external\subtypes\vey_med_limbs.dm" -// #include "proxima\code\modules\factions\include_factions.dm" -#include "proxima\code\modules\factions\mirania\mirania.dm" +#include "proxima\code\modules\factions\avalon\church.dm" #include "proxima\code\modules\factions\command\command.dm" +#include "proxima\code\modules\factions\ftu\ftu.dm" +#include "proxima\code\modules\factions\hephestus\engineering.dm" #include "proxima\code\modules\factions\lawson_arms\lawson_arms.dm" -#include "proxima\code\modules\factions\pcrc\pcrc.dm" +#include "proxima\code\modules\factions\mirania\mirania.dm" +#include "proxima\code\modules\factions\nt\nanotrasens.dm" #include "proxima\code\modules\factions\pcrc\jobs.dm" +#include "proxima\code\modules\factions\pcrc\pcrc.dm" #include "proxima\code\modules\factions\zeng-hu\medical.dm" #include "proxima\code\modules\factions\zeng-hu\science.dm" -#include "proxima\code\modules\factions\ftu\ftu.dm" -#include "proxima\code\modules\factions\nt\nanotrasens.dm" -#include "proxima\code\modules\factions\hephestus\engineering.dm" -#include "proxima\code\modules\factions\avalon\church.dm" +#include "proxima\code\modules\organs\external\subtypes\vey_med_limbs.dm" #include "proxima\code\modules\TGS\_TGSDefines.dm" #include "proxima\code\modules\TGS\TGDMAPI\tgs.dm" #include "proxima\code\modules\TGS\TGDMAPI\tgs\includes.dm" diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index d9b5f59e3ec..500eac3009f 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -22,6 +22,7 @@ 2: Nitrogen: Nitrogen ONLY 3: Carbon Dioxide: Carbon Dioxide ONLY 4: Sleeping Agent (N2O) + 5: Hydrogen */ var/filter_type = -1 var/list/filtered_out = list() @@ -49,6 +50,8 @@ filtered_out = list("carbon_dioxide") if(4)//removing N2O filtered_out = list("sleeping_agent") + if(5)//removing h2 + filtered_out = list("hydrogen") air1.volume = ATMOS_DEFAULT_VOLUME_FILTER air2.volume = ATMOS_DEFAULT_VOLUME_FILTER @@ -168,6 +171,8 @@ current_filter_type = "Carbon Dioxide" if(4) current_filter_type = "Nitrous Oxide" + if(5) + current_filter_type = "Hydrogen" if(-1) current_filter_type = "Nothing" else @@ -182,6 +187,7 @@ Nitrogen
Carbon Dioxide
Nitrous Oxide
+ Hydrogen
Nothing
Set Flow Rate Limit: @@ -213,6 +219,8 @@ filtered_out += "carbon_dioxide" if(4)//removing N2O filtered_out += "sleeping_agent" + if(5)//removing h2 + filtered_out += "hydrogen" if (href_list["temp"]) src.temp = null diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index 1babf0ffe77..b0febeb91b0 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -26,7 +26,7 @@ var/last_zas_update = null var/scrubbing = SCRUBBING - var/list/scrubbing_gas = list("carbon_dioxide","sleeping_agent","plasma") + var/list/scrubbing_gas = list("carbon_dioxide","sleeping_agent","plasma", "hydrogen") var/expanded_range = FALSE var/panic = FALSE //is this scrubber panicked? @@ -108,6 +108,7 @@ "filter_n2" = ("nitrogen" in scrubbing_gas), "filter_co2" = ("carbon_dioxide" in scrubbing_gas), "filter_plasma" = ("plasma" in scrubbing_gas), + "filter_h2" = ("hydrogen" in scrubbing_gas), "filter_n2o" = ("sleeping_agent" in scrubbing_gas), "sigtype" = "status" ) @@ -239,6 +240,11 @@ else if(signal.data["toggle_tox_scrub"]) toggle += "plasma" + if(!isnull(signal.data["h2_scrub"]) && text2num(signal.data["h2_scrub"]) != ("hydrogen" in scrubbing_gas)) + toggle += "hydrogen" + else if(signal.data["toggle_h2_scrub"]) + toggle += "hydrogen" + if(!isnull(signal.data["n2o_scrub"]) && text2num(signal.data["n2o_scrub"]) != ("sleeping_agent" in scrubbing_gas)) toggle += "sleeping_agent" else if(signal.data["toggle_n2o_scrub"]) diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index b8f44a4640a..60d541f72ef 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -1180,6 +1180,21 @@ ..() icon_state = "plasma" +/obj/machinery/atmospherics/pipe/tank/hydrogen + name = "Pressure Tank (Hydrogen)" + description_antag = "Will make people suddenly combust" + icon_state = "h2_map" + +/obj/machinery/atmospherics/pipe/tank/hydrogen/New() + air_temporary = new + air_temporary.volume = volume + air_temporary.temperature = T20C + + air_temporary.adjust_gas("hydrogen", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)) + + ..() + icon_state = "hydrogen" + /obj/machinery/atmospherics/pipe/tank/nitrous_oxide name = "Pressure Tank (Nitrous Oxide)" icon_state = "n2o_map" diff --git a/code/ZAS/Controller.dm b/code/ZAS/Controller.dm index c43dfb1327f..6af9db3fb4f 100644 --- a/code/ZAS/Controller.dm +++ b/code/ZAS/Controller.dm @@ -368,6 +368,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun if(A.plasma != B.plasma) return 0 if(A.carbon_dioxide != B.carbon_dioxide) return 0 if(A.temperature != B.temperature) return 0 + if(A.hydrogen != B.hydrogen) return 0 return 1 /datum/controller/air_system/proc/remove_edge(connection_edge/E) diff --git a/code/ZAS/Turf.dm b/code/ZAS/Turf.dm index b8accfa115f..660de0b047a 100644 --- a/code/ZAS/Turf.dm +++ b/code/ZAS/Turf.dm @@ -272,6 +272,7 @@ GM.gas["carbon_dioxide"] = (carbon_dioxide/sum)*amount GM.gas["nitrogen"] = (nitrogen/sum)*amount GM.gas["plasma"] = (plasma/sum)*amount + GM.gas["hydrogen"] = (hydrogen/sum)*amount GM.temperature = temperature GM.update_values() diff --git a/code/__DEFINES/atmos.dm b/code/__DEFINES/atmos.dm index ab4d32a5494..548b1f283b7 100644 --- a/code/__DEFINES/atmos.dm +++ b/code/__DEFINES/atmos.dm @@ -94,6 +94,7 @@ #define ATMOSTANK_OXYGEN 40000 // O2 is also important for airmix, but not as much as N2 as it's only 21% of it. #define ATMOSTANK_CO2 25000 // CO2 and PH are not critically important for station, only for toxins and alternative coolants, no need to store a lot of those. #define ATMOSTANK_PLASMA 25000 +#define ATMOSTANK_HYDROGEN 100000 #define ATMOSTANK_NITROUSOXIDE 10000 // N2O doesn't have a real useful use, i guess it's on station just to allow refilling of sec's riot control canisters? #define R_IDEAL_GAS_EQUATION 8.31 // kPa*L/(K*mol). diff --git a/code/controllers/subsystems/air.dm b/code/controllers/subsystems/air.dm index e9060c90b25..eef48c790c9 100644 --- a/code/controllers/subsystems/air.dm +++ b/code/controllers/subsystems/air.dm @@ -517,6 +517,8 @@ SUBSYSTEM_DEF(air) return FALSE if(A.carbon_dioxide != B.carbon_dioxide) return FALSE + if(A.hydrogen != B.hydrogen) + return FALSE if(A.temperature != B.temperature) return FALSE diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index ac5f060a696..887502ff887 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -561,6 +561,7 @@ ) scrubbers[scrubbers.len]["filters"] += list(list("name" = "Oxygen", "command" = "o2_scrub", "val" = info["filter_o2"])) scrubbers[scrubbers.len]["filters"] += list(list("name" = "Nitrogen", "command" = "n2_scrub", "val" = info["filter_n2"])) + scrubbers[scrubbers.len]["filters"] += list(list("name" = "Hydrogen", "command" = "h2_scrub", "val" = info["filter_h2"])) scrubbers[scrubbers.len]["filters"] += list(list("name" = "Carbon Dioxide", "command" = "co2_scrub","val" = info["filter_co2"])) scrubbers[scrubbers.len]["filters"] += list(list("name" = "Toxin" , "command" = "tox_scrub","val" = info["filter_plasma"])) scrubbers[scrubbers.len]["filters"] += list(list("name" = "Nitrous Oxide", "command" = "n2o_scrub","val" = info["filter_n2o"])) @@ -583,6 +584,7 @@ "oxygen" = "O2", "carbon dioxide" = "CO2", "plasma" = "Toxin", + "hydrogen" = "H2", "other" = "Other") for (var/g in gas_names) thresholds[++thresholds.len] = list("name" = gas_names[g], "settings" = list()) @@ -690,6 +692,7 @@ "n2_scrub", "co2_scrub", "tox_scrub", + "h2_scrub", "n2o_scrub", "panic_siphon", "scrubbing") diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index c9ad7fb1862..46fd580cf19 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -19,6 +19,7 @@ // 8 for plasma concentration // 16 for nitrogen concentration // 32 for carbon dioxide concentration + // 64 for hydrogen var/datum/radio_frequency/radio_connection @@ -50,11 +51,14 @@ signal.data["nitrogen"] = round(100*air_sample.gas["nitrogen"]/total_moles,0.1) if(output&32) signal.data["carbon_dioxide"] = round(100*air_sample.gas["carbon_dioxide"]/total_moles,0.1) + if(output&64) + signal.data["hydrogen"] = round(100*air_sample.gas["hydrogen"]/total_moles,0.1) else signal.data["oxygen"] = 0 signal.data["plasma"] = 0 signal.data["nitrogen"] = 0 signal.data["carbon_dioxide"] = 0 + signal.data["hydrogen"] = 0 signal.data["sigtype"]="status" radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA) @@ -132,6 +136,8 @@ obj/machinery/computer/general_air_control/Destroy() sensor_part += "[data["carbon_dioxide"]]% CO2; " if(data["plasma"]) sensor_part += "[data["plasma"]]% TX; " + if(data["hydrogen"]) + sensor_part += "[data["hydrogen"]]% H2; " sensor_part += "
" else diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 7d4e7d4db2a..b2866fe3583 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -69,6 +69,13 @@ canister_color = "grey" can_label = 0 +/obj/machinery/portable_atmospherics/canister/hydrogen + name = "Canister: \[N2]" + icon_state = "purple" + description_antag = "Causes people to suddenly combust. Very flamable" + canister_color = "purple" + can_label = 0 + /obj/machinery/portable_atmospherics/canister/air/airlock start_pressure = 3 * ONE_ATMOSPHERE @@ -97,8 +104,10 @@ icon_state = "redws" canister_color = "redws" - - +/obj/machinery/portable_atmospherics/canister/empty/hydrogen + name = "Canister: \[N2]" + icon_state = "purple" + canister_color = "purple" /obj/machinery/portable_atmospherics/canister/proc/check_change() var/old_flag = update_flag diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index f349d241754..e9eaca5d13e 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -442,6 +442,7 @@ var/global/list/obj/item/device/pda/PDAs = list() var/o2_level = environment.gas["oxygen"]/total_moles var/n2_level = environment.gas["nitrogen"]/total_moles var/co2_level = environment.gas["carbon_dioxide"]/total_moles + var/h2_level = environment.gas["hydrogen"]/total_moles var/plasma_level = environment.gas["plasma"]/total_moles var/unknown_level = 1-(o2_level+n2_level+co2_level+plasma_level) data["aircontents"] = list(\ @@ -450,6 +451,7 @@ var/global/list/obj/item/device/pda/PDAs = list() "oxygen" = "[round(o2_level*100,0.1)]",\ "carbon_dioxide" = "[round(co2_level*100,0.1)]",\ "plasma" = "[round(plasma_level*100,0.01)]",\ + "hydrogen" = "[round(h2_level*100,0.01)]",\ "other" = "[round(unknown_level, 0.01)]",\ "temp" = "[round(environment.temperature-T0C,0.1)]",\ "reading" = 1\ diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index af600719d25..922fb34eab1 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -384,6 +384,12 @@ nitrogen = 0 plasma = ATMOSTANK_PLASMA +/turf/simulated/floor/reinforced/hydrogen + oxygen = 0 + nitrogen = 0 + hydrogen = ATMOSTANK_HYDROGEN + + /turf/simulated/floor/reinforced/carbon_dioxide oxygen = 0 nitrogen = 0 diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 917eb945150..1f842d6b610 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -10,6 +10,7 @@ var/carbon_dioxide = 0 var/nitrogen = 0 var/plasma = 0 + var/hydrogen = 0 var/list/initial_gas diff --git a/code/modules/trade/datums/trade_stations_presets/1-common/zarya.dm b/code/modules/trade/datums/trade_stations_presets/1-common/zarya.dm index 3fcf1470a09..b48b2da038c 100644 --- a/code/modules/trade/datums/trade_stations_presets/1-common/zarya.dm +++ b/code/modules/trade/datums/trade_stations_presets/1-common/zarya.dm @@ -27,6 +27,8 @@ /obj/item/tank/plasma, /obj/machinery/portable_atmospherics/canister/sleeping_agent = custom_good_price(800), /obj/machinery/portable_atmospherics/canister/nitrogen = custom_good_price(400), + /obj/machinery/portable_atmospherics/canister/hydrogen = custom_good_price(400), + /obj/machinery/portable_atmospherics/canister/plasma = custom_good_price(2000), /obj/machinery/portable_atmospherics/canister/oxygen = custom_good_price(400), /obj/machinery/portable_atmospherics/canister/air = custom_good_price(400), /obj/machinery/portable_atmospherics/canister/carbon_dioxide = custom_good_price(400) diff --git a/icons/atmos/tank.dmi b/icons/atmos/tank.dmi index 8c49277ff854670df9eb46cc683d829c548db260..94b651358375f99f62c950a044a58a49cda89698 100644 GIT binary patch delta 2963 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 diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi index 7c19cd30e28461f5d9770afc8b17a49326d0272b..9bb82fe6126ee862af43c6f2bb14d34c959a9999 100644 GIT binary patch literal 21124 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℞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

+|G6O-Z(xbO(Fu{lUKj0*a*c36kwj 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 d2y%=~aZ-7CcD=bRcI*FWc2 Date: Sat, 1 Jul 2023 17:46:07 +0300 Subject: [PATCH 19/20] please end my pain --- proxima/code/modules/power/fusion/_setup.dm | 80 +++ .../power/fusion/consoles/_consoles.dm | 49 ++ .../power/fusion/consoles/core_control.dm | 63 ++ .../power/fusion/consoles/gyrotron_control.dm | 63 ++ .../power/fusion/consoles/injector_control.dm | 74 +++ .../code/modules/power/fusion/core/_core.dm | 130 +++++ .../modules/power/fusion/core/core_field.dm | 541 ++++++++++++++++++ .../fusion/fuel_assembly/fuel_assembly.dm | 77 +++ .../fusion/fuel_assembly/fuel_compressor.dm | 56 ++ .../fusion/fuel_assembly/fuel_injector.dm | 150 +++++ proxima/code/modules/power/fusion/fusion.dm | 15 + .../modules/power/fusion/fusion_circuits.dm | 123 ++++ .../power/fusion/fusion_particle_catcher.dm | 40 ++ .../modules/power/fusion/fusion_reactions.dm | 168 ++++++ .../modules/power/fusion/gyrotron/gyrotron.dm | 64 +++ .../modules/power/fusion/kinetic_harvester.dm | 131 +++++ 16 files changed, 1824 insertions(+) create mode 100644 proxima/code/modules/power/fusion/_setup.dm create mode 100644 proxima/code/modules/power/fusion/consoles/_consoles.dm create mode 100644 proxima/code/modules/power/fusion/consoles/core_control.dm create mode 100644 proxima/code/modules/power/fusion/consoles/gyrotron_control.dm create mode 100644 proxima/code/modules/power/fusion/consoles/injector_control.dm create mode 100644 proxima/code/modules/power/fusion/core/_core.dm create mode 100644 proxima/code/modules/power/fusion/core/core_field.dm create mode 100644 proxima/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm create mode 100644 proxima/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm create mode 100644 proxima/code/modules/power/fusion/fuel_assembly/fuel_injector.dm create mode 100644 proxima/code/modules/power/fusion/fusion.dm create mode 100644 proxima/code/modules/power/fusion/fusion_circuits.dm create mode 100644 proxima/code/modules/power/fusion/fusion_particle_catcher.dm create mode 100644 proxima/code/modules/power/fusion/fusion_reactions.dm create mode 100644 proxima/code/modules/power/fusion/gyrotron/gyrotron.dm create mode 100644 proxima/code/modules/power/fusion/kinetic_harvester.dm diff --git a/proxima/code/modules/power/fusion/_setup.dm b/proxima/code/modules/power/fusion/_setup.dm new file mode 100644 index 00000000000..5e98798ba8f --- /dev/null +++ b/proxima/code/modules/power/fusion/_setup.dm @@ -0,0 +1,80 @@ +#define SETUP_OK 1 // All good +#define SETUP_WARNING 2 // Something that shouldn't happen happened, but it's not critical so we will continue +#define SETUP_ERROR 3 // Something bad happened, and it's important so we won't continue setup. +#define SETUP_DELAYED 4 // Wait for other things first. + +/datum/admins/proc/setup_fusion() + set category = "Debug" + set name = "Setup Fusion Core" + set desc = "Allows you to start the R-UST engine." + + if (!istype(src,/datum/admins)) + src = usr.client.holder + if (!istype(src,/datum/admins)) + to_chat(usr, "Error: you are not an admin!") + return + + if(!(locate(/obj/machinery/power/fusion_core/mapped) in world)) + to_chat(usr, "This map is not appropriate for this verb.") + return + + var/response = input(usr, "Are you sure?", "Engine setup") as null|anything in list("No", "Yes") + if(!response || response == "No") + return + + var/errors = 0 + var/warnings = 0 + var/success = 0 + + log_and_message_admins("## FUSION CORE SETUP - Setup initiated by [usr].") + + for(var/obj/machinery/fusion_fuel_injector/mapped/injector in SSmachines.machinery) + injector.cur_assembly = new /obj/item/fuel_assembly/deuterium(injector) + injector.BeginInjecting() + + var/obj/machinery/power/fusion_core/mapped/core = locate() in SSmachines.machinery + if(core.jumpstart(15000)) + var/list/delayed_objects = list() + + // SETUP PHASE + for(var/obj/effect/engine_setup/S in world) + var/result = S.activate(0) + switch(result) + if(SETUP_OK) + success++ + continue + if(SETUP_WARNING) + warnings++ + continue + if(SETUP_ERROR) + errors++ + log_and_message_admins("## FUSION CORE SETUP - Error encountered! Aborting.") + break + if(SETUP_DELAYED) + delayed_objects.Add(S) + continue + + if(!errors) + for(var/obj/effect/engine_setup/S in delayed_objects) + var/result = S.activate(1) + switch(result) + if(SETUP_OK) + success++ + continue + if(SETUP_WARNING) + warnings++ + continue + if(SETUP_ERROR) + errors++ + log_and_message_admins("## FUSION CORE SETUP - Error encountered! Aborting.") + break + else + log_and_message_admins("## FUSION CORE SETUP - Error encountered! Aborting.") + errors++ + + log_and_message_admins("## FUSION CORE SETUP - Setup completed with [errors] errors, [warnings] warnings and [success] successful steps.") + +#undef SETUP_OK +#undef SETUP_WARNING +#undef SETUP_ERROR +#undef SETUP_DELAYED \ No newline at end of file diff --git a/proxima/code/modules/power/fusion/consoles/_consoles.dm b/proxima/code/modules/power/fusion/consoles/_consoles.dm new file mode 100644 index 00000000000..2a6331c1c73 --- /dev/null +++ b/proxima/code/modules/power/fusion/consoles/_consoles.dm @@ -0,0 +1,49 @@ +/obj/machinery/computer/fusion + icon_keyboard = "power_key" + icon_screen = "rust_screen" + light_color = COLOR_ORANGE + idle_power_usage = 250 + active_power_usage = 500 + var/ui_template + var/initial_id_tag + +/obj/machinery/computer/fusion/Initialize() + set_extension(src, /datum/extension/local_network_member) + if(initial_id_tag) + var/datum/extension/local_network_member/fusion = get_extension(src, /datum/extension/local_network_member) + fusion.set_tag(null, initial_id_tag) + . = ..() + +/obj/machinery/computer/fusion/proc/get_local_network() + var/datum/extension/local_network_member/fusion = get_extension(src, /datum/extension/local_network_member) + return fusion.get_local_network() + +/obj/machinery/computer/fusion/attackby(var/obj/item/thing, var/mob/user) + if(isMultitool(thing)) + var/datum/extension/local_network_member/fusion = get_extension(src, /datum/extension/local_network_member) + fusion.get_new_tag(user) + return + else + return ..() + +/obj/machinery/computer/fusion/interface_interact(var/mob/user) + ui_interact(user) + return TRUE + +/obj/machinery/computer/fusion/proc/build_ui_data() + var/datum/extension/local_network_member/fusion = get_extension(src, /datum/extension/local_network_member) + var/datum/local_network/lan = fusion.get_local_network() + var/list/data = list() + data["id"] = lan ? lan.id_tag : "unset" + data["name"] = name + . = data + +/obj/machinery/computer/fusion/ui_interact(var/mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + if(ui_template) + var/list/data = build_ui_data() + ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) + if (!ui) + ui = new(user, src, ui_key, ui_template, name, 400, 600) + ui.set_initial_data(data) + ui.open() + ui.set_auto_update(1) \ No newline at end of file diff --git a/proxima/code/modules/power/fusion/consoles/core_control.dm b/proxima/code/modules/power/fusion/consoles/core_control.dm new file mode 100644 index 00000000000..e56a76dc782 --- /dev/null +++ b/proxima/code/modules/power/fusion/consoles/core_control.dm @@ -0,0 +1,63 @@ +/obj/machinery/computer/fusion/core_control + name = "\improper R-UST Mk. 8 core control" + ui_template = "fusion_core_control.tmpl" + +/obj/machinery/computer/fusion/core_control/OnTopic(var/mob/user, var/href_list, var/datum/topic_state/state) + + if(href_list["toggle_active"] || href_list["str"]) + var/obj/machinery/power/fusion_core/C = locate(href_list["machine"]) + if(!istype(C)) + return TOPIC_NOACTION + + var/datum/local_network/lan = get_local_network() + if(!lan || !lan.is_connected(C)) + return TOPIC_NOACTION + + if(!C.check_core_status()) + return TOPIC_NOACTION + + if(href_list["toggle_active"]) + if(!C.Startup()) //Startup() whilst the device is active will return null. + if(!C.owned_field.is_shutdown_safe()) + if(alert(user, "Shutting down this fusion core without proper safety procedures will cause serious damage, do you wish to continue?", "Shut Down?", "Yes", "No") == "No") + return TOPIC_NOACTION + C.Shutdown() + return TOPIC_REFRESH + + if(href_list["str"] && C) + var/val = text2num(href_list["str"]) + if(!val) //Value is 0, which is manual entering. + C.set_strength(input("Enter the new field power density (W.m^-3)", "Fusion Control", C.field_strength) as num) + else + C.set_strength(C.field_strength + val) + return TOPIC_REFRESH + +/obj/machinery/computer/fusion/core_control/build_ui_data() + . = ..() + var/datum/extension/local_network_member/fusion = get_extension(src, /datum/extension/local_network_member) + var/datum/local_network/lan = fusion.get_local_network() + var/list/cores = list() + if(lan) + var/list/fusion_cores = lan.get_devices(/obj/machinery/power/fusion_core) + for(var/i = 1 to LAZYLEN(fusion_cores)) + var/list/core = list() + var/obj/machinery/power/fusion_core/C = fusion_cores[i] + core["id"] = "#[i]" + core["ref"] = "\ref[C]" + core["field"] = !isnull(C.owned_field) + core["power"] = "[C.field_strength/10.0] tesla" + core["size"] = C.owned_field ? "[C.owned_field.size] meter\s" : "Field offline." + core["instability"] = C.owned_field ? "[C.owned_field.percent_unstable * 100]%" : "Field offline." + core["temperature"] = C.owned_field ? "[C.owned_field.plasma_temperature + 295]K" : "Field offline." + core["powerstatus"] = "[C.avail()]/[C.active_power_usage] W" + var/fuel_string = "" + if(C.owned_field && LAZYLEN(C.owned_field.reactants)) + for(var/reactant in C.owned_field.reactants) + fuel_string += "" + else + fuel_string += "" + fuel_string += "
[reactant][C.owned_field.reactants[reactant]]
Nothing.
" + core["fuel"] = fuel_string + + cores += list(core) + .["cores"] = cores diff --git a/proxima/code/modules/power/fusion/consoles/gyrotron_control.dm b/proxima/code/modules/power/fusion/consoles/gyrotron_control.dm new file mode 100644 index 00000000000..d27837b2b27 --- /dev/null +++ b/proxima/code/modules/power/fusion/consoles/gyrotron_control.dm @@ -0,0 +1,63 @@ +/obj/machinery/computer/fusion/gyrotron + name = "gyrotron control console" + icon_keyboard = "med_key" + icon_screen = "gyrotron_screen" + light_color = COLOR_BLUE + ui_template = "fusion_gyrotron_control.tmpl" + +/obj/machinery/computer/fusion/gyrotron/OnTopic(var/mob/user, var/href_list, var/datum/topic_state/state) + + if(href_list["modifypower"] || href_list["modifyrate"] || href_list["toggle"]) + + var/obj/machinery/power/emitter/gyrotron/G = locate(href_list["machine"]) + if(!istype(G)) + return TOPIC_NOACTION + + var/datum/local_network/lan = get_local_network() + var/list/gyrotrons = lan.get_devices(/obj/machinery/power/emitter/gyrotron) + if(!lan || !gyrotrons || !gyrotrons[G]) + return TOPIC_NOACTION + + if(href_list["modifypower"]) + var/new_val = input("Enter new emission power level (1 - 50)", "Modifying power level", G.mega_energy) as num + if(!istype(G)) + return TOPIC_NOACTION + if(!new_val) + to_chat(user, SPAN_WARNING("That's not a valid number.")) + return TOPIC_NOACTION + G.mega_energy = clamp(new_val, 1, 50) + G.change_power_consumption(G.mega_energy * 1500, POWER_USE_ACTIVE) + return TOPIC_REFRESH + + if(href_list["modifyrate"]) + var/new_val = input("Enter new emission delay between 2 and 10 seconds.", "Modifying emission rate", G.rate) as num + if(!istype(G)) + return TOPIC_NOACTION + if(!new_val) + to_chat(user, SPAN_WARNING("That's not a valid number.")) + return TOPIC_NOACTION + G.rate = clamp(new_val, 2, 10) + return TOPIC_REFRESH + + if(href_list["toggle"]) + G.activate(user) + return TOPIC_REFRESH + +/obj/machinery/computer/fusion/gyrotron/build_ui_data() + . = ..() + var/datum/extension/local_network_member/fusion = get_extension(src, /datum/extension/local_network_member) + var/datum/local_network/lan = fusion.get_local_network() + var/list/gyrotrons = list() + if(lan && gyrotrons) + var/list/lan_gyrotrons = lan.get_devices(/obj/machinery/power/emitter/gyrotron) + for(var/i = 1 to LAZYLEN(lan_gyrotrons)) + var/list/gyrotron = list() + var/obj/machinery/power/emitter/gyrotron/G = lan_gyrotrons[i] + gyrotron["id"] = "#[i]" + gyrotron["ref"] = "\ref[G]" + gyrotron["active"] = G.active + gyrotron["firedelay"] = G.rate + gyrotron["energy"] = G.mega_energy + gyrotrons += list(gyrotron) + .["gyrotrons"] = gyrotrons + diff --git a/proxima/code/modules/power/fusion/consoles/injector_control.dm b/proxima/code/modules/power/fusion/consoles/injector_control.dm new file mode 100644 index 00000000000..b8eb62e7f7e --- /dev/null +++ b/proxima/code/modules/power/fusion/consoles/injector_control.dm @@ -0,0 +1,74 @@ +/obj/machinery/computer/fusion/fuel_control + name = "fuel injection control computer" + icon_keyboard = "rd_key" + icon_screen = "fuel_screen" + ui_template = "fusion_injector_control.tmpl" + +/obj/machinery/computer/fusion/fuel_control/OnTopic(var/mob/user, var/href_list, var/datum/topic_state/state) + var/datum/local_network/lan = get_local_network() + var/list/fuel_injectors = lan.get_devices(/obj/machinery/fusion_fuel_injector) + + if(href_list["global_toggle"]) + if(!lan || !fuel_injectors) + return TOPIC_NOACTION + + for(var/obj/machinery/fusion_fuel_injector/F in fuel_injectors) + if(F.injecting) + F.StopInjecting() + else + F.BeginInjecting() + return TOPIC_REFRESH + + if(href_list["global_rate"]) + if(!lan || !fuel_injectors) + return TOPIC_NOACTION + var/new_injection_rate = input("Enter a new injection rate between 1 and 100. This will affect all injectors!", "Modifying injection rate") as null|num + var/new_injection_clamped = clamp(new_injection_rate, 1, 100) / 100 + if(!new_injection_rate) + return TOPIC_NOACTION + if(!CanInteract(user,state)) + return TOPIC_NOACTION + for(var/obj/machinery/fusion_fuel_injector/F as anything in fuel_injectors) + F.injection_rate = new_injection_clamped + return TOPIC_REFRESH + + if(href_list["toggle_injecting"] || href_list["injection_rate"]) + var/obj/machinery/fusion_fuel_injector/I = locate((href_list["toggle_injecting"] || href_list["machine"])) + if(!istype(I) || !lan || !fuel_injectors || !fuel_injectors[I]) + return TOPIC_NOACTION + + if(href_list["toggle_injecting"]) + if(I.injecting) + I.StopInjecting() + else + I.BeginInjecting() + + if(href_list["injection_rate"]) + var/new_injection_rate = input("Enter a new injection rate between 1 and 100.", "Modifying injection rate", I.injection_rate) as null|num + if(!istype(I)) + return TOPIC_NOACTION + if(!new_injection_rate) + return TOPIC_NOACTION + if(!CanInteract(user,state)) + return TOPIC_NOACTION + I.injection_rate = clamp(new_injection_rate, 1, 100) / 100 + return TOPIC_REFRESH + +/obj/machinery/computer/fusion/fuel_control/build_ui_data() + . = ..() + var/datum/extension/local_network_member/fusion = get_extension(src, /datum/extension/local_network_member) + var/datum/local_network/lan = fusion.get_local_network() + var/list/injectors = list() + if(lan) + var/list/fuel_injectors = lan.get_devices(/obj/machinery/fusion_fuel_injector) + for(var/i = 1 to LAZYLEN(fuel_injectors)) + var/list/injector = list() + var/obj/machinery/fusion_fuel_injector/I = fuel_injectors[i] + injector["id"] = "#[i]" + injector["ref"] = "\ref[I]" + injector["injecting"] = I.injecting + injector["fueltype"] = "[I.cur_assembly ? I.cur_assembly.fuel_type : "No Fuel Inserted"]" + injector["depletion"] = "[I.cur_assembly ? (I.cur_assembly.percent_depleted * 100) : 100]%" + injector["injection_rate"] = "[I.injection_rate * 100]%" + injectors += list(injector) + .["injectors"] = injectors diff --git a/proxima/code/modules/power/fusion/core/_core.dm b/proxima/code/modules/power/fusion/core/_core.dm new file mode 100644 index 00000000000..1031b4d39e5 --- /dev/null +++ b/proxima/code/modules/power/fusion/core/_core.dm @@ -0,0 +1,130 @@ +#define MAX_FIELD_STR 10000 +#define MIN_FIELD_STR 1 + +/obj/machinery/power/fusion_core + name = "\improper R-UST Mk. 8 Tokamak core" + desc = "An enormous solenoid for generating extremely high power electromagnetic fields. It includes a kinetic energy harvester." + icon = 'icons/obj/machines/power/fusion_core.dmi' + icon_state = "core0" + layer = ABOVE_HUMAN_LAYER + density = TRUE + use_power = POWER_USE_IDLE + idle_power_usage = 50 + active_power_usage = 500 //multiplied by field strength + anchored = FALSE + construct_state = /decl/machine_construction/default/panel_closed + uncreated_component_parts = null + stat_immune = 0 + base_type = /obj/machinery/power/fusion_core + + var/obj/effect/fusion_em_field/owned_field + var/field_strength = 1//0.01 + var/initial_id_tag + +/obj/machinery/power/fusion_core/mapped + anchored = TRUE + +/obj/machinery/power/fusion_core/Initialize() + . = ..() + connect_to_network() + set_extension(src, /datum/extension/local_network_member) + if(initial_id_tag) + var/datum/extension/local_network_member/fusion = get_extension(src, /datum/extension/local_network_member) + fusion.set_tag(null, initial_id_tag) + +/obj/machinery/power/fusion_core/Process() + if((stat & BROKEN) || !powernet || !owned_field) + Shutdown() + +/obj/machinery/power/fusion_core/Topic(href, href_list) + if(..()) + return 1 + if(href_list["str"]) + var/dif = text2num(href_list["str"]) + field_strength = min(max(field_strength + dif, MIN_FIELD_STR), MAX_FIELD_STR) + change_power_consumption(500 * field_strength, POWER_USE_ACTIVE) + if(owned_field) + owned_field.ChangeFieldStrength(field_strength) + +/obj/machinery/power/fusion_core/proc/Startup() + if(owned_field) + return + owned_field = new(loc, src) + owned_field.ChangeFieldStrength(field_strength) + icon_state = "core1" + update_use_power(POWER_USE_ACTIVE) + . = 1 + +/obj/machinery/power/fusion_core/proc/Shutdown(var/force_rupture) + if(owned_field) + icon_state = "core0" + if(force_rupture || owned_field.plasma_temperature > 1000) + owned_field.Rupture() + else + owned_field.RadiateAll() + qdel(owned_field) + owned_field = null + update_use_power(POWER_USE_IDLE) + +/obj/machinery/power/fusion_core/proc/AddParticles(var/name, var/quantity = 1) + if(owned_field) + owned_field.AddParticles(name, quantity) + . = 1 + +/obj/machinery/power/fusion_core/bullet_act(var/obj/item/projectile/Proj) + if(owned_field) + . = owned_field.bullet_act(Proj) + +/obj/machinery/power/fusion_core/proc/set_strength(var/value) + value = clamp(value, MIN_FIELD_STR, MAX_FIELD_STR) + field_strength = value + change_power_consumption(5 * value, POWER_USE_ACTIVE) + if(owned_field) + owned_field.ChangeFieldStrength(value) + +/obj/machinery/power/fusion_core/physical_attack_hand(var/mob/user) + visible_message("\The [user] hugs \the [src] to make it feel better!") + if(owned_field) + Shutdown() + return TRUE + +/obj/machinery/power/fusion_core/attackby(var/obj/item/W, var/mob/user) + + if(owned_field) + to_chat(user,"Shut \the [src] off first!") + return + + if(isMultitool(W)) + var/datum/extension/local_network_member/fusion = get_extension(src, /datum/extension/local_network_member) + fusion.get_new_tag(user) + return + + else if(isWrench(W)) + anchored = !anchored + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) + if(anchored) + user.visible_message("[user.name] secures [src.name] to the floor.", \ + "You secure the [src.name] to the floor.", \ + "You hear a ratchet") + else + user.visible_message("[user.name] unsecures [src.name] from the floor.", \ + "You unsecure the [src.name] from the floor.", \ + "You hear a ratchet") + return + + return ..() + +/obj/machinery/power/fusion_core/proc/jumpstart(var/field_temperature) + field_strength = 501 // Generally a good size. + Startup() + if(!owned_field) + return FALSE + owned_field.plasma_temperature = field_temperature + return TRUE + +/obj/machinery/power/fusion_core/proc/check_core_status() + if(stat & BROKEN) + return FALSE + if(idle_power_usage > avail()) + return FALSE + . = TRUE diff --git a/proxima/code/modules/power/fusion/core/core_field.dm b/proxima/code/modules/power/fusion/core/core_field.dm new file mode 100644 index 00000000000..c0377a79d9d --- /dev/null +++ b/proxima/code/modules/power/fusion/core/core_field.dm @@ -0,0 +1,541 @@ +#define FUSION_ENERGY_PER_K 20 +#define FUSION_INSTABILITY_DIVISOR 50000 +#define FUSION_RUPTURE_THRESHOLD 10000 +#define FUSION_REACTANT_CAP 10000 + +/obj/effect/fusion_em_field + name = "electromagnetic field" + desc = "A coruscating, barely visible field of energy. It is shaped like a slightly flattened torus." + alpha = 30 + layer = 4 + light_color = COLOR_RED + + plane = EFFECTS_ABOVE_LIGHTING_PLANE + + var/size = 1 + var/energy = 0 + var/plasma_temperature = 0 + var/radiation = 0 + var/field_strength = 0.01 + var/tick_instability = 0 + var/percent_unstable = 0 + + var/obj/machinery/power/fusion_core/owned_core + var/list/reactants = list() + var/list/particle_catchers = list() + + var/list/ignore_types = list( + /obj/item/projectile, + /obj/effect, + /obj/structure/cable, + /obj/machinery/atmospherics, + /obj/machinery/air_sensor + ) + + var/light_min_range = 2 + var/light_min_power = 0.2 + var/light_max_range = 18 + var/light_max_power = 1 + + var/last_range + var/last_power + + var/last_reactants = 0 + + particles = new/particles/fusion + + var/animating_ripple = FALSE + +/obj/effect/fusion_em_field/proc/UpdateVisuals() + //Take the particle system and edit it + + //size + var/radius = ((size-1) / 2) * WORLD_ICON_SIZE + + particles.position = generator("circle", radius - size, radius + size, NORMAL_RAND) + + //Radiation affects drift + var/radiationfactor = clamp((radiation * 0.001), 0, 0.5) + particles.drift = generator("circle", (0.2 + radiationfactor), NORMAL_RAND) + + particles.spawning = last_reactants * 0.9 + Interpolate(0, 200, clamp(plasma_temperature / 70000, 0, 1)) + + +/obj/effect/fusion_em_field/New(loc, var/obj/machinery/power/fusion_core/new_owned_core) + ..() + + filters = list(filter(type = "ripple", size = 4, "radius" = 1, "falloff" = 1) + , filter(type="outline", size = 2, color = COLOR_RED) + , filter(type="bloom", size=3, offset = 0.5, alpha = 235)) + + set_light(light_min_power, light_min_range / 10, light_min_range) + last_range = light_min_range + last_power = light_min_power + + owned_core = new_owned_core + if(!owned_core) + qdel(src) + return + + particles.spawning = 0 //Turn off particles until something calls for it + + //create the gimmicky things to handle field collisions + var/obj/effect/fusion_particle_catcher/catcher + + catcher = new (locate(src.x,src.y,src.z)) + catcher.parent = src + catcher.SetSize(1) + particle_catchers.Add(catcher) + + for(var/iter=1,iter<=6,iter++) + catcher = new (locate(src.x-iter,src.y,src.z)) + catcher.parent = src + catcher.SetSize((iter*2)+1) + particle_catchers.Add(catcher) + + catcher = new (locate(src.x+iter,src.y,src.z)) + catcher.parent = src + catcher.SetSize((iter*2)+1) + particle_catchers.Add(catcher) + + catcher = new (locate(src.x,src.y+iter,src.z)) + catcher.parent = src + catcher.SetSize((iter*2)+1) + particle_catchers.Add(catcher) + + catcher = new (locate(src.x,src.y-iter,src.z)) + catcher.parent = src + catcher.SetSize((iter*2)+1) + particle_catchers.Add(catcher) + + START_PROCESSING(SSobj, src) + +/obj/effect/fusion_em_field/Initialize() + . = ..() + addtimer(CALLBACK(src, .proc/update_light_colors), 10 SECONDS, TIMER_LOOP) + +/obj/effect/fusion_em_field/proc/update_light_colors() + var/use_range + var/use_power + switch (plasma_temperature) + if (-INFINITY to 1000) + light_color = COLOR_RED + use_range = light_min_range + use_power = light_min_power + alpha = 30 + if (100000 to INFINITY) + light_color = COLOR_VIOLET + use_range = light_max_range + use_power = light_max_power + alpha = 230 + else + var/temp_mod = ((plasma_temperature-5000)/20000) + use_range = light_min_range + Ceil((light_max_range-light_min_range)*temp_mod) + use_power = light_min_power + Ceil((light_max_power-light_min_power)*temp_mod) + switch (plasma_temperature) + if (1000 to 6000) + light_color = COLOR_ORANGE + alpha = 50 + if (6000 to 20000) + light_color = COLOR_YELLOW + alpha = 80 + if (20000 to 50000) + light_color = COLOR_GREEN + alpha = 120 + if (50000 to 70000) + light_color = COLOR_CYAN + alpha = 160 + if (70000 to 100000) + light_color = COLOR_BLUE + alpha = 200 + + if (last_range != use_range || last_power != use_power || color != light_color) + set_light(min(use_power, 1), use_range / 6, use_range) //cap first arg at 1 to avoid breaking lighting stuff. + last_range = use_range + last_power = use_power + //Temperature based color + particles.gradient = list(0, COLOR_WHITE, 0.85, light_color) + UNLINT(var/dm_filter/outline = filters[2]) + UNLINT(outline.color = light_color) + UNLINT(var/dm_filter/bloom = filters[3]) + UNLINT(bloom.alpha = alpha) + +/obj/effect/fusion_em_field/Process() + //make sure the field generator is still intact + if(QDELETED(owned_core)) + qdel(src) + return + + // Take some gas up from our environment. + var/added_particles = FALSE + var/datum/gas_mixture/uptake_gas = owned_core.loc.return_air() + if(uptake_gas) + uptake_gas = uptake_gas.remove_by_flag(XGM_GAS_FUSION_FUEL, rand(50,100)) + if(uptake_gas && uptake_gas.total_moles) + for(var/gasname in uptake_gas.gas) + if(uptake_gas.gas[gasname]*10 > reactants[gasname]) + AddParticles(gasname, uptake_gas.gas[gasname]*10) + uptake_gas.adjust_gas(gasname, -(uptake_gas.gas[gasname]), update=FALSE) + added_particles = TRUE + if(added_particles) + uptake_gas.update_values() + + //let the particles inside the field react + React() + + // Dump power to our powernet. + owned_core.add_avail(FUSION_ENERGY_PER_K * plasma_temperature) + + // Energy decay. + if(plasma_temperature >= 1) + var/lost = plasma_temperature*0.01 + radiation += lost + plasma_temperature -= lost + + //handle some reactants formatting + for(var/reactant in reactants) + var/amount = reactants[reactant] + if(amount < 1) + reactants.Remove(reactant) + else if(amount >= FUSION_REACTANT_CAP) + var/radiate = rand(3 * amount / 4, amount / 4) + reactants[reactant] -= radiate + radiation += radiate + + check_instability() + Radiate() + if(radiation) + SSradiation.radiate(src, round(radiation*0.001)) + return 1 + +/obj/effect/fusion_em_field/proc/check_instability() + if(tick_instability > 0) + percent_unstable += (tick_instability*size)/FUSION_INSTABILITY_DIVISOR + tick_instability = 0 + UpdateVisuals() + else + if(percent_unstable < 0) + percent_unstable = 0 + else + if(percent_unstable > 1) + percent_unstable = 1 + if(percent_unstable > 0) + percent_unstable = max(0, percent_unstable-rand(0.01,0.03)) + UpdateVisuals() + + if(percent_unstable >= 1) + owned_core.Shutdown(force_rupture=1) + else + if(percent_unstable > 0.5 && prob(percent_unstable*100)) + var/ripple_radius = (((size-1) / 2) * WORLD_ICON_SIZE) + WORLD_ICON_SIZE + var/wave_size = 4 + if(plasma_temperature < FUSION_RUPTURE_THRESHOLD) + visible_message("\The [src] ripples uneasily, like a disturbed pond.") + else + var/flare + var/fuel_loss + var/rupture + if(percent_unstable < 0.7) + visible_message("\The [src] ripples uneasily, like a disturbed pond.") + fuel_loss = prob(5) + else if(percent_unstable < 0.9) + visible_message("\The [src] undulates violently, shedding plumes of plasma!") + flare = prob(50) + fuel_loss = prob(20) + rupture = prob(5) + wave_size += 2 + else + visible_message("\The [src] is wracked by a series of horrendous distortions, buckling and twisting like a living thing!") + flare = 1 + fuel_loss = prob(50) + rupture = prob(25) + wave_size += 4 + + if(rupture) + owned_core.Shutdown(force_rupture=1) + else + var/lost_plasma = (plasma_temperature*percent_unstable) + radiation += lost_plasma + if(flare) + radiation += plasma_temperature/2 + wave_size += 6 + plasma_temperature -= lost_plasma + + if(fuel_loss) + for(var/particle in reactants) + var/lost_fuel = reactants[particle]*percent_unstable + radiation += lost_fuel + reactants[particle] -= lost_fuel + if(reactants[particle] <= 0) + reactants.Remove(particle) + Radiate() + Ripple(wave_size, ripple_radius) + return + +/obj/effect/fusion_em_field/proc/Ripple(_size, _radius) + if(!animating_ripple) + UNLINT(var/dm_filter/ripple = filters[1]) + UNLINT(ripple.size = _size) + animate(filters[1], time = 0, loop = 1, radius = 0, flags=ANIMATION_PARALLEL) + animate(time = 2 SECONDS, radius = _radius) + animating_ripple = TRUE + addtimer(CALLBACK(src, .proc/ResetRipple), 2 SECONDS, TIMER_CLIENT_TIME) + +/obj/effect/fusion_em_field/proc/ResetRipple() + animating_ripple = FALSE + +/obj/effect/fusion_em_field/proc/is_shutdown_safe() + return plasma_temperature < 1000 + +/obj/effect/fusion_em_field/proc/Rupture() + visible_message("\The [src] shudders like a dying animal before flaring to eye-searing brightness and rupturing!") + set_light(1, 0.1, 15, 2, "#ccccff") + empulse(get_turf(src), Ceil(plasma_temperature/1000), Ceil(plasma_temperature/300)) + sleep(5) + RadiateAll() + explosion(get_turf(owned_core),-1,-1,8,10) // Blow out all the windows. + return + +/obj/effect/fusion_em_field/proc/ChangeFieldStrength(var/new_strength) + var/calc_size = 1 + if(new_strength <= 50) + calc_size = 1 + else if(new_strength <= 200) + calc_size = 3 + else if(new_strength <= 500) + calc_size = 5 + else if(new_strength <= 1000) + calc_size = 7 + else if(new_strength <= 2000) + calc_size = 9 + else if(new_strength <= 5000) + calc_size = 11 + else + calc_size = 13 + field_strength = new_strength + change_size(calc_size) + +/obj/effect/fusion_em_field/proc/AddEnergy(var/a_energy, var/a_plasma_temperature) + energy += a_energy + plasma_temperature += a_plasma_temperature + if(a_energy && percent_unstable > 0) + percent_unstable -= a_energy/10000 + if(percent_unstable < 0) + percent_unstable = 0 + while(energy >= 100) + energy -= 100 + plasma_temperature += 1 + UpdateVisuals() + +/obj/effect/fusion_em_field/proc/AddParticles(var/name, var/quantity = 1) + if(name in reactants) + reactants[name] += quantity + else if(name != "proton" && name != "electron" && name != "neutron") + reactants.Add(name) + reactants[name] = quantity + UpdateVisuals() + +/obj/effect/fusion_em_field/proc/RadiateAll(var/ratio_lost = 1) + + // Create our plasma field and dump it into our environment. + var/turf/T = get_turf(src) + if(istype(T)) + var/datum/gas_mixture/plasma + for(var/reactant in reactants) + if(!gas_data.name[reactant]) + continue + if(!plasma) + plasma = new + plasma.adjust_gas(reactant, max(1,round(reactants[reactant]*0.1)), 0) // *0.1 to compensate for *10 when uptaking gas. + if(!plasma) + return + plasma.temperature = (plasma_temperature/2) + plasma.update_values() + T.assume_air(plasma) + T.hotspot_expose(plasma_temperature) + plasma = null + + // Radiate all our unspent fuel and energy. + for(var/particle in reactants) + radiation += reactants[particle] + reactants.Remove(particle) + radiation += plasma_temperature/2 + plasma_temperature = 0 + + SSradiation.radiate(src, round(radiation*0.001)) + Radiate() + +/obj/effect/fusion_em_field/proc/Radiate() + if(istype(loc, /turf)) + var/empsev = max(1, min(3, Ceil(size/2))) + for(var/atom/movable/AM in range(max(1,Floor(size/2)), loc)) + + if(AM == src || AM == owned_core || !AM.simulated) + continue + + var/skip_obstacle + for(var/ignore_path in ignore_types) + if(istype(AM, ignore_path)) + skip_obstacle = TRUE + break + if(skip_obstacle) + continue + + AM.visible_message("The field buckles visibly around \the [AM]!") + tick_instability += rand(30,50) + AM.emp_act(empsev) + + if(owned_core && owned_core.loc) + var/datum/gas_mixture/environment = owned_core.loc.return_air() + if(environment && environment.temperature < (T0C+1000)) // Putting an upper bound on it to stop it being used in a TEG. + environment.add_thermal_energy(plasma_temperature*20000) + radiation = 0 + +/obj/effect/fusion_em_field/proc/change_size(var/newsize = 1) + var/changed = 0 + if( ((newsize-1)%2==0) && (newsize<=13) ) + size = newsize + changed = newsize + UpdateVisuals() + + for(var/obj/effect/fusion_particle_catcher/catcher in particle_catchers) + catcher.UpdateSize() + return changed + +//the !!fun!! part +/obj/effect/fusion_em_field/proc/React() + //loop through the reactants in random order + var/list/react_pool = reactants.Copy() + last_reactants = 0 + + //cant have any reactions if there aren't any reactants present + if(react_pool.len) + //determine a random amount to actually react this cycle, and remove it from the standard pool + //this is a hack, and quite nonrealistic :( + for(var/reactant in react_pool) + react_pool[reactant] = rand(Floor(react_pool[reactant]/2),react_pool[reactant]) + reactants[reactant] -= react_pool[reactant] + if(!react_pool[reactant]) + react_pool -= reactant + + //loop through all the reacting reagents, picking out random reactions for them + var/list/produced_reactants = new/list + var/list/p_react_pool = react_pool.Copy() + while(p_react_pool.len) + //pick one of the unprocessed reacting reagents randomly + var/cur_p_react = pick(p_react_pool) + p_react_pool.Remove(cur_p_react) + + //grab all the possible reactants to have a reaction with + var/list/possible_s_reacts = react_pool.Copy() + //if there is only one of a particular reactant, then it can not react with itself so remove it + possible_s_reacts[cur_p_react] -= 1 + if(possible_s_reacts[cur_p_react] < 1) + possible_s_reacts.Remove(cur_p_react) + + //loop through and work out all the possible reactions + var/list/possible_reactions + for(var/cur_s_react in possible_s_reacts) + if(possible_s_reacts[cur_s_react] < 1) + continue + var/decl/fusion_reaction/cur_reaction = get_fusion_reaction(cur_p_react, cur_s_react) + if(cur_reaction && plasma_temperature >= cur_reaction.minimum_energy_level) + LAZYDISTINCTADD(possible_reactions, cur_reaction) + + //if there are no possible reactions here, abandon this primary reactant and move on + if(!LAZYLEN(possible_reactions)) + continue + + /// Sort based on reaction priority to avoid deut-deut eating all the deut before deut-trit can run etc. + sortTim(possible_reactions, /proc/cmp_fusion_reaction_des) + + //split up the reacting atoms between the possible reactions + while(possible_reactions.len) + var/decl/fusion_reaction/cur_reaction = possible_reactions[1] + possible_reactions.Remove(cur_reaction) + + //set the randmax to be the lower of the two involved reactants + var/max_num_reactants = react_pool[cur_reaction.p_react] > react_pool[cur_reaction.s_react] ? \ + react_pool[cur_reaction.s_react] : react_pool[cur_reaction.p_react] + if(max_num_reactants < 1) + continue + + //make sure we have enough energy + if(plasma_temperature < cur_reaction.minimum_reaction_temperature) + continue + + if(plasma_temperature < max_num_reactants * cur_reaction.energy_consumption) + max_num_reactants = round(plasma_temperature / cur_reaction.energy_consumption) + if(max_num_reactants < 1) + continue + + //randomly determined amount to react + var/amount_reacting = rand(1, max_num_reactants) + + //removing the reacting substances from the list of substances that are primed to react this cycle + //if there aren't enough of that substance (there should be) then modify the reactant amounts accordingly + if( react_pool[cur_reaction.p_react] - amount_reacting >= 0 ) + react_pool[cur_reaction.p_react] -= amount_reacting + else + amount_reacting = react_pool[cur_reaction.p_react] + react_pool[cur_reaction.p_react] = 0 + //same again for secondary reactant + if(react_pool[cur_reaction.s_react] - amount_reacting >= 0 ) + react_pool[cur_reaction.s_react] -= amount_reacting + else + react_pool[cur_reaction.p_react] += amount_reacting - react_pool[cur_reaction.p_react] + amount_reacting = react_pool[cur_reaction.s_react] + react_pool[cur_reaction.s_react] = 0 + + plasma_temperature -= max_num_reactants * cur_reaction.energy_consumption // Remove the consumed energy. + plasma_temperature += max_num_reactants * cur_reaction.energy_production // Add any produced energy. + radiation += max_num_reactants * cur_reaction.radiation // Add any produced radiation. + tick_instability += max_num_reactants * cur_reaction.instability + last_reactants += amount_reacting + + // Create the reaction products. + for(var/reactant in cur_reaction.products) + var/success = 0 + for(var/check_reactant in produced_reactants) + if(check_reactant == reactant) + produced_reactants[reactant] += cur_reaction.products[reactant] * amount_reacting + success = 1 + break + if(!success) + produced_reactants[reactant] = cur_reaction.products[reactant] * amount_reacting + + // Handle anything special. If this proc returns true, abort the current reaction. + if(cur_reaction.handle_reaction_special(src)) + return + + // This reaction is done, and can't be repeated this sub-cycle. + possible_reactions.Remove(cur_reaction.s_react) + + // Loop through the newly produced reactants and add them to the pool. + for(var/reactant in produced_reactants) + AddParticles(reactant, produced_reactants[reactant]) + + // Check whether there are reactants left, and add them back to the pool. + for(var/reactant in react_pool) + AddParticles(reactant, react_pool[reactant]) + + UpdateVisuals() + +/obj/effect/fusion_em_field/Destroy() + set_light(0) + RadiateAll() + QDEL_NULL_LIST(particle_catchers) + if(owned_core) + owned_core.owned_field = null + owned_core = null + STOP_PROCESSING(SSobj, src) + . = ..() + +/obj/effect/fusion_em_field/bullet_act(var/obj/item/projectile/Proj) + AddEnergy(Proj.damage) + update_icon() + return 0 + +#undef FUSION_INSTABILITY_DIVISOR +#undef FUSION_RUPTURE_THRESHOLD +#undef FUSION_REACTANT_CAP diff --git a/proxima/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm b/proxima/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm new file mode 100644 index 00000000000..4116b8699df --- /dev/null +++ b/proxima/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm @@ -0,0 +1,77 @@ +/obj/item/fuel_assembly + name = "fuel rod assembly" + icon = 'icons/obj/machines/power/fusion.dmi' + icon_state = "fuel_assembly" + layer = 4 + + var/material_name + var/percent_depleted = 1 + var/list/rod_quantities = list() + var/fuel_type = "composite" + var/fuel_colour + var/radioactivity = 0 + var/initial_amount + +/obj/item/fuel_assembly/New(var/newloc, var/_material, var/_colour) + fuel_type = _material + fuel_colour = _colour + ..(newloc) + +/obj/item/fuel_assembly/Initialize() + . = ..() + + if(ispath(fuel_type, /datum/reagent)) + var/datum/reagent/R = fuel_type + fuel_type = lowertext(initial(R.name)) + fuel_colour = initial(R.color) + initial_amount = 50000 + + var/material/material = SSmaterials.get_material_by_name(fuel_type) + if(istype(material)) + initial_amount = material.units_per_sheet * 5 // Fuel compressor eats 5 sheets. + SetName("[material.use_name] fuel rod assembly") + desc = "A fuel rod for a fusion reactor. This one is made from [material.use_name]." + fuel_colour = material.icon_colour + fuel_type = material.use_name + if(material.radioactivity) + radioactivity = material.radioactivity + desc += " It is warm to the touch." + START_PROCESSING(SSobj, src) + if(material.luminescence) + set_light(material.luminescence, material.luminescence, material.icon_colour) + else + SetName("[fuel_type] fuel rod assembly") + desc = "A fuel rod for a fusion reactor. This one is made from [fuel_type]." + + icon_state = "blank" + var/image/I = image(icon, "fuel_assembly") + I.color = fuel_colour + overlays += list(I, image(icon, "fuel_assembly_bracket")) + rod_quantities[fuel_type] = initial_amount + +/obj/item/fuel_assembly/Process() + if(!radioactivity) + return PROCESS_KILL + + if(istype(loc, /turf)) + SSradiation.radiate(src, max(1,Ceil(radioactivity/15))) + +/obj/item/fuel_assembly/Destroy() + STOP_PROCESSING(SSobj, src) + return ..() + +// Mapper shorthand. +/obj/item/fuel_assembly/deuterium/New(var/newloc) + ..(newloc, MATERIAL_DEUTERIUM) + +/obj/item/fuel_assembly/tritium/New(var/newloc) + ..(newloc, MATERIAL_TRITIUM) + +/obj/item/fuel_assembly/phoron/New(var/newloc) + ..(newloc, MATERIAL_PHORON) + +/obj/item/fuel_assembly/supermatter/New(var/newloc) + ..(newloc, MATERIAL_SUPERMATTER) + +/obj/item/fuel_assembly/hydrogen/New(var/newloc) + ..(newloc, MATERIAL_HYDROGEN) \ No newline at end of file diff --git a/proxima/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm b/proxima/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm new file mode 100644 index 00000000000..1831eaf1108 --- /dev/null +++ b/proxima/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm @@ -0,0 +1,56 @@ +// 5 sheets == ~12500 matter units == ~100u reagents +// Try to avoid letting people produce more material +// with the kinetic harvester than they put into the +// field in the first place. + +/obj/machinery/fusion_fuel_compressor + name = "fuel compressor" + icon = 'icons/obj/machines/power/fusion.dmi' + icon_state = "fuel_compressor1" + density = TRUE + anchored = TRUE + layer = 4 + construct_state = /decl/machine_construction/default/panel_closed + +/obj/machinery/fusion_fuel_compressor/MouseDrop_T(var/atom/movable/target, var/mob/user) + if(user.incapacitated() || !user.Adjacent(src)) + return + return do_fuel_compression(target, user) + +/obj/machinery/fusion_fuel_compressor/attackby(var/obj/item/thing, var/mob/user) + return do_fuel_compression(thing, user) || ..() + +/obj/machinery/fusion_fuel_compressor/proc/do_fuel_compression(var/obj/item/thing, var/mob/user) + if(istype(thing) && thing.reagents && thing.reagents.total_volume && thing.is_open_container()) + if(thing.reagents.reagent_list.len > 1) + to_chat(user, "The contents of \the [thing] are impure and cannot be used as fuel.") + return 1 + if(thing.reagents.total_volume < 100) + to_chat(user, "You need at least one hundred units of material to form a fuel rod.") + return 1 + var/datum/reagent/R = thing.reagents.reagent_list[1] + visible_message("\The [src] compresses the contents of \the [thing] into a new fuel assembly.") + var/obj/item/fuel_assembly/F = new(get_turf(src), R.type, R.color) + thing.reagents.remove_reagent(R.type, 100) + user.put_in_hands(F) + return 1 + else if(istype(thing, /obj/machinery/power/supermatter/shard)) + var/obj/item/fuel_assembly/F = new(get_turf(src), MATERIAL_SUPERMATTER) + visible_message("\The [src] compresses the \[thing] into a new fuel assembly.") + qdel(thing) + user.put_in_hands(F) + return 1 + else if(istype(thing, /obj/item/stack/material)) + var/obj/item/stack/material/M = thing + var/material/mat = M.get_material() + if(!mat.is_fusion_fuel) + to_chat(user, "It would be pointless to make a fuel rod out of [mat.use_name].") + return + if(!M.use(5)) + to_chat(user, "You need at least five [mat.sheet_plural_name] to make a fuel rod.") + return + var/obj/item/fuel_assembly/F = new(get_turf(src), mat.name) + visible_message("\The [src] compresses the [mat.use_name] into a new fuel assembly.") + user.put_in_hands(F) + return 1 + return 0 diff --git a/proxima/code/modules/power/fusion/fuel_assembly/fuel_injector.dm b/proxima/code/modules/power/fusion/fuel_assembly/fuel_injector.dm new file mode 100644 index 00000000000..5b7746aac3a --- /dev/null +++ b/proxima/code/modules/power/fusion/fuel_assembly/fuel_injector.dm @@ -0,0 +1,150 @@ +/obj/machinery/fusion_fuel_injector + name = "fuel injector" + icon = 'icons/obj/machines/power/fusion.dmi' + icon_state = "injector0" + density = TRUE + anchored = FALSE + req_access = list(access_engine) + idle_power_usage = 10 + active_power_usage = 500 + construct_state = /decl/machine_construction/default/panel_closed + uncreated_component_parts = null + stat_immune = 0 + base_type = /obj/machinery/fusion_fuel_injector + + var/fuel_usage = 0.001 + var/initial_id_tag + var/injecting = 0 + var/obj/item/fuel_assembly/cur_assembly + var/injection_rate = 1 + +/obj/machinery/fusion_fuel_injector/Initialize() + set_extension(src, /datum/extension/local_network_member) + if(initial_id_tag) + var/datum/extension/local_network_member/fusion = get_extension(src, /datum/extension/local_network_member) + fusion.set_tag(null, initial_id_tag) + . = ..() + +/obj/machinery/fusion_fuel_injector/Destroy() + if(cur_assembly) + cur_assembly.dropInto(loc) + cur_assembly = null + . = ..() + +/obj/machinery/fusion_fuel_injector/mapped + anchored = TRUE + +/obj/machinery/fusion_fuel_injector/Process() + if(injecting) + if(stat & (BROKEN|NOPOWER)) + StopInjecting() + else + Inject() + +/obj/machinery/fusion_fuel_injector/attackby(obj/item/W, mob/user) + + if(isMultitool(W)) + var/datum/extension/local_network_member/lanm = get_extension(src, /datum/extension/local_network_member) + lanm.set_tag(null, initial_id_tag) + return + + if(istype(W, /obj/item/fuel_assembly)) + + if(injecting) + to_chat(user, "Shut \the [src] off before playing with the fuel rod!") + return + if(!user.unEquip(W, src)) + return + if(cur_assembly) + visible_message("\The [user] swaps \the [src]'s [cur_assembly] for \a [W].") + else + visible_message("\The [user] inserts \a [W] into \the [src].") + if(cur_assembly) + cur_assembly.dropInto(loc) + user.put_in_hands(cur_assembly) + cur_assembly = W + return + + if(isWrench(W)) + if(injecting) + to_chat(user, "Shut \the [src] off first!") + return + anchored = !anchored + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) + if(anchored) + user.visible_message("\The [user] secures \the [src] to the floor.") + else + user.visible_message("\The [user] unsecures \the [src] from the floor.") + return + + return ..() + +/obj/machinery/fusion_fuel_injector/physical_attack_hand(mob/user) + if(injecting) + to_chat(user, "Shut \the [src] off before playing with the fuel rod!") + return TRUE + + if(cur_assembly) + cur_assembly.dropInto(loc) + user.put_in_hands(cur_assembly) + visible_message("\The [user] removes \the [cur_assembly] from \the [src].") + cur_assembly = null + return TRUE + else + to_chat(user, "There is no fuel rod in \the [src].") + return TRUE + +/obj/machinery/fusion_fuel_injector/proc/BeginInjecting() + if(!injecting && cur_assembly) + icon_state = "injector1" + injecting = 1 + update_use_power(POWER_USE_IDLE) + +/obj/machinery/fusion_fuel_injector/proc/StopInjecting() + if(injecting) + injecting = 0 + icon_state = "injector0" + update_use_power(POWER_USE_OFF) + +/obj/machinery/fusion_fuel_injector/proc/Inject() + if(!injecting) + return + if(cur_assembly) + var/amount_left = 0 + for(var/reagent in cur_assembly.rod_quantities) + if(cur_assembly.rod_quantities[reagent] > 0) + var/amount = cur_assembly.rod_quantities[reagent] * fuel_usage * injection_rate + if(amount < 1) + amount = 1 + var/obj/effect/accelerated_particle/A = new/obj/effect/accelerated_particle(get_turf(src), dir) + A.particle_type = reagent + A.additional_particles = amount + A.move(1) + if(cur_assembly) + cur_assembly.rod_quantities[reagent] -= amount + amount_left += cur_assembly.rod_quantities[reagent] + if(cur_assembly) + cur_assembly.percent_depleted = amount_left / cur_assembly.initial_amount + flick("injector-emitting",src) + else + StopInjecting() + +/obj/machinery/fusion_fuel_injector/verb/rotate_clock() + set category = "Object" + set name = "Rotate Generator (Clockwise)" + set src in view(1) + + if (usr.incapacitated() || usr.restrained() || anchored) + return + + src.dir = turn(src.dir, -90) + +/obj/machinery/fusion_fuel_injector/verb/rotate_anticlock() + set category = "Object" + set name = "Rotate Generator (Counter-clockwise)" + set src in view(1) + + if (usr.incapacitated() || usr.restrained() || anchored) + return + + src.dir = turn(src.dir, 90) \ No newline at end of file diff --git a/proxima/code/modules/power/fusion/fusion.dm b/proxima/code/modules/power/fusion/fusion.dm new file mode 100644 index 00000000000..e01d692a860 --- /dev/null +++ b/proxima/code/modules/power/fusion/fusion.dm @@ -0,0 +1,15 @@ +#include "proxima\code\modules\power\fusion\kinetic_harvester.dm" +#include "proxima\code\modules\power\fusion\fusion_reactions.dm" +#include "proxima\code\modules\power\fusion\fusion_particle_catcher.dm" +#include "proxima\code\modules\power\fusion\fusion_circuits.dm" +#include "proxima\code\modules\power\fusion\_setup.dm" +#include "proxima\code\modules\power\fusion\gyrotron\gyrotron.dm" +#include "proxima\code\modules\power\fusion\fuel_assembly\fuel_injector.dm +#include "proxima\code\modules\power\fusion\fuel_assembly\fuel_compressor.dm" +#include "proxima\code\modules\power\fusion\fuel_assembly\fuel_assembly.dm" +#include "proxima\code\modules\power\fusion\core\core_field.dm" +#include "proxima\code\modules\power\fusion\core\_core.dm" +#include "proxima\code\modules\power\fusion\consoles\injector_control.dm" +#include "proxima\code\modules\power\fusion\consoles\gyrotron_control.dm" +#include "proxima\code\modules\power\fusion\consoles\core_control.dm" +#include "proxima\code\modules\power\fusion\consoles\_consoles.dm" diff --git a/proxima/code/modules/power/fusion/fusion_circuits.dm b/proxima/code/modules/power/fusion/fusion_circuits.dm new file mode 100644 index 00000000000..a1757383b4c --- /dev/null +++ b/proxima/code/modules/power/fusion/fusion_circuits.dm @@ -0,0 +1,123 @@ +/obj/item/electronics/circuitboard/fusion/core_control + name = T_BOARD("fusion core controller") + build_path = /obj/machinery/computer/fusion/core_control + origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) + +/obj/item/electronics/circuitboard/kinetic_harvester + name = T_BOARD("kinetic harvester") + build_path = /obj/machinery/kinetic_harvester + board_type = "machine" + origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4, TECH_MATERIAL = 4) + req_components = list( + /obj/item/stock_parts/manipulator/pico = 2, + /obj/item/stock_parts/matter_bin/super = 1, + /obj/item/stock_parts/console_screen = 1, + /obj/item/stack/cable_coil = 5 + ) + +/obj/item/electronics/circuitboard/fusion_fuel_compressor + name = T_BOARD("fusion fuel compressor") + build_path = /obj/machinery/fusion_fuel_compressor + board_type = "machine" + origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 4, TECH_MATERIAL = 4) + req_components = list( + /obj/item/stock_parts/manipulator/pico = 2, + /obj/item/stock_parts/matter_bin/super = 2, + /obj/item/stock_parts/console_screen = 1, + /obj/item/stack/cable_coil = 5 + ) + +/obj/item/electronics/circuitboard/fusion_fuel_control + name = T_BOARD("fusion fuel controller") + build_path = /obj/machinery/computer/fusion/fuel_control + origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) + +/obj/item/electronics/circuitboard/gyrotron_control + name = T_BOARD("gyrotron controller") + build_path = /obj/machinery/computer/fusion/gyrotron + origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) + +/obj/item/electronics/circuitboard/fusion_core + name = T_BOARD("fusion core") + build_path = /obj/machinery/power/fusion_core + board_type = "machine" + origin_tech = list(TECH_BLUESPACE = 2, TECH_MAGNET = 4, TECH_POWER = 4) + req_components = list( + /obj/item/stock_parts/manipulator/pico = 2, + /obj/item/stock_parts/micro_laser/ultra = 1, + /obj/item/stock_parts/subspace/crystal = 1, + /obj/item/stock_parts/console_screen = 1, + /obj/item/stack/cable_coil = 5 + ) + +/obj/item/electronics/circuitboard/fusion_injector + name = T_BOARD("fusion fuel injector") + build_path = /obj/machinery/fusion_fuel_injector + board_type = "machine" + origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 4, TECH_MATERIAL = 4) + req_components = list( + /obj/item/stock_parts/manipulator/pico = 2, + /obj/item/stock_parts/scanning_module/phasic = 1, + /obj/item/stock_parts/matter_bin/super = 1, + /obj/item/stock_parts/console_screen = 1, + /obj/item/stack/cable_coil = 5 + ) + +/obj/item/electronics/circuitboard/gyrotron + name = T_BOARD("gyrotron") + build_path = /obj/machinery/power/emitter/gyrotron + board_type = "machine" + origin_tech = list(TECH_POWER = 4, TECH_ENGINEERING = 4) + req_components = list( + /obj/item/stack/cable_coil = 20, + /obj/item/stock_parts/micro_laser/ultra = 2 + ) + +/datum/design/research/circuit/fusion + name = "fusion core control console" + id = "fusion_core_control" + build_path = /obj/item/electronics/circuitboard/fusion/core_control + sort_string = "LAAAD" + category = CAT_POWER + +/datum/design/research/circuit/fusion/fuel_compressor + name = "fusion fuel compressor" + id = "fusion_fuel_compressor" + build_path = /obj/item/electronics/circuitboard/fusion_fuel_compressor + sort_string = "LAAAE" + +/datum/design/research/circuit/fusion/fuel_control + name = "fusion fuel control console" + id = "fusion_fuel_control" + build_path = /obj/item/electronics/circuitboard/fusion_fuel_control + sort_string = "LAAAF" + +/datum/design/research/circuit/fusion/gyrotron_control + name = "gyrotron control console" + id = "gyrotron_control" + build_path = /obj/item/electronics/circuitboard/gyrotron_control + sort_string = "LAAAG" + +/datum/design/research/circuit/fusion/core + name = "fusion core" + id = "fusion_core" + build_path = /obj/item/electronics/circuitboard/fusion_core + sort_string = "LAAAH" + +/datum/design/research/circuit/fusion/injector + name = "fusion fuel injector" + id = "fusion_injector" + build_path = /obj/item/electronics/circuitboard/fusion_injector + sort_string = "LAAAI" + +/datum/design/research/circuit/fusion/kinetic_harvester + name = "fusion toroid kinetic harvester" + id = "fusion_kinetic_harvester" + build_path = /obj/item/electronics/circuitboard/kinetic_harvester + sort_string = "LAAAJ" + +/datum/design/research/circuit/fusion/gyrotron + name = "gyrotron" + id = "gyrotron" + build_path = /obj/item/electronics/circuitboard/gyrotron + sort_string = "LAAAK" diff --git a/proxima/code/modules/power/fusion/fusion_particle_catcher.dm b/proxima/code/modules/power/fusion/fusion_particle_catcher.dm new file mode 100644 index 00000000000..de4f3e2a112 --- /dev/null +++ b/proxima/code/modules/power/fusion/fusion_particle_catcher.dm @@ -0,0 +1,40 @@ +/obj/effect/fusion_particle_catcher + icon = 'icons/effects/effects.dmi' + density = TRUE + anchored = TRUE + invisibility = 101 + light_color = COLOR_BLUE + var/obj/effect/fusion_em_field/parent + var/mysize = 0 + +/obj/effect/fusion_particle_catcher/Destroy() + . =..() + parent.particle_catchers -= src + parent = null + +/obj/effect/fusion_particle_catcher/proc/SetSize(var/newsize) + name = "collector [newsize]" + mysize = newsize + UpdateSize() + +/obj/effect/fusion_particle_catcher/proc/AddParticles(var/name, var/quantity = 1) + if(parent && parent.size >= mysize) + parent.AddParticles(name, quantity) + return 1 + return 0 + +/obj/effect/fusion_particle_catcher/proc/UpdateSize() + if(parent.size >= mysize) + set_density(1) + SetName("collector [mysize] ON") + else + set_density(0) + SetName("collector [mysize] OFF") + +/obj/effect/fusion_particle_catcher/bullet_act(var/obj/item/projectile/Proj) + parent.AddEnergy(Proj.damage) + update_icon() + return 0 + +/obj/effect/fusion_particle_catcher/CanPass(var/atom/movable/mover, var/turf/target, var/height=0, var/air_group=0) + return ismob(mover) diff --git a/proxima/code/modules/power/fusion/fusion_reactions.dm b/proxima/code/modules/power/fusion/fusion_reactions.dm new file mode 100644 index 00000000000..bb9b97d53a5 --- /dev/null +++ b/proxima/code/modules/power/fusion/fusion_reactions.dm @@ -0,0 +1,168 @@ +var/global/list/fusion_reactions + +/decl/fusion_reaction + var/p_react = "" // Primary reactant. + var/s_react = "" // Secondary reactant. + var/minimum_energy_level = 1 + var/energy_consumption = 0 + var/energy_production = 0 + var/radiation = 0 + var/instability = 0 + var/list/products = list() + var/minimum_reaction_temperature = 100 + var/priority = 100 + +/decl/fusion_reaction/proc/handle_reaction_special(var/obj/effect/fusion_em_field/holder) + return 0 + +/proc/get_fusion_reaction(var/p_react, var/s_react, var/m_energy) + if(!fusion_reactions) + fusion_reactions = list() + for(var/rtype in typesof(/decl/fusion_reaction) - /decl/fusion_reaction) + var/decl/fusion_reaction/cur_reaction = new rtype() + if(!fusion_reactions[cur_reaction.p_react]) + fusion_reactions[cur_reaction.p_react] = list() + fusion_reactions[cur_reaction.p_react][cur_reaction.s_react] = cur_reaction + if(!fusion_reactions[cur_reaction.s_react]) + fusion_reactions[cur_reaction.s_react] = list() + fusion_reactions[cur_reaction.s_react][cur_reaction.p_react] = cur_reaction + + if(fusion_reactions.Find(p_react)) + var/list/secondary_reactions = fusion_reactions[p_react] + if(secondary_reactions.Find(s_react)) + return fusion_reactions[p_react][s_react] + +// Material fuels +// deuterium +// tritium +// phoron +// supermatter + +// Gaseous/reagent fuels +// hydrogen +// helium +// lithium +// boron + +// Basic power production reactions. +// This is not necessarily realistic, but it makes a basic failure more spectacular. +/decl/fusion_reaction/hydrogen_hydrogen + p_react = GAS_HYDROGEN + s_react = GAS_HYDROGEN + energy_consumption = 1 + energy_production = 2 + products = list(GAS_HELIUM = 1) + priority = 10 + +/decl/fusion_reaction/deuterium_deuterium + p_react = GAS_DEUTERIUM + s_react = GAS_DEUTERIUM + energy_consumption = 1 + energy_production = 2 + priority = 0 + +// Advanced production reactions (todo) +/decl/fusion_reaction/deuterium_helium + p_react = GAS_DEUTERIUM + s_react = GAS_HELIUM + energy_consumption = 1 + energy_production = 5 + radiation = 2 + +/decl/fusion_reaction/deuterium_tritium + p_react = GAS_DEUTERIUM + s_react = GAS_TRITIUM + energy_consumption = 1 + energy_production = 1 + products = list(GAS_HELIUM = 1) + instability = 0.5 + radiation = 3 + +/decl/fusion_reaction/deuterium_lithium + p_react = GAS_DEUTERIUM + s_react = "lithium" + energy_consumption = 2 + energy_production = 0 + radiation = 3 + products = list(GAS_TRITIUM= 1) + instability = 1 + +// Unideal/material production reactions +/decl/fusion_reaction/oxygen_oxygen + p_react = GAS_OXYGEN + s_react = GAS_OXYGEN + energy_consumption = 10 + energy_production = 0 + instability = 5 + radiation = 5 + products = list("silicon"= 1) + +/decl/fusion_reaction/iron_iron + p_react = "iron" + s_react = "iron" + products = list("silver" = 10, "gold" = 10, "platinum" = 10) // Not realistic but w/e + energy_consumption = 10 + energy_production = 0 + instability = 2 + minimum_reaction_temperature = 10000 + +/decl/fusion_reaction/phoron_hydrogen + p_react = GAS_HYDROGEN + s_react = GAS_PHORON + energy_consumption = 10 + energy_production = 0 + instability = 5 + products = list("mhydrogen" = 1) + minimum_reaction_temperature = 8000 + +// VERY UNIDEAL REACTIONS. +/decl/fusion_reaction/phoron_supermatter + p_react = "supermatter" + s_react = GAS_PHORON + energy_consumption = 0 + energy_production = 5 + radiation = 40 + instability = 20 + +/decl/fusion_reaction/phoron_supermatter/handle_reaction_special(var/obj/effect/fusion_em_field/holder) + + wormhole_event(GetConnectedZlevels(holder)) + + var/turf/origin = get_turf(holder) + holder.Rupture() + qdel(holder) + var/radiation_level = rand(100, 200) + + // Copied from the SM for proof of concept. //Not any more --Cirra //Use the whole z proc --Leshana + SSradiation.z_radiate(locate(1, 1, holder.z), radiation_level, 1) + + for(var/mob/living/mob in GLOB.living_mob_list_) + var/turf/T = get_turf(mob) + if(T && (holder.z == T.z)) + if(istype(mob, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = mob + H.hallucination(rand(100,150), 51) + + for(var/obj/machinery/fusion_fuel_injector/I in range(world.view, origin)) + if(I.cur_assembly && I.cur_assembly.fuel_type == MATERIAL_SUPERMATTER) + explosion(get_turf(I), 1, 2, 3) + spawn(5) + if(I && I.loc) + qdel(I) + + sleep(5) + explosion(origin, 1, 2, 5) + + return 1 + + +// High end reactions. +/decl/fusion_reaction/boron_hydrogen + p_react = GAS_BORON + s_react = GAS_HYDROGEN + minimum_energy_level = 15000 + energy_consumption = 3 + energy_production = 12 + radiation = 3 + instability = 2.5 + products = list(GAS_HELIUM = 1) diff --git a/proxima/code/modules/power/fusion/gyrotron/gyrotron.dm b/proxima/code/modules/power/fusion/gyrotron/gyrotron.dm new file mode 100644 index 00000000000..9d309c5f7b4 --- /dev/null +++ b/proxima/code/modules/power/fusion/gyrotron/gyrotron.dm @@ -0,0 +1,64 @@ +#define GYRO_POWER 25000 + +/obj/machinery/power/emitter/gyrotron + name = "gyrotron" + icon = 'icons/obj/machines/power/fusion.dmi' + desc = "A heavy-duty, highly configurable industrial gyrotron suited for powering fusion reactors." + icon_state = "emitter-off" + req_lock_access = list(access_engine) + use_power = POWER_USE_IDLE + active_power_usage = GYRO_POWER + + var/initial_id_tag + var/rate = 3 + var/mega_energy = 1 + + construct_state = /decl/machine_construction/default/panel_closed + uncreated_component_parts = list( + /obj/item/stock_parts/radio/receiver, + ) + stat_immune = 0 + base_type = /obj/machinery/power/emitter/gyrotron + +/obj/machinery/power/emitter/gyrotron/anchored + anchored = TRUE + state = EMITTER_WELDED + +/obj/machinery/power/emitter/gyrotron/Initialize() + set_extension(src, /datum/extension/local_network_member) + if(initial_id_tag) + var/datum/extension/local_network_member/fusion = get_extension(src, /datum/extension/local_network_member) + fusion.set_tag(null, initial_id_tag) + change_power_consumption(mega_energy * GYRO_POWER, POWER_USE_ACTIVE) + . = ..() + +/obj/machinery/power/emitter/gyrotron/Process() + change_power_consumption(mega_energy * GYRO_POWER, POWER_USE_ACTIVE) + . = ..() + +/obj/machinery/power/emitter/gyrotron/get_rand_burst_delay() + return rate * 10 + +/obj/machinery/power/emitter/gyrotron/get_burst_delay() + return rate * 10 + +/obj/machinery/power/emitter/gyrotron/get_emitter_beam() + var/obj/item/projectile/beam/emitter/E = ..() + E.damage = mega_energy * 50 + return E + +/obj/machinery/power/emitter/gyrotron/on_update_icon() + if (active && powernet && avail(active_power_usage)) + icon_state = "emitter-on" + else + icon_state = "emitter-off" + +/obj/machinery/power/emitter/gyrotron/attackby(var/obj/item/W, var/mob/user) + if(istype(W, /obj/item/tool/multitool)) + W.set_buffer + var/datum/extension/local_network_member/fusion = get_extension(src, /datum/extension/local_network_member) + fusion.get_new_tag(user) + return + return ..() + +#undef GYRO_POWER diff --git a/proxima/code/modules/power/fusion/kinetic_harvester.dm b/proxima/code/modules/power/fusion/kinetic_harvester.dm new file mode 100644 index 00000000000..e1b54870dfe --- /dev/null +++ b/proxima/code/modules/power/fusion/kinetic_harvester.dm @@ -0,0 +1,131 @@ +/obj/machinery/kinetic_harvester + name = "kinetic harvester" + desc = "A complicated mechanism for harvesting rapidly moving particles from a fusion toroid and condensing them into a usable form." + density = TRUE + anchored = TRUE + use_power = POWER_USE_IDLE + icon = 'icons/obj/kinetic_harvester.dmi' + icon_state = "off" + var/initial_id_tag + var/list/stored = list() + var/list/harvesting = list() + var/obj/machinery/power/fusion_core/harvest_from + construct_state = /decl/machine_construction/default/panel_closed + uncreated_component_parts = null + stat_immune = 0 + +/obj/machinery/kinetic_harvester/Initialize() + set_extension(src, /datum/extension/local_network_member) + if(initial_id_tag) + var/datum/extension/local_network_member/lanm = get_extension(src, /datum/extension/local_network_member) + lanm.set_tag(null, initial_id_tag) + find_core() + queue_icon_update() + . = ..() + +/obj/machinery/kinetic_harvester/interface_interact(mob/user) + ui_interact(user) + return TRUE + +/obj/machinery/kinetic_harvester/attackby(var/obj/item/thing, var/mob/user) + if(isMultitool(thing)) + var/datum/extension/local_network_member/lanm = get_extension(src, /datum/extension/local_network_member) + if(lanm.get_new_tag(user)) + find_core() + return + return ..() + +/obj/machinery/kinetic_harvester/proc/find_core() + harvest_from = null + var/datum/extension/local_network_member/lanm = get_extension(src, /datum/extension/local_network_member) + var/datum/local_network/lan = lanm.get_local_network() + + if(lan) + var/list/fusion_cores = lan.get_devices(/obj/machinery/power/fusion_core) + if(fusion_cores && fusion_cores.len) + harvest_from = fusion_cores[1] + return harvest_from + +/obj/machinery/kinetic_harvester/ui_interact(var/mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + + if(!harvest_from && !find_core()) + to_chat(user, SPAN_WARNING("This machine cannot locate a fusion core. Please ensure the machine is correctly configured to share a fusion plant network.")) + return + + var/datum/extension/local_network_member/fusion = get_extension(src, /datum/extension/local_network_member) + var/datum/local_network/plant = fusion.get_local_network() + var/list/data = list() + + data["id"] = plant ? plant.id_tag : "unset" + data["status"] = (use_power >= POWER_USE_ACTIVE) + data["materials"] = list() + for(var/mat in stored) + var/material/material = SSmaterials.get_material_by_name(mat) + if(material) + var/sheets = Floor(stored[mat]/(material.units_per_sheet * 1.5)) + data["materials"] += list(list("material" = mat, "rawamount" = stored[mat], "amount" = sheets, "harvest" = harvesting[mat])) + + ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) + if (!ui) + ui = new(user, src, ui_key, "kinetic_harvester.tmpl", name, 400, 600) + ui.set_initial_data(data) + ui.open() + ui.set_auto_update(1) + +/obj/machinery/kinetic_harvester/Process() + if(harvest_from && get_dist(src, harvest_from) > 10) + harvest_from = null + + if(use_power >= POWER_USE_ACTIVE) + if(harvest_from && harvest_from.owned_field) + for(var/mat in harvest_from.owned_field.reactants) + if(SSmaterials.materials_by_name[mat] && !stored[mat]) + stored[mat] = 0 + for(var/mat in harvesting) + if(!SSmaterials.materials_by_name[mat] || !harvest_from.owned_field.reactants[mat]) + harvesting -= mat + else + var/harvest = min(harvest_from.owned_field.reactants[mat], rand(100,200)) + harvest_from.owned_field.reactants[mat] -= harvest + if(harvest_from.owned_field.reactants[mat] <= 0) + harvest_from.owned_field.reactants -= mat + stored[mat] += harvest + else + harvesting.Cut() + +/obj/machinery/kinetic_harvester/on_update_icon() + if(stat & (BROKEN|NOPOWER)) + icon_state = "broken" + else if(use_power >= POWER_USE_ACTIVE) + icon_state = "on" + else + icon_state = "off" + +/obj/machinery/kinetic_harvester/OnTopic(var/mob/user, var/href_list, var/datum/topic_state/state) + if(href_list["remove_mat"]) + var/mat = href_list["remove_mat"] + var/material/material = SSmaterials.get_material_by_name(mat) + if(material) + var/sheet_cost = (material.units_per_sheet * 1.5) + var/sheets = Floor(stored[mat]/sheet_cost) + if(sheets > 0) + material.place_sheet(loc, sheets) + stored[mat] -= sheets * sheet_cost + if(stored[mat] <= 0) + stored -= mat + return TOPIC_REFRESH + + if(href_list["toggle_power"]) + use_power = (use_power >= POWER_USE_ACTIVE ? POWER_USE_IDLE : POWER_USE_ACTIVE) + queue_icon_update() + return TOPIC_REFRESH + + if(href_list["toggle_harvest"]) + var/mat = href_list["toggle_harvest"] + if(harvesting[mat]) + harvesting -= mat + else + harvesting[mat] = TRUE + if(!(mat in stored)) + stored[mat] = 0 + return TOPIC_REFRESH From f2a32ef2958787bdeab0a3bacb684b6de1d4ba40 Mon Sep 17 00:00:00 2001 From: Evie7056 Date: Thu, 13 Jul 2023 02:32:01 +0300 Subject: [PATCH 20/20] =?UTF-8?q?=D0=BE=D0=B9=20=D0=B2=20=D0=BF=D0=B8?= =?UTF-8?q?=D0=B7=D0=B4=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cev_eris.dme | 16 +++++ proxima/code/modules/power/fusion/_setup.dm | 80 --------------------- proxima/code/modules/power/fusion/fusion.dm | 15 ---- 3 files changed, 16 insertions(+), 95 deletions(-) delete mode 100644 proxima/code/modules/power/fusion/_setup.dm diff --git a/cev_eris.dme b/cev_eris.dme index ca95fe6cc98..b06d829c024 100644 --- a/cev_eris.dme +++ b/cev_eris.dme @@ -2853,6 +2853,22 @@ #include "proxima\code\modules\factions\zeng-hu\medical.dm" #include "proxima\code\modules\factions\zeng-hu\science.dm" #include "proxima\code\modules\organs\external\subtypes\vey_med_limbs.dm" +//#include "proxima\code\modules\power\fusion\fusion.dm" +#include "proxima\code\modules\power\fusion\consoles\_consoles.dm" +#include "proxima\code\modules\power\fusion\consoles\core_control.dm" +#include "proxima\code\modules\power\fusion\consoles\gyrotron_control.dm" +#include "proxima\code\modules\power\fusion\consoles\injector_control.dm" +#include "proxima\code\modules\power\fusion\core\_core.dm" +#include "proxima\code\modules\power\fusion\core\core_field.dm" +#include "proxima\code\modules\power\fusion\fuel_assembly\fuel_assembly.dm" +#include "proxima\code\modules\power\fusion\fuel_assembly\fuel_compressor.dm" +#include "proxima\code\modules\power\fusion\fuel_assembly\fuel_injector.dm" +#include "proxima\code\modules\power\fusion\gyrotron\gyrotron.dm" +#include "proxima\code\modules\power\fusion\fusion_circuits.dm" +#include "proxima\code\modules\power\fusion\fusion_particle_catcher.dm" +#include "proxima\code\modules\power\fusion\fusion_reactions.dm" +#include "proxima\code\modules\power\fusion\kinetic_harvester.dm" + #include "proxima\code\modules\TGS\_TGSDefines.dm" #include "proxima\code\modules\TGS\TGDMAPI\tgs.dm" #include "proxima\code\modules\TGS\TGDMAPI\tgs\includes.dm" diff --git a/proxima/code/modules/power/fusion/_setup.dm b/proxima/code/modules/power/fusion/_setup.dm deleted file mode 100644 index 5e98798ba8f..00000000000 --- a/proxima/code/modules/power/fusion/_setup.dm +++ /dev/null @@ -1,80 +0,0 @@ -#define SETUP_OK 1 // All good -#define SETUP_WARNING 2 // Something that shouldn't happen happened, but it's not critical so we will continue -#define SETUP_ERROR 3 // Something bad happened, and it's important so we won't continue setup. -#define SETUP_DELAYED 4 // Wait for other things first. - -/datum/admins/proc/setup_fusion() - set category = "Debug" - set name = "Setup Fusion Core" - set desc = "Allows you to start the R-UST engine." - - if (!istype(src,/datum/admins)) - src = usr.client.holder - if (!istype(src,/datum/admins)) - to_chat(usr, "Error: you are not an admin!") - return - - if(!(locate(/obj/machinery/power/fusion_core/mapped) in world)) - to_chat(usr, "This map is not appropriate for this verb.") - return - - var/response = input(usr, "Are you sure?", "Engine setup") as null|anything in list("No", "Yes") - if(!response || response == "No") - return - - var/errors = 0 - var/warnings = 0 - var/success = 0 - - log_and_message_admins("## FUSION CORE SETUP - Setup initiated by [usr].") - - for(var/obj/machinery/fusion_fuel_injector/mapped/injector in SSmachines.machinery) - injector.cur_assembly = new /obj/item/fuel_assembly/deuterium(injector) - injector.BeginInjecting() - - var/obj/machinery/power/fusion_core/mapped/core = locate() in SSmachines.machinery - if(core.jumpstart(15000)) - var/list/delayed_objects = list() - - // SETUP PHASE - for(var/obj/effect/engine_setup/S in world) - var/result = S.activate(0) - switch(result) - if(SETUP_OK) - success++ - continue - if(SETUP_WARNING) - warnings++ - continue - if(SETUP_ERROR) - errors++ - log_and_message_admins("## FUSION CORE SETUP - Error encountered! Aborting.") - break - if(SETUP_DELAYED) - delayed_objects.Add(S) - continue - - if(!errors) - for(var/obj/effect/engine_setup/S in delayed_objects) - var/result = S.activate(1) - switch(result) - if(SETUP_OK) - success++ - continue - if(SETUP_WARNING) - warnings++ - continue - if(SETUP_ERROR) - errors++ - log_and_message_admins("## FUSION CORE SETUP - Error encountered! Aborting.") - break - else - log_and_message_admins("## FUSION CORE SETUP - Error encountered! Aborting.") - errors++ - - log_and_message_admins("## FUSION CORE SETUP - Setup completed with [errors] errors, [warnings] warnings and [success] successful steps.") - -#undef SETUP_OK -#undef SETUP_WARNING -#undef SETUP_ERROR -#undef SETUP_DELAYED \ No newline at end of file diff --git a/proxima/code/modules/power/fusion/fusion.dm b/proxima/code/modules/power/fusion/fusion.dm index e01d692a860..e69de29bb2d 100644 --- a/proxima/code/modules/power/fusion/fusion.dm +++ b/proxima/code/modules/power/fusion/fusion.dm @@ -1,15 +0,0 @@ -#include "proxima\code\modules\power\fusion\kinetic_harvester.dm" -#include "proxima\code\modules\power\fusion\fusion_reactions.dm" -#include "proxima\code\modules\power\fusion\fusion_particle_catcher.dm" -#include "proxima\code\modules\power\fusion\fusion_circuits.dm" -#include "proxima\code\modules\power\fusion\_setup.dm" -#include "proxima\code\modules\power\fusion\gyrotron\gyrotron.dm" -#include "proxima\code\modules\power\fusion\fuel_assembly\fuel_injector.dm -#include "proxima\code\modules\power\fusion\fuel_assembly\fuel_compressor.dm" -#include "proxima\code\modules\power\fusion\fuel_assembly\fuel_assembly.dm" -#include "proxima\code\modules\power\fusion\core\core_field.dm" -#include "proxima\code\modules\power\fusion\core\_core.dm" -#include "proxima\code\modules\power\fusion\consoles\injector_control.dm" -#include "proxima\code\modules\power\fusion\consoles\gyrotron_control.dm" -#include "proxima\code\modules\power\fusion\consoles\core_control.dm" -#include "proxima\code\modules\power\fusion\consoles\_consoles.dm"