From 4400f33748c145d254fb93b537b7db5c0a97e61c Mon Sep 17 00:00:00 2001 From: LordNest <77477080+LordNest@users.noreply.github.com> Date: Wed, 25 Oct 2023 22:24:20 +0400 Subject: [PATCH 01/13] Refactor and fix Pioneer corps away site (#1137) --- maps/sierra/sierra_ranks.dm | 2 - mods/_maps/farfleet/code/farfleet.dm | 5 +- mods/_maps/farfleet/code/farfleet_areas.dm | 26 ++- mods/_maps/farfleet/code/farfleet_crew.dm | 50 +++--- mods/_maps/farfleet/code/farfleet_faction.dm | 122 -------------- mods/_maps/farfleet/code/farfleet_items.dm | 137 ++++++++++++++-- .../farfleet/code/farfleet_structures.dm | 48 ++---- .../farfleet/icons/{ => mob}/lefthand.dmi | Bin mods/_maps/farfleet/icons/mob/onmob_head.dmi | Bin 0 -> 502 bytes mods/_maps/farfleet/icons/mob/onmob_suit.dmi | Bin 0 -> 731 bytes .../farfleet/icons/{ => mob}/righthand.dmi | Bin .../farfleet/icons/{ => obj}/bonfire.dmi | Bin .../farfleet/icons/{ => obj}/iccg_rifle.dmi | Bin .../farfleet/icons/{ => obj}/mbr_bullpup.dmi | Bin mods/_maps/farfleet/icons/{ => obj}/mr735.dmi | Bin mods/_maps/farfleet/icons/obj/obj_head.dmi | Bin 0 -> 331 bytes mods/_maps/farfleet/icons/obj/obj_suit.dmi | Bin 0 -> 381 bytes .../_maps/farfleet/icons/{ => obj}/stupor.dmi | Bin mods/_maps/farfleet/maps/farfleet-1.dmm | 154 ++++++++++-------- mods/_maps/farfleet/maps/farfleet-2.dmm | 112 ++++++++----- mods/_maps/sentinel/code/sentinel.dm | 1 + 21 files changed, 352 insertions(+), 305 deletions(-) rename mods/_maps/farfleet/icons/{ => mob}/lefthand.dmi (100%) create mode 100644 mods/_maps/farfleet/icons/mob/onmob_head.dmi create mode 100644 mods/_maps/farfleet/icons/mob/onmob_suit.dmi rename mods/_maps/farfleet/icons/{ => mob}/righthand.dmi (100%) rename mods/_maps/farfleet/icons/{ => obj}/bonfire.dmi (100%) rename mods/_maps/farfleet/icons/{ => obj}/iccg_rifle.dmi (100%) rename mods/_maps/farfleet/icons/{ => obj}/mbr_bullpup.dmi (100%) rename mods/_maps/farfleet/icons/{ => obj}/mr735.dmi (100%) create mode 100644 mods/_maps/farfleet/icons/obj/obj_head.dmi create mode 100644 mods/_maps/farfleet/icons/obj/obj_suit.dmi rename mods/_maps/farfleet/icons/{ => obj}/stupor.dmi (100%) diff --git a/maps/sierra/sierra_ranks.dm b/maps/sierra/sierra_ranks.dm index 1009631eee37c..0cf7dce22c20a 100644 --- a/maps/sierra/sierra_ranks.dm +++ b/maps/sierra/sierra_ranks.dm @@ -13,7 +13,6 @@ /datum/mil_branch/skrell_fleet, /datum/mil_branch/iccgn, /datum/mil_branch/css, - /datum/mil_branch/pioneer, /datum/mil_branch/fleet, /datum/mil_branch/scga ) @@ -26,7 +25,6 @@ /datum/mil_branch/skrell_fleet, /datum/mil_branch/iccgn, /datum/mil_branch/css, - /datum/mil_branch/pioneer, /datum/mil_branch/fleet, /datum/mil_branch/scga ) diff --git a/mods/_maps/farfleet/code/farfleet.dm b/mods/_maps/farfleet/code/farfleet.dm index 300292bf8a670..ea31ba6ac5d75 100644 --- a/mods/_maps/farfleet/code/farfleet.dm +++ b/mods/_maps/farfleet/code/farfleet.dm @@ -42,8 +42,9 @@ description = "Garibaldi-class Gunboat, ICCG Pioneer Corps Reconnaissance Craft." prefix = "mods/_maps/farfleet/maps/" suffixes = list("farfleet-1.dmm", "farfleet-2.dmm") - spawn_cost = 50 // Temporary disabled - player_cost = 50 + ban_ruins = list(/datum/map_template/ruin/away_site/patrol) + spawn_cost = 0.5 + player_cost = 7 spawn_weight = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/snz) diff --git a/mods/_maps/farfleet/code/farfleet_areas.dm b/mods/_maps/farfleet/code/farfleet_areas.dm index 39a1d8aa96756..f139bd4f27496 100644 --- a/mods/_maps/farfleet/code/farfleet_areas.dm +++ b/mods/_maps/farfleet/code/farfleet_areas.dm @@ -7,6 +7,7 @@ name = "\improper Officer's Locker Room" icon_state = "locker" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_CREW /area/ship/farfleet/crew/hydroponics name = "\improper Auxiliary Hydroponics" @@ -47,79 +48,93 @@ name = "\improper Hallway - Operative Deck" icon_state = "hallF" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/ship/farfleet/crew/hallway/upper name = "\improper Hallway - Hangar Deck" icon_state = "hallA" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/ship/farfleet/crew/brig name = "\improper Ship Brig" icon_state = "red" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_SECURITY /area/ship/farfleet/crew/brig/emergency_armory name = "\improper Emergency Armory" icon_state = "red" req_access = list(access_away_iccgn, access_away_iccgn_captain) + holomap_color = HOLOMAP_AREACOLOR_SECURITY /area/ship/farfleet/crew/brig/css name = "\improper Counsultant Room" icon_state = "red" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/ship/farfleet/engineering/hallway name = "\improper Engineering Hallway" icon_state = "yellow" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/ship/farfleet/engineering/equipment name = "\improper Engineering Equipment" icon_state = "yellow" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/ship/farfleet/engineering/atmos_equipment name = "\improper Atmospherics Equipment" icon_state = "yellow" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/ship/farfleet/engineering/storage name = "\improper Engineering Storage" icon_state = "engineering_locker" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/ship/farfleet/engineering/shield name = "\improper Shield Generator" icon_state = "yellow" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/ship/farfleet/engineering/fussion name = "\improper Fussion Zone" icon_state = "rust_reactor" ambience = list('sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambieng1.ogg') req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/ship/farfleet/engineering/fussion/control name = "\improper Fussion Control" icon_state = "green" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/ship/farfleet/engineering/atmospherics name = "\improper Atmospherics" icon_state = "atmos" ambience = list('sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambiatm1.ogg') req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/ship/farfleet/barracks name = "\improper Droptroops Section" icon_state = "locker" req_access = list(access_away_iccgn, access_away_iccgn_droptroops) + holomap_color = HOLOMAP_AREACOLOR_EXPLORATION /area/ship/farfleet/barracks/armory name = "\improper Droptroops Armory" icon_state = "red" req_access = list(access_away_iccgn, access_away_iccgn_droptroops, access_away_iccgn_sergeant) - + holomap_color = HOLOMAP_AREACOLOR_EXPLORATION @@ -127,6 +142,7 @@ name = "\improper Medical Bay" icon_state = "exam_room" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_MEDICAL /area/ship/farfleet/medbay/storage name = "\improper Medical Storage" @@ -151,6 +167,7 @@ name = "\improper Anomaly Materials " icon_state = "amaint" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/ship/farfleet/maintenance/storage name = "\improper Auxiliary Storage" @@ -173,11 +190,13 @@ name = "\improper Bridge" icon_state = "bridge" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/ship/farfleet/command/eva name = "\improper Fleet EVA" icon_state = "eva" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/ship/farfleet/command/equipment name = "\improper Fleet Equipment" @@ -188,17 +207,19 @@ name = "\improper SNZ Hangar" icon_state = "hangar" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_CARGO /area/ship/farfleet/command/hangar_canisters name = "\improper Fuel station" icon_state = "purple" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/ship/farfleet/command/launcher name = "\improper Fore Impulse Cannon" icon_state = "blue" req_access = list(access_away_iccgn) - + holomap_color = HOLOMAP_AREACOLOR_COMMAND @@ -206,3 +227,4 @@ name = "\improper Docking Bay" icon_state = "entry_1" req_access = list(access_away_iccgn) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING diff --git a/mods/_maps/farfleet/code/farfleet_crew.dm b/mods/_maps/farfleet/code/farfleet_crew.dm index c4606d517c97b..eb497b8f22092 100644 --- a/mods/_maps/farfleet/code/farfleet_crew.dm +++ b/mods/_maps/farfleet/code/farfleet_crew.dm @@ -99,13 +99,13 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" */ /datum/job/submap/away_iccgn_farfleet - title = "ICCG Droptrooper" + title = "Pioneer Corps Trooper" total_positions = 2 outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_droptroops - branch = /datum/mil_branch/pioneer - rank = /datum/mil_rank/pioneer/or3 - allowed_branches = list(/datum/mil_branch/pioneer) - allowed_ranks = list(/datum/mil_rank/pioneer/or3) + branch = /datum/mil_rank/iccgn + rank = /datum/mil_rank/iccgn/or3 + allowed_branches = list(/datum/mil_branch/iccgn) + allowed_ranks = list(/datum/mil_rank/iccgn/or3) supervisors = "sergeant" loadout_allowed = TRUE is_semi_antagonist = TRUE @@ -126,14 +126,14 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" access = list(access_away_iccgn, access_away_iccgn_droptroops, access_engine_equip) /datum/job/submap/away_iccgn_farfleet/iccgn_sergeant - title = "ICCG Droptrooper Sergeant" + title = "Pioneer Corps Sergeant" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_sergeant supervisors = "Recon captain, Command of the Pioneer Corps , ICCGN" - branch = /datum/mil_branch/pioneer - rank = /datum/mil_rank/pioneer/or5 - allowed_branches = list(/datum/mil_branch/pioneer) - allowed_ranks = list(/datum/mil_rank/pioneer/or5) + branch = /datum/mil_rank/iccgn + rank = /datum/mil_rank/iccgn/or5 + allowed_branches = list(/datum/mil_rank/iccgn) + allowed_ranks = list(/datum/mil_rank/iccgn/or5) loadout_allowed = TRUE is_semi_antagonist = TRUE info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \ @@ -158,10 +158,10 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" title = "Pioneer Corps Captain" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_captain - branch = /datum/mil_branch/pioneer - rank = /datum/mil_rank/pioneer/of5 - allowed_branches = list(/datum/mil_branch/pioneer) - allowed_ranks = list(/datum/mil_rank/pioneer/of5) + branch = /datum/mil_rank/iccgn + rank = /datum/mil_rank/iccgn/of5 + allowed_branches = list(/datum/mil_rank/iccgn) + allowed_ranks = list(/datum/mil_rank/iccgn/of5) supervisors = "command of the Pioneer Corps , ICCGN" loadout_allowed = TRUE is_semi_antagonist = TRUE @@ -187,12 +187,12 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" title = "Pioneer Corpsman" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_medic - branch = /datum/mil_branch/pioneer - rank = /datum/mil_rank/pioneer/of5 - allowed_branches = list(/datum/mil_branch/pioneer) + branch = /datum/mil_rank/iccgn + rank = /datum/mil_rank/iccgn/of5 + allowed_branches = list(/datum/mil_rank/iccgn) allowed_ranks = list( - /datum/mil_rank/pioneer/of1, - /datum/mil_rank/pioneer/of3 + /datum/mil_rank/iccgn/of1, + /datum/mil_rank/iccgn/of3 ) loadout_allowed = TRUE info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \ @@ -216,13 +216,13 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" access = list(access_away_iccgn, access_engine_equip) /datum/job/submap/away_iccgn_farfleet/iccgn_gunner - title = "Senior Technician" + title = "Pioneer Corps Technician" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_gunner - branch = /datum/mil_branch/pioneer - rank = /datum/mil_rank/pioneer/of3 - allowed_branches = list(/datum/mil_branch/pioneer) - allowed_ranks = list(/datum/mil_rank/pioneer/of3) + branch = /datum/mil_rank/iccgn + rank = /datum/mil_rank/iccgn/of3 + allowed_branches = list(/datum/mil_rank/iccgn) + allowed_ranks = list(/datum/mil_rank/iccgn/of3) supervisors = "captain" loadout_allowed = TRUE info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \ @@ -256,6 +256,7 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" allowed_branches = list(/datum/mil_branch/css) allowed_ranks = list(/datum/mil_rank/css/fa7) supervisors = "chief of 'P' Department, Confederate Security Service" + psi_faculties = list(PSI_COERCION = PSI_RANK_MASTER) loadout_allowed = TRUE info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \ Вы - сотрдник отдела 'П' Конфедеративной Службы Безопасности, приписанный к кораблю Пионерского Корпуса. \ @@ -277,6 +278,7 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" access = list(access_away_iccgn, access_away_iccgn_droptroops, access_away_iccgn_sergeant, access_away_iccgn_captain, access_engine_equip) + /* OUTFITS * ======= */ diff --git a/mods/_maps/farfleet/code/farfleet_faction.dm b/mods/_maps/farfleet/code/farfleet_faction.dm index 8ed91756334dc..7035a6b841f5d 100644 --- a/mods/_maps/farfleet/code/farfleet_faction.dm +++ b/mods/_maps/farfleet/code/farfleet_faction.dm @@ -1,125 +1,3 @@ -/datum/mil_branch/pioneer - name = "Gilgamesh Confederation Pioneer Corps" - name_short = "ICCGPC" - email_domain = "pc.gcc" - assistant_job = null - min_skill = list( - SKILL_HAULING = SKILL_BASIC, - SKILL_WEAPONS = SKILL_BASIC, - SKILL_EVA = SKILL_BASIC - ) - - rank_types = list( - /datum/mil_rank/pioneer/or3, - /datum/mil_rank/pioneer/or5, - /datum/mil_rank/pioneer/or7, - /datum/mil_rank/pioneer/of1, - /datum/mil_rank/pioneer/of3, - /datum/mil_rank/pioneer/of5, - /datum/mil_rank/pioneer/of6, - /datum/mil_rank/pioneer/of8, - /datum/mil_rank/pioneer/of9 - ) - - spawn_rank_types = list( - /datum/mil_rank/pioneer/or3, - /datum/mil_rank/pioneer/or5, - /datum/mil_rank/pioneer/or7, - /datum/mil_rank/pioneer/of1, - /datum/mil_rank/pioneer/of3, - /datum/mil_rank/pioneer/of5, - /datum/mil_rank/pioneer/of6, - /datum/mil_rank/pioneer/of8, - /datum/mil_rank/pioneer/of9 - ) - - -/datum/mil_branch/pioneer/New() - rank_types = subtypesof(/datum/mil_rank/pioneer) - ..() - - -/datum/mil_rank/pioneer/or3 - name = "Pioneer" - name_short = "Pnr" - accessory = list( - /obj/item/clothing/accessory/iccgn_rank/or3 - ) - sort_order = 30 - - -/datum/mil_rank/pioneer/or5 - name = "Pioneer-Sergeant" - name_short = "PSnt" - accessory = list( - /obj/item/clothing/accessory/iccgn_rank/or5 - ) - sort_order = 50 - - -/datum/mil_rank/pioneer/or7 - name = "Chief-Pioneer" - name_short = "ChPr" - accessory = list( - /obj/item/clothing/accessory/iccgn_rank/or7 - ) - sort_order = 70 - - -/datum/mil_rank/pioneer/of1 - name = "Junior Lieutenant-Pioneer" - name_short = "JLtP" - accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of1 - ) - sort_order = 110 - - -/datum/mil_rank/pioneer/of3 - name = "Lieutenant-Pioneer" - name_short = "LtP" - accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of3 - ) - sort_order = 130 - - -/datum/mil_rank/pioneer/of5 - name = "Captain-Leutenant" - name_short = "CptLt" - accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of5 - ) - sort_order = 150 - - -/datum/mil_rank/pioneer/of6 - name = "Captain of the third rank" - name_short = "Cpt3" - accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of6 - ) - sort_order = 160 - - -/datum/mil_rank/pioneer/of8 - name = "Vice-Admiral" - name_short = "VAdm" - accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of8 - ) - sort_order = 180 - - -/datum/mil_rank/pioneer/of9 - name = "Admiral of Pioneer Corps" - name_short = "AdmPC" - accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of9 - ) - sort_order = 190 - - /datum/mil_branch/css name = "Confederate Security Service" name_short = "ICCGCSS" diff --git a/mods/_maps/farfleet/code/farfleet_items.dm b/mods/_maps/farfleet/code/farfleet_items.dm index e5bca6b125db9..ac1b11b822b54 100644 --- a/mods/_maps/farfleet/code/farfleet_items.dm +++ b/mods/_maps/farfleet/code/farfleet_items.dm @@ -63,7 +63,7 @@ /obj/item/gun/projectile/automatic/assault_rifle/heltek name = "LA-700" desc = "HelTek LA-700 is a standart equipment of ICCG Space-assault Forces. Looks very similiar to STS-35." - icon = 'mods/_maps/farfleet/icons/iccg_rifle.dmi' + icon = 'mods/_maps/farfleet/icons/obj/iccg_rifle.dmi' icon_state = "iccg_rifle" /obj/item/gun/projectile/automatic/assault_rifle/heltek/on_update_icon() @@ -78,12 +78,12 @@ /obj/item/gun/projectile/automatic/mr735 name = "MR-735" desc = "A cheap rifle for close quarters combat, with an auto-firing mode available. HelTek MR-735 is a standard rifle for ICCG Space-assault Forces, designed without a stock for easier storage and combat in closed spaces. Perfect weapon for some ship's crew." - icon = 'mods/_maps/farfleet/icons/mr735.dmi' + icon = 'mods/_maps/farfleet/icons/obj/mr735.dmi' icon_state = "nostockrifle" item_state = "nostockrifle" item_icons = list( - slot_r_hand_str = 'mods/_maps/farfleet/icons/righthand.dmi', - slot_l_hand_str = 'mods/_maps/farfleet/icons/lefthand.dmi', + slot_r_hand_str = 'mods/_maps/farfleet/icons/mob/righthand.dmi', + slot_l_hand_str = 'mods/_maps/farfleet/icons/mob/lefthand.dmi', ) wielded_item_state = "nostockrifle_wielded" force = 10 @@ -117,12 +117,12 @@ /obj/item/gun/projectile/automatic/mbr name = "MBR" desc = "A shabby bullpup carbine. Despite its size, it looks a little uncomfortable, but it is robust. HelTek MBR is a standart equipment of ICCG Space-assault Forces, designed in a bullpup layout. Possesses autofire and is perfect for the ship's crew." - icon = 'mods/_maps/farfleet/icons/mbr_bullpup.dmi' + icon = 'mods/_maps/farfleet/icons/obj/mbr_bullpup.dmi' icon_state = "mbr_bullpup" item_state = "mbr_bullpup" item_icons = list( - slot_r_hand_str = 'mods/_maps/farfleet/icons/righthand.dmi', - slot_l_hand_str = 'mods/_maps/farfleet/icons/lefthand.dmi', + slot_r_hand_str = 'mods/_maps/farfleet/icons/mob/righthand.dmi', + slot_l_hand_str = 'mods/_maps/farfleet/icons/mob/lefthand.dmi', ) wielded_item_state = "mbr_bullpup-wielded" force = 10 @@ -157,12 +157,12 @@ /obj/item/gun/energy/laser/bonfire name = "Bonfire Carbine" desc = "Strange construction: laser carbine with underslung grenade launcher and very capable internal battery. HelTek Bonfire-75 is a weapon designed for suppressive fire in close quarters, where usage of ballistic weaponry will be uneffective or simply hazardous." - icon = 'mods/_maps/farfleet/icons/bonfire.dmi' + icon = 'mods/_maps/farfleet/icons/obj/bonfire.dmi' icon_state = "bonfire" item_state = "bonfire" item_icons = list( - slot_r_hand_str = 'mods/_maps/farfleet/icons/righthand.dmi', - slot_l_hand_str = 'mods/_maps/farfleet/icons/lefthand.dmi', + slot_r_hand_str = 'mods/_maps/farfleet/icons/mob/righthand.dmi', + slot_l_hand_str = 'mods/_maps/farfleet/icons/mob/lefthand.dmi', ) slot_flags = SLOT_BELT|SLOT_BACK w_class = ITEM_SIZE_LARGE @@ -213,12 +213,12 @@ /obj/item/gun/energy/ionrifle/small/stupor name = "Stupor ion pistol" desc = "The HelTek Stupor-45 is a compact anti-drone weapon. Due to their small output of EMP, you need be marksman to disable human-sized synthetic. But it's still better, than nothing." - icon = 'mods/_maps/farfleet/icons/stupor.dmi' + icon = 'mods/_maps/farfleet/icons/obj/stupor.dmi' icon_state = "stupor" item_state = "stupor" item_icons = list( - slot_r_hand_str = 'mods/_maps/farfleet/icons/righthand.dmi', - slot_l_hand_str = 'mods/_maps/farfleet/icons/lefthand.dmi', + slot_r_hand_str = 'mods/_maps/farfleet/icons/mob/righthand.dmi', + slot_l_hand_str = 'mods/_maps/farfleet/icons/mob/lefthand.dmi', ) fire_delay = 40 one_hand_penalty = 0 @@ -238,10 +238,119 @@ ammo_type = /obj/item/ammo_casing/pistol/nullglass /* VOIDSUITS AND RIGS - * ======== TODO: Make any suits instead of plaseholder + * ======== */ +/obj/item/clothing/head/helmet/space/void/pioneer + name = "pioneer corps voidsuit helmet" + desc = "A somewhat old-fashioned helmet in bright colors. On the forehead you can see the inscription PC ICCG. This one has radiation shielding." + icon = 'mods/_maps/farfleet/icons/obj/obj_head.dmi' + icon_state = "pioneer" + item_state = "pioneer" + item_icons = list(slot_head_str = 'mods/_maps/farfleet/icons/mob/onmob_head.dmi') + armor = list( + melee = ARMOR_MELEE_RESISTANT, + bullet = ARMOR_BALLISTIC_MINOR, + laser = ARMOR_LASER_MINOR, + bomb = ARMOR_BOMB_PADDED, + bio = ARMOR_BIO_SHIELDED, + rad = ARMOR_RAD_RESISTANT + ) + max_pressure_protection = ENG_VOIDSUIT_MAX_PRESSURE + siemens_coefficient = 0.3 + +/obj/item/clothing/suit/space/void/pioneer + name = "pioneer corps voidsuit" + desc = "A somewhat old-fashioned voidsuit in bright colors. On the shoulder you can see the inscription PC ICCG. This one has radiation shielding." + icon = 'mods/_maps/farfleet/icons/obj/obj_suit.dmi' + icon_state = "pioneer" + item_state = "pioneer" + item_icons = list(slot_wear_suit_str = 'mods/_maps/farfleet/icons/mob/onmob_suit.dmi') + max_pressure_protection = ENG_VOIDSUIT_MAX_PRESSURE + siemens_coefficient = 0.3 + armor = list( + melee = ARMOR_MELEE_RESISTANT, + bullet = ARMOR_BALLISTIC_MINOR, + laser = ARMOR_LASER_MINOR, + bomb = ARMOR_BOMB_PADDED, + bio = ARMOR_BIO_SHIELDED, + rad = ARMOR_RAD_RESISTANT + ) + allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/briefcase/inflatable,/obj/item/rcd,/obj/item/rpd, /obj/item/gun) + +/obj/item/clothing/suit/space/void/pioneer/prepared + helmet = /obj/item/clothing/head/helmet/space/void/pioneer + boots = /obj/item/clothing/shoes/magboots + item_flags = ITEM_FLAG_THICKMATERIAL | ITEM_FLAG_INVALID_FOR_CHAMELEON + +/obj/item/rig/pioneer + name = "pioneer corps suit control module" + desc = "A ridiculously bulky military hardsuit with PC-13AA inscription and a small ICCG crest on its control module. This suit's armor plates mostly replaced with anomaly and radiation shielding." + suit_type = "heavy" + icon_state = "gcc_rig" + online_slowdown = 2 ///chunky + offline_slowdown = 4 + armor = list( + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_RESISTANT, + laser = ARMOR_LASER_MAJOR, + energy = ARMOR_ENERGY_STRONG, + bomb = ARMOR_BOMB_PADDED, + bio = ARMOR_BIO_SHIELDED, + rad = ARMOR_RAD_SHIELDED + ) + initial_modules = list( + /obj/item/rig_module/vision/meson, + /obj/item/rig_module/chem_dispenser, + /obj/item/rig_module/ai_container, + /obj/item/rig_module/device/anomaly_scanner, + /obj/item/rig_module/power_sink, + /obj/item/rig_module/cooling_unit, + /obj/item/rig_module/maneuvering_jets + ) + + chest_type = /obj/item/clothing/suit/space/rig/pioneer + helm_type = /obj/item/clothing/head/helmet/space/rig/pioneer + boot_type = /obj/item/clothing/shoes/magboots/rig/pioneer + glove_type = /obj/item/clothing/gloves/rig/pioneer + +/obj/item/clothing/head/helmet/space/rig/pioneer + light_overlay = "helmet_light_dual_alt" + +/obj/item/clothing/suit/space/rig/pioneer + breach_threshold = 40 + species_restricted = list(SPECIES_HUMAN, SPECIES_IPC) + allowed = list( + /obj/item/gun, + /obj/item/ammo_magazine, + /obj/item/ammo_casing, + /obj/item/handcuffs, + /obj/item/device/flashlight, + /obj/item/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/melee/baton + ) +/obj/item/clothing/gloves/rig/pioneer + siemens_coefficient = 0 + +/obj/item/clothing/shoes/magboots/rig/pioneer + +/obj/item/rig/pioneer/sergeant + name = "pioneer corps sergeant suit control module" + desc = "A ridiculously bulky military hardsuit with PC-13AS inscription and a small ICCG crest on its control module. This suit's armor plates mostly replaced with anomaly and radiation shielding." + suit_type = "heavy" + + initial_modules = list( + /obj/item/rig_module/vision/meson, + /obj/item/rig_module/chem_dispenser, + /obj/item/rig_module/ai_container, + /obj/item/rig_module/mounted/ballistic/minigun, + /obj/item/rig_module/device/anomaly_scanner, + /obj/item/rig_module/power_sink, + /obj/item/rig_module/cooling_unit, + /obj/item/rig_module/maneuvering_jets + ) /* MISC * ======== diff --git a/mods/_maps/farfleet/code/farfleet_structures.dm b/mods/_maps/farfleet/code/farfleet_structures.dm index b552ea0c54b08..0027ea0347349 100644 --- a/mods/_maps/farfleet/code/farfleet_structures.dm +++ b/mods/_maps/farfleet/code/farfleet_structures.dm @@ -3,14 +3,14 @@ /////////////// /obj/structure/closet/secure_closet/guncabinet/farfleet - name = "droptrops cabinet" + name = "heavy armory cabinet" req_access = list(access_away_iccgn_droptroops) /obj/structure/closet/secure_closet/guncabinet/farfleet/antitank/WillContain() return list( - /obj/item/gun/magnetic/railgun = 2, + /obj/item/gun/magnetic/railgun = 1, /obj/item/gun/energy/ionrifle/small/stupor = 2, - /obj/item/rcd_ammo = 10 + /obj/item/rcd_ammo = 5 ) /obj/structure/closet/secure_closet/guncabinet/farfleet/ballistics/WillContain() @@ -56,7 +56,7 @@ ) /obj/structure/closet/secure_closet/farfleet - name = "trooper locker" + name = "pioneer locker" closet_appearance = /singleton/closet_appearance/secure_closet/farfleet/two req_access = list(access_away_iccgn_droptroops) @@ -80,7 +80,7 @@ /obj/structure/closet/secure_closet/farfleet/sergeant - name = "droptroops sergeant locker" + name = "pioneer sergeant locker" closet_appearance = /singleton/closet_appearance/secure_closet/farfleet/two req_access = list(access_away_iccgn_sergeant) @@ -108,7 +108,7 @@ ) /obj/structure/closet/secure_closet/farfleet/fleet - name = "fleet cabinet" + name = "crew cabinet" closet_appearance = /singleton/closet_appearance/secure_closet/farfleet req_access = list(access_away_iccgn) @@ -123,7 +123,7 @@ ) /obj/structure/closet/secure_closet/farfleet/fleet/engi - name = "fleet technician cabinet" + name = "corps technician cabinet" closet_appearance = /singleton/closet_appearance/secure_closet/farfleet req_access = list(access_away_iccgn) @@ -233,40 +233,16 @@ * ==== */ -/* -/obj/machinery/suit_storage_unit/away_iccgn_med - name = "Pioneer Corpsman Voidsuit Storage Unit" - suit= /obj/item/clothing/suit/space/void/pioneer/prepared +/obj/machinery/suit_storage_unit/pioneer + name = "pioneer corps voidsuit storage unit" + suit= /obj/item/clothing/suit/space/void/pioneer + helmet = /obj/item/clothing/head/helmet/space/void/pioneer boots = /obj/item/clothing/shoes/magboots tank = /obj/item/tank/oxygen + mask = /obj/item/clothing/mask/breath req_access = list(access_away_iccgn) islocked = 1 -/obj/machinery/suit_storage_unit/away_iccgn_eng - name = "Senior Technician Voidsuit Storage Unit" - suit= /obj/item/clothing/suit/space/void/pioneer/prepared - boots = /obj/item/clothing/shoes/magboots - tank = /obj/item/tank/oxygen - req_access = list(access_away_iccgn) - islocked = 1 - -/obj/machinery/suit_storage_unit/away_iccgn_pawn - name = "CSS Voidsuit Storage Unit" - suit= /obj/item/clothing/suit/space/void/pioneer/prepared - boots = /obj/item/clothing/shoes/magboots - tank = /obj/item/tank/oxygen - req_access = list(access_away_iccgn) - islocked = 1 - -/obj/machinery/suit_storage_unit/away_iccgn_com - name = "Captain Voidsuit Storage Unit" - suit= /obj/item/clothing/suit/space/void/pioneer/command/prepared - boots = /obj/item/clothing/shoes/magboots - tank = /obj/item/tank/oxygen - req_access = list(access_away_iccgn, access_away_iccgn_captain) - islocked = 1 - */ - /obj/structure/sign/farfleetplaque name = "\improper Pioneer Corps Plaque" desc = "Пионерский Корпус, сформированный в 2306 году является авангардом Конфедерации. Пионерский корпус не входит в состав Флота ГКК, выполняет ряд миротворческих и гуманитарных функций. На этой табличке - первые страницы приказа о создании Пионерского Корпуса." diff --git a/mods/_maps/farfleet/icons/lefthand.dmi b/mods/_maps/farfleet/icons/mob/lefthand.dmi similarity index 100% rename from mods/_maps/farfleet/icons/lefthand.dmi rename to mods/_maps/farfleet/icons/mob/lefthand.dmi diff --git a/mods/_maps/farfleet/icons/mob/onmob_head.dmi b/mods/_maps/farfleet/icons/mob/onmob_head.dmi new file mode 100644 index 0000000000000000000000000000000000000000..04e9342e0d471b134a8d9abf455e65552b980b57 GIT binary patch literal 502 zcmVQ~D>Hq)$0d!JMQvg8b*k%9#0Bd?w zSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1YO+ttc@!6~s2=QdV&Fa{(I+ z0DEs60Gs+1=>Px$3`s;mR7i>Kl(A03Fcd{yT84JBVzu%HE-amD1y%AGcuO{lcpp$9 zg_))9AG9Nuvt&bz{Yug-eh!l74!PU$JGxFR*^G4=sU@T7GZVO7r+5tbo+Y?jcu6qR z?Lt91b)oJlGhNwgM+J^sPIxjuoa|l%=9fm15V|d&f-u@#1RdCm_Aeay2D3O>N%k~e zEt}{d92DOym1%C0^C3g7FK2Z}@kX8F`RoyqGUD4$B>V#4YrtCsSVaX7&>Ezm#b;VE zo+TL1t607*qoM6N<$g7`wxl>h($ literal 0 HcmV?d00001 diff --git a/mods/_maps/farfleet/icons/mob/onmob_suit.dmi b/mods/_maps/farfleet/icons/mob/onmob_suit.dmi new file mode 100644 index 0000000000000000000000000000000000000000..8b292034c30f87e40d006bf91e70fa8dc36a869b GIT binary patch literal 731 zcmV<10wn#3P)X`I&E!hm6VLk$+^&lOh!gjS|K+FUfH|=0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sQ{=rHMK~Ii!&v&s2HS;i!-e#F*g;&Hsn%PaP@Nm8w>z@ZyNxc z`W5K_00H+&L_t(YiS3lJbDJ;}hlOLi9wW7fJtC2F8G8nfwLQdnO=`3k4{Amyw5N_X zxoi2eE1H7dgUgUTZ}Rukrw2&qN61^fqP&0*4mp%LWb!2>SAx2ACMXl1-TLB=#XF|2 zd-khJSCw)?aaRd$v%Z0T7F-MURcn0&0;9TO>edN6Uu%{Qf&9ni&|#r68?4j*p^I`~ zD7BZvON@i5pz=hOanT2JnZ+{C66rqsCb2af#4LKU9r9N6!t(w@S`^7f_Zv2$lroQ~ z6P|viY2Eh1D*BU1nYGdInatF6Z61e{Y)vh5^Xu%6vd)Z&PcO3<#->I>$KX1bG(3$2 z%Ud99-%o`d5WL^w+z7{HW;wcmz-!J89SLy5B=8vCKzJ7fj)i3gc%@k&{Cn4sTBZyL zG&;9@kU6wEL}uBga!5X`%2@d*n0 zl9#YUH!ZNxW(O#A(*g=)w>BB%+B}4iNoFSkWc%;0k?@Z56XG~NVZrxNu$~CpEegKJ z85UMe6hJ;+*cl6ag9J7a1nw|v#JB^)0-roWH;^Me78;5LJ29Sr{RK+fh^|BwD+mAp N002ovPDHLkV1fWPKr;XU literal 0 HcmV?d00001 diff --git a/mods/_maps/farfleet/icons/righthand.dmi b/mods/_maps/farfleet/icons/mob/righthand.dmi similarity index 100% rename from mods/_maps/farfleet/icons/righthand.dmi rename to mods/_maps/farfleet/icons/mob/righthand.dmi diff --git a/mods/_maps/farfleet/icons/bonfire.dmi b/mods/_maps/farfleet/icons/obj/bonfire.dmi similarity index 100% rename from mods/_maps/farfleet/icons/bonfire.dmi rename to mods/_maps/farfleet/icons/obj/bonfire.dmi diff --git a/mods/_maps/farfleet/icons/iccg_rifle.dmi b/mods/_maps/farfleet/icons/obj/iccg_rifle.dmi similarity index 100% rename from mods/_maps/farfleet/icons/iccg_rifle.dmi rename to mods/_maps/farfleet/icons/obj/iccg_rifle.dmi diff --git a/mods/_maps/farfleet/icons/mbr_bullpup.dmi b/mods/_maps/farfleet/icons/obj/mbr_bullpup.dmi similarity index 100% rename from mods/_maps/farfleet/icons/mbr_bullpup.dmi rename to mods/_maps/farfleet/icons/obj/mbr_bullpup.dmi diff --git a/mods/_maps/farfleet/icons/mr735.dmi b/mods/_maps/farfleet/icons/obj/mr735.dmi similarity index 100% rename from mods/_maps/farfleet/icons/mr735.dmi rename to mods/_maps/farfleet/icons/obj/mr735.dmi diff --git a/mods/_maps/farfleet/icons/obj/obj_head.dmi b/mods/_maps/farfleet/icons/obj/obj_head.dmi new file mode 100644 index 0000000000000000000000000000000000000000..db0a1cee375b01ae86cb4ef5ce43abc953d922a1 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*Or6rRG1NXcH~Y-V zoflet+}uJmU5k~=`fYYB4dl@UDr8_R3GxeOaCmkj4amu=3W+FjNi9w;$}A|!%+F(B zsF)KRR!~&>{Y!Ac$FEPcymhtCojD)8A=Kca@qe1P4th#xHghtYdqcg*%%$UuUsI9%@*UkoBHil|-slS!8F1iA3 zP4#qf4AGdFoFH+>!NcV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sQ{=rHMK~Ii!&v&s2C_>$ix8Nyzu0#qPaC|Cd$U^4~@l$RyL1lWr+ zIy%zK%gbQ`49q}*Wb;sjL)pxLz&rp+z#=2VtQ1Lrp~AwVxD?rQ#l^)46T$YBmmA{_ bn*jj;A+#ORl18vT00000NkvXXu0mjf4$P0n literal 0 HcmV?d00001 diff --git a/mods/_maps/farfleet/icons/stupor.dmi b/mods/_maps/farfleet/icons/obj/stupor.dmi similarity index 100% rename from mods/_maps/farfleet/icons/stupor.dmi rename to mods/_maps/farfleet/icons/obj/stupor.dmi diff --git a/mods/_maps/farfleet/maps/farfleet-1.dmm b/mods/_maps/farfleet/maps/farfleet-1.dmm index ba811682f3a80..99bbfc9c38766 100644 --- a/mods/_maps/farfleet/maps/farfleet-1.dmm +++ b/mods/_maps/farfleet/maps/farfleet-1.dmm @@ -117,7 +117,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22; req_access = list("ACCESS_ICCGN") }, @@ -132,7 +131,6 @@ /obj/machinery/fusion_fuel_injector/mapped{ anchored = 0; dir = 4; - icon_state = "injector0"; id_tag = "fusion_injector_farfleet"; req_access = list("ACCESS_ICCGN"); initial_id_tag = "fusion_injector_farfleet" @@ -452,7 +450,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22; req_access = list("ACCESS_ICCGN") }, @@ -1261,10 +1258,10 @@ /turf/simulated/floor/tiled, /area/ship/farfleet/crew/hallway/lower) "ec" = ( -/obj/structure/sign/double/iccgflag/left{ +/obj/floor_decal/industrial/outline/yellow, +/obj/structure/sign/double/iccgflag/right{ pixel_y = 32 }, -/obj/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/dock) "eg" = ( @@ -1996,9 +1993,7 @@ dir = 4; pixel_x = 26 }, -/obj/machinery/suit_storage_unit/security/alt{ - req_access = list("ACCESS_ICCGN") - }, +/obj/machinery/suit_storage_unit/pioneer, /turf/simulated/floor/tiled, /area/ship/farfleet/command/eva) "hp" = ( @@ -2956,6 +2951,12 @@ /obj/structure/sign/iccg{ pixel_y = 32 }, +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/farfleet/command/bridge) "ma" = ( @@ -2973,8 +2974,19 @@ /turf/simulated/floor/tiled, /area/ship/farfleet/engineering/equipment) "me" = ( -/obj/machinery/suit_storage_unit/standard_unit, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/table/rack, +/obj/structure/window/reinforced, +/obj/item/clothing/suit/space/emergency{ + pixel_x = 6 + }, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency{ + pixel_x = -6 + }, +/obj/machinery/door/window{ + dir = 8 + }, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/dock) "mf" = ( @@ -3138,28 +3150,6 @@ /obj/paint/dark_gunmetal, /turf/simulated/floor, /area/ship/farfleet/engineering/atmos_equipment) -"mN" = ( -/obj/structure/closet/secure_closet/guncabinet{ - req_access = list("ACCESS_ICCGN") - }, -/obj/item/ammo_magazine/rifle, -/obj/item/ammo_magazine/rifle, -/obj/item/ammo_magazine/rifle, -/obj/item/ammo_magazine/rifle, -/obj/item/ammo_magazine/rifle, -/obj/item/ammo_magazine/rifle, -/obj/item/ammo_magazine/rifle, -/obj/item/ammo_magazine/rifle, -/obj/item/ammo_magazine/rifle, -/obj/item/ammo_magazine/rifle, -/obj/item/ammo_magazine/rifle, -/obj/item/ammo_magazine/rifle, -/obj/item/gun/projectile/automatic/mbr, -/obj/item/gun/projectile/automatic/mbr, -/obj/item/gun/projectile/automatic/mbr, -/obj/item/gun/projectile/automatic/mbr, -/turf/simulated/floor/tiled/dark/monotile, -/area/ship/farfleet/crew/brig/emergency_armory) "mO" = ( /obj/machinery/power/shield_generator, /obj/structure/cable/yellow{ @@ -3307,25 +3297,21 @@ /obj/structure/closet/secure_closet/guncabinet{ req_access = list("ACCESS_ICCGN") }, -/obj/item/storage/box/ammo/flashshells, -/obj/item/storage/box/ammo/flashshells, -/obj/item/storage/box/ammo/shotgunshells, -/obj/item/storage/box/ammo/shotgunshells, -/obj/item/storage/box/ammo/stunshells, -/obj/item/storage/box/ammo/stunshells, -/obj/item/storage/box/ammo/shotgunammo, -/obj/item/storage/box/ammo/shotgunammo, -/obj/item/clothing/accessory/storage/bandolier, -/obj/item/clothing/accessory/storage/bandolier, -/obj/item/clothing/accessory/storage/bandolier, -/obj/item/clothing/accessory/storage/bandolier, /obj/machinery/light{ dir = 1 }, -/obj/item/gun/projectile/shotgun/pump/sawn, -/obj/item/gun/projectile/shotgun/pump/sawn, -/obj/item/gun/projectile/shotgun/pump/sawn, -/obj/item/gun/projectile/shotgun/pump/sawn, +/obj/item/gun/projectile/automatic/merc_smg, +/obj/item/gun/projectile/automatic/merc_smg, +/obj/item/gun/projectile/automatic/merc_smg, +/obj/item/gun/projectile/automatic/merc_smg, +/obj/item/ammo_magazine/smg, +/obj/item/ammo_magazine/smg, +/obj/item/ammo_magazine/smg, +/obj/item/ammo_magazine/smg, +/obj/item/ammo_magazine/smg, +/obj/item/ammo_magazine/smg, +/obj/item/ammo_magazine/smg, +/obj/item/ammo_magazine/smg, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/crew/brig/emergency_armory) "nC" = ( @@ -3550,6 +3536,12 @@ /area/ship/farfleet/dock) "ox" = ( /obj/structure/table/steel_reinforced, +/obj/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/ship/farfleet/command/bridge) "oz" = ( @@ -3695,6 +3687,7 @@ /obj/item/airlock_brace, /obj/item/airlock_brace, /obj/item/airlock_brace, +/obj/item/material/twohanded/jack/titanium, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/crew/brig/emergency_armory) "pw" = ( @@ -3786,7 +3779,8 @@ /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/glass/terran{ - name = "Bridge" + name = "Bridge"; + dir = 8 }, /obj/machinery/door/blast/regular/open{ id_tag = "pcbridge"; @@ -3979,6 +3973,12 @@ /obj/machinery/light{ dir = 8 }, +/obj/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/ship/farfleet/command/bridge) "rQ" = ( @@ -4183,7 +4183,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22; req_access = list("ACCESS_ICCGN") }, @@ -4366,6 +4365,12 @@ /obj/machinery/light{ dir = 4 }, +/obj/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/ship/farfleet/command/bridge) "uM" = ( @@ -4509,7 +4514,6 @@ /obj/structure/iv_stand, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22; req_access = list("ACCESS_ICCGN") }, @@ -4532,7 +4536,6 @@ /obj/machinery/fusion_fuel_injector/mapped{ anchored = 0; dir = 4; - icon_state = "injector0"; id_tag = "fusion_injector_farfleet"; req_access = list("ACCESS_ICCGN"); initial_id_tag = "fusion_injector_farfleet" @@ -4843,6 +4846,9 @@ pixel_y = 0 }, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/sign/double/iccgflag/left{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/dock) "zJ" = ( @@ -5064,10 +5070,10 @@ /turf/simulated/wall, /area/ship/farfleet/engineering/atmos_equipment) "Cd" = ( -/obj/structure/sign/double/iccgflag/right{ +/obj/floor_decal/industrial/outline/yellow, +/obj/structure/sign/warning/vacuum{ pixel_y = 32 }, -/obj/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/dock) "Cg" = ( @@ -5968,11 +5974,24 @@ /turf/simulated/floor/tiled/dark, /area/ship/farfleet/crew/brig/emergency_armory) "JX" = ( -/obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/light{ dir = 4 }, /obj/floor_decal/industrial/outline/yellow, +/obj/structure/table/rack, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/clothing/head/helmet/space/emergency{ + pixel_x = 7 + }, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency{ + pixel_x = -7 + }, +/obj/machinery/door/window/northright{ + dir = 8 + }, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/dock) "JY" = ( @@ -6094,9 +6113,7 @@ "Ls" = ( /obj/floor_decal/corner_steel_grid/diagonal, /obj/floor_decal/industrial/outline/yellow, -/obj/machinery/suit_storage_unit/security/alt{ - req_access = list("ACCESS_ICCGN") - }, +/obj/machinery/suit_storage_unit/pioneer, /turf/simulated/floor/tiled, /area/ship/farfleet/command/eva) "Lu" = ( @@ -6152,12 +6169,12 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/farfleet/engineering/atmospherics) "Mr" = ( -/obj/structure/closet/walllocker{ - pixel_x = -32 - }, /obj/item/gun/launcher/grenade, /obj/item/storage/box/fragshells, /obj/item/storage/box/fragshells, +/obj/structure/closet/secure_closet/guncabinet{ + req_access = list("ACCESS_ICCGN") + }, /turf/simulated/floor/tiled/dark, /area/ship/farfleet/crew/brig/emergency_armory) "Ms" = ( @@ -7525,6 +7542,16 @@ /obj/paint/dark_gunmetal, /turf/simulated/wall/r_wall, /area/ship/farfleet/maintenance) +"Ye" = ( +/obj/structure/table/steel_reinforced, +/obj/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/farfleet/command/bridge) "Yi" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -7689,7 +7716,6 @@ /obj/item/device/suit_cooling_unit, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22; req_access = list("ACCESS_ICCGN") }, @@ -13533,7 +13559,7 @@ ky nA hD Mr -mN +qr ky cn cn @@ -13655,7 +13681,7 @@ ky dU dU dU -qr +dU ky ky cn @@ -15104,7 +15130,7 @@ aa Cp eV eV -ox +Ye uL sI Ou diff --git a/mods/_maps/farfleet/maps/farfleet-2.dmm b/mods/_maps/farfleet/maps/farfleet-2.dmm index 6fe8e8f30def7..25b63743cff5b 100644 --- a/mods/_maps/farfleet/maps/farfleet-2.dmm +++ b/mods/_maps/farfleet/maps/farfleet-2.dmm @@ -566,7 +566,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/farfleet/barracks/armory) "fN" = ( -/obj/structure/table/steel_reinforced, +/obj/machinery/photocopier, /turf/simulated/floor/tiled/techmaint, /area/ship/farfleet/maintenance/anomaly) "fS" = ( @@ -657,6 +657,7 @@ icon_state = "4-8" }, /obj/floor_decal/industrial/outline/grey, +/obj/machinery/suspension_gen, /turf/simulated/floor/tiled/techfloor/grid, /area/ship/snz) "gJ" = ( @@ -727,10 +728,7 @@ /turf/simulated/floor/tiled/white, /area/ship/farfleet/crew/kitchen) "hj" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/machinery/photocopier, +/obj/structure/closet/radiation, /turf/simulated/floor/tiled/techmaint, /area/ship/farfleet/maintenance/anomaly) "hn" = ( @@ -1480,11 +1478,9 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/farfleet/maintenance/anomaly) "oX" = ( -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - req_access = list("ACCESS_ICCGN") +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, /area/ship/farfleet/maintenance/anomaly) @@ -1808,7 +1804,8 @@ /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/terran{ - name = "Droptroops Armory" + name = "Droptroops Armory"; + dir = 8 }, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/barracks/armory) @@ -1823,6 +1820,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/tiled/techmaint, /area/ship/farfleet/maintenance/anomaly) "rD" = ( @@ -1859,6 +1857,7 @@ dir = 4 }, /obj/floor_decal/industrial/outline/grey, +/obj/machinery/stasis_cage, /turf/simulated/floor/tiled/techfloor/grid, /area/ship/snz) "rS" = ( @@ -2475,6 +2474,7 @@ icon_state = "4-8" }, /obj/floor_decal/industrial/outline/grey, +/obj/structure/closet/toolcloset/excavation/awaysite, /turf/simulated/floor/tiled/techfloor/grid, /area/ship/snz) "xO" = ( @@ -2555,7 +2555,8 @@ /obj/machinery/door/firedoor, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/multi_tile/glass/terran{ - name = "Canteen" + name = "Canteen"; + dir = 8 }, /obj/structure/cable{ d1 = 4; @@ -2587,6 +2588,16 @@ /obj/machinery/light{ dir = 8 }, +/obj/item/anodevice, +/obj/item/anobattery{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/anobattery{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/scanner/health, /turf/simulated/floor/tiled/techmaint, /area/ship/farfleet/maintenance/anomaly) "yK" = ( @@ -2778,6 +2789,10 @@ }, /turf/simulated/floor/tiled/white, /area/ship/farfleet/crew/canteen) +"AE" = ( +/obj/machinery/portable_atmospherics/powered/pump, +/turf/simulated/floor/tiled/steel_ridged, +/area/ship/farfleet/maintenance/storage) "AJ" = ( /obj/floor_decal/corner/grey_alt/diagonal{ dir = 8 @@ -2924,7 +2939,8 @@ dir = 4 }, /obj/machinery/door/airlock/multi_tile/terran{ - name = "Hangar" + name = "Hangar"; + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/ship/farfleet/command/snz_hangar) @@ -3228,19 +3244,15 @@ "Eh" = ( /obj/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, /obj/item/rig_module/electrowarfare_suite, /obj/item/rig_module/electrowarfare_suite, /obj/item/rig_module/electrowarfare_suite, -/obj/item/rig_module/device/healthscanner, -/obj/item/rig_module/chem_dispenser/combat, -/obj/item/rig_module/chem_dispenser/combat, -/obj/item/rig_module/chem_dispenser/combat, /obj/structure/sign/double/iccgflag/left{ pixel_y = 32 }, +/obj/item/rig_module/grenade_launcher/light, +/obj/item/rig_module/grenade_launcher/light, +/obj/item/rig_module/grenade_launcher/light, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/barracks/armory) "En" = ( @@ -3415,18 +3427,10 @@ /obj/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, /obj/item/rig_module/device/rcd, -/obj/item/rig_module/grenade_launcher/light, -/obj/item/rig_module/grenade_launcher/light, -/obj/item/rig_module/grenade_launcher/light, -/obj/item/rig_module/power_sink, -/obj/item/rig_module/power_sink, -/obj/item/rig_module/power_sink, -/obj/item/rig_module/self_destruct/small, -/obj/item/rig_module/self_destruct/small, -/obj/item/rig_module/self_destruct/small, /obj/item/rig_module/vision/multi, /obj/item/rig_module/vision/nvg, /obj/item/rig_module/vision/nvg, +/obj/item/rig_module/device/healthscanner, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/barracks/armory) "Gq" = ( @@ -3725,6 +3729,7 @@ dir = 4 }, /obj/floor_decal/industrial/outline/grey, +/obj/machinery/anomaly_container, /turf/simulated/floor/tiled/techfloor/grid, /area/ship/snz) "Kr" = ( @@ -3753,8 +3758,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ship/snz) "KE" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22; + req_access = list("ACCESS_ICCGN") + }, /obj/structure/table/steel_reinforced, -/obj/machinery/microscope, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/techmaint, /area/ship/farfleet/maintenance/anomaly) "KF" = ( @@ -4279,9 +4289,13 @@ "QR" = ( /obj/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/rig/combat, -/obj/item/rig/combat, -/obj/item/rig/combat, +/obj/item/rig/pioneer{ + pixel_y = 6 + }, +/obj/item/rig/pioneer, +/obj/item/rig/pioneer/sergeant{ + pixel_y = -5 + }, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/barracks/armory) "QU" = ( @@ -4977,6 +4991,25 @@ }, /turf/simulated/floor/tiled/white, /area/ship/farfleet/crew/canteen) +"Wj" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22; + req_access = list("ACCESS_ICCGN") + }, +/turf/simulated/floor/carpet/purple, +/area/ship/farfleet/crew/brig/css) +"Wx" = ( +/obj/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24; + req_access = list("ACCESS_ICCGN") + }, +/turf/simulated/floor/tiled/dark, +/area/ship/farfleet/crew/brig) "Wy" = ( /obj/structure/cable{ d1 = 4; @@ -5326,7 +5359,8 @@ /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/terran{ - name = "Droptroops Locker" + name = "Droptroops Locker"; + dir = 8 }, /turf/simulated/floor/tiled/dark/monotile, /area/ship/farfleet/barracks) @@ -13207,7 +13241,7 @@ st UH yf en -Ep +Wx Bi bF EK @@ -13450,7 +13484,7 @@ DT DT dw lT -BA +Wj Lf DT OQ @@ -14442,7 +14476,7 @@ AY ns ME zR -hj +px oX yB KE @@ -14686,7 +14720,7 @@ AY ns VB zR -px +hj sg sg sg @@ -15788,7 +15822,7 @@ xD Rv dZ MY -xD +AE SV Ud ab diff --git a/mods/_maps/sentinel/code/sentinel.dm b/mods/_maps/sentinel/code/sentinel.dm index 11bdf9d892082..8b56d874d1e9e 100644 --- a/mods/_maps/sentinel/code/sentinel.dm +++ b/mods/_maps/sentinel/code/sentinel.dm @@ -43,6 +43,7 @@ description = "Cobra-class Patrol Craft." prefix = "mods/_maps/sentinel/maps/" suffixes = list("sentinel-1.dmm", "sentinel-2.dmm") + ban_ruins = list(/datum/map_template/ruin/away_site/farfleet) spawn_cost = 0.5 player_cost = 7 spawn_weight = 1 From 8bbcffbddc343d45be48964b2e2f684c2f549562 Mon Sep 17 00:00:00 2001 From: SierraKomodo <11140088+SierraKomodo@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:34:45 +0300 Subject: [PATCH 02/13] [MIRROR] Remove extra R&D sign from deck 1 stairs --- maps/torch/torch5_deck1.dmm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/maps/torch/torch5_deck1.dmm b/maps/torch/torch5_deck1.dmm index bfa5116a0e85a..8f2df95626762 100644 --- a/maps/torch/torch5_deck1.dmm +++ b/maps/torch/torch5_deck1.dmm @@ -17200,12 +17200,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery) -"fDm" = ( -/obj/structure/sign/science_1{ - dir = 1 - }, -/turf/simulated/wall/prepainted, -/area/rnd/entry) "fDJ" = ( /obj/floor_decal/corner/blue{ dir = 5 @@ -52255,7 +52249,7 @@ pzZ axw iTC rvY -fDm +aBP lkb nLb nLb From 4ae52fe6ae97033e1279d18945bf1b886948af88 Mon Sep 17 00:00:00 2001 From: AzzyIsNotHere <29222142+AzzyIsNotHere@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:35:12 +0300 Subject: [PATCH 03/13] [MIRROR] Fixes the extremely small typo in the fax names --- maps/torch/torch_define.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/torch/torch_define.dm b/maps/torch/torch_define.dm index 8eae69a3f4547..14d125c47494e 100644 --- a/maps/torch/torch_define.dm +++ b/maps/torch/torch_define.dm @@ -32,7 +32,7 @@ "SFP Territory Support", "SFP Special Investigations", "SFP Fugitive Recovery", - "Sol Fleet Mars Commmand", + "Sol Fleet Mars Command", "Bureau of Diplomatic Affairs", "Emergency Management Bureau", "Secure Routing Service" From b942fdae5c1786cabd7d2370d6ca178f09d44314 Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:35:53 +0300 Subject: [PATCH 04/13] [MIRROR] Change disposal constant overlay image path to icon var --- code/modules/recycling/disposal.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 08b02903b9ff9..1ac6c6e767e6c 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -355,7 +355,7 @@ GLOBAL_LIST_EMPTY(diversion_junctions) // flush handle if(flush) - AddOverlays(image('icons/obj/pipes/disposal.dmi', "dispover-handle")) + AddOverlays(image(icon, "dispover-handle")) // only handle is shown if no power if(!is_powered() || mode == -1) @@ -363,13 +363,13 @@ GLOBAL_LIST_EMPTY(diversion_junctions) // check for items/vomit in disposal - occupied light if(length(contents) > LAZYLEN(component_parts) || reagents.total_volume) - AddOverlays(image('icons/obj/pipes/disposal.dmi', "dispover-full")) + AddOverlays(image(icon, "dispover-full")) // charging and ready light if(mode == 1) - AddOverlays(image('icons/obj/pipes/disposal.dmi', "dispover-charge")) + AddOverlays(image(icon, "dispover-charge")) else if(mode == 2) - AddOverlays(image('icons/obj/pipes/disposal.dmi', "dispover-ready")) + AddOverlays(image(icon, "dispover-ready")) // timed process // charge the gas reservoir and perform flush if ready From 401d3ea10278852bcb62723836fda1afb059ba7c Mon Sep 17 00:00:00 2001 From: Alex6511 <7919184+Alex6511@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:35:26 +0300 Subject: [PATCH 05/13] [MIRROR] Remove further references to things that don't exist --- maps/away/mining/mining.dm | 4 ++-- maps/random_ruins/exoplanet_ruins/marooned/marooned.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maps/away/mining/mining.dm b/maps/away/mining/mining.dm index 9319415d39917..7347d304caa96 100644 --- a/maps/away/mining/mining.dm +++ b/maps/away/mining/mining.dm @@ -101,9 +101,9 @@ return res /datum/map_template/ruin/away_site/mining_signal - name = "Mining - Planetoid" + name = "Mining - Dwarf Planet" id = "awaysite_mining_signal" - description = "A mineral-rich, formerly-volcanic site on a planetoid." + description = "A mineral-rich, formerly-volcanic site on a dwarf planet." suffixes = list("mining/mining-signal.dmm") spawn_cost = 1 generate_mining_by_z = 1 diff --git a/maps/random_ruins/exoplanet_ruins/marooned/marooned.dm b/maps/random_ruins/exoplanet_ruins/marooned/marooned.dm index 6573832440b6d..61b726672a5e3 100644 --- a/maps/random_ruins/exoplanet_ruins/marooned/marooned.dm +++ b/maps/random_ruins/exoplanet_ruins/marooned/marooned.dm @@ -59,7 +59,7 @@ /obj/item/paper/marooned/note03 info = "Day 4. Saw some animals outside. Look pretty ferocious, and probably not edible. I'll stick to MREs for now.
I guess I'll start with how I ended up here. We were on a special mission far away from Magnitka, checking something for the Academy of Sciences, anomalous readings of some sort. The professor looked pretty excited, but I didn't really understand the technical details. We got few scientists embedded in our crew, a civilian hull paintjob and 'alternative' transponder codes. Business as usual." /obj/item/paper/marooned/note04 - info = "Day 5.
We got to the destination without much trouble. A planetoid, in an uncharted sector of space. Scientists locked down the readings they were looking for, and we sent a team down. They returned with some sort of obelisk, etched with symbols I've never seen before, maybe 3 meters tall. Should've ditched that thing out of airlock there and then." + info = "Day 5.
We got to the destination without much trouble. A dwarf planet, in an uncharted sector of space. Scientists locked down the readings they were looking for, and we sent a team down. They returned with some sort of obelisk, etched with symbols I've never seen before, maybe 3 meters tall. Should've ditched that thing out of airlock there and then." /obj/item/paper/marooned/note05 info = "Day 8. Made a running wave antenna and jury rigged some amplification for the radio. Hope someone will hear the signal.
That obelisk was trouble. People on guard duty in cargo hold kept complaining about headaches and hearing things. Some didn't. They were nice enough to offer to take the shifts of those who complained. Now that I think about it, that's when they started acting weird." /obj/item/paper/marooned/note06 From de85cde72193a629f8435e3693a42586e36cf525 Mon Sep 17 00:00:00 2001 From: SierraKomodo <11140088+SierraKomodo@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:34:58 +0300 Subject: [PATCH 06/13] [MIRROR] Various electronic assembly window fixes --- .../integrated_electronics/core/assemblies.dm | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index 125187ad67fec..50d343f9f0bf0 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -157,7 +157,8 @@ if(opened) open_interact(user) - closed_interact(user) + else + closed_interact(user) /obj/item/device/electronic_assembly/proc/closed_interact(mob/user) var/HTML = list() @@ -210,12 +211,12 @@ for(var/i = start_index to min(length(assembly_components), start_index + (components_per_page - 1))) var/obj/item/integrated_circuit/circuit = assembly_components[i] HTML += "\[ [i] \] | " - HTML += "\[R\] | " + HTML += "\[R\] | " if(circuit.removable) HTML += "\[-\] | " else HTML += "\[-\] | " - HTML += "[circuit.displayed_name]" + HTML += "[circuit.displayed_name]" HTML += "
" if(length(assembly_components) > components_per_page) @@ -275,17 +276,22 @@ if(href_list["remove"]) try_remove_component(component, usr) - else - // Adjust the position - if(href_list["set_slot"]) - var/selected_slot = input("Select a new slot", "Select slot", current_pos) as null|num - if(!check_interactivity(usr)) - return 0 - if(selected_slot < 1 || selected_slot > length(assembly_components)) - return 0 - - assembly_components.Remove(component) - assembly_components.Insert(selected_slot, component) + else if (href_list["rename_component"]) + component.rename_component() + + else if(href_list["set_slot"]) + var/selected_slot = input("Select a new slot", "Select slot", current_pos) as null|num + if(!check_interactivity(usr)) + return 0 + if(selected_slot < 1 || selected_slot > length(assembly_components)) + return 0 + + assembly_components.Remove(component) + assembly_components.Insert(selected_slot, component) + + else if (href_list["examine_component"]) + component.interact(usr) + return interact(usr) // To refresh the UI. From 2500b8aa1c4aaa9ff897d606819367aab2b64346 Mon Sep 17 00:00:00 2001 From: SierraKomodo <11140088+SierraKomodo@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:35:05 +0300 Subject: [PATCH 07/13] [MIRROR] Update console glow when updating icon --- code/game/machinery/computer/computer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 6ac304b64da2c..a7aba9f1062d9 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -41,6 +41,7 @@ visible_message(SPAN_WARNING("\The [src] breaks!")) /obj/machinery/computer/on_update_icon() + update_glow() ClearOverlays() icon = initial(icon) icon_state = initial(icon_state) @@ -62,7 +63,6 @@ if(reason_broken & MACHINE_BROKEN_NO_PARTS) - set_light(0) icon = 'icons/obj/machines/computer.dmi' icon_state = "wired" var/screen = get_component_of_type(/obj/item/stock_parts/console_screen) From ba72b0023b5cd39b5c32a03a9f23e7da72ec03cb Mon Sep 17 00:00:00 2001 From: emmanuelbassil <6874235+emmanuelbassil@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:35:19 +0300 Subject: [PATCH 08/13] [MIRROR] Fixes speedpunching --- code/game/objects/objs.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index d96f2c259d6ad..dd8c587cfa014 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -251,6 +251,8 @@ var/datum/unarmed_attack/attack = assailant.get_unarmed_attack(src) if (!attack) return ..() + assailant.do_attack_animation(src) + assailant.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) var/damage = attack.damage + rand(1,5) var/attack_verb = "[pick(attack.attack_verb)]" @@ -268,11 +270,8 @@ SPAN_WARNING("\The [assailant] [attack_verb] \the [src]!"), SPAN_WARNING("You [attack_verb] \the [src]!") ) - assailant.do_attack_animation(src) - assailant.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) damage_health(damage, attack.get_damage_type(), attack.damage_flags()) return - ..() /obj/is_fluid_pushable(amt) From bf2f0dda166da9e1ef5cac1926bf2f8a3ad7dff5 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:54:46 +0300 Subject: [PATCH 09/13] [MIRROR] fix changelog yaml loading deprecations (#1177) Co-authored-by: Spookerton <918997+Spookerton@users.noreply.github.com> Co-authored-by: SuhEugene <32931701+SuhEugene@users.noreply.github.com> --- tools/changelog/generate_cl.py | 4 ++-- tools/changelog/sierra_check_changelog.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/changelog/generate_cl.py b/tools/changelog/generate_cl.py index 8d84218312374..4fde5a3543ae8 100644 --- a/tools/changelog/generate_cl.py +++ b/tools/changelog/generate_cl.py @@ -70,8 +70,9 @@ write_cl['delete-after'] = True +yaml = yaml.YAML(type='safe',pure=True) with open(Path.cwd().joinpath("tools/changelog/tags.yml")) as file: - tags = yaml.safe_load(file) + tags = yaml.load(file) write_cl['changes'] = [] @@ -83,7 +84,6 @@ if write_cl['changes']: with io.StringIO() as cl_contents: - yaml = yaml.YAML() yaml.indent(sequence=4, offset=2) yaml.dump(write_cl, cl_contents) cl_contents.seek(0) diff --git a/tools/changelog/sierra_check_changelog.py b/tools/changelog/sierra_check_changelog.py index 05e8a1dd7d9e2..3a321f065d74c 100644 --- a/tools/changelog/sierra_check_changelog.py +++ b/tools/changelog/sierra_check_changelog.py @@ -73,8 +73,9 @@ if not write_cl['author']: print("There are spaces or tabs instead of author username") +yaml = yaml.YAML(type='safe',pure=True) with open(Path.cwd().joinpath("tags.yml")) as file: - tags = yaml.safe_load(file) + tags = yaml.load(file) write_cl['changes'] = [] From d45dbf9fdcc0b429a243e9c4f054f2c200694b88 Mon Sep 17 00:00:00 2001 From: TheNightingale <137739943+TheNightingale@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:34:38 +0300 Subject: [PATCH 10/13] [MIRROR] Removes server-crashing TC option --- code/datums/uplink/badassery.dm | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/code/datums/uplink/badassery.dm b/code/datums/uplink/badassery.dm index 53555c823a7bb..4f9dc35ff7a12 100644 --- a/code/datums/uplink/badassery.dm +++ b/code/datums/uplink/badassery.dm @@ -57,26 +57,6 @@ /datum/uplink_item/item/badassery/random_one/can_buy(obj/item/device/uplink/U) return U.uses -/datum/uplink_item/item/badassery/random_many - name = "Random Items" - desc = "Buys you as many random items as you can afford. Convenient packaging NOT included!" - -/datum/uplink_item/item/badassery/random_many/cost(telecrystals, obj/item/device/uplink/U) - return max(1, telecrystals) - -/datum/uplink_item/item/badassery/random_many/get_goods(obj/item/device/uplink/U, loc) - var/list/bought_items = list() - for(var/datum/uplink_item/UI in get_random_uplink_items(U, U.uses, loc)) - UI.purchase_log(U) - var/obj/item/I = UI.get_goods(U, loc) - if(istype(I)) - bought_items += I - - return bought_items - -/datum/uplink_item/item/badassery/random_many/purchase_log(obj/item/device/uplink/U) - log_and_message_admins("used \the [U.loc] to buy \a [src]") - /**************** * Surplus Crate * ****************/ From 908e3b3f4918ae529c25c4354f55cb258b37147f Mon Sep 17 00:00:00 2001 From: Spookerton <918997+Spookerton@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:35:39 +0300 Subject: [PATCH 11/13] [MIRROR] correct spelling of incorrectly spelled gencl param --- tools/changelog/generate_cl.py | 2 +- tools/changelog/sierra_check_changelog.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/changelog/generate_cl.py b/tools/changelog/generate_cl.py index 4fde5a3543ae8..96b2bb8d03a01 100644 --- a/tools/changelog/generate_cl.py +++ b/tools/changelog/generate_cl.py @@ -70,7 +70,7 @@ write_cl['delete-after'] = True -yaml = yaml.YAML(type='safe',pure=True) +yaml = yaml.YAML(typ='safe',pure=True) with open(Path.cwd().joinpath("tools/changelog/tags.yml")) as file: tags = yaml.load(file) diff --git a/tools/changelog/sierra_check_changelog.py b/tools/changelog/sierra_check_changelog.py index 3a321f065d74c..7806ff5c12c41 100644 --- a/tools/changelog/sierra_check_changelog.py +++ b/tools/changelog/sierra_check_changelog.py @@ -73,7 +73,7 @@ if not write_cl['author']: print("There are spaces or tabs instead of author username") -yaml = yaml.YAML(type='safe',pure=True) +yaml = yaml.YAML(typ='safe',pure=True) with open(Path.cwd().joinpath("tags.yml")) as file: tags = yaml.load(file) From 4c470782246fc4c7b6c5956e04e30e39d846d11e Mon Sep 17 00:00:00 2001 From: SierraKomodo <11140088+SierraKomodo@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:34:52 +0300 Subject: [PATCH 12/13] [MIRROR] Remove arterial bleed confusion --- code/modules/organs/internal/heart.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/organs/internal/heart.dm b/code/modules/organs/internal/heart.dm index 6eff2c4fcfd01..98c3576101bb0 100644 --- a/code/modules/organs/internal/heart.dm +++ b/code/modules/organs/internal/heart.dm @@ -178,8 +178,6 @@ SPAN_DANGER("Blood sprays out from \the [owner]'s [spray_organ]!"), FONT_HUGE(SPAN_DANGER("Blood sprays out from your [spray_organ]!")) ) - owner.set_confused(1) - owner.eye_blurry = 2 //AB occurs every heartbeat, this only throttles the visible effect next_blood_squirt = world.time + 80 From 59898aa16e1f0e9bf2c5360dc5ab0159fa6964d0 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Thu, 26 Oct 2023 17:16:27 +0300 Subject: [PATCH 13/13] =?UTF-8?q?=D0=A7=D0=B5=D0=B9=D0=BD=D0=B4=D0=B6?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3=20=D0=B4=D0=BB=D1=8F=20PR=20#1171=20[ci=20sk?= =?UTF-8?q?ip]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/changelogs/AutoChangeLog-sierra-pr-1171.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1171.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1171.yml b/html/changelogs/AutoChangeLog-sierra-pr-1171.yml new file mode 100644 index 0000000000000..b8e9312ed5498 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1171.yml @@ -0,0 +1,5 @@ +author: SierraKomodo +changes: + - {balance: Arterial bleeds no longer cause confusion or blurred vision when they + trigger.} +delete-after: true