From f1b89345171ef7b9e50315f5e7a352198c58234e Mon Sep 17 00:00:00 2001 From: LordNest <77477080+LordNest@users.noreply.github.com> Date: Thu, 28 Dec 2023 00:38:02 +0400 Subject: [PATCH] Fix IT and do minor balance tweaks (#1683) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bugfix: Убрал возможность быть мерчантами у ГБСов и Адхерантов, так как те не понимают, как работает рынок. tweak: Добавил офицерам в шкафы тазеры. rscadd: Вернул потерянные очки айтишника maptweak: Добавил на карту очки, добавил на карту новый ящик в чекпоинт РнД. balance: Добавил ГККшному набору ниндзи паверфист как модуль. Его нужно запихнуть в ИКС. --- code/__defines/items_clothing.dm | 8 +- code/game/machinery/doors/airlock.dm | 4 + .../mob/living/carbon/human/examine.dm | 6 +- maps/sierra/job/jobs_command.dm | 4 +- maps/sierra/job/jobs_engineering.dm | 4 +- maps/sierra/loadout/_defines.dm | 2 - maps/sierra/structures/closets/security.dm | 3 +- maps/sierra/z1-z5_sierra.dmm | 5 +- mods/_maps/liberia/code/liberia_jobs.dm | 2 +- mods/_maps/liberia/maps/liberia.dmm | 1 + mods/antagonists/README.md | 1 + mods/antagonists/code/operative.dm | 137 +++++++++++++++ mods/global_modpacks.dm | 1 + mods/loadout_items/_loadout_items.dme | 2 + mods/loadout_items/code/lists/accessories.dm | 24 +++ mods/loadout_items/code/lists/suits.dm | 47 +++++ mods/loadout_items/code/suits.dm | 163 ++++++++++++++++++ mods/ntnet/README.md | 79 +++++++++ mods/ntnet/_ntnet.dm | 4 + mods/ntnet/_ntnet.dme | 9 + .../NTNet => mods/ntnet/code}/NTNet-core.dm | 1 - mods/ntnet/code/NTNet-items.dm | 42 +++++ .../ntnet/code}/terminal/commands/connect.dm | 0 .../ntnet/code}/terminal/terminal-core.dm | 0 mods/ntnet/icons/obj_eyes.dmi | Bin 0 -> 1390 bytes mods/ntnet/icons/onmob_eyes.dmi | Bin 0 -> 1434 bytes packs/infinity/clothing/suits/suits.dm | 19 -- packs/sierra-tweaks/_pack.dm | 3 - 28 files changed, 534 insertions(+), 37 deletions(-) create mode 100644 mods/loadout_items/code/lists/suits.dm create mode 100644 mods/loadout_items/code/suits.dm create mode 100644 mods/ntnet/README.md create mode 100644 mods/ntnet/_ntnet.dm create mode 100644 mods/ntnet/_ntnet.dme rename {packs/sierra-tweaks/machinery/NTNet => mods/ntnet/code}/NTNet-core.dm (99%) create mode 100644 mods/ntnet/code/NTNet-items.dm rename {packs/sierra-tweaks/machinery/NTNet => mods/ntnet/code}/terminal/commands/connect.dm (100%) rename {packs/sierra-tweaks/machinery/NTNet => mods/ntnet/code}/terminal/terminal-core.dm (100%) create mode 100644 mods/ntnet/icons/obj_eyes.dmi create mode 100644 mods/ntnet/icons/onmob_eyes.dmi diff --git a/code/__defines/items_clothing.dm b/code/__defines/items_clothing.dm index 288ffb7cbb433..029c6e5cb8cb7 100644 --- a/code/__defines/items_clothing.dm +++ b/code/__defines/items_clothing.dm @@ -183,8 +183,8 @@ #define FIRESUIT_MAX_PRESSURE 100 * ONE_ATMOSPHERE // Firesuis and atmos voidsuits #define RIG_MAX_PRESSURE 50 * ONE_ATMOSPHERE // Rigs #define LIGHT_RIG_MAX_PRESSURE 25 * ONE_ATMOSPHERE // Rigs -#define ENG_VOIDSUIT_MAX_PRESSURE 50 * ONE_ATMOSPHERE -#define VOIDSUIT_MAX_PRESSURE 25 * ONE_ATMOSPHERE +#define ENG_VOIDSUIT_MAX_PRESSURE 50 * ONE_ATMOSPHERE +#define VOIDSUIT_MAX_PRESSURE 25 * ONE_ATMOSPHERE #define SPACE_SUIT_MAX_PRESSURE 5 * ONE_ATMOSPHERE // Fire. @@ -218,7 +218,9 @@ #define HUD_SECURITY FLAG(1) #define HUD_MEDICAL FLAG(2) #define HUD_JANITOR FLAG(3) - +// [SIERRA-ADD] - NTNET - NTNet gimmics +#define HUD_IT FLAG(4) +// [/SIERRA-ADD] /** * flags for /mob/proc/equip_to_slot_if_possible diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 46597b8e01144..309064bff4eda 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -779,6 +779,10 @@ About the new airlock wires panel: data["electrified"] = round(electrified_until > 0 ? max(electrified_until - world.time, 0) / 10 : electrified_until, 1) data["open"] = !density + // [SIERRA-ADD] - NTNet gimmics + data["airlock_ntnet_id"] = NTNet_id + // [/SIERRA-ADD] + var/commands[0] commands[LIST_PRE_INC(commands)] = list("name" = "IdScan", "command"= "idscan", "active" = !aiDisabledIdScanner, "enabled" = "Enabled", "disabled" = "Disable", "danger" = 0, "act" = 1) commands[LIST_PRE_INC(commands)] = list("name" = "Bolts", "command"= "bolts", "active" = !locked, "enabled" = "Raised ", "disabled" = "Dropped", "danger" = 0, "act" = 0) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 5174cf7b29c1d..56c07884785cf 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -358,8 +358,10 @@ if (A.hud_type & hudtype) AUG = A break - - return ((istype(G) && ((G.hud_type & hudtype) || (G.hud && (G.hud.hud_type & hudtype)))) && G.check_access(ID)) || AUG?.active && AUG.check_access(ID) + // [SIERRA-EDIT] - NTNET + // return ((istype(G) && ((G.hud_type & hudtype) || (G.hud && (G.hud.hud_type & hudtype)))) && G.check_access(ID)) || AUG?.active && AUG.check_access(ID) // SIERRA-EDIT - ORIGINAL + return ((istype(G) && ((G.hud_type & hudtype) || (G.hud && (G.hud.hud_type & hudtype)))) && G.check_access(ID) && (G.toggleable ? G.active : TRUE)) || AUG?.active && AUG.check_access(ID) + // [/SIERRA-EDIT] else if(istype(M, /mob/living/silicon/robot)) for (var/obj/item/borg/sight/sight as anything in M.GetAllHeld(/obj/item/borg/sight)) if (sight.hud_type & hudtype) diff --git a/maps/sierra/job/jobs_command.dm b/maps/sierra/job/jobs_command.dm index 33c1be9f43f3f..3d125d0b215aa 100644 --- a/maps/sierra/job/jobs_command.dm +++ b/maps/sierra/job/jobs_command.dm @@ -161,7 +161,7 @@ access_sec_doors, access_medical, access_network, access_maint_tunnels, access_eva, access_expedition_shuttle, access_expedition_shuttle_helm, access_guppy, access_hangar, access_petrov, access_petrov_helm, - access_guppy_helm, access_explorer, access_el + access_guppy_helm, access_explorer, access_el, access_network_admin ) software_on_spawn = list( /datum/computer_file/program/comm, @@ -295,7 +295,7 @@ access_atmospherics, access_janitor, access_construction, access_sec_doors, access_medical, access_network, access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, - access_seneng, access_hangar + access_seneng, access_hangar, access_network_admin ) diff --git a/maps/sierra/job/jobs_engineering.dm b/maps/sierra/job/jobs_engineering.dm index e04ad38983689..93644b5fb287f 100644 --- a/maps/sierra/job/jobs_engineering.dm +++ b/maps/sierra/job/jobs_engineering.dm @@ -32,7 +32,7 @@ access = list( access_engine, access_engine_equip, access_maint_tunnels, access_external_airlocks, access_emergency_storage, access_eva, access_tech_storage, access_atmospherics, access_janitor, access_construction, - access_tcomsat, access_seneng, access_hangar) + access_tcomsat, access_seneng, access_hangar, access_network) software_on_spawn = list(/datum/computer_file/program/power_monitor, @@ -184,7 +184,7 @@ max_skill = list( SKILL_ELECTRICAL = SKILL_MAX, SKILL_COMPUTER = SKILL_MAX) - access = list( access_maint_tunnels, access_network, access_external_airlocks, + access = list( access_maint_tunnels, access_network, access_network_admin, access_external_airlocks, access_tech_storage, access_emergency_storage, access_tcomsat) diff --git a/maps/sierra/loadout/_defines.dm b/maps/sierra/loadout/_defines.dm index d039e6bf6b3c5..f75c19ccb254e 100644 --- a/maps/sierra/loadout/_defines.dm +++ b/maps/sierra/loadout/_defines.dm @@ -2,13 +2,11 @@ /datum/map/sierra loadout_blacklist = list( /datum/gear/union_card, - /datum/gear/eyes/security, /datum/gear/suit/labcoat_corp, /datum/gear/uniform/corp_exec, /datum/gear/uniform/corp_overalls, /datum/gear/uniform/corp_flight, /datum/gear/uniform/corp_exec_jacket, - /datum/gear/uniform/corporate ) //For all exploration crew diff --git a/maps/sierra/structures/closets/security.dm b/maps/sierra/structures/closets/security.dm index 9a213bf1bb356..a5feb17cd275f 100644 --- a/maps/sierra/structures/closets/security.dm +++ b/maps/sierra/structures/closets/security.dm @@ -138,6 +138,7 @@ /obj/item/gun/projectile/pistol/sec, /obj/item/ammo_magazine/pistol/rubber, /obj/item/ammo_magazine/pistol, + /obj/item/gun/energy/taser, /obj/item/device/megaphone, /obj/item/clothing/gloves/thick, /obj/item/device/holowarrant, @@ -173,7 +174,7 @@ /obj/structure/closet/secure_closet/security/sierra/science name = "research guard locker" req_access = list(access_security) - closet_appearance = /singleton/closet_appearance/secure_closet/sierra/security + closet_appearance = /singleton/closet_appearance/secure_closet/security /obj/structure/closet/secure_closet/security/sierra/science/WillContain() return list( diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index a4e60fd64e44e..e6c46573daec4 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -76487,6 +76487,7 @@ pixel_x = 24; dir = 8 }, +/obj/item/clothing/glasses/hud/it, /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/computer) "lvv" = ( @@ -111744,6 +111745,8 @@ dir = 8 }, /obj/floor_decal/industrial/outline/yellow, +/obj/item/storage/box/donut, +/obj/item/reagent_containers/food/drinks/bottle/small/beer/fake, /turf/simulated/floor/tiled/dark, /area/security/opscheck) "qMl" = ( @@ -128223,7 +128226,7 @@ /obj/machinery/newscaster/security_unit{ pixel_x = -32 }, -/obj/structure/closet/secure_closet/security/science, +/obj/structure/closet/secure_closet/security/sierra/science, /obj/floor_decal/borderfloor{ dir = 9 }, diff --git a/mods/_maps/liberia/code/liberia_jobs.dm b/mods/_maps/liberia/code/liberia_jobs.dm index b6f2974f7ee9e..7347d9e16cb58 100644 --- a/mods/_maps/liberia/code/liberia_jobs.dm +++ b/mods/_maps/liberia/code/liberia_jobs.dm @@ -14,7 +14,7 @@ create_record = FALSE outfit_type = /singleton/hierarchy/outfit/job/liberia/merchant/leader whitelisted_species = null - blacklisted_species = list(SPECIES_VOX, SPECIES_ALIEN, SPECIES_GOLEM, ) // SPECIES_MANTID_GYNE, SPECIES_MANTID_ALATE, SPECIES_MONARCH_WORKER, SPECIES_MONARCH_QUEEN Not yet... not yet... + blacklisted_species = list(SPECIES_VOX, SPECIES_ALIEN, SPECIES_GOLEM, SPECIES_ADHERENT, SPECIES_NABBER) // SPECIES_MANTID_GYNE, SPECIES_MANTID_ALATE, SPECIES_MONARCH_WORKER, SPECIES_MONARCH_QUEEN Not yet... not yet... latejoin_at_spawnpoints = TRUE diff --git a/mods/_maps/liberia/maps/liberia.dmm b/mods/_maps/liberia/maps/liberia.dmm index e1d7ce40c4cc7..5e50cabd5388c 100644 --- a/mods/_maps/liberia/maps/liberia.dmm +++ b/mods/_maps/liberia/maps/liberia.dmm @@ -2905,6 +2905,7 @@ /obj/floor_decal/corner/yellow{ dir = 6 }, +/obj/item/clothing/gloves/insulated/black, /turf/simulated/floor/tiled/steel_grid, /area/liberia/atmos) "eO" = ( diff --git a/mods/antagonists/README.md b/mods/antagonists/README.md index c34b5a6d7a0a5..3f00b675ac1b9 100644 --- a/mods/antagonists/README.md +++ b/mods/antagonists/README.md @@ -2,6 +2,7 @@ #### Список PRов: - https://github.com/SierraBay/SierraBay12/pull/1474 +- https://github.com/SierraBay/SierraBay12/pull/1683 + + +## NTNetwork + +ID мода: NTNET + + +### Описание мода + +NTNet + + +### Изменения *кор кода* + +- `code/__defines/items_clothing.dm` +- `code/modules/mob/living/carbon/human/examine.dm` + + +### Оверрайды + + + +### Дефайны + +- HUD_IT + + +### Используемые файлы, не содержащиеся в модпаке + +- `maps/sierra/icons/obj/clothing/obj_suit.dmi` +- `maps/sierra/icons/mob/onmob/onmob_suit.dmi` + + +### Авторы: + +- Код - LordNest + + diff --git a/mods/ntnet/_ntnet.dm b/mods/ntnet/_ntnet.dm new file mode 100644 index 0000000000000..b8294a95e3f9e --- /dev/null +++ b/mods/ntnet/_ntnet.dm @@ -0,0 +1,4 @@ +/singleton/modpack/ntnet + name = "NTNet" + desc = "NTNet - Best solutions for your internal network. Мод, который добавляет НТнет." + author = "LordNest and others who originally coded this thing." diff --git a/mods/ntnet/_ntnet.dme b/mods/ntnet/_ntnet.dme new file mode 100644 index 0000000000000..e60c0c4b049a7 --- /dev/null +++ b/mods/ntnet/_ntnet.dme @@ -0,0 +1,9 @@ +#ifndef MODPACK_NTNET +#define MODPACK_NTNET + +#include "_ntnet.dm" + +#include "code\NTNet-items.dm" +#include "code\NTNet-core.dm" + +#endif diff --git a/packs/sierra-tweaks/machinery/NTNet/NTNet-core.dm b/mods/ntnet/code/NTNet-core.dm similarity index 99% rename from packs/sierra-tweaks/machinery/NTNet/NTNet-core.dm rename to mods/ntnet/code/NTNet-core.dm index a15fc7b5a53f1..f7a882e6a66c2 100644 --- a/packs/sierra-tweaks/machinery/NTNet/NTNet-core.dm +++ b/mods/ntnet/code/NTNet-core.dm @@ -1,7 +1,6 @@ #include "terminal\terminal-core.dm" GLOBAL_LIST_INIT(NTNet_machines, list()) - // modify core /obj/machinery var/NTNet_id diff --git a/mods/ntnet/code/NTNet-items.dm b/mods/ntnet/code/NTNet-items.dm new file mode 100644 index 0000000000000..412b54fda22aa --- /dev/null +++ b/mods/ntnet/code/NTNet-items.dm @@ -0,0 +1,42 @@ +// HACSO's HUD and related interactions +// code\__defines\items_clothing.dm - used outside pack +// code\modules\mob\living\carbon\human\examine.dm - used outside pack + +/obj/item/clothing/glasses/hud/it + name = "IT special HUD" + desc = "An augmented reality device that allows you to see doors NTNet ID's." + icon = 'mods/NTNet/icons/obj_eyes.dmi' + item_icons = list(slot_glasses_str = 'mods/NTNet/icons/onmob_eyes.dmi') + icon_state = "ithud" + off_state = "ithud_off" + hud_type = HUD_IT + body_parts_covered = 0 + +/obj/machinery/door/airlock/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) + if (src.isElectrified()) + if (istype(mover, /obj/item)) + var/obj/item/i = mover + if (i.matter && (MATERIAL_STEEL in i.matter) && i.matter[MATERIAL_STEEL] > 0) + var/datum/effect/spark_spread/s = new /datum/effect/spark_spread + s.set_up(5, 1, src) + s.start() + return ..() + +/obj/machinery/door/airlock/examine(mob/user) + . = ..() + if(hasHUD(user, HUD_IT) && arePowerSystemsOn()) + to_chat(user, SPAN_INFO(SPAN_ITALIC("You may notice a small hologram that says: [NTNet_id]"))) + +/obj/item/modular_computer/examine(mob/user) + . = ..() + if(hasHUD(user, HUD_IT)) + if(network_card && network_card.check_functionality() && enabled) + to_chat(user, SPAN_INFO(SPAN_ITALIC("You may notice a small hologram that says: [network_card.get_network_tag()]."))) + +/obj/machinery/computer/modular/examine(mob/user) + . = ..() + if(hasHUD(user, HUD_IT)) + var/datum/extension/interactive/ntos/os = get_extension(src, /datum/extension/interactive/ntos) + var/obj/item/stock_parts/computer/network_card/network_card = os.get_component(PART_NETWORK) + if(istype(network_card) && network_card.check_functionality() && os.on) + to_chat(user, SPAN_INFO(SPAN_ITALIC("You may notice a small hologram that says: [network_card.get_network_tag()]."))) diff --git a/packs/sierra-tweaks/machinery/NTNet/terminal/commands/connect.dm b/mods/ntnet/code/terminal/commands/connect.dm similarity index 100% rename from packs/sierra-tweaks/machinery/NTNet/terminal/commands/connect.dm rename to mods/ntnet/code/terminal/commands/connect.dm diff --git a/packs/sierra-tweaks/machinery/NTNet/terminal/terminal-core.dm b/mods/ntnet/code/terminal/terminal-core.dm similarity index 100% rename from packs/sierra-tweaks/machinery/NTNet/terminal/terminal-core.dm rename to mods/ntnet/code/terminal/terminal-core.dm diff --git a/mods/ntnet/icons/obj_eyes.dmi b/mods/ntnet/icons/obj_eyes.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c79445c78325b546537b0ce4170b65690c6e400c GIT binary patch literal 1390 zcma)6eKga182=8Fn3Q{Es%t8@ZpuQ!v1+O@EN{(-w2@jl-bO1g$(BxbrWYia^0L(p z_vY5M+*9sJUQVJHZI-v;#wZ)^$e8_NZ+D%0`|mpE{_(tho^zh_dCv2~4i3bdo31kj z0GRvv;tuO=^cOKP*6Xp-G!MODWriN1<4&H5O^u_`+b z=)mt35bH=z!d>FA9fCvKUIps|x3RHK-?xVZKU}2c5iALZtrDzmx)5CaiDUEK?`}4D z5M8e1=`q9~9^HACXNVgULW@PD2wF<@J&ApogUA6n#q~m;gok6T;ntKOG>|>sK8i7U zwH5%QyMDO+q3Pw*6|IELr;zO&=a73MaVx>=)mw)?<_e3;@Mq&qWTGgi&B=`T*uB-( zsP$lSVQzv+V$~xv+a(Lx_a_D3rIncopLX&l4?iLDmMwKFwf>u;6zW`qTvKu5=fw;B zU6i)b3zk(;=!0VCc5(|5Z(z3>R!|6D`hpYoz{L{StYls_^78o#<1}j8mLgvH(2L_C z^5*gyX?SClc|c8fn7w7|^mL+%N3CbG*(*b9Nu7ND-N*-bqtL8WCm$gr8QiXpkV>V1 zd1OZ}kLMgkp**ps(dj*FtGXwZ1FP9M{R~*Frd4gkSqS0P?MeudagtrvH8eK1DHIC) z(L@Gg#06mp3f_!=duk)!puM9bq_%hUHJ_BMEZJnV(KID0s%>UwrX?Qvew;!EU*FVpScF4>WZJJKf|IkG6w1?j5yUB z%4I3EfJfE|a? zNQHORX(O?`WK6v2YsM!+*WlnfH#aw9&-h0JzZU!2MDS5XJTXb+)v6a_K~F40j;mcx()ejWgH=iv8jIh*5Y4N;Mi`d|qV0{G9(wXUT$R zCnvy;6+~XUL3dzKxp{m zGQlYo42qL+)sQjs2DvAQ$@rT86mSJ?%X+ zjWHA-k+J4#b265DeqZx>*s6+o`KP9Sxn%F`)Dy7^mY}oK812+HX_zyMYAH(cA)KtJ z%%`X(4`S_@i|P&u>K;e@Vy6Z?qAbBqG%E~WW>2mt(ELl;2aPXU{@9jlTHj_#HW>I? zlrfSGR?lQLu794T)2h_ZKdW=}bn2uZ-cO)UgL7NC{VIqxp0>2IqTxdJMO3pi+pB9{ z{tVftf}nYpW)WVgg6$V{eDSrK7`1k85ymO}A8c>wU}pD6dY+1co%IhC_<0B79v+C! F`5S8qjaL8w literal 0 HcmV?d00001 diff --git a/mods/ntnet/icons/onmob_eyes.dmi b/mods/ntnet/icons/onmob_eyes.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c0c87d8bafdfb77205e08c793535f4e60a16ea5c GIT binary patch literal 1434 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zcal9aSL_B`&GO$wiq3C7Jno3=9=> za!+mKI%FW?_R#XXX5FpOBiH!!$|s7Pys)o{r6^f%MXQQdZ8f{P>$#E#*@ZIxd2MrL zY*oc$-zD(emYq4hZPtMs-%}>NP`!G7%B$547c+eO3*wS;POzM1?P>Hm^G}Vn=bih% zaCRfdb#<(Z@7K8M9=mzSukYTwXWH)#r(ZqBz`%0W)5S5QV$R#U8@-h?B^o|nFPPvY zSah31Oib`d(RLd#pNYR_>2BL%nXWoP>F*?^oYGzyMoahZ&-^!@t&2M0^oQBxsZz%B zXjzV=$!f(%6F09u#N&DGNo8HG!Tkx-mrHbikACs}w_@Pbx-ZNg_LCSn&N8&5F*r$k zGtBi4tFQ1RSk;;a7a_w>_G zD{8+fyqd?zz}O!ZQ|_4b?7^2;al^77<*k|s@3 zIoWnNamwkZGoDb2G2i{WiZVAt-Teo~|_?zE? zAO&eb@_Q{S|L0A5ZeQv*@uzrH|G$`TkNL~k1(yqE&%e`ee|Gcp%zyXz6-@3kf?|eZ zCnF3wCe-lz>l?|0uJs13G=v*{2uZ=jUIZd#(5P$K@O3>sNnyeemV<+dFQ* z=ufq;llyG(-|6+myZ!%dzCE7*w@@}kdz|v+`#F{K>*rqQQ&s|o z|NC>AMi7_U+yDO9J!ARLYWs!@HSAQ3dT2IzcRYRe)1S|G$shRp