Fix IT and do minor balance tweaks (#1683)

bugfix: Убрал возможность быть мерчантами у ГБСов и Адхерантов, так как те не понимают, как работает рынок. tweak: Добавил офицерам в шкафы тазеры. rscadd: Вернул потерянные очки айтишника maptweak: Добавил на карту очки, добавил на карту новый ящик в чекпоинт РнД. balance: Добавил ГККшному набору ниндзи паверфист как модуль. Его нужно запихнуть в ИКС.
SierraBay · Dec 27, 2023 · f1b8934 · f1b8934
1 parent df9f45a
commit f1b8934
Show file tree

Hide file tree

Showing 28 changed files with 534 additions and 37 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,6 +2,7 @@
 #### Список PRов:
 
 - https://github.com/SierraBay/SierraBay12/pull/1474
+- https://github.com/SierraBay/SierraBay12/pull/1683
 <!--
   Ссылки на PRы, связанные с модом:
   - Создание

diff --git a/mods/antagonists/code/operative.dm b/mods/antagonists/code/operative.dm
@@ -21,6 +21,7 @@
 /obj/structure/closet/crate/ninja/gcc/WillContain()
 	return list(
 		/obj/item/rig/light/ninja/gcc,
+		/obj/item/rig_module/mounted/power_fist,
 		/obj/item/gun/projectile/pistol/optimus,
 		/obj/item/ammo_magazine/pistol/double = 2,
 		/obj/item/ammo_magazine/box/minigun = 2,
@@ -62,3 +63,139 @@
 		/obj/item/device/encryptionkey/syndicate,
 		/obj/item/card/emag
 	)
+
+// Powerfist item
+
+/obj/item/melee/powerfist/mounted
+	icon_state = "powerfist"
+	item_state = "powerfist"
+	name = "hardsuit powerfist"
+	icon = 'icons/obj/augment.dmi'
+	desc = "Hardsuit gauntlet powered-up by servomotors. Capable of prying airlock open, but can't make people fly."
+	base_parry_chance = 12
+	force = 15
+	attack_cooldown = SLOW_WEAPON_COOLDOWN
+	hitsound = 'sound/effects/bang.ogg'
+	attack_verb = list("smashed", "bludgeoned", "hammered", "battered")
+	var/mob/living/creator
+
+/obj/item/melee/powerfist/mounted/dropped()
+	..()
+	QDEL_IN(src, 0)
+
+
+/obj/item/melee/powerfist/mounted/get_storage_cost()
+	return ITEM_SIZE_NO_CONTAINER
+
+
+/obj/item/melee/powerfist/mounted/Initialize()
+	. = ..()
+	START_PROCESSING(SSobj, src)
+
+
+/obj/item/melee/powerfist/mounted/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	. = ..()
+
+
+/obj/item/melee/powerfist/mounted/attack_self(mob/user as mob)
+	user.drop_from_inventory(src)
+
+
+/obj/item/melee/powerfist/mounted/use_before(atom/target, mob/living/user, click_parameters)
+	if (user.a_intent == I_HELP || !istype(target, /obj/machinery/door/airlock))
+		return FALSE
+
+	var/obj/machinery/door/airlock/A = target
+
+	if (A.operating)
+		return FALSE
+
+	if (A.locked)
+		to_chat(user, SPAN_WARNING("The airlock's bolts prevent it from being forced."))
+		return TRUE
+
+	if (A.welded)
+		A.visible_message(SPAN_DANGER("\The [user] forces the fingers of \the [src] in through the welded metal, beginning to pry \the [A] open!"))
+		if (do_after(user, 11 SECONDS, A, DO_DEFAULT | DO_USER_UNIQUE_ACT | DO_PUBLIC_PROGRESS) && !A.locked)
+			A.welded = FALSE
+			A.update_icon()
+			playsound(A, 'sound/effects/bang.ogg', 100, 1)
+			playsound(A, 'sound/machines/airlock_creaking.ogg', 100, 1)
+			A.visible_message(SPAN_DANGER("\The [user] tears \the [A] open with \a [src]!"))
+			addtimer(new Callback(A, /obj/machinery/door/airlock/.proc/open, TRUE), 0)
+			A.set_broken(TRUE)
+		return TRUE
+	else
+		A.visible_message(SPAN_DANGER("\The [user] pries the fingers of \a [src] in, beginning to force \the [A]!"))
+		if ((MACHINE_IS_BROKEN(A) || !A.is_powered() || do_after(user, 8 SECONDS, A, DO_DEFAULT | DO_USER_UNIQUE_ACT | DO_PUBLIC_PROGRESS)) && !(A.operating || A.welded || A.locked))
+			playsound(A, 'sound/machines/airlock_creaking.ogg', 100, 1)
+			if (A.density)
+				addtimer(new Callback(A, /obj/machinery/door/airlock/.proc/open, TRUE), 0)
+				if(!MACHINE_IS_BROKEN(A) && A.is_powered())
+					A.set_broken(TRUE)
+				A.visible_message(SPAN_DANGER("\The [user] forces \the [A] open with \a [src]!"))
+			else
+				addtimer(new Callback(A, /obj/machinery/door/airlock/.proc/close, TRUE), 0)
+				if (!MACHINE_IS_BROKEN(A) && A.is_powered())
+					A.set_broken(TRUE)
+				A.visible_message(SPAN_DANGER("\The [user] forces \the [A] closed with \a [src]!"))
+		return TRUE
+
+// Powerfist module
+
+/obj/item/rig_module/mounted/power_fist
+
+	name = "hand-mounted powerfists"
+	desc = "A pair of heavy powerfists to be installed into a hardsuit gauntlets."
+	icon_state = "module"
+
+	suit_overlay_active = null
+
+	activate_string = "Power up Fist"
+	deactivate_string = "Power off Fist"
+
+	interface_name = "hand-mounted powerfists"
+	interface_desc = "A pair of heavy powerfists to be installed into a hardsuit gauntlets."
+
+	usable = 0
+	selectable = 0
+	toggleable = 1
+	use_power_cost = 10 KILOWATTS
+	active_power_cost = 5 KILOWATTS
+	passive_power_cost = 0
+
+/obj/item/rig_module/mounted/power_fist/Process()
+
+	if(holder && holder.wearer)
+		if(!(locate(/obj/item/melee/powerfist/mounted) in holder.wearer))
+			deactivate()
+			return 0
+
+	return ..()
+
+/obj/item/rig_module/mounted/power_fist/activate()
+	var/mob/living/M = holder.wearer
+
+	if (!M.HasFreeHand())
+		to_chat(M, SPAN_DANGER("Your hands are full."))
+		deactivate()
+		return
+
+	var/obj/item/melee/powerfist/mounted/blade = new(M)
+	M.put_in_hands(blade)
+
+	if(!..())
+		return 0
+
+/obj/item/rig_module/mounted/power_fist/deactivate()
+
+	..()
+
+	var/mob/living/M = holder.wearer
+
+	if(!M)
+		return
+
+	for(var/obj/item/melee/powerfist/mounted/blade in M.contents)
+		qdel(blade)
diff --git a/mods/global_modpacks.dm b/mods/global_modpacks.dm
@@ -14,6 +14,7 @@
 #include "loadout_items/_loadout_items.dme"
 #include "lobbyscreen/_lobbyscreen.dme"
 #include "music_player/_music_player.dme"
+#include "ntnet/_ntnet.dme"
 #include "nyc_posters/_nyc_posters.dme"
 #include "ssinput/_ssinput.dme"
 #include "statusbar/_statusbar.dme"

diff --git a/mods/loadout_items/_loadout_items.dme b/mods/loadout_items/_loadout_items.dme
@@ -7,10 +7,12 @@
 #include "code/cloak.dm"
 #include "code/gloves.dm"
 #include "code/shoes.dm"
+#include "code/suits.dm"
 #include "code/uniforms.dm"
 #include "code/lists/accessories.dm"
 #include "code/lists/cloaks.dm"
 #include "code/lists/uniforms.dm"
+#include "code/lists/suits.dm"
 #include "code/lists/xenowear.dm"
 #include "code/loadout/loadout.dm"
 

diff --git a/mods/loadout_items/code/lists/accessories.dm b/mods/loadout_items/code/lists/accessories.dm
@@ -15,3 +15,27 @@
 	solgovranks["ranks (O-1 ensign)"] = /obj/item/clothing/accessory/solgov/rank/ec/officer
 	solgovranks["ranks (O-3 lieutenant)"] = /obj/item/clothing/accessory/solgov/rank/ec/officer/o3
 	gear_tweaks += new/datum/gear_tweak/path(solgovranks)
+
+// Cosmetics
+
+/datum/gear/brush
+	display_name = "hairbrush"
+	path = /obj/item/haircomb/brush
+	sort_category = "Cosmetics"
+
+/datum/gear/deodorant
+	display_name = "deodorant"
+	path = /obj/item/reagent_containers/spray/cleaner/deodorant
+	sort_category = "Cosmetics"
+
+/datum/gear/lipstick
+	display_name = "lipstick selection"
+	path = /obj/item/lipstick
+	sort_category = "Cosmetics"
+	flags = GEAR_HAS_TYPE_SELECTION
+
+/datum/gear/comb
+	display_name = "plastic comb"
+	path = /obj/item/haircomb
+	sort_category = "Cosmetics"
+	flags = GEAR_HAS_COLOR_SELECTION