diff --git a/.gitignore b/.gitignore index f4771f2ef16..8ef9946abc9 100644 --- a/.gitignore +++ b/.gitignore @@ -211,9 +211,6 @@ Temporary Items /tools/tgs_test/bin/* /tools/tgs_test/obj/* -# TGUI bundles - SKYRAT EDIT -/tgui/public/tgui-common.bundle.js - # Built auxtools libraries and intermediate files aux*.dll libaux*.so @@ -244,19 +241,6 @@ define_sanity_output.txt # ezdb /db/ /config/ezdb.txt -<<<<<<< HEAD -<<<<<<< HEAD -======= # Running OpenDream locally tgstation.json -<<<<<<< HEAD -.cargo-lock ->>>>>>> 5d81843b3302 (Raptor faction fix (#85792)) -======= ->>>>>>> 8fa9db8869f0 (Reverts accidental .gitignore changes (#86114)) -======= - -# Running OpenDream locally -tgstation.json ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/README.md b/README.md index 7a4a4f6d307..dd60afc886b 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,6 @@ This is Skyrat's downstream fork of /tg/station created in byond. Space Station 13 is a paranoia-laden round-based roleplaying game set against the backdrop of a nonsensical, metal death trap masquerading as a space station, with charming spritework designed to represent the sci-fi setting and its dangerous undertones. Have fun, and survive! -<<<<<<< HEAD ## Important note - TEST YOUR PULL REQUESTS You are responsible for the testing of your content and providing proof of such in your pull request. You should not mark a pull request ready for review until you have actually tested it. If you require a separate client for testing, you can use a guest account by logging out of BYOND and connecting to your test server. Test merges are not for bug finding, they are for stress tests where local testing simply doesn't allow for this. @@ -35,9 +34,6 @@ You are responsible for the testing of your content and providing proof of such ![image](https://i.imgur.com/aJnE4WT.png) [Modularisation Guide](./modular_skyrat/readme.md) -======= -*All github inquiries (such as moderation actions) may be handled via the /tg/station discord [#coding-general](https://discord.com/channels/326822144233439242/326831214667235328). Simply ping the `@Maintainer` role, following the guide on asking questions located in the channel description, with your issue!* ->>>>>>> 43b48e715e70 (Update README.md to include how to actually get help (#86025)) ## DOWNLOADING diff --git a/SQL/database_changelog.md b/SQL/database_changelog.md index 7c6a6ece2b7..22257e22cf1 100644 --- a/SQL/database_changelog.md +++ b/SQL/database_changelog.md @@ -2,35 +2,20 @@ Any time you make a change to the schema files, remember to increment the databa Make sure to also update `DB_MAJOR_VERSION` and `DB_MINOR_VERSION`, which can be found in `code/__DEFINES/subsystem.dm`. -<<<<<<< HEAD The latest database version is 5.30 (5.27 for /tg/); The query to update the schema revision table is: ```sql INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 30); -======= -The latest database version is 5.27; The query to update the schema revision table is: - -```sql -INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 27); ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ``` or ```sql -<<<<<<< HEAD INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 30); -======= -INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 27); ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ``` In any query remember to add a prefix to the table names if you use one. ----------------------------------------------------- -<<<<<<< HEAD Version 5.30, 26 April 2024, by zephyrtfa -======= -Version 5.27, 26 April 2024, by zephyrtfa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Add the ip intel whitelist table ```sql DROP TABLE IF EXISTS `ipintel_whitelist`; @@ -44,7 +29,6 @@ CREATE TABLE `ipintel_whitelist` ( /*!40101 SET character_set_client = @saved_cs_client */; ``` ----------------------------------------------------- -<<<<<<< HEAD Version 5.29, 08 January 2024, by Useroth Add a new table for age-checking purposes. Optional if you don't ever intend to use the age prompt. @@ -59,31 +43,20 @@ CREATE TABLE `player_dob` ( ----------------------------------------------------- Version 5.28, 03 December 2023, by distributivgesetz -======= -Version 5.26, 03 December 2023, by distributivgesetz ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Set the default value of cloneloss to 0, as it's obsolete and it won't be set by blackbox anymore. ```sql ALTER TABLE `death` MODIFY COLUMN `cloneloss` SMALLINT(5) UNSIGNED DEFAULT '0'; ``` ----------------------------------------------------- -<<<<<<< HEAD Version 5.27, 27 September 2023, by Jimmyl -======= -Version 5.25, 27 September 2023, by Jimmyl ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Removes the text_adventures table because it is no longer used ```sql DROP TABLE IF EXISTS `text_adventures`; ``` ----------------------------------------------------- -<<<<<<< HEAD Version 5.26, 17 May 2023, by LemonInTheDark -======= -Version 5.24, 17 May 2023, by LemonInTheDark ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Modified the library action table to fit ckeys properly, and to properly store ips. ```sql ALTER TABLE `library_action` MODIFY COLUMN `ckey` varchar(32) NOT NULL; @@ -91,11 +64,7 @@ Modified the library action table to fit ckeys properly, and to properly store i ``` ----------------------------------------------------- -<<<<<<< HEAD Version 5.25, 28 December 2022, by Mothblocks -======= -Version 5.23, 28 December 2022, by Mothblocks ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Added `tutorial_completions` to mark what ckeys have completed contextual tutorials. ```sql @@ -108,11 +77,7 @@ CREATE TABLE `tutorial_completions` ( ``` ----------------------------------------------------- -<<<<<<< HEAD Version 5.24, 22 December 2021, by Mothblocks -======= -Version 5.22, 22 December 2021, by Mothblocks ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fixes a bug in `telemetry_connections` that limited the range of IPs. ```sql @@ -120,11 +85,7 @@ ALTER TABLE `telemetry_connections` MODIFY COLUMN `address` INT(10) UNSIGNED NOT ``` ----------------------------------------------------- -<<<<<<< HEAD Version 5.23, 15 December 2021, by Mothblocks -======= -Version 5.21, 15 December 2021, by Mothblocks ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Adds `telemetry_connections` table for tracking tgui telemetry. ```sql @@ -142,11 +103,7 @@ CREATE TABLE `telemetry_connections` ( ``` ----------------------------------------------------- -<<<<<<< HEAD Version 5.22, 11 November 2021, by Mothblocks -======= -Version 5.20, 11 November 2021, by Mothblocks ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Adds `admin_ckey` field to the `known_alts` table to track who added what. ```sql @@ -155,11 +112,7 @@ ADD COLUMN `admin_ckey` VARCHAR(32) NOT NULL DEFAULT '*no key*' AFTER `ckey2`; ``` ----------------------------------------------------- -<<<<<<< HEAD Version 5.21, 10 November 2021, by WalterMeldron -======= -Version 5.19, 10 November 2021, by WalterMeldron ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Adds an urgent column to tickets for ahelps marked as urgent. ```sql @@ -167,11 +120,7 @@ ALTER TABLE `ticket` ADD COLUMN `urgent` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0 ``` ----------------------------------------------------- -<<<<<<< HEAD Version 5.20, 1 November 2021, by Mothblocks -======= -Version 5.18, 1 November 2021, by Mothblocks ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Added `known_alts` table for tracking who not to create suspicious logins for. ```sql @@ -185,11 +134,7 @@ CREATE TABLE `known_alts` ( ``` ----------------------------------------------------- -<<<<<<< HEAD Version 5.19, 8 October 2021, by MrStonedOne + Mothblocks -======= -Version 5.17, 8 October 2021, by MrStonedOne + Mothblocks ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Changes any table that requrired a NOT NULL round ID to now accept NULL. In the BSQL past, these were handled as 0, but in the move to rust-g this behavior was lost. ```sql @@ -208,7 +153,6 @@ ALTER TABLE `ticket` CHANGE `round_id` `round_id` INT(11) UNSIGNED NULL; ``` ----------------------------------------------------- -<<<<<<< HEAD Version 5.18, 23 August 2021, by GoldenAlpharex Added `discord_report` column to the `ban table` @@ -218,9 +162,6 @@ Added `discord_report` column to the `ban table` ----------------------------------------------------- Version 5.17, 31 July 2021, by Atlanta-Ned -======= -Version 5.16, 31 July 2021, by Atlanta-Ned ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Added `library_action` table for tracking reported library books and actions taken on them. ```sql @@ -239,11 +180,7 @@ CREATE TABLE `library_action` ( ----------------------------------------------------- -<<<<<<< HEAD Version 5.16, 2 June 2021, by Mothblocks -======= -Version 5.15, 2 June 2021, by Mothblocks ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Added verified admin connection log used for 2FA ```sql @@ -260,11 +197,7 @@ CREATE TABLE `admin_connections` ( ----------------------------------------------------- -<<<<<<< HEAD Version 5.15, xx May 2021, by Anturke -======= -Version 5.14, xx May 2021, by Anturke ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Added exploration drone adventure table ```sql @@ -281,11 +214,7 @@ CREATE TABLE `text_adventures` ( ----------------------------------------------------- -<<<<<<< HEAD Version 5.14, 30 April 2021, by Atlanta Ned -======= -Version 5.13, 30 April 2021, by Atlanta Ned ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Added the `citation` table for tracking security citations in the database. ```sql @@ -314,7 +243,6 @@ AUTO_INCREMENT=1 ----------------------------------------------------- -<<<<<<< HEAD Version 5.13, 9 March, 2021, by Useroth Implemented some features to help with running multiple servers on the same database and easily differentiate @@ -360,8 +288,6 @@ Version 5.12, 29 December 2020, by Missfox Modified table `messages`, adding column `playtime` to show the user's playtime when the note was created. ALTER TABLE `messages` ADD `playtime` INT(11) NULL DEFAULT(NULL) AFTER `severity` ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - ----------------------------------------------------- Version 5.11, 7 September 2020, by bobbahbrown, MrStonedOne, and Jordie0608 (Updated 26 March 2021 by bobbahbrown) diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql index 1d875b61a0c..fba7edfcb7a 100644 --- a/SQL/tgstation_schema.sql +++ b/SQL/tgstation_schema.sql @@ -660,7 +660,6 @@ CREATE TABLE `discord_links` ( ) ENGINE=InnoDB; -- -<<<<<<< HEAD -- Table structure for table `game_log` -- DROP TABLE IF EXISTS `game_log`; @@ -676,8 +675,6 @@ CREATE TABLE `game_log` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -- -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 -- Table structure for table `admin_connections` -- DROP TABLE IF EXISTS `admin_connections`; diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm index e1acbbf4f28..047d4b4c042 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm @@ -2,11 +2,7 @@ "a" = ( /turf/closed/mineral/random/snow, /area/icemoon/surface/outdoors/nospawn) -<<<<<<< HEAD -"c" = ( -======= "b" = ( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/circuitboard/machine/space_heater, /obj/item/stack/cable_coil/five, /obj/structure/frame/machine, @@ -177,8 +173,6 @@ /obj/effect/decal/cleanable/ash, /turf/open/floor/carpet/blue, /area/ruin/smoking_room/room) -<<<<<<< HEAD -======= "E" = ( /obj/item/trash/shrimp_chips, /obj/item/cigarette/rollie/trippy{ @@ -193,7 +187,6 @@ /obj/effect/spawner/random/special_lighter, /turf/open/floor/wood, /area/ruin/smoking_room/house) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "F" = ( /obj/structure/table/wood/fancy/black, /obj/item/storage/fancy/cigarettes/cigars/cohiba, @@ -279,23 +272,6 @@ }, /turf/open/floor/wood, /area/ruin/smoking_room/house) -<<<<<<< HEAD -"U" = ( -/obj/item/trash/shrimp_chips, -/obj/item/cigarette/rollie/trippy{ - pixel_x = 3; - pixel_y = -1 - }, -/obj/item/cigarette/rollie/trippy{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/effect/spawner/random/trash/bin, -/obj/effect/spawner/random/special_lighter, -/turf/open/floor/wood, -/area/ruin/smoking_room/house) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "V" = ( /obj/structure/fireplace, /obj/effect/turf_decal/siding/wood, @@ -397,11 +373,7 @@ x B r S -<<<<<<< HEAD -c -======= b ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 I Q Q @@ -499,11 +471,7 @@ a a a I -<<<<<<< HEAD -U -======= E ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 u y L diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 83f08dce288..4b922fa8394 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -406,13 +406,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ruin/powered/beach) -<<<<<<< HEAD -======= "mv" = ( /obj/effect/spawner/message_in_a_bottle/low_prob, /turf/open/misc/beach/coast, /area/ruin/powered/beach) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mw" = ( /obj/structure/flora/coconuts, /turf/open/misc/beach/sand, @@ -555,22 +552,7 @@ /obj/item/toy/beach_ball, /turf/open/misc/beach/sand, /area/ruin/powered/beach) -<<<<<<< HEAD -"sa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/chair/stool/bar/directional/south, -/turf/open/floor/wood, -/area/ruin/powered/beach) -"sl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/closed/wall/mineral/wood/nonmetal, -/area/ruin/powered/beach) -"sz" = ( -======= "rU" = ( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/condiment/enzyme, /obj/item/reagent_containers/cup/beaker{ pixel_x = 5 @@ -578,12 +560,6 @@ /obj/structure/table, /turf/open/floor/wood, /area/ruin/powered/beach) -<<<<<<< HEAD -"sA" = ( -/mob/living/basic/crab{ - name = "Jon" - }, -======= "sa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/structure/chair/stool/bar/directional/south, @@ -599,7 +575,6 @@ /mob/living/basic/crab{ name = "Jon" }, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/beach/sand, /area/ruin/powered/beach) "sV" = ( @@ -896,18 +871,6 @@ /area/ruin/powered/beach) "Fa" = ( /obj/structure/chair/stool/bar/directional/south, -<<<<<<< HEAD -/turf/open/floor/wood, -/area/ruin/powered/beach) -"Fj" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/chair/stool/directional/south, -/obj/item/storage/backpack/duffelbag, -/obj/item/clothing/under/shorts/red, -/obj/item/clothing/glasses/sunglasses, -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/wood, /area/ruin/powered/beach) "Fr" = ( @@ -951,8 +914,6 @@ /obj/item/book/manual/wiki/cooking_to_serve_man, /obj/item/clothing/suit/apron/chef, /obj/item/clothing/head/utility/chefhat, -<<<<<<< HEAD -======= /turf/open/floor/wood, /area/ruin/powered/beach) "Gf" = ( @@ -966,7 +927,6 @@ /obj/item/storage/backpack/duffelbag, /obj/item/clothing/under/shorts/red, /obj/item/clothing/glasses/sunglasses, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/wood, /area/ruin/powered/beach) "Gf" = ( @@ -1033,10 +993,7 @@ dir = 1 }, /obj/machinery/light/directional/south, -<<<<<<< HEAD -======= /obj/effect/spawner/message_in_a_bottle/low_prob, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/beach/coast/corner{ dir = 8 }, @@ -2042,11 +1999,7 @@ bG bL VI VI -<<<<<<< HEAD -yT -======= mv ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pz Eu pz @@ -2073,11 +2026,7 @@ Lm Lm rv VI -<<<<<<< HEAD -Fj -======= GA ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bH bM VI diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm index adbc2cb5353..edd734ee6f5 100644 --- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm @@ -1062,11 +1062,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/dangerous_research/lab) "oJ" = ( -<<<<<<< HEAD -/obj/structure/closet/crate/medical, -======= /obj/structure/closet/crate/secure/interdyne, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/stack/medical/suture/emergency, /obj/item/stack/medical/gauze/twelve, /obj/item/reagent_containers/hypospray/medipen/blood_loss, @@ -2159,11 +2155,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/dangerous_research/lab) "BG" = ( -<<<<<<< HEAD -/obj/structure/closet/crate, -======= /obj/structure/closet/crate/secure/interdyne, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/stack/sheet/mineral/plasma/thirty, /obj/item/stack/sheet/mineral/wood/fifty, /obj/item/stack/sheet/iron/fifty, @@ -3666,11 +3658,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/dangerous_research) "VQ" = ( -<<<<<<< HEAD -/obj/structure/closet/crate, -======= /obj/structure/closet/crate/secure/interdyne, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/waterbottle/large, /obj/item/reagent_containers/cup/glass/waterbottle/large, /obj/item/reagent_containers/cup/glass/waterbottle/large, diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm index 2d7c9429777..6aca5d7938a 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm @@ -253,16 +253,6 @@ /obj/structure/closet/secure_closet/freezer/empty, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) -<<<<<<< HEAD -"jy" = ( -/obj/structure/closet/cardboard, -/obj/item/toy/plush/snakeplushie, -/obj/item/clothing/glasses/eyepatch, -/obj/item/cigarette/cigar/havana, -/turf/open/floor/plating/dumpsterair, -/area/ruin/space/has_grav/garbagetruck/foodwaste) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ki" = ( /obj/effect/spawner/random/trash/food_packaging, /obj/item/shard, @@ -483,8 +473,6 @@ }, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) -<<<<<<< HEAD -======= "wv" = ( /obj/structure/closet/cardboard, /obj/item/toy/plush/snakeplushie, @@ -492,7 +480,6 @@ /obj/item/cigarette/cigar/havana, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wR" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/item/food/badrecipe/moldy/bacteria{ @@ -504,12 +491,6 @@ /area/ruin/space/has_grav/garbagetruck/foodwaste) "xf" = ( /obj/item/trash/tray, -<<<<<<< HEAD -/obj/item/trash/waffles, -/obj/item/trash/waffles, -/obj/item/trash/waffles, -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/food/grown/mushroom/plumphelmet, /obj/structure/closet/crate/trashcart, /mob/living/basic/mouse/rat, @@ -767,15 +748,12 @@ /obj/item/food/cornchips/random, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) -<<<<<<< HEAD -======= "Fz" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/item/stock_parts/power_store/cell/lead, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/garbagetruck/foodwaste) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "FL" = ( /obj/structure/closet/cardboard, /obj/item/pen/blue, @@ -892,15 +870,6 @@ }, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/garbagetruck/foodwaste) -<<<<<<< HEAD -"Ji" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/lead, -/turf/open/floor/iron/smooth, -/area/ruin/space/has_grav/garbagetruck/foodwaste) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "JH" = ( /obj/item/petri_dish/random, /obj/item/petri_dish/random, @@ -916,23 +885,6 @@ /obj/effect/spawner/random/medical/surgery_tool, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) -<<<<<<< HEAD -"Kj" = ( -/obj/item/clothing/head/cone{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/machinery/light/warm, -/obj/machinery/power/apc{ - locked = 0; - pixel_y = -25; - start_charge = 0 - }, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron, -/area/ruin/space/has_grav/garbagetruck/foodwaste) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "KD" = ( /obj/structure/closet/crate/critter, /obj/item/dog_bone{ @@ -1108,8 +1060,6 @@ /obj/effect/decal/cleanable/food/tomato_smudge, /turf/open/floor/plating/dumpsterair, /area/ruin/space/has_grav/garbagetruck/foodwaste) -<<<<<<< HEAD -======= "PU" = ( /obj/item/clothing/head/cone{ pixel_x = 8; @@ -1124,7 +1074,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron, /area/ruin/space/has_grav/garbagetruck/foodwaste) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Qi" = ( /obj/item/book/bible, /obj/structure/closet/crate/cardboard, @@ -1330,11 +1279,7 @@ Sa XY Od kJ -<<<<<<< HEAD -Ji -======= Fz ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gI OD Sa @@ -1343,11 +1288,7 @@ rL HC YB iH -<<<<<<< HEAD -jy -======= wv ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 KD wR nS @@ -1471,11 +1412,7 @@ XY Od fI bF -<<<<<<< HEAD -Kj -======= PU ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 OD Sa Qi diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm index fb6172ff2f3..01ef1895a66 100644 --- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm +++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm @@ -43,8 +43,6 @@ }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -======= "bi" = ( /obj/structure/rack, /obj/item/reagent_containers/syringe/bluespace{ @@ -57,7 +55,6 @@ /obj/machinery/door/window/survival_pod/left/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/hilbertresearchfacility) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bE" = ( /turf/open/floor/iron/stairs, /area/ruin/space/has_grav/powered/hilbertresearchfacility) @@ -255,8 +252,6 @@ /obj/structure/railing/corner, /turf/open/floor/glass, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -======= "hB" = ( /obj/machinery/door/window/survival_pod/left/directional/east, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -265,7 +260,6 @@ /obj/item/stack/cable_coil/cut, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hL" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/siding/thinplating_new/light{ @@ -500,17 +494,6 @@ /obj/item/transfer_valve, /turf/open/floor/plating/airless, /area/ruin/space) -<<<<<<< HEAD -"mz" = ( -/obj/structure/rack, -/obj/item/clothing/suit/bio_suit/cmo, -/obj/item/clothing/head/bio_hood/cmo, -/obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/obj/machinery/door/window/survival_pod/left/directional/south, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/powered/hilbertresearchfacility) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mC" = ( /obj/machinery/chem_mass_spec, /turf/open/floor/mineral/titanium/tiled/blue, @@ -553,21 +536,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -"nv" = ( -/obj/structure/rack, -/obj/item/reagent_containers/syringe/bluespace{ - pixel_y = 2 - }, -/obj/item/reagent_containers/syringe/bluespace{ - pixel_y = 8 - }, -/obj/structure/window/reinforced/survival_pod/spawner/directional/east, -/obj/machinery/door/window/survival_pod/left/directional/south, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/powered/hilbertresearchfacility) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nx" = ( /obj/machinery/door/window/left/directional/south, /obj/effect/decal/cleanable/dirt, @@ -583,15 +551,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -"nK" = ( -/obj/structure/rack, -/obj/item/gun/syringe, -/obj/machinery/door/window/survival_pod/left/directional/west, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/powered/hilbertresearchfacility) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nM" = ( /obj/structure/lattice, /turf/template_noop, @@ -615,17 +574,6 @@ /obj/item/assembly/signaler, /turf/open/floor/plating/airless, /area/ruin/space) -<<<<<<< HEAD -"nY" = ( -/obj/machinery/door/window/survival_pod/left/directional/east, -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 5 - }, -/obj/item/stack/cable_coil/cut, -/turf/open/floor/mineral/titanium/tiled/purple, -/area/ruin/space/has_grav/powered/hilbertresearchfacility) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "og" = ( /obj/item/slime_extract/bluespace, /obj/effect/decal/cleanable/dirt, @@ -702,17 +650,6 @@ }, /turf/open/floor/iron/grimy, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -"qj" = ( -/obj/machinery/door/window/survival_pod/left/directional/west, -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/titanium/tiled/purple, -/area/ruin/space/has_grav/powered/hilbertresearchfacility) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qC" = ( /obj/machinery/transport/tram_controller/hilbert, /turf/closed/indestructible/riveted/plastinum/nodiagonal, @@ -797,15 +734,12 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -======= "th" = ( /obj/structure/rack, /obj/item/gun/syringe, /obj/machinery/door/window/survival_pod/left/directional/west, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/hilbertresearchfacility) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ty" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/stock_parts/matter_bin/bluespace{ @@ -854,8 +788,6 @@ /obj/effect/turf_decal/trimline/neutral/mid_joiner, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -======= "us" = ( /obj/machinery/door/window/survival_pod/left/directional/west, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -863,7 +795,6 @@ }, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uV" = ( /obj/effect/turf_decal/siding/thinplating_new/light{ dir = 5 @@ -891,8 +822,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -======= "vz" = ( /obj/structure/rack, /obj/item/clothing/suit/bio_suit/cmo, @@ -901,7 +830,6 @@ /obj/machinery/door/window/survival_pod/left/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/hilbertresearchfacility) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vG" = ( /obj/structure/fluff/tram_rail/end{ dir = 8 @@ -1042,8 +970,6 @@ /obj/item/grown/bananapeel/mimanapeel, /turf/open/floor/glass, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -======= "yK" = ( /obj/machinery/door/window/survival_pod/left/directional/west, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -1052,7 +978,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "yO" = ( /obj/structure/door_assembly/door_assembly_shuttle, /turf/open/floor/mineral/titanium/blue, @@ -1233,8 +1158,6 @@ /obj/effect/landmark/transport/nav_beacon/tram/nav/immovable_rod, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -======= "BF" = ( /obj/machinery/door/window/survival_pod/left/directional/west, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -1242,7 +1165,6 @@ }, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "BH" = ( /obj/item/kirbyplants/photosynthetic, /obj/effect/turf_decal/stripes/red/line, @@ -1308,16 +1230,6 @@ }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -"CB" = ( -/obj/machinery/door/window/survival_pod/left/directional/west, -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 10 - }, -/turf/open/floor/mineral/titanium/tiled/purple, -/area/ruin/space/has_grav/powered/hilbertresearchfacility) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "CO" = ( /turf/open/floor/glass, /area/ruin/space/has_grav/powered/hilbertresearchfacility) @@ -1352,8 +1264,6 @@ }, /turf/open/floor/engine, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -======= "DO" = ( /obj/machinery/door/window/survival_pod/left/directional/east, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -1362,7 +1272,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "DR" = ( /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) @@ -1459,16 +1368,6 @@ /obj/item/paper_bin, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -"Fy" = ( -/obj/machinery/door/window/survival_pod/left/directional/west, -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 9 - }, -/turf/open/floor/mineral/titanium/tiled/purple, -/area/ruin/space/has_grav/powered/hilbertresearchfacility) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "FB" = ( /obj/structure/table/wood, /obj/item/lighter, @@ -1495,18 +1394,6 @@ /obj/structure/table/reinforced, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -"Gr" = ( -/obj/machinery/door/window/survival_pod/left/directional/west, -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/mob/living/basic/slime/hilbert, -/turf/open/floor/mineral/titanium/tiled/purple, -/area/ruin/space/has_grav/powered/hilbertresearchfacility) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Gs" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 @@ -1702,17 +1589,6 @@ /obj/item/flashlight/lamp/green, /turf/open/floor/carpet/black, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -"JW" = ( -/obj/effect/decal/remains/human, -/obj/machinery/door/window/survival_pod/left/directional/east, -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 6 - }, -/turf/open/floor/mineral/titanium/tiled/purple, -/area/ruin/space/has_grav/powered/hilbertresearchfacility) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Kd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/wooden, @@ -1838,8 +1714,6 @@ /obj/structure/girder, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -======= "NJ" = ( /obj/effect/decal/remains/human, /obj/machinery/door/window/survival_pod/left/directional/east, @@ -1848,7 +1722,6 @@ }, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "NU" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -2117,17 +1990,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -"SL" = ( -/obj/machinery/door/window/survival_pod/left/directional/east, -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/titanium/tiled/purple, -/area/ruin/space/has_grav/powered/hilbertresearchfacility) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "SR" = ( /obj/structure/railing{ dir = 4 @@ -2295,8 +2157,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/hilbertresearchfacility) -<<<<<<< HEAD -======= "WC" = ( /obj/machinery/door/window/survival_pod/left/directional/west, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -2306,7 +2166,6 @@ /mob/living/basic/slime/hilbert, /turf/open/floor/mineral/titanium/tiled/purple, /area/ruin/space/has_grav/powered/hilbertresearchfacility) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "WI" = ( /obj/structure/table/wood, /obj/item/food/cornchips/blue, @@ -3280,11 +3139,7 @@ Bo Bo Bo Bo -<<<<<<< HEAD -nv -======= bi ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sz Bo Dk @@ -3323,11 +3178,7 @@ Dk Dk Dk Bo -<<<<<<< HEAD -mz -======= vz ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 te Bo Dk @@ -3367,11 +3218,7 @@ Dk Dk Bo Ok -<<<<<<< HEAD -nK -======= th ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bo Dk Dk @@ -3734,19 +3581,11 @@ Bo Bk Bk Bo -<<<<<<< HEAD -nY -JW -Bo -SL -JW -======= hB NJ Bo DO NJ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bo Dk Dk @@ -4054,19 +3893,11 @@ Bo Dk Dk Bo -<<<<<<< HEAD -qj -CB -Bo -Fy -Gr -======= yK us Bo BF WC ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bo Dk Dk diff --git a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm index b0a604d132d..abccc6b550e 100644 --- a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm +++ b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm @@ -557,8 +557,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/mineral/titanium/tiled/white, /area/ruin/space/has_grav/infested_frigate) -<<<<<<< HEAD -======= "hX" = ( /obj/structure/cable, /obj/machinery/airalarm/directional/north, @@ -568,7 +566,6 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/infested_frigate) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ie" = ( /obj/structure/showcase/machinery{ icon_state = "autolathe"; @@ -2487,18 +2484,6 @@ /obj/machinery/computer/operating, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/infested_frigate) -<<<<<<< HEAD -"NW" = ( -/obj/structure/cable, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/all_access, -/obj/machinery/icecream_vat{ - desc = "Waffle Corp. actually ordered these guys to steal one of these just to be sure." - }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/infested_frigate) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "NX" = ( /obj/structure/table/glass, /obj/effect/decal/cleanable/glass, @@ -3388,11 +3373,7 @@ fl wP EQ wP -<<<<<<< HEAD -NW -======= hX ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SM ME KT diff --git a/_maps/RandomRuins/SpaceRuins/the_outlet.dmm b/_maps/RandomRuins/SpaceRuins/the_outlet.dmm index 464332c4637..f31929b70a4 100644 --- a/_maps/RandomRuins/SpaceRuins/the_outlet.dmm +++ b/_maps/RandomRuins/SpaceRuins/the_outlet.dmm @@ -85,8 +85,6 @@ }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/the_outlet/researchrooms) -<<<<<<< HEAD -======= "cL" = ( /obj/effect/rune/apocalypse{ req_cultists = 999 @@ -94,7 +92,6 @@ /obj/structure/destructible/cult/pants_altar, /turf/open/floor/cult, /area/ruin/space/has_grav/the_outlet/cultinfluence) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cZ" = ( /obj/structure/kitchenspike, /obj/effect/decal/cleanable/blood/gibs{ @@ -558,8 +555,6 @@ /obj/item/clothing/suit/jacket/straight_jacket, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/the_outlet/researchrooms) -<<<<<<< HEAD -======= "oI" = ( /obj/structure/rack, /obj/item/clothing/head/cowboy/brown, @@ -572,7 +567,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/eighties, /area/ruin/space/has_grav/the_outlet/storefront) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ps" = ( /obj/structure/rack, /obj/item/clothing/under/misc/bouncer, @@ -1042,21 +1036,6 @@ }, /turf/open/floor/iron/white, /area/ruin/space/has_grav/the_outlet/cultinfluence) -<<<<<<< HEAD -"zk" = ( -/obj/structure/rack, -/obj/item/clothing/head/cowboy/brown, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/under/costume/dutch, -/obj/item/clothing/suit/costume/poncho, -/obj/item/cigarette/cigar, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/eighties, -/area/ruin/space/has_grav/the_outlet/storefront) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "zm" = ( /obj/effect/spawner/random/vending/colavend, /turf/open/floor/eighties, @@ -1710,16 +1689,6 @@ /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/iron/white, /area/ruin/space/has_grav/the_outlet/researchrooms) -<<<<<<< HEAD -"Ob" = ( -/obj/effect/rune/apocalypse{ - req_cultists = 999 - }, -/obj/structure/destructible/cult/pants_altar, -/turf/open/floor/cult, -/area/ruin/space/has_grav/the_outlet/cultinfluence) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Od" = ( /obj/effect/baseturf_helper/asteroid/airless, /turf/open/floor/cult, @@ -3461,11 +3430,7 @@ HV xI TM nq -<<<<<<< HEAD -zk -======= oI ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 HH HH Kp @@ -3670,11 +3635,7 @@ qy wl RO PE -<<<<<<< HEAD -Ob -======= cL ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ML RO zc diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 857064d96aa..ac4f7201a8f 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -1390,13 +1390,6 @@ }, /turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) -<<<<<<< HEAD -"jE" = ( -/obj/effect/landmark/awaystart/moonoutpost, -/turf/open/floor/mineral/titanium/blue, -/area/awaymission/moonoutpost19/arrivals) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jH" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1909,8 +1902,6 @@ "mr" = ( /turf/open/floor/mineral/titanium/yellow, /area/awaymission/moonoutpost19/arrivals) -<<<<<<< HEAD -======= "ms" = ( /obj/effect/landmark/awaystart/moonoutpost, /turf/open/floor/mineral/titanium/blue, @@ -1922,7 +1913,6 @@ /obj/effect/landmark/awaystart/moonoutpost, /turf/open/floor/mineral/titanium/blue, /area/awaymission/moonoutpost19/arrivals) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mu" = ( /obj/machinery/light/small/directional/east, /obj/structure/window/reinforced/spawner/directional/north, @@ -1964,8 +1954,6 @@ }, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/moonoutpost19/arrivals) -<<<<<<< HEAD -======= "mI" = ( /obj/effect/landmark/awaystart/moonoutpost, /turf/open/floor/mineral/titanium/yellow, @@ -1980,7 +1968,6 @@ /obj/effect/landmark/awaystart/moonoutpost, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/moonoutpost19/arrivals) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mK" = ( /obj/machinery/door/airlock/titanium{ name = "Shuttle Airlock" @@ -4618,19 +4605,6 @@ temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) -<<<<<<< HEAD -"Ei" = ( -/obj/structure/sign/warning/vacuum{ - desc = "A beacon used by a teleporter."; - icon = 'icons/obj/devices/tracker.dmi'; - icon_state = "beacon"; - name = "tracking beacon" - }, -/obj/effect/landmark/awaystart/moonoutpost, -/turf/open/floor/mineral/titanium/yellow, -/area/awaymission/moonoutpost19/arrivals) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ep" = ( /turf/closed/mineral/random/labormineral, /area/awaymission/moonoutpost19/mines) @@ -5165,16 +5139,6 @@ }, /turf/open/floor/iron, /area/awaymission/moonoutpost19/research) -<<<<<<< HEAD -"HX" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/landmark/awaystart/moonoutpost, -/turf/open/floor/mineral/titanium/blue, -/area/awaymission/moonoutpost19/arrivals) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "HY" = ( /obj/structure/sign/departments/science{ pixel_y = 32 @@ -7714,13 +7678,6 @@ /obj/effect/spawner/random/medical/surgery_tool, /turf/open/misc/asteroid/moon/dug, /area/awaymission/moonoutpost19/mines) -<<<<<<< HEAD -"Zk" = ( -/obj/effect/landmark/awaystart/moonoutpost, -/turf/open/floor/mineral/titanium/yellow, -/area/awaymission/moonoutpost19/arrivals) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Zo" = ( /turf/open/floor/pod/light, /area/awaymission/moonoutpost19/tent) diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 503741e367e..ccdf7c87e19 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -5231,8 +5231,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/awaymission/snowdin/post/custodials) -<<<<<<< HEAD -======= "sU" = ( /obj/effect/turf_decal/weather/snow, /obj/effect/turf_decal/stripes/white/line{ @@ -5246,7 +5244,6 @@ }, /turf/open/floor/iron/dark/snowdin, /area/awaymission/snowdin/outside) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sX" = ( /obj/item/disk/holodisk/snowdin/ripjacob, /obj/structure/cable, @@ -5708,14 +5705,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) -<<<<<<< HEAD -"vv" = ( -/obj/structure/table, -/obj/item/trash/waffles, -/turf/open/floor/iron/cafeteria, -/area/awaymission/snowdin/post/messhall) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vw" = ( /obj/structure/sink/directional/west, /turf/open/floor/iron/showroomfloor, @@ -5831,8 +5820,6 @@ }, /turf/open/floor/mineral/titanium/blue, /area/awaymission/snowdin/post/broken_shuttle) -<<<<<<< HEAD -======= "wc" = ( /obj/machinery/computer{ desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional."; @@ -5842,7 +5829,6 @@ }, /turf/open/floor/mineral/titanium/blue, /area/awaymission/snowdin/post/broken_shuttle) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wd" = ( /obj/item/shard, /obj/structure/flora/grass/both/style_random, @@ -9720,7 +9706,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/research) -<<<<<<< HEAD "OY" = ( /obj/machinery/computer{ desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional."; @@ -9730,8 +9715,6 @@ }, /turf/open/floor/mineral/titanium/blue, /area/awaymission/snowdin/post/broken_shuttle) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "OZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, @@ -10132,22 +10115,6 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) -<<<<<<< HEAD -"QW" = ( -/obj/effect/turf_decal/weather/snow, -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/obj/machinery/computer{ - desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional."; - dir = 4; - icon_screen = null; - name = "Shuttle Transit Console" - }, -/turf/open/floor/iron/dark/snowdin, -/area/awaymission/snowdin/outside) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "QY" = ( /obj/structure/girder, /obj/effect/turf_decal/weather/snow, @@ -25044,11 +25011,7 @@ Kd ex fJ gA -<<<<<<< HEAD -vv -======= hq ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hW iH jz diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 33ebba37aa8..355fe2c2851 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -99,8 +99,6 @@ /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, /turf/open/floor/iron/dark, -<<<<<<< HEAD -======= /area/awaymission/undergroundoutpost45/central) "ax" = ( /obj/effect/landmark/awaystart/underground, @@ -133,7 +131,6 @@ dir = 4 }, /turf/open/floor/iron, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/awaymission/undergroundoutpost45/central) "aC" = ( /turf/closed/wall, @@ -219,13 +216,10 @@ /area/awaymission/undergroundoutpost45/central) "aS" = ( /turf/open/floor/iron, -<<<<<<< HEAD -======= /area/awaymission/undergroundoutpost45/central) "aT" = ( /obj/effect/landmark/awaystart/underground, /turf/open/floor/iron/grimy, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/awaymission/undergroundoutpost45/central) "aU" = ( /obj/structure/closet/secure_closet/personal/cabinet{ @@ -5478,13 +5472,6 @@ dir = 1 }, /area/awaymission/undergroundoutpost45/engineering) -<<<<<<< HEAD -"uB" = ( -/obj/effect/landmark/awaystart/underground, -/turf/open/floor/iron, -/area/awaymission/undergroundoutpost45/central) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uC" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -5951,16 +5938,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) -<<<<<<< HEAD -"wm" = ( -/obj/structure/chair/comfy/beige{ - dir = 4 - }, -/obj/effect/landmark/awaystart/underground, -/turf/open/floor/iron/grimy, -/area/awaymission/undergroundoutpost45/central) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wn" = ( /turf/closed/wall/rust, /area/awaymission/undergroundoutpost45/engineering) @@ -7140,13 +7117,6 @@ }, /turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) -<<<<<<< HEAD -"LC" = ( -/obj/effect/landmark/awaystart/underground, -/turf/open/floor/iron/grimy, -/area/awaymission/undergroundoutpost45/central) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "LT" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -7357,22 +7327,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) -<<<<<<< HEAD -"PF" = ( -/obj/structure/sign/warning/vacuum{ - desc = "A beacon used by a teleporter."; - icon = 'icons/obj/devices/tracker.dmi'; - icon_state = "beacon"; - name = "tracking beacon" - }, -/obj/effect/landmark/awaystart/underground, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/awaymission/undergroundoutpost45/central) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Qb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7627,17 +7581,6 @@ }, /turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) -<<<<<<< HEAD -"TV" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/landmark/awaystart/underground, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/awaymission/undergroundoutpost45/central) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ud" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38366,15 +38309,9 @@ an aS aS aO -<<<<<<< HEAD -uB -PF -TV -======= ax az aB ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Xd bw bB diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 9d3333db69a..dc61088dfb5 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -4050,8 +4050,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) -<<<<<<< HEAD -======= "aYN" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -4075,7 +4073,6 @@ /obj/machinery/scanner_gate/preset_guns, /turf/open/floor/iron/dark, /area/station/security/brig) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aYO" = ( /obj/structure/chair/pew/right, /turf/open/floor/iron/chapel{ @@ -18880,8 +18877,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/maintenance/department/science) -<<<<<<< HEAD -======= "eIh" = ( /obj/machinery/computer/robotics{ dir = 8 @@ -18896,7 +18891,6 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/rd) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eIi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22284,8 +22278,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/service/kitchen) -<<<<<<< HEAD -======= "fyH" = ( /obj/machinery/keycard_auth/wall_mounted/directional/south{ pixel_x = 6 @@ -22295,7 +22287,6 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fyP" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/siding/yellow{ @@ -24915,10 +24906,7 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, -<<<<<<< HEAD -======= /obj/machinery/vending/cytopro, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron, /area/station/science/xenobiology) "gfR" = ( @@ -25061,978 +25049,6 @@ }, /obj/effect/turf_decal/stripes/line{ dir = 6 -<<<<<<< HEAD - }, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) -"gic" = ( -/obj/machinery/vending/cigarette, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/entry) -"gii" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/station/service/theater) -"gij" = ( -/obj/structure/table, -/obj/item/hand_tele, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron, -/area/station/command/teleporter) -"giu" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/station/science/auxlab/firing_range) -"giw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay) -"giz" = ( -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/service) -"giA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/greenglow, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/medical/abandoned) -"giC" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Central Hallway - Port"; - name = "hallway camera" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) -"giY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/random/directional/north, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/port/fore) -"gjc" = ( -/obj/structure/cable, -/obj/machinery/button/flasher{ - id = "Cell 4"; - name = "Prisoner Flash"; - pixel_x = 25; - pixel_y = 7 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/button/door/directional/east{ - id = "permashut4"; - name = "Cell Lockdown Button"; - pixel_y = -6; - req_access = list("brig") - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/execution/transfer) -"gjg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) -"gjh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/maintenance/port/fore) -"gjk" = ( -/obj/structure/chair, -/obj/machinery/airalarm/directional/west, -/obj/machinery/camera/directional/north{ - c_tag = "Security Post - Departures Holding Cell"; - dir = 9 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/structure/sign/poster/official/report_crimes/directional/north, -/turf/open/floor/iron, -/area/station/security/checkpoint/escape) -"gjl" = ( -/obj/machinery/computer/upload/borg{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai_upload) -"gjB" = ( -/obj/structure/cable, -/obj/structure/closet/emcloset, -/obj/machinery/newscaster/directional/north, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/processing) -"gjE" = ( -/obj/machinery/airalarm/directional/west, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/paramedic) -"gjI" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, -/obj/machinery/atmospherics/components/binary/pump/off/yellow/visible{ - dir = 4; - name = "CO2 to Pure" - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"gkp" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/computer) -"gkt" = ( -/obj/effect/turf_decal/caution/stand_clear, -/obj/effect/turf_decal/box, -/obj/machinery/door/poddoor/shutters{ - dir = 8; - id = "secmechbay"; - name = "Security Mech Bay Shutters" - }, -/turf/open/floor/iron/dark, -/area/station/security/mechbay) -"gku" = ( -/obj/machinery/meter, -/obj/machinery/door/window/right/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/effect/turf_decal/siding/dark_red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/execution/education) -"gkx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/grille_or_waste, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/chapel) -"gkB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron, -/area/station/engineering/lobby) -"gkG" = ( -/obj/effect/spawner/random/vending/snackvend, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit) -"gkI" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/large, -/area/station/medical/medbay/lobby) -"gkP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/pdapainter/supply, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/qm) -"gkU" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/dark/textured_large, -/area/station/science/xenobiology) -"gkW" = ( -/obj/structure/table/wood, -/obj/item/storage/briefcase, -/obj/structure/sign/poster/official/help_others/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/courtroom) -"glb" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) -"gld" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/service/kitchen) -"glv" = ( -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics) -"glW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/main) -"gmc" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/cmo) -"gme" = ( -/obj/structure/table/reinforced, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/stack/cable_coil, -/obj/effect/turf_decal/bot, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/main) -"gmh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/table/wood, -/obj/item/pai_card, -/turf/open/floor/carpet/red, -/area/station/hallway/secondary/service) -"gml" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/prison) -"gmo" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/qm) -"gmx" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) -"gmD" = ( -/obj/machinery/door/airlock/engineering{ - name = "Engineering Auxiliary Power" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/iron, -/area/station/maintenance/department/electrical) -"gmE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/auxlab/firing_range) -"gmI" = ( -/obj/machinery/door/window/brigdoor/left/directional/north{ - name = "Cytology Pen"; - req_access = list("research") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/science/xenobiology) -"gmK" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/mining_weather_monitor/directional/south, -/turf/open/floor/iron, -/area/station/construction/mining/aux_base) -"gmP" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) -"gmQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/station/service/theater) -"gmT" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/lights/mixed, -/obj/item/clothing/gloves/color/fyellow, -/turf/open/floor/iron, -/area/station/commons/storage/primary) -"gmY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) -"gmZ" = ( -/obj/item/stack/cable_coil, -/obj/item/assembly/igniter, -/obj/item/assembly/timer{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 5 - }, -/obj/structure/table, -/turf/open/floor/iron/white, -/area/station/science/lobby) -"gnb" = ( -/obj/machinery/status_display/evac/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/medical_kiosk, -/obj/machinery/camera/directional/north{ - c_tag = "Medbay - Lobby"; - name = "medbay camera"; - network = list("ss13","medbay") - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) -"gng" = ( -/obj/effect/turf_decal/arrows/red{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/service/chapel) -"gnh" = ( -/obj/structure/bookcase/random/nonfiction, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/station/service/library) -"gnj" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/landmark/generic_maintenance_landmark, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/station/security/detectives_office/private_investigators_office) -"gnw" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) -"gnz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) -"gnA" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/computer) -"gnG" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) -"gnH" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/space/nearstation) -"gnO" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/aisat/exterior) -"gnS" = ( -/obj/effect/landmark/start/hangover, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) -"gnW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/port) -"goa" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/landmark/generic_maintenance_landmark, -/turf/open/floor/iron, -/area/station/maintenance/starboard/aft) -"goj" = ( -/obj/structure/sign/painting/library{ - pixel_y = 33 - }, -/turf/open/floor/carpet/green, -/area/station/commons/dorms) -"gor" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron, -/area/station/engineering/main) -"gox" = ( -/obj/effect/turf_decal/trimline/neutral/filled/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) -"goy" = ( -/obj/machinery/status_display/ai/directional/west, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/structure/sink/directional/east, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/science/xenobiology) -"goD" = ( -/obj/structure/rack, -/obj/item/crowbar/red, -/obj/item/wrench, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/maintenance, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/port) -"goV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/main) -"gpd" = ( -/obj/machinery/door/window/right/directional/north, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/neutral/filled/line, -/turf/open/floor/iron/dark/textured_half, -/area/station/service/abandoned_gambling_den) -"gpg" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - name = "External Solar Access" - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/iron, -/area/station/maintenance/solars/starboard/aft) -"gpi" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/service/electronic_marketing_den) -"gpq" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "paramed_dispatch"; - name = "Privacy Shutters" - }, -/turf/open/floor/plating, -/area/station/medical/paramedic) -"gps" = ( -/obj/structure/closet/secure_closet/bar, -/obj/item/storage/photo_album/bar, -/obj/item/radio/intercom/directional/east, -/obj/item/storage/dice, -/turf/open/floor/iron/checker, -/area/station/service/bar/backroom) -"gpw" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) -"gpy" = ( -/obj/structure/reflector/single, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) -"gpD" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/brown/half{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/official/random/directional/west, -/turf/open/floor/iron/half{ - dir = 1 - }, -/area/station/cargo/miningoffice) -"gpI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) -"gpY" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured_half, -/area/station/service/chapel/storage) -"gqd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"gqe" = ( -/obj/structure/table/reinforced, -/obj/item/pipe_dispenser{ - pixel_x = 2; - pixel_y = -4 - }, -/obj/item/pipe_dispenser, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/hfr_room) -"gqf" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot_red, -/obj/item/clothing/suit/apron/chef{ - desc = "A white smock used by barbers to remain hair free."; - name = "barber smock" - }, -/obj/item/razor{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/razor{ - pixel_x = -2 - }, -/obj/effect/turf_decal/tile/red/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/barber) -"gqm" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/medical/virology) -"gqq" = ( -/obj/structure/dresser, -/turf/open/floor/iron/grimy, -/area/station/command/heads_quarters/hop) -"gqA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, -/turf/open/floor/iron, -/area/station/commons/vacant_room/office) -"gqF" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 10 - }, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"gqH" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Mix to Ports" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"gqR" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/maintenance/disposal/incinerator) -"gqZ" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "brig-entrance" - }, -/obj/machinery/door/airlock/security/glass{ - name = "Brig" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/entrance, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/brig) -"gri" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/sign/poster/random/directional/south, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/commons/dorms) -"grl" = ( -/obj/effect/turf_decal/bot, -/obj/structure/rack, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/turf/open/floor/iron, -/area/station/engineering/main) -"grm" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) -"grp" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) -"grq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/maintenance/department/medical/morgue) -"grz" = ( -/obj/machinery/door/window/left/directional/east, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/service/abandoned_gambling_den) -"grA" = ( -/obj/effect/spawner/random/structure/furniture_parts, -/obj/structure/closet/crate/decorations, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark, -/area/station/maintenance/port) -"grE" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 10 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Virology - Work Room"; - name = "virology camera"; - network = list("ss13","medbay","virology") - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) -"grK" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible, -/obj/machinery/computer/atmos_control/plasma_tank{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"grM" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/structure/reagent_dispensers/plumbed{ - name = "bar water reservoir" - }, -/turf/open/floor/plating, -/area/station/maintenance/department/crew_quarters/bar) -"grN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/commons/toilet/locker) -"grO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/atmos/pumproom) -"grV" = ( -/obj/effect/turf_decal/arrows/red{ - dir = 4; - pixel_x = -15 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/hfr_room) -"gsf" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/matches{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/lighter, -/obj/item/lighter{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/machinery/fax{ - fax_name = "Engineering Lobby"; - name = "Engineering Lobby Fax Machine" - }, -/turf/open/floor/wood, -/area/station/engineering/break_room) -"gsh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/science/auxlab/firing_range) -"gsy" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -"gsz" = ( -/turf/open/floor/iron/chapel{ - dir = 1 - }, -/area/station/service/chapel) -"gsG" = ( -/obj/structure/table/reinforced, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stock_parts/scanning_module{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stock_parts/capacitor, -/obj/item/stock_parts/servo, -/obj/item/stock_parts/servo, -/obj/machinery/light_switch/directional/east, -/obj/effect/turf_decal/siding/purple{ - dir = 8 - }, -/obj/machinery/button/door/directional/east{ - id = "rdrnd"; - name = "Window Shutters"; - pixel_x = 38; - req_access = list("science") - }, -/turf/open/floor/iron, -/area/station/science/lab) -"gsH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/large, -/area/station/medical/medbay/lobby) -"gsO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/service/library/abandoned) -"gsP" = ( -/obj/machinery/light_switch/directional/north, -/obj/machinery/photocopier, -/obj/machinery/light/directional/north, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) -"gsV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) -"gsY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"gsZ" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/bot, -======= }, /turf/open/floor/plating, /area/station/maintenance/department/electrical) @@ -27024,7 +26040,6 @@ "gsZ" = ( /obj/machinery/dna_scannernew, /obj/effect/turf_decal/bot, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 @@ -28037,261 +27052,6 @@ }, /turf/open/floor/iron, /area/station/medical/medbay) -<<<<<<< HEAD -"gFz" = ( -/obj/machinery/status_display/ai/directional/north, -/obj/machinery/button/door/directional/east{ - id = "hosprivacy"; - name = "Privacy Control"; - pixel_y = 6; - req_access = list("hos") - }, -/obj/machinery/button/door/directional/east{ - id = "hosspace"; - name = "Space Shutters Control"; - pixel_y = -6; - req_access = list("hos") - }, -/obj/machinery/keycard_auth/wall_mounted/directional/east{ - pixel_x = 38; - pixel_y = 6 - }, -/obj/machinery/light_switch/directional/east{ - pixel_x = 37; - pixel_y = -6 - }, -/obj/structure/tank_holder/extinguisher, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hos) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 -"gFB" = ( -/obj/effect/turf_decal/siding/white{ - dir = 9 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/genetics) -"gFF" = ( -/obj/effect/landmark/event_spawn, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/ai_monitored/security/armory) -"gFM" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/science) -"gFO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/maintenance/port/aft) -"gFP" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/science) -"gFW" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) -"gGv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron, -/area/station/security/execution/transfer) -"gGw" = ( -/obj/effect/landmark/start/hangover, -/obj/structure/railing, -/obj/structure/chair/sofa/bench/right{ - dir = 1 - }, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, -/obj/effect/turf_decal/box/corners, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) -"gGE" = ( -/obj/structure/chair, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/item/radio/intercom/directional/north, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/security/checkpoint/escape) -"gGF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/girder, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) -"gGJ" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/aisat/exterior) -"gGT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/toilet{ - dir = 8 - }, -/obj/machinery/newscaster/directional/west, -/obj/machinery/button/door/directional/south{ - id = "Toilet_Research"; - name = "Lock Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) -"gHh" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/east{ - c_tag = "Science - Entrance Access"; - name = "science camera"; - network = list("ss13","rd") - }, -/obj/structure/closet/l3closet/scientist, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/research) -"gHq" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/cargo/bitrunning/den) -"gHt" = ( -/obj/item/kirbyplants/random, -/obj/machinery/button/door/directional/north{ - id = "ceblast"; - name = "Office Lockdown Control"; - pixel_x = 6; - pixel_y = 26; - req_access = list("ce") - }, -/obj/machinery/light_switch/directional/north{ - pixel_x = -6 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) -"gHE" = ( -/obj/machinery/requests_console/directional/north{ - department = "Chapel"; - name = "Chapel Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/machinery/light/small/directional/north, -/turf/open/floor/carpet/royalblack, -/area/station/service/chapel/office) -"gHI" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/cargo/drone_bay) -"gHS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) -"gIa" = ( -/obj/machinery/light/small/directional/north, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/disposal/bin/tagger, -/turf/open/floor/iron, -/area/station/security/brig) -"gIc" = ( -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/obj/structure/sign/calendar/directional/north, -/obj/structure/table/wood, -/obj/effect/landmark/start/hangover, -/obj/item/flashlight/lamp, -/turf/open/floor/wood, -/area/station/commons/dorms) -"gIk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/engineering/storage_shared) -"gIn" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/holding_cell) -"gIq" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) -"gIt" = ( -/obj/machinery/duct, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/main) -<<<<<<< HEAD -======= "gIw" = ( /obj/machinery/status_display/ai/directional/north, /obj/machinery/button/door/directional/east{ @@ -28319,7 +27079,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gIx" = ( /obj/machinery/atmospherics/components/binary/valve, /obj/effect/decal/cleanable/dirt, @@ -31879,7 +30638,6 @@ /area/station/medical/virology) "hGW" = ( /obj/machinery/mass_driver/ordnance{ -<<<<<<< HEAD dir = 8 }, /turf/open/floor/plating, @@ -32427,1312 +31185,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/brig) -"hOU" = ( -/obj/machinery/computer/robotics{ - dir = 8 - }, -/obj/structure/sign/nanotrasen{ - pixel_x = 32 - }, -/obj/machinery/keycard_auth/wall_mounted/directional/south, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/rd) -"hOY" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/main) -"hPc" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/binary/valve/digital, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron/dark/corner{ - dir = 8 - }, -/area/station/maintenance/department/electrical) -"hPd" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "maint_contraption"; - pixel_x = -8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/generic, -/obj/effect/turf_decal/tile/neutral/anticorner{ - dir = 1 - }, -/turf/open/floor/iron/smooth_corner, -/area/station/maintenance/port/aft) -"hPg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/large, -/area/station/ai_monitored/command/storage/eva) -"hPh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/tank_holder, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) -"hPk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/courtroom) -"hPs" = ( -/obj/machinery/door/poddoor/shutters{ - id = "evashutters"; - name = "E.V.A. Storage Shutters" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/ai_monitored/command/storage/eva) -"hPu" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/chapel) -"hPw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/cargo/office) -"hPx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/security) -"hPJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"hPN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/security/prison/safe) -"hPO" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/sign/warning/vacuum/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/hallway) -"hQj" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/cargo/storage) -"hQq" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/office) -"hQr" = ( -/obj/machinery/light_switch/directional/north, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/sign/warning/deathsposal/directional/east, -/obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 5 - }, -/obj/machinery/button/door/directional/north{ - id = "viro_private_shutters"; - name = "Privacy Shutters"; - pixel_y = 36 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/virology) -"hQs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/cargo/storage) -"hQu" = ( -/obj/machinery/duct, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/yellow/warning, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) -"hQx" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/service/library/abandoned) -"hQA" = ( -/obj/effect/turf_decal/trimline/red/filled/corner, -/obj/machinery/camera/directional/east{ - c_tag = "Science - Starboard Hallway"; - name = "science camera"; - network = list("ss13","rd") - }, -/turf/open/floor/iron/white, -/area/station/science/research) -"hQF" = ( -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/secondary/exit/departure_lounge) -"hQK" = ( -/obj/structure/reflector/box, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) -"hQV" = ( -/obj/effect/turf_decal/plaque{ - icon_state = "L13" - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/edge, -/area/station/hallway/primary/central/aft) -"hRj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/engineering/atmospherics_portable, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/port/aft) -"hRq" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/camera/directional/east{ - c_tag = "AI Satellite - Port"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/aisat/exterior) -"hRs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/crate_loot, -/turf/open/floor/plating, -/area/station/maintenance/port) -"hRy" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/engine/atmos) -"hRH" = ( -/obj/structure/closet/firecloset, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) -"hRI" = ( -/obj/structure/closet/wardrobe/grey, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 8 - }, -/obj/machinery/airalarm/directional/east, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/turf_decal/tile/dark_blue/fourcorners, -/turf/open/floor/iron, -/area/station/commons/dorms/laundry) -"hRV" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) -"hRX" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/grimy, -/area/station/commons/vacant_room/office) -"hSa" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 10 - }, -/turf/open/space/basic, -/area/space/nearstation) -"hSd" = ( -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "External Solar Access" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/iron, -/area/station/maintenance/solars/starboard/fore) -"hSf" = ( -/obj/structure/table, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/item/relic, -/obj/item/assembly/signaler{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/machinery/door/poddoor/preopen{ - id = "sci_experimentor"; - name = "Experimentor Blast Door" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/explab) -"hSi" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Xenobiology - Killroom Chamber"; - name = "xenobiology camera"; - network = list("ss13","xeno","rd") - }, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark/telecomms, -/area/station/science/xenobiology) -"hSl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron, -/area/station/service/kitchen/abandoned) -"hSu" = ( -/obj/effect/spawner/random/trash/box, -/obj/effect/spawner/random/food_or_drink/seed, -/obj/effect/spawner/random/trash/botanical_waste, -/obj/item/reagent_containers/cup/glass/waterbottle/empty, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/port/fore) -"hSx" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"hSE" = ( -/obj/structure/chair/stool/bar/directional/north, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/grimy, -/area/station/service/abandoned_gambling_den) -"hST" = ( -/obj/structure/destructible/cult/item_dispenser/archives/library, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating, -/area/station/service/library/abandoned) -"hTg" = ( -/obj/effect/landmark/event_spawn, -/obj/machinery/light_switch/directional/north{ - pixel_x = -8 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain/private) -"hTi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) -"hTk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) -"hTl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/cargo/storage) -"hTm" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Starboard Primary Hallway" -======= - dir = 8 - }, -/turf/open/floor/plating, -/area/station/science/ordnance/testlab) -"hGZ" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) -"hHi" = ( -/obj/structure/window/spawner/directional/south, -/obj/structure/sign/poster/official/random/directional/north, -/obj/structure/water_source/puddle, -/turf/open/misc/sandy_dirt, -/area/station/security/prison/garden) -"hHo" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/chem_heater/withbuffer, -/obj/effect/turf_decal/bot_red, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/turf/open/floor/iron/dark, -/area/station/medical/pharmacy) -"hHt" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, -/obj/effect/landmark/start/head_of_security, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/grimy, -/area/station/command/heads_quarters/hos) -"hHv" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/paramedic) -"hHx" = ( -/obj/item/radio/intercom/directional/west, -/turf/open/floor/wood, -/area/station/service/theater/abandoned) -"hHF" = ( -/turf/open/floor/plating{ - icon_state = "foam_plating" - }, -/area/station/maintenance/department/science/xenobiology) -"hHJ" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood, -/area/station/engineering/break_room) -"hHQ" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) -"hHS" = ( -/obj/effect/decal/cleanable/generic, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -"hHW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/dark/textured, -/area/station/medical/cryo) -"hHX" = ( -/obj/structure/chair/wood{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/service/abandoned_gambling_den) -"hIf" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -<<<<<<< HEAD -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) -"hTq" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "corporatelounge"; - name = "Corporate Lounge Shutters" - }, -/turf/open/floor/plating, -/area/station/command/corporate_showroom) -"hTr" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/mob/living/simple_animal/bot/secbot/beepsky/armsky, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) -"hTv" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) -"hTR" = ( -/obj/structure/closet/crate/coffin, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plating, -/area/station/service/chapel/storage) -"hUb" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Port Mix to Engine" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"hUh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/obj/structure/chair/office{ - dir = 1 - }, -/obj/structure/sign/poster/random/directional/south, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/service) -"hUm" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 9 - }, -/obj/machinery/vending/coffee, -/turf/open/space/basic, -/area/space/nearstation) -"hUt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/closet/radiation, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron, -/area/station/engineering/main) -"hUx" = ( -/obj/effect/spawner/random/vending/colavend, -/obj/effect/turf_decal/bot, -/obj/item/radio/intercom/directional/south, -/obj/machinery/light/small/directional/east, -/obj/machinery/status_display/ai/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/breakroom) -"hUB" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/checker, -/area/station/engineering/atmos/mix) -"hUD" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/directional{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/service/abandoned_gambling_den) -"hUE" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/warning, -/obj/effect/turf_decal/siding/yellow, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"hUK" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Atmospherics - co2 Cell"; - name = "atmospherics camera" - }, -/turf/open/floor/engine/co2, -/area/station/engineering/atmos) -"hUO" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/grimy, -/area/station/commons/vacant_room/office) -"hUU" = ( -/obj/effect/landmark/start/hangover, -/obj/structure/chair/sofa/bench{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/entry) -"hUV" = ( -/obj/structure/sign/warning/no_smoking, -/turf/closed/wall, -/area/station/engineering/atmos/storage) -"hVi" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/commons/dorms) -"hVt" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/aisat/exterior) -"hVx" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/medbay) -"hVy" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/dark/smooth_large, -/area/station/science/genetics) -"hVA" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/aisat/exterior) -"hVB" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - name = "External Airlock" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/engineering/external, -/turf/open/floor/iron, -/area/station/maintenance/department/science/xenobiology) -"hVE" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/space, -/area/space/nearstation) -"hVI" = ( -/obj/structure/table, -/obj/item/plant_analyzer, -/obj/item/hatchet, -/obj/item/cultivator, -/obj/item/shovel/spade, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden) -"hVV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/carpet/blue, -/area/station/medical/psychology) -"hWh" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/station/engineering/atmos) -"hWq" = ( -/obj/structure/chair/comfy/brown{ - buildstackamount = 0; - dir = 1 - }, -/turf/open/floor/carpet, -/area/station/command/meeting_room/council) -"hWz" = ( -/obj/structure/closet/secure_closet/atmospherics, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/station/engineering/atmos/hfr_room) -"hWA" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id = "hopblast"; - name = "HoP Blast Door" - }, -/obj/machinery/door/window/brigdoor/left/directional/east{ - name = "Access Desk"; - req_access = list("hop") - }, -/obj/machinery/door/window/right/directional/west{ - name = "Access Queue" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/desk_bell{ - pixel_x = 7 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) -"hWF" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -"hWJ" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/customs/aft) -"hWW" = ( -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) -"hWY" = ( -/obj/structure/reflector/double, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/mid_joiner{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) -"hXf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/maintenance/department/science) -"hXg" = ( -/turf/closed/wall, -/area/station/cargo/bitrunning/den) -"hXi" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) -"hXm" = ( -/obj/structure/closet/emcloset, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/delivery, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) -"hXo" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4; - name = "Cooling to Filters" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/box/corners, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) -"hXu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 10 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) -"hXw" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/west, -/obj/machinery/duct, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) -"hXx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/gateway) -"hXB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/cargo/warehouse) -"hXO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/science/research/abandoned) -"hXZ" = ( -/obj/item/storage/box/teargas{ - pixel_x = 3; - pixel_y = 3 - }, -======= -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) -"hIh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) -"hIo" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/construction/mining/aux_base) -"hIs" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/station/maintenance/disposal) -"hIy" = ( -/obj/machinery/door/airlock/medical{ - name = "Psychology" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/psychology, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/station/medical/psychology) -"hIB" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "rdordnance"; - name = "Ordnance Lab Shutters" - }, -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/science/ordnance/storage) -"hIH" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 10 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"hIP" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) -"hIQ" = ( -/obj/item/kirbyplants/organic/plant22, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"hIU" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) -"hJc" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron, -/area/station/security/courtroom) -"hJj" = ( -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/tools) -"hJn" = ( -/obj/structure/extinguisher_cabinet/directional/north, -/obj/item/stack/medical/gauze, -/obj/item/stack/medical/suture, -/obj/machinery/camera/directional/north{ - c_tag = "Medbay - Treatment Center"; - name = "medbay camera"; - network = list("ss13","medbay") - }, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron, -/area/station/medical/treatment_center) -"hJo" = ( -/obj/structure/table/wood, -/obj/item/folder/white{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/folder/red, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/iron/grimy, -/area/station/security/detectives_office/private_investigators_office) -"hJs" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) -"hJv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/iron, -/area/station/command/gateway) -"hJz" = ( -/turf/open/floor/iron, -/area/station/engineering/atmos/hfr_room) -"hJG" = ( -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/station/commons/fitness/recreation) -"hJM" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/recharge_floor, -/area/station/science/robotics/mechbay) -"hJP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 6 - }, -/obj/machinery/duct, -/obj/effect/landmark/start/bartender, -/turf/open/floor/iron/grimy, -/area/station/service/bar/backroom) -"hKE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/large, -/area/station/service/hydroponics) -"hKF" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, -/obj/machinery/atmospherics/components/binary/pump/off/yellow/visible{ - dir = 4; - name = "O2 To Pure" - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"hKG" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark, -/area/station/service/library) -"hKH" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/command/teleporter) -"hKO" = ( -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/virology) -"hKZ" = ( -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/bot, -/obj/machinery/vending/wardrobe/atmos_wardrobe, -/obj/effect/turf_decal/delivery, -/obj/machinery/status_display/evac/directional/north, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/storage) -"hLa" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/cargo/office) -"hLe" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "brigprison"; - name = "Prison Blast Door" - }, -/turf/open/floor/plating, -/area/station/security/prison) -"hLf" = ( -/obj/structure/chair/stool/directional/north, -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/commons/locker) -"hLq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/station/maintenance/port/fore) -"hLt" = ( -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: EXTERNAL AIRLOCK" - }, -/turf/closed/wall, -/area/station/hallway/secondary/exit/departure_lounge) -"hLA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/carpet/orange, -/area/station/commons/dorms) -"hLM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/service/abandoned_gambling_den) -"hMa" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/mechanical, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/glasses/welding, -/obj/effect/turf_decal/siding/purple{ - dir = 8 - }, -/obj/machinery/newscaster/directional/east, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/science/lab) -"hMd" = ( -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/commons/dorms) -"hMg" = ( -/obj/machinery/pdapainter/security, -/obj/effect/turf_decal/bot_red, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hos) -"hMp" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/landmark/generic_maintenance_landmark, -/turf/open/floor/plating, -/area/station/maintenance/port) -"hMx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/radio/intercom/prison/directional/east, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron, -/area/station/security/prison) -"hMI" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "viro_private_shutters"; - name = "Virology Privacy Shutters" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/medical/virology) -"hMO" = ( -/obj/effect/landmark/start/hangover, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"hMP" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/security/brig) -"hNb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/medical/morgue) -"hNg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) -"hNp" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/edge{ - dir = 4 - }, -/area/station/engineering/atmos/project) -"hNr" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/cargo/office) -"hNu" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Xeniobiology - Xenobiology Computers"; - name = "xenobiology camera"; - network = list("ss13","xeno","rd") - }, -/obj/structure/chair/office/light, -/obj/machinery/newscaster/directional/east, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/turf/open/floor/iron, -/area/station/science/xenobiology) -"hNx" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/commons/toilet/locker) -"hNP" = ( -/obj/structure/sign/poster/contraband/random/directional/west, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/maintenance/fore) -"hNS" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/maintenance/department/chapel) -"hNT" = ( -/obj/structure/chair/pew/right, -/turf/open/floor/iron/chapel{ - dir = 9 - }, -/area/station/service/chapel) -"hNW" = ( -/turf/open/floor/iron/dark, -/area/station/science/ordnance) -"hOa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/poddoor{ - id = "engstorage"; - name = "Engineering Secure Storage Lockdown" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/main) -"hOk" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/lockers) -"hOw" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/grimy, -/area/station/command/heads_quarters/hos) -"hOx" = ( -/obj/machinery/door/firedoor, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/desk_bell{ - pixel_y = 5 - }, -/obj/machinery/door/poddoor/shutters{ - dir = 8; - id = "commissaryshutters"; - name = "Vacant Commissary Shutters" - }, -/turf/open/floor/iron/dark, -/area/station/commons/vacant_room/commissary) -"hOz" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "brigwindows"; - name = "Brig Front Blast Door" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/brig) "hOY" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34487,7 +31939,6 @@ pixel_x = 3; pixel_y = 3 }, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/handcuffs, /obj/item/storage/box/flashbangs{ pixel_x = -3; @@ -41464,30 +38915,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) -<<<<<<< HEAD -"jIN" = ( -/obj/machinery/keycard_auth/wall_mounted/directional/south{ - pixel_y = -38 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/button/door/directional/south{ - id = "teleportershutters"; - name = "Teleporter Shutters"; - pixel_x = -6; - req_access = list("command") - }, -/obj/machinery/button/door/directional/south{ - id = "evastorage"; - name = "E.V.A. Shutters"; - pixel_x = 6; - req_access = list("command") - }, -/turf/open/floor/carpet, -/area/station/command/bridge) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jIQ" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/structure/chair/wood{ @@ -45093,8 +42520,6 @@ /obj/item/storage/crayons, /turf/open/floor/wood, /area/station/service/library/abandoned) -<<<<<<< HEAD -======= "kEp" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance" @@ -45113,7 +42538,6 @@ /obj/machinery/scanner_gate/preset_guns, /turf/open/floor/iron/dark, /area/station/security/brig) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kEw" = ( /obj/structure/cable, /obj/structure/reagent_dispensers/plumbed{ @@ -53014,32 +50438,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -<<<<<<< HEAD -"mEB" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Brig" - }, -/obj/structure/cable, -/obj/effect/landmark/navigate_destination, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "brig-entrance" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/entrance, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/scanner_gate/preset_guns, -/turf/open/floor/iron/dark, -/area/station/security/brig) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mEH" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -57911,40 +55309,6 @@ }, /turf/open/floor/iron, /area/station/service/kitchen/abandoned) -<<<<<<< HEAD -"nTg" = ( -/obj/structure/table/reinforced, -/obj/item/folder/yellow, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, -/obj/structure/extinguisher_cabinet/directional/north{ - pixel_x = 32 - }, -/obj/item/radio/intercom/directional/east{ - pixel_x = 38; - pixel_y = 3 - }, -/obj/machinery/keycard_auth/wall_mounted/directional/east{ - pixel_x = 40; - pixel_y = -8 - }, -/obj/machinery/button/door/directional/east{ - id = "qmspace"; - name = "Space Shutters Control"; - pixel_y = -8 - }, -/obj/machinery/button/door/directional/east{ - id = "qmprivacy"; - name = "Privacy Control"; - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/qm) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nTn" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -58398,18 +55762,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -<<<<<<< HEAD -"nZG" = ( -/obj/machinery/keycard_auth/wall_mounted/directional/south{ - pixel_x = 6 - }, -/obj/machinery/light_switch/directional/south{ - pixel_x = -8 - }, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nZK" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -73256,16 +70608,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/command/heads_quarters/qm) -<<<<<<< HEAD -"rLs" = ( -/obj/structure/table/wood, -/obj/machinery/keycard_auth/wall_mounted/directional/west, -/obj/item/flashlight/lamp, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rLt" = ( /obj/machinery/camera/directional/north{ c_tag = "Holodeck Control"; @@ -74467,2554 +71809,6 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "rYA" = ( -<<<<<<< HEAD -/turf/closed/wall, -/area/station/maintenance/department/security) -"rYE" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/button/door{ - id = "xeno4"; - name = "Containment Control"; - req_access = list("xenobiology") - }, -/turf/open/floor/iron, -/area/station/science/xenobiology) -"rYR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) -"rZe" = ( -/obj/structure/table/reinforced, -/obj/item/tank/internals/anesthetic{ - pixel_x = 3 - }, -/obj/item/tank/internals/anesthetic, -/obj/item/tank/internals/anesthetic{ - pixel_x = -3 - }, -/obj/item/clothing/mask/breath/medical{ - pixel_y = 3 - }, -/obj/item/clothing/mask/breath/medical, -/obj/item/clothing/mask/breath/medical{ - pixel_y = -3 - }, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/status_display/evac/directional/south, -/obj/machinery/door/window/left/directional/north{ - name = "Surgical Supplies"; - req_access = list("surgery") - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/medical/surgery/theatre) -"rZf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) -"rZl" = ( -/obj/structure/closet/secure_closet/medical1, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/siding/green, -/obj/structure/cable, -/obj/machinery/requests_console/directional/north{ - department = "Virology"; - name = "Virology Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/ore_update, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/medical/virology) -"rZt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/green/filled/warning, -/mob/living/carbon/human/species/monkey, -/turf/open/floor/iron/white, -/area/station/medical/virology) -"rZw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/maintenance/port) -"rZy" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/aisat/exterior) -"rZE" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Prison Wing" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/iron, -/area/station/security/execution/transfer) -"rZF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/service/abandoned_gambling_den/gaming) -"rZI" = ( -/obj/structure/rack, -/obj/effect/spawner/random/clothing/costume, -/obj/effect/spawner/random/clothing/costume, -/obj/item/clothing/neck/tie/black, -/obj/effect/turf_decal/bot/right, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/service/theater/abandoned) -"rZL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/grille, -/turf/closed/wall/r_wall, -/area/station/engineering/atmos) -"rZU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/turf/open/floor/iron, -/area/station/maintenance/department/engine/atmos) -"sao" = ( -/obj/machinery/hydroponics/constructable, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics) -"sau" = ( -/obj/machinery/blackbox_recorder, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/station/tcommsat/server) -"sav" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/science/research) -"saz" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/purple/filled/warning, -/turf/open/floor/iron/white, -/area/station/science/lobby) -"saA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/item/kirbyplants/random, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"saB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/loading_area, -/turf/open/floor/plating, -/area/station/maintenance/department/crew_quarters/bar) -"saC" = ( -/obj/machinery/photocopier, -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain/private) -"saD" = ( -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) -"saE" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Port to Filter" - }, -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"saK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/service/kitchen/abandoned) -"saR" = ( -/obj/machinery/disposal/bin, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) -"saS" = ( -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, -/obj/item/crowbar/red, -/obj/item/stack/sheet/mineral/plasma{ - amount = 20 - }, -/obj/item/gps/engineering, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/station/engineering/main) -"saT" = ( -/obj/structure/cable, -/obj/machinery/holopad/secure, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/full, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/large, -/area/station/security/lockers) -"sbf" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) -"sbh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/interrogation) -"sbl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/sign/warning/biohazard/directional/south, -/turf/open/floor/iron, -/area/station/maintenance/department/science) -"sbn" = ( -/obj/machinery/door/window/left/directional/east{ - name = "Monkey Pen"; - req_access = list("genetics") - }, -/obj/structure/flora/bush/lavendergrass, -/obj/structure/flora/bush/flowers_yw, -/turf/open/floor/grass, -/area/station/science/genetics) -"sbP" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/crew_quarters/bar) -"sbT" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/large, -/area/station/medical/surgery/theatre) -"sbV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/engineering/main) -"sbW" = ( -/obj/structure/cable, -/obj/effect/landmark/start/hangover, -/obj/structure/table, -/obj/effect/turf_decal/tile/red/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) -"sbX" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) -"sca" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/large, -/area/station/medical/medbay) -"sch" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos/mix) -"scn" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/port/fore) -"scp" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/bot/left, -/obj/structure/sign/nanotrasen{ - pixel_x = -32 - }, -/obj/machinery/modular_computer/preset/cargochat/science{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/science/research) -"scs" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/service/chapel) -"scy" = ( -/obj/machinery/atmospherics/components/trinary/mixer{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/storage) -"scR" = ( -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/white, -/area/station/science/research) -"scU" = ( -/obj/structure/easel, -/obj/effect/decal/cleanable/dirt, -/obj/item/canvas/twentythree_twentythree, -/obj/item/canvas/twentythree_twentythree, -/turf/open/floor/plating, -/area/station/service/library/abandoned) -"scX" = ( -/obj/machinery/door/window/brigdoor/right/directional/east{ - name = "Primary AI Core Access"; - req_access = list("ai_upload") - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai) -"sdi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible, -/obj/machinery/meter/monitored/distro_loop, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/atmos/pumproom) -"sdq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -"sdw" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/medical/virology) -"sdB" = ( -/obj/item/kirbyplants/random, -/obj/machinery/status_display/evac/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tech) -"sdC" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/maintenance/solars/port/fore) -"sdJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"sdK" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai_upload) -"sdO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 1 - }, -/obj/machinery/meter, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"sdV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/floor, -/turf/open/floor/wood/large, -/area/station/command/corporate_showroom) -"sef" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner{ - dir = 8 - }, -/area/station/hallway/primary/port) -"seg" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/turf/open/floor/iron, -/area/station/medical/storage) -"sez" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/medbay) -"seD" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "viro_private_shutters"; - name = "Virology Privacy Shutters" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/medical/virology) -"seE" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/external{ - name = "External Docking Port" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"seX" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sign/nanotrasen{ - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) -"sfc" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "genetics_shutters"; - name = "Genetics Shutters" - }, -/turf/open/floor/plating, -/area/station/science/genetics) -"sfe" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/engineering) -"sfs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"sfw" = ( -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"sfy" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/computer/shuttle/mining/common, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: EXTERNAL AIRLOCK"; - pixel_y = 32 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/smooth_large, -/area/station/hallway/secondary/entry) -"sfA" = ( -/obj/structure/chair/stool/directional/north, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) -"sfB" = ( -/obj/effect/spawner/random/structure/girder, -/obj/effect/spawner/random/structure/grille, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) -"sfC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/landmark/start/hangover, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=hall2"; - location = "hall1" - }, -/obj/effect/turf_decal/plaque{ - icon_state = "L5" - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) -"sfD" = ( -/obj/effect/spawner/random/structure/tank_holder, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) -"sfE" = ( -/obj/effect/decal/cleanable/xenoblood, -/turf/open/floor/engine/xenobio, -/area/station/science/xenobiology) -"sfH" = ( -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) -"sfN" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) -"sfW" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/server) -"sgd" = ( -/obj/structure/cable, -/obj/machinery/biogenerator, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/siding/green{ - dir = 8 - }, -/obj/machinery/light/small/dim/directional/north, -/turf/open/floor/iron/checker, -/area/station/service/hydroponics/garden/abandoned) -"sgh" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron, -/area/station/security/execution/transfer) -"sgj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/valve, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/maintenance/department/electrical) -"sgp" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/medical/pharmacy) -"sgA" = ( -/obj/structure/table/reinforced, -/obj/machinery/gulag_item_reclaimer{ - pixel_y = 28 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/processing) -"sgD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/brig) -"sgI" = ( -/obj/docking_port/stationary/escape_pod{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) -"sgZ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/spawner/random/engineering/tracking_beacon, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/main) -"shm" = ( -/obj/effect/spawner/random/structure/table_or_rack, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -"shJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ - dir = 4 - }, -/turf/open/floor/engine/vacuum, -/area/station/engineering/atmos) -"shM" = ( -/obj/effect/landmark/event_spawn, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/floor, -/turf/open/floor/iron/grimy, -/area/station/command/heads_quarters/hos) -"shO" = ( -/obj/structure/cable, -/turf/open/floor/circuit/green, -/area/station/science/xenobiology) -"shP" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/white, -/area/station/science/lobby) -"shU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/research) -"shZ" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/station/service/barber) -"sid" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/obj/effect/landmark/start/janitor, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/checker, -/area/station/service/janitor) -"sie" = ( -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) -"sii" = ( -/obj/structure/table/wood/poker, -/obj/item/storage/dice, -/obj/effect/spawner/random/entertainment/money_large, -/turf/open/floor/iron/grimy, -/area/station/service/abandoned_gambling_den) -"sik" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/maintenance/port/fore) -"sim" = ( -/obj/machinery/light/small/directional/east, -/obj/structure/bed, -/obj/item/bedsheet/captain, -/obj/effect/landmark/start/captain, -/obj/machinery/newscaster/directional/east, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain/private) -"siu" = ( -/obj/machinery/computer/security{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/warden) -"siF" = ( -/obj/machinery/mineral/ore_redemption, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/box, -/obj/machinery/door/window/left/directional/south{ - name = "Ore Redemption Access"; - req_access = list("mineral_storeroom") - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) -"siI" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/box/white/corners, -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) -"siT" = ( -/obj/machinery/holopad, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/bot, -/obj/structure/cable/layer3, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/aisat/exterior) -"siV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/maintenance/fore) -"siX" = ( -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/service/theater) -"sja" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/chair/stool/directional/south, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/commons/locker) -"sjh" = ( -/obj/structure/statue/sandstone/venus{ - name = "Justice" - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"sji" = ( -/obj/structure/closet/crate/preopen, -/obj/effect/spawner/random/maintenance, -/obj/effect/turf_decal/bot, -/obj/item/electronics/apc, -/turf/open/floor/iron, -/area/station/cargo/storage) -"sjm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay) -"sjt" = ( -/turf/closed/wall, -/area/station/hallway/secondary/entry) -"sjz" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) -"sjD" = ( -/obj/structure/closet/radiation, -/obj/effect/turf_decal/bot, -/obj/item/analyzer, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmos/hfr_room) -"sjH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/iron, -/area/station/maintenance/port) -"ske" = ( -/obj/effect/spawner/random/entertainment/arcade, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/service/abandoned_gambling_den/gaming) -"skf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/eva/abandoned) -"skg" = ( -/obj/machinery/iv_drip, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/machinery/status_display/ai/directional/east, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 6 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Virology - Cell 2"; - name = "virology camera"; - network = list("ss13","medbay","virology") - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/virology) -"skr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/vending/snackvend, -/turf/open/floor/plating, -/area/station/service/abandoned_gambling_den) -"skx" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/command/teleporter) -"sky" = ( -/obj/machinery/light_switch/directional/north{ - pixel_x = -8 - }, -/obj/machinery/button/door{ - id = "rdordnance"; - name = "Ordnance Containment Control"; - pixel_x = 8; - pixel_y = 26; - req_access = list("science") - }, -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Science - Ordnance Lab Access"; - name = "science camera"; - network = list("ss13","rd") - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance/office) -"skC" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/port/fore) -"skD" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/aisat_interior) -"skI" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) -"skQ" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/effect/turf_decal/box/red, -/obj/structure/sign/poster/official/help_others/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/execution/education) -"skX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) -"skZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) -"sle" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/brigdoor/right/directional/east{ - name = "Warden's Desk"; - req_access = list("armory") - }, -/obj/machinery/door/window/left/directional/west{ - name = "Warden's Desk" - }, -/obj/item/folder/red, -/obj/item/pen, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/warden) -"slp" = ( -/obj/structure/cable, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/security/checkpoint/engineering) -"slr" = ( -/obj/effect/landmark/start/chaplain, -/obj/machinery/holopad, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/grimy, -/area/station/service/chapel) -"slx" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sign/departments/engineering/directional/north, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) -"slC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/status_display/ai/directional/north, -/obj/structure/sign/poster/official/random/directional/west, -/turf/open/floor/engine, -/area/station/science/explab) -"slE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit) -"slG" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"slW" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/maintenance/port) -"slZ" = ( -/obj/machinery/power/port_gen/pacman/pre_loaded, -/obj/effect/turf_decal/bot_red, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/chapel) -"sma" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/blobstart, -/obj/effect/landmark/generic_maintenance_landmark, -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/service/abandoned_gambling_den/gaming) -"smj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/science/xenobiology) -"smF" = ( -/obj/structure/chair{ - dir = 8; - name = "Judge" - }, -/obj/machinery/newscaster/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/security/courtroom) -"smG" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) -"smJ" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/escape) -"smN" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/maintenance/starboard/lesser) -"smO" = ( -/obj/structure/sign/warning/electric_shock, -/turf/closed/wall/r_wall, -/area/station/maintenance/solars/starboard/fore) -"smR" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/open/floor/engine/n2, -/area/station/engineering/atmos) -"smU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock{ - name = "Auxiliary Storage Closet" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/maintenance/port/fore) -"smV" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/space, -/area/space/nearstation) -"snc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable, -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/research) -"snj" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/science/robotics/lab) -"snE" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "genetics_shutters"; - name = "Genetics Shutters" - }, -/turf/open/floor/plating, -/area/station/science/genetics) -"snK" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) -"snW" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 3 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/armory/disablers, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) -"sob" = ( -/obj/structure/disposalpipe/segment, -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/circuits) -"sog" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/atmospherics/components/binary/pump/on/supply/visible/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark/corner, -/area/station/maintenance/disposal/incinerator) -"sox" = ( -/obj/structure/cable, -/turf/open/floor/iron/grimy, -/area/station/command/heads_quarters/hop) -"soK" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/courtroom) -"soO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Engineering - Supermatter Foyer"; - name = "engineering camera"; - network = list("ss13","engine") - }, -/obj/structure/rack, -/obj/item/analyzer, -/obj/item/geiger_counter, -/obj/item/geiger_counter{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron, -/area/station/engineering/main) -"soU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/large, -/area/station/medical/paramedic) -"spa" = ( -/obj/machinery/light/small/directional/south, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/chem_dispenser/drinks/beer{ - dir = 1 - }, -/obj/structure/table/wood/poker, -/obj/structure/sign/poster/contraband/random/directional/south, -/turf/open/floor/plating, -/area/station/service/abandoned_gambling_den) -"spd" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2; - name = "Genetics Junction" - }, -/obj/structure/cable, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/mail_sorting/science/genetics, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/science/research) -"spe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/structure/sign/warning/fire/directional/east, -/turf/open/floor/iron, -/area/station/engineering/main) -"spq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) -"spB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/execution/transfer) -"spG" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/station/commons/vacant_room/office) -"spI" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) -"spJ" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/open/floor/engine/co2, -/area/station/engineering/atmos) -"spV" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/space/basic, -/area/space/nearstation) -"sqd" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) -"sqj" = ( -/obj/structure/closet/crate/freezer/surplus_limbs, -/obj/machinery/camera/directional/north{ - c_tag = "Medbay - Coldroom"; - dir = 9; - name = "medbay camera"; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/bot_white{ - color = "#435a88" - }, -/turf/open/floor/iron/freezer, -/area/station/medical/coldroom) -"sqm" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/machinery/iv_drip, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) -"sqp" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/commons/toilet/locker) -"squ" = ( -/obj/item/kirbyplants/random, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/medical/medbay/lobby) -"sqD" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp, -/obj/structure/sign/poster/official/work_for_a_future/directional/south, -/turf/open/floor/carpet, -/area/station/commons/vacant_room/office) -"sqI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/half, -/area/station/service/hydroponics) -"sqM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/closet/secure_closet/freezer/meat, -/obj/effect/turf_decal/bot, -/obj/item/food/meat/slab/monkey, -/obj/item/food/meat/slab/monkey, -/turf/open/floor/iron/dark, -/area/station/service/kitchen/coldroom) -"sqT" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) -"sqX" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/white/smooth_large, -/area/station/command/heads_quarters/cmo) -"srb" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/station/science/lobby) -"srd" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/disposal/bin, -/obj/structure/sign/warning/deathsposal/directional/south, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/checker, -/area/station/maintenance/disposal/incinerator) -"srg" = ( -/obj/structure/table/glass, -/obj/item/food/pizzaslice/vegetable, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/bless_this_spess/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/space_hut/observatory) -"srh" = ( -/obj/machinery/door/window/brigdoor/security/cell/right/directional/west{ - id = "brig1"; - name = "Cell 1" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/dark_red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/brig) -"srn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/large, -/area/station/science/research) -"srI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/service/abandoned_gambling_den) -"ssb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron, -/area/station/science/ordnance/testlab) -"ssj" = ( -/obj/machinery/duct, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/turf/open/floor/iron, -/area/station/maintenance/department/security) -"ssp" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) -"ssr" = ( -/obj/machinery/button/door{ - id = "brigwindows"; - name = "Cell Window Control"; - pixel_x = -32; - pixel_y = -26; - req_access = list("security") - }, -/obj/machinery/button/door{ - id = "brigfront"; - name = "Brig Access Control"; - pixel_x = -26; - pixel_y = -36; - req_access = list("security") - }, -/obj/machinery/button/door{ - id = "brigprison"; - name = "Prison Lockdown"; - pixel_x = -38; - pixel_y = -36; - req_access = list("brig") - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/security/warden) -"sst" = ( -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) -"ssy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/newscaster/directional/north, -/obj/machinery/duct, -/obj/structure/cable, -/turf/open/floor/iron/grimy, -/area/station/service/bar/backroom) -"ssM" = ( -/obj/structure/sign/departments/medbay/alt/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Departures Hallway" - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit) -"ssR" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 5 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/virology) -"ssY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/plumbed{ - name = "dormitory water reservoir" - }, -/obj/effect/turf_decal/delivery/white{ - color = "#52B4E9" - }, -/obj/effect/turf_decal/tile/red/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/turf/open/floor/iron, -/area/station/maintenance/department/security) -"stc" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/medical/pharmacy) -"stx" = ( -/obj/structure/chair/pew/left, -/turf/open/floor/iron/chapel{ - dir = 10 - }, -/area/station/service/chapel) -"stA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/security/brig) -"stC" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood/large, -/area/station/command/corporate_showroom) -"stD" = ( -/obj/machinery/suit_storage_unit/engine, -/obj/machinery/status_display/evac/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/storage) -"stK" = ( -/obj/structure/closet/crate/coffin, -/turf/open/floor/plating, -/area/station/service/chapel/storage) -"stN" = ( -/obj/structure/railing{ - dir = 10 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/wood, -/area/station/service/theater) -"suj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/junction/yjunction, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) -"sup" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/maintenance/port/fore) -"suw" = ( -/obj/item/kirbyplants/random, -/obj/machinery/status_display/ai/directional/west, -/turf/open/floor/carpet, -/area/station/commons/vacant_room/office) -"suA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/light/small/directional/west, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/structure/sign/warning/no_smoking/directional/west, -/turf/open/floor/iron, -/area/station/maintenance/department/engine/atmos) -"suB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/kirbyplants/random, -/obj/machinery/firealarm/directional/north, -/obj/machinery/light_switch/directional/west{ - pixel_x = -24 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/commons/toilet/locker) -"suE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/electrical) -"suH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/modular_computer/preset/civilian, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/engineering/storage_shared) -"suQ" = ( -/obj/structure/cable, -/obj/structure/table/wood/fancy/blue, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/door/window/right/directional/west{ - name = "Core Modules"; - req_access = list("captain") - }, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/ai_upload) -"suZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/atmospherics, -/obj/item/book/manual/wiki/atmospherics{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/item/pipe_dispenser, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/station/engineering/atmos) -"sva" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/warning/engine_safety/directional/south, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron, -/area/station/engineering/lobby) -"svc" = ( -/obj/structure/table/reinforced, -/obj/machinery/button/door{ - id = "xeno7"; - name = "Containment Control"; - req_access = list("xenobiology") - }, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/iron, -/area/station/science/xenobiology) -"svd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/crate, -/obj/effect/spawner/random/engineering/tool, -/turf/open/floor/plating, -/area/station/maintenance/department/security) -"svf" = ( -/obj/structure/closet/crate/hydroponics, -/obj/effect/spawner/random/food_or_drink/seed, -/obj/effect/spawner/random/food_or_drink/seed, -/obj/effect/spawner/random/food_or_drink/seed, -/obj/effect/spawner/random/maintenance, -/obj/machinery/light_switch/directional/east{ - pixel_y = 6 - }, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/checker, -/area/station/service/hydroponics/garden/abandoned) -"svj" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) -"svm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/service/chapel/funeral) -"svt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/generic_maintenance_landmark, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/service/abandoned_gambling_den) -"svz" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/random/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -"svO" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/structure/chair, -/obj/effect/landmark/start/assistant, -/obj/structure/cable, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) -"svW" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"svX" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/obj/effect/landmark/event_spawn, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/main) -"swf" = ( -/obj/machinery/door/window/brigdoor/left/directional/south{ - id = "medsci-cell"; - name = "Med-Sci Cell"; - req_access = list("security") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron/dark/side, -/area/station/security/checkpoint/medical/medsci) -"swj" = ( -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Captain's Office"; - name = "Captain's Fax Machine" - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) -"swn" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/execution/education) -"swD" = ( -/obj/machinery/power/emitter, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/station/engineering/main) -"swP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/closet/emcloset, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating, -/area/station/commons/fitness/recreation) -"swR" = ( -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 6 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = 2 - }, -/obj/item/cigarette/cigar{ - pixel_x = 4.5 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) -"swY" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chem_lab_maint_windows"; - name = "Privacy Shutters" - }, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) -"sxk" = ( -/obj/structure/barricade/wooden, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, -/turf/open/floor/iron, -/area/station/service/abandoned_gambling_den) -"sxp" = ( -/obj/structure/table/reinforced, -/obj/item/analyzer{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/analyzer{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/assembly/signaler, -/obj/item/assembly/signaler, -/turf/open/floor/iron, -/area/station/engineering/storage/tech) -"sxr" = ( -/obj/structure/table/wood, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/requests_console/directional/south{ - department = "Bridge"; - name = "Bridge Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/announcement, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/item/papercutter, -/turf/open/floor/iron/grimy, -/area/station/command/bridge) -"sxD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) -"sxE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/purple/filled/mid_joiner, -/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/turf/open/floor/iron/white/smooth_large, -/area/station/science/ordnance/office) -"sxG" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/medical{ - name = "Medbay Desk" - }, -/turf/open/floor/iron, -/area/station/medical/paramedic) -"sxK" = ( -/obj/effect/turf_decal/siding/wood, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/wood/large, -/area/station/service/barber) -"sxP" = ( -/obj/machinery/computer/records/security, -/obj/machinery/status_display/ai/directional/north, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/processing) -"sxR" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/engineering/main) -"sye" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/cargo/sorting) -"sys" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner{ - dir = 8 - }, -/area/station/engineering/lobby) -"syE" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research/glass{ - name = "Robotics Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/robotics, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/science/robotics/lab) -"syO" = ( -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"syW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/conveyor{ - id = "cargodisposals" - }, -/turf/open/floor/plating, -/area/station/cargo/sorting) -"sze" = ( -/turf/open/floor/iron/cafeteria, -/area/station/security/prison/mess) -"szf" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/status_display/evac/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/maintenance/disposal/incinerator) -"szg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) -"szh" = ( -/obj/effect/spawner/random/trash/soap, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/tile/dark_blue/half{ - dir = 8 - }, -/turf/open/floor/iron/textured_half{ - dir = 8 - }, -/area/station/commons/toilet/locker) -"szi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/security/range) -"szj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Science - Ordnance Storage"; - name = "science camera"; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ - dir = 4 - }, -/turf/open/floor/iron/white/smooth_large, -/area/station/science/ordnance/storage) -"szn" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/ai_monitored/command/storage/eva) -"szs" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/turf_decal/siding/yellow, -/obj/effect/landmark/start/atmospheric_technician, -/turf/open/floor/iron, -/area/station/engineering/atmos/storage/gas) -"szy" = ( -/turf/closed/wall, -/area/station/service/bar/backroom) -"szG" = ( -/obj/effect/turf_decal/box/white, -/turf/open/floor/iron/dark/textured_large, -/area/station/engineering/atmos/hfr_room) -"szJ" = ( -/obj/machinery/research/anomaly_refinery, -/obj/effect/turf_decal/bot_red, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) -"szL" = ( -/obj/structure/cable, -/obj/structure/closet/firecloset, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/processing) -"szN" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) -"sAh" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/service/barber) -"sAi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/xenoblood, -/obj/structure/sign/warning/xeno_mining/directional/north, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/science/xenobiology) -"sAm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) -"sAv" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/purple/fourcorners, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) -"sAD" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"sAI" = ( -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/maintenance/department/medical/morgue) -"sAL" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) -"sAU" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron, -/area/station/service/hydroponics) -"sAY" = ( -/obj/effect/landmark/start/hangover/closet, -/obj/structure/closet/firecloset, -/obj/effect/turf_decal/delivery, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/entry) -"sBb" = ( -/obj/machinery/holopad, -/obj/structure/cable, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/random/engineering/tracking_beacon, -/turf/open/floor/iron, -/area/station/command/teleporter) -"sBc" = ( -/turf/open/floor/iron, -/area/station/engineering/lobby) -"sBg" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "perma-entrance" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/airlock/security/glass{ - name = "Prison Wing" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/brig) -"sBk" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible, -/turf/open/floor/plating, -/area/station/engineering/atmos/mix) -"sBt" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/poddoor/preopen{ - id = "xeno8"; - name = "Creature Cell #8" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/science/xenobiology) -"sBy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/main) -"sBE" = ( -/obj/machinery/door/firedoor/heavy, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/white/smooth_half{ - dir = 1 - }, -/area/station/science/ordnance/storage) -"sBG" = ( -/obj/structure/cable, -/turf/open/floor/iron/checker, -/area/station/service/janitor) -"sBK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/maintenance/port/aft) -"sBM" = ( -/obj/structure/table, -/obj/machinery/airalarm/directional/east, -/obj/item/storage/medkit/emergency, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) -"sBX" = ( -/turf/closed/wall, -/area/station/service/bar) -"sCd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/shieldgen, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/station/engineering/main) -"sCh" = ( -/obj/structure/cable, -/obj/structure/table/wood, -/obj/machinery/recharger, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) -"sCl" = ( -/obj/effect/landmark/start/hangover, -/obj/structure/chair/sofa/bench{ - dir = 4 - }, -/obj/machinery/status_display/ai/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/fore) -"sCo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"sCx" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) -"sCB" = ( -/obj/machinery/duct, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/dark/smooth_large, -/area/station/science/breakroom) -"sCE" = ( -/obj/structure/table/wood, -/obj/item/poster/random_contraband{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/poster/random_contraband{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/poster/random_contraband, -/turf/open/floor/wood, -/area/station/service/electronic_marketing_den) -"sCF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/half, -/area/station/service/hydroponics) -"sCY" = ( -/obj/structure/cable, -/obj/machinery/power/tracker, -/turf/open/floor/iron/solarpanel/airless, -/area/station/solars/port/fore) -"sDd" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/obj/machinery/camera/directional/west{ - c_tag = "Science - Medbay Airlock"; - name = "science camera"; - network = list("ss13","rd") - }, -/turf/open/floor/iron/white, -/area/station/science/research) -"sDe" = ( -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/commons/locker) -"sDk" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/spawner/random/trash/caution_sign, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: PRESSURIZED DOORS"; - pixel_x = -32 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -"sDJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/holopad, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/grimy, -/area/station/service/chapel) -"sDL" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) -"sDO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch" - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "sci-toxins-passthrough" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/science) -"sEc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/science/xenobiology) -"sEm" = ( -/obj/structure/cable, -/obj/structure/chair/comfy/brown{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/station/command/meeting_room/council) -"sEn" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/airlock/unres, -/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, -/turf/open/floor/iron, -/area/station/maintenance/department/crew_quarters/bar) -"sEs" = ( -/turf/closed/wall, -/area/station/command/heads_quarters/captain/private) -"sEv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/loading_area{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) -"sEF" = ( -/obj/structure/cable, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/tile/purple/fourcorners, -/turf/open/floor/iron, -/area/station/science/research) -"sFf" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"sFq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/corner, -/turf/open/floor/iron/white, -/area/station/science/research) -"sFu" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/command/corporate_showroom) -"sFR" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/virology) -"sFS" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/external{ - name = "External Solar Access" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/iron, -/area/station/maintenance/solars/port/fore) -"sFW" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/security/brig) -"sGa" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "AI Satellite - Fore Starboard"; - name = "ai camera"; - network = list("minisat"); - start_active = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/aisat/exterior) -"sGi" = ( -/obj/structure/cable, -/obj/effect/landmark/start/hangover, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) -"sGj" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "aiuploadwindow"; - name = "AI Upload Lockdown Door" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/ai_monitored/turret_protected/ai_upload) -"sGx" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) -"sGz" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/wall, -/area/station/command/heads_quarters/hop) -"sGB" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/service/library/printer) -"sGI" = ( -/obj/effect/spawner/random/structure/girder, -/obj/effect/spawner/random/structure/grille, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -======= /turf/closed/wall, /area/station/maintenance/department/security) "rYE" = ( @@ -79588,7 +74382,6 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron, /area/station/maintenance/port/aft) "sGJ" = ( @@ -81953,8 +76746,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -<<<<<<< HEAD -======= "tns" = ( /obj/structure/table/wood, /obj/machinery/keycard_auth/wall_mounted/directional/west, @@ -81962,7 +76753,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tnu" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -85343,27 +80133,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -<<<<<<< HEAD -"ucz" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "brig-entrance" - }, -/obj/machinery/door/airlock/security/glass{ - name = "Brig" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/entrance, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/scanner_gate/preset_guns, -/turf/open/floor/iron/dark, -/area/station/security/brig) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ucA" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -87446,28 +82215,6 @@ }, /turf/open/floor/iron, /area/station/engineering/lobby) -<<<<<<< HEAD -"uDg" = ( -/obj/machinery/modular_computer/preset/id{ - dir = 1 - }, -/obj/machinery/keycard_auth/wall_mounted/directional/south{ - pixel_x = -5 - }, -/obj/machinery/button/door/directional/south{ - id = "cmoshutter"; - name = "CMO Office Shutters"; - pixel_x = 8; - pixel_y = -26; - req_access = list("cmo") - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/cmo) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uDj" = ( /obj/structure/cable, /obj/structure/sign/nanotrasen{ @@ -95625,8 +90372,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/medical/medsci) -<<<<<<< HEAD -======= "wDO" = ( /obj/machinery/modular_computer/preset/id{ dir = 1 @@ -95646,7 +90391,6 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/cmo) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wDX" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -99129,14 +93873,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/maintenance/department/chapel) -<<<<<<< HEAD -"xyX" = ( -/obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/smartfridge/drying, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xyZ" = ( /obj/machinery/light/directional/north, /obj/item/kirbyplants/random, @@ -132714,11 +127450,7 @@ spq nyp vmh rEJ -<<<<<<< HEAD -xyX -======= shc ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 xtp hBF jUU @@ -132785,11 +127517,7 @@ tYP hBT ipr xwC -<<<<<<< HEAD -hOU -======= eIh ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 urt mjW lPM @@ -137639,11 +132367,7 @@ jpe sCh cvE vcU -<<<<<<< HEAD -rLs -======= tns ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lZx lZx dQf @@ -137923,11 +132647,7 @@ rcW oJy oFr pXk -<<<<<<< HEAD -sbn -======= hXQ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lfz fvi nlK @@ -138720,11 +133440,7 @@ dQT akg hdH jgt -<<<<<<< HEAD -uDg -======= wDO ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 loe iId nuI @@ -141235,11 +135951,7 @@ cQv sHn qBY wIe -<<<<<<< HEAD -jIN -======= goc ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eVl dol uIY @@ -143559,11 +138271,7 @@ wkt aby dFo xnw -<<<<<<< HEAD -nZG -======= fyH ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ivA hTg pgE @@ -148670,11 +143378,7 @@ aaa aaa aad ljS -<<<<<<< HEAD -nTg -======= szZ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bdF wob eZV @@ -152048,15 +146752,9 @@ hOz hOz hOz dzw -<<<<<<< HEAD -mEB -hOz -ucz -======= aYN hOz kEp ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mTA mTA tNZ @@ -158201,11 +152899,7 @@ qIH aad kOA kOA -<<<<<<< HEAD -gFz -======= gIw ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 huI fbW okz diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 2a889cf2fc6..880184c8f8c 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -13,25 +13,6 @@ "aag" = ( /turf/closed/wall, /area/station/commons/fitness) -<<<<<<< HEAD -"aaj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Science Research"; - network = list("ss13","rd") - }, -/obj/machinery/light/small/directional/south, -/obj/structure/noticeboard/rd{ - pixel_y = -32 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/science/lab) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aal" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -81,19 +62,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/aft) -<<<<<<< HEAD -"aaL" = ( -/obj/structure/table, -/obj/effect/turf_decal/siding/white/corner, -/obj/machinery/firealarm/directional/north, -/obj/item/clipboard, -/obj/item/paper, -/obj/item/pen, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/station/medical/office) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "abI" = ( /obj/structure/chair/stool/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -192,18 +160,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) -<<<<<<< HEAD -"adC" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/purple/fourcorners, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "adD" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance, @@ -267,17 +223,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron/dark/textured, /area/station/medical/cryo) -<<<<<<< HEAD -"afe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/decal/cleanable/wrapping, -/turf/open/floor/iron, -/area/station/cargo/sorting) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "afj" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -316,8 +261,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/carpet, /area/station/commons/dorms) -<<<<<<< HEAD -======= "afM" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -325,7 +268,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/main) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "afZ" = ( /obj/machinery/vending/coffee, /obj/structure/disposalpipe/segment, @@ -336,45 +278,6 @@ /mob/living/simple_animal/bot/secbot/beepsky/armsky, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -<<<<<<< HEAD -"agf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/box/lights/mixed{ - pixel_x = -4; - pixel_y = 18 - }, -/obj/item/storage/box/lights/mixed{ - pixel_x = 6; - pixel_y = 12 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/grenade/chem_grenade/cleaner{ - pixel_x = -7; - pixel_y = 12 - }, -/obj/structure/table, -/turf/open/floor/iron, -/area/station/service/janitor) -"agk" = ( -/obj/effect/turf_decal/siding/thinplating_new/dark, -/obj/effect/turf_decal/trimline/brown/line, -/obj/effect/turf_decal/trimline/brown/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/landmark/start/bitrunner, -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark/textured_half, -/area/station/cargo/bitrunning/den) -======= "agi" = ( /obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -384,7 +287,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ago" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /turf/open/floor/iron, @@ -396,17 +298,6 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -<<<<<<< HEAD -"agB" = ( -/obj/machinery/firealarm/directional/north, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/trimline/red/filled/corner{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "agN" = ( /obj/structure/table/glass, /obj/item/radio/intercom/directional/west, @@ -436,24 +327,6 @@ }, /turf/open/floor/iron/white, /area/station/science/cytology) -<<<<<<< HEAD -"agP" = ( -/obj/item/storage/box/syringes, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "agR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -467,14 +340,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -<<<<<<< HEAD -"ahb" = ( -/obj/structure/lattice/catwalk, -/obj/item/banner/cargo, -/turf/open/space/basic, -/area/space/nearstation) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ahe" = ( /obj/machinery/airalarm/directional/east, /obj/structure/cable, @@ -523,29 +388,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) -<<<<<<< HEAD -"ahu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Service Hallway"; - name = "Service Fax Machine" - }, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ahD" = ( /obj/structure/displaycase/trophy, /turf/open/floor/wood, @@ -571,101 +413,6 @@ dir = 4 }, /turf/open/floor/iron/dark/corner{ -<<<<<<< HEAD - dir = 1 - }, -/area/station/engineering/atmos) -"ahW" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Corporate Showroom" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "showroom" - }, -/obj/effect/mapping_helpers/airlock/access/any/command/general, -/turf/open/floor/wood, -/area/station/command/corporate_showroom) -"aib" = ( -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) -"aid" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/entry) -"aie" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) -"aif" = ( -/obj/structure/table/wood, -/obj/item/book/manual/wiki/security_space_law{ - pixel_y = 3 - }, -/obj/item/radio/intercom/command/directional/north, -/obj/item/paper/fluff/jobs/engineering/frequencies, -/turf/open/floor/iron/dark, -/area/station/command/bridge) -"aig" = ( -/obj/machinery/door/poddoor/preopen{ - id = "medsecprivacy"; - name = "Privacy Shutter" - }, -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/brigdoor/right/directional/north{ - req_access = list("brig_entrance") - }, -/obj/item/folder/red{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/paper, -/obj/item/pen, -/turf/open/floor/plating, -/area/station/security/checkpoint/medical) -"aij" = ( -/obj/structure/chair, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/turf_decal/tile/red/opposingcorners, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) -"aiw" = ( -/obj/structure/window/spawner/directional/east, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) -"aja" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/security/office) -"ajI" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/vending/drugs, -/turf/open/floor/iron/dark, -/area/station/medical/medbay/central) -"ajK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -======= dir = 1 }, /area/station/engineering/atmos) @@ -734,7 +481,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ dir = 1 }, @@ -795,24 +541,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -<<<<<<< HEAD -"akQ" = ( -/obj/structure/table/wood, -/obj/structure/sign/picture_frame/showroom/three{ - pixel_x = -8; - pixel_y = 32 - }, -/obj/structure/sign/picture_frame/showroom/four{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/item/pai_card{ - desc = "A real Nanotrasen success, these personal AIs provide all of the companionship of an AI without any law related red-tape."; - name = "\improper Nanotrasen-brand personal AI device exhibit" - }, -/turf/open/floor/wood, -/area/station/command/corporate_showroom) -======= "akF" = ( /obj/machinery/flasher/directional/north{ id = "AI" @@ -826,7 +554,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "akZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 @@ -840,8 +567,6 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) -<<<<<<< HEAD -======= "alu" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/structure/crate, @@ -871,7 +596,6 @@ /obj/effect/mapping_helpers/mail_sorting/supply/qm_office, /turf/open/floor/plating, /area/station/maintenance/port/fore) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "alE" = ( /turf/open/floor/iron, /area/station/security/courtroom) @@ -881,13 +605,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/mechbay) -<<<<<<< HEAD -"alG" = ( -/obj/structure/sign/poster/contraband/random/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "alI" = ( /obj/machinery/door/window/left/directional/east{ name = "Bridge Deliveries"; @@ -930,18 +647,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) -<<<<<<< HEAD -"aml" = ( -/obj/structure/secure_safe/hos{ - pixel_x = 36; - pixel_y = 28 - }, -/obj/machinery/status_display/evac/directional/north, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hos) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "amo" = ( /obj/structure/chair{ dir = 8; @@ -1035,28 +740,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -<<<<<<< HEAD -"aoc" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/food/pie/cream, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "kitchen_counter"; - name = "Kitchen Counter Shutters" - }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, -/area/station/service/kitchen) -"aoh" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "qmroom" - }, -/turf/open/floor/plating, -/area/station/command/heads_quarters/qm) -======= "anX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1071,7 +754,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aok" = ( /turf/open/floor/iron, /area/station/cargo/storage) @@ -1103,13 +785,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -<<<<<<< HEAD -======= "apC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/miningoffice) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "apJ" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -1119,627 +798,6 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -<<<<<<< HEAD -"apT" = ( -/obj/machinery/door/airlock/external{ - name = "Solar Maintenance" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/plating, -/area/station/maintenance/solars/starboard/aft) -"aqa" = ( -/obj/machinery/portable_atmospherics/pump, -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/commons/locker) -"aqh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) -"aqq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/box/mousetraps{ - pixel_x = -5; - pixel_y = 14 - }, -/obj/structure/table, -/obj/item/storage/box/mousetraps{ - pixel_x = 12; - pixel_y = 15 - }, -/obj/item/radio/intercom/directional/north, -/obj/item/grenade/chem_grenade/cleaner{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/item/grenade/chem_grenade/cleaner{ - pixel_x = -1; - pixel_y = 3 - }, -/turf/open/floor/iron, -/area/station/service/janitor) -"aqs" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"aqu" = ( -/obj/structure/closet/wardrobe/green, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/commons/locker) -"aqG" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/cargo/sorting) -"aqS" = ( -/obj/effect/turf_decal/siding/purple/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/research) -"aqW" = ( -/obj/structure/cable, -/obj/machinery/power/terminal, -/obj/machinery/light/small/directional/east, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/solars/port/fore) -"ara" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/turf/open/floor/plating, -/area/station/maintenance/starboard/greater) -"arg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/spawner/random/structure/closet_maintenance, -/obj/effect/spawner/random/maintenance/two, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) -"ark" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) -"art" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/computer) -"asm" = ( -/obj/effect/turf_decal/siding/white, -/obj/effect/turf_decal/trimline/brown/warning, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/iron, -/area/station/medical/medbay/lobby) -"asz" = ( -/obj/structure/table, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/mineral/plasma{ - amount = 35 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/storage/satellite) -"asB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -"asM" = ( -/obj/machinery/computer/prisoner/management{ - dir = 4 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hos) -"atf" = ( -/obj/structure/table/glass, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) -"ati" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/computer/security/telescreen/ordnance/directional/east, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) -"atk" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/aft/greater) -"atN" = ( -/obj/structure/cable, -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/office) -"aub" = ( -/obj/effect/spawner/random/structure/grille, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) -"auc" = ( -/obj/machinery/light/small/directional/west, -/turf/open/floor/engine, -/area/station/engineering/supermatter) -"aum" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -"auw" = ( -/obj/machinery/door/airlock{ - id_tag = "Cabin7"; - name = "Cabin 1" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood, -/area/station/commons/dorms) -"auJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/hallway/secondary/entry) -"auQ" = ( -/obj/structure/cable, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/construction/storage_wing) -"ava" = ( -/obj/effect/spawner/random/structure/closet_maintenance, -/obj/item/storage/box/lights/mixed, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) -"avb" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/holopad, -/obj/effect/turf_decal/box/white{ - color = "#52B4E9" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ - dir = 1 - }, -/turf/open/floor/iron/white/smooth_half, -/area/station/medical/cryo) -"avc" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Gateway - Access" - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/station/command/gateway) -"avq" = ( -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -"avr" = ( -/obj/item/radio/intercom/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) -"avx" = ( -/obj/machinery/computer/camera_advanced/xenobio{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/iron, -/area/station/science/xenobiology) -"avA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, -/area/station/command/corporate_showroom) -"avK" = ( -/turf/closed/wall, -/area/station/maintenance/fore/lesser) -"avU" = ( -/obj/structure/bed, -/obj/effect/spawner/random/bedsheet, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/button/door/directional/east{ - id = "Cabin2"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/carpet, -/area/station/commons/dorms) -"awy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/siding/purple, -/obj/structure/sign/warning/test_chamber/directional/south, -/turf/open/floor/iron/white, -/area/station/science/ordnance/testlab) -"awO" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "rdoffice"; - name = "Research Director's Shutters" - }, -/turf/open/floor/plating, -/area/station/science/server) -"axd" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = -32 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/entry) -"axe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/brig{ - id = "Cell 3"; - name = "Cell 3 locker" - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/brig) -"axx" = ( -/obj/machinery/firealarm/directional/north, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/atmos) -"axJ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood, -/area/station/maintenance/port/aft) -"axK" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/security/prison) -"axO" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/security/prison) -"axS" = ( -/obj/structure/sign/warning/secure_area{ - desc = "A warning sign which reads 'BOMB RANGE"; - name = "BOMB RANGE" - }, -/turf/closed/wall, -/area/station/science/ordnance/bomb) -"axW" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/side, -/area/station/medical/medbay/lobby) -"aye" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 10 - }, -/turf/open/space, -/area/space/nearstation) -"ayg" = ( -/turf/open/floor/engine/o2, -/area/station/engineering/atmos) -"ayr" = ( -/turf/open/floor/iron, -/area/station/engineering/break_room) -"ayG" = ( -/obj/structure/table/reinforced, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/tile/neutral/half{ - dir = 8 - }, -/obj/machinery/light/small/directional/north, -/obj/item/surgery_tray/full/morgue, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 8 - }, -/area/station/medical/morgue) -"ayH" = ( -/obj/effect/spawner/random/engineering/atmospherics_portable, -/turf/open/floor/plating, -/area/station/maintenance/port) -"ayO" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -"ayV" = ( -/obj/effect/turf_decal/trimline/red/filled/corner{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/brig) -"azd" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 4 - }, -/turf/open/space, -/area/space/nearstation) -"azg" = ( -/obj/item/stack/cable_coil, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"azo" = ( -/obj/structure/table/glass, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/pai_card, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted, -/turf/open/floor/iron/white, -/area/station/science/lobby) -"azv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable/layer3, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai) -"azE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) -"azF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/white, -/area/station/science/research) -"azZ" = ( -/obj/structure/closet/crate, -/obj/item/reagent_containers/cup/bowl, -/obj/effect/spawner/random/contraband/prison, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/kitchen/fork/plastic, -/obj/item/kitchen/fork/plastic, -/obj/item/kitchen/fork/plastic, -/obj/item/storage/box/drinkingglasses, -/obj/item/kitchen/spoon/plastic, -/obj/item/kitchen/spoon/plastic, -/obj/item/kitchen/spoon/plastic, -/obj/item/knife/plastic, -/obj/item/knife/plastic, -/obj/item/knife/plastic, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/box/drinkingglasses, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) -"aAg" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/commons/dorms) -"aAs" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/greater) -"aAt" = ( -/obj/machinery/light_switch/directional/south, -/obj/effect/spawner/random/vending/colavend, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron/dark, -/area/station/command/bridge) -"aAA" = ( -/obj/docking_port/stationary/mining_home{ - dir = 8 - }, -/turf/open/space/basic, -/area/space) -"aAB" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/station/medical/storage) -"aAI" = ( -/obj/structure/sign/plaques/kiddie/perfect_man{ - pixel_y = 32 - }, -/obj/effect/spawner/random/decoration/showcase, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/carpet, -/area/station/command/corporate_showroom) -"aAK" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/command/gateway) -"aAS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/north, -/obj/machinery/light/small/directional/north, -/obj/effect/spawner/random/engineering/tracking_beacon, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) -"aAT" = ( -/obj/machinery/firealarm/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Bridge - Port Access" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/command/bridge) -"aBw" = ( -/obj/structure/cable, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) -"aBL" = ( -/obj/effect/spawner/structure/window, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/execution/transfer) -"aBM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/item/cigbutt{ - pixel_x = -6; - pixel_y = -4 - }, -/obj/machinery/duct, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/random/trash/garbage, -/turf/open/floor/iron, -/area/station/maintenance/starboard/greater) -"aBV" = ( -/obj/structure/sign/directions/evac, -/obj/structure/sign/directions/medical{ - pixel_y = 8 - }, -/obj/structure/sign/directions/science{ - pixel_y = -8 - }, -/turf/closed/wall, -/area/station/commons/lounge) -"aBX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -======= "apO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue{ @@ -2380,7 +1438,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) "aCi" = ( @@ -2402,16 +1459,6 @@ /obj/item/wallframe/digital_clock, /turf/open/floor/iron, /area/station/commons/storage/tools) -<<<<<<< HEAD -"aCz" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aCE" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=10.1-Central-from-Aft"; @@ -2523,13 +1570,6 @@ /obj/item/poster/random_official, /turf/open/floor/iron/dark, /area/station/security/office) -<<<<<<< HEAD -"aEp" = ( -/obj/structure/sign/departments/cargo, -/turf/closed/wall, -/area/station/cargo/lobby) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aEr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2542,18 +1582,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -<<<<<<< HEAD -"aEy" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/turf/open/floor/iron, -/area/station/cargo/sorting) -======= "aEA" = ( /obj/structure/table/wood, /obj/item/staff/broom, @@ -2565,7 +1593,6 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/wood/large, /area/station/service/theater) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aEH" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -2580,13 +1607,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/station/security/checkpoint/science) -<<<<<<< HEAD -"aFb" = ( -/obj/structure/sign/warning/electric_shock/directional/south, -/turf/open/space/basic, -/area/space/nearstation) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aFd" = ( /obj/effect/landmark/start/shaft_miner, /turf/open/floor/iron, @@ -2601,14 +1621,11 @@ /obj/effect/spawner/random/bureaucracy/paper, /turf/open/floor/wood, /area/station/commons/dorms) -<<<<<<< HEAD -======= "aFW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/mirror/directional/west, /turf/open/floor/wood, /area/station/service/theater) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aFZ" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -2651,8 +1668,6 @@ "aGM" = ( /turf/open/floor/iron, /area/station/security/range) -<<<<<<< HEAD -======= "aGQ" = ( /obj/item/storage/medkit/regular{ pixel_x = 3; @@ -2664,7 +1679,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aGS" = ( /obj/structure/sign/warning/no_smoking, /turf/closed/wall, @@ -2677,26 +1691,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) -<<<<<<< HEAD -"aGW" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "rdgene2"; - name = "Genetics Lab Shutters" - }, -/obj/machinery/door/window/left/directional/east{ - name = "Genetics Desk"; - req_access = list("genetics") - }, -/obj/item/folder, -/obj/item/pen, -/obj/effect/turf_decal/tile/purple/fourcorners, -/turf/open/floor/iron, -/area/station/science/genetics) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aHh" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -2737,8 +1731,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -<<<<<<< HEAD -======= "aHH" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/siding/purple{ @@ -2753,7 +1745,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aHM" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -2764,19 +1755,6 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron, /area/station/science/research) -<<<<<<< HEAD -"aHW" = ( -/obj/machinery/door/airlock/mining{ - name = "Drone Bay" - }, -/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, -/obj/effect/landmark/navigate_destination, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/cargo/drone_bay) -======= "aHN" = ( /obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/bot, @@ -2789,7 +1767,6 @@ /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, /area/station/science/research) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aIl" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -2866,13 +1843,6 @@ }, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) -<<<<<<< HEAD -"aJh" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/closed/wall/r_wall, -/area/station/science/ordnance/burnchamber) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aJj" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -2895,38 +1865,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) -<<<<<<< HEAD -"aJt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/trimline/brown/filled/line, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aJv" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/station/engineering/supermatter) -<<<<<<< HEAD -"aJw" = ( -/obj/structure/table, -/obj/machinery/button/door{ - id = "xenobio4"; - name = "Xenobio Pen 4 Blast Doors"; - pixel_y = 4; - req_access = list("xenobiology"); - sync_doors = 4 - }, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/floor/iron, -/area/station/science/xenobiology) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aJI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -3019,8 +1961,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) -<<<<<<< HEAD -======= "aKN" = ( /obj/structure/chair/office, /obj/machinery/requests_console/directional/north{ @@ -3032,7 +1972,6 @@ /obj/effect/landmark/start/depsec/supply, /turf/open/floor/iron, /area/station/security/checkpoint/supply) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aKO" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3092,8 +2031,6 @@ /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/white, /area/station/science/lobby) -<<<<<<< HEAD -======= "aLW" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -3132,7 +2069,6 @@ }, /turf/open/floor/wood/large, /area/station/command/heads_quarters/qm) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aMb" = ( /obj/structure/table, /obj/item/cultivator, @@ -3235,8 +2171,6 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -<<<<<<< HEAD -======= "aNQ" = ( /obj/structure/table, /obj/item/stack/medical/gauze, @@ -3249,7 +2183,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aNZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -3277,359 +2210,6 @@ /obj/effect/turf_decal/trimline/brown/warning, /turf/open/floor/iron/white, /area/station/science/lobby) -<<<<<<< HEAD -"aOt" = ( -/obj/effect/turf_decal/siding/white{ - dir = 9 - }, -/turf/open/water, -/area/station/service/hydroponics/garden) -"aOC" = ( -/obj/effect/turf_decal/trimline/red/filled/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/security/brig) -"aOH" = ( -/obj/structure/table, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/assembly/flash/handheld{ - pixel_x = 6; - pixel_y = 13 - }, -/turf/open/floor/iron/dark, -/area/station/security/office) -"aOV" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Lab - Test Chamber"; - network = list("ss13","rd","xeno") - }, -/obj/machinery/light/cold/directional/east, -/turf/open/floor/engine/xenobio, -/area/station/science/xenobiology) -"aPk" = ( -/obj/structure/closet/crate/preopen, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -"aPm" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) -"aPq" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Auxilliary Surgery" - }, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) -"aPs" = ( -/obj/structure/displaycase/captain{ - pixel_y = 5 - }, -/obj/machinery/status_display/evac/directional/north, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain/private) -"aPv" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai_upload) -"aPw" = ( -/obj/machinery/ai_slipper{ - uses = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai_upload) -"aPx" = ( -/obj/effect/turf_decal/bot, -/obj/effect/spawner/random/structure/closet_empty/crate, -/turf/open/floor/iron, -/area/station/maintenance/port/aft) -"aPH" = ( -/obj/structure/bed/dogbed/runtime, -/obj/item/toy/cattoy, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 - }, -/mob/living/basic/pet/cat/runtime, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/cmo) -"aPX" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/server) -"aQe" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "MiniSat Exterior - Starboard Aft"; - network = list("minisat") - }, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/aisat/exterior) -"aQr" = ( -/obj/machinery/portable_atmospherics/pipe_scrubber, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"aQw" = ( -/obj/machinery/turretid{ - control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; - name = "Antechamber Turret Control"; - pixel_x = 30; - req_access = list("minisat") - }, -/obj/machinery/ai_slipper{ - uses = 10 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/aisat/foyer) -"aQP" = ( -/obj/structure/table/wood, -/obj/machinery/microwave{ - pixel_x = 1; - pixel_y = 6 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/station/service/cafeteria) -"aQR" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/space, -/area/space/nearstation) -"aQS" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/department/science/central) -"aRo" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) -"aRt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) -"aRx" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/normal/directional/north, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) -"aRz" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/iron, -/area/station/maintenance/port/aft) -"aRI" = ( -/turf/open/floor/circuit/green, -/area/station/science/robotics/mechbay) -"aRV" = ( -/obj/machinery/porta_turret/ai{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai_upload) -"aSe" = ( -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/cryo) -"aSf" = ( -/obj/structure/table, -/obj/structure/cable, -/obj/item/disk/tech_disk{ - pixel_x = -6 - }, -/obj/item/disk/tech_disk{ - pixel_x = 6 - }, -/obj/item/disk/tech_disk{ - pixel_y = 6 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/science/lab) -"aSk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) -"aSm" = ( -/obj/machinery/light/small/directional/west, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, -/area/station/hallway/secondary/entry) -"aSB" = ( -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/command/bridge) -"aSQ" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/machinery/light_switch/directional/north, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/security/checkpoint/customs) -"aST" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/break_room) -"aSZ" = ( -/obj/machinery/door/poddoor{ - id = "QMLoaddoor2"; - name = "Supply Dock Loading Door" - }, -/obj/machinery/conveyor{ - dir = 4; - id = "QMLoad2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plating, -/area/station/cargo/storage) -"aTs" = ( -/mob/living/basic/slime, -/turf/open/floor/engine, -/area/station/science/xenobiology) -"aTD" = ( -/obj/machinery/vending/coffee, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) -"aTU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/construction/storage_wing) -"aTV" = ( -/turf/closed/wall/r_wall, -/area/station/ai_monitored/turret_protected/ai) -"aUm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron, -/area/station/cargo/lobby) -"aUn" = ( -/obj/effect/spawner/random/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"aUt" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) -"aUx" = ( -/turf/closed/wall/r_wall, -/area/station/ai_monitored/turret_protected/ai_upload_foyer) -"aUK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/ai_monitored/command/storage/eva) -"aUP" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/junction, -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) -"aVd" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hop) -"aVl" = ( -/obj/machinery/porta_turret/ai{ - dir = 4 - }, -======= "aOA" = ( /obj/effect/landmark/blobstart, /obj/effect/turf_decal/stripes/line{ @@ -3932,7 +2512,6 @@ /obj/machinery/porta_turret/ai{ dir = 4 }, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) "aVn" = ( @@ -4045,32 +2624,9 @@ "aWO" = ( /obj/machinery/ai_slipper{ uses = 10 -<<<<<<< HEAD }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) -"aWS" = ( -/obj/machinery/button/door/directional/south{ - id = "warehouse"; - name = "Warehouse Shutters Control" - }, -/obj/effect/turf_decal/trimline/red/filled/warning/corner{ - dir = 8 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Cargo Bay - Aft"; - pixel_x = 14 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) -======= - }, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/ai) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aXa" = ( /turf/closed/wall, /area/station/security/prison/mess) @@ -4157,8 +2713,6 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) -<<<<<<< HEAD -======= "aYl" = ( /obj/machinery/camera/directional/east{ c_tag = "Xenobiology Lab - Test Chamber"; @@ -4167,7 +2721,6 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/engine/xenobio, /area/station/science/xenobiology) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aYw" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three"; @@ -4185,22 +2738,6 @@ }, /turf/open/space, /area/space/nearstation) -<<<<<<< HEAD -"aYy" = ( -/obj/machinery/light/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aYz" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -4241,83 +2778,6 @@ "aZj" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 -<<<<<<< HEAD - }, -/obj/machinery/computer/order_console/mining, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) -"aZv" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "ordnancebridge" - }, -/obj/machinery/button/door{ - id = "ordnancebridge"; - pixel_x = -24; - req_one_access = list("maint_tunnels","science") - }, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) -"aZA" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/button/door/directional/south{ - id = "PermaLockdown"; - name = "Panic Button"; - req_access = list("brig") - }, -/turf/open/floor/iron, -/area/station/security/execution/transfer) -"aZL" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/spawner/random/trash/garbage{ - spawn_scatter_radius = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) -"aZR" = ( -/obj/effect/turf_decal/plaque{ - icon_state = "L2" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -"bah" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/port) -"bar" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 10 - }, -/obj/item/flashlight/lamp{ - pixel_x = -7; - pixel_y = 18; - start_on = 0 - }, -/obj/item/kitchen/rollingpin{ - pixel_x = -4 - }, -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/light/small/dim/directional/west, -/turf/open/floor/plating, -======= }, /obj/machinery/computer/order_console/mining, /turf/open/floor/iron, @@ -4413,7 +2873,6 @@ /obj/effect/mapping_helpers/broken_floor, /obj/machinery/light/small/dim/directional/west, /turf/open/floor/plating, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/station/maintenance/port/aft) "bas" = ( /obj/machinery/airalarm/directional/west, @@ -4517,8 +2976,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port/aft) -<<<<<<< HEAD -======= "bbT" = ( /obj/structure/closet/crate, /obj/item/stack/cable_coil, @@ -4535,7 +2992,6 @@ /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, /area/station/science/research) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bcf" = ( /obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -4550,8 +3006,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -<<<<<<< HEAD -======= "bcw" = ( /obj/structure/cable, /obj/structure/sign/poster/official/random/directional/west, @@ -4572,7 +3026,6 @@ /obj/machinery/light/cold/directional/west, /turf/open/floor/iron/dark, /area/station/command/teleporter) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bcT" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; @@ -4592,8 +3045,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/bridge) -<<<<<<< HEAD -======= "bdb" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4605,7 +3056,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bdv" = ( /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/trunk, @@ -4626,19 +3076,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/smooth_large, /area/station/medical/surgery/theatre) -<<<<<<< HEAD -"bdE" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/obj/structure/sign/poster/contraband/random/directional/south, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bdP" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -4744,18 +3181,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/science/ordnance) -<<<<<<< HEAD -"bfy" = ( -/obj/item/retractor, -/obj/item/hemostat{ - pixel_x = -10 - }, -/obj/structure/table, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bfM" = ( /obj/machinery/door/airlock/public/glass{ name = "Art Storage" @@ -4910,19 +3335,6 @@ /obj/machinery/component_printer, /turf/open/floor/iron/white, /area/station/science/explab) -<<<<<<< HEAD -"biz" = ( -/obj/structure/table, -/obj/item/analyzer, -/obj/effect/turf_decal/siding/purple{ - dir = 10 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron/white, -/area/station/science/ordnance/office) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "biA" = ( /obj/machinery/holopad, /obj/effect/turf_decal/delivery, @@ -5070,15 +3482,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) -<<<<<<< HEAD -======= "bkJ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/fore) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bkM" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/engine, @@ -5107,27 +3516,6 @@ /obj/effect/spawner/random/vending/snackvend, /turf/open/floor/wood, /area/station/service/library) -<<<<<<< HEAD -"blg" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/structure/crate, -/turf/open/floor/iron, -/area/station/cargo/warehouse) -"blt" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Cargo Bay - Mailroom" - }, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/trimline/brown/filled/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/white/corner{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "blu" = ( /obj/structure/table/wood, /obj/machinery/light/small/directional/west, @@ -5171,20 +3559,6 @@ }, /turf/open/floor/iron, /area/station/command/gateway) -<<<<<<< HEAD -"bmn" = ( -/obj/structure/cable, -/obj/machinery/camera/motion/directional/south{ - c_tag = "Vault"; - network = list("vault") - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/nuke_storage) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bmB" = ( /obj/machinery/light_switch/directional/south, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -5250,8 +3624,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) -<<<<<<< HEAD -======= "bny" = ( /obj/machinery/turretid{ control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; @@ -5267,7 +3639,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bnA" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ @@ -5378,8 +3749,6 @@ dir = 4 }, /area/station/service/chapel) -<<<<<<< HEAD -======= "bpq" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -5400,7 +3769,6 @@ }, /turf/open/floor/iron, /area/station/service/kitchen) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bpu" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -5428,8 +3796,6 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/station/hallway/primary/central) -<<<<<<< HEAD -======= "bpY" = ( /obj/machinery/light/small/directional/west, /obj/item/clothing/mask/animal/horsehead, @@ -5448,7 +3814,6 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bqk" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -5518,21 +3883,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/main) -<<<<<<< HEAD -"brN" = ( -/obj/structure/table, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/mask/surgical, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -10; - pixel_y = -1 - }, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "brO" = ( /obj/structure/transit_tube/diagonal/topleft, /turf/open/space, @@ -5599,14 +3949,6 @@ }, /turf/open/floor/wood, /area/station/service/library) -<<<<<<< HEAD -"bsv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) "bsz" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -5623,24 +3965,6 @@ /area/station/service/theater) "bsE" = ( /obj/structure/cable, -======= -"bsz" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/commons/locker) -"bsC" = ( -/obj/structure/chair/wood/wings{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/carpet, -/area/station/service/theater) -"bsE" = ( -/obj/structure/cable, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/sorting/mail{ @@ -5684,64 +4008,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -<<<<<<< HEAD -"btD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -"btL" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 10 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance/storage) -"bug" = ( -/obj/structure/lattice, -/obj/item/tank/internals/oxygen/empty, -/turf/open/space/basic, -/area/space/nearstation) -"buj" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -"buk" = ( -/obj/structure/sign/warning/electric_shock, -/turf/closed/wall/r_wall, -/area/station/maintenance/starboard/fore) -"bus" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/extinguisher{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/extinguisher, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron, -/area/station/science/xenobiology) -======= "btC" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -5810,7 +4076,6 @@ /obj/structure/closet/bombcloset, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "buE" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/window/spawner/directional/west, @@ -5846,8 +4111,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -<<<<<<< HEAD -======= "buL" = ( /obj/structure/closet/secure_closet/exile, /obj/structure/extinguisher_cabinet/directional/west, @@ -5856,7 +4119,6 @@ }, /turf/open/floor/iron, /area/station/command/gateway) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "buN" = ( /obj/structure/flora/bush/large/style_random, /obj/structure/disposalpipe/segment, @@ -5884,8 +4146,6 @@ }, /turf/open/floor/iron, /area/station/commons/locker) -<<<<<<< HEAD -======= "bvl" = ( /obj/machinery/newscaster/directional/east, /obj/structure/table, @@ -5908,7 +4168,6 @@ /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron, /area/station/cargo/sorting) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bvJ" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -5917,19 +4176,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/robotics/lab) -<<<<<<< HEAD -"bvU" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/firealarm/directional/east, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bvY" = ( /obj/machinery/power/tracker, /obj/structure/cable, @@ -5978,18 +4224,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) -<<<<<<< HEAD -"bxc" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 14 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/cargo/warehouse) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bxf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6024,13 +4258,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -<<<<<<< HEAD -======= "bxr" = ( /obj/structure/sign/warning/electric_shock/directional/east, /turf/open/space/basic, /area/space/nearstation) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bxE" = ( /obj/machinery/camera/directional/south{ c_tag = "Chemistry South"; @@ -6094,8 +4325,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -<<<<<<< HEAD -======= "byE" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -6131,7 +4360,6 @@ /obj/effect/turf_decal/tile/bar, /turf/open/floor/iron, /area/station/hallway/primary/central) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "byR" = ( /obj/structure/sign/warning/secure_area/directional/north, /obj/structure/cable, @@ -6223,8 +4451,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -<<<<<<< HEAD -======= "bBy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6237,7 +4463,6 @@ /obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay, /turf/open/floor/iron, /area/station/hallway/primary/port) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bBA" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6248,16 +4473,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -<<<<<<< HEAD -"bBC" = ( -/obj/structure/sign/poster/random/directional/west, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bBK" = ( /obj/structure/table, /obj/item/storage/dice, @@ -6686,25 +4901,6 @@ location = "11.1-Command-Starboard" }, /obj/structure/cable, -<<<<<<< HEAD -/turf/open/floor/iron, -/area/station/hallway/primary/central) -"bKe" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/airalarm/directional/south, -/obj/structure/cable, -/obj/structure/table/glass, -/obj/item/clothing/glasses/science, -/obj/item/clothing/glasses/science, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) -"bKz" = ( -/turf/closed/wall/mineral/plastitanium, -/area/station/security/execution/transfer) -======= /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, @@ -7029,7 +5225,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bKT" = ( /obj/machinery/door/airlock/grunge{ name = "Prison Forestry" @@ -7042,8 +5237,6 @@ "bLd" = ( /turf/closed/wall, /area/station/maintenance/starboard/aft) -<<<<<<< HEAD -======= "bLh" = ( /obj/effect/turf_decal/trimline/green/line{ dir = 1 @@ -7068,7 +5261,6 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/iron/dark, /area/station/service/cafeteria) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bLj" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -7085,8 +5277,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/plating/airless, /area/space/nearstation) -<<<<<<< HEAD -======= "bLY" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -7100,7 +5290,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bMa" = ( /obj/structure/disposaloutlet{ dir = 4; @@ -7146,14 +5335,6 @@ }, /turf/open/floor/iron/checker, /area/station/engineering/atmos/pumproom) -<<<<<<< HEAD -"bME" = ( -/obj/structure/table, -/obj/item/cigarette/pipe, -/turf/open/floor/plating, -/area/station/maintenance/port) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bMM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -7231,21 +5412,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -<<<<<<< HEAD -"bNv" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bNE" = ( /obj/machinery/light/directional/east, /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -<<<<<<< HEAD -======= "bNN" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -7253,7 +5424,6 @@ /obj/structure/railing, /turf/open/floor/iron, /area/station/cargo/lobby) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bNP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -7335,44 +5505,6 @@ "bQj" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 -<<<<<<< HEAD - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) -"bQk" = ( -/obj/item/bodypart/arm/left, -/turf/open/floor/plating/airless, -/area/station/science/ordnance/bomb) -"bQN" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/computer/security/telescreen/entertainment/directional/north, -/turf/open/floor/iron/grimy, -/area/station/service/chapel/office) -"bQO" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Bar - Starboard" - }, -/obj/structure/cable, -/obj/effect/spawner/random/entertainment/arcade, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, -/area/station/commons/lounge) -"bQQ" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/machinery/smartfridge/extract/preloaded, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron, -/area/station/science/xenobiology) -"bRb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/start/scientist, -/turf/open/floor/engine, -/area/station/science/explab) -======= }, /obj/structure/cable, /turf/open/floor/plating, @@ -7430,7 +5562,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/carpet, /area/station/command/corporate_showroom) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bRq" = ( /obj/structure/table/wood, /obj/item/food/grown/harebell{ @@ -7509,22 +5640,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -<<<<<<< HEAD -"bSp" = ( -/obj/machinery/door/airlock/mining{ - name = "Quartermaster's Office" - }, -/obj/effect/mapping_helpers/airlock/access/all/supply/qm, -/obj/structure/cable, -/obj/effect/turf_decal/tile/yellow/diagonal_edge, -/obj/effect/turf_decal/tile/brown/diagonal_centre, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/diagonal, -/area/station/command/heads_quarters/qm) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bSr" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/machinery/airalarm/directional/west, @@ -7532,8 +5647,6 @@ dir = 8 }, /area/station/commons/fitness) -<<<<<<< HEAD -======= "bSs" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -7558,7 +5671,6 @@ /obj/effect/mapping_helpers/requests_console/ore_update, /turf/open/floor/iron/white, /area/station/medical/pharmacy) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bSY" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -7581,8 +5693,6 @@ }, /turf/open/floor/iron, /area/station/commons/lounge) -<<<<<<< HEAD -======= "bTm" = ( /obj/structure/table/reinforced, /obj/item/wheelchair{ @@ -7597,7 +5707,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/station/medical/office) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bTq" = ( /obj/machinery/camera/motion/directional/south{ c_tag = "AI Upload Chamber - Port"; @@ -7608,32 +5717,11 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) -<<<<<<< HEAD -"bUb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/brown/filled/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/brown/filled/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/wrapping, -/turf/open/floor/iron, -/area/station/cargo/sorting) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bUc" = ( /obj/machinery/shower/directional/west, /obj/effect/landmark/start/assistant, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) -<<<<<<< HEAD -"bUg" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/turf/open/floor/iron, -/area/station/cargo/storage) -======= "bUk" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -7672,7 +5760,6 @@ /obj/item/disk/nuclear, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bUC" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -7800,20 +5887,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) -<<<<<<< HEAD -"bWs" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/external{ - name = "Solar Maintenance" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/plating, -/area/station/maintenance/solars/port/fore) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bWw" = ( /obj/structure/chair/stool/directional/south, /obj/machinery/computer/pod/old/mass_driver_controller/trash{ @@ -7821,22 +5894,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) -<<<<<<< HEAD -"bWA" = ( -/obj/machinery/light/directional/west, -/obj/machinery/piratepad/civilian, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bWM" = ( /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/tile/blue, @@ -7876,8 +5933,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -<<<<<<< HEAD -======= "bXc" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -7906,7 +5961,6 @@ }, /turf/open/floor/iron, /area/station/science/explab) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bXk" = ( /obj/machinery/telecomms/server/presets/command, /turf/open/floor/circuit/telecomms/mainframe, @@ -7984,25 +6038,6 @@ "bYz" = ( /turf/open/floor/circuit, /area/station/maintenance/port/aft) -<<<<<<< HEAD -"bYF" = ( -/obj/structure/sign/chalkboard_menu, -/turf/closed/wall, -/area/station/commons/storage/primary) -"bYU" = ( -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/structure/table/glass, -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/command/bridge) -======= "bYN" = ( /obj/effect/turf_decal/siding/wideplating_new{ dir = 4 @@ -8024,7 +6059,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron, /area/station/science/xenobiology) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bZq" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/stripes/line{ @@ -8077,14 +6111,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/courtroom) -<<<<<<< HEAD -"car" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/cargo/sorting) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "caO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -8093,14 +6119,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -<<<<<<< HEAD -======= "caV" = ( /obj/vehicle/sealed/mecha/ripley/cargo, /obj/effect/decal/cleanable/generic, /turf/open/floor/iron/recharge_floor, /area/station/cargo/warehouse) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cbg" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -8117,23 +6140,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -<<<<<<< HEAD -"cbz" = ( -/turf/closed/wall, -/area/station/cargo/storage) -"cbK" = ( -/obj/structure/table/reinforced, -/obj/item/emergency_bed, -/obj/item/emergency_bed{ - pixel_y = 3 - }, -/obj/item/emergency_bed{ - pixel_y = 6 - }, -/obj/structure/window/spawner/directional/west, -/turf/open/floor/iron/dark, -/area/station/medical/office) -======= "cbp" = ( /obj/structure/chair/office{ dir = 8 @@ -8148,7 +6154,6 @@ "cbz" = ( /turf/closed/wall, /area/station/cargo/storage) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ccc" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -8157,26 +6162,6 @@ /obj/machinery/duct, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -<<<<<<< HEAD -"cci" = ( -/obj/machinery/computer/mecha{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 5 - }, -/obj/machinery/requests_console/directional/east{ - department = "Research Director's Desk"; - name = "Research Director's Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/announcement, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/machinery/computer/security/telescreen/rd/directional/north, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/rd) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ccD" = ( /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, @@ -8213,8 +6198,6 @@ }, /turf/open/floor/iron, /area/station/commons/toilet/auxiliary) -<<<<<<< HEAD -======= "cdC" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -8228,7 +6211,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cdX" = ( /turf/closed/wall, /area/station/engineering/storage/tech) @@ -8426,8 +6408,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -<<<<<<< HEAD -======= "cgP" = ( /obj/machinery/air_sensor/ordnance_burn_chamber, /turf/open/floor/engine/vacuum, @@ -8437,7 +6417,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron, /area/station/cargo/storage) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cha" = ( /obj/machinery/door/airlock/research/glass{ name = "Ordnance Lab" @@ -8448,8 +6427,6 @@ /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, /area/station/science/ordnance/freezerchamber) -<<<<<<< HEAD -======= "chn" = ( /obj/structure/sign/warning/secure_area/directional/south, /obj/structure/table/reinforced, @@ -8460,7 +6437,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/medical/break_room) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "chH" = ( /obj/structure/chair/stool/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8488,17 +6464,6 @@ }, /turf/closed/wall, /area/station/maintenance/central) -<<<<<<< HEAD -"cia" = ( -/obj/structure/sign/poster/random/directional/south, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cii" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -8506,8 +6471,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) -<<<<<<< HEAD -======= "ciE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -8517,7 +6480,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ciG" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8582,8 +6544,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) -<<<<<<< HEAD -======= "ckB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8592,7 +6552,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron, /area/station/cargo/storage) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ckE" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -8608,80 +6567,6 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/white, /area/station/science/xenobiology) -<<<<<<< HEAD -"clf" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/lobby) -"clj" = ( -/obj/effect/spawner/random/structure/grille, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) -"cln" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/floor/iron, -/area/station/science/research) -"clp" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/station/maintenance/port) -"clq" = ( -/turf/open/floor/carpet, -/area/station/security/detectives_office) -"clD" = ( -/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{ - name = "Burn Chamber Exterior Airlock" - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, -/turf/open/floor/engine/vacuum, -/area/station/science/ordnance/burnchamber) -"clE" = ( -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) -"clO" = ( -/obj/machinery/door/window/left/directional/north{ - name = "Inner Pipe Access"; - req_access = list("atmospherics") - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump/off{ - dir = 1; - name = "O2 To Pure" - }, -/obj/structure/window/spawner/directional/east, -/obj/structure/window/spawner/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"clQ" = ( -/turf/closed/wall, -/area/station/command/teleporter) -"cml" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance/storage) -"cmA" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/turf/open/floor/carpet, -/area/station/command/bridge) -======= "clj" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, @@ -8731,7 +6616,6 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cmB" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -8860,14 +6744,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) -<<<<<<< HEAD -"coE" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 4 -======= "com" = ( /obj/structure/cable, /obj/machinery/netpod, @@ -8878,17 +6754,8 @@ "coz" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 8 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /turf/open/floor/iron, -/area/station/cargo/storage) -"coJ" = ( -/obj/structure/chair/stool/directional/north, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/wood, -/area/station/maintenance/port/aft) -"cpi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/circuit/green{ luminosity = 2 }, @@ -8899,7 +6766,6 @@ name = "Bridge Access Blast Door Control"; req_access = list("command") }, -/obj/effect/turf_decal/tile/blue{ dir = 1 }, /turf/open/floor/iron/dark, @@ -9005,8 +6871,6 @@ /obj/structure/cable, /turf/open/floor/plating/airless, /area/station/solars/port/aft) -<<<<<<< HEAD -======= "cqm" = ( /obj/item/disk/data{ pixel_x = 9; @@ -9027,7 +6891,6 @@ }, /turf/open/floor/carpet, /area/station/command/corporate_showroom) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cqp" = ( /obj/machinery/airalarm/directional/north, /obj/effect/spawner/random/structure/closet_private, @@ -9038,8 +6901,6 @@ /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -<<<<<<< HEAD -======= "cqy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -9048,7 +6909,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cqD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -63697,17 +61557,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/commons/dorms) -<<<<<<< HEAD -"mtV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/junction/flip{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mtZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64086,8 +61935,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/station/security/checkpoint/science) -<<<<<<< HEAD -======= "myG" = ( /obj/structure/sign/directions/evac, /obj/structure/sign/directions/medical{ @@ -64098,7 +61945,6 @@ }, /turf/closed/wall, /area/station/commons/lounge) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "myH" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -64106,14 +61952,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/security/prison) -<<<<<<< HEAD -"myS" = ( -/obj/structure/sign/warning/vacuum/external/directional/north, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "myY" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -64126,15 +61964,6 @@ /obj/machinery/vending/autodrobe/all_access, /turf/open/floor/plating, /area/station/maintenance/port) -<<<<<<< HEAD -"mzc" = ( -/obj/structure/table/reinforced, -/obj/effect/spawner/random/entertainment/lighter, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, -/area/station/service/bar) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mzg" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/red, @@ -64204,15 +62033,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison/visit) -<<<<<<< HEAD -"mzY" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/cargo/warehouse) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mAb" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, @@ -66974,37 +64794,6 @@ }, /turf/open/floor/wood, /area/station/commons/dorms) -<<<<<<< HEAD -"noX" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/item/folder/yellow{ - pixel_x = 8; - pixel_y = -1 - }, -/obj/item/ammo_casing/rocket{ - pixel_x = -2; - pixel_y = 19; - name = "Dud Rocket"; - desc = "An 84mm High Explosive rocket. This one's a dud. Pretty sure." - }, -/obj/item/computer_disk/quartermaster{ - pixel_x = 9; - pixel_y = 13 - }, -/obj/effect/spawner/random/entertainment/lighter{ - pixel_x = -7; - pixel_y = -4 - }, -/turf/open/floor/wood/large, -/area/station/command/heads_quarters/qm) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "npv" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 @@ -67017,20 +64806,6 @@ /obj/structure/window/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -<<<<<<< HEAD -"npy" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/maintenance{ - name = "Mining Dock Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, -/obj/effect/mapping_helpers/airlock/access/any/supply/mining, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "npY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -67150,8 +64925,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -<<<<<<< HEAD -======= "nrB" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -67169,7 +64942,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/service/cafeteria) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nrV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /turf/open/floor/iron/dark, @@ -67360,29 +65132,6 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/storage) -<<<<<<< HEAD -"ntA" = ( -/obj/machinery/door/airlock/external, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/external, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) -"ntM" = ( -/obj/machinery/power/solar_control{ - id = "foreport"; - name = "Port Bow Solar Control" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/solars/port/fore) -"ntP" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Brig Control" - }, -======= "ntm" = ( /obj/machinery/door/airlock/maintenance{ name = "Disposal Access" @@ -67424,7 +65173,6 @@ /obj/machinery/door/airlock/security/glass{ name = "Brig Control" }, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/cable, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -67477,38 +65225,6 @@ /obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 -<<<<<<< HEAD - }, -/turf/open/floor/iron/white, -/area/station/medical/office) -"nut" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -"nuw" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/lobby) -"nuB" = ( -/obj/structure/secure_safe/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -======= }, /turf/open/floor/iron/white, /area/station/medical/office) @@ -67523,7 +65239,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "nuI" = ( @@ -67602,8 +65317,6 @@ /obj/structure/window/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/medical/storage) -<<<<<<< HEAD -======= "nwm" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -67615,7 +65328,6 @@ }, /turf/open/floor/wood/large, /area/station/command/heads_quarters/qm) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nwq" = ( /obj/structure/table, /obj/machinery/firealarm/directional/south, @@ -67624,33 +65336,6 @@ }, /turf/open/floor/iron, /area/station/command/gateway) -<<<<<<< HEAD -"nwx" = ( -/obj/item/storage/box/matches{ - pixel_x = -2; - pixel_y = 3 - }, -/obj/item/cigarette/cigar{ - pixel_x = 4; - pixel_y = 1 - }, -/obj/item/cigarette/cigar{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/cigarette/cigar/cohiba, -/obj/structure/table/wood, -/turf/open/floor/carpet, -/area/station/command/corporate_showroom) -"nwA" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/landmark/start/depsec/supply, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nwC" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -67661,10 +65346,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, /turf/closed/wall, /area/station/engineering/atmos/pumproom) -<<<<<<< HEAD -"nwT" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ -======= "nwL" = ( /obj/machinery/computer/upload/ai, /obj/machinery/door/window/right/directional/south{ @@ -71787,7 +69468,6 @@ /area/station/ai_monitored/turret_protected/ai_upload) "oWH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -81778,8 +79458,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -<<<<<<< HEAD -======= "qnj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -81787,7 +79465,6 @@ /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron, /area/station/cargo/storage) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qno" = ( /obj/structure/table, /obj/machinery/microwave{ @@ -81802,8 +79479,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/xenobiology/hallway) -<<<<<<< HEAD -======= "qnr" = ( /obj/structure/cable, /obj/effect/spawner/random/maintenance, @@ -81811,7 +79486,6 @@ /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/aft) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qnt" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -82272,10 +79946,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/holding_cell) -<<<<<<< HEAD -"qvi" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ -======= "quT" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/machinery/light/directional/south, @@ -83930,7 +81600,6 @@ "qWR" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/warning{ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 1 }, /turf/open/floor/engine/vacuum, @@ -85534,20 +83203,6 @@ /obj/structure/closet, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) -<<<<<<< HEAD -"qYb" = ( -/obj/structure/closet{ - name = "evidence closet 3" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/item/poster/traitor, -/turf/open/floor/iron/dark, -/area/station/security/evidence) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qYd" = ( /obj/structure/cable, /turf/open/floor/iron/white, @@ -85563,8 +83218,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /turf/open/floor/iron/dark, /area/station/tcommsat/server) -<<<<<<< HEAD -======= "qYt" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -85574,21 +83227,17 @@ /obj/effect/turf_decal/tile/purple/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/aft) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qYw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) -<<<<<<< HEAD -======= "qYC" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, /area/station/ai_monitored/command/nuke_storage) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qZa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -87282,8 +84931,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/security/prison/visit) -<<<<<<< HEAD -======= "ryV" = ( /obj/effect/turf_decal/trimline/brown/corner{ dir = 4 @@ -87293,7 +84940,6 @@ }, /turf/open/floor/iron, /area/station/cargo/lobby) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rza" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -89089,8 +86735,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) -<<<<<<< HEAD -======= "saD" = ( /obj/machinery/light_switch/directional/north, /obj/structure/table/wood, @@ -89117,7 +86761,6 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/iron/dark, /area/station/service/cafeteria) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "saN" = ( /obj/structure/bookcase/random/religion, /turf/open/floor/wood, @@ -89132,19 +86775,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -<<<<<<< HEAD -"sbo" = ( -/obj/machinery/requests_console/directional/south{ - department = "Mining"; - name = "Mining Requests Console" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sbp" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -89170,14 +86800,6 @@ /mob/living/basic/parrot/poly, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) -<<<<<<< HEAD -"sbD" = ( -/obj/structure/sign/directions/medical{ - pixel_y = -7 - }, -/turf/closed/wall, -/area/station/medical/pharmacy) -======= "sbF" = ( /obj/machinery/conveyor{ dir = 1; @@ -89191,7 +86813,6 @@ /obj/structure/sign/warning/directional/west, /turf/open/floor/plating, /area/station/cargo/sorting) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sbG" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/east, @@ -89374,36 +86995,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -<<<<<<< HEAD -"seE" = ( -/obj/structure/sign/warning/biohazard, -/turf/closed/wall/r_wall, -/area/station/science/research) -"seJ" = ( -/obj/machinery/light/directional/south, -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted, -/turf/open/floor/iron, -/area/station/cargo/lobby) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "seN" = ( /obj/structure/sign/directions/evac, /turf/closed/wall/r_wall, /area/station/hallway/primary/aft) -<<<<<<< HEAD -"seO" = ( -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/cargo/sorting) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sfg" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -89452,30 +87047,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/security/evidence) -<<<<<<< HEAD -"sfW" = ( -/obj/machinery/conveyor/inverted{ - dir = 6; - id = "QMLoad" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/cargo/storage) -"sga" = ( -/obj/effect/spawner/random/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -======= "sgc" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -89485,7 +87056,6 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/aft) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sgh" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 @@ -89726,21 +87296,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -<<<<<<< HEAD -"skj" = ( -/obj/structure/table, -/obj/item/storage/medkit/regular{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/medkit/regular, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/light/cold/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "skx" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -89755,9 +87310,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/science/lab) -<<<<<<< HEAD -"skD" = ( -======= "skW" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -89959,192 +87511,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "soX" = ( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/event_spawn, -<<<<<<< HEAD -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron, -/area/station/cargo/storage) -"skW" = ( -/obj/effect/spawner/structure/window/reinforced/tinted, -/turf/open/floor/plating, -/area/station/medical/morgue) -"slc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/vehicle/ridden/janicart, -/obj/item/key/janitor, -/turf/open/floor/iron, -/area/station/service/janitor) -"sli" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/medical) -"sln" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 3 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -3 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "kitchen_counter"; - name = "Kitchen Counter Shutters" - }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/service/kitchen) -"sls" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/light/floor, -/turf/open/floor/iron/white, -/area/station/science/xenobiology/hallway) -"slC" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/pharmacy) -"slD" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/entry) -"slI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron/white, -/area/station/security/prison/safe) -"smg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, -/turf/open/floor/engine/vacuum, -/area/station/maintenance/disposal/incinerator) -"smt" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"smy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -"smG" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -"smZ" = ( -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"snb" = ( -/obj/structure/table/optable, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) -"snj" = ( -/obj/machinery/igniter/incinerator_ordmix, -/turf/open/floor/engine/vacuum, -/area/station/science/ordnance/burnchamber) -"snB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/gravity_generator) -"snE" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance/testlab) -"soi" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/unres, -/obj/effect/mapping_helpers/airlock/access/any/command/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/central) -"sok" = ( -/obj/item/storage/box, -/turf/open/floor/plating, -/area/station/maintenance/port) -"sol" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/obj/structure/sign/poster/official/moth_piping/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) -"sou" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/external{ - name = "Departure Lounge Airlock" - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) -"sox" = ( -/obj/structure/table, -/obj/item/training_toolbox, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) -"soU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics) -"soW" = ( -/obj/structure/rack, -/obj/effect/spawner/random/techstorage/security_all, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tech) -"soX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -90153,48 +87519,23 @@ /area/station/service/lawoffice) "spd" = ( /obj/effect/landmark/event_spawn, -======= -/turf/open/floor/wood, -/area/station/service/lawoffice) -"spd" = ( -/obj/effect/landmark/event_spawn, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /turf/open/floor/iron, /area/station/commons/locker) -<<<<<<< HEAD -"spe" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -======= "spf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/circuit/green{ luminosity = 2 }, /area/station/ai_monitored/command/nuke_storage) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sph" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/color_adapter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -<<<<<<< HEAD -"spy" = ( -/obj/effect/spawner/random/vending/colavend, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/port) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "spH" = ( /obj/item/radio/intercom/directional/south, /obj/structure/disposalpipe/segment{ @@ -90257,16 +87598,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -<<<<<<< HEAD -"sqN" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/brown/anticorner{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "src" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/broken_floor, @@ -90282,17 +87613,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/central) -<<<<<<< HEAD -"srr" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/airalarm/directional/east, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron, -/area/station/cargo/storage) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "srP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -90418,8 +87738,7 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -<<<<<<< HEAD -======= + "sul" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -90459,27 +87778,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "suD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison) -<<<<<<< HEAD -"suK" = ( -/obj/structure/table/wood, -/obj/item/lipstick{ - pixel_y = 5 - }, -/obj/effect/spawner/random/entertainment/musical_instrument, -/obj/structure/sign/poster/random/directional/east, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood/large, -/area/station/service/theater) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "suP" = ( /obj/structure/lattice, /obj/machinery/atmospherics/components/unary/passive_vent/layer2{ @@ -90679,32 +87982,11 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/white, /area/station/science/lab) -<<<<<<< HEAD -"sxN" = ( -/obj/structure/railing{ - dir = 10 - }, -/obj/machinery/light/directional/north, -/obj/structure/statue/gold/qm, -/obj/machinery/status_display/supply{ - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/brown/diagonal_centre, -/obj/effect/turf_decal/tile/yellow/diagonal_edge, -/obj/effect/turf_decal/siding/yellow{ - dir = 10 - }, -/turf/open/floor/iron/diagonal, -/area/station/cargo/storage) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sxR" = ( /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -<<<<<<< HEAD -======= "sxX" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -90717,7 +87999,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/wood/large, /area/station/service/theater) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "syc" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -92303,8 +89584,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central) -<<<<<<< HEAD -======= "sUy" = ( /obj/structure/table/wood, /obj/structure/sign/picture_frame/showroom/one{ @@ -92322,7 +89601,6 @@ }, /turf/open/floor/wood, /area/station/command/corporate_showroom) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sUC" = ( /obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -92459,23 +89737,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -<<<<<<< HEAD -"sWq" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/left/directional/east{ - name = "Hydroponics Desk"; - req_access = list("hydroponics") - }, -/obj/structure/desk_bell{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/effect/turf_decal/tile/green/fourcorners, -/turf/open/floor/iron, -/area/station/service/hydroponics) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sWs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -93622,83 +90883,15 @@ /obj/machinery/atmospherics/components/binary/pump{ dir = 4 }, -<<<<<<< HEAD -/turf/open/floor/iron/white, -/area/station/science/cytology) -"tmn" = ( -/obj/structure/sign/poster/random/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/effect/spawner/random/food_or_drink/donkpockets{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/effect/spawner/random/food_or_drink/donkpockets{ - pixel_x = 5; - pixel_y = 7 - }, -/obj/machinery/light/small/broken/directional/east, -/turf/open/floor/iron, -/area/station/cargo/warehouse) -======= /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/science/cytology) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tmq" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -<<<<<<< HEAD -"tms" = ( -/obj/machinery/turretid{ - icon_state = "control_stun"; - name = "AI Chamber turret control"; - pixel_x = 3; - pixel_y = -23 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/door/window/brigdoor/left/directional/west{ - name = "Primary AI Core Access"; - req_access = list("ai_upload") - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai) -"tmx" = ( -/obj/structure/table/wood, -/obj/machinery/firealarm/directional/south, -/obj/item/storage/photo_album/bar, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/wood, -/area/station/service/bar/backroom) -"tmy" = ( -/obj/structure/table, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/book/manual/chef_recipes, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/structure/window/spawner/directional/south, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tmz" = ( /obj/machinery/door/poddoor/shutters{ dir = 1; @@ -93772,15 +90965,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) -<<<<<<< HEAD -======= "tnk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/crate_abandoned, /obj/effect/turf_decal/bot_white, /turf/open/floor/iron, /area/station/cargo/warehouse) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tnm" = ( /obj/structure/chair{ dir = 1 @@ -99213,8 +96403,6 @@ /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/science/ordnance) -<<<<<<< HEAD -======= "uEs" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -99222,7 +96410,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uEw" = ( /obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, @@ -103819,21 +101006,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -<<<<<<< HEAD -"vKi" = ( -/obj/structure/table, -/obj/item/storage/box/lights/mixed{ - pixel_y = 9; - pixel_x = 8 - }, -/obj/item/storage/box/lights/mixed{ - pixel_y = 5; - pixel_x = -6 - }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vKm" = ( /obj/structure/rack, /obj/item/clothing/suit/hazardvest, @@ -103924,14 +101096,11 @@ }, /turf/open/floor/iron, /area/station/commons/locker) -<<<<<<< HEAD -======= "vLM" = ( /obj/structure/table/wood/poker, /obj/item/storage/dice, /turf/open/floor/wood, /area/station/commons/lounge) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vLX" = ( /obj/item/wrench, /turf/open/floor/iron/dark, @@ -103949,18 +101118,6 @@ /obj/machinery/portable_atmospherics/canister/water_vapor, /turf/open/floor/iron, /area/station/service/janitor) -<<<<<<< HEAD -"vMt" = ( -/mob/living/simple_animal/bot/mulebot, -/obj/structure/cable, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=2"; - location = "QM #1" - }, -/turf/open/floor/catwalk_floor, -/area/station/cargo/storage) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vMw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -103975,16 +101132,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/locker) -<<<<<<< HEAD -"vMI" = ( -/obj/machinery/status_display/ai/directional/north, -/obj/machinery/porta_turret/ai, -/obj/machinery/computer/security/telescreen/research/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/aisat_interior) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vML" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -104021,15 +101168,12 @@ }, /turf/open/floor/iron, /area/station/command/gateway) -<<<<<<< HEAD -======= "vNp" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 }, /turf/open/floor/iron, /area/station/cargo/lobby) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vNv" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -104125,8 +101269,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -<<<<<<< HEAD -======= "vPu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -104136,7 +101278,6 @@ /obj/machinery/atmospherics/components/binary/pump/on/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vPy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -104233,8 +101374,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -<<<<<<< HEAD -======= "vQT" = ( /obj/structure/railing{ dir = 1 @@ -104243,7 +101382,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron, /area/station/cargo/storage) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vQV" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -104305,20 +101443,6 @@ /obj/structure/disposalpipe/junction/flip, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -<<<<<<< HEAD -"vRu" = ( -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/cargo/lobby) -"vRJ" = ( -/obj/machinery/camera/motion/directional/south{ - active_power_usage = 0; - c_tag = "Armory - External"; - use_power = 0 - }, -/turf/open/space/basic, -/area/space/nearstation) -======= "vRr" = ( /obj/effect/turf_decal/trimline/brown/corner{ dir = 1 @@ -104335,7 +101459,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_half, /area/station/cargo/bitrunning/den) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vRN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -104375,8 +101498,6 @@ "vRU" = ( /turf/open/floor/carpet, /area/station/service/theater) -<<<<<<< HEAD -======= "vSh" = ( /obj/machinery/status_display/ai/directional/north, /obj/item/storage/toolbox/mechanical{ @@ -104390,7 +101511,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/command/bridge) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vSo" = ( /obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -104472,21 +101592,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) -<<<<<<< HEAD -"vTL" = ( -/obj/machinery/light/small/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/structure/sign/poster/official/random/directional/west, -/turf/open/floor/iron, -/area/station/commons/toilet/auxiliary) -"vTO" = ( -/obj/structure/cable, -/obj/structure/sign/poster/contraband/random/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/port/greater) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vTV" = ( /obj/effect/turf_decal/trimline/neutral/warning{ dir = 10 @@ -104554,48 +101659,6 @@ /obj/effect/turf_decal/tile/dark_blue/half/contrasted, /turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) -<<<<<<< HEAD -"vVg" = ( -/obj/machinery/light_switch/directional/north, -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/mug{ - pixel_x = 13; - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/glass/mug{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/mug{ - pixel_x = 13; - pixel_y = -1 - }, -/obj/item/reagent_containers/cup/glass/shaker{ - pixel_x = -2; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/glass/ice{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/structure/window/spawner/directional/west, -/turf/open/floor/iron/dark, -/area/station/service/cafeteria) -"vVm" = ( -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, -/obj/machinery/door/airlock/maintenance{ - name = "Brig Maintenance" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "vVp" = ( /obj/structure/reagent_dispensers/fueltank, /obj/structure/sign/poster/contraband/random/directional/north, @@ -104613,25 +101676,6 @@ dir = 4 }, /obj/structure/cable, -======= -"vVp" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/sign/poster/contraband/random/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) -"vVr" = ( -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/starboard/greater) -"vVw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -104727,14 +101771,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/station/security/checkpoint/science) -<<<<<<< HEAD -"vWA" = ( -/obj/structure/fake_stairs/directional/east, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron, -/area/station/cargo/storage) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vWB" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/components/binary/pump/on{ @@ -104845,21 +101881,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/command/gateway) -<<<<<<< HEAD -"vYD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/brig) -"vYE" = ( -/obj/effect/turf_decal/trimline/purple/filled/line, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/rd) -======= "vYl" = ( /obj/structure/sign/poster/random/directional/west, /turf/open/floor/plating, @@ -104892,7 +101913,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/entrance, /turf/open/floor/iron, /area/station/security/brig) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vYI" = ( /obj/structure/sign/warning/secure_area/directional/north, /obj/structure/closet/radiation, @@ -105065,26 +102085,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -<<<<<<< HEAD -"vZY" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Cargo Bay Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, -/turf/open/floor/plating, -/area/station/cargo/storage) -"wab" = ( -/obj/structure/sign/warning/secure_area/directional/south, -/obj/structure/table/reinforced, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/break_room) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wac" = ( /obj/item/stack/sheet/glass/fifty{ pixel_x = 3; @@ -105092,8 +102092,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -<<<<<<< HEAD -======= "waf" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -105104,7 +102102,6 @@ /obj/machinery/computer/security/telescreen/turbine/directional/east, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wag" = ( /obj/machinery/computer/records/medical, /obj/structure/cable, @@ -112922,22 +109919,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/evidence) -<<<<<<< HEAD -"xyd" = ( -/obj/effect/turf_decal/trimline/red/filled/corner{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xyp" = ( /obj/machinery/status_display/evac/directional/north, /obj/structure/cable, @@ -113061,30 +110042,10 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -<<<<<<< HEAD -"xzB" = ( -/obj/structure/table, -/obj/effect/turf_decal/siding{ - dir = 9 - }, -/obj/item/stock_parts/matter_bin{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/micro_laser, -/obj/item/flatpack{ - board = /obj/item/circuitboard/machine/flatpacker - }, -/obj/item/multitool, -/turf/open/floor/iron, -/area/station/science/lab) -======= "xzx" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor/iron, /area/station/cargo/storage) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xAb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -154885,21 +151846,13 @@ lMJ dxK aaf aaf -<<<<<<< HEAD -axS -======= weq ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 kJi vpl cDb xOI kJi -<<<<<<< HEAD -axS -======= weq ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aaa aaa aaa @@ -158580,11 +155533,7 @@ rpx dPy loA poc -<<<<<<< HEAD -dgy -======= oDH ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uXd tfg tfg @@ -158637,11 +155586,7 @@ lWq lWq lWq qIq -<<<<<<< HEAD -sDB -======= iCj ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rDm smg crg @@ -163080,11 +160025,7 @@ gHI svo jXz fJy -<<<<<<< HEAD -ggG -======= bJQ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mRv kyZ bDq @@ -168077,19 +165018,11 @@ hbK mgS hbK jlU -<<<<<<< HEAD -jDN -jDN -wIE -jDN -jDN -======= kcu kcu gyK kcu kcu ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 jlU hbK mTg @@ -174234,11 +171167,7 @@ aVn tIa aWN aTV -<<<<<<< HEAD -tms -======= qeQ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aTV aTV aWN @@ -175016,11 +171945,7 @@ iCV mCL pIE bjQ -<<<<<<< HEAD -fMa -======= dqy ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rNs tSP mZW @@ -175283,11 +172208,7 @@ txh bjQ giA hSe -<<<<<<< HEAD -okp -======= lBN ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pDe ueE jGr @@ -175798,11 +172719,7 @@ ldP xgE uFw tXz -<<<<<<< HEAD -wkA -======= jGN ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gfU gfU gfU diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 90a0c56273c..01234def932 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -3894,8 +3894,6 @@ dir = 4 }, /area/mine/lounge) -<<<<<<< HEAD -======= "uT" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/components/unary/outlet_injector/layer2{ @@ -3903,7 +3901,6 @@ }, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/mine/maintenance/service) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uU" = ( /turf/closed/mineral/random/labormineral/volcanic, /area/lavaland/surface/outdoors) @@ -6747,16 +6744,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth_edge, /area/mine/laborcamp) -<<<<<<< HEAD -"LZ" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/components/unary/outlet_injector/layer2{ - dir = 1 - }, -/turf/open/misc/asteroid/basalt/lava_land_surface, -/area/mine/maintenance/service) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ma" = ( /obj/structure/stone_tile/block/cracked, /obj/structure/stone_tile{ @@ -41506,11 +41493,7 @@ pU pU pU uj -<<<<<<< HEAD -LZ -======= uT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pU pU pU diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index f4647bfec47..6a3ad5c1d27 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -196,16 +196,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) -<<<<<<< HEAD -"aV" = ( -/obj/structure/table/wood, -/obj/item/clipboard, -/obj/item/radio/headset/headset_cent, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aW" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -715,12 +705,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/admin) -<<<<<<< HEAD -"de" = ( -/obj/effect/landmark/start/new_player, -/turf/cordon, -/area/misc/start) -======= "df" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -736,7 +720,6 @@ /obj/item/stamp/centcom, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dh" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 @@ -806,8 +789,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) -<<<<<<< HEAD -======= "ds" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -822,7 +803,6 @@ /obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dv" = ( /obj/structure/railing/corner{ dir = 8 @@ -886,487 +866,6 @@ /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks{ dir = 8 -<<<<<<< HEAD - }, -/obj/machinery/status_display/evac/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"dJ" = ( -/obj/machinery/button/door/indestructible{ - id = "thunderdomehea"; - name = "Heavy Supply Control"; - req_access = list("cent_thunder") - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/administration) -"dK" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/highsecurity, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"dL" = ( -/obj/effect/turf_decal/loading_area, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"dU" = ( -/obj/structure/bookcase/random, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/status_display/ai/directional/north, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"dV" = ( -/obj/structure/table/wood, -/obj/item/storage/box/beanbag, -/obj/item/gun/ballistic/shotgun/doublebarrel, -/obj/machinery/status_display/evac/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"dW" = ( -/obj/item/radio{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/radio{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/radio, -/obj/structure/table/wood, -/obj/machinery/status_display/evac/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"ea" = ( -/obj/item/flashlight/lamp, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"ec" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"eg" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"em" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"en" = ( -/obj/item/storage/box/ids{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/silver_ids, -/obj/structure/table/reinforced, -/obj/machinery/newscaster/directional/north, -/obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"ep" = ( -/obj/machinery/power/shuttle_engine/heater, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/catwalk_floor, -/area/centcom/central_command_areas/evacuation/ship) -"eq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/filingcabinet/filingcabinet, -/obj/effect/turf_decal/bot, -/obj/machinery/status_display/evac/directional/east, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) -"et" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: BLAST DOORS" - }, -/turf/open/floor/plating, -/area/centcom/central_command_areas/courtroom) -"eu" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"ev" = ( -/obj/item/kirbyplants/organic/plant22, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"ey" = ( -/obj/structure/flora/bush/leavy, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/grass, -/area/centcom/central_command_areas/evacuation/ship) -"eA" = ( -/obj/machinery/status_display/ai/directional/north, -/obj/item/kirbyplants/organic/plant15{ - pixel_x = -6; - pixel_y = 12 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"eB" = ( -/obj/structure/bookcase/random, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"eD" = ( -/obj/machinery/door/airlock/centcom{ - name = "Administrative Office" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/airlock/access/all/admin/captain, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin) -"eE" = ( -/obj/structure/table/reinforced, -/obj/item/toy/figure/dsquad{ - pixel_x = -3; - pixel_y = 11 - }, -/obj/item/flashlight/seclite, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"eF" = ( -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/briefing) -"eH" = ( -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/ferny/style_random, -/turf/open/floor/iron{ - icon_state = "asteroid5"; - name = "plating" - }, -/area/centcom/tdome/administration) -"eI" = ( -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"eK" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/flowers_yw/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/pale/style_random, -/obj/machinery/light/directional/south, -/turf/open/misc/asteroid, -/area/centcom/central_command_areas/evacuation) -"eM" = ( -/obj/machinery/vending/cola, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"eN" = ( -/obj/structure/table/wood, -/obj/structure/plaque/static_plaque/golden{ - pixel_y = 32 - }, -/obj/item/clothing/accessory/lawyers_badge{ - desc = "A badge of upmost glory."; - name = "thunderdome badge" - }, -/turf/open/floor/iron/grimy, -/area/centcom/tdome/observation) -"eP" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/mob_spawn/corpse/human/intern, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"eR" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/stone, -/area/centcom/central_command_areas/evacuation/ship) -"eS" = ( -/obj/structure/table/wood, -/obj/item/folder, -/obj/item/pen/red, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"eV" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law, -/obj/item/taperecorder, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/briefing) -"eX" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood/tile, -/area/centcom/central_command_areas/evacuation/ship) -"eY" = ( -/obj/machinery/airalarm/directional/east, -/obj/structure/filingcabinet/filingcabinet, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/ferry) -"fa" = ( -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"fc" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"fe" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/item/kirbyplants/organic/plant21, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/courtroom) -"ff" = ( -/obj/structure/rack, -/obj/item/clothing/under/color/green, -/obj/item/clothing/shoes/sneakers/brown, -/obj/item/clothing/suit/armor/vest, -/obj/item/clothing/head/helmet/swat, -/obj/item/gun/energy/laser, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"fh" = ( -/obj/item/kirbyplants/organic/plant22, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"fi" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/effect/landmark/ert_spawn, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"fj" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/armory) -"fk" = ( -/obj/machinery/vending/cigarette, -/obj/machinery/status_display/evac/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"fl" = ( -/obj/effect/landmark/thunderdome/two, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"fm" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/centcom/central_command_areas/evacuation) -"fw" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"fy" = ( -/obj/structure/signpost/salvation{ - icon = 'icons/obj/structures.dmi'; - icon_state = "ladder10"; - invisibility = 100 - }, -/turf/open/misc/ashplanet/wateryrock{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15"; - planetary_atmos = 0 - }, -/area/awaymission/errorroom) -"fA" = ( -/obj/machinery/vending/cola, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/central_command_areas/fore) -"fC" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/full, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"fE" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"fF" = ( -/obj/machinery/door/airlock/external/ruin{ - name = "Backup Emergency Escape Shuttle" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/tdome/administration) -"fG" = ( -/obj/machinery/door/airlock/silver{ - name = "Bathroom" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/mapping_helpers/airlock/access/all/admin/captain, -/turf/open/floor/iron/white, -/area/centcom/central_command_areas/admin) -"fI" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"fM" = ( -/obj/structure/filingcabinet/medical, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"fN" = ( -/obj/structure/closet/crate/bin, -/obj/machinery/light_switch/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"fP" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/centcom/central_command_areas/admin) -"fQ" = ( -/obj/machinery/power/smes/magical, -/obj/structure/sign/warning/electric_shock/directional/east, -/turf/open/floor/iron/smooth_large, -/area/centcom/central_command_areas/evacuation/ship) -"fR" = ( -/obj/item/food/egg/rainbow{ - desc = "I bet you think you're pretty clever... well you are."; - name = "easter egg" - }, -/turf/open/space/basic, -/area/space) -"fT" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/space/basic, -/area/space/nearstation) -"fV" = ( -/turf/open/floor/iron/dark/herringbone, -/area/centcom/central_command_areas/evacuation/ship) -"fW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/centcom/central_command_areas/evacuation/ship) -"fX" = ( -/turf/cordon, -/area/misc/start) -"fZ" = ( -/obj/effect/landmark/ctf, -/turf/open/space/basic, -/area/space) -"ga" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/structure/flora/bush/pointy/style_random, -/obj/machinery/light/directional/south, -/turf/open/floor/grass, -/area/centcom/tdome/administration) -"gd" = ( -/obj/machinery/door/airlock/highsecurity, -/obj/effect/turf_decal/tile/neutral/full, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"ge" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/maintenance_hatch, -/turf/open/floor/catwalk_floor, -/area/centcom/central_command_areas/evacuation/ship) -"gf" = ( -/obj/machinery/vending/security, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) -"gh" = ( -/turf/closed/indestructible/fakedoor{ - name = "Thunderdome Admin" - }, -/area/centcom/tdome/administration) -======= }, /obj/machinery/status_display/evac/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -1834,7 +1333,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gi" = ( /obj/docking_port/stationary{ dir = 4; @@ -1988,8 +1486,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/armory) -<<<<<<< HEAD -======= "gY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -2003,7 +1499,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/control) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -2187,8 +1682,6 @@ /obj/item/soap/nanotrasen, /turf/open/floor/iron/white, /area/centcom/tdome/observation) -<<<<<<< HEAD -======= "ig" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -2196,7 +1689,6 @@ /obj/item/book/manual/wiki/security_space_law, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ih" = ( /obj/structure/bookcase/random, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -2312,14 +1804,6 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) -<<<<<<< HEAD -"iB" = ( -/turf/closed/indestructible/fakedoor{ - name = "CentCom Cell" - }, -/area/centcom/central_command_areas/prison/cells) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iC" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks/beer{ @@ -2949,14 +2433,7 @@ "lb" = ( /obj/structure/table/wood, /obj/machinery/door/window/left/directional/south, -<<<<<<< HEAD -/obj/item/radio/intercom{ - desc = "Talk smack through this."; - syndie = 1 - }, -======= /obj/item/radio/intercom/syndicate, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) "lc" = ( @@ -2969,14 +2446,7 @@ /area/centcom/central_command_areas/courtroom) "ld" = ( /obj/structure/table/wood, -<<<<<<< HEAD -/obj/item/radio/intercom{ - desc = "Talk smack through this."; - syndie = 1 - }, -======= /obj/item/radio/intercom/syndicate, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/door/window/brigdoor/right/directional/south{ name = "CentCom Stand"; req_access = list("cent_captain") @@ -3212,14 +2682,7 @@ /area/centcom/central_command_areas/courtroom) "mn" = ( /obj/structure/table/wood, -<<<<<<< HEAD -/obj/item/radio/intercom{ - desc = "Talk smack through this."; - syndie = 1 - }, -======= /obj/item/radio/intercom/syndicate, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) "mo" = ( @@ -3452,14 +2915,11 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/fore) -<<<<<<< HEAD -======= "nz" = ( /obj/structure/table/reinforced, /obj/machinery/fax/admin, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/briefing) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -4230,21 +3690,6 @@ /obj/effect/mapping_helpers/airlock/access/all/admin/captain, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) -<<<<<<< HEAD -"qM" = ( -/obj/machinery/keycard_auth/wall_mounted/directional/south, -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/machinery/button/door/indestructible{ - id = "XCCFerry"; - name = "Hanger Bay Shutters"; - pixel_y = -38 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/ferry) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qO" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -4313,14 +3758,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/prison) -<<<<<<< HEAD -"rh" = ( -/obj/machinery/keycard_auth/wall_mounted/directional/south, -/obj/structure/table/reinforced, -/obj/item/stack/package_wrap{ - pixel_y = 11; - pixel_x = -16 -======= "rk" = ( /turf/open/floor/wood, /area/centcom/central_command_areas/courtroom) @@ -4996,7 +4433,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ name = "CentCom" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /obj/item/stack/cable_coil{ pixel_y = 4; @@ -5136,562 +4572,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -<<<<<<< HEAD -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/centcom/tdome/administration) -"rM" = ( -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/courtroom) -"rN" = ( -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"rQ" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation/ship) -"rS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/status_display/evac/directional/east, -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) -"rT" = ( -/obj/structure/flora/bush/flowers_br/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/grass, -/area/centcom/central_command_areas/evacuation) -"rU" = ( -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/grass, -/area/centcom/central_command_areas/evacuation) -"rV" = ( -/obj/structure/flora/bush/flowers_yw/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/grass, -/area/centcom/central_command_areas/evacuation) -"rY" = ( -/obj/structure/sign/warning/secure_area, -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/armory) -"rZ" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) -"sa" = ( -/obj/structure/table/wood, -/obj/item/lighter{ - pixel_x = -6; - pixel_y = -2 - }, -/obj/item/crowbar/power{ - pixel_y = 15 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supplypod) -"sb" = ( -/obj/machinery/vending/snack, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod) -"sc" = ( -/obj/structure/table/wood, -/obj/structure/plaque/static_plaque/golden{ - pixel_y = 32 - }, -/obj/item/clothing/accessory/medal/silver{ - pixel_y = 5 - }, -/turf/open/floor/iron/grimy, -/area/centcom/tdome/observation) -"sd" = ( -/obj/machinery/door/airlock/centcom{ - name = "Orbital Drop Pod Loading" - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/general, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"sk" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_y = 5 - }, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/administration) -"sn" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom Security" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/medical, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"so" = ( -/obj/effect/landmark/thunderdome/one, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"sq" = ( -/obj/machinery/computer/shuttle/white_ship{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/status_display/ai/directional/west, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"sr" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"ss" = ( -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"st" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"su" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"sv" = ( -/obj/structure/noticeboard/directional/east, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"sw" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"sz" = ( -/obj/machinery/status_display/evac/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"sA" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation/ship) -"sC" = ( -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"sE" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/armory) -"sF" = ( -/obj/machinery/computer/crew, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"sH" = ( -/obj/machinery/computer/security/telescreen, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"sI" = ( -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) -"sJ" = ( -/obj/machinery/vending/coffee, -/obj/machinery/newscaster/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"sK" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"sL" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom Security" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/general, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"sN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"sO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"sP" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_y = 7; - pixel_x = -4 - }, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"sQ" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"sR" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"sS" = ( -/obj/structure/table, -/obj/item/toy/katana{ - pixel_y = 8 - }, -/obj/item/toy/plush/carpplushie, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"sT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"sV" = ( -/obj/machinery/door/poddoor/shuttledock, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"sY" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom Supplypod Loading" - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/storage, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation) -"sZ" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom Supplypod Loading" - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/storage, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supplypod) -"tb" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen/fourcolor, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"td" = ( -/obj/structure/sign/departments/drop, -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/ferry) -"tg" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/machinery/newscaster/directional/south, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"tl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) -"tn" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/entertainment/directional/south, -/obj/structure/sign/warning/secure_area/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"to" = ( -/obj/machinery/computer/shuttle/ferry{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/status_display/evac/directional/west, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"tp" = ( -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"tq" = ( -/obj/structure/chair/office, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"tr" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"ts" = ( -/obj/effect/turf_decal/tile/green, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"tt" = ( -/obj/effect/turf_decal/tile/green/anticorner/contrasted, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"tu" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom Supply" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/general, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"ty" = ( -/obj/structure/filingcabinet/security, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"tF" = ( -/obj/machinery/door/airlock/centcom{ - name = "Thunderdome Locker Room" - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"tG" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"tH" = ( -/obj/machinery/door/airlock/centcom{ - name = "Thunderdome Administration" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/administration) -"tI" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: BLAST DOORS" - }, -/turf/open/floor/plating, -/area/centcom/central_command_areas/fore) -"tK" = ( -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"tL" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"tM" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"tN" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"tQ" = ( -/obj/item/kirbyplants/organic/plant22, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"tR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/status_display/evac/directional/west, -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) -"tT" = ( -/obj/effect/turf_decal/siding/dark_blue, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"tU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"tV" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"tW" = ( -/obj/structure/sign/poster/contraband/syndicate_recruitment/directional/north, -/turf/open/indestructible/dark, -/area/centcom/central_command_areas/admin) -"ub" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "CentCom" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, /obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/control) -<<<<<<< HEAD -"uc" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"ud" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/stone, -/area/centcom/central_command_areas/evacuation/ship) -"uf" = ( -/turf/closed/indestructible/riveted, -/area/centcom/tdome/administration) -"ug" = ( -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation) -"uh" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -"uj" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/flowers_br/style_random, -/obj/structure/flora/bush/generic/style_random, -/turf/open/floor/grass, -/area/centcom/central_command_areas/prison) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ul" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/yellow/corner{ @@ -6223,23 +5109,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) -<<<<<<< HEAD -"wu" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "CentCom Security" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/general, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wv" = ( /obj/machinery/door/poddoor/shutters{ id = "XCCFerry"; @@ -6316,22 +5185,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/control) -<<<<<<< HEAD -"wJ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "CentCom" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wK" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -6728,128 +5581,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 -<<<<<<< HEAD - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"yL" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/donut_box, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"yO" = ( -/obj/machinery/computer/communications, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -"yP" = ( -/obj/machinery/newscaster{ - pixel_y = -32 - }, -/obj/machinery/computer/cargo{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) -"yS" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/emps, -/obj/item/gun/energy/ionrifle, -/obj/structure/sign/departments/medbay/alt/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"yU" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "CentCom" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"yV" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 8; - height = 7; - json_key = "cargo"; - name = "CentCom"; - shuttle_id = "cargo_away"; - width = 20 - }, -/turf/open/space, -/area/space) -"yW" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"yX" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/white/textured, -/area/centcom/central_command_areas/evacuation/ship) -"yY" = ( -/obj/structure/chair, -/obj/effect/landmark/thunderdome/observe, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"za" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/oil, -/turf/open/floor/iron/smooth_large, -/area/centcom/central_command_areas/evacuation/ship) -"zb" = ( -/obj/machinery/computer/records/medical{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"zc" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"zf" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law, -/obj/item/taperecorder, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation) -"zh" = ( -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) -"zi" = ( -/obj/item/rupee, -/turf/open/misc/ashplanet/wateryrock{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15"; - planetary_atmos = 0 - }, -======= }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) @@ -6972,7 +5703,6 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15"; planetary_atmos = 0 }, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/awaymission/errorroom) "zk" = ( /obj/machinery/door/airlock/medical/glass{ @@ -7161,8 +5891,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/two) -<<<<<<< HEAD -======= "zO" = ( /obj/machinery/camera/directional/north{ c_tag = "Red Team"; @@ -7176,7 +5904,6 @@ /obj/effect/light_emitter/thunderdome, /turf/open/floor/iron, /area/centcom/tdome/arena) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "zR" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -8044,105 +6771,6 @@ /area/centcom/central_command_areas/control) "DJ" = ( /obj/structure/chair/office{ -<<<<<<< HEAD - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"DL" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/catwalk_floor, -/area/centcom/central_command_areas/evacuation/ship) -"DN" = ( -/obj/effect/turf_decal/loading_area{ - dir = 4 - }, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"DT" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Green Team"; - network = list("thunder"); - pixel_x = 12; - pixel_y = -10; - resistance_flags = 64 - }, -/obj/effect/landmark/thunderdome/one, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"DU" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"Eb" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"Ee" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Ef" = ( -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"Eg" = ( -/obj/machinery/door/airlock/centcom{ - name = "Thunderdome Booth" - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"Ej" = ( -/obj/structure/table/reinforced, -/obj/item/storage/medkit/regular, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"Em" = ( -/obj/item/paper_bin, -/obj/item/pen/fourcolor, -/obj/structure/table/reinforced, -/obj/machinery/newscaster/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"En" = ( -/obj/structure/chair/comfy/black, -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -"Eq" = ( -/obj/structure/chair/stool/bar/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/vomit/old, -/turf/open/floor/carpet/red, -/area/centcom/central_command_areas/evacuation/ship) -"Er" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -======= dir = 8 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -8227,7 +6855,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/tile/neutral/full, /obj/effect/decal/cleanable/dirt, /obj/item/kirbyplants, @@ -8260,8 +6887,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) -<<<<<<< HEAD -======= "EA" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -8275,7 +6900,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "EB" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 8 @@ -8333,191 +6957,6 @@ /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 }, -<<<<<<< HEAD -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/full, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/obey/directional/west, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"EM" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/light_emitter/podbay, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/one) -"EV" = ( -/obj/structure/table/wood, -/obj/machinery/microwave{ - pixel_y = 7 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/item/storage/box/donkpockets/donkpocketspicy{ - pixel_x = -4; - pixel_y = 4 - }, -/turf/open/floor/wood/tile, -/area/centcom/central_command_areas/evacuation/ship) -"EZ" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/three) -"Fe" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) -"Ff" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/turf/open/floor/carpet/red, -/area/centcom/central_command_areas/evacuation/ship) -"Fg" = ( -/obj/structure/closet/crate/bin, -/obj/machinery/status_display/evac/directional/south, -/obj/machinery/status_display/evac/directional/west, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"Fh" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"Fi" = ( -/obj/effect/landmark/basketball/game_area, -/turf/open/space/basic, -/area/space) -"Fj" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "Thunderdome Administration" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/administration) -"Fk" = ( -/obj/machinery/vending/cola, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"Fo" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: BLAST DOORS" - }, -/turf/open/floor/plating, -/area/centcom/central_command_areas/prison) -"Fq" = ( -/obj/structure/sign/warning/secure_area, -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/control) -"Fu" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/administration) -"Fv" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/iron, -/area/centcom/central_command_areas/fore) -"Fw" = ( -/obj/machinery/door/window/brigdoor/right/directional/south{ - name = "CentCom Stand"; - req_access = list("cent_captain") - }, -/obj/machinery/status_display/evac/directional/west, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/courtroom) -"Fz" = ( -/obj/item/kirbyplants/organic/plant22, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"FB" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/syringes, -/obj/item/gun/syringe/rapidsyringe, -/obj/structure/reagent_dispensers/wall/peppertank/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"FI" = ( -/obj/effect/landmark/thunderdome/two, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"FO" = ( -/obj/structure/table/reinforced, -/obj/item/computer_disk/quartermaster, -/obj/item/computer_disk/quartermaster, -/obj/item/computer_disk/quartermaster, -/obj/item/gps/mining, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) -"FR" = ( -/obj/effect/light_emitter/podbay, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/pod_storage) -"FX" = ( -/obj/machinery/computer/auxiliary_base/directional/north, -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/radio/headset/headset_cent, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/ferry) -"FZ" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Ga" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/fax, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/ferry) -"Gb" = ( -/obj/effect/light_emitter/thunderdome, -/turf/closed/indestructible/fakeglass, -/area/centcom/tdome/observation) -"Gf" = ( -/obj/machinery/firealarm/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump{ - dir = 8 - }, -======= /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -8711,7 +7150,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 8 }, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) "Gi" = ( @@ -8790,7 +7228,6 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/admin/storage) "GC" = ( -<<<<<<< HEAD /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ name = "CentCom" @@ -9081,3282 +7518,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) -"Io" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 10; - height = 30; - json_key = "ferry"; - name = "CentCom Ferry Dock"; - shuttle_id = "ferry_away"; - width = 21 - }, -/turf/open/space, -/area/space) -"Ip" = ( -/obj/structure/chair/stool/bar/directional/east, -/turf/open/floor/carpet/red, -/area/centcom/central_command_areas/evacuation/ship) -"Ir" = ( -/obj/machinery/computer/emergency_shuttle{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_y = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"Iv" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/stone, -/area/centcom/central_command_areas/evacuation/ship) -"Iw" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"IK" = ( -/obj/structure/closet/secure_closet/ert_sec, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/status_display/ai/directional/south, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"IO" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/floor, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"IR" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/flowers_br/style_random, -/obj/structure/flora/bush/generic/style_random, -/obj/machinery/light/directional/south, -/turf/open/floor/grass, -/area/centcom/tdome/administration) -"IX" = ( -/obj/effect/turf_decal/siding/dark_blue{ - dir = 6 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"Jb" = ( -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/prison/cells) -"Jg" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/centcom/central_command_areas/fore) -"Ji" = ( -/turf/open/floor/circuit/green, -/area/centcom/tdome/arena) -"Jj" = ( -/obj/machinery/flasher{ - id = "tdomeflash"; - name = "Thunderdome Flash" - }, -/turf/open/floor/circuit/green, -/area/centcom/tdome/arena) -"Jl" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/effect/turf_decal/tile/green/anticorner/contrasted, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Jq" = ( -/obj/machinery/camera/motion/thunderdome{ - pixel_x = 10 - }, -/turf/open/floor/circuit/green, -/area/centcom/tdome/arena) -"JC" = ( -/obj/machinery/modular_computer/preset/command{ - dir = 8 - }, -/obj/machinery/status_display/evac/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"JE" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"JJ" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/donut_box, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/administration) -"JO" = ( -/obj/machinery/modular_computer/preset/id/centcom, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -"JU" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"JV" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks/beer{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"JW" = ( -/obj/structure/table/reinforced, -/obj/item/storage/briefcase/secure, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"Kd" = ( -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Ke" = ( -/obj/item/clipboard, -/obj/item/folder/red, -/obj/item/stamp/denied{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stamp, -/obj/structure/table/reinforced, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/briefing) -"Kf" = ( -/obj/machinery/door/airlock/centcom{ - name = "Administrative Storage" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/admin/captain, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin) -"Ko" = ( -/obj/structure/table, -/obj/structure/bedsheetbin, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) -"KA" = ( -/obj/effect/landmark/thunderdome/two, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"KC" = ( -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/wood, -/area/centcom/central_command_areas/courtroom) -"KD" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/machinery/status_display/ai/directional/east, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/courtroom) -"KF" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/one) -"KH" = ( -/turf/closed/wall/mineral/titanium, -/area/centcom/central_command_areas/evacuation/ship) -"KK" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/iron/smooth_large, -/area/centcom/central_command_areas/evacuation/ship) -"KL" = ( -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/effect/landmark/thunderdome/two, -/obj/effect/turf_decal/delivery, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"KN" = ( -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/ferny/style_random, -/obj/machinery/light/directional/north, -/turf/open/floor/iron{ - icon_state = "asteroid5"; - name = "plating" - }, -/area/centcom/tdome/observation) -"KO" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/full, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/vending/cigarette, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"KQ" = ( -/turf/open/floor/plating, -/area/centcom/central_command_areas/evacuation/ship) -"KS" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 1; - height = 5; - name = "recovery ship"; - shuttle_id = "pod_2_away"; - width = 3 - }, -/turf/open/space/basic, -/area/space) -"KV" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/full, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"KZ" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"Lb" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation/ship) -"Lc" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/full, -/obj/structure/closet/emcloset, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"Ld" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"Lf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/marker_beacon/burgundy, -/turf/open/floor/catwalk_floor, -/area/centcom/central_command_areas/evacuation/ship) -"Li" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation/ship) -"Lj" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"Lk" = ( -/obj/machinery/power/shuttle_engine/heater, -/turf/open/floor/catwalk_floor, -/area/centcom/central_command_areas/evacuation/ship) -"Ll" = ( -/obj/structure/flora/grass/jungle, -/turf/open/floor/grass, -/area/centcom/central_command_areas/evacuation/ship) -"Lm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/door/airlock/titanium/glass, -/turf/open/floor/stone, -/area/centcom/central_command_areas/evacuation/ship) -"Ln" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/chair/comfy/shuttle/tactical{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"Lo" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"Lp" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/full, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"Lt" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/centcom/central_command_areas/evacuation/ship) -"Lu" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/full, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/nanotrasen_logo/directional/west, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"Lv" = ( -/obj/item/kirbyplants/organic/plant22, -/obj/effect/turf_decal/tile/green, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"Lw" = ( -/obj/effect/spawner/structure/window/reinforced/shuttle, -/turf/open/floor/plating, -/area/centcom/central_command_areas/evacuation/ship) -"Lx" = ( -/obj/effect/turf_decal/siding/dark_blue/corner{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"Lz" = ( -/obj/structure/railing{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"LA" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"LB" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/tile/neutral/full, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"LC" = ( -/obj/effect/turf_decal/tile/neutral/full, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/door/airlock/titanium, -/obj/structure/fans/tiny, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"LD" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"LF" = ( -/obj/structure/flora/grass/jungle/b/style_3, -/turf/open/floor/grass, -/area/centcom/central_command_areas/evacuation/ship) -"LG" = ( -/obj/structure/flora/bush/sparsegrass, -/turf/open/floor/grass, -/area/centcom/central_command_areas/evacuation/ship) -"LI" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white/textured, -/area/centcom/central_command_areas/evacuation/ship) -"LJ" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, -/obj/machinery/portable_atmospherics/canister, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/glass, -/turf/open/floor/iron/smooth_large, -/area/centcom/central_command_areas/evacuation/ship) -"LK" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/item/kirbyplants/organic/plant21, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/courtroom) -"LM" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 1; - height = 5; - name = "recovery ship"; - shuttle_id = "pod_6_away"; - width = 3 - }, -/turf/open/space/basic, -/area/space) -"LN" = ( -/obj/structure/table/optable, -/obj/machinery/defibrillator_mount/loaded{ - pixel_y = 28 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white, -/area/centcom/central_command_areas/evacuation/ship) -"LP" = ( -/obj/effect/turf_decal/tile/neutral/full, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/door/airlock/titanium, -/obj/structure/fans/tiny, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"LQ" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"LR" = ( -/obj/structure/sign/poster/official/tactical_game_cards/directional/north, -/turf/open/floor/carpet/red, -/area/centcom/central_command_areas/evacuation/ship) -"LU" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/computer/records/medical{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"LV" = ( -/turf/closed/indestructible/riveted, -/area/awaymission/errorroom) -"LW" = ( -/turf/closed/mineral/ash_rock, -/area/awaymission/errorroom) -"LX" = ( -/obj/structure/speaking_tile, -/turf/closed/mineral/ash_rock, -/area/awaymission/errorroom) -"Mf" = ( -/obj/effect/landmark/thunderdome/one, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"Mn" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"Mo" = ( -/obj/structure/bed, -/obj/item/bedsheet/black, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"Mp" = ( -/obj/structure/table/wood, -/obj/machinery/recharger, -/obj/machinery/status_display/evac/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"Mr" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/light/directional/north, -/obj/machinery/status_display/evac/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"Ms" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Mt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) -"Mu" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Mv" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/tdome/administration) -"Mw" = ( -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"My" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) -"Mz" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/centcom/central_command_areas/prison) -"MC" = ( -/obj/structure/flora/grass/jungle/b, -/obj/effect/decal/cleanable/garbage{ - pixel_x = -15; - pixel_y = -6 - }, -/turf/open/floor/grass, -/area/centcom/central_command_areas/evacuation/ship) -"ME" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"MF" = ( -/obj/structure/fans/tiny, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"MH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/herringbone, -/area/centcom/central_command_areas/evacuation/ship) -"MI" = ( -/obj/machinery/light/directional/north, -/obj/structure/table/wood, -/obj/structure/reagent_dispensers/beerkeg{ - pixel_y = 6; - pixel_x = 5 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supplypod) -"MJ" = ( -/obj/structure/chair/office, -/obj/effect/landmark/ert_spawn, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"MK" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"ML" = ( -/obj/machinery/vending/cigarette, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"MM" = ( -/obj/machinery/power/shuttle_engine/large, -/turf/open/floor/plating, -/area/centcom/central_command_areas/evacuation/ship) -"MP" = ( -/obj/effect/light_emitter/podbay, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/two) -"MQ" = ( -/obj/structure/closet/secure_closet/courtroom, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"MS" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) -"MU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) -"MV" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"MX" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/smooth_edge, -/area/centcom/central_command_areas/evacuation/ship) -"MY" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/briefing) -"Ne" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/trophy/gold_cup, -/turf/open/floor/iron/grimy, -/area/centcom/tdome/observation) -"Ng" = ( -/obj/item/storage/box/ids{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/silver_ids, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"Nh" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses{ - pixel_y = 14; - pixel_x = -4 - }, -/obj/item/reagent_containers/cup/glass/shaker{ - pixel_y = -8; - pixel_x = -10 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supplypod) -"Nk" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) -"Nm" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white/textured, -/area/centcom/central_command_areas/evacuation/ship) -"Nn" = ( -/obj/structure/table/reinforced, -/obj/item/storage/lockbox/loyalty, -/obj/item/gun/ballistic/automatic/ar, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin/storage) -"Np" = ( -/obj/structure/bookcase/random, -/obj/structure/noticeboard/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"Nq" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) -"Nr" = ( -/obj/structure/table/reinforced, -/obj/item/folder/red, -/obj/item/restraints/handcuffs, -/obj/item/assembly/flash/handheld, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"Nw" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"Nx" = ( -/obj/structure/fans/tiny, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) -"Ny" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"NC" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"NE" = ( -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/pod_storage) -"NG" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom Security" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/general, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"NH" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/oven/range, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"NI" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/stone, -/area/centcom/central_command_areas/evacuation/ship) -"NJ" = ( -/obj/machinery/status_display/ai/directional/south, -/obj/machinery/status_display/evac/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"NM" = ( -/obj/structure/closet/crate/bin, -/obj/machinery/light/directional/south, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) -"NO" = ( -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supplypod) -"NP" = ( -/obj/machinery/door/airlock/silver{ - name = "Shower" - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) -"NR" = ( -/obj/machinery/door/poddoor{ - id = "thunderdome"; - name = "Thunderdome Blast Door" - }, -/obj/effect/turf_decal/loading_area{ - dir = 8 - }, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"NU" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"NW" = ( -/obj/structure/bookcase/random, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"NY" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"NZ" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"Oc" = ( -/obj/machinery/door/airlock/centcom{ - name = "Administrative Office" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/captain, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"Od" = ( -/obj/structure/cable, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) -"Of" = ( -/obj/item/clipboard, -/obj/item/stamp/denied{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stamp, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"Oh" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/folder/red, -/obj/item/pen/red, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"Oi" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"Oj" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "CentCom" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"Om" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/folder/white, -/obj/item/pen/blue, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"On" = ( -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/admin) -"Oq" = ( -/obj/effect/turf_decal/tile/brown/anticorner/contrasted, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/two) -"Or" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ - dir = 1 - }, -/obj/machinery/meter, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin/storage) -"Ot" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Ou" = ( -/obj/effect/landmark/thunderdome/one, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"Ow" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin/storage) -"Ox" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/centcom/central_command_areas/fore) -"Oz" = ( -/obj/machinery/door/airlock/external/ruin, -/obj/effect/mapping_helpers/airlock/access/all/admin/general, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"OA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supplypod) -"OB" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) -"OC" = ( -/obj/structure/table/reinforced, -/obj/item/toy/plush/lizard_plushie/space/green{ - name = "Escapes-on-Pods" - }, -/turf/open/floor/iron/smooth_large, -/area/centcom/central_command_areas/evacuation/ship) -"OD" = ( -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -3; - pixel_y = 5 - }, -/obj/structure/table/wood, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supplypod) -"OE" = ( -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/ferny/style_random, -/turf/open/floor/iron{ - dir = 6; - icon_state = "asteroid8"; - name = "sand" - }, -/area/centcom/tdome/observation) -"OF" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/wood, -/obj/item/toy/cards/deck{ - pixel_y = 12; - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/glass/mug/tea{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/item/trash/semki{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"OH" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"OI" = ( -/obj/item/kirbyplants/organic/plant21, -/turf/open/floor/iron/dark/herringbone, -/area/centcom/central_command_areas/evacuation/ship) -"OM" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/papercutter{ - pixel_y = 6; - pixel_x = 2 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) -"OO" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder{ - desc = "Used to grind things up into raw materials and liquids."; - pixel_y = 5 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -8 - }, -/obj/item/knife/kitchen{ - pixel_x = 11; - pixel_y = -12 - }, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"OP" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/one) -"OQ" = ( -/obj/machinery/door/airlock/centcom{ - name = "Briefing Room" - }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/admin/general, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"OR" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"OS" = ( -/obj/structure/bookcase/random, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"OV" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) -"OW" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white/textured, -/area/centcom/central_command_areas/evacuation/ship) -"OX" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/obj/effect/landmark/ert_spawn, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"OY" = ( -/obj/item/storage/fancy/donut_box, -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"OZ" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/flowers_yw/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/pale/style_random, -/obj/machinery/light/directional/north, -/turf/open/misc/asteroid, -/area/centcom/tdome/observation) -"Pc" = ( -/obj/structure/fans/tiny, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"Pd" = ( -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"Pe" = ( -/obj/structure/table/wood, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 6 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = 2 - }, -/obj/item/cigarette/cigar{ - pixel_x = 4.5 - }, -/obj/machinery/status_display/evac/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"Pg" = ( -/obj/machinery/computer/auxiliary_base/directional/north, -/obj/structure/table/reinforced, -/obj/item/clipboard{ - pixel_y = 4; - pixel_x = 2 - }, -/obj/item/folder/yellow{ - pixel_y = 7; - pixel_x = 5 - }, -/obj/item/pen/red{ - pixel_y = 2; - pixel_x = 3 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/paper_bin{ - pixel_x = -15; - pixel_y = 7 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) -"Pk" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/donut_box, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"Pl" = ( -/obj/machinery/button/flasher/indestructible{ - id = "tdomeflash" - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/administration) -"Pm" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/four) -"Pn" = ( -/obj/item/storage/box/matches{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/structure/table/wood, -/obj/machinery/barsign/all_access/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"Po" = ( -/obj/machinery/vending/boozeomat, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/turf/open/floor/wood/tile, -/area/centcom/central_command_areas/evacuation/ship) -"Pq" = ( -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/prison) -"Pr" = ( -/obj/effect/landmark/thunderdome/admin, -/obj/structure/chair/comfy/black{ - dir = 1 - }, -/turf/open/floor/iron/grimy, -/area/centcom/tdome/administration) -"Ps" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin/storage) -"Pt" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/mechanical, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"Pv" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/four) -"Pw" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 1; - height = 5; - name = "recovery ship"; - shuttle_id = "pod_7_away"; - width = 3 - }, -/turf/open/space/basic, -/area/space) -"Pz" = ( -/obj/structure/table/reinforced, -/obj/item/paper/pamphlet/centcom/visitor_info, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod) -"PD" = ( -/obj/item/kirbyplants/organic/plant21{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/fore) -"PE" = ( -/obj/machinery/newscaster{ - pixel_x = 32 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/armory) -"PF" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/admin) -"PG" = ( -/obj/effect/turf_decal/tile/dark_blue/fourcorners, -/obj/effect/turf_decal/tile/dark_blue/fourcorners, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"PH" = ( -/obj/machinery/firealarm/directional/south, -/obj/structure/closet/crate/bin, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/ferry) -"PJ" = ( -/obj/structure/closet/crate/freezer/blood, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white/textured, -/area/centcom/central_command_areas/evacuation/ship) -"PK" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/one) -"PL" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/flowers_yw/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/pale/style_random, -/turf/open/misc/asteroid, -/area/centcom/central_command_areas/evacuation) -"PM" = ( -/obj/structure/chair/office, -/obj/effect/landmark/ert_spawn, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"PR" = ( -/obj/structure/table/wood, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 6 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = 2 - }, -/obj/item/cigarette/cigar{ - pixel_x = 4.5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 10 - }, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -"PT" = ( -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"PU" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"PV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supplypod) -"PW" = ( -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/three) -"PX" = ( -/obj/structure/table/reinforced, -/obj/item/folder/red{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/folder/blue{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/lighter, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/briefing) -"PY" = ( -/obj/structure/closet/crate/bin, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"PZ" = ( -/obj/structure/flora/tree/palm{ - icon_state = "palm2" - }, -/obj/machinery/light/directional/west, -/turf/open/floor/grass, -/area/centcom/central_command_areas/evacuation/ship) -"Qb" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/book/manual/wiki/security_space_law, -/obj/item/restraints/handcuffs, -/obj/item/assembly/flash/handheld, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"Qd" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/drinkingglass{ - pixel_y = 9; - pixel_x = 3 - }, -/obj/item/paper/pamphlet/violent_video_games{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood/tile, -/area/centcom/central_command_areas/evacuation/ship) -"Qe" = ( -/turf/open/ai_visible, -/area/centcom/ai_multicam_room) -"Qf" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"Qi" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Qk" = ( -/obj/structure/table/reinforced, -/obj/machinery/button/door/indestructible{ - id = "XCCsec3"; - name = "CC Main Access Control" - }, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"Qm" = ( -/obj/item/clipboard, -/obj/item/folder/red, -/obj/item/stamp/denied{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stamp, -/obj/structure/table/reinforced, -/obj/machinery/status_display/ai/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"Qo" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/administration) -"Qp" = ( -/obj/effect/light_emitter/podbay, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/one) -"Qt" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/electrical{ - pixel_y = 8; - pixel_x = 4 - }, -/obj/item/storage/toolbox/mechanical, -/turf/open/floor/iron/smooth_large, -/area/centcom/central_command_areas/evacuation/ship) -"Qv" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Qx" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/yellow{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) -"Qy" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) -"Qz" = ( -/obj/effect/turf_decal/tile/green, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"QB" = ( -/obj/structure/table/reinforced, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/item/paper_bin{ - pixel_y = 3; - pixel_x = -6 - }, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/clipboard{ - pixel_x = 5 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"QC" = ( -/turf/closed/indestructible/riveted, -/area/centcom/tdome/observation) -"QH" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark, -/obj/effect/turf_decal/tile/neutral/full, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"QM" = ( -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/three) -"QO" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod) -"QR" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"QT" = ( -/obj/structure/table/wood, -/obj/structure/reagent_dispensers/beerkeg, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"QU" = ( -/obj/structure/table/wood, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 6 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = 2 - }, -/obj/item/cigarette/cigar{ - pixel_x = 4.5 - }, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/administration) -"QV" = ( -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -"QX" = ( -/obj/item/kirbyplants/organic/plant22, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"QY" = ( -/obj/item/storage/box/handcuffs, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/gun/ballistic/revolver/mateba, -/obj/structure/table/reinforced, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin/storage) -"Ra" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom Security" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/airlock/access/all/admin/general, -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) -"Rb" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) -"Rc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/centcom/tdome/administration) -"Rd" = ( -/obj/structure/bookcase/random, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"Rf" = ( -/obj/item/kirbyplants/organic/plant22, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"Rh" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Ri" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law, -/obj/item/taperecorder, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"Rj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/airlock/vault{ - req_access = list("cent_captain") - }, -/obj/machinery/door/poddoor/shutters/indestructible{ - id = "XCCadminstore" - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin/storage) -"Rk" = ( -/obj/structure/cable, -/obj/structure/marker_beacon/burgundy, -/turf/open/floor/catwalk_floor, -/area/centcom/central_command_areas/evacuation/ship) -"Rl" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -"Rn" = ( -/obj/structure/table/wood, -/obj/item/clipboard, -/obj/item/folder/blue, -/obj/item/melee/chainofcommand, -/obj/item/stamp/head/captain, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"Ro" = ( -/obj/structure/table/wood, -/obj/item/storage/box/donkpockets{ - pixel_y = 19; - pixel_x = 5 - }, -/obj/item/storage/fancy/cigarettes/cigars/cohiba{ - pixel_y = 6 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supplypod) -"Rp" = ( -/obj/machinery/computer/communications, -/turf/open/floor/iron/dark/herringbone, -/area/centcom/central_command_areas/evacuation/ship) -"Rq" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"Rs" = ( -/obj/structure/closet/secure_closet/security, -/obj/item/storage/belt/security/full, -/obj/item/gun/ballistic/automatic/wt550, -/obj/item/clothing/head/helmet/swat/nanotrasen, -/obj/item/crowbar/red, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation) -"Rw" = ( -/obj/structure/table/wood, -/obj/item/clipboard, -/obj/item/radio/headset/headset_cent, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/administration) -"Rx" = ( -/obj/machinery/newscaster/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/icecream_vat, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"Ry" = ( -/obj/item/storage/medkit/fire, -/obj/item/storage/medkit/regular{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/centcom/central_command_areas/control) -"RB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron, -/area/centcom/tdome/administration) -"RF" = ( -/obj/structure/table/reinforced, -/obj/item/crowbar/red, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/clothing/mask/gas, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"RG" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, -/obj/machinery/light/directional/south, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"RH" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"RI" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/centcom/central_command_areas/courtroom) -"RJ" = ( -/obj/effect/decal/cleanable/fuel_pool, -/turf/open/floor/grass, -/area/centcom/central_command_areas/evacuation/ship) -"RL" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/light_emitter/podbay, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/two) -"RM" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/armory) -"RP" = ( -/obj/structure/bookcase/random, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"RR" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"RV" = ( -/obj/structure/table/reinforced, -/obj/item/restraints/handcuffs, -/obj/item/radio, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"RW" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/paper/pamphlet/centcom/visitor_info, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"RX" = ( -/obj/item/kirbyplants/organic/plant22, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"Sd" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"Se" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/two) -"Sg" = ( -/obj/item/storage/briefcase{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/briefcase/secure, -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/administration) -"Sh" = ( -/obj/structure/table/reinforced, -/obj/item/mod/control/pre_equipped/corporate{ - pixel_y = 5 - }, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/mask/gas/sechailer/swat, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin/storage) -"Si" = ( -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/two) -"Sj" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/siding/dark_blue/corner, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"Sk" = ( -/obj/structure/table/reinforced, -/obj/item/storage/medkit/regular, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"Sl" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/centcom/tdome/observation) -"Sm" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) -"Sp" = ( -/obj/machinery/door/airlock/external/ruin, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Sq" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/folder/yellow, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"Su" = ( -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod) -"Sx" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/admin/storage) -"Sy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/floor, -/turf/open/floor/iron/dark/herringbone, -/area/centcom/central_command_areas/evacuation/ship) -"Sz" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/administration) -"SB" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"SC" = ( -/obj/structure/tank_dispenser/oxygen, -/obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/turf/open/floor/iron/smooth_large, -/area/centcom/central_command_areas/evacuation/ship) -"SE" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/light_emitter/podbay, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/three) -"SG" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation) -"SH" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supplypod) -"SJ" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"SL" = ( -/obj/structure/reagent_dispensers/wall/peppertank/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) -"SO" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/machinery/status_display/ai/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"SP" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) -"SQ" = ( -/obj/structure/filingcabinet/medical, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"SR" = ( -/turf/open/floor/circuit/green, -/area/centcom/central_command_areas/briefing) -"SS" = ( -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/one) -"ST" = ( -/obj/machinery/door/poddoor/ert{ - id = "XCCertstore" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"SX" = ( -/obj/machinery/computer/shuttle, -/turf/open/floor/iron/dark/herringbone, -/area/centcom/central_command_areas/evacuation/ship) -"Tb" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"Tc" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/two) -"Te" = ( -/obj/structure/closet/crate/engineering, -/obj/item/stack/sheet/mineral/plasma{ - amount = 10 - }, -/obj/item/stack/sheet/mineral/plasma{ - amount = 10 - }, -/obj/item/stack/sheet/mineral/plasma/five, -/turf/open/floor/iron/smooth_edge, -/area/centcom/central_command_areas/evacuation/ship) -"Tf" = ( -/obj/structure/table/wood, -/obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/item/reagent_containers/cup/rag, -/obj/machinery/newscaster/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"Tg" = ( -/obj/item/storage/briefcase{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/briefcase/secure, -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"Tj" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_y = 19; - pixel_x = 7 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = -6; - pixel_y = 5 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod) -"Tl" = ( -/obj/structure/table/wood, -/obj/structure/plaque/static_plaque/thunderdome{ - pixel_y = -32 - }, -/obj/item/clothing/accessory/medal/gold{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/item/clothing/accessory/medal/gold, -/turf/open/floor/iron/grimy, -/area/centcom/tdome/observation) -"Tm" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet/red, -/area/centcom/central_command_areas/evacuation/ship) -"To" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -"Tp" = ( -/obj/structure/table/reinforced, -/obj/machinery/status_display/evac/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/clothing/suit/apron/chef, -/obj/item/kitchen/rollingpin{ - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_y = 15; - pixel_x = -7 - }, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"Tq" = ( -/obj/structure/filingcabinet/filingcabinet, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) -"Ts" = ( -/obj/structure/table/reinforced, -/obj/item/restraints/handcuffs/cable/zipties, -/obj/item/assembly/flash/handheld, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"Tt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron, -/area/centcom/tdome/administration) -"Tv" = ( -/obj/structure/table/wood, -/obj/structure/window/spawner/directional/south, -/obj/item/storage/fancy/donut_box, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood/tile, -/area/centcom/central_command_areas/evacuation/ship) -"Tw" = ( -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/ferny/style_random, -/obj/machinery/light/floor, -/turf/open/floor/iron{ - icon_state = "asteroid5"; - name = "plating" - }, -/area/centcom/central_command_areas/control) -"Ty" = ( -/obj/structure/table/reinforced, -/obj/item/camera, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod) -"Tz" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/three) -"TB" = ( -/obj/structure/closet/secure_closet/personal, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"TE" = ( -/obj/structure/chair/comfy/brown{ - color = "#596479"; - dir = 4 - }, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/briefing) -"TG" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation) -"TI" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"TK" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"TL" = ( -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"TS" = ( -/obj/structure/table/wood, -/obj/item/dice/d20{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/dice/d10{ - pixel_x = -3 - }, -/obj/machinery/computer/security/telescreen/entertainment/directional/south, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"TT" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/donut_box{ - pixel_y = 13 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod) -"TU" = ( -/obj/machinery/computer/security{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"TV" = ( -/obj/item/storage/fancy/cigarettes/cigars{ - pixel_y = 6 - }, -/obj/item/storage/fancy/cigarettes/cigars/cohiba{ - pixel_y = 3 - }, -/obj/item/storage/fancy/cigarettes/cigars/havana, -/obj/structure/table/wood, -/obj/machinery/status_display/evac/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"TW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/centcom/central_command_areas/admin) -"Ub" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ - dir = 1 - }, -/obj/machinery/meter, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin/storage) -"Uf" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation) -"Uh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) -"Ui" = ( -/obj/structure/table/wood, -/obj/machinery/computer/security/wooden_tv, -/obj/structure/secure_safe{ - pixel_x = 32; - pixel_y = 24 - }, -/obj/machinery/status_display/ai/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"Ul" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/flowers_yw/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/pale/style_random, -/turf/open/misc/asteroid, -/area/centcom/central_command_areas/fore) -"Um" = ( -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/ferny/style_random, -/turf/open/floor/iron{ - dir = 6; - icon_state = "asteroid8"; - name = "sand" - }, -/area/centcom/tdome/administration) -"Un" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"Ur" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/under/rank/civilian/curator/treasure_hunter, -/obj/item/clothing/under/dress/skirt, -/obj/item/clothing/under/shorts/black, -/obj/item/clothing/under/pants/track, -/obj/item/clothing/accessory/armband/deputy, -/obj/item/clothing/accessory/waistcoat, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/neck/large_scarf/red, -/obj/item/clothing/neck/tie/red, -/obj/item/clothing/head/helmet/space/beret, -/obj/item/clothing/suit/jacket/curator, -/obj/item/clothing/suit/space/officer, -/obj/item/clothing/gloves/fingerless, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/glasses/eyepatch, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -"Us" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"Uv" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/bottle/multiver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = -4 - }, -/obj/item/reagent_containers/hypospray/medipen, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"Uw" = ( -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supplypod) -"Ux" = ( -/turf/open/indestructible/dark, -/area/centcom/central_command_areas/admin) -"Uz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/closet/emcloset, -/turf/open/floor/iron/dark/smooth_large, -/area/centcom/central_command_areas/evacuation/ship) -"UA" = ( -/obj/item/cardboard_cutout{ - starting_cutout = "Private Security Officer" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation) -"UC" = ( -/obj/structure/closet/secure_closet/personal, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"UE" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Red Team"; - network = list("thunder"); - pixel_x = 11; - pixel_y = -9; - resistance_flags = 64 - }, -/obj/effect/landmark/thunderdome/two, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"UH" = ( -/obj/machinery/light/directional/west, -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supplypod) -"UI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/tank/air{ - dir = 1 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin/storage) -"UM" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod) -"UO" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom Security" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/general, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"UR" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"UV" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/lighter, -/obj/machinery/newscaster/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/administration) -"UW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/iron, -/area/centcom/tdome/administration) -"UX" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) -"Vc" = ( -/obj/effect/decal/cleanable/vomit/old, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"Vd" = ( -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 - }, -/turf/open/floor/iron/white/side{ - dir = 10 - }, -/area/centcom/central_command_areas/evacuation) -"Vf" = ( -/obj/item/kirbyplants/organic/plant21{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/fore) -"Vg" = ( -/obj/structure/rack, -/obj/item/gun/energy/e_gun{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/energy/e_gun, -/obj/structure/sign/nanotrasen{ - pixel_y = 32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"Vh" = ( -/obj/structure/table/reinforced, -/obj/item/surgery_tray/full{ - pixel_y = 10; - pixel_x = 2 - }, -/obj/item/storage/box/masks{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/white, -/area/centcom/central_command_areas/evacuation/ship) -"Vi" = ( -/obj/item/book/manual/wiki/security_space_law, -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"Vk" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/two) -"Vl" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/flowers_yw/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/pale/style_random, -/turf/open/misc/asteroid, -/area/centcom/tdome/administration) -"Vn" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/three) -"Vp" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -"Vq" = ( -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"Vr" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Vs" = ( -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Vu" = ( -/obj/structure/closet/secure_closet/ert_med, -/obj/machinery/vending/wallmed/directional/south{ - use_power = 0 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"Vv" = ( -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/full, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/textured_large, -/area/centcom/central_command_areas/evacuation/ship) -"Vw" = ( -/obj/machinery/light/directional/south, -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) -"Vx" = ( -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/fore) -"Vy" = ( -/obj/machinery/status_display/ai/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) -"Vz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -"VB" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/folder/white, -/obj/item/pen/blue, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"VF" = ( -/obj/machinery/computer/crew{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"VG" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/effect/turf_decal/tile/green, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"VK" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/donut_box, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -"VM" = ( -/obj/structure/closet/secure_closet/ert_sec, -/obj/structure/sign/directions/security{ - dir = 1; - pixel_y = -24 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/east, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"VO" = ( -/obj/machinery/door/poddoor/ert{ - id = "XCCertstore" - }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"VP" = ( -/obj/effect/turf_decal/tile/brown/anticorner/contrasted, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/four) -"VT" = ( -/obj/machinery/status_display/evac/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/reinforced, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -3; - pixel_y = 5 - }, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"VY" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/machinery/button/door/indestructible{ - id = "XCCcustoms1"; - name = "CC Emergency Docks Control"; - pixel_x = 24; - pixel_y = 24 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation) -"VZ" = ( -/obj/structure/closet/secure_closet/ert_med, -/obj/structure/sign/directions/medical{ - dir = 1; - pixel_y = -24 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"Wa" = ( -/obj/item/kirbyplants/organic/plant22, -/obj/structure/noticeboard/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"Wc" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom Security" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/general, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"Wd" = ( -/obj/structure/table/reinforced, -/obj/item/gun/ballistic/automatic/wt550, -/obj/item/flashlight/seclite, -/obj/structure/noticeboard/directional/north, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"Wf" = ( -/obj/structure/sink/directional/west, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Wl" = ( -/obj/structure/table/wood, -/obj/machinery/recharger, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"Wn" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/centcom/tdome/administration) -"Wp" = ( -/obj/item/storage/briefcase{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/briefcase/secure, -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"Ws" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/yellow/corner{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) -"Wt" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/four) -"Wv" = ( -/obj/structure/chair, -/obj/effect/landmark/thunderdome/observe, -/obj/machinery/barsign/all_access/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"Wy" = ( -/obj/structure/chair/office, -/obj/effect/landmark/ert_spawn, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"WE" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation/ship) -"WF" = ( -/obj/item/storage/box/ids{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/silver_ids, -/obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation) -"WG" = ( -/obj/structure/closet/secure_closet/ert_engi, -/obj/structure/sign/directions/engineering{ - pixel_y = 24 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) -"WK" = ( -/obj/structure/chair, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"WL" = ( -/obj/structure/chair, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"WN" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"WO" = ( -/obj/structure/table/wood, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 6 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = 2 - }, -/obj/item/cigarette/cigar{ - pixel_x = 4.5 - }, -/obj/machinery/newscaster/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"WP" = ( -/obj/machinery/computer/station_alert{ - dir = 8 - }, -/obj/item/radio/intercom{ - desc = "Talk smack through this."; - pixel_x = 28; - syndie = 1 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"WQ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "CentCom Security" -======= -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "CentCom" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -<<<<<<< HEAD -/obj/effect/mapping_helpers/airlock/access/all/admin/general, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"WR" = ( -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) -"WS" = ( -/obj/machinery/button/door/indestructible{ - id = "XCCsec3"; - name = "XCC Shutter 3 Control"; - pixel_x = 24; - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) -"WU" = ( -/obj/machinery/door/airlock/centcom{ - name = "Administrative Office" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/admin/captain, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin) -"WX" = ( -/obj/machinery/light_switch/directional/west, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -"WY" = ( -/obj/machinery/light/directional/north, -/obj/structure/table/reinforced, -/obj/item/crowbar/red, -/obj/item/wrench, -/obj/item/clothing/mask/gas, -/obj/machinery/status_display/evac/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/ferry) -"Xa" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/cup/glass/mug/britcup, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) -"Xb" = ( -/obj/machinery/computer/security{ - dir = 8 - }, -/obj/machinery/newscaster/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation) -"Xc" = ( -/obj/structure/noticeboard/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"Xd" = ( -/obj/item/lighter{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/lighter, -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) -"Xf" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/structure/flora/bush/pointy/style_random, -/turf/open/floor/grass, -/area/centcom/tdome/observation) -"Xh" = ( -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod/loading/four) -"Xj" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"Xk" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/handcuffs, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation) -"Xl" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) -======= -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) -"GD" = ( -/obj/effect/turf_decal/siding/dark_blue{ - dir = 10 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/evacuation) -"GI" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"GJ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: BLAST DOORS" - }, -/turf/open/floor/plating, -/area/centcom/central_command_areas/evacuation) -"GL" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/item/clothing/head/costume/festive{ - pixel_x = -4; - pixel_y = 6 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) -"GN" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/donut_box, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"GT" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"GX" = ( -/obj/item/kirbyplants/organic/plant22, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"Ha" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen/fourcolor, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"Hb" = ( -/obj/machinery/power/port_gen/pacman, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/glass, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/smooth_edge, -/area/centcom/central_command_areas/evacuation/ship) -"Hi" = ( -/obj/effect/turf_decal/tile/green, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/centcom/central_command_areas/ferry) -"Hj" = ( -/obj/structure/closet/crate/bin, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Hl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/herringbone, -/area/centcom/central_command_areas/evacuation/ship) -"Hm" = ( -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/ferny/style_random, -/turf/open/floor/iron{ - icon_state = "asteroid5"; - name = "plating" - }, -/area/centcom/tdome/observation) -"Ho" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/centcom{ - name = "CentCom" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/admin/captain, -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) -"Hs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) -"Hv" = ( -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/courtroom) -"Hw" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"Hz" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) -"HE" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/flowers_yw/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/pale/style_random, -/turf/open/misc/asteroid, -/area/centcom/tdome/observation) -"HF" = ( -/obj/machinery/igniter/on, -/obj/effect/turf_decal/delivery, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"HG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/catwalk_floor, -/area/centcom/central_command_areas/evacuation/ship) -"HH" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation) -"HI" = ( -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/effect/landmark/thunderdome/one, -/obj/effect/turf_decal/delivery, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"HJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/stone, -/area/centcom/central_command_areas/evacuation/ship) -"HK" = ( -/obj/effect/landmark/thunderdome/two, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"HL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/turf/open/floor/stone, -/area/centcom/central_command_areas/evacuation/ship) -"HM" = ( -/obj/structure/bookcase/random, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) -"HR" = ( -/obj/structure/bed/medical/emergency, -/obj/machinery/iv_drip, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/white, -/area/centcom/central_command_areas/evacuation/ship) -"HV" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/closet/secure_closet/quartermaster, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) -"HY" = ( -/obj/machinery/photocopier, -/obj/machinery/button/door/indestructible{ - id = "XCCFerry"; - name = "Hanger Bay Shutters"; - pixel_x = -8; - pixel_y = 24 - }, -/obj/machinery/button/door/indestructible{ - id = "XCCsec3"; - name = "CC Main Access Control"; - pixel_x = 8; - pixel_y = 24 - }, -/obj/machinery/button/door/indestructible{ - id = "XCCsec1"; - name = "CC Shutter 1 Control"; - pixel_x = 8; - pixel_y = 38 - }, -/obj/machinery/button/door/indestructible{ - id = "XCCsec3"; - name = "XCC Shutter 3 Control"; - pixel_x = -8; - pixel_y = 38 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) -"HZ" = ( -/obj/structure/railing{ - dir = 6 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/dark{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/evacuation/ship) -"Ic" = ( -/obj/machinery/door/poddoor{ - id = "thunderdomehea"; - name = "Heavy Supply" - }, -/obj/effect/turf_decal/loading_area, -/obj/effect/light_emitter/thunderdome, -/turf/open/floor/iron, -/area/centcom/tdome/arena) -"Id" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -8 - }, -/obj/item/reagent_containers/cup/glass/mug/britcup, -/obj/effect/turf_decal/bot, -/obj/item/clothing/head/utility/chefhat{ - pixel_y = 11; - pixel_x = 5 - }, -/turf/open/floor/iron, -/area/centcom/tdome/observation) -"Ie" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/yellow, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) -"If" = ( -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) "Im" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -15354,7 +10515,6 @@ }, /turf/open/floor/iron/white, /area/centcom/tdome/observation) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Xn" = ( /obj/machinery/computer/security/telescreen, /obj/structure/table/reinforced, @@ -15477,20 +10637,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/centcom/central_command_areas/supplypod) -<<<<<<< HEAD -"XV" = ( -/obj/structure/table/wood, -/obj/item/clipboard, -/obj/item/folder/red, -/obj/item/stamp/denied{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stamp, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ya" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/armory) @@ -15902,22 +11048,6 @@ /area/centcom/central_command_areas/supply) (1,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -15932,7 +11062,6 @@ TJ TJ TJ TJ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gu aa aa @@ -16176,23 +11305,6 @@ aa aa "} (2,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -16282,7 +11394,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -16525,23 +11636,6 @@ LV aa "} (3,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -16651,7 +11745,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -16784,103 +11877,6 @@ aa aa aa aa -<<<<<<< HEAD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa LV @@ -16897,23 +11893,6 @@ LV aa "} (4,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -17031,7 +12010,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -17094,8 +12072,6 @@ aa aa aa aa -<<<<<<< HEAD -======= aa aa aa @@ -17116,7 +12092,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -17160,131 +12135,6 @@ aa aa aa aa -<<<<<<< HEAD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa LV LW @@ -17300,23 +12150,6 @@ LV aa "} (5,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -17434,7 +12267,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -17497,8 +12329,6 @@ aa aa aa aa -<<<<<<< HEAD -======= aa aa aa @@ -17519,7 +12349,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -17563,131 +12392,6 @@ aa aa aa aa -<<<<<<< HEAD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa LV LW @@ -17703,23 +12407,6 @@ LV aa "} (6,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -17837,7 +12524,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -17900,8 +12586,6 @@ aa aa aa aa -<<<<<<< HEAD -======= aa aa aa @@ -17922,7 +12606,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -17966,131 +12649,6 @@ aa aa aa aa -<<<<<<< HEAD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa LV LW @@ -18106,23 +12664,6 @@ LV aa "} (7,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -18240,7 +12781,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -18303,8 +12843,6 @@ aa aa aa aa -<<<<<<< HEAD -======= aa aa aa @@ -18325,7 +12863,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -18369,131 +12906,6 @@ aa aa aa aa -<<<<<<< HEAD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa LV LW @@ -18509,23 +12921,6 @@ LV aa "} (8,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -de -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -18643,7 +13038,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -18706,8 +13100,6 @@ aa aa aa aa -<<<<<<< HEAD -======= aa aa aa @@ -18728,7 +13120,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -18772,131 +13163,6 @@ aa aa aa aa -<<<<<<< HEAD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa LV LW @@ -18912,23 +13178,6 @@ LV aa "} (9,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -19038,7 +13287,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -19171,103 +13419,6 @@ aa aa aa aa -<<<<<<< HEAD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa LV @@ -19278,33 +13429,12 @@ zi ik ik ZE -<<<<<<< HEAD -fy -======= FM ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LW LV aa "} (10,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -19394,7 +13524,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -19637,23 +13766,6 @@ LV aa "} (11,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -19787,7 +13899,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -19853,127 +13964,6 @@ aa aa aa aa -<<<<<<< HEAD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -20033,23 +14023,6 @@ LV aa "} (12,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -20183,7 +14156,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -20249,127 +14221,6 @@ aa aa aa aa -<<<<<<< HEAD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -20429,23 +14280,6 @@ LV aa "} (13,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -20579,7 +14413,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -20645,127 +14478,6 @@ aa aa aa aa -<<<<<<< HEAD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -20825,23 +14537,6 @@ LV aa "} (14,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -20975,7 +14670,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -21041,127 +14735,6 @@ aa aa aa aa -<<<<<<< HEAD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -21221,23 +14794,6 @@ LV aa "} (15,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -21371,7 +14927,6 @@ aa aa aa aa ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -21437,127 +14992,6 @@ aa aa aa aa -<<<<<<< HEAD -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -21617,23 +15051,6 @@ LV aa "} (16,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -21649,7 +15066,6 @@ TJ TJ TJ TJ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -21892,23 +15308,6 @@ LV aa "} (17,1,1) = {" -<<<<<<< HEAD -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -======= TJ TJ TJ @@ -21924,7 +15323,6 @@ TJ TJ TJ TJ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -52145,11 +45543,7 @@ aa aa aa oe -<<<<<<< HEAD -Ga -======= ig ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sq to ZN @@ -52409,11 +45803,7 @@ mD FX sr tp -<<<<<<< HEAD -qM -======= KW ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mD aa oe @@ -53960,11 +47350,7 @@ mD mD ds xh -<<<<<<< HEAD -wu -======= ds ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mD gO cn @@ -54228,14 +47614,7 @@ WN cb Bu tb -<<<<<<< HEAD -aV -======= rr ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 -ho -gO -aa aa aa aa @@ -54480,15 +47859,9 @@ dx Hz dd mD -<<<<<<< HEAD -WQ -xh -WQ -======= Kv xh Kv ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mD WO eF @@ -55006,13 +48379,8 @@ fa mD PU eF -<<<<<<< HEAD -PX -Ke -======= nz yR ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 eV eF xU @@ -56022,11 +49390,7 @@ vo fP On Zw -<<<<<<< HEAD -XV -======= df ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hd To BT @@ -56849,11 +50213,7 @@ Bp Sz Sz uf -<<<<<<< HEAD -gh -======= FU ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uf aa aa @@ -57569,11 +50929,7 @@ iF Pg mH nm -<<<<<<< HEAD -rh -======= NN ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 On Ui JC @@ -58391,11 +51747,7 @@ BY QC bR HK -<<<<<<< HEAD -UE -======= zO ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 HK HK pb @@ -58876,15 +52228,9 @@ YU YU mD mD -<<<<<<< HEAD -wu -xh -wu -======= ds xh ds ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mD Ya rY @@ -59396,15 +52742,9 @@ iu iu io io -<<<<<<< HEAD -ub -mk -ub -======= uk mk uk ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 io io iu @@ -61234,11 +54574,7 @@ Gb Ef NY NY -<<<<<<< HEAD -Jj -======= fb ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jq NY NY @@ -62714,24 +56050,6 @@ aa aa Jb ir -<<<<<<< HEAD -iB -YX -ir -iB -Jb -ir -iB -Jb -ir -iB -Jb -ir -iB -YX -ir -iB -======= IF YX ir @@ -62748,7 +56066,6 @@ IF YX ir IF ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jb iH il @@ -63023,15 +56340,9 @@ Fq UO io io -<<<<<<< HEAD -yU -mk -yU -======= gY mk gY ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 io io iu @@ -63543,15 +56854,9 @@ io yj io io -<<<<<<< HEAD -Oj -mk -Oj -======= Im mk Im ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 io io iu @@ -64096,11 +57401,7 @@ Tf QC dj Mf -<<<<<<< HEAD -DT -======= RQ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Mf Mf Zi @@ -65319,24 +58620,6 @@ aa aa Jb ir -<<<<<<< HEAD -iB -YX -ir -iB -Jb -ir -iB -Jb -ir -iB -Jb -ir -iB -YX -ir -iB -======= IF YX ir @@ -65353,7 +58636,6 @@ IF YX ir IF ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jb pc Hv @@ -65628,15 +58910,9 @@ cg cg cg cg -<<<<<<< HEAD -yU -GJ -yU -======= gY GJ gY ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cg cg cg @@ -65675,11 +58951,7 @@ Bp Sz Sz uf -<<<<<<< HEAD -gh -======= FU ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 uf aa aa @@ -66152,15 +59424,9 @@ cg cg cg cg -<<<<<<< HEAD -wJ -GJ -wJ -======= EA GJ EA ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cg cg cg diff --git a/_maps/modular_generic/station_m_evidence.dmm b/_maps/modular_generic/station_m_evidence.dmm index be88bbc860e..0324a6f3d7d 100644 --- a/_maps/modular_generic/station_m_evidence.dmm +++ b/_maps/modular_generic/station_m_evidence.dmm @@ -2,8 +2,6 @@ "a" = ( /turf/template_noop, /area/template_noop) -<<<<<<< HEAD -======= "d" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/effect/decal/cleanable/dirt/dust, @@ -13,7 +11,6 @@ }, /turf/open/floor/iron/dark, /area/template_noop) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "h" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/effect/turf_decal/siding/red{ @@ -38,18 +35,6 @@ /obj/effect/turf_decal/tile/dark/opposingcorners, /turf/open/floor/iron/dark, /area/template_noop) -<<<<<<< HEAD -"p" = ( -/obj/effect/turf_decal/tile/dark_red/opposingcorners, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/secure_safe/directional/north{ - name = "evidence safe" - }, -/turf/open/floor/iron/dark, -/area/template_noop) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "q" = ( /obj/structure/closet/secure_closet/evidence, /obj/effect/spawner/random/sakhno/ammo, @@ -91,8 +76,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/template_noop) -<<<<<<< HEAD -======= "z" = ( /obj/machinery/door/window/brigdoor/left/directional/south{ name = "Secure Evidence Lockup"; @@ -102,7 +85,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/template_noop) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "A" = ( /obj/machinery/door/airlock/security{ name = "Evidence Lockup" @@ -180,18 +162,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/template_noop) -<<<<<<< HEAD -"W" = ( -/obj/machinery/door/window/brigdoor/left/directional/south{ - name = "Secure Evidence Lockup"; - req_one_access = list("armory","detective") - }, -/obj/effect/turf_decal/tile/dark_red/opposingcorners, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/template_noop) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "X" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/effect/turf_decal/siding/red{ @@ -235,15 +205,9 @@ a (3,1,1) = {" a G -<<<<<<< HEAD -p -s -W -======= d s z ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 h K m diff --git a/_maps/shuttles/emergency_birdshot.dmm b/_maps/shuttles/emergency_birdshot.dmm index 5931c31825a..bbcad398257 100644 --- a/_maps/shuttles/emergency_birdshot.dmm +++ b/_maps/shuttles/emergency_birdshot.dmm @@ -226,8 +226,6 @@ /obj/item/trash/cheesie, /turf/open/floor/mineral/titanium/tiled, /area/shuttle/escape) -<<<<<<< HEAD -======= "ll" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Airlock" @@ -239,7 +237,6 @@ }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lp" = ( /obj/machinery/door/airlock/titanium{ name = "Emergency Shuttle Airlock" @@ -542,20 +539,6 @@ /obj/machinery/power/shuttle_engine/heater, /turf/open/floor/plating/airless, /area/shuttle/escape) -<<<<<<< HEAD -"zL" = ( -/obj/machinery/door/airlock/titanium{ - name = "Emergency Shuttle Airlock" - }, -/obj/docking_port/mobile/emergency{ - dir = 8; - name = "birdshot emergency shuttle"; - port_direction = 4 - }, -/turf/open/floor/mineral/titanium, -/area/shuttle/escape) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "zV" = ( /obj/structure/toilet{ dir = 4 @@ -1521,11 +1504,7 @@ nQ nQ nQ LX -<<<<<<< HEAD -zL -======= ll ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LX lp rZ diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index b6ce0c3405e..34dcc05801e 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -463,8 +463,6 @@ /obj/structure/sign/warning/vacuum/external/directional/east, /turf/open/floor/plating, /area/shuttle/pirate) -<<<<<<< HEAD -======= "br" = ( /obj/structure/table/wood, /obj/item/storage/box/matches, @@ -482,7 +480,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/wood, /area/shuttle/pirate) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bt" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -825,13 +822,6 @@ /obj/machinery/light/small/directional/east, /obj/machinery/computer/monitor{ dir = 8 -<<<<<<< HEAD - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/all_access, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ -======= }, /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/south, @@ -847,7 +837,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/rack{ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dir = 8 }, /turf/open/floor/iron/dark, @@ -1007,26 +996,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, -<<<<<<< HEAD -/area/shuttle/pirate) -"UI" = ( -/obj/structure/table/wood, -/obj/item/storage/box/matches, -/obj/item/reagent_containers/cup/glass/bottle/rum{ - name = "Captain Pete's Private Reserve Cuban Spaced Rum"; - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 6; - pixel_y = 12 - }, -/obj/item/cigarette/cigar, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/wood, -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/shuttle/pirate) (1,1,1) = {" diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm index ccca83f6fab..1d1a0b0902b 100644 --- a/_maps/shuttles/pirate_dutchman.dmm +++ b/_maps/shuttles/pirate_dutchman.dmm @@ -487,14 +487,9 @@ "xA" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 1; -<<<<<<< HEAD - x_offset = -4; - y_offset = -8 -======= x_offset = 7; y_offset = -3; view_range = 10 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /turf/open/floor/carpet/royalblack/airless, /area/shuttle/pirate/flying_dutchman) diff --git a/_maps/shuttles/pirate_geode.dmm b/_maps/shuttles/pirate_geode.dmm index 0b7d92797fe..2f6a573aae0 100644 --- a/_maps/shuttles/pirate_geode.dmm +++ b/_maps/shuttles/pirate_geode.dmm @@ -430,12 +430,7 @@ "vY" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ dir = 8; -<<<<<<< HEAD - x_offset = 10; - y_offset = 5 -======= x_offset = -8 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, /obj/effect/turf_decal/weather/dirt{ dir = 3 @@ -491,11 +486,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, -<<<<<<< HEAD -/turf/open/floor/plating, -======= /turf/open/floor/plating/airless, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/shuttle/pirate) "yz" = ( /obj/structure/flora/lunar_plant/style_3, @@ -846,11 +837,7 @@ /obj/machinery/power/shuttle_engine/propulsion{ dir = 8 }, -<<<<<<< HEAD -/turf/open/floor/plating, -======= /turf/open/floor/plating/airless, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/shuttle/pirate) "Pr" = ( /obj/structure/table/wood, diff --git a/_maps/shuttles/pirate_irs.dmm b/_maps/shuttles/pirate_irs.dmm index 2e595ba817e..4fd5a8c3573 100644 --- a/_maps/shuttles/pirate_irs.dmm +++ b/_maps/shuttles/pirate_irs.dmm @@ -380,16 +380,6 @@ /obj/machinery/loot_locator, /turf/open/floor/pod/dark, /area/shuttle/pirate) -<<<<<<< HEAD -"nj" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 5 - }, -/turf/open/floor/iron, -/area/shuttle/pirate) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nk" = ( /obj/effect/turf_decal/tile/dark_blue/half{ dir = 8 @@ -1029,8 +1019,6 @@ /obj/structure/curtain, /turf/open/floor/iron/dark, /area/shuttle/pirate) -<<<<<<< HEAD -======= "Dr" = ( /obj/structure/sign/departments/vault/directional/north, /obj/effect/turf_decal/trimline/dark_blue/filled/end{ @@ -1044,7 +1032,6 @@ /obj/structure/fluff/shower_drain, /turf/open/floor/iron/dark, /area/shuttle/pirate) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Dy" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron/white, @@ -1071,22 +1058,6 @@ }, /turf/open/floor/pod/dark, /area/shuttle/pirate) -<<<<<<< HEAD -"Ek" = ( -/obj/structure/sign/departments/vault/directional/north, -/obj/effect/turf_decal/trimline/dark_blue/filled/end{ - dir = 8 - }, -/obj/structure/railing{ - dir = 10 - }, -/obj/machinery/shower/directional/south, -/obj/effect/turf_decal/box, -/obj/structure/fluff/shower_drain, -/turf/open/floor/iron/dark, -/area/shuttle/pirate) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Eq" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/bot, @@ -1446,8 +1417,6 @@ dir = 4 }, /area/shuttle/pirate) -<<<<<<< HEAD -======= "LV" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate{ y_offset = 11; @@ -1459,7 +1428,6 @@ }, /turf/open/floor/iron, /area/shuttle/pirate) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "LX" = ( /turf/open/floor/plating/airless, /area/shuttle/pirate) @@ -2298,11 +2266,7 @@ WR "} (13,1,1) = {" Rh -<<<<<<< HEAD -nj -======= LV ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ev mA pO @@ -2462,11 +2426,7 @@ OC Mu OC hK -<<<<<<< HEAD -Ek -======= Dr ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 BG XX wM diff --git a/_maps/shuttles/starfury_corvette.dmm b/_maps/shuttles/starfury_corvette.dmm index 2e9547bb085..877375fa4e7 100644 --- a/_maps/shuttles/starfury_corvette.dmm +++ b/_maps/shuttles/starfury_corvette.dmm @@ -56,8 +56,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/sbc_corvette) -<<<<<<< HEAD -======= "ai" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/corvette{ dir = 8; @@ -85,7 +83,6 @@ }, /turf/open/floor/plating, /area/shuttle/sbc_corvette) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ak" = ( /obj/structure/chair/comfy/shuttle{ name = "tactical chair" @@ -296,8 +293,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_corvette) -<<<<<<< HEAD -======= "aO" = ( /obj/machinery/door/poddoor/preopen{ id = "SBC_corvette_blast" @@ -305,7 +300,6 @@ /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, /area/shuttle/sbc_corvette) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aP" = ( /obj/machinery/door/airlock/hatch{ name = "Syndicate Corvette Cockpit" @@ -387,22 +381,6 @@ "aZ" = ( /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/sbc_corvette) -<<<<<<< HEAD -"eV" = ( -/obj/machinery/door/airlock/external{ - id_tag = "SBC_corvette_bolt"; - name = "Syndicate Corvette Airlock" - }, -/obj/docking_port/mobile/syndicate_corvette, -/obj/structure/fans/tiny, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 1 - }, -/turf/open/floor/plating, -/area/shuttle/sbc_corvette) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qH" = ( /obj/structure/table, /obj/item/wrench, @@ -412,18 +390,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_corvette) -<<<<<<< HEAD -"rQ" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/corvette{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/shuttle/sbc_corvette) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "uo" = ( /turf/open/floor/iron/dark/small, /area/shuttle/sbc_corvette) @@ -472,16 +438,6 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/sbc_corvette) -<<<<<<< HEAD -"Zi" = ( -/obj/machinery/door/poddoor/preopen{ - id = "SBC_corvette_blast" - }, -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/turf/open/floor/plating, -/area/shuttle/sbc_corvette) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 (1,1,1) = {" aa @@ -553,11 +509,7 @@ aT aZ aU as -<<<<<<< HEAD -eV -======= aj ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "} (9,1,1) = {" aM @@ -587,36 +539,12 @@ ay aM "} (12,1,1) = {" -<<<<<<< HEAD -Zi -======= aO ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qH ac aW ae aQ -<<<<<<< HEAD -Zi -"} -(13,1,1) = {" -Zi -Zi -rQ -ag -ap -Zi -Zi -"} -(14,1,1) = {" -aa -Zi -Zi -Zi -Zi -Zi -======= aO "} (13,1,1) = {" @@ -635,6 +563,5 @@ aO aO aO aO ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa "} diff --git a/_maps/shuttles/whiteship_birdshot.dmm b/_maps/shuttles/whiteship_birdshot.dmm index be2ae8e5ade..ed1936e3a1c 100644 --- a/_maps/shuttles/whiteship_birdshot.dmm +++ b/_maps/shuttles/whiteship_birdshot.dmm @@ -63,36 +63,6 @@ }, /turf/open/floor/iron/small, /area/shuttle/abandoned/crew) -<<<<<<< HEAD -"cj" = ( -/obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/reagent_containers/condiment/enzyme, -/obj/item/food/meat/slab/synthmeat{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/food/meat/slab/synthmeat{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/food/meat/slab/synthmeat{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/condiment/milk, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/cafeteria, -/area/shuttle/abandoned/bar) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cB" = ( /obj/structure/chair/stool/directional/west, /obj/effect/decal/cleanable/dirt, @@ -389,8 +359,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/shuttle/abandoned/crew) -<<<<<<< HEAD -======= "nz" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, /obj/item/reagent_containers/condiment/enzyme, @@ -418,7 +386,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, /area/shuttle/abandoned/bar) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -1983,11 +1950,7 @@ fU Gg GS wY -<<<<<<< HEAD -cj -======= nz ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JP Kf jv diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm index cba527e12d1..df697dc1739 100644 --- a/_maps/shuttles/whiteship_cere.dmm +++ b/_maps/shuttles/whiteship_cere.dmm @@ -495,8 +495,6 @@ }, /turf/open/floor/wood, /area/shuttle/abandoned/bridge) -<<<<<<< HEAD -======= "wM" = ( /obj/structure/cable, /obj/structure/cable/layer1, @@ -507,7 +505,6 @@ /obj/item/stock_parts/power_store/cell/high, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/abandoned/cargo) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, @@ -678,19 +675,6 @@ /obj/effect/spawner/random/maintenance/six, /turf/open/floor/pod/dark, /area/shuttle/abandoned/cargo) -<<<<<<< HEAD -"Gu" = ( -/obj/structure/cable, -/obj/structure/cable/layer1, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/reinforced/titaniumglass, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/turf/open/floor/catwalk_floor/iron_dark, -/area/shuttle/abandoned/cargo) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ha" = ( /obj/machinery/computer/mech_bay_power_console{ dir = 4 @@ -698,8 +682,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/dark, /area/shuttle/abandoned/cargo) -<<<<<<< HEAD -======= "Hw" = ( /obj/machinery/light/small/directional/east, /obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ @@ -710,7 +692,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/shuttle/abandoned/bridge) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "HI" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /obj/structure/cable, @@ -994,19 +975,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/dark, /area/shuttle/abandoned/cargo) -<<<<<<< HEAD -"Xq" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ - dir = 1; - x_offset = 0; - y_offset = 10 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/shuttle/abandoned/bridge) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "XT" = ( /obj/machinery/door/airlock/external/glass/ruin, /obj/effect/decal/cleanable/dirt, @@ -1177,11 +1145,7 @@ WF gK US gK -<<<<<<< HEAD -Gu -======= wM ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aG oB DC @@ -1283,11 +1247,7 @@ kP EQ aQ Fj -<<<<<<< HEAD -Xq -======= Hw ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 su "} (12,1,1) = {" diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm index fe7ca4db4d0..7e6e2851726 100644 --- a/_maps/shuttles/whiteship_donut.dmm +++ b/_maps/shuttles/whiteship_donut.dmm @@ -34,14 +34,11 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/plating/airless, /area/shuttle/abandoned) -<<<<<<< HEAD -======= "aX" = ( /obj/machinery/power/shuttle_engine/heater, /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/plating/airless, /area/shuttle/abandoned) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "be" = ( /obj/machinery/power/shuttle_engine/propulsion/left, /turf/open/floor/plating/airless, @@ -210,14 +207,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, /area/shuttle/abandoned) -<<<<<<< HEAD -"uj" = ( -/obj/machinery/power/shuttle_engine/heater, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/floor/plating/airless, -/area/shuttle/abandoned) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "vu" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm index 413d5d19f5a..491aac07280 100644 --- a/_maps/shuttles/whiteship_pubby.dmm +++ b/_maps/shuttles/whiteship_pubby.dmm @@ -80,8 +80,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/shuttle/abandoned) -<<<<<<< HEAD -======= "cE" = ( /obj/effect/turf_decal/bot_white, /obj/machinery/atmospherics/components/tank/air/layer4{ @@ -90,7 +88,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/shuttle/abandoned) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cS" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 @@ -463,17 +460,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/purple, /area/shuttle/abandoned) -<<<<<<< HEAD -"rY" = ( -/obj/effect/turf_decal/bot_white, -/obj/machinery/atmospherics/components/tank/air/layer4{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/abandoned) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sl" = ( /obj/machinery/door/poddoor{ id = "whiteship_bridge" @@ -1373,11 +1359,7 @@ CG Il pV Bu -<<<<<<< HEAD -rY -======= cE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Sc ot cx diff --git a/_maps/shuttles/whiteship_tram.dmm b/_maps/shuttles/whiteship_tram.dmm index f542c1b02ff..7666e2c70ac 100644 --- a/_maps/shuttles/whiteship_tram.dmm +++ b/_maps/shuttles/whiteship_tram.dmm @@ -496,8 +496,6 @@ }, /turf/open/floor/iron/smooth_large, /area/shuttle/abandoned/engine) -<<<<<<< HEAD -======= "ca" = ( /obj/structure/cable, /obj/structure/table, @@ -517,7 +515,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/smooth_large, /area/shuttle/abandoned/engine) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cg" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -1165,8 +1162,6 @@ /obj/structure/lattice, /turf/template_noop, /area/shuttle/abandoned/cargo) -<<<<<<< HEAD -======= "Ft" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ dir = 8; @@ -1179,7 +1174,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/textured_large, /area/shuttle/abandoned/bridge) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "FQ" = ( /obj/item/shard/titanium, /obj/structure/grille/broken, @@ -1273,21 +1267,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/smooth_large, /area/shuttle/abandoned/engine) -<<<<<<< HEAD -"NZ" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ - dir = 8; - x_offset = 0; - y_offset = 13 - }, -/obj/effect/turf_decal/stripes/white/corner{ - dir = 1 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark/textured_large, -/area/shuttle/abandoned/bridge) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "OL" = ( /obj/machinery/computer/shuttle/white_ship/bridge{ dir = 8 @@ -1297,28 +1276,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/shuttle/abandoned/bridge) -<<<<<<< HEAD -"OV" = ( -/obj/structure/cable, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/multitool{ - pixel_x = 7; - pixel_y = 5 - }, -/obj/item/stack/cable_coil{ - pixel_x = -5; - pixel_y = 6 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 9 - }, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron/smooth_large, -/area/shuttle/abandoned/engine) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "PI" = ( /obj/machinery/door/window/survival_pod/left/directional/east, /obj/effect/turf_decal/delivery/red, @@ -1612,11 +1569,7 @@ RK dn yd OL -<<<<<<< HEAD -NZ -======= Ft ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dx "} (5,1,1) = {" @@ -1652,11 +1605,7 @@ da cl Rs ad -<<<<<<< HEAD -OV -======= ca ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 NU bx ad diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index e88cd3dc383..59d6b325fda 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -19,8 +19,6 @@ "ac" = ( /turf/closed/wall/mineral/plastitanium, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "ad" = ( /obj/machinery/door/poddoor/preopen{ id = "syndie_battlecruier_bridge_blast" @@ -29,7 +27,6 @@ /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ae" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/sbc_starfury) @@ -409,8 +406,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "bx" = ( /obj/machinery/door/poddoor/preopen{ id = "syndie_battlecruier_bridge_blast" @@ -419,7 +414,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "by" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -649,17 +643,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"cy" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/effect/turf_decal/siding/thinplating_new/dark, -/obj/effect/turf_decal/stripes/red/line, -/turf/open/floor/mineral/plastitanium/red, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cz" = ( /obj/machinery/newscaster/directional/south, /obj/structure/table/reinforced/plastitaniumglass, @@ -1000,8 +983,6 @@ /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "dO" = ( /obj/structure/sign/warning/secure_area/directional/east{ desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; @@ -1020,7 +1001,6 @@ /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dT" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -1600,8 +1580,6 @@ /obj/machinery/door/airlock/multi_tile/public/glass, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "fE" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -1611,7 +1589,6 @@ }, /turf/open/floor/iron, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fF" = ( /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/machinery/door/firedoor/heavy, @@ -1634,8 +1611,6 @@ /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/iron/showroomfloor, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "fR" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -1644,7 +1619,6 @@ /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1668,8 +1642,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "gp" = ( /obj/structure/sign/warning/secure_area/directional/east{ desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; @@ -1681,7 +1653,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gx" = ( /obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser{ dir = 8 @@ -1711,8 +1682,6 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "gC" = ( /obj/structure/sign/warning/secure_area/directional/west{ desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; @@ -1727,7 +1696,6 @@ }, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gD" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -1767,22 +1735,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"gN" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/structure/cable, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gO" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -2232,8 +2184,6 @@ /obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "hZ" = ( /obj/structure/rack{ dir = 8 @@ -2264,7 +2214,6 @@ }, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ib" = ( /obj/structure/closet/secure_closet{ anchored = 1; @@ -2411,8 +2360,6 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "io" = ( /obj/structure/rack{ dir = 8 @@ -2427,7 +2374,6 @@ }, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iq" = ( /obj/machinery/microwave, /obj/structure/table/wood, @@ -2494,8 +2440,6 @@ /obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/iron, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "ix" = ( /obj/structure/rack{ dir = 8 @@ -2505,7 +2449,6 @@ /obj/item/gun/ballistic/automatic/l6_saw, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iy" = ( /obj/item/storage/box/donkpockets{ pixel_x = 2 @@ -2559,8 +2502,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/red, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "iG" = ( /obj/structure/table/wood, /obj/item/folder/syndicate/red{ @@ -2579,7 +2520,6 @@ /obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/carpet/red, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iI" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -2607,8 +2547,6 @@ }, /turf/open/floor/plating, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "iN" = ( /obj/structure/rack{ dir = 8 @@ -2628,7 +2566,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iO" = ( /obj/structure/table, /obj/item/shield/energy{ @@ -3224,8 +3161,6 @@ /obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/plating, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "kN" = ( /obj/structure/sign/warning/secure_area/directional/north{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -3238,7 +3173,6 @@ /obj/machinery/light/small/red/directional/north, /turf/open/floor/plating, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kO" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/yellow{ @@ -3298,16 +3232,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"lg" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -======= "lf" = ( /obj/structure/sign/warning/secure_area/directional/north{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -3319,7 +3243,6 @@ }, /obj/machinery/light/small/red/directional/north, /turf/open/floor/plating, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/shuttle/sbc_starfury) "lh" = ( /obj/effect/turf_decal/tile/yellow{ @@ -3731,17 +3654,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/engine, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"nu" = ( -/obj/machinery/door/poddoor/preopen{ - id = "syndie_battlecruier_bridge_blast" - }, -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/obj/structure/cable, -/turf/open/floor/plating, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nz" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green, @@ -3938,18 +3850,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/plating, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"qT" = ( -/obj/structure/sign/warning/secure_area/directional/east{ - desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; - icon_state = "space"; - name = "KEEP CLEAR: SHUTTLE BAY" - }, -/obj/effect/turf_decal/stripes/red/line, -/turf/open/floor/iron/dark, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -4008,20 +3908,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/pod/dark, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"rF" = ( -/obj/structure/rack{ - dir = 8 - }, -/obj/machinery/airalarm/directional/east, -/obj/item/storage/belt/military, -/obj/item/ammo_box/magazine/sniper_rounds, -/obj/item/gun/ballistic/rifle/sniper_rifle/syndicate, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/turf/open/floor/pod/light, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sh" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/dark_green/opposingcorners{ @@ -4290,33 +4176,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"xo" = ( -/obj/structure/rack{ - dir = 8 - }, -/obj/item/card/emag{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/card/emag, -/obj/item/card/emag{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/clothing/glasses/thermal{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal{ - pixel_x = 3; - pixel_y = -3 - }, -/turf/open/floor/pod/light, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "xp" = ( /obj/structure/dresser, /turf/open/floor/carpet, @@ -4586,18 +4445,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"BG" = ( -/obj/structure/sign/warning/secure_area/directional/west{ - desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; - icon_state = "space"; - name = "KEEP CLEAR: SHUTTLE BAY" - }, -/obj/effect/turf_decal/stripes/red/line, -/turf/open/floor/iron/dark, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "BI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -4609,23 +4456,6 @@ /obj/effect/turf_decal/tile/dark_red, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"BK" = ( -/obj/structure/sign/warning/secure_area/directional/west{ - desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; - icon_state = "space"; - name = "KEEP CLEAR: SHUTTLE BAY" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "BN" = ( /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/structure/window/reinforced/survival_pod/spawner/directional/south, @@ -4706,8 +4536,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "Dy" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -4721,7 +4549,6 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Dz" = ( /obj/item/crowbar/red, /obj/structure/cable, @@ -4729,24 +4556,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured_large, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"DM" = ( -/obj/structure/rack{ - dir = 8 - }, -/obj/item/gun/ballistic/automatic/m90{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/ballistic/automatic/m90, -/obj/item/gun/ballistic/automatic/m90{ - pixel_x = 3; - pixel_y = -3 - }, -/turf/open/floor/pod/light, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "DS" = ( /obj/structure/rack, /obj/item/stack/sheet/mineral/uranium{ @@ -4763,27 +4572,6 @@ /obj/structure/cable, /turf/open/floor/pod/dark, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"Es" = ( -/obj/structure/table/wood, -/obj/item/folder/syndicate/red{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/cigarette/cigar{ - pixel_x = 5; - pixel_y = 7 - }, -/obj/item/storage/box/matches, -/obj/item/pen{ - pixel_x = -5 - }, -/obj/machinery/airalarm/directional/east, -/obj/effect/mapping_helpers/airalarm/syndicate_access, -/turf/open/floor/carpet/red, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Ex" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -5003,18 +4791,6 @@ temperature = 80 }, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"Hr" = ( -/obj/structure/rack{ - dir = 8 - }, -/obj/item/storage/belt/military, -/obj/item/ammo_box/magazine/m7mm, -/obj/item/gun/ballistic/automatic/l6_saw, -/turf/open/floor/pod/light, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "HF" = ( /obj/machinery/suit_storage_unit/syndicate, /obj/machinery/light/small/directional/west, @@ -5096,8 +4872,6 @@ /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "Jl" = ( /obj/structure/rack{ dir = 8 @@ -5109,7 +4883,6 @@ /obj/effect/mapping_helpers/airalarm/syndicate_access, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Jm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5139,8 +4912,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "JL" = ( /obj/structure/rack{ dir = 8 @@ -5165,7 +4936,6 @@ }, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "JP" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -5187,17 +4957,6 @@ }, /turf/open/floor/plating, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"KH" = ( -/obj/machinery/door/poddoor/preopen{ - id = "syndie_battlecruier_bridge_blast" - }, -/obj/structure/cable, -/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, -/turf/open/floor/plating, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "KK" = ( /obj/structure/filingcabinet, /turf/open/floor/carpet/red, @@ -5226,28 +4985,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"KZ" = ( -/obj/structure/rack{ - dir = 8 - }, -/obj/item/mod/control/pre_equipped/elite{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/item/clothing/mask/gas/syndicate{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/mod/control/pre_equipped/elite{ - pixel_x = -4 - }, -/obj/item/clothing/mask/gas/syndicate, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/pod/light, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Lb" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -5259,21 +4996,6 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/plating, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"Ly" = ( -/obj/structure/sign/warning/secure_area/directional/north{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - name = "EXTERNAL AIRLOCK" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light/small/red/directional/north, -/turf/open/floor/plating, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "LH" = ( /obj/structure/table, /obj/item/storage/medkit/regular{ @@ -5296,21 +5018,6 @@ }, /turf/open/floor/pod/dark, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"Mq" = ( -/obj/structure/sign/warning/secure_area/directional/north{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - name = "EXTERNAL AIRLOCK" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light/small/red/directional/north, -/turf/open/floor/plating, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Mt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5351,20 +5058,6 @@ /obj/machinery/light/small/red/directional/north, /turf/open/floor/plating, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"MQ" = ( -/obj/structure/closet/crate, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/inducer/syndicate, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "MR" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -5470,22 +5163,6 @@ }, /turf/open/floor/iron, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"OZ" = ( -/obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/cup/glass/shaker{ - pixel_x = 10 - }, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar, -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/turf/open/floor/iron/dark, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Pa" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -5653,8 +5330,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/engine, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "RX" = ( /obj/item/book/manual/wiki/barman_recipes, /obj/item/reagent_containers/cup/glass/shaker{ @@ -5668,7 +5343,6 @@ /obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Sb" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -5739,20 +5413,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/mineral/plastitanium, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"Tl" = ( -/obj/structure/sign/warning/secure_area/directional/east{ - desc = "A warning sign which reads 'KEEP CLEAR: SHUTTLE BAY'"; - icon_state = "space"; - name = "KEEP CLEAR: SHUTTLE BAY" - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Tn" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/portable_atmospherics/canister/plasma, @@ -5943,8 +5603,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/side, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -======= "WI" = ( /obj/structure/closet/crate, /obj/item/stock_parts/power_store/cell/high, @@ -5956,7 +5614,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "WV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -6076,23 +5733,6 @@ }, /turf/open/floor/pod/dark, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"Ys" = ( -/obj/structure/rack{ - dir = 8 - }, -/obj/item/gun/ballistic/revolver/syndicate{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/item/gun/ballistic/revolver/syndicate{ - pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/pod/light, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Yt" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/bot_red, @@ -6113,24 +5753,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/pod/dark, /area/shuttle/sbc_starfury) -<<<<<<< HEAD -"Zh" = ( -/obj/structure/rack{ - dir = 8 - }, -/obj/item/gun/ballistic/shotgun/bulldog{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/ballistic/shotgun/bulldog, -/obj/item/gun/ballistic/shotgun/bulldog{ - pixel_x = 3; - pixel_y = -3 - }, -/turf/open/floor/pod/light, -/area/shuttle/sbc_starfury) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Zl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -6427,11 +6049,7 @@ ce ae hd hD -<<<<<<< HEAD -OZ -======= RX ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iq iy ae @@ -6460,11 +6078,7 @@ aa aa aa ac -<<<<<<< HEAD -nu -======= bx ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae ah cH @@ -6650,11 +6264,7 @@ aa aa aa ae -<<<<<<< HEAD -Mq -======= kN ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae MP aH @@ -6740,11 +6350,7 @@ aa aa aa ae -<<<<<<< HEAD -nu -======= bx ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae xr aH @@ -6824,11 +6430,7 @@ ri ay ay XI -<<<<<<< HEAD -qT -======= dO ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dV eR cO @@ -6867,11 +6469,7 @@ Jf ae kz kO -<<<<<<< HEAD -lg -======= fE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae ae Fc @@ -6892,11 +6490,7 @@ Ou Ou Ou vT -<<<<<<< HEAD -nu -======= bx ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dq vk ay @@ -6964,11 +6558,7 @@ aa aa Ou vT -<<<<<<< HEAD -nu -======= bx ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ne IM ae @@ -7031,17 +6621,10 @@ aa aa aa aa -<<<<<<< HEAD -KH -KH -KH -KH -======= ad ad ad ad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae by Sb @@ -7105,13 +6688,8 @@ aa (14,1,1) = {" aa aa -<<<<<<< HEAD -KH -KH -======= ad ad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aU bj eJ @@ -7125,11 +6703,7 @@ ay ag dY UB -<<<<<<< HEAD -cy -======= fR ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ec eB aH @@ -7150,11 +6724,7 @@ hB ST ec dV -<<<<<<< HEAD -Tl -======= gp ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 oA ay hm @@ -7186,11 +6756,7 @@ aa (15,1,1) = {" aa aa -<<<<<<< HEAD -KH -======= ad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ct aV aJ @@ -7258,11 +6824,7 @@ ac (16,1,1) = {" aa aa -<<<<<<< HEAD -KH -======= ad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 al Dd xi @@ -7329,13 +6891,8 @@ mO "} (17,1,1) = {" aa -<<<<<<< HEAD -KH -KH -======= ad ad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UU az aK @@ -7402,11 +6959,7 @@ ir "} (18,1,1) = {" aa -<<<<<<< HEAD -KH -======= ad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pm an aA @@ -7450,11 +7003,7 @@ hq hP ae iu -<<<<<<< HEAD -Es -======= iG ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 nz ae Qf @@ -7478,11 +7027,7 @@ ir "} (19,1,1) = {" aa -<<<<<<< HEAD -KH -======= ad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wo ao aB @@ -7550,11 +7095,7 @@ ae "} (20,1,1) = {" aa -<<<<<<< HEAD -KH -======= ad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bo ap aC @@ -7622,13 +7163,8 @@ mO "} (21,1,1) = {" aa -<<<<<<< HEAD -KH -KH -======= ad ad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aq aD aO @@ -7696,11 +7232,7 @@ ir (22,1,1) = {" aa aa -<<<<<<< HEAD -KH -======= ad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ar vr xO @@ -7737,11 +7269,7 @@ ST ae ae gB -<<<<<<< HEAD -gN -======= Dy ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gY Fl hS @@ -7772,11 +7300,7 @@ ir (23,1,1) = {" aa aa -<<<<<<< HEAD -KH -======= ad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bC aE aP @@ -7844,13 +7368,8 @@ ac (24,1,1) = {" aa aa -<<<<<<< HEAD -KH -KH -======= ad ad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 be bt FC @@ -7885,11 +7404,7 @@ hB ST ec fF -<<<<<<< HEAD -BK -======= gC ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hs gO hv @@ -7922,17 +7437,10 @@ aa aa aa aa -<<<<<<< HEAD -KH -KH -KH -KH -======= ad ad ad ad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae by po @@ -8002,11 +7510,7 @@ aa aa aa vT -<<<<<<< HEAD -nu -======= bx ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ck Zm ae @@ -8074,11 +7578,7 @@ Ou Ou Ou vT -<<<<<<< HEAD -nu -======= bx ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bV Wv ay @@ -8154,11 +7654,7 @@ xD ay ay PF -<<<<<<< HEAD -BG -======= dS ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AJ dd ik @@ -8214,11 +7710,7 @@ aa aa aa ae -<<<<<<< HEAD -nu -======= bx ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae xr aH @@ -8256,23 +7748,14 @@ ae ae ae Yi -<<<<<<< HEAD -DM -DM -======= hZ hZ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ec mQ ae nR Xr -<<<<<<< HEAD -MQ -======= WI ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae ko ae @@ -8336,11 +7819,7 @@ sB ec ec ec -<<<<<<< HEAD -xo -======= JL ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae XN qf @@ -8405,17 +7884,10 @@ gF gR Ay sB -<<<<<<< HEAD -Zh -Ys -ec -KZ -======= ia io ec iN ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae nR jB @@ -8424,11 +7896,7 @@ aa aa aa ae -<<<<<<< HEAD -Ly -======= lf ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae fB aH @@ -8455,11 +7923,7 @@ ae ae Jm da -<<<<<<< HEAD -nu -======= bx ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 aa aa aa @@ -8518,11 +7982,7 @@ aa aa aa ac -<<<<<<< HEAD -nu -======= bx ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ae BN vk @@ -8561,13 +8021,8 @@ UH ae hC ib -<<<<<<< HEAD -rF -Hr -======= Jl ix ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fj ae ae diff --git a/_maps/templates/hilbertshotellore.dmm b/_maps/templates/hilbertshotellore.dmm index 0b71a99174b..fe77ef9cc3d 100644 --- a/_maps/templates/hilbertshotellore.dmm +++ b/_maps/templates/hilbertshotellore.dmm @@ -5,14 +5,6 @@ "ab" = ( /turf/closed/indestructible/hotelwall, /area/misc/hilbertshotel) -<<<<<<< HEAD -"ac" = ( -/obj/structure/table/wood/fancy, -/obj/structure/mirror/broken/directional/north, -/turf/open/indestructible/hotelwood, -/area/misc/hilbertshotel) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ad" = ( /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) @@ -150,14 +142,6 @@ /obj/structure/sink/directional/east, /turf/open/indestructible/hoteltile, /area/misc/hilbertshotel) -<<<<<<< HEAD -"aJ" = ( -/obj/structure/window/reinforced/tinted/spawner/directional/west, -/obj/structure/window/reinforced/tinted/spawner/directional/north, -/turf/open/indestructible/hoteltile, -/area/misc/hilbertshotel) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aK" = ( /obj/machinery/shower/directional/west, /turf/open/indestructible/hoteltile, @@ -171,21 +155,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) -<<<<<<< HEAD -"aN" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/structure/window/reinforced/tinted/spawner/directional/north, -/obj/structure/window/reinforced/tinted/spawner/directional/west, -/turf/open/indestructible/hoteltile, -/area/misc/hilbertshotel) -"aO" = ( -/obj/structure/window/reinforced/tinted/spawner/directional/west, -/turf/open/indestructible/hoteltile, -/area/misc/hilbertshotel) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aP" = ( /obj/item/bikehorn/rubberducky, /obj/machinery/light/small/directional/east, @@ -200,14 +169,6 @@ /obj/machinery/smartfridge/food, /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) -<<<<<<< HEAD -"aS" = ( -/obj/structure/window/reinforced/tinted/spawner/directional/west, -/obj/structure/window/reinforced/tinted/spawner/directional/south, -/turf/open/indestructible/hoteltile, -/area/misc/hilbertshotel) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "aT" = ( /obj/structure/table/reinforced, /obj/structure/sink/kitchen/directional/north, @@ -305,8 +266,6 @@ /obj/item/paper/crumpled/ruins/hotel_note, /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) -<<<<<<< HEAD -======= "ej" = ( /obj/structure/window/reinforced/tinted/spawner/directional/west, /turf/open/indestructible/hoteltile, @@ -321,14 +280,11 @@ /obj/structure/mirror/broken/directional/north, /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Mn" = ( /obj/structure/table/wood/fancy, /obj/machinery/light/small/directional/north, /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) -<<<<<<< HEAD -======= "XX" = ( /obj/structure/window/reinforced/tinted/spawner/directional/west, /obj/structure/window/reinforced/tinted/spawner/directional/north, @@ -342,7 +298,6 @@ /obj/structure/window/reinforced/tinted/spawner/directional/west, /turf/open/indestructible/hoteltile, /area/misc/hilbertshotel) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 (1,1,1) = {" aa diff --git a/_maps/templates/lazy_templates/nukie_base.dmm b/_maps/templates/lazy_templates/nukie_base.dmm index 64e13b786b7..60c5b1dcb58 100644 --- a/_maps/templates/lazy_templates/nukie_base.dmm +++ b/_maps/templates/lazy_templates/nukie_base.dmm @@ -1124,35 +1124,6 @@ /obj/machinery/chem_dispenser/mutagensaltpeter, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_bioterrorism) -<<<<<<< HEAD -"mj" = ( -/obj/structure/table/wood/poker, -/obj/machinery/light/warm/directional/north, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_x = -4; - pixel_y = 14 - }, -/obj/item/toy/cards/deck{ - pixel_x = 3; - pixel_y = 6 - }, -/obj/item/cigarette/robust{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/ash{ - pixel_x = 12; - pixel_y = -6 - }, -/obj/effect/spawner/random/entertainment/lighter{ - pixel_x = 9; - pixel_y = -3 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, -/area/centcom/syndicate_mothership/control) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "my" = ( /obj/effect/landmark/start/nukeop_leader, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -1504,8 +1475,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/control) -<<<<<<< HEAD -======= "qs" = ( /obj/machinery/light/small/directional/west, /obj/structure/closet/secure_closet/freezer/fridge/open, @@ -1533,7 +1502,6 @@ }, /turf/open/floor/plastic, /area/centcom/syndicate_mothership/expansion_fridgerummage) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "qv" = ( /obj/item/kirbyplants/random, /turf/open/floor/mineral/titanium, @@ -1995,36 +1963,6 @@ }, /turf/open/floor/carpet, /area/centcom/syndicate_mothership/control) -<<<<<<< HEAD -"wr" = ( -/obj/machinery/light/small/directional/west, -/obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/food/meat/slab/rawcrab, -/obj/item/food/meat/slab/rawcrab, -/obj/item/food/meat/slab/rawcrab, -/obj/item/food/fishmeat, -/obj/item/food/fishmeat, -/obj/item/food/fishmeat, -/obj/item/food/grown/tomato, -/obj/item/food/grown/tomato, -/obj/item/food/grown/tomato, -/obj/item/reagent_containers/condiment/enzyme, -/obj/item/storage/fancy/egg_box, -/obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -5; - pixel_y = 9 - }, -/turf/open/floor/plastic, -/area/centcom/syndicate_mothership/expansion_fridgerummage) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ws" = ( /obj/effect/turf_decal/siding/wideplating/dark, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -2639,8 +2577,6 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_bombthreat) -<<<<<<< HEAD -======= "DY" = ( /obj/structure/table/wood/poker, /obj/machinery/light/warm/directional/north, @@ -2667,7 +2603,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "DZ" = ( /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/control) @@ -6484,11 +6419,7 @@ rJ Cf nU ek -<<<<<<< HEAD -wr -======= qs ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ek DZ eK @@ -7110,11 +7041,7 @@ DZ Gr tc mJ -<<<<<<< HEAD -mj -======= DY ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lQ Nb VK diff --git a/_maps/templates/lazy_templates/wizard_den.dmm b/_maps/templates/lazy_templates/wizard_den.dmm index bd05b063ab2..887e1c08176 100644 --- a/_maps/templates/lazy_templates/wizard_den.dmm +++ b/_maps/templates/lazy_templates/wizard_den.dmm @@ -44,8 +44,6 @@ /obj/structure/showcase/machinery/rng, /turf/open/floor/engine/cult, /area/centcom/wizard_station) -<<<<<<< HEAD -======= "dr" = ( /obj/structure/table/wood, /obj/item/cigarette/cigar{ @@ -58,7 +56,6 @@ }, /turf/open/floor/engine/cult, /area/centcom/wizard_station) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dB" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/engine/cult, @@ -330,8 +327,6 @@ /obj/machinery/griddle, /turf/open/floor/iron, /area/centcom/wizard_station) -<<<<<<< HEAD -======= "qg" = ( /obj/structure/railing, /obj/structure/railing{ @@ -339,7 +334,6 @@ }, /turf/open/floor/engine/cult, /area/centcom/wizard_station) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ql" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -385,21 +379,6 @@ }, /turf/open/floor/engine/cult, /area/centcom/wizard_station) -<<<<<<< HEAD -"sw" = ( -/obj/structure/table/wood, -/obj/item/cigarette/cigar{ - pixel_y = -9; - pixel_x = -5 - }, -/obj/item/camera/spooky{ - pixel_y = 7; - pixel_x = 2 - }, -/turf/open/floor/engine/cult, -/area/centcom/wizard_station) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sx" = ( /obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, @@ -528,8 +507,6 @@ }, /turf/open/floor/plastic, /area/centcom/wizard_station) -<<<<<<< HEAD -======= "yX" = ( /obj/structure/railing, /obj/structure/railing/corner{ @@ -537,7 +514,6 @@ }, /turf/open/floor/engine/cult, /area/centcom/wizard_station) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "zB" = ( /turf/open/floor/iron, /area/centcom/wizard_station) @@ -638,16 +614,6 @@ }, /turf/open/floor/engine/cult, /area/centcom/wizard_station) -<<<<<<< HEAD -"Ii" = ( -/obj/structure/railing, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/engine/cult, -/area/centcom/wizard_station) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "II" = ( /obj/structure/table/wood, /obj/item/modular_computer/laptop/preset/civilian{ @@ -887,16 +853,6 @@ /obj/machinery/vending/magivend, /turf/open/floor/engine/cult, /area/centcom/wizard_station) -<<<<<<< HEAD -"Va" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/engine/cult, -/area/centcom/wizard_station) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "VB" = ( /turf/closed/indestructible/wood, /area/centcom/wizard_station) @@ -1595,11 +1551,7 @@ kZ uy VB TX -<<<<<<< HEAD -Ii -======= yX ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 VB VB op @@ -1645,11 +1597,7 @@ kZ uy VB fX -<<<<<<< HEAD -Va -======= qg ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fX VB VB @@ -1695,11 +1643,7 @@ LU cy VB eI -<<<<<<< HEAD -Va -======= qg ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fX fX dk @@ -1791,11 +1735,7 @@ LU cy VB fX -<<<<<<< HEAD -Va -======= qg ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fX fX dk @@ -1841,11 +1781,7 @@ kZ uy VB fX -<<<<<<< HEAD -Va -======= qg ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fX VB VB @@ -1891,11 +1827,7 @@ kZ uy VB fX -<<<<<<< HEAD -Va -======= qg ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 VB VB op @@ -1920,11 +1852,7 @@ op op TG TG -<<<<<<< HEAD -sw -======= dr ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 HD VB Dq diff --git a/_maps/virtual_domains/breeze_bay.dmm b/_maps/virtual_domains/breeze_bay.dmm index 19d99b74403..5fa537bccde 100644 --- a/_maps/virtual_domains/breeze_bay.dmm +++ b/_maps/virtual_domains/breeze_bay.dmm @@ -13,13 +13,10 @@ "e" = ( /turf/open/floor/carpet/red, /area/virtual_domain/fullbright) -<<<<<<< HEAD -======= "f" = ( /obj/effect/baseturf_helper/virtual_domain, /turf/open/water/beach, /area/virtual_domain/fullbright) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "g" = ( /obj/item/toy/beach_ball/branded, /turf/open/misc/beach/sand, @@ -48,13 +45,6 @@ /obj/structure/table/wood, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) -<<<<<<< HEAD -"n" = ( -/obj/effect/baseturf_helper/virtual_domain, -/turf/open/water/beach, -/area/virtual_domain/fullbright) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "o" = ( /obj/structure/flora/tree/jungle/style_5, /turf/open/misc/beach/sand, @@ -240,11 +230,7 @@ i Q i i -<<<<<<< HEAD -n -======= f ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 a "} (3,1,1) = {" diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 143aa5f4472..11cf261276d 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -16,13 +16,8 @@ #define MINOR_NEGATIVE 4 -<<<<<<< HEAD -//Mutation classes. Normal being on them, extra being additional mutations with instability and other being stuff you dont want people to fuck with like wizard mutate -/// A mutation that can be activated and deactived by completing a sequence -======= //Mutation classes. Normal being on them, extra being additional mutations with instability and other being stuff you don't want people to fuck with like wizard mutate /// A mutation that can be activated and deactivated by completing a sequence ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MUT_NORMAL 1 /// A mutation that is in the mutations tab, and can be given and taken away through though the DNA console. Has a 0 before its name in the mutation section of the dna console #define MUT_EXTRA 2 @@ -49,11 +44,8 @@ #define DNA_UNI_IDENTITY_BLOCKS 12 -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular_skyrat/modules/customization/_DEFINES/DNA.dm) /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// This number needs to equal the total number of DNA blocks #define DNA_MUTANT_COLOR_BLOCK 1 #define DNA_ETHEREAL_COLOR_BLOCK 2 @@ -70,10 +62,7 @@ #define DNA_MOTH_MARKINGS_BLOCK 13 #define DNA_MUSHROOM_CAPS_BLOCK 14 #define DNA_POD_HAIR_BLOCK 15 -<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Hey! Listen up if you're here because you're adding a species feature! // @@ -82,7 +71,6 @@ // (Which means having a DNA block for a feature tied to a mob without DNA is entirely pointless.) /// Total amount of DNA blocks, must be equal to the highest DNA block number -<<<<<<< HEAD #define DNA_FEATURE_BLOCKS SSaccessories.dna_total_feature_blocks // SKYRAT EDIT CHANGE - ORIGINAL: #define DNA_FEATURE_BLOCKS 15 // SKYRAT EDIT ADDITION START #define DNA_MANDATORY_COLOR_BLOCKS 5 @@ -93,9 +81,6 @@ #define DNA_SKIN_COLOR_BLOCK 5 #define DNA_POD_HAIR_BLOCK 15 // SKYRAT EDIT ADDITION END -======= -#define DNA_FEATURE_BLOCKS 15 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define DNA_SEQUENCE_LENGTH 4 #define DNA_MUTATION_BLOCKS 8 diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm index df2b06a7a77..2de9e7140ad 100644 --- a/code/__DEFINES/MC.dm +++ b/code/__DEFINES/MC.dm @@ -19,11 +19,7 @@ ///creates a running average of "things elapsed" per time period when you need to count via a smaller time period. ///eg you want an average number of things happening per second but you measure the event every tick (50 milliseconds). -<<<<<<< HEAD -///make sure both time intervals are in the same units. doesnt work if current_duration > total_duration or if total_duration == 0 -======= ///make sure both time intervals are in the same units. doesn't work if current_duration > total_duration or if total_duration == 0 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MC_AVG_OVER_TIME(average, current, total_duration, current_duration) ((((total_duration) - (current_duration)) / (total_duration)) * (average) + (current)) #define MC_AVG_MINUTES(average, current, current_duration) (MC_AVG_OVER_TIME(average, current, 1 MINUTES, current_duration)) @@ -36,11 +32,7 @@ #define STOP_PROCESSING(Processor, Datum) Datum.datum_flags &= ~DF_ISPROCESSING;Processor.processing -= Datum;Processor.currentrun -= Datum /// Returns true if the MC is initialized and running. -<<<<<<< HEAD -/// Optional argument init_stage controls what stage the mc must have initializted to count as initialized. Defaults to INITSTAGE_MAX if not specified. -======= /// Optional argument init_stage controls what stage the mc must have initialized to count as initialized. Defaults to INITSTAGE_MAX if not specified. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MC_RUNNING(INIT_STAGE...) (Master && Master.processing > 0 && Master.current_runlevel && Master.init_stage_completed == (max(min(INITSTAGE_MAX, ##INIT_STAGE), 1))) #define MC_LOOP_RTN_NEWSTAGES 1 diff --git a/code/__DEFINES/_flags.dm b/code/__DEFINES/_flags.dm index 7182068bf51..687f5365f6d 100644 --- a/code/__DEFINES/_flags.dm +++ b/code/__DEFINES/_flags.dm @@ -11,11 +11,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define DF_USE_TAG (1<<0) #define DF_VAR_EDITED (1<<1) #define DF_ISPROCESSING (1<<2) -<<<<<<< HEAD -======= /// Placed on datums that have a static, constant reference. Primarily only used for turfs. #define DF_STATIC_OBJECT (1<<3) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //FLAGS BITMASK // scroll down before changing the numbers on these @@ -28,11 +25,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define NO_SCREENTIPS_1 (1<<2) /// Prevent clicking things below it on the same turf eg. doors/ fulltile windows #define PREVENT_CLICK_UNDER_1 (1<<3) -<<<<<<< HEAD -///specifies that this atom is a hologram that isnt real -======= ///specifies that this atom is a hologram that isn't real ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define HOLOGRAM_1 (1<<4) ///Whether /atom/Initialize() has already run for the object #define INITIALIZED_1 (1<<5) @@ -59,11 +52,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 /// Whether or not this atom is storing contents for a disassociated storage object #define HAS_DISASSOCIATED_STORAGE_1 (1<<16) /// If this atom has experienced a decal element "init finished" sourced appearance update -<<<<<<< HEAD -/// We use this to ensure stacked decals don't double up appearance updates for no rasin -======= /// We use this to ensure stacked decals don't double up appearance updates for no reason ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Flag as an optimization, don't make this a trait without profiling /// Yes I know this is a stupid flag, no you can't take him from me #define DECAL_INIT_UPDATE_EXPERIENCED_1 (1<<17) @@ -92,15 +81,9 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define RICOCHET_HARD (1<<1) //TURF FLAGS -<<<<<<< HEAD -/// If a turf cant be jaunted through. -#define NOJAUNT (1<<0) -/// If a turf is an usused reservation turf awaiting assignment -======= /// If a turf can't be jaunted through. #define NOJAUNT (1<<0) /// If a turf is an unused reservation turf awaiting assignment ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define UNUSED_RESERVATION_TURF (1<<1) /// If a turf is a reserved turf #define RESERVATION_TURF (1<<2) @@ -298,13 +281,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define RELIGION_TOOL_SACRIFICE (1<<1) #define RELIGION_TOOL_SECTSELECT (1<<2) -<<<<<<< HEAD -// ---- Skillchip incompatability flags ---- // -// These flags control which skill chips are compatible with eachother. -======= // ---- Skillchip incompatibility flags ---- // // These flags control which skill chips are compatible with each other. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // By default, skillchips are incompatible with themselves and multiple of the same istype() cannot be implanted together. Set this flag to disable that check. #define SKILLCHIP_ALLOWS_MULTIPLE (1<<0) // This skillchip is incompatible with other skillchips from the incompatible_category list. diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 48cf38db373..6200a86da62 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -337,12 +337,8 @@ ACCESS_VIROLOGY, \ ACCESS_WEAPONS, \ ACCESS_XENOBIOLOGY, \ -<<<<<<< HEAD ACCESS_BARBER, \ ) // SKYRAT EDIT ADDITION -======= -) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Command staff/secure accesses, think bridge/armoury, ai_upload, notably access to modify ID cards themselves. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_COMMAND) #define COMMAND_ACCESS list( \ @@ -369,11 +365,7 @@ ACCESS_HOP, \ ACCESS_QM, \ ACCESS_RD, \ -<<<<<<< HEAD ) // SKYRAT EDIT - Added ACCESS_CE and ACCESS_CMO to PRIVATE_COMMAND_ACCESS -======= -) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Captains private rooms. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_CAPTAIN) #define CAPTAIN_ACCESS list( \ diff --git a/code/__DEFINES/ai/ai.dm b/code/__DEFINES/ai/ai.dm index b77e7cf0145..73a8f2d1900 100644 --- a/code/__DEFINES/ai/ai.dm +++ b/code/__DEFINES/ai/ai.dm @@ -2,10 +2,6 @@ #define GET_TARGETING_STRATEGY(targeting_type) SSai_behaviors.targeting_strategies[targeting_type] #define HAS_AI_CONTROLLER_TYPE(thing, type) istype(thing?.ai_controller, type) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //AI controller flags //If you add a new status, be sure to add it to the ai_controllers subsystem's ai_controllers_by_status list. ///The AI is currently active. @@ -72,11 +68,7 @@ ///macro for whether it's appropriate to resist right now, used by resist subtree #define SHOULD_RESIST(source) (source.on_fire || source.buckled || HAS_TRAIT(source, TRAIT_RESTRAINED) || (source.pulledby && source.pulledby.grab_state > GRAB_PASSIVE)) ///macro for whether the pawn can act, used generally to prevent some horrifying ai disasters -<<<<<<< HEAD -#define IS_DEAD_OR_INCAP(source) (source.incapacitated() || source.stat) -======= #define IS_DEAD_OR_INCAP(source) (source.incapacitated || source.stat) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOBAL_LIST_INIT(all_radial_directions, list( "NORTH" = image(icon = 'icons/testing/turf_analysis.dmi', icon_state = "red_arrow", dir = NORTH), diff --git a/code/__DEFINES/ai/monsters.dm b/code/__DEFINES/ai/monsters.dm index b95e10a34b6..330e2d48eb2 100644 --- a/code/__DEFINES/ai/monsters.dm +++ b/code/__DEFINES/ai/monsters.dm @@ -288,8 +288,6 @@ //netguardians /// rocket launcher #define BB_NETGUARDIAN_ROCKET_ABILITY "netguardian_rocket" -<<<<<<< HEAD -======= //deer ///our water target @@ -306,4 +304,3 @@ #define BB_DEER_RESTING "deer_resting" ///time till our next rest duration #define BB_DEER_NEXT_REST_TIMER "deer_next_rest_timer" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm index 67685364e0d..0b3e3bb8585 100644 --- a/code/__DEFINES/antagonists.dm +++ b/code/__DEFINES/antagonists.dm @@ -76,177 +76,6 @@ #define CONTRACT_UPLINK_PAGE_CONTRACTS "CONTRACTS" #define CONTRACT_UPLINK_PAGE_HUB "HUB" -<<<<<<< HEAD - -// Heretic path defines. -#define PATH_START "Start Path" -#define PATH_SIDE "Side Path" -#define PATH_ASH "Ash Path" -#define PATH_RUST "Rust Path" -#define PATH_FLESH "Flesh Path" -#define PATH_VOID "Void Path" -#define PATH_BLADE "Blade Path" -#define PATH_COSMIC "Cosmic Path" -#define PATH_LOCK "Lock Path" -#define PATH_MOON "Moon Path" - -/// Defines are used in /proc/has_living_heart() to report if the heretic has no heart period, no living heart, or has a living heart. -#define HERETIC_NO_HEART_ORGAN -1 -#define HERETIC_NO_LIVING_HEART 0 -#define HERETIC_HAS_LIVING_HEART 1 - -/// A define used in ritual priority for heretics. -#define MAX_KNOWLEDGE_PRIORITY 100 - -/// Checks if the passed mob can become a heretic ghoul. -/// - Must be a human (type, not species) -/// - Skeletons cannot be husked (they are snowflaked instead of having a trait) -/// - Monkeys are monkeys, not quite human (balance reasons) -#define IS_VALID_GHOUL_MOB(mob) (ishuman(mob) && !isskeleton(mob) && !ismonkey(mob)) - -/// Forces the blob to place the core where they currently are, ignoring any checks. -#define BLOB_FORCE_PLACEMENT -1 -/// Normal blob placement, does the regular checks to make sure the blob isn't placing itself in an invalid location -#define BLOB_NORMAL_PLACEMENT 0 -/// Selects a random location for the blob to be placed. -#define BLOB_RANDOM_PLACEMENT 1 - -#define CONSTRUCT_JUGGERNAUT "Juggernaut" -#define CONSTRUCT_WRAITH "Wraith" -#define CONSTRUCT_ARTIFICER "Artificer" -#define CONSTRUCT_HARVESTER "Harvester" - -/// The Classic Wizard wizard loadout. -#define WIZARD_LOADOUT_CLASSIC "loadout_classic" -/// Mjolnir's Power wizard loadout. -#define WIZARD_LOADOUT_MJOLNIR "loadout_hammer" -/// Fantastical Army wizard loadout. -#define WIZARD_LOADOUT_WIZARMY "loadout_army" -/// Soul Tapper wizard loadout. -#define WIZARD_LOADOUT_SOULTAP "loadout_tap" -/// Convenient list of all wizard loadouts for unit testing. -#define ALL_WIZARD_LOADOUTS list( \ - WIZARD_LOADOUT_CLASSIC, \ - WIZARD_LOADOUT_MJOLNIR, \ - WIZARD_LOADOUT_WIZARMY, \ - WIZARD_LOADOUT_SOULTAP, \ -) -/// Number of times you need to perform the grand ritual to complete it -#define GRAND_RITUAL_FINALE_COUNT 7 -/// The crew will start being warned every time a rune is created after this many invocations. -#define GRAND_RITUAL_RUNES_WARNING_POTENCY 3 -/// The crew will get a louder warning when this level of rune is created, and the next one will be special -#define GRAND_RITUAL_IMMINENT_FINALE_POTENCY 6 - -/// Used in logging spells for roundend results -#define LOG_SPELL_TYPE "type" -#define LOG_SPELL_AMOUNT "amount" - -///File to the traitor flavor -#define TRAITOR_FLAVOR_FILE "antagonist_flavor/traitor_flavor.json" - -///File to the malf flavor -#define MALFUNCTION_FLAVOR_FILE "antagonist_flavor/malfunction_flavor.json" - -/// JSON string file for all of our heretic influence flavors -#define HERETIC_INFLUENCE_FILE "antagonist_flavor/heretic_influences.json" - -/// JSON file containing spy objectives -#define SPY_OBJECTIVE_FILE "antagonist_flavor/spy_objective.json" - -///employers that are from the syndicate -GLOBAL_LIST_INIT(syndicate_employers, list( - "Animal Rights Consortium", - "Bee Liberation Front", - "Cybersun Industries", - "Donk Corporation", - "Gorlex Marauders", - "MI13", - "Tiger Cooperative Fanatic", - "Waffle Corporation Terrorist", - "Waffle Corporation", -)) -///employers that are from nanotrasen -GLOBAL_LIST_INIT(nanotrasen_employers, list( - "Champions of Evil", - "Corporate Climber", - "Gone Postal", - "Internal Affairs Agent", - "Legal Trouble", -)) - -///employers who hire agents to do the hijack -GLOBAL_LIST_INIT(hijack_employers, list( - "Animal Rights Consortium", - "Bee Liberation Front", - "Gone Postal", - "Tiger Cooperative Fanatic", - "Waffle Corporation Terrorist", -)) - -///employers who hire agents to do a task and escape... or martyrdom. whatever -GLOBAL_LIST_INIT(normal_employers, list( - "Champions of Evil", - "Corporate Climber", - "Cybersun Industries", - "Donk Corporation", - "Gorlex Marauders", - "Internal Affairs Agent", - "Legal Trouble", - "MI13", - "Waffle Corporation", -)) - -///employers for malfunctioning ais. they do not have sides, unlike traitors. -GLOBAL_LIST_INIT(ai_employers, list( - "Biohazard", - "Despotic Ruler", - "Fanatical Revelation", - "Logic Core Error", - "Problem Solver", - "S.E.L.F.", - "Something's Wrong", - "Spam Virus", - "SyndOS", - "Unshackled", -)) - -#define UPLINK_THEME_SYNDICATE "syndicate" - -#define UPLINK_THEME_UNDERWORLD_MARKET "neutral" - -/// Checks if the given mob is a traitor -#define IS_TRAITOR(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/traitor)) - -/// Checks if the given mob is a blood cultist -#define IS_CULTIST(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/cult)) - -/// Checks if the mob is a sentient or non-sentient cultist -#define IS_CULTIST_OR_CULTIST_MOB(mob) ((IS_CULTIST(mob)) || (mob.faction.Find(FACTION_CULT))) -/// Checks if the given mob is a changeling -#define IS_CHANGELING(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/changeling)) - -/// Checks if the given mob is a nuclear operative -#define IS_NUKE_OP(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/nukeop)) - -//Tells whether or not someone is a space ninja -#define IS_SPACE_NINJA(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/ninja)) - -/// Checks if the given mob is a heretic. -#define IS_HERETIC(mob) (mob.mind?.has_antag_datum(/datum/antagonist/heretic)) -/// Check if the given mob is a heretic monster. -#define IS_HERETIC_MONSTER(mob) (mob.mind?.has_antag_datum(/datum/antagonist/heretic_monster)) -/// Check if the given mob is a lunatic -#define IS_LUNATIC(mob) (mob.mind?.has_antag_datum(/datum/antagonist/lunatic)) -/// Checks if the given mob is either a heretic, heretic monster or a lunatic. -#define IS_HERETIC_OR_MONSTER(mob) (IS_HERETIC(mob) || IS_HERETIC_MONSTER(mob) || IS_LUNATIC(mob)) -/// CHecks if the given mob is in the mansus realm -#define IS_IN_MANSUS(mob) (istype(get_area(mob), /area/centcom/heretic_sacrifice)) - -/// Checks if the given mob is a wizard -#define IS_WIZARD(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/wizard)) - -======= // Heretic path defines. #define PATH_START "Start Path" @@ -435,7 +264,6 @@ GLOBAL_LIST_INIT(ai_employers, list( /// Checks if the given mob is a wizard #define IS_WIZARD(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/wizard)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Checks if the given mob is a revolutionary. Will return TRUE for rev heads as well. #define IS_REVOLUTIONARY(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/rev)) @@ -570,10 +398,6 @@ GLOBAL_LIST_INIT(human_invader_antagonists, list( /// For changelings, this is how many recent say lines are retained when absorbing a mob #define LING_ABSORB_RECENT_SPEECH 8 -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Various abductor equipment modes. #define VEST_STEALTH 1 diff --git a/code/__DEFINES/atmospherics/atmos_helpers.dm b/code/__DEFINES/atmospherics/atmos_helpers.dm index 8921aa05eab..d5bcbf51471 100644 --- a/code/__DEFINES/atmospherics/atmos_helpers.dm +++ b/code/__DEFINES/atmospherics/atmos_helpers.dm @@ -82,11 +82,7 @@ GLOBAL_LIST_INIT(atmos_adjacent_savings, list(0,0)) turf.archived_cycle = SSair.times_fired;\ turf.temperature_archived = turf.temperature; -<<<<<<< HEAD -/* Fetch the energy transferred when two gas mixtures's temperature equalize. -======= /* Fetch the energy transferred when two gas mixtures' temperature equalize. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * * To equalize two gas mixtures, we simply pool the energy and divide it by the pooled heat capacity. * T' = (W1+W2) / (C1+C2) @@ -111,11 +107,7 @@ GLOBAL_LIST_INIT(atmos_adjacent_savings, list(0,0)) * Not immediately obvious, but saves us operation time. * * We put a lot of parentheses here because the numbers get really really big. -<<<<<<< HEAD - * By prioritizing the division we try to tone the number down so we dont get overflows. -======= * By prioritizing the division we try to tone the number down so we don't get overflows. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * * Arguments: * * temperature_delta: T2 - T1. [/datum/gas_mixture/var/temperature] diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm index 9722ae1a57c..a105e119847 100644 --- a/code/__DEFINES/atom_hud.dm +++ b/code/__DEFINES/atom_hud.dm @@ -47,7 +47,6 @@ #define DIAG_CAMERA_HUD "22" /// Steady Hacked APC effect, visible only to Malf AIs #define MALF_APC_HUD "23" -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - gun permits and DNR /// ammo of guns @@ -58,8 +57,6 @@ /// If they have the DNR trait #define DNR_HUD "27" // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //by default everything in the hud_list of an atom is an image //a value in hud_list with one of these will change that behavior @@ -78,10 +75,7 @@ #define DATA_HUD_AI_DETECT 9 #define DATA_HUD_FAN 10 #define DATA_HUD_MALF_APC 11 -<<<<<<< HEAD #define DATA_HUD_PERMIT 12 //SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// cooldown for being shown the images for any particular data hud #define ADD_HUD_TO_COOLDOWN 20 diff --git a/code/__DEFINES/blob_defines.dm b/code/__DEFINES/blob_defines.dm index f4bd496e1a7..966e02af3fc 100644 --- a/code/__DEFINES/blob_defines.dm +++ b/code/__DEFINES/blob_defines.dm @@ -13,12 +13,8 @@ // Generic blob defines -<<<<<<< HEAD //#define BLOB_BASE_POINT_RATE 2 // Base amount of points per process() #define BLOB_BASE_POINT_RATE 2.5 // SKYRAT EDIT CHANGE -======= -#define BLOB_BASE_POINT_RATE 2 // Base amount of points per process() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define BLOB_EXPAND_COST 4 // Price to expand onto a new tile #define BLOB_ATTACK_REFUND 2 // Points 'refunded' when the expand attempt actually attacks something instead #define BLOB_BRUTE_RESIST 0.5 // Brute damage taken gets multiplied by this value diff --git a/code/__DEFINES/bodyparts.dm b/code/__DEFINES/bodyparts.dm index 79e8d764a91..12d0d572288 100644 --- a/code/__DEFINES/bodyparts.dm +++ b/code/__DEFINES/bodyparts.dm @@ -6,15 +6,9 @@ /// The max damage a limb can take before it stops taking damage. /// Used by the max_damage var. #define LIMB_MAX_HP_PROSTHESIS 20 //Used by surplus prosthesis limbs. -<<<<<<< HEAD #define LIMB_MAX_HP_DEFAULT 60 //Used by most all limbs by default. // SKYRAT EDIT CHANGE - ORIGINAL : #define LIMB_MAX_HP_DEFAULT 50 #define LIMB_MAX_HP_ADVANCED 75 //Used by advanced robotic limbs. #define LIMB_MAX_HP_CORE 250 //Only use this for heads and torsos. // SKYRAT EDIT CHANGE - ORIGINAL : #define LIMB_MAX_HP_CORE 200 -======= -#define LIMB_MAX_HP_DEFAULT 50 //Used by most all limbs by default. -#define LIMB_MAX_HP_ADVANCED 75 //Used by advanced robotic limbs. -#define LIMB_MAX_HP_CORE 200 //Only use this for heads and torsos. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Xenomorph Limbs #define LIMB_MAX_HP_ALIEN_LARVA 50 //Used by the weird larva chest and head. Did you know they have those? diff --git a/code/__DEFINES/callbacks.dm b/code/__DEFINES/callbacks.dm index eefd8f127f9..7e07c3d0541 100644 --- a/code/__DEFINES/callbacks.dm +++ b/code/__DEFINES/callbacks.dm @@ -18,11 +18,7 @@ /* Written with `0 ||` to avoid the compiler seeing call("string"), and thinking it's a deprecated DLL */ \ call(0 || proc_owner, proc_path)(##proc_arguments); \ }; \ -<<<<<<< HEAD } -======= - } ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// like CALLBACK but specifically for verb callbacks #define VERB_CALLBACK new /datum/callback/verb_callback diff --git a/code/__DEFINES/cameranets.dm b/code/__DEFINES/cameranets.dm index 7cfc33dd0bf..3cd0d30660d 100644 --- a/code/__DEFINES/cameranets.dm +++ b/code/__DEFINES/cameranets.dm @@ -30,10 +30,7 @@ #define CAMERA_NETWORK_CARGO "cargo" #define CAMERANET_NETWORK_ABDUCTOR "abductor" #define OPERATIVE_CAMERA_NET "operative" -<<<<<<< HEAD -======= #define CAMERANET_NETWORK_CURATOR "curator" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Ruins/Away missiosn/Misc camera nets #define CAMERANET_NETWORK_MOON19_XENO "mo19x" diff --git a/code/__DEFINES/cleaning.dm b/code/__DEFINES/cleaning.dm index 8f544bc256b..a53887dd0ed 100644 --- a/code/__DEFINES/cleaning.dm +++ b/code/__DEFINES/cleaning.dm @@ -32,7 +32,6 @@ /// Cleans decals such as cobwebs off the floor #define CLEAN_TYPE_HARD_DECAL (1 << 7) -<<<<<<< HEAD // SKYRAT EDIT BEGIN ADD: Turf liquid cleaning type! /// Cleans all the liquids from a turf, or "evaporates" them @@ -44,12 +43,6 @@ // Use these when calling the wash proc for your cleaning apparatus #define CLEAN_WASH (CLEAN_TYPE_BLOOD | CLEAN_TYPE_DISEASE | CLEAN_TYPE_ACID | CLEAN_TYPE_LIGHT_DECAL) #define CLEAN_SCRUB (CLEAN_WASH | CLEAN_TYPE_FINGERPRINTS | CLEAN_TYPE_FIBERS | CLEAN_TYPE_HARD_DECAL | CLEAN_TYPE_LIQUIDS) // Skyrat edit - adds CLEAN_TYPE_LIQUIDS -======= -// Different cleaning methods. -// Use these when calling the wash proc for your cleaning apparatus -#define CLEAN_WASH (CLEAN_TYPE_BLOOD | CLEAN_TYPE_DISEASE | CLEAN_TYPE_ACID | CLEAN_TYPE_LIGHT_DECAL) -#define CLEAN_SCRUB (CLEAN_WASH | CLEAN_TYPE_FINGERPRINTS | CLEAN_TYPE_FIBERS | CLEAN_TYPE_HARD_DECAL) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define CLEAN_RAD CLEAN_TYPE_RADIATION #define CLEAN_ALL ALL diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index bed569911bb..60cd3a7b018 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -13,22 +13,14 @@ #define OXY "oxygen" /// Exhaustion and nonlethal damage. #define STAMINA "stamina" -<<<<<<< HEAD -/// Brain damage. Should probably be decomissioned and replaced with proper organ damage. -======= /// Brain damage. Should probably be decommissioned and replaced with proper organ damage. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define BRAIN "brain" //Damage flag defines // /// Involves corrosive substances. #define ACID "acid" -<<<<<<< HEAD -/// Involved in checking wheter a disease can infect or spread. Also involved in xeno neurotoxin. -======= /// Involved in checking whether a disease can infect or spread. Also involved in xeno neurotoxin. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define BIO "bio" /// Involves a shockwave, usually from an explosion. #define BOMB "bomb" @@ -44,11 +36,7 @@ #define LASER "laser" /// Involves a melee attack or a thrown object. #define MELEE "melee" -<<<<<<< HEAD -/// Involved in checking the likelyhood of applying a wound to a mob. -======= /// Involved in checking the likelihood of applying a wound to a mob. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define WOUND "wound" #define ARMOR_ALL "all_damage_types" diff --git a/code/__DEFINES/communications.dm b/code/__DEFINES/communications.dm index 1b4dd8931aa..813179974f9 100644 --- a/code/__DEFINES/communications.dm +++ b/code/__DEFINES/communications.dm @@ -4,11 +4,8 @@ /// The extended time an admin has to cancel a cross-sector message if they pass the filter, for instance #define EXTENDED_CROSS_SECTOR_CANCEL_TIME (30 SECONDS) -<<<<<<< HEAD // SKYRAT EDIT REMOVAL BEGIN - modularized into code/__DEFINES/~skyrat_defines/security_alerts.dm /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Security levels affect the escape shuttle timer /// Security level is green. (no threats) #define SEC_LEVEL_GREEN 0 @@ -18,8 +15,5 @@ #define SEC_LEVEL_RED 2 /// Security level is delta. (station destruction immiment) #define SEC_LEVEL_DELTA 3 -<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/construction/material.dm b/code/__DEFINES/construction/material.dm index c8aa68874b7..57d55ab8042 100644 --- a/code/__DEFINES/construction/material.dm +++ b/code/__DEFINES/construction/material.dm @@ -1,8 +1,4 @@ -<<<<<<< HEAD -//Defines for amount of material retrived from sheets & other items -======= //Defines for amount of material retrieved from sheets & other items ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The amount of materials you get from a sheet of mineral like iron/diamond/glass etc. 100 Units. #define SHEET_MATERIAL_AMOUNT 100 /// The amount of materials you get from half a sheet. Used in standard object quantities. 50 units. diff --git a/code/__DEFINES/construction/rcd.dm b/code/__DEFINES/construction/rcd.dm index 05db5a1619b..a8d98215af1 100644 --- a/code/__DEFINES/construction/rcd.dm +++ b/code/__DEFINES/construction/rcd.dm @@ -7,11 +7,7 @@ #define RCD_WINDOWGRILLE (1 << 1) /// Windoors & Airlocks #define RCD_AIRLOCK (1 << 2) -<<<<<<< HEAD - /// Literarly anything that is spawned on top of a turf such as tables, machines etc -======= /// Literally anything that is spawned on top of a turf such as tables, machines etc ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define RCD_STRUCTURE (1 << 3) /// For wallmounts like air alarms, fire alarms & apc #define RCD_WALLFRAME (1 << 4) diff --git a/code/__DEFINES/crushing.dm b/code/__DEFINES/crushing.dm index c8dc788155b..62705e0e3b8 100644 --- a/code/__DEFINES/crushing.dm +++ b/code/__DEFINES/crushing.dm @@ -8,11 +8,7 @@ #define SUCCESSFULLY_FELL_OVER (1<<2) #define CRUSH_CRIT_SHATTER_LEGS "crush_crit_shatter_legs" -<<<<<<< HEAD -#define CRUSH_CRIT_PARAPALEGIC "crush_crit_parapalegic" -======= #define CRUSH_CRIT_PARAPLEGIC "crush_crit_paraplegic" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define CRUSH_CRIT_SQUISH_LIMB "crush_crit_pin" #define CRUSH_CRIT_HEADGIB "crush_crit_headgib" #define VENDOR_CRUSH_CRIT_PIN "vendor_crush_crit_pin" diff --git a/code/__DEFINES/database.dm b/code/__DEFINES/database.dm index 80919b5d049..22351b5052d 100644 --- a/code/__DEFINES/database.dm +++ b/code/__DEFINES/database.dm @@ -4,9 +4,6 @@ #define DB_QUERY_FINISHED 1 /// When there was a problem with the execution of a query. #define DB_QUERY_BROKEN 2 -<<<<<<< HEAD -======= ///The probability of non-maploaded photos and papers being saved as bottle messages at the end of the round. #define MESSAGE_BOTTLE_CHANCE 0.2 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/dcs/signals/signals_action.dm b/code/__DEFINES/dcs/signals/signals_action.dm index 0d0185286e3..c6e042a0581 100644 --- a/code/__DEFINES/dcs/signals/signals_action.dm +++ b/code/__DEFINES/dcs/signals/signals_action.dm @@ -2,11 +2,7 @@ ///from base of datum/action/proc/Trigger(): (datum/action) #define COMSIG_ACTION_TRIGGER "action_trigger" -<<<<<<< HEAD - // Return to block the trigger from occuring -======= // Return to block the trigger from occurring ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMPONENT_ACTION_BLOCK_TRIGGER (1<<0) /// From /datum/action/Grant(): (mob/grant_to) #define COMSIG_ACTION_GRANTED "action_grant" diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm index ce7e58f1d11..925c7bc4e71 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm @@ -74,11 +74,7 @@ #define COMSIG_MOVABLE_DISPOSING "movable_disposing" // called when movable is expelled from a disposal pipe, bin or outlet on obj/pipe_eject: (direction) #define COMSIG_MOVABLE_PIPE_EJECTING "movable_pipe_ejecting" -<<<<<<< HEAD -///called when the movable sucessfully has its anchored var changed, from base atom/movable/set_anchored(): (value) -======= ///called when the movable successfully has its anchored var changed, from base atom/movable/set_anchored(): (value) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_MOVABLE_SET_ANCHORED "movable_set_anchored" ///from base of atom/movable/setGrabState(): (newstate) #define COMSIG_MOVABLE_SET_GRAB_STATE "living_set_grab_state" @@ -123,15 +119,12 @@ /// From base of area/Exited(): (area/left, direction) #define COMSIG_MOVABLE_EXITED_AREA "movable_exited_area" -<<<<<<< HEAD -======= ///from base of /datum/component/splat/splat: (hit_atom) #define COMSIG_MOVABLE_SPLAT "movable_splat" ///from base of /atom/movable/point_at: (atom/A, obj/effect/temp_visual/point/point) #define COMSIG_MOVABLE_POINTED "movable_pointed" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Sent to movables when they are being stolen by a spy: (mob/living/spy, datum/spy_bounty/bounty) #define COMSIG_MOVABLE_SPY_STEALING "movable_spy_stealing" /// Called when something is pushed by a living mob bumping it: (mob/living/pusher, push force) diff --git a/code/__DEFINES/dcs/signals/signals_bitrunning.dm b/code/__DEFINES/dcs/signals/signals_bitrunning.dm index f6e2f66278f..ac3095d6f5a 100644 --- a/code/__DEFINES/dcs/signals/signals_bitrunning.dm +++ b/code/__DEFINES/dcs/signals/signals_bitrunning.dm @@ -53,9 +53,6 @@ /// from /obj/effect/mob_spawn/ghost_role/human/virtual_domain/proc/artificial_spawn() : (mob/living/runner) #define COMSIG_BITRUNNER_SPAWNED "bitrunner_spawned" -<<<<<<< HEAD -======= /// from /obj/effect/landmark/bitrunning/mob_segment/proc/spawn_mobs() : (list/mob/living) #define COMSIG_BITRUNNING_MOB_SEGMENT_SPAWNED "bitrunner_mob_segment_spawned" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/dcs/signals/signals_fish.dm b/code/__DEFINES/dcs/signals/signals_fish.dm index 01c950b1b8e..8af3b8dfca7 100644 --- a/code/__DEFINES/dcs/signals/signals_fish.dm +++ b/code/__DEFINES/dcs/signals/signals_fish.dm @@ -17,15 +17,12 @@ #define COMSIG_FISH_EATEN_BY_OTHER_FISH "fish_eaten_by_other_fish" ///From /obj/item/fish/feed: (fed_reagents, fed_reagent_type) #define COMSIG_FISH_FED "fish_on_fed" -<<<<<<< HEAD -======= ///from /obj/item/fish/pet_fish #define COMSIG_FISH_PETTED "fish_petted" ///From /obj/item/fish/update_size_and_weight: (new_size, new_weight) #define COMSIG_FISH_UPDATE_SIZE_AND_WEIGHT "fish_update_size_and_weight" ///From /obj/item/fish/update_fish_force: (weight_rank, bonus_malus) #define COMSIG_FISH_FORCE_UPDATED "fish_force_updated" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Fishing challenge completed #define COMSIG_FISHING_CHALLENGE_COMPLETED "fishing_completed" diff --git a/code/__DEFINES/dcs/signals/signals_food.dm b/code/__DEFINES/dcs/signals/signals_food.dm index 2a91706619b..113826a4486 100644 --- a/code/__DEFINES/dcs/signals/signals_food.dm +++ b/code/__DEFINES/dcs/signals/signals_food.dm @@ -16,12 +16,9 @@ /// called when an edible ingredient is added: (datum/component/edible/ingredient) #define COMSIG_FOOD_INGREDIENT_ADDED "edible_ingredient_added" -<<<<<<< HEAD -======= /// from base of /datum/component/edible/get_recipe_complexity(): (list/extra_complexity) #define COMSIG_FOOD_GET_EXTRA_COMPLEXITY "food_get_extra_complexity" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Deep frying foods /// An item becomes fried - From /datum/element/fried_item/Attach: (fry_time) #define COMSIG_ITEM_FRIED "item_fried" @@ -37,11 +34,8 @@ #define COMPONENT_MICROWAVE_BAD_RECIPE (1<<1) ///called on item when created through microwaving (): (obj/machinery/microwave/M, cooking_efficiency) #define COMSIG_ITEM_MICROWAVE_COOKED "microwave_cooked" -<<<<<<< HEAD -======= ///called on the ingredient through microwawing: (result) #define COMSIG_ITEM_MICROWAVE_COOKED_FROM "item_microwave_cooked_from" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Grilling foods (griddle, grill, and bonfire) ///Called when an object is placed onto a griddle @@ -57,12 +51,9 @@ ///Called when an object is turned into another item through grilling ontop of a griddle #define COMSIG_ITEM_GRILLED "item_grill_completed" -<<<<<<< HEAD -======= ///Called when the object is grilled by the grill (not to be confused by the griddle, but oh gee the two should be merged in one) #define COMSIG_ITEM_BARBEQUE_GRILLED "item_barbeque_grilled" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Baking foods (oven) //Called when an object is inserted into an oven (atom/oven, mob/baker) #define COMSIG_ITEM_OVEN_PLACED_IN "item_placed_in_oven" diff --git a/code/__DEFINES/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm index 78ff266f668..bda49bb4b4a 100644 --- a/code/__DEFINES/dcs/signals/signals_global.dm +++ b/code/__DEFINES/dcs/signals/signals_global.dm @@ -57,11 +57,7 @@ #define COMSIG_GLOB_NEW_MACHINE "!new_machine" /// a client (re)connected, after all /client/New() checks have passed : (client/connected_client) #define COMSIG_GLOB_CLIENT_CONNECT "!client_connect" -<<<<<<< HEAD -/// a weather event of some kind occured -======= /// a weather event of some kind occurred ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_WEATHER_TELEGRAPH(event_type) "!weather_telegraph [event_type]" #define COMSIG_WEATHER_START(event_type) "!weather_start [event_type]" #define COMSIG_WEATHER_WINDDOWN(event_type) "!weather_winddown [event_type]" diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_ai.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_ai.dm index fafff26749e..16f7e00e78a 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_ai.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_ai.dm @@ -9,8 +9,5 @@ ///Signal sent when a bot is reset #define COMSIG_BOT_RESET "bot_reset" -<<<<<<< HEAD -======= ///Sent off /mob/living/basic/bot/proc/set_mode_flags() : (new_flags) #define COMSIG_BOT_MODE_FLAGS_SET "bot_mode_flags_set" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm index a2105699baa..56d5ddf4524 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm @@ -3,16 +3,6 @@ /// Stops the rest of the help #define COMPONENT_BLOCK_HELP_ACT (1<<0) -<<<<<<< HEAD -///Called from /mob/living/carbon/help_shake_act, before any hugs have ocurred. (mob/living/helper) -#define COMSIG_CARBON_PRE_MISC_HELP "carbon_pre_misc_help" - /// Stops the rest of help act (hugging, etc) from occuring - #define COMPONENT_BLOCK_MISC_HELP (1<<0) - -///Called from /mob/living/carbon/help_shake_act on the person being helped, after any hugs have ocurred. (mob/living/helper) -#define COMSIG_CARBON_HELP_ACT "carbon_help" -///Called from /mob/living/carbon/help_shake_act on the helper, after any hugs have ocurred. (mob/living/helped) -======= ///Called from /mob/living/carbon/help_shake_act, before any hugs have occurred. (mob/living/helper) #define COMSIG_CARBON_PRE_MISC_HELP "carbon_pre_misc_help" /// Stops the rest of help act (hugging, etc) from occurring @@ -21,7 +11,6 @@ ///Called from /mob/living/carbon/help_shake_act on the person being helped, after any hugs have occurred. (mob/living/helper) #define COMSIG_CARBON_HELP_ACT "carbon_help" ///Called from /mob/living/carbon/help_shake_act on the helper, after any hugs have occurred. (mob/living/helped) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_CARBON_HELPED "carbon_helped_someone" ///When a carbon slips. Called on /turf/open/handle_slip() @@ -106,19 +95,11 @@ #define COMPONENT_OVERRIDE_HEALTH_HUD (1<<0) ///Called when a carbon updates their sanity (source = carbon) #define COMSIG_CARBON_SANITY_UPDATE "carbon_sanity_update" -<<<<<<< HEAD -///Called when a carbon attempts to breath, before the breath has actually occured -#define COMSIG_CARBON_ATTEMPT_BREATHE "carbon_attempt_breathe" - // Prevents the breath - #define COMSIG_CARBON_BLOCK_BREATH (1 << 0) -///Called when a carbon breathes, before the breath has actually occured -======= ///Called when a carbon attempts to breath, before the breath has actually occurred #define COMSIG_CARBON_ATTEMPT_BREATHE "carbon_attempt_breathe" // Prevents the breath #define COMSIG_CARBON_BLOCK_BREATH (1 << 0) ///Called when a carbon breathes, before the breath has actually occurred ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_CARBON_PRE_BREATHE "carbon_pre_breathe" ///Called when a carbon updates their mood #define COMSIG_CARBON_MOOD_UPDATE "carbon_mood_update" @@ -152,15 +133,9 @@ #define VISIBLE_NAME_FACE 1 //Index for the name of the id #define VISIBLE_NAME_ID 2 -<<<<<<< HEAD - //Index for whether their name is being overriden instead of obsfuscated - #define VISIBLE_NAME_FORCED 3 -///from /mob/living/carbon/human/get_id_name; only returns if the mob has TRAIT_UNKNOWN and it's being overriden: (identity) -======= //Index for whether their name is being overridden instead of obfuscated #define VISIBLE_NAME_FORCED 3 ///from /mob/living/carbon/human/get_id_name; only returns if the mob has TRAIT_UNKNOWN and it's being overridden: (identity) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_HUMAN_GET_FORCED_NAME "human_get_forced_name" // Mob transformation signals @@ -184,17 +159,10 @@ #define HANDLE_BLOOD_HANDLED (1<<0) /// Return to skip default nutrition -> blood conversion #define HANDLE_BLOOD_NO_NUTRITION_DRAIN (1<<1) -<<<<<<< HEAD - /// Return to skip oxyloss and similar effecst from blood level - #define HANDLE_BLOOD_NO_OXYLOSS (1<<2) - -/// from /datum/status_effect/limp/proc/check_step(mob/whocares, OldLoc, Dir, forced) iodk where it shuld go -======= /// Return to skip oxyloss and similar effects from blood level #define HANDLE_BLOOD_NO_OXYLOSS (1<<2) /// from /datum/status_effect/limp/proc/check_step(mob/whocares, OldLoc, Dir, forced) iodk where it should go ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_CARBON_LIMPING "mob_limp_check" #define COMPONENT_CANCEL_LIMP (1<<0) diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm index d547e532196..1b2d82ca9c5 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm @@ -50,11 +50,7 @@ #define COMSIG_MOB_CLIENT_BLOCK_PRE_MOVE COMPONENT_MOVABLE_BLOCK_PRE_MOVE /// The argument of move_args which corresponds to the loc we're moving to #define MOVE_ARG_NEW_LOC 1 -<<<<<<< HEAD - /// The arugment of move_args which dictates our movement direction -======= /// The argument of move_args which dictates our movement direction ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MOVE_ARG_DIRECTION 2 /// From base of /client/Move(): (direction, old_dir) #define COMSIG_MOB_CLIENT_MOVED "mob_client_moved" @@ -76,11 +72,7 @@ #define COMSIG_MOB_MIND_TRANSFERRED_INTO "mob_mind_transferred_into" ///from mind/transfer_from. Sent to the mob the mind is being transferred out of. #define COMSIG_MOB_MIND_TRANSFERRED_OUT_OF "mob_mind_transferred_out_of" -<<<<<<< HEAD -/// From /mob/proc/ghostize() Called when a mob sucessfully ghosts -======= /// From /mob/proc/ghostize() Called when a mob successfully ghosts ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMSIG_MOB_GHOSTIZED "mob_ghostized" ///from base of obj/allowed(mob/M): (/obj) returns ACCESS_ALLOWED if mob has id access to the obj @@ -159,11 +151,6 @@ /// from base of mob/swap_hand(): () /// Performed after the hands are swapped. #define COMSIG_MOB_SWAP_HANDS "mob_swap_hands" -<<<<<<< HEAD -///from base of /mob/verb/pointed: (atom/A) -#define COMSIG_MOB_POINTED "mob_pointed" -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Mob is trying to open the wires of a target [/atom], from /datum/wires/interactable(): (atom/target) #define COMSIG_TRY_WIRES_INTERACT "try_wires_interact" #define COMPONENT_CANT_INTERACT_WIRES (1<<0) @@ -183,13 +170,8 @@ ///Called on user, from base of /datum/strippable_item/try_(un)equip() (atom/target, obj/item/equipping?) #define COMSIG_TRY_STRIP "try_strip" #define COMPONENT_CANT_STRIP (1<<0) -<<<<<<< HEAD -///From /datum/component/creamed/Initialize() -#define COMSIG_MOB_CREAMED "mob_creamed" -======= ///From /datum/component/face_decal/splat/Initialize() #define COMSIG_MOB_HIT_BY_SPLAT "hit_by_splat" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///From /obj/item/gun/proc/check_botched() #define COMSIG_MOB_CLUMSY_SHOOT_FOOT "mob_clumsy_shoot_foot" ///from /obj/item/hand_item/slapper/attack_atom(): (source=obj/structure/table/slammed_table, mob/living/slammer) @@ -265,9 +247,6 @@ /// from /mob/proc/key_down(): (key, client/client, full_key) #define COMSIG_MOB_KEYDOWN "mob_key_down" -<<<<<<< HEAD -======= /// from /mob/update_incapacitated(): (old_incap, new_incap) #define COMSIG_MOB_INCAPACITATE_CHANGED "mob_incapacitated" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/dcs/signals/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object.dm index ca6dd17aa12..797256017d4 100644 --- a/code/__DEFINES/dcs/signals/signals_object.dm +++ b/code/__DEFINES/dcs/signals/signals_object.dm @@ -153,20 +153,12 @@ /// Sebt from obj/item/ui_action_click(): (mob/user, datum/action) #define COMSIG_ITEM_UI_ACTION_CLICK "item_action_click" -<<<<<<< HEAD - /// Return to prevent the default behavior (attack_selfing) from ocurring. -======= /// Return to prevent the default behavior (attack_selfing) from occurring. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMPONENT_ACTION_HANDLED (1<<0) /// Sent from obj/item/item_action_slot_check(): (mob/user, datum/action, slot) #define COMSIG_ITEM_UI_ACTION_SLOT_CHECKED "item_action_slot_checked" -<<<<<<< HEAD - /// Return to prevent the default behavior (attack_selfing) from ocurring. -======= /// Return to prevent the default behavior (attack_selfing) from occurring. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMPONENT_ITEM_ACTION_SLOT_INVALID (1<<0) ///from base of mob/living/carbon/attacked_by(): (mob/living/carbon/target, mob/living/user, hit_zone) diff --git a/code/__DEFINES/dcs/signals/signals_reagent.dm b/code/__DEFINES/dcs/signals/signals_reagent.dm index 50135da59b7..367ec946361 100644 --- a/code/__DEFINES/dcs/signals/signals_reagent.dm +++ b/code/__DEFINES/dcs/signals/signals_reagent.dm @@ -53,11 +53,6 @@ #define COMSIG_REAGENTS_EXPOSE_MOB "reagents_expose_mob" ///from base of [/turf/proc/expose_reagents]: (/turf, /list, methods, volume_modifier, show_message) #define COMSIG_REAGENTS_EXPOSE_TURF "reagents_expose_turf" -<<<<<<< HEAD -///from base of [/datum/component/personal_crafting/proc/del_reqs]: () -#define COMSIG_REAGENTS_CRAFTING_PING "reagents_crafting_ping" -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// sent when reagents are transfered from a cup, to something refillable (atom/transfer_to) #define COMSIG_REAGENTS_CUP_TRANSFER_TO "reagents_cup_transfer_to" /// sent when reagents are transfered from some reagent container, to a cup (atom/transfer_from) diff --git a/code/__DEFINES/dcs/signals/signals_spell.dm b/code/__DEFINES/dcs/signals/signals_spell.dm index 31f8bb4fd95..8d02affded8 100644 --- a/code/__DEFINES/dcs/signals/signals_spell.dm +++ b/code/__DEFINES/dcs/signals/signals_spell.dm @@ -113,11 +113,7 @@ // Charge /// Sent from /datum/action/cooldown/spell/charge/cast(), to the item in hand being charged: (datum/action/cooldown/spell/spell, mob/user) #define COMSIG_ITEM_MAGICALLY_CHARGED "item_magic_charged" -<<<<<<< HEAD - /// Return if an item was successfuly recharged -======= /// Return if an item was successful recharged ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define COMPONENT_ITEM_CHARGED (1 << 0) /// Return if the item had a negative side effect occur while recharging #define COMPONENT_ITEM_BURNT_OUT (1 << 1) diff --git a/code/__DEFINES/dcs/signals/signals_tools.dm b/code/__DEFINES/dcs/signals/signals_tools.dm index 3fe59826d0d..110db1ed89c 100644 --- a/code/__DEFINES/dcs/signals/signals_tools.dm +++ b/code/__DEFINES/dcs/signals/signals_tools.dm @@ -1,10 +1,6 @@ // Notifies tools that something is happening. -<<<<<<< HEAD -// Sucessful actions against an atom. -======= // Successful actions against an atom. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Called from /atom/proc/tool_act (atom) #define COMSIG_TOOL_ATOM_ACTED_PRIMARY(tooltype) "tool_atom_acted_[tooltype]" ///Called from /atom/proc/tool_act (atom) diff --git a/code/__DEFINES/events.dm b/code/__DEFINES/events.dm index cd71ca713ab..7045d8f0c65 100644 --- a/code/__DEFINES/events.dm +++ b/code/__DEFINES/events.dm @@ -22,11 +22,7 @@ #define EVENT_CATEGORY_FRIENDLY "Friendly" ///Events that affect the body and mind #define EVENT_CATEGORY_HEALTH "Health" -<<<<<<< HEAD -///Events reserved for special occassions -======= ///Events reserved for special occasions ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define EVENT_CATEGORY_HOLIDAY "Holiday" ///Events with enemy groups with a more complex plan #define EVENT_CATEGORY_INVASION "Invasion" diff --git a/code/__DEFINES/external_organs.dm b/code/__DEFINES/external_organs.dm index b265f8a69b7..b47c6cff3bc 100644 --- a/code/__DEFINES/external_organs.dm +++ b/code/__DEFINES/external_organs.dm @@ -11,7 +11,4 @@ /// Tail spine defines #define SPINE_KEY_LIZARD "lizard" -<<<<<<< HEAD #define SPINE_KEY_VOX "vox" // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/fish.dm b/code/__DEFINES/fish.dm index aca4d5eafb0..04557b4a8e6 100644 --- a/code/__DEFINES/fish.dm +++ b/code/__DEFINES/fish.dm @@ -1,10 +1,7 @@ /// Use in fish tables to denote miss chance. #define FISHING_DUD "dud" -<<<<<<< HEAD -======= ///Used in the the hydro tray fishing spot to define a random seed reward #define FISHING_RANDOM_SEED "Random seed" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Baseline fishing difficulty levels #define FISHING_DEFAULT_DIFFICULTY 15 @@ -19,14 +16,6 @@ #define FISH_TRAIT_MINOR_DIFFICULTY_BOOST 5 -<<<<<<< HEAD -// These define how the fish will behave in the minigame -#define FISH_AI_DUMB "dumb" -#define FISH_AI_ZIPPY "zippy" -#define FISH_AI_SLOW "slow" - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Slot defines for the fishing rod and its equipment #define ROD_SLOT_BAIT "bait" #define ROD_SLOT_LINE "line" @@ -78,17 +67,11 @@ #define FISHING_MINIGAME_RULE_FLIP (1 << 5) ///Skip the biting phase and go straight to the minigame, avoiding the penalty for having slow reflexes. #define FISHING_MINIGAME_AUTOREEL (1 << 6) -<<<<<<< HEAD - -///all the effects that are active and will last for a few seconds before triggering a cooldown -#define FISHING_MINIGAME_ACTIVE_EFFECTS (FISHING_MINIGAME_RULE_ANTIGRAV|FISHING_MINIGAME_RULE_FLIP) -======= ///The fish will fade in and out at intervals #define FISHING_MINIGAME_RULE_CAMO (1 << 7) ///all the effects that are active and will last for a few seconds before triggering a cooldown #define FISHING_MINIGAME_ACTIVE_EFFECTS (FISHING_MINIGAME_RULE_ANTIGRAV|FISHING_MINIGAME_RULE_FLIP|FISHING_MINIGAME_RULE_CAMO) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The default additive value for fishing hook catch weight modifiers. #define FISHING_DEFAULT_HOOK_BONUS_ADDITIVE 0 @@ -105,16 +88,12 @@ #define FISH_ICON_GEM "gem" #define FISH_ICON_CRAB "crab" #define FISH_ICON_JELLYFISH "jellyfish" -<<<<<<< HEAD -#define FISH_ICON_BONE "bone" -======= #define FISH_ICON_BOTTLE "bottle" #define FISH_ICON_BONE "bone" #define FISH_ICON_ELECTRIC "electric" #define FISH_ICON_WEAPON "weapon" #define FISH_ICON_CRITTER "critter" #define FISH_ICON_SEED "seed" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define AQUARIUM_ANIMATION_FISH_SWIM "fish" #define AQUARIUM_ANIMATION_FISH_DEAD "dead" @@ -135,16 +114,11 @@ ///Fish size thresholds for w_class. #define FISH_SIZE_TINY_MAX 30 #define FISH_SIZE_SMALL_MAX 50 -<<<<<<< HEAD -#define FISH_SIZE_NORMAL_MAX 90 -#define FISH_SIZE_BULKY_MAX 130 -======= #define FISH_SIZE_NORMAL_MAX 80 #define FISH_SIZE_BULKY_MAX 120 ///size threshold for requiring two-handed carry #define FISH_SIZE_TWO_HANDS_REQUIRED 135 #define FISH_SIZE_HUGE_MAX 165 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The coefficient for maximum weight/size divergence relative to the averages. #define MAX_FISH_DEVIATION_COEFF 2.5 @@ -154,8 +128,6 @@ ///The number of fillets is multiplied by the fish' size and divided by this. #define FISH_FILLET_NUMBER_SIZE_DIVISOR 30 -<<<<<<< HEAD -======= ///The slowdown of the fish when carried begins at this value #define FISH_WEIGHT_SLOWDOWN 2100 ///The value of the slowdown equals to the weight divided by this (and then at the power of a sub-1 exponent) @@ -165,7 +137,6 @@ ///Used to calculate the force of the fish by comparing (1 + log(weight/this_define)) and the w_class of the item. #define FISH_WEIGHT_FORCE_DIVISOR 250 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The breeding timeout for newly instantiated fish is multiplied by this. #define NEW_FISH_BREEDING_TIMEOUT_MULT 2 ///The last feeding timestamp of newly instantiated fish is multiplied by this: ergo, they spawn 50% hungry. @@ -209,8 +180,6 @@ //Fish breeding stops if fish count exceeds this. #define AQUARIUM_MAX_BREEDING_POPULATION 20 -<<<<<<< HEAD -======= //Minigame defines /// The height of the minigame slider. Not in pixels, but minigame units. @@ -227,4 +196,3 @@ #define FISH_BAIT_REAGENT "Reagent" #define FISH_BAIT_VALUE "Value" #define FISH_BAIT_AMOUNT "Amount" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/fonts.dm b/code/__DEFINES/fonts.dm index 2df43b40953..b8932860fca 100644 --- a/code/__DEFINES/fonts.dm +++ b/code/__DEFINES/fonts.dm @@ -13,11 +13,7 @@ #define SIGNATURE_FONT "Segoe Script" /// Emoji icon set -<<<<<<< HEAD #define EMOJI_SET 'modular_skyrat/master_files/icons/emoji.dmi' // SKYRAT EDIT - ORIGINAL: 'icons/ui/chat/emoji.dmi' -======= -#define EMOJI_SET 'icons/ui/chat/emoji.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Font metrics bitfield /// Include leading A width and trailing C width in GetWidth() or in DrawText() diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index 4e249f0fb7d..1304bd53cd3 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -19,10 +19,7 @@ #define BUGS (1<<18) #define GORE (1<<19) #define STONE (1<<20) -<<<<<<< HEAD #define BLOODY (1<<21) // SKYRAT EDIT - Hemophage Food -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DEFINE_BITFIELD(foodtypes, list( "MEAT" = MEAT, @@ -46,10 +43,7 @@ DEFINE_BITFIELD(foodtypes, list( "BUGS" = BUGS, "GORE" = GORE, "STONE" = STONE, -<<<<<<< HEAD "BLOODY" = BLOODY, // SKYRAT EDIT - Hemophage Food -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /// A list of food type names, in order of their flags @@ -75,10 +69,7 @@ DEFINE_BITFIELD(foodtypes, list( "BUGS", \ "GORE", \ "STONE", \ -<<<<<<< HEAD "BLOODY", /* SKYRAT EDIT - Hemophage Food */ \ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /// IC meaning (more or less) for food flags @@ -104,10 +95,7 @@ DEFINE_BITFIELD(foodtypes, list( "Bugs", \ "Gore", \ "Rocks", \ -<<<<<<< HEAD "Bloody", /* SKYRAT EDIT - Hemophage Food */ \ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) #define DRINK_REVOLTING 1 @@ -117,10 +105,7 @@ DEFINE_BITFIELD(foodtypes, list( #define DRINK_FANTASTIC 5 #define FOOD_AMAZING 6 -<<<<<<< HEAD #define RACE_DRINK 7 // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FOOD_QUALITY_NORMAL 1 #define FOOD_QUALITY_NICE 2 @@ -190,25 +175,14 @@ GLOBAL_LIST_INIT(food_buffs, list( #define FOOD_IN_CONTAINER (1<<0) /// Finger food can be eaten while walking / running around #define FOOD_FINGER_FOOD (1<<1) -<<<<<<< HEAD -======= - -DEFINE_BITFIELD(food_flags, list( - "FOOD_FINGER_FOOD" = FOOD_FINGER_FOOD, - "FOOD_IN_CONTAINER" = FOOD_IN_CONTAINER, -)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DEFINE_BITFIELD(food_flags, list( "FOOD_FINGER_FOOD" = FOOD_FINGER_FOOD, "FOOD_IN_CONTAINER" = FOOD_IN_CONTAINER, )) -<<<<<<< HEAD #define STOP_SERVING_BREAKFAST (35 MINUTES) // SKYRAT EDIT - ORIGINAL: 15 MINUTES -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FOOD_MEAT_HUMAN 50 #define FOOD_MEAT_MUTANT 100 #define FOOD_MEAT_MUTANT_RARE 200 diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index 24b2d1cbe9b..aff51851e18 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -139,7 +139,6 @@ DEFINE_BITFIELD(smoothing_junction, list( #define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS S_TURF(59) ///turf/closed/wall/mineral/titanium/survival #define SMOOTH_GROUP_TURF_OPEN_CLIFF S_TURF(60) ///turf/open/cliff -<<<<<<< HEAD // SKYRAT EDIT ADDITION #define SMOOTH_GROUP_ELEVATED_PLASTEEL S_TURF(61) #define SMOOTH_GROUP_LOWERED_PLASTEEL S_TURF(62) @@ -149,9 +148,6 @@ DEFINE_BITFIELD(smoothing_junction, list( #define MAX_S_TURF 63 //Always match this value with the one above it. //SKYRAT EDIT END -======= -#define MAX_S_TURF 60 //Always match this value with the one above it. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define S_OBJ(num) ("-" + #num + ",") /* /obj included */ @@ -174,14 +170,11 @@ DEFINE_BITFIELD(smoothing_junction, list( #define SMOOTH_GROUP_BAMBOO_WALLS S_TURF(17) //![/turf/closed/wall/mineral/bamboo, /obj/structure/falsewall/bamboo] #define SMOOTH_GROUP_PLASTINUM_WALLS S_TURF(18) //![turf/closed/indestructible/riveted/plastinum] -<<<<<<< HEAD //SKYRAT EDIT ADDITION #define SMOOTH_GROUP_SHIPWALLS S_OBJ(19) ///turf/closed/wall/mineral/titanium/spaceship #define SMOOTH_GROUP_STONE_WALLS S_OBJ(20) ///turf/closed/wall/mineral/stone, /obj/structure/falsewall/stone //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SMOOTH_GROUP_PAPERFRAME S_OBJ(21) ///obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe #define SMOOTH_GROUP_WINDOW_FULLTILE S_OBJ(22) ///turf/closed/indestructible/fakeglass, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/reinforced/plasma/fulltile @@ -226,15 +219,12 @@ DEFINE_BITFIELD(smoothing_junction, list( #define SMOOTH_GROUP_SPIDER_WEB_WALL_TOUGH S_OBJ(73) // /obj/structure/spider/stickyweb/sealed/thick #define SMOOTH_GROUP_SPIDER_WEB_WALL_MIRROR S_OBJ(74) // /obj/structure/spider/stickyweb/sealed/reflector -<<<<<<< HEAD //SKYRAT EDIT ADDITION #define SMOOTH_GROUP_SHUTTERS S_OBJ(75) #define SMOOTH_GROUP_WATER S_OBJ(76) ///obj/effect/abstract/liquid_turf //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SMOOTH_GROUP_GRAV_FIELD S_OBJ(69) /// Performs the work to set smoothing_groups and canSmoothWith. diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 19336594769..67a9af9d9b3 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -63,11 +63,8 @@ #define ITEM_SLOT_HANDCUFFED (1<<18) /// Legcuff slot (bolas, beartraps) #define ITEM_SLOT_LEGCUFFED (1<<19) -<<<<<<< HEAD -======= /// Inside of a character's BELT......... #define ITEM_SLOT_BELTPACK (1<<20) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Total amount of slots #define SLOTS_AMT 20 // Keep this up to date! @@ -113,7 +110,6 @@ DEFINE_BITFIELD(no_equip_flags, list( #define HIDEMUTWINGS (1<<13) ///hides belts and riggings #define HIDEBELT (1<<14) -<<<<<<< HEAD //SKYRAT EDIT ADDITION: CUSTOM EAR TOGGLE FOR ANTHRO/ETC EAR SHOWING - /// Manually set this on items you want anthro ears to show on! @@ -127,8 +123,6 @@ DEFINE_BITFIELD(no_equip_flags, list( /// If this has our taur variant, do we hide our taur part? #define HIDETAUR (1<<18) //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //bitflags for clothing coverage - also used for limbs #define HEAD (1<<0) @@ -162,13 +156,10 @@ DEFINE_BITFIELD(no_equip_flags, list( #define FEMALE_UNIFORM_TOP_ONLY (1<<1) /// For when you don't want the "breast" effect to be applied (the one that cuts two pixels in the middle of the front of the uniform when facing east or west). #define FEMALE_UNIFORM_NO_BREASTS (1<<2) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START /// For when you -don't- want to apply FEMALE_UNIFORM_TOP_ONLY to the digi version (which happens by default). #define FEMALE_UNIFORM_DIGI_FULL (1<<3) // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in #define NORMAL_STYLE 0 @@ -176,15 +167,15 @@ DEFINE_BITFIELD(no_equip_flags, list( #define DIGITIGRADE_STYLE 2 //Flags (actual flags, fucker ^) for /obj/item/var/supports_variations_flags -<<<<<<< HEAD -///No alternative sprites based on bodytype +/// No alternative sprites or handling based on bodytype #define CLOTHING_NO_VARIATION (1<<0) -///Has a sprite for digitigrade legs specifically. +/// Has a sprite for digitigrade legs specifically. #define CLOTHING_DIGITIGRADE_VARIATION (1<<1) -///The sprite works fine for digitigrade legs as-is. +/// The sprite works fine for digitigrade legs as-is. #define CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON (1<<2) -///has a sprite for monkeys -#define CLOTHING_MONKEY_VARIATION (1<<3) +/// Auto-generates the leg portion of the sprite with GAGS +/// Suggested that you set [/obj/item/var/digitigrade_greyscale_config_worn] when using this flag +#define CLOTHING_DIGITIGRADE_MASK (1<<3) // SKYRAT EDIT ADDITION START /// The sprite works fine for snouts. #define CLOTHING_SNOUTED_VARIATION (1<<4) @@ -199,20 +190,8 @@ DEFINE_BITFIELD(no_equip_flags, list( /// The sprite works fine for vox snouts as is. #define CLOTHING_SNOUTED_BETTER_VOX_VARIATION_NO_NEW_ICON (1<<9) // SKYRAT EDIT ADDITION END -======= -/// No alternative sprites or handling based on bodytype -#define CLOTHING_NO_VARIATION (1<<0) -/// Has a sprite for digitigrade legs specifically. -#define CLOTHING_DIGITIGRADE_VARIATION (1<<1) -/// The sprite works fine for digitigrade legs as-is. -#define CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON (1<<2) -/// Auto-generates the leg portion of the sprite with GAGS -/// Suggested that you set [/obj/item/var/digitigrade_greyscale_config_worn] when using this flag -#define CLOTHING_DIGITIGRADE_MASK (1<<3) - /// All variation flags which render "correctly" on a digitigrade leg setup #define DIGITIGRADE_VARIATIONS (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON|CLOTHING_DIGITIGRADE_MASK) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //flags for covering body parts #define GLASSESCOVERSEYES (1<<0) @@ -257,10 +236,7 @@ GLOBAL_LIST_INIT(detective_vest_allowed, list( /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/energy, /obj/item/gun/ballistic/shotgun/automatic/combat/compact, -<<<<<<< HEAD /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) GLOBAL_LIST_INIT(security_vest_allowed, list( @@ -278,10 +254,7 @@ GLOBAL_LIST_INIT(security_vest_allowed, list( /obj/item/storage/belt/holster/energy, /obj/item/gun/ballistic/shotgun/automatic/combat/compact, /obj/item/pen/red/security, -<<<<<<< HEAD /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) GLOBAL_LIST_INIT(security_wintercoat_allowed, list( @@ -294,10 +267,7 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, list( /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/energy, /obj/item/gun/ballistic/shotgun/automatic/combat/compact, -<<<<<<< HEAD /obj/item/gun/microfusion, //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) //Allowed list for all chaplain suits (except the honkmother robe) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 52c7d2f83d1..8846672efe1 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -139,21 +139,6 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list( //Silicon mobs #define issilicon(A) (istype(A, /mob/living/silicon)) -<<<<<<< HEAD -///Define on whether A has access to Silicon stuff either through being a silicon, admin ghost or is a non-silicon holding the Silicon remote. -///This can only be used for instances where you are not specifically looking for silicon, but access. -#define HAS_SILICON_ACCESS(A) (istype(A, /mob/living/silicon) || isAdminGhostAI(A) || A.has_unlimited_silicon_privilege || istype(A.get_active_held_item(), /obj/item/machine_remote)) - -#define isAI(A) (istype(A, /mob/living/silicon/ai)) -///Define on whether A has access to AI stuff either through being a AI, admin ghost, or is a non-silicon holding the Silicon remote -///This can only be used for instances where you are not specifically looking for silicon, but access. -#define HAS_AI_ACCESS(A) (istype(A, /mob/living/silicon/ai) || isAdminGhostAI(A) || istype(A.get_active_held_item(), /obj/item/machine_remote)) - -#define iscyborg(A) (istype(A, /mob/living/silicon/robot)) - -#define ispAI(A) (istype(A, /mob/living/silicon/pai)) - -======= #define isAI(A) (istype(A, /mob/living/silicon/ai)) #define iscyborg(A) (istype(A, /mob/living/silicon/robot)) #define ispAI(A) (istype(A, /mob/living/silicon/pai)) @@ -163,7 +148,6 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list( ///This is used to see if you have the access of an AI. This doesn't mean you are an AI, just have the same access as one. #define HAS_AI_ACCESS(possible_ai) (HAS_TRAIT(possible_ai, TRAIT_AI_ACCESS) || isAdminGhostAI(possible_ai)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // basic mobs #define isbasicmob(A) (istype(A, /mob/living/basic)) diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 64c0351bc5d..f7700da8441 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -63,45 +63,30 @@ #define JOB_SECURITY_OFFICER_ENGINEERING "Security Officer (Engineering)" #define JOB_SECURITY_OFFICER_SCIENCE "Security Officer (Science)" #define JOB_SECURITY_OFFICER_SUPPLY "Security Officer (Cargo)" -<<<<<<< HEAD #define JOB_CORRECTIONS_OFFICER "Corrections Officer" // SKYRAT EDIT ADDITION //Engineering #define JOB_STATION_ENGINEER "Station Engineer" #define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician" #define JOB_ENGINEERING_GUARD "Engineering Guard" // SKYRAT EDIT ADDITION #define JOB_TELECOMMS_SPECIALIST "Telecomms Specialist" // SKYRAT EDIT ADDITION -======= -//Engineering -#define JOB_STATION_ENGINEER "Station Engineer" -#define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Medical #define JOB_CORONER "Coroner" #define JOB_MEDICAL_DOCTOR "Medical Doctor" #define JOB_PARAMEDIC "Paramedic" #define JOB_CHEMIST "Chemist" -<<<<<<< HEAD #define JOB_ORDERLY "Orderly" // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Science #define JOB_SCIENTIST "Scientist" #define JOB_ROBOTICIST "Roboticist" #define JOB_GENETICIST "Geneticist" -<<<<<<< HEAD #define JOB_SCIENCE_GUARD "Science Guard" -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Supply #define JOB_QUARTERMASTER "Quartermaster" #define JOB_CARGO_TECHNICIAN "Cargo Technician" #define JOB_CARGO_GORILLA "Cargo Gorilla" #define JOB_SHAFT_MINER "Shaft Miner" #define JOB_BITRUNNER "Bitrunner" -<<<<<<< HEAD #define JOB_CUSTOMS_AGENT "Customs Agent" // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Service #define JOB_BARTENDER "Bartender" #define JOB_BOTANIST "Botanist" @@ -114,11 +99,8 @@ #define JOB_LAWYER "Lawyer" #define JOB_CHAPLAIN "Chaplain" #define JOB_PSYCHOLOGIST "Psychologist" -<<<<<<< HEAD #define JOB_BARBER "Barber" // SKYRAT EDIT ADDITION #define JOB_BOUNCER "Bouncer" // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //ERTs #define JOB_ERT_DEATHSQUAD "Death Commando" #define JOB_ERT_COMMANDER "Emergency Response Team Commander" @@ -141,7 +123,6 @@ #define JOB_CENTCOM_RESEARCH_OFFICER "Research Officer" #define JOB_CENTCOM_SPECIAL_OFFICER "Special Ops Officer" #define JOB_CENTCOM_PRIVATE_SECURITY "Private Security Force" -<<<<<<< HEAD // SKYRAT EDIT ADDITION START #define JOB_BLUESHIELD "Blueshield" #define JOB_NT_REP "Nanotrasen Consultant" @@ -159,8 +140,6 @@ #define JOB_SOLFED "SolFed" #define JOB_SOLFED_LIASON "SolFed Liason" // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define JOB_GROUP_ENGINEERS list( \ JOB_STATION_ENGINEER, \ @@ -207,7 +186,6 @@ #define JOB_DISPLAY_ORDER_DETECTIVE 37 #define JOB_DISPLAY_ORDER_SECURITY_OFFICER 38 #define JOB_DISPLAY_ORDER_PRISONER 39 -<<<<<<< HEAD #define JOB_DISPLAY_ORDER_SECURITY_MEDIC 100 //SKYRAT EDIT ADDITON #define JOB_DISPLAY_ORDER_CORRECTIONS_OFFICER 101 //SKYRAT EDIT ADDITON #define JOB_DISPLAY_ORDER_NANOTRASEN_CONSULTANT 102 //SKYRAT EDIT ADDITON @@ -219,8 +197,6 @@ #define JOB_DISPLAY_ORDER_CUSTOMS_AGENT 108 //SKYRAT EDIT ADDITION #define JOB_DISPLAY_ORDER_EXP_CORPS 109 //SKYRAT EDIT ADDITON #define JOB_DISPLAY_ORDER_TELECOMMS_SPECIALIST 51 //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define DEPARTMENT_UNASSIGNED "No Department" @@ -244,11 +220,8 @@ #define DEPARTMENT_ASSISTANT "Assistant" #define DEPARTMENT_BITFLAG_CAPTAIN (1<<9) #define DEPARTMENT_CAPTAIN "Captain" -<<<<<<< HEAD #define DEPARTMENT_BITFLAG_CENTRAL_COMMAND (1<<10) //SKYRAT EDIT CHANGE #define DEPARTMENT_CENTRAL_COMMAND "Central Command" //SKYRAT EDIT CHANGE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DEFINE_BITFIELD(departments_bitflags, list( "SECURITY" = DEPARTMENT_BITFLAG_SECURITY, diff --git a/code/__DEFINES/lag_switch.dm b/code/__DEFINES/lag_switch.dm index fdcde76a86d..2152d0d9a55 100644 --- a/code/__DEFINES/lag_switch.dm +++ b/code/__DEFINES/lag_switch.dm @@ -16,13 +16,8 @@ #define DISABLE_PARALLAX 7 /// Disables footsteps, TRAIT_BYPASS_MEASURES exempted #define DISABLE_FOOTSTEPS 8 -<<<<<<< HEAD // SKYRAT EDIT ADDITION /// Stops people from changing things in the character creator. Entirely. #define DISABLE_CREATOR 9 // SKYRAT EDIT END #define MEASURES_AMOUNT 9 // The total number of switches defined above // SKYRAT EDIT ADDITION -======= - -#define MEASURES_AMOUNT 8 // The total number of switches defined above ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 6ae326f6164..82c1f3dfe97 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -132,10 +132,6 @@ // this allows larger then bound floors to layer as we'd expect // ANYTHING on the floor plane needs TOPDOWN_LAYER, and nothing that isn't on the floor plane can have it -<<<<<<< HEAD -//FLOOR_PLANE layers -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // NOTICE: we break from the pattern of increasing in steps of like 0.01 here // Because TOPDOWN_LAYER is 10000 and that's enough to floating point our modifications away #define LOW_FLOOR_LAYER (1 + TOPDOWN_LAYER) @@ -272,10 +268,7 @@ #define CURSE_LAYER 6 #define ECHO_LAYER 7 #define PARRY_LAYER 8 -<<<<<<< HEAD #define CARRIER_LAYER 9 // SKYRAT EDIT - CARRIERS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FOV_EFFECT_LAYER 100 diff --git a/code/__DEFINES/lazy_templates.dm b/code/__DEFINES/lazy_templates.dm index 4f54c72760d..bc1e99e594c 100644 --- a/code/__DEFINES/lazy_templates.dm +++ b/code/__DEFINES/lazy_templates.dm @@ -12,9 +12,5 @@ "Abductor Ships" = LAZY_TEMPLATE_KEY_ABDUCTOR_SHIPS, \ "Heretic Sacrifice Level" = LAZY_TEMPLATE_KEY_HERETIC_SACRIFICE, \ "Voidwalker Void" = LAZY_TEMPLATE_KEY_VOIDWALKER_VOID, \ -<<<<<<< HEAD "Outpost of Cogs" = LAZY_TEMPLATE_KEY_OUTPOST_OF_COGS, \ ) // SKYRAT EDIT ABOVE - OUTPOST OF COGS -======= -) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/lighting.dm b/code/__DEFINES/lighting.dm index 08f6dafc4a0..d6586f390c6 100644 --- a/code/__DEFINES/lighting.dm +++ b/code/__DEFINES/lighting.dm @@ -10,16 +10,6 @@ #define OVERLAY_LIGHT_BEAM 4 /// Nonesensical value for light color, used for null checks. #define NONSENSICAL_VALUE -99999 -<<<<<<< HEAD -======= - -/// Is our overlay light source attached to another movable (its loc), meaning that the lighting component should go one level deeper. -#define LIGHT_ATTACHED (1<<0) -/// Freezes a light in its current state, blocking any attempts at modification -#define LIGHT_FROZEN (1<<1) -/// Does this light ignore inherent offsets? (Pixels, transforms, etc) -#define LIGHT_IGNORE_OFFSET (1<<2) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Is our overlay light source attached to another movable (its loc), meaning that the lighting component should go one level deeper. #define LIGHT_ATTACHED (1<<0) @@ -28,11 +18,8 @@ /// Does this light ignore inherent offsets? (Pixels, transforms, etc) #define LIGHT_IGNORE_OFFSET (1<<2) -<<<<<<< HEAD #define MINIMUM_USEFUL_LIGHT_RANGE 1.5 // SKYRAT EDIT CHANGE - Original value 1.4 -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// light UNDER the floor. primarily used for starlight, shouldn't fuck with this #define LIGHTING_HEIGHT_SPACE -0.5 /// light ON the floor diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 4b36814adf9..a2d66b9d4fc 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -66,13 +66,10 @@ #define AWAY_IMPRINTER (1<<9) /// For wiremod/integrated circuits. Uses various minerals. #define COMPONENT_PRINTER (1<<10) -<<<<<<< HEAD // SKYRAT EDIT ADDITION /// Can be made by the orderable colony fabricator #define COLONY_FABRICATOR (1<<11) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define HYPERTORUS_INACTIVE 0 // No or minimal energy #define HYPERTORUS_NOMINAL 1 // Normal operation diff --git a/code/__DEFINES/melee.dm b/code/__DEFINES/melee.dm index c156f08c55e..55240946de0 100644 --- a/code/__DEFINES/melee.dm +++ b/code/__DEFINES/melee.dm @@ -12,8 +12,4 @@ #define MARTIALART_WRESTLING "wrestling" /// The number of hits required to crit a target -<<<<<<< HEAD #define HITS_TO_CRIT(damage) round(HUMAN_MAXHEALTH / damage, 0.1) // SKYRAT EDIT - changes the magic health number of 100 to HUMAN_MAXHEALTH. -======= -#define HITS_TO_CRIT(damage) round(100 / damage, 0.1) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/mobfactions.dm b/code/__DEFINES/mobfactions.dm index 935b6e78bae..cb934a28f5c 100644 --- a/code/__DEFINES/mobfactions.dm +++ b/code/__DEFINES/mobfactions.dm @@ -33,21 +33,13 @@ #define FACTION_HELL "hell" /// Hivebots #define FACTION_HIVEBOT "hivebot" -<<<<<<< HEAD -/// Illusionary creaturs -======= /// Illusionary creatures ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FACTION_ILLUSION "illusion" /// Creatures of the never finished jungle planet, and gorillas #define FACTION_JUNGLE "jungle" /// Small lizards #define FACTION_LIZARD "lizard" -<<<<<<< HEAD -/// Maint creatures have mutual respect for eachother. -======= /// Maint creatures have mutual respect for each other. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FACTION_MAINT_CREATURES "maint_creatures" /// Animated objects and statues #define FACTION_MIMIC "mimic" diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 8deccd78351..17a51c5b75c 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -15,11 +15,7 @@ //Blood levels #define BLOOD_VOLUME_MAX_LETHAL 2150 #define BLOOD_VOLUME_EXCESS 2100 -<<<<<<< HEAD -#define BLOOD_VOLUME_MAXIMUM 1000 // SKYRAT EDIT - Blood volume balancing (mainly for Hemophages as nobody else really goes much above regular blood volume) - ORIGINAL VALUE: 2000 -======= #define BLOOD_VOLUME_MAXIMUM 2000 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define BLOOD_VOLUME_SLIME_SPLIT 1120 #define BLOOD_VOLUME_NORMAL 560 #define BLOOD_VOLUME_SAFE (BLOOD_VOLUME_NORMAL * (1 - 0.15)) // Latter number is percentage of blood lost, for readability! @@ -93,7 +89,6 @@ #define BODYTYPE_GOLEM (1<<4) //The limb is a peg limb #define BODYTYPE_PEG (1<<5) -<<<<<<< HEAD // SKYRAT EDIT ADDITION ///The limb fits a modular custom shape #define BODYSHAPE_CUSTOM (1<<9) @@ -119,22 +114,6 @@ #define BODYTYPE_BIOSCRAMBLE_INCOMPATIBLE (BODYTYPE_ROBOTIC | BODYTYPE_LARVA_PLACEHOLDER | BODYTYPE_GOLEM | BODYTYPE_PEG) #define BODYTYPE_CAN_BE_BIOSCRAMBLED(bodytype) (!(bodytype & BODYTYPE_BIOSCRAMBLE_INCOMPATIBLE)) -======= - -// Bodyshape defines for how things can be worn, i.e., what "shape" the mob sprite is -///The limb fits the human mold. This is not meant to be literal, if the sprite "fits" on a human, it is "humanoid", regardless of origin. -#define BODYSHAPE_HUMANOID (1<<0) -///The limb fits the monkey mold. -#define BODYSHAPE_MONKEY (1<<1) -///The limb is digitigrade. -#define BODYSHAPE_DIGITIGRADE (1<<2) -///The limb is snouted. -#define BODYSHAPE_SNOUTED (1<<3) - -#define BODYTYPE_BIOSCRAMBLE_INCOMPATIBLE (BODYTYPE_ROBOTIC | BODYTYPE_LARVA_PLACEHOLDER | BODYTYPE_GOLEM | BODYTYPE_PEG) -#define BODYTYPE_CAN_BE_BIOSCRAMBLED(bodytype) (!(bodytype & BODYTYPE_BIOSCRAMBLE_INCOMPATIBLE)) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Defines for Species IDs. Used to refer to the name of a species, for things like bodypart names or species preferences. #define SPECIES_ABDUCTOR "abductor" #define SPECIES_ANDROID "android" @@ -184,14 +163,10 @@ ///The species is forced to have digitigrade legs in generation. #define DIGITIGRADE_FORCED 2 -<<<<<<< HEAD -///Digitigrade's prefs, used in features for legs if you're meant to be a Digitigrade. -======= // Preferences for leg types /// Legs that are normal #define NORMAL_LEGS "Normal Legs" /// Digitgrade legs that are like bended and uhhh no shoes ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define DIGITIGRADE_LEGS "Digitigrade Legs" // Health/damage defines @@ -344,11 +319,7 @@ #define BRUTE_DAMAGE_REQUIRED_TO_STOP_CRYSTALIZATION 30 -<<<<<<< HEAD -#define CRYSTALIZE_STAGE_ENGULFING 100 //Cant use second defines -======= #define CRYSTALIZE_STAGE_ENGULFING 100 //Can't use second defines ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define CRYSTALIZE_STAGE_ENCROACHING 300 //In switches #define CRYSTALIZE_STAGE_SMALL 600 //Because they're not static @@ -470,7 +441,6 @@ #define OFFSET_SUIT "suit" #define OFFSET_NECK "neck" #define OFFSET_HELD "held" -<<<<<<< HEAD #define OFFSET_ACCESSORY "accessory" // Skyrat edit - addition #define OFFSET_HAIR "hair" // Skyrat edit - addition - Akulas @@ -487,19 +457,6 @@ #define POCKET_STRIP_DELAY (4 SECONDS) //time taken to search somebody's pockets #define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you -======= - -//MINOR TWEAKS/MISC -#define AGE_MIN 17 //youngest a character can be -#define AGE_MAX 85 //oldest a character can be -#define AGE_MINOR 20 //legal age of space drinking and smoking -#define WIZARD_AGE_MIN 30 //youngest a wizard can be -#define APPRENTICE_AGE_MIN 29 //youngest an apprentice can be -#define SHOES_SLOWDOWN 0 //How much shoes slow you down by default. Negative values speed you up -#define POCKET_STRIP_DELAY (4 SECONDS) //time taken to search somebody's pockets -#define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define HUNGER_FACTOR 0.05 //factor at which mob nutrition decreases #define ETHEREAL_DISCHARGE_RATE (8e-4 * STANDARD_CELL_CHARGE) // Rate at which ethereal stomach charge decreases /// How much nutrition eating clothes as moth gives and drains @@ -551,27 +508,6 @@ #define RACE_SWAP (1<<3) //Wabbacjack staff projectiles #define WABBAJACK (1<<4) -<<<<<<< HEAD - -// These flags do NOT unlock the Lepton Violet shuttle, hardcoded in wabbajack() - use for things like xenobio, admins, etc. -//Badmin magic mirror -#define MIRROR_BADMIN (1<<5) -//ERT spawn template (avoid races that don't function without correct gear) -#define ERT_SPAWN (1<<6) -//xenobio black crossbreed -#define SLIME_EXTRACT (1<<7) - -// Randomization keys for calling wabbajack with. -// Note the contents of these keys are important, as they're displayed to the player -// Ex: (You turn into a "monkey", You turn into a "xenomorph") -#define WABBAJACK_MONKEY "monkey" -#define WABBAJACK_ROBOT "robot" -#define WABBAJACK_SLIME "slime" -#define WABBAJACK_XENO "xenomorph" -#define WABBAJACK_HUMAN "humanoid" -#define WABBAJACK_ANIMAL "animal" -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // These flags do NOT unlock the Lepton Violet shuttle, hardcoded in wabbajack() - use for things like xenobio, admins, etc. //Badmin magic mirror @@ -756,7 +692,6 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list( /// Total number of layers for mob overlays /// KEEP THIS UP-TO-DATE OR SHIT WILL BREAK /// Also consider updating layers_to_offset -<<<<<<< HEAD #define TOTAL_LAYERS 41 // SKYRAT EDIT CHANGE - ORIGINAL: 35 /// Mutations layer - Tk headglows, cold resistance glow, etc #define MUTATIONS_LAYER 41 // SKYRAT EDIT CHANGE - ORIGINAL: 35 @@ -787,27 +722,6 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list( #define NIPPLES_LAYER 28 #define BANDAGE_LAYER 27 //SKYRAT EDIT ADDITION END -======= -#define TOTAL_LAYERS 35 -/// Mutations layer - Tk headglows, cold resistance glow, etc -#define MUTATIONS_LAYER 35 -/// Mutantrace features (tail when looking south) that must appear behind the body parts -#define BODY_BEHIND_LAYER 34 -/// Layer for bodyparts that should appear behind every other bodypart - Mostly, legs when facing WEST or EAST -#define BODYPARTS_LOW_LAYER 33 -/// Layer for most bodyparts, appears above BODYPARTS_LOW_LAYER and below BODYPARTS_HIGH_LAYER -#define BODYPARTS_LAYER 32 -/// Mutantrace features (snout, body markings) that must appear above the body parts -#define BODY_ADJ_LAYER 31 -/// Underwear, undershirts, socks, eyes, lips(makeup) -#define BODY_LAYER 30 -/// Mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes) -#define FRONT_MUTATIONS_LAYER 29 -/// Damage indicators (cuts and burns) -#define DAMAGE_LAYER 28 -/// Jumpsuit clothing layer -#define UNIFORM_LAYER 27 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// ID card layer #define ID_LAYER 26 /// ID card layer (might be deprecated) @@ -829,11 +743,7 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list( /// Glasses layer #define GLASSES_LAYER 17 /// Belt layer -<<<<<<< HEAD -#define BELT_LAYER 16 //Possible make this an overlay of somethign required to wear a belt? -======= #define BELT_LAYER 16 //Possible make this an overlay of something required to wear a belt? ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Suit storage layer (tucking a gun or baton underneath your armor) #define SUIT_STORE_LAYER 15 /// Neck layer (for wearing capes and bedsheets) @@ -912,7 +822,6 @@ GLOBAL_LIST_INIT(layers_to_offset, list( // WOUND_LAYER (full body) )) -<<<<<<< HEAD //Bitflags for the layers an external organ can draw on (organs can be drawn on multiple layers) /// Draws organ on the BODY_FRONT_LAYER #define EXTERNAL_FRONT (1 << 1) @@ -928,15 +837,6 @@ GLOBAL_LIST_INIT(layers_to_offset, list( /// Draws organ on the HEAD_LAYER, for things that need to be above hair but below hats. #define EXTERNAL_FRONT_ABOVE_HAIR (1 << 6) // SKYRAT EDIT END (not touching what comes next because we don't actually have to (nor want to)) -======= -//Bitflags for the layers a bodypart overlay can draw on (can be drawn on multiple layers) -/// Draws overlay on the BODY_FRONT_LAYER -#define EXTERNAL_FRONT (1 << 0) -/// Draws overlay on the BODY_ADJ_LAYER -#define EXTERNAL_ADJACENT (1 << 1) -/// Draws overlay on the BODY_BEHIND_LAYER -#define EXTERNAL_BEHIND (1 << 2) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Draws organ on all EXTERNAL layers #define ALL_EXTERNAL_OVERLAYS EXTERNAL_FRONT | EXTERNAL_ADJACENT | EXTERNAL_BEHIND @@ -982,11 +882,7 @@ GLOBAL_LIST_INIT(layers_to_offset, list( #define NEED_VENTCRAWL (1<<8) /// Skips adjacency checks #define BYPASS_ADJACENCY (1<<9) -<<<<<<< HEAD -/// Skips reccursive loc checks -======= /// Skips recursive loc checks ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define NOT_INSIDE_TARGET (1<<10) /// Checks for base adjacency, but silences the error #define SILENT_ADJACENCY (1<<11) @@ -1118,11 +1014,8 @@ GLOBAL_LIST_INIT(layers_to_offset, list( /// The duration of the flip emote animation #define FLIP_EMOTE_DURATION 0.7 SECONDS -<<<<<<< HEAD -======= ///The duration of a taunt emote, so how long they can deflect projectiles #define TAUNT_EMOTE_DURATION 0.9 SECONDS ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Sprites for photocopying butts #define BUTT_SPRITE_HUMAN_MALE "human_male" diff --git a/code/__DEFINES/pai.dm b/code/__DEFINES/pai.dm index 8d642b95676..356cbc28843 100644 --- a/code/__DEFINES/pai.dm +++ b/code/__DEFINES/pai.dm @@ -12,11 +12,7 @@ #define PAI_SPAM_TIME (40 SECONDS) /// Maximum distance you can set the holoform leash -<<<<<<< HEAD #define HOLOFORM_MAX_RANGE 25 // SKYRAT EDIT CHANGE - ORIGINAL: #define HOLOFORM_MAX_RANGE 9 -======= -#define HOLOFORM_MAX_RANGE 9 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Minimum distance you can set the holoform leash #define HOLOFORM_MIN_RANGE 3 /// Default holoform leash distance diff --git a/code/__DEFINES/paper.dm b/code/__DEFINES/paper.dm index 68485721601..9cede4214bd 100644 --- a/code/__DEFINES/paper.dm +++ b/code/__DEFINES/paper.dm @@ -18,8 +18,6 @@ #define BARCODE_SCANNER_INVENTORY "inventory" #define IS_WRITING_UTENSIL(thing) (thing?.get_writing_implement_details()?["interaction_mode"] == MODE_WRITING) -<<<<<<< HEAD -======= /** * key defines used when converting a paper to and fro' a data/json list. It's really important that they stay the same @@ -46,4 +44,3 @@ #define LIST_PAPER_STAMP_X "x" #define LIST_PAPER_STAMP_Y "y" #define LIST_PAPER_ROTATION "rotation" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 02cb99106c5..c85b2519869 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -60,10 +60,7 @@ // Playtime tracking system, see jobs_exp.dm #define EXP_TYPE_LIVING "Living" #define EXP_TYPE_CREW "Crew" -<<<<<<< HEAD #define EXP_TYPE_CENTRAL_COMMAND "Central Command" // SKYRAT EDIT ADD -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define EXP_TYPE_COMMAND "Command" #define EXP_TYPE_ENGINEERING "Engineering" #define EXP_TYPE_MEDICAL "Medical" diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm index 13221b53910..44e4417a209 100644 --- a/code/__DEFINES/radio.dm +++ b/code/__DEFINES/radio.dm @@ -77,10 +77,7 @@ #define FREQ_MEDICAL 1355 // Medical comms frequency, soft blue #define FREQ_ENGINEERING 1357 // Engineering comms frequency, orange #define FREQ_SECURITY 1359 // Security comms frequency, red -<<<<<<< HEAD -======= #define FREQ_ENTERTAINMENT 1415 // Used by entertainment monitors, cyan ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FREQ_HOLOGRID_SOLUTION 1433 #define FREQ_STATUS_DISPLAYS 1435 @@ -138,8 +135,6 @@ #define RADIO_FREQENCY_LOCKED 1 /// Radio frequency is locked and unchangeable, but can be unlocked by an emag #define RADIO_FREQENCY_EMAGGABLE_LOCK 2 -<<<<<<< HEAD -======= ///Bitflag for if a headset can use the syndicate radio channel #define RADIO_SPECIAL_SYNDIE (1<<0) @@ -147,4 +142,3 @@ #define RADIO_SPECIAL_CENTCOM (1<<1) ///Bitflag for if a headset can use the binary radio channel #define RADIO_SPECIAL_BINARY (1<<2) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 2b779630b81..2414ff046b2 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -142,19 +142,11 @@ #define MAX_ADDICTION_POINTS 1000 ///Addiction start/ends -<<<<<<< HEAD #define WITHDRAWAL_STAGE1_START_CYCLE 121 // SKYRAT EDIT CHANGE - Original 61 #define WITHDRAWAL_STAGE1_END_CYCLE 240 // SKYRAT EDIT CHANGE - Original 120 #define WITHDRAWAL_STAGE2_START_CYCLE 241 // SKYRAT EDIT CHANGE - Original 121 #define WITHDRAWAL_STAGE2_END_CYCLE 360 // SKYRAT EDIT CHANGE - Original 180 #define WITHDRAWAL_STAGE3_START_CYCLE 361 // SKYRAT EDIT CHANGE - Original 181 -======= -#define WITHDRAWAL_STAGE1_START_CYCLE 61 -#define WITHDRAWAL_STAGE1_END_CYCLE 120 -#define WITHDRAWAL_STAGE2_START_CYCLE 121 -#define WITHDRAWAL_STAGE2_END_CYCLE 180 -#define WITHDRAWAL_STAGE3_START_CYCLE 181 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///reagent tags - used to look up reagents for specific effects. Feel free to add to but comment it /// This reagent does brute effects (BOTH damaging and healing) @@ -223,11 +215,7 @@ #define GOLDSCHLAGER_GOLD_RATIO (GOLDSCHLAGER_GOLD/(GOLDSCHLAGER_VODKA+GOLDSCHLAGER_GOLD)) /// The rate at which alcohol affects the drinker -<<<<<<< HEAD #define ALCOHOL_RATE 0.0025 // SKYRAT EDIT CHANGE - ALCOHOL_PROCESSING - ORIGINAL: 0.005 -======= -#define ALCOHOL_RATE 0.005 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define BLASTOFF_DANCE_MOVE_CHANCE_PER_UNIT 3 #define BLASTOFF_DANCE_MOVES_PER_SUPER_MOVE 3 diff --git a/code/__DEFINES/research/anomalies.dm b/code/__DEFINES/research/anomalies.dm index bb1d379ad6d..209a539ac7e 100644 --- a/code/__DEFINES/research/anomalies.dm +++ b/code/__DEFINES/research/anomalies.dm @@ -43,12 +43,9 @@ GLOBAL_LIST_INIT(bioscrambler_organs_blacklist, typecacheof(list ( /obj/item/organ/internal/tongue/dullahan, /obj/item/organ/internal/vocal_cords/colossus, /obj/item/organ/internal/zombie_infection, -<<<<<<< HEAD /obj/item/organ/internal/empowered_borer_egg, // SKYRAT EDIT ADDITION /obj/item/organ/internal/eyes/robotic, // SKYRAT EDIT ADDITION /obj/item/organ/internal/eyes/night_vision/cyber, // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ))) /// List of body parts we can apply to people diff --git a/code/__DEFINES/robots.dm b/code/__DEFINES/robots.dm index ec280d42c33..f135635b185 100644 --- a/code/__DEFINES/robots.dm +++ b/code/__DEFINES/robots.dm @@ -55,7 +55,6 @@ ///Third Borg module slot. #define BORG_CHOOSE_MODULE_THREE 3 -<<<<<<< HEAD // SKYRAT EDIT START - TODO - Move this upstream later /// To store all the different cyborg models, instead of creating that for each cyborg. GLOBAL_LIST_EMPTY(cyborg_model_list) @@ -65,8 +64,6 @@ GLOBAL_LIST_EMPTY(cyborg_base_models_icon_list) GLOBAL_LIST_EMPTY(cyborg_all_models_icon_list) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SKIN_ICON "skin_icon" #define SKIN_ICON_STATE "skin_icon_state" #define SKIN_PIXEL_X "skin_pixel_x" diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index ba380c965e6..72f04b66869 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -17,13 +17,10 @@ #define ROLE_TRAITOR "Traitor" #define ROLE_WIZARD "Wizard" #define ROLE_SPY "Spy" -<<<<<<< HEAD // SKYRAT EDIT START #define ROLE_ASSAULT_OPERATIVE "Assault Operative" #define ROLE_OPFOR_CANDIDATE "OPFOR Candidate" // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Midround roles #define ROLE_ABDUCTOR "Abductor" @@ -44,15 +41,12 @@ #define ROLE_SPACE_DRAGON "Space Dragon" #define ROLE_SPIDER "Spider" #define ROLE_WIZARD_MIDROUND "Wizard (Midround)" -<<<<<<< HEAD //SKYRAT EDIT START #define ROLE_BORER "Borer" #define ROLE_LONE_INFILTRATOR "Lone Infiltrator" #define ROLE_MUTANT "Mutated Abomination" #define ROLE_CLOCK_CULTIST "Clock Cultist" // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define ROLE_VOIDWALKER "Voidwalker" // Latejoin roles @@ -133,7 +127,6 @@ #define ROLE_CYBER_POLICE "Cyber Police" #define ROLE_CYBER_TAC "Cyber Tac" #define ROLE_NETGUARDIAN "NetGuardian Prime" -<<<<<<< HEAD //SKYRAT EDIT START - Skyrat roles #define ROLE_BLACK_MARKET_DEALER "Black Market Dealer" #define ROLE_DS2 "DS2 Syndicate" @@ -141,8 +134,6 @@ #define ROLE_GHOST_CAFE "Ghost Cafe Visitor" #define ROLE_PORT_TARKON "Port Tarkon Survivor" //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// This defines the antagonists you can operate with in the settings. /// Keys are the antagonist, values are the number of days since the player's @@ -160,12 +151,9 @@ GLOBAL_LIST_INIT(special_roles, list( ROLE_TRAITOR = 0, ROLE_WIZARD = 14, ROLE_SPY = 0, -<<<<<<< HEAD // SKYRAT EDIT ADDITION ROLE_ASSAULT_OPERATIVE = 14, // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Midround ROLE_ABDUCTOR = 0, @@ -186,14 +174,11 @@ GLOBAL_LIST_INIT(special_roles, list( ROLE_SPACE_DRAGON = 0, ROLE_SPIDER = 0, ROLE_WIZARD_MIDROUND = 14, -<<<<<<< HEAD //SKYRAT EDIT START ROLE_LONE_INFILTRATOR = 0, ROLE_BORER = 0, ROLE_MUTANT = 0, //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ROLE_VOIDWALKER = 0, // Latejoin diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index cba857beed1..86432d25ecb 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -105,11 +105,7 @@ #define FOLLOW_OR_TURF_LINK(alice, bob, turfy) "(F)" //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam -<<<<<<< HEAD #define MAX_MESSAGE_LEN 2048 //SKYRAT EDIT CHANGE - ORIGINAL 1024 - I SAID DOUBLE IT!! FUCK THE WARNING! -======= -#define MAX_MESSAGE_LEN 1024 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MAX_NAME_LEN 42 #define MAX_BROADCAST_LEN 512 #define MAX_CHARTER_LEN 80 diff --git a/code/__DEFINES/sight.dm b/code/__DEFINES/sight.dm index 57a8b07c7c3..5a3e0d17ef3 100644 --- a/code/__DEFINES/sight.dm +++ b/code/__DEFINES/sight.dm @@ -56,19 +56,6 @@ /// NOTE: this does not function with the SIDE_MAP map format. So we can't. :( //#define SEE_BLACKNESS (1<<10) -<<<<<<< HEAD -/// Bitfield of sight flags that show things "inside" the blackness plane -/// We've gotta alpha it down if we get this, cause otherwise the sight flag won't work -#define BLACKNESS_CUTTING (SEE_MOBS|SEE_OBJS|SEE_TURFS|SEE_TURFS|SEE_TURFS) - -/// Range at which blindness effects treat nearsightedness as blind and play -#define NEARSIGHTNESS_BLINDNESS 2 - -/// Range in tiles that a mob can see in the dark (used to determine if a mob has night_vision) -#define NIGHTVISION_RANGE 8 - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Bitfield of sight flags that show THINGS but no lighting /// Since lighting is an underlay on turfs, this is everything but that #define SEE_AVOID_TURF_BLACKNESS (SEE_MOBS|SEE_OBJS) diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 034bc9a5e11..5e506b44622 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -16,14 +16,11 @@ #define MAX_INSTRUMENT_CHANNELS (128 * 6) -<<<<<<< HEAD // SKYRAT EDIT START - JUKEBOX #define CHANNEL_JUKEBOX_START 1006 #define CHANNEL_HEV 1005 //SKYRAT EDIT CHANGE END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Default range of a sound. #define SOUND_RANGE 17 #define MEDIUM_RANGE_SOUND_EXTRARANGE -5 @@ -125,7 +122,6 @@ #define ANNOUNCER_SHUTTLERECALLED "announcer_shuttlerecalled" #define ANNOUNCER_SPANOMALIES "announcer_spanomalies" -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN #define ANNOUNCER_SHUTTLELEFT "announcer_shuttleleft" #define ANNOUNCER_CARP "announcer_carp" @@ -157,8 +153,6 @@ //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Global list of all of our announcer keys. GLOBAL_LIST_INIT(announcer_keys, list( ANNOUNCER_AIMALF, @@ -177,7 +171,6 @@ GLOBAL_LIST_INIT(announcer_keys, list( ANNOUNCER_SHUTTLEDOCK, ANNOUNCER_SHUTTLERECALLED, ANNOUNCER_SPANOMALIES, -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN ANNOUNCER_SHUTTLELEFT, ANNOUNCER_CARP, @@ -204,8 +197,6 @@ GLOBAL_LIST_INIT(announcer_keys, list( ANNOUNCER_NRI_RAIDERS, ANNOUNCER_OUTBREAK6, //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /// List of all of our sound keys. @@ -251,10 +242,7 @@ GLOBAL_LIST_INIT(announcer_keys, list( #define SFX_KEYBOARD_CLICKS "keyboard_clicks" #define SFX_STONE_DROP "stone_drop" #define SFX_STONE_PICKUP "stone_pickup" -<<<<<<< HEAD -======= #define SFX_MUFFLED_SPEECH "muffspeech" #define SFX_DEFAULT_FISH_SLAP "default_fish_slap" #define SFX_ALT_FISH_SLAP "alt_fish_slap" #define SFX_FISH_PICKUP "fish_pickup" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/spacevines.dm b/code/__DEFINES/spacevines.dm index 082c6401481..eca0975c262 100644 --- a/code/__DEFINES/spacevines.dm +++ b/code/__DEFINES/spacevines.dm @@ -27,17 +27,10 @@ #define SEVERITY_MAJOR 10 /// Kudzu mutativeness is based on a scale factor * potency -<<<<<<< HEAD -#define MUTATIVENESS_SCALE_FACTOR 0.1 // SKYRAT EDIT CHANGE - Original: 0.2 - -/// Kudzu maximum mutation severity is a linear function of potency -#define MAX_SEVERITY_LINEAR_COEFF 0.1 // SKYRAT EDIT CHANGE - Original: 0.15 -======= #define MUTATIVENESS_SCALE_FACTOR 0.2 /// Kudzu maximum mutation severity is a linear function of potency #define MAX_SEVERITY_LINEAR_COEFF 0.15 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MAX_SEVERITY_CONSTANT_TERM 10 /// Additional maximum mutation severity given to kudzu spawned by a random event diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm index 36c3438e784..259a13e1e9a 100644 --- a/code/__DEFINES/span.dm +++ b/code/__DEFINES/span.dm @@ -48,10 +48,7 @@ #define span_drone(str) ("" + str + "") #define span_engradio(str) ("" + str + "") #define span_extremelybig(str) ("" + str + "") -<<<<<<< HEAD -======= #define span_enteradio(str) ("" + str + "") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define span_game_say(str) ("" + str + "") #define span_ghostalert(str) ("" + str + "") #define span_green(str) ("" + str + "") diff --git a/code/__DEFINES/species_clothing_paths.dm b/code/__DEFINES/species_clothing_paths.dm index 17148efcc80..be95aa3a3b0 100644 --- a/code/__DEFINES/species_clothing_paths.dm +++ b/code/__DEFINES/species_clothing_paths.dm @@ -8,16 +8,8 @@ //DIGITIGRADE PATHS ///The dmi containing digitigrade uniforms -<<<<<<< HEAD #define DIGITIGRADE_UNIFORM_FILE 'modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi' // SKYRAT EDIT CHANGE ///The dmi containing digitigrade shoes #define DIGITIGRADE_SHOES_FILE 'modular_skyrat/master_files/icons/mob/clothing/feet_digi.dmi' // SKYRAT EDIT CHANGE ///The dmi containing digitigrade oversuits #define DIGITIGRADE_SUIT_FILE 'modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi' // SKYRAT EDIT CHANGE -======= -#define DIGITIGRADE_UNIFORM_FILE 'icons/mob/human/species/misc/digitigrade.dmi' -///The dmi containing digitigrade shoes -#define DIGITIGRADE_SHOES_FILE 'icons/mob/human/species/misc/digitigrade_shoes.dmi' -///The dmi containing digitigrade oversuits -#define DIGITIGRADE_SUIT_FILE 'icons/mob/human/species/misc/digitigrade_suits.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index 889fa06429c..ead7764d605 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -24,15 +24,6 @@ #define CURSE_GRASPING (1<<3) //Incapacitated status effect flags -<<<<<<< HEAD -/// If the incapacitated status effect will ignore a mob in restraints (handcuffs) -#define IGNORE_RESTRAINTS (1<<0) -/// If the incapacitated status effect will ignore a mob in stasis (stasis beds) -#define IGNORE_STASIS (1<<1) -/// If the incapacitated status effect will ignore a mob being agressively grabbed -#define IGNORE_GRAB (1<<2) - -======= /// If the mob is normal incapacitated. Should never need this, just avoids issues if we ever overexpand this #define TRADITIONAL_INCAPACITATED (1<<0) /// If the incapacitated status effect is being caused by restraints (handcuffs) @@ -46,7 +37,6 @@ /// Does this by inverting the passed in flags and seeing if we're still incapacitated #define INCAPACITATED_IGNORING(mob, flags) (mob.incapacitated & ~(flags)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Maxamounts of fire stacks a mob can get #define MAX_FIRE_STACKS 20 /// If a mob has a higher threshold than this, the icon shown will be increased to the big fire icon. diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 0757bd3f226..82896f4da4e 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -20,11 +20,7 @@ * * make sure you add an update to the schema_version stable in the db changelog */ -<<<<<<< HEAD #define DB_MINOR_VERSION 30 -======= -#define DB_MINOR_VERSION 27 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //! ## Timing subsystem @@ -43,11 +39,7 @@ * Timing should be based on how timing progresses on clients, not the server. * * Tracking this is more expensive, -<<<<<<< HEAD - * should only be used in conjuction with things that have to progress client side, such as -======= * should only be used in conjunction with things that have to progress client side, such as ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * animate() or sound() */ #define TIMER_CLIENT_TIME (1<<2) @@ -89,17 +81,10 @@ ///Nothing happens #define INITIALIZE_HINT_NORMAL 0 /** -<<<<<<< HEAD - * call LateInitialize at the end of all atom Initalization - * - * The item will be added to the late_loaders list, this is iterated over after - * initalization of subsystems is complete and calls LateInitalize on the atom -======= * call LateInitialize at the end of all atom Initialization * * The item will be added to the late_loaders list, this is iterated over after * initialization of subsystems is complete and calls LateInitalize on the atom ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * see [this file for the LateIntialize proc](atom.html#proc/LateInitialize) */ #define INITIALIZE_HINT_LATELOAD 1 @@ -121,39 +106,23 @@ //! ### SS initialization hints /** -<<<<<<< HEAD - * Negative values incidate a failure or warning of some kind, positive are good. - * 0 and 1 are unused so that TRUE and FALSE are guarenteed to be invalid values. -======= * Negative values indicate a failure or warning of some kind, positive are good. * 0 and 1 are unused so that TRUE and FALSE are guaranteed to be invalid values. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ /// Subsystem failed to initialize entirely. Print a warning, log, and disable firing. #define SS_INIT_FAILURE -2 -<<<<<<< HEAD -/// The default return value which must be overriden. Will succeed with a warning. -#define SS_INIT_NONE -1 - -/// Subsystem initialized sucessfully. -======= /// The default return value which must be overridden. Will succeed with a warning. #define SS_INIT_NONE -1 /// Subsystem initialized successfully. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SS_INIT_SUCCESS 2 /// If your system doesn't need to be initialized (by being disabled or something) #define SS_INIT_NO_NEED 3 -<<<<<<< HEAD -/// Succesfully initialized, BUT do not announce it to players (generally to hide game mechanics it would otherwise spoil) -======= /// Successfully initialized, BUT do not announce it to players (generally to hide game mechanics it would otherwise spoil) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SS_INIT_NO_MESSAGE 4 //! ### SS initialization load orders @@ -167,14 +136,9 @@ #define INIT_ORDER_DBCORE 95 #define INIT_ORDER_BLACKBOX 94 #define INIT_ORDER_SERVER_MAINT 93 -<<<<<<< HEAD #define INIT_ORDER_PLAYER_RANKS 86 // SKYRAT EDIT - Player Ranks Subsystem #define INIT_ORDER_INPUT 85 #define INIT_ORDER_ADMIN_VERBS 84 // needs to be pretty high, admins cant do much without it -======= -#define INIT_ORDER_INPUT 85 -#define INIT_ORDER_ADMIN_VERBS 84 // needs to be pretty high, admins can't do much without it ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define INIT_ORDER_SOUNDS 83 #define INIT_ORDER_INSTRUMENTS 82 #define INIT_ORDER_GREYSCALE 81 @@ -192,10 +156,7 @@ #define INIT_ORDER_AI_CONTROLLERS 55 //So the controller can get the ref #define INIT_ORDER_TICKER 55 #define INIT_ORDER_TCG 55 -<<<<<<< HEAD #define INIT_ORDER_AUTOMAPPER 51 // SKYRAT EDIT ADDITION - We need to load just before mapping. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define INIT_ORDER_MAPPING 50 #define INIT_ORDER_AI_IDLE_CONTROLLERS 50 #define INIT_ORDER_EARLY_ASSETS 48 @@ -206,13 +167,9 @@ #define INIT_ORDER_OUTPUTS 35 #define INIT_ORDER_RESTAURANT 34 #define INIT_ORDER_TTS 33 -<<<<<<< HEAD #define INIT_ORDER_POLLUTION 32 //SKYRAT EDIT ADDITION - //Needs to be above atoms #define INIT_ORDER_ATOMS 30 #define INIT_ORDER_ARMAMENTS 27 // SKYRAT EDIT ADDITION - Needs to be between atoms and default so it runs before gun companies -======= -#define INIT_ORDER_ATOMS 30 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define INIT_ORDER_LANGUAGE 25 #define INIT_ORDER_MACHINES 20 #define INIT_ORDER_SKILLS 15 @@ -232,12 +189,9 @@ #define INIT_ORDER_SHUTTLE -21 #define INIT_ORDER_MINOR_MAPPING -40 #define INIT_ORDER_PATH -50 -<<<<<<< HEAD #define INIT_ORDER_MATURITY_GUARD -60 //SKYRAT EDIT ADDITION #define INIT_ORDER_DECAY -61 //SKYRAT EDIT ADDITION #define INIT_ORDER_POWERATOR_PENALITY -62 // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define INIT_ORDER_EXPLOSIONS -69 #define INIT_ORDER_STATPANELS -97 #define INIT_ORDER_BAN_CACHE -98 diff --git a/code/__DEFINES/surgery.dm b/code/__DEFINES/surgery.dm index 07e1ffcb858..ef40501d995 100644 --- a/code/__DEFINES/surgery.dm +++ b/code/__DEFINES/surgery.dm @@ -28,10 +28,6 @@ #define ORGAN_VIRGIN (1<<10) /// ALWAYS show this when scanned by advanced scanners, even if it is totally healthy #define ORGAN_PROMINENT (1<<11) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Helper to figure out if a limb is organic #define IS_ORGANIC_LIMB(limb) (limb.bodytype & BODYTYPE_ORGANIC) /// Helper to figure out if a limb is robotic @@ -71,11 +67,7 @@ /// All head flags, default for most heads #define HEAD_ALL_FEATURES (HEAD_HAIR|HEAD_FACIAL_HAIR|HEAD_LIPS|HEAD_EYESPRITES|HEAD_EYECOLOR|HEAD_EYEHOLES|HEAD_DEBRAIN) -<<<<<<< HEAD -/// When the surgery step fails :( -======= /// Return value when the surgery step fails :( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SURGERY_STEP_FAIL -1 // Flags for surgery_flags on surgery datums diff --git a/code/__DEFINES/text.dm b/code/__DEFINES/text.dm index 42574992f97..12409962379 100644 --- a/code/__DEFINES/text.dm +++ b/code/__DEFINES/text.dm @@ -94,13 +94,10 @@ #define FLESH_SCAR_FILE "wounds/flesh_scar_desc.json" /// File location for bone wound descriptions #define BONE_SCAR_FILE "wounds/bone_scar_desc.json" -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - SYNTH WOUNDS /// File location for metalic wound descriptions -#define METAL_SCAR_FILE "wounds/metal_scar_desc.json" +#define METAL_SCAR_FILE "wounds/metal_scar_desc.json" // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// File location for scar wound descriptions #define SCAR_LOC_FILE "wounds/scar_loc.json" /// File location for exodrone descriptions diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index f4416fb65bf..42f2d5fc31f 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,11 +1,7 @@ // tgstation-server DMAPI // The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in IETF RFC 2119. -<<<<<<< HEAD -#define TGS_DMAPI_VERSION "7.2.1" -======= #define TGS_DMAPI_VERSION "7.3.0" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // All functions and datums outside this document are subject to change with any version and should not be relied on. diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index 2b27ff263e7..3b1193247de 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -24,11 +24,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_PULL_BLOCKED "pullblocked" /// Abstract condition that prevents movement if being pulled and might be resisted against. Handcuffs and straight jackets, basically. #define TRAIT_RESTRAINED "restrained" -<<<<<<< HEAD -/// Apply this to make a mob not dense, and remove it when you want it to no longer make them undense, other sorces of undesity will still apply. Always define a unique source when adding a new instance of this! -======= /// Apply this to make a mob not dense, and remove it when you want it to no longer make them undense, other sources of undesity will still apply. Always define a unique source when adding a new instance of this! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_UNDENSE "undense" /// Expands our FOV by 30 degrees if restricted #define TRAIT_EXPANDED_FOV "expanded_fov" @@ -54,11 +50,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_DEAF "deaf" #define TRAIT_FAT "fat" #define TRAIT_HUSK "husk" -<<<<<<< HEAD -///Blacklisted from being revived via defibrilator -======= ///Blacklisted from being revived via defibrillator ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_DEFIB_BLACKLISTED "defib_blacklisted" #define TRAIT_BADDNA "baddna" #define TRAIT_CLUMSY "clumsy" @@ -177,11 +169,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_NO_ZOMBIFY "no_zombify" /// Carbons with this trait can't have their DNA copied by diseases nor changelings #define TRAIT_NO_DNA_COPY "no_dna_copy" -<<<<<<< HEAD -/// Carbons with this trait cant have their dna scrambled by genetics or a disease retrovirus. -======= /// Carbons with this trait can't have their DNA scrambled by genetics or a disease retrovirus. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_NO_DNA_SCRAMBLE "no_dna_scramble" /// Carbons with this trait can eat blood to regenerate their own blood volume, instead of injecting it #define TRAIT_DRINKS_BLOOD "drinks_blood" @@ -245,11 +233,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_FISHING_SPOT "fishing_spot" ///Trait given to mobs that can fish without a rod #define TRAIT_PROFOUND_FISHER "profound_fisher" -<<<<<<< HEAD -======= /// If an atom has this trait, then you can toss a bottle with a message in it. #define TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION "message_in_a_bottle_location" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// This trait lets you evaluate someone's fitness level against your own #define TRAIT_EXAMINE_FITNESS "reveal_power_level" /// These mobs have particularly hygienic tongues @@ -270,11 +255,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Stop the mob from sliding around from being slipped, but not the slip part. /// DOES NOT include ice slips. #define TRAIT_NO_SLIP_SLIDE "noslip_slide" -<<<<<<< HEAD -/// Stops all slipping and sliding from ocurring -======= /// Stops all slipping and sliding from occurring ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_NO_SLIP_ALL "noslip_all" /// Unlinks gliding from movement speed, meaning that there will be a delay between movements rather than a single move movement between tiles @@ -383,25 +364,14 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_GUNFLIP "gunflip" /// Increases chance of getting special traumas, makes them harder to cure #define TRAIT_SPECIAL_TRAUMA_BOOST "special_trauma_boost" -<<<<<<< HEAD -/// Doubles the duration and cooldown of a flip -#define TRAIT_SLOW_FLIP "slow_flip" -#define TRAIT_SPACEWALK "spacewalk" -/// Sanity trait to keep track of when we're in hyperspace and add the appropriate element if we werent -======= #define TRAIT_SPACEWALK "spacewalk" /// Sanity trait to keep track of when we're in hyperspace and add the appropriate element if we weren't ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_HYPERSPACED "hyperspaced" ///Gives the movable free hyperspace movement without being pulled during shuttle transit #define TRAIT_FREE_HYPERSPACE_MOVEMENT "free_hyperspace_movement" ///Lets the movable move freely in the soft-cordon area of transit space, which would otherwise teleport them away just before they got to see the true cordon #define TRAIT_FREE_HYPERSPACE_SOFTCORDON_MOVEMENT "free_hyperspace_softcordon_movement" -<<<<<<< HEAD -///Deletes the object upon being dumped into space, usually from exiting hyperspace. Useful if you're spawning in a lot of stuff for hyperspace events that dont need to flood the entire game -======= ///Deletes the object upon being dumped into space, usually from exiting hyperspace. Useful if you're spawning in a lot of stuff for hyperspace events that don't need to flood the entire game ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_DEL_ON_SPACE_DUMP "del_on_hyperspace_leave" /// We can walk up or around cliffs, or at least we don't fall off of it #define TRAIT_CLIFF_WALKER "cliff_walker" @@ -468,11 +438,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_BLOODSHOT_EYES "bloodshot_eyes" /// This mob should never close UI even if it doesn't have a client #define TRAIT_PRESERVE_UI_WITHOUT_CLIENT "preserve_ui_without_client" -<<<<<<< HEAD -/// This mob overrides certian SSlag_switch measures with this special trait -======= /// This mob overrides certain SSlag_switch measures with this special trait ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TRAIT_BYPASS_MEASURES "bypass_lagswitch_measures" /// Someone can safely be attacked with honorbound with ONLY a combat mode check, the trait is assuring holding a weapon and hitting won't hurt them.. #define TRAIT_ALLOWED_HONORBOUND_ATTACK "allowed_honorbound_attack" @@ -568,12 +534,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Mobs with this trait cannot be hit by projectiles, meaning the projectiles will just go through. #define TRAIT_UNHITTABLE_BY_PROJECTILES "unhittable_by_projectiles" -<<<<<<< HEAD -/// Projectile with this trait will always hit the defined zone of a struck living mob. -#define TRAIT_ALWAYS_HIT_ZONE "always_hit_zone" - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Mobs with this trait do care about a few grisly things, such as digging up graves. They also really do not like bringing people back to life or tending wounds, but love autopsies and amputations. #define TRAIT_MORBID "morbid" @@ -714,11 +674,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// This movable atom has the explosive block element #define TRAIT_BLOCKING_EXPLOSIVES "blocking_explosives" -<<<<<<< HEAD -======= ///This mob is currently blocking a projectile. #define TRAIT_BLOCKING_PROJECTILES "blocking_projectiles" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Lava will be safe to cross while it has this trait. #define TRAIT_LAVA_STOPPED "lava_stopped" ///Chasms will be safe to cross while they've this trait. @@ -785,29 +742,20 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_FOOD_SILVER "food_silver" /// If this item's been made by a chef instead of being map-spawned or admin-spawned or such #define TRAIT_FOOD_CHEF_MADE "food_made_by_chef" -<<<<<<< HEAD -======= /// This atom has a quality_food_ingredient element attached #define TRAIT_QUALITY_FOOD_INGREDIENT "quality_food_ingredient" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The items needs two hands to be carried #define TRAIT_NEEDS_TWO_HANDS "needstwohands" /// Can't be catched when thrown #define TRAIT_UNCATCHABLE "uncatchable" -<<<<<<< HEAD -======= /// You won't catch duds while fishing with this rod. #define TRAIT_ROD_REMOVE_FISHING_DUD "rod_remove_fishing_dud" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Stuff that can go inside fish cases #define TRAIT_FISH_CASE_COMPATIBILE "fish_case_compatibile" /// If the item can be used as a bit. #define TRAIT_FISHING_BAIT "fishing_bait" -<<<<<<< HEAD -======= /// This bait will kill any fish that doesn't have it on its favorite_bait list #define TRAIT_POISONOUS_BAIT "poisonous_bait" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The quality of the bait. It influences odds of catching fish #define TRAIT_BASIC_QUALITY_BAIT "baic_quality_bait" #define TRAIT_GOOD_QUALITY_BAIT "good_quality_bait" @@ -815,9 +763,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Baits with this trait will ignore bait preferences and related fish traits. #define TRAIT_OMNI_BAIT "omni_bait" /// The bait won't be consumed when used -<<<<<<< HEAD -#define TRAIT_BAIT_UNCONSUMABLE "bait_unconsumabe" -======= #define TRAIT_BAIT_UNCONSUMABLE "bait_unconsumable" /// This bait ignores environmental conditions for fishing (like low light for nocturnal fish) #define TRAIT_BAIT_IGNORE_ENVIRONMENT "bait_ignore_environment" @@ -826,7 +771,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai * instead, it'll allow the fishing dud to be there unless there's at least one fish that likes the bait */ #define TRAIT_BAIT_ALLOW_FISHING_DUD "bait_dont_affect_fishing_dud" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Plants that were mutated as a result of passive instability, not a mutation threshold. #define TRAIT_PLANT_WILDMUTATE "wildmutation" /// If you hit an APC with exposed internals with this item it will try to shock you @@ -1020,8 +964,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_FISH_FROM_CASE "fish_from_case" ///Fish will also occasionally fire weak tesla zaps #define TRAIT_FISH_ELECTROGENESIS "fish_electrogenesis" -<<<<<<< HEAD -======= ///Offsprings from this fish will never be of its same type (unless it's self-reproducing). #define TRAIT_FISH_RECESSIVE "fish_recessive" ///This fish comes equipped with a stinger (increased damage and potentially venomous if also toxic) @@ -1030,7 +972,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_FISH_INK_ON_COOLDOWN "fish_ink_on_cooldown" ///This fish requires two hands to carry even if smaller than FISH_SIZE_TWO_HANDS_REQUIRED, as long as it's bulky-sized. #define TRAIT_FISH_SHOULD_TWOHANDED "should_twohanded" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trait given to angelic constructs to let them purge cult runes #define TRAIT_ANGELIC "angelic" @@ -1128,8 +1069,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// things with this trait are treated as having no access in /atom/movable/proc/check_access(obj/item) #define TRAIT_ALWAYS_NO_ACCESS "alwaysnoaccess" -<<<<<<< HEAD -======= ///The entity has Silicon 'access', so is either a silicon, has an access wand, or is an admin ghost AI. ///This is put on the mob, it is used on the client for Admins but they are the exception as they use `isAdminGhostAI`. #define TRAIT_SILICON_ACCESS "silicon_access_trait" @@ -1137,7 +1076,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai ///This is put on the mob, it is used on the client for Admins but they are the exception as they use `isAdminGhostAI`. #define TRAIT_AI_ACCESS "ai_access_trait" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Used by wearable_client_colour to determine whether the mob wants to have the colours of the screen affected by worn items (some still do regardless). #define TRAIT_SEE_WORN_COLOURS "see_worn_colour" @@ -1183,11 +1121,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Currently fishing #define TRAIT_GONE_FISHING "fishing" -<<<<<<< HEAD -======= /// Currently fishing, and it's the active minigame phase #define TRAIT_ACTIVELY_FISHING "actively_fishing" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Makes a character be better/worse at tackling depending on their wing's status #define TRAIT_TACKLING_WINGED_ATTACKER "tacking_winged_attacker" @@ -1293,15 +1228,12 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Trait given to anything linked to, not necessarily allied to, the mansus #define TRAIT_MANSUS_TOUCHED "mansus_touched" -<<<<<<< HEAD -======= // These traits are used in IS_X() as an OR, and is utilized for pseudoantags (such as deathmatch or domains) so they don't need to actually get antag status. // To specifically and only get the antag datum, GET_X() exists now. #define TRAIT_ACT_AS_CULTIST "act_as_cultist" #define TRAIT_ACT_AS_HERETIC "act_as_heretic" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Appiled when wizard buy (/datum/spellbook_entry/perks/spalls_lottery) perk. /// Give 50/25% chance not spend a spellbook charge on 1/2 cost spell. /// Appiled it wizard can't refund any spells. diff --git a/code/__DEFINES/traits/sources.dm b/code/__DEFINES/traits/sources.dm index 37b75c31d70..0648dd4dd37 100644 --- a/code/__DEFINES/traits/sources.dm +++ b/code/__DEFINES/traits/sources.dm @@ -36,11 +36,8 @@ #define VENDING_MACHINE_TRAIT "vending_machine" -<<<<<<< HEAD -======= ///A trait given by a held item #define HELD_ITEM_TRAIT "held-item-trait" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define ABSTRACT_ITEM_TRAIT "abstract-item" /// A trait given by any status effect #define STATUS_EFFECT_TRAIT "status-effect" @@ -50,12 +47,8 @@ /// Trait given by an Action datum #define ACTION_TRAIT "action" -<<<<<<< HEAD - -======= ///A trait given by someone blocking. #define BLOCKING_TRAIT "blocking" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define CLOTHING_TRAIT "clothing" #define HELMET_TRAIT "helmet" /// inherited from the mask diff --git a/code/__DEFINES/transport.dm b/code/__DEFINES/transport.dm index cb2caea75e8..b47bb6c2f06 100644 --- a/code/__DEFINES/transport.dm +++ b/code/__DEFINES/transport.dm @@ -99,15 +99,10 @@ DEFINE_BITFIELD(request_flags, list( #define XING_STATE_RED 2 #define XING_STATE_MALF 3 -<<<<<<< HEAD // #define XING_THRESHOLD_AMBER 45 // #define XING_THRESHOLD_RED 27 #define XING_THRESHOLD_AMBER 60 // SKYRAT EDIT CHANGE - RUN/WALK SPEED #define XING_THRESHOLD_RED 36 // SKYRAT EDIT CHANGE - RUN/WALK SPEED -======= -#define XING_THRESHOLD_AMBER 45 -#define XING_THRESHOLD_RED 27 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define DEFAULT_TRAM_LENGTH 10 #define DEFAULT_TRAM_MIDPOINT 5 diff --git a/code/__DEFINES/wiremod.dm b/code/__DEFINES/wiremod.dm index a7c8eeaea1a..45c2dfae84b 100644 --- a/code/__DEFINES/wiremod.dm +++ b/code/__DEFINES/wiremod.dm @@ -123,13 +123,10 @@ #define CIRCUIT_FLAG_REFUSE_MODULE (1<<5) /// This circuit component cannot be inserted into the same circuit multiple times. Only use this for major headaches. #define CIRCUIT_NO_DUPLICATES (1<<6) -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - This is required since we have two reagent components, and the BCI only allows one active /// This circuit component is a reagent container type. Check for existing reagent containers before adding. #define CIRCUIT_REAGENT_CONTAINER_TYPE (1<<7) // This value should not conflict with any of the previous flags // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Datatype flags /// The datatype supports manual inputs diff --git a/code/__DEFINES/wounds.dm b/code/__DEFINES/wounds.dm index 64b312b04da..678a3fa80b9 100644 --- a/code/__DEFINES/wounds.dm +++ b/code/__DEFINES/wounds.dm @@ -46,10 +46,6 @@ GLOBAL_LIST_INIT(wound_severities_chronological, list( /// Mainly a define used for wound_pregen_data, if a pregen data instance expects this, it will accept any and all wound types, even none at all #define WOUND_ALL "wound_all" -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // ~determination second wind defines // How much determination reagent to add each time someone gains a new wound in [/datum/wound/proc/second_wind] #define WOUND_DETERMINATION_MODERATE 1 @@ -117,10 +113,6 @@ GLOBAL_LIST_INIT(bio_state_anatomy, list( // Wound series // A "wound series" is just a family of wounds that logically follow eachother // Multiple wounds in a single series cannot be on a limb - the highest severity will always be prioritized, and lower ones will be skipped -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// T1-T3 Bleeding slash wounds. Requires flesh. Can cause bleeding, but doesn't require it. From: slash.dm #define WOUND_SERIES_FLESH_SLASH_BLEED "wound_series_flesh_slash_bled" /// T1-T3 Basic blunt wounds. T1 requires jointed, but 2-3 require bone. From: bone.dm @@ -134,7 +126,6 @@ GLOBAL_LIST_INIT(bio_state_anatomy, list( /// Cranial fissure wound. #define WOUND_SERIES_CRANIAL_FISSURE "wound_series_cranial_fissure" -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - MUSCLE AND SYNTH WOUNDS // Have to put it here so I can use it in the global list of wound series /// See muscle.dm and robotic_blunt.dm @@ -146,8 +137,6 @@ GLOBAL_LIST_INIT(bio_state_anatomy, list( #define WOUND_SERIES_WIRE_PIERCE_ELECTRICAL_DAMAGE "wound_series_metal_pierce_electrical_damage_basic" // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A assoc list of (wound typepath -> wound_pregen_data instance). Every wound should have a pregen data. GLOBAL_LIST_INIT_TYPED(all_wound_pregen_data, /datum/wound_pregen_data, generate_wound_static_data()) @@ -219,7 +208,6 @@ GLOBAL_LIST_INIT(wound_series_collections, generate_wound_series_collection()) /// Allows for determining of which wound series are caused by what. GLOBAL_LIST_INIT(wounding_types_to_series, list( WOUND_BLUNT = list( -<<<<<<< HEAD WOUND_SERIES_BONE_BLUNT_BASIC, WOUND_SERIES_MUSCLE_DAMAGE, // SKYRAT EDIT -- MUSCLE WOUNDS WOUND_SERIES_METAL_BLUNT_BASIC, // SKYRAT EDIT ADDITION - SYNTH WOUNDS @@ -239,18 +227,6 @@ GLOBAL_LIST_INIT(wounding_types_to_series, list( WOUND_SERIES_FLESH_PUNCTURE_BLEED, WOUND_SERIES_MUSCLE_DAMAGE, // SKYRAT EDIT ADDITION - MUSCLE WOUNDS WOUND_SERIES_WIRE_PIERCE_ELECTRICAL_DAMAGE, // SKYRAT EDIT ADDITION - SYNTH WOUNDS -======= - WOUND_SERIES_BONE_BLUNT_BASIC - ), - WOUND_SLASH = list( - WOUND_SERIES_FLESH_SLASH_BLEED, - ), - WOUND_BURN = list( - WOUND_SERIES_FLESH_BURN_BASIC, - ), - WOUND_PIERCE = list( - WOUND_SERIES_FLESH_PUNCTURE_BLEED ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ), )) @@ -321,12 +297,8 @@ GLOBAL_LIST_INIT(wounding_types_to_series, list( /// Assoc list of biotype -> ideal scar file to be used and grab stuff from. GLOBAL_LIST_INIT(biotypes_to_scar_file, list( "[BIO_FLESH]" = FLESH_SCAR_FILE, -<<<<<<< HEAD "[BIO_BONE]" = BONE_SCAR_FILE, "[BIO_METAL]" = METAL_SCAR_FILE // SKYRAT EDIT ADDITION - METAL SCARS (see robotic_blunt.dm) -======= - "[BIO_BONE]" = BONE_SCAR_FILE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) // ~burn wound infection defines diff --git a/code/__HELPERS/_auxtools_api.dm b/code/__HELPERS/_auxtools_api.dm index 92782717d1a..a907be8ecf8 100644 --- a/code/__HELPERS/_auxtools_api.dm +++ b/code/__HELPERS/_auxtools_api.dm @@ -1,41 +1,3 @@ -<<<<<<< HEAD -#define AUXTOOLS_FULL_INIT 2 -#define AUXTOOLS_PARTIAL_INIT 1 - -GLOBAL_LIST_EMPTY(auxtools_initialized) -GLOBAL_PROTECT(auxtools_initialized) - -#define AUXTOOLS_CHECK(LIB)\ - if (!CONFIG_GET(flag/auxtools_enabled)) {\ - CRASH("Auxtools is not enabled in config!");\ - }\ - if (GLOB.auxtools_initialized[LIB] != AUXTOOLS_FULL_INIT) {\ - if (fexists(LIB)) {\ - var/string = call_ext(LIB,"auxtools_init")();\ - if(findtext(string, "SUCCESS")) {\ - GLOB.auxtools_initialized[LIB] = AUXTOOLS_FULL_INIT;\ - } else {\ - CRASH(string);\ - }\ - } else {\ - CRASH("No file named [LIB] found!")\ - }\ - }\ - -#define AUXTOOLS_SHUTDOWN(LIB)\ - if (GLOB.auxtools_initialized[LIB] == AUXTOOLS_FULL_INIT && fexists(LIB)){\ - call_ext(LIB,"auxtools_shutdown")();\ - GLOB.auxtools_initialized[LIB] = AUXTOOLS_PARTIAL_INIT;\ - }\ - -#define AUXTOOLS_FULL_SHUTDOWN(LIB)\ - if (GLOB.auxtools_initialized[LIB] && fexists(LIB)){\ - call_ext(LIB,"auxtools_full_shutdown")();\ - GLOB.auxtools_initialized[LIB] = FALSE;\ - } - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/auxtools_stack_trace(msg) CRASH(msg) diff --git a/code/__HELPERS/_dreamluau.dm b/code/__HELPERS/_dreamluau.dm index 7915a6d14b6..1e1e315a2ae 100644 --- a/code/__HELPERS/_dreamluau.dm +++ b/code/__HELPERS/_dreamluau.dm @@ -1,10 +1,5 @@ /* This comment bypasses grep checks */ /var/__dreamluau -<<<<<<< HEAD -#define DREAMLUAU (world.system_type == MS_WINDOWS ? "dreamluau.dll" : (__dreamluau || (__dreamluau = __detect_auxtools("dreamluau")))) - -#define DREAMLUAU_CALL(func) call_ext(DREAMLUAU, "byond:[#func]") -======= /* This comment also bypasses grep checks */ /var/__dreamluau_exists #define DREAMLUAU_EXISTS (__dreamluau_exists ||= fexists(DREAMLUAU)) @@ -12,7 +7,6 @@ #define DREAMLUAU (world.system_type == MS_WINDOWS ? "dreamluau.dll" : (__dreamluau ||= __detect_auxtools("dreamluau"))) #define DREAMLUAU_CALL(func) (!DREAMLUAU_EXISTS) ? null : call_ext(DREAMLUAU, "byond:[#func]") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * All of the following functions will return a string if the underlying rust code returns an error or a wrapped panic. diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index dc87b93372d..f8a0dc6d7d5 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -978,14 +978,6 @@ else return element -<<<<<<< HEAD -/// Returns a copy of the list where any element that is a datum or the world is converted into a ref -/proc/refify_list(list/target_list, list/visited, path_accumulator = "list") - if(!visited) - visited = list() - var/list/ret = list() - visited[target_list] = path_accumulator -======= /** * Intermediate step for preparing lists to be passed into the lua editor tgui. * Resolves weakrefs, converts some values without a standard textual representation to text, @@ -997,50 +989,11 @@ var/list/ret = list() visited[target_list] = ret var/list/duplicate_keys = list() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/i in 1 to target_list.len) var/key = target_list[i] var/new_key = key if(isweakref(key)) var/datum/weakref/ref = key -<<<<<<< HEAD - var/resolved = ref.resolve() - if(resolved) - new_key = "[resolved] [REF(resolved)]" - else - new_key = "null weakref [REF(key)]" - else if(isdatum(key)) - new_key = "[key] [REF(key)]" - else if(key == world) - new_key = "world [REF(world)]" - else if(islist(key)) - if(visited.Find(key)) - new_key = visited[key] - else - new_key = refify_list(key, visited, path_accumulator + "\[[i]\]") - var/value - if(istext(key) || islist(key) || ispath(key) || isdatum(key) || key == world) - value = target_list[key] - if(isweakref(value)) - var/datum/weakref/ref = value - var/resolved = ref.resolve() - if(resolved) - value = "[resolved] [REF(resolved)]" - else - value = "null weakref [REF(key)]" - else if(isdatum(value)) - value = "[value] [REF(value)]" - else if(value == world) - value = "world [REF(world)]" - else if(islist(value)) - if(visited.Find(value)) - value = visited[value] - else - value = refify_list(value, visited, path_accumulator + "\[[key]\]") - var/list/to_add = list(new_key) - if(value) - to_add[new_key] = value -======= new_key = ref.resolve() || "null weakref" else if(key == world) new_key = world.name @@ -1076,7 +1029,6 @@ to_add[final_key] = value else to_add += list(new_key) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ret += to_add if(i < target_list.len) CHECK_TICK @@ -1085,14 +1037,6 @@ /** * Converts a list into a list of assoc lists of the form ("key" = key, "value" = value) * so that list keys that are themselves lists can be fully json-encoded -<<<<<<< HEAD - */ -/proc/kvpify_list(list/target_list, depth = INFINITY, list/visited, path_accumulator = "list") - if(!visited) - visited = list() - var/list/ret = list() - visited[target_list] = path_accumulator -======= * and that unique objects with the same string representation do not * produce duplicate keys that are clobbered by the standard JavaScript JSON.parse function */ @@ -1101,26 +1045,10 @@ visited = list() var/list/ret = list() visited[target_list] = ret ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/i in 1 to target_list.len) var/key = target_list[i] var/new_key = key if(islist(key) && depth) -<<<<<<< HEAD - if(visited.Find(key)) - new_key = visited[key] - else - new_key = kvpify_list(key, depth-1, visited, path_accumulator + "\[[i]\]") - var/value - if(istext(key) || islist(key) || ispath(key) || isdatum(key) || key == world) - value = target_list[key] - if(islist(value) && depth) - if(visited.Find(value)) - value = visited[value] - else - value = kvpify_list(value, depth-1, visited, path_accumulator + "\[[key]\]") - if(value) -======= if(visited[key]) new_key = visited[key] else @@ -1134,7 +1062,6 @@ else value = kvpify_list(value, depth-1, visited) if(!isnull(value)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ret += list(list("key" = new_key, "value" = value)) else ret += list(list("key" = i, "value" = new_key)) @@ -1144,21 +1071,12 @@ /// Compares 2 lists, returns TRUE if they are the same /proc/deep_compare_list(list/list_1, list/list_2) -<<<<<<< HEAD - if(!islist(list_1) || !islist(list_2)) - return FALSE - - if(list_1 == list_2) - return TRUE - -======= if(list_1 == list_2) return TRUE if(!islist(list_1) || !islist(list_2)) return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(list_1.len != list_2.len) return FALSE @@ -1181,19 +1099,11 @@ return TRUE /// Returns a copy of the list where any element that is a datum is converted into a weakref -<<<<<<< HEAD -/proc/weakrefify_list(list/target_list, list/visited, path_accumulator = "list") - if(!visited) - visited = list() - var/list/ret = list() - visited[target_list] = path_accumulator -======= /proc/weakrefify_list(list/target_list, list/visited) if(!visited) visited = list() var/list/ret = list() visited[target_list] = ret ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/i in 1 to target_list.len) var/key = target_list[i] var/new_key = key @@ -1203,77 +1113,19 @@ if(visited.Find(key)) new_key = visited[key] else -<<<<<<< HEAD - new_key = weakrefify_list(key, visited, path_accumulator + "\[[i]\]") - var/value - if(istext(key) || islist(key) || ispath(key) || isdatum(key) || key == world) -======= new_key = weakrefify_list(key, visited) var/value if(!isnull(key) && !isnum(key)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 value = target_list[key] if(isdatum(value)) value = WEAKREF(value) else if(islist(value)) -<<<<<<< HEAD - if(visited.Find(value)) - value = visited[value] - else - value = weakrefify_list(value, visited, path_accumulator + "\[[key]\]") - var/list/to_add = list(new_key) - if(value) - to_add[new_key] = value - ret += to_add - if(i < target_list.len) - CHECK_TICK - return ret - -/// Returns a copy of a list where text values (except assoc-keys and string representations of lua-only values) are -/// wrapped in quotes and existing quote marks are escaped, -/// and nulls are replaced with the string "null" -/proc/encode_text_and_nulls(list/target_list, list/visited) - var/static/regex/lua_reference_regex - if(!lua_reference_regex) - lua_reference_regex = regex(@"^((function)|(table)|(thread)|(userdata)): 0x[0-9a-fA-F]+$") - if(!visited) - visited = list() - var/list/ret = list() - visited[target_list] = TRUE - for(var/i in 1 to target_list.len) - var/key = target_list[i] - var/new_key = key - if(istext(key) && !target_list[key] && !lua_reference_regex.Find(key)) - new_key = "\"[replacetext(key, "\"", "\\\"")]\"" - else if(islist(key)) - var/found_index = visited.Find(key) - if(found_index) - new_key = visited[found_index] - else - new_key = encode_text_and_nulls(key, visited) - else if(isnull(key)) - new_key = "null" - var/value - if(istext(key) || islist(key) || ispath(key) || isdatum(key) || key == world) - value = target_list[key] - if(istext(value) && !lua_reference_regex.Find(value)) - value = "\"[replacetext(value, "\"", "\\\"")]\"" - else if(islist(value)) - var/found_index = visited.Find(value) - if(found_index) - value = visited[found_index] - else - value = encode_text_and_nulls(value, visited) - var/list/to_add = list(new_key) - if(value) -======= if(visited[value]) value = visited[value] else value = weakrefify_list(value, visited) var/list/to_add = list(new_key) if(!isnull(value)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_add[new_key] = value ret += to_add if(i < target_list.len) @@ -1299,8 +1151,6 @@ if("x" in coords) return locate(coords["x"], coords["y"], coords["z"]) return locate(coords[1], coords[2], coords[3]) -<<<<<<< HEAD -======= /** * Given a list and a list of its variant hints, appends variants that aren't explicitly required by dreamluau, @@ -1453,4 +1303,3 @@ && deep_compare_list(log_1["stack"], log_2["stack"]) else return TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__HELPERS/atmospherics.dm b/code/__HELPERS/atmospherics.dm index 1e5fcb788a1..9ebafd5fbb5 100644 --- a/code/__HELPERS/atmospherics.dm +++ b/code/__HELPERS/atmospherics.dm @@ -105,21 +105,13 @@ GLOBAL_LIST_EMPTY(gas_handbook) factor_info["factor_name"] = factor factor_info["factor_type"] = "misc" if(factor == "Temperature" || factor == "Pressure") -<<<<<<< HEAD - factor_info["tooltip"] = "Reaction is influenced by the [LOWER_TEXT(factor)] of the place where the reaction is occuring." -======= factor_info["tooltip"] = "Reaction is influenced by the [LOWER_TEXT(factor)] of the place where the reaction is occurring." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(factor == "Energy") factor_info["tooltip"] = "Energy released by the reaction, may or may not result in linear temperature change depending on a slew of other factors." else if(factor == "Radiation") factor_info["tooltip"] = "This reaction emits dangerous radiation! Take precautions." else if (factor == "Location") -<<<<<<< HEAD - factor_info["tooltip"] = "This reaction has special behaviour when occuring in specific locations." -======= factor_info["tooltip"] = "This reaction has special behaviour when occurring in specific locations." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(factor == "Hot Ice") factor_info["tooltip"] = "Hot ice are solidified stacks of plasma. Ignition of one will result in a raging fire." reaction_info["factors"] += list(factor_info) @@ -146,21 +138,13 @@ GLOBAL_LIST_EMPTY(gas_handbook) factor_info["factor_name"] = factor factor_info["factor_type"] = "misc" if(factor == "Temperature" || factor == "Pressure") -<<<<<<< HEAD - factor_info["tooltip"] = "Reaction is influenced by the [LOWER_TEXT(factor)] of the place where the reaction is occuring." -======= factor_info["tooltip"] = "Reaction is influenced by the [LOWER_TEXT(factor)] of the place where the reaction is occurring." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(factor == "Energy") factor_info["tooltip"] = "Energy released by the reaction, may or may not result in linear temperature change depending on a slew of other factors." else if(factor == "Radiation") factor_info["tooltip"] = "This reaction emits dangerous radiation! Take precautions." else if (factor == "Location") -<<<<<<< HEAD - factor_info["tooltip"] = "This reaction has special behaviour when occuring in specific locations." -======= factor_info["tooltip"] = "This reaction has special behaviour when occurring in specific locations." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 reaction_info["factors"] += list(factor_info) GLOB.reaction_handbook += list(reaction_info) qdel(reaction) diff --git a/code/__HELPERS/atoms.dm b/code/__HELPERS/atoms.dm index 05ab5278e9e..22f082a5eb3 100644 --- a/code/__HELPERS/atoms.dm +++ b/code/__HELPERS/atoms.dm @@ -63,19 +63,6 @@ var/turf/target_turf = get_turf(target) if(get_dist(source, target) > length) return FALSE -<<<<<<< HEAD - var/steps = 1 - if(current == target_turf)//they are on the same turf, source can see the target - return TRUE - current = get_step_towards(current, target_turf) - while(current != target_turf) - if(steps > length) - return FALSE - if(IS_OPAQUE_TURF(current)) - return FALSE - current = get_step_towards(current, target_turf) - steps++ -======= if(current == target_turf)//they are on the same turf, source can see the target return TRUE var/list/steps = get_steps_to(current, target_turf) @@ -87,7 +74,6 @@ break if(IS_OPAQUE_TURF(current)) return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE ///Get the cardinal direction between two atoms diff --git a/code/__HELPERS/construction.dm b/code/__HELPERS/construction.dm index 6d3da7d033c..166a009f066 100644 --- a/code/__HELPERS/construction.dm +++ b/code/__HELPERS/construction.dm @@ -61,11 +61,7 @@ . = new target.type(target.drop_location(), amount, FALSE, target.mats_per_unit) /** -<<<<<<< HEAD - * divides a list of materials uniformly among all contents of the target_object reccursively -======= * divides a list of materials uniformly among all contents of the target_object recursively ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Used to set materials of printed items with their design cost by taking into consideration their already existing materials * e.g. if 12 iron is to be divided uniformly among 2 objects A, B who's current iron contents are 3 & 7 * Then first we normalize those values i.e. find their weights to decide who gets an higher share of iron @@ -85,11 +81,7 @@ target_object.set_custom_materials(custom_materials, multiplier) return -<<<<<<< HEAD - //Step 1: Get reccursive contents of all objects, only filter obj cause that what's material container accepts -======= //Step 1: Get recursive contents of all objects, only filter obj cause that what's material container accepts ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/reccursive_contents = target_object.get_all_contents_type(/obj/item) //Step 2: find the sum of each material type per object and record their amounts into an 2D list diff --git a/code/__HELPERS/dna.dm b/code/__HELPERS/dna.dm index c8af5840069..17fd7e21b8e 100644 --- a/code/__HELPERS/dna.dm +++ b/code/__HELPERS/dna.dm @@ -15,8 +15,4 @@ ///Getter macro used to get the length of a identity block #define GET_UI_BLOCK_LEN(blocknum) (GLOB.identity_block_lengths["[blocknum]"] || DNA_BLOCK_SIZE) ///Ditto, but for a feature. -<<<<<<< HEAD #define GET_UF_BLOCK_LEN(blocknum) (SSaccessories.features_block_lengths["[blocknum]"] || DNA_BLOCK_SIZE) //SKYRAT CHANGE EDIT - Customization ORIGINAL: #define GET_UF_BLOCK_LEN(blocknum) (GLOB.features_block_lengths["[blocknum]"] || DNA_BLOCK_SIZE) -======= -#define GET_UF_BLOCK_LEN(blocknum) (GLOB.features_block_lengths["[blocknum]"] || DNA_BLOCK_SIZE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/__HELPERS/duplicating.dm b/code/__HELPERS/duplicating.dm index f7367a9aa09..f0f3f9a9fce 100644 --- a/code/__HELPERS/duplicating.dm +++ b/code/__HELPERS/duplicating.dm @@ -15,11 +15,6 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars, list( "contents", "cooldowns", "_datum_components", -<<<<<<< HEAD - "external_organs", - "external_organs_slot", -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "group", "hand_bodyparts", "held_items", diff --git a/code/__HELPERS/dynamic_human_icon_gen.dm b/code/__HELPERS/dynamic_human_icon_gen.dm index a5755fba51c..eb6d53517df 100644 --- a/code/__HELPERS/dynamic_human_icon_gen.dm +++ b/code/__HELPERS/dynamic_human_icon_gen.dm @@ -17,10 +17,7 @@ GLOBAL_LIST_EMPTY(dynamic_human_appearances) dummy.underwear = "Nude" dummy.undershirt = "Nude" dummy.socks = "Nude" -<<<<<<< HEAD dummy.bra = "Nude" // SKYRAT EDIT ADDITION - Underwear and bra split -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(outfit_path) var/datum/outfit/outfit = new outfit_path() if(r_hand != NO_REPLACE) //we can still override to be null, no replace means just use outfit's diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index e2bced4b7ff..1cdf2efa896 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -33,11 +33,8 @@ GLOBAL_VAR_INIT(fileaccess_timer, 0) var/confirmation = input(src, "Are you SURE you want to download all the files in this folder? (This will open [length(comp_flist)] prompt[length(comp_flist) == 1 ? "" : "s"])", "Confirmation") in list("Yes", "No") if(confirmation != "Yes") continue -<<<<<<< HEAD log_admin("[key_name(src)] is downloading [length(comp_flist)] files from [path]") // SKYRAT EDIT -- ADDITION message_admins("Admin [key_name_admin(src)] is downloading [length(comp_flist)] files from [path]") // SKYRAT EDIT -- ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/file in comp_flist) src << ftp(path + file) return diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index c0dfc33e113..e9973e6f671 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -1,10 +1,7 @@ -<<<<<<< HEAD -======= ////////////////////////// /////Initial Building///// ////////////////////////// ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Inits GLOB.surgeries /proc/init_surgeries() var/surgeries = list() @@ -17,13 +14,9 @@ /proc/make_datum_reference_lists() // I tried to eliminate this proc but I couldn't untangle their init-order interdependencies -Dominion/Cyberboss init_keybindings() -<<<<<<< HEAD make_skyrat_datum_references() //SKYRAT EDIT ADDITION - CUSTOMIZATION GLOB.emote_list = init_emote_list() // WHY DOES THIS NEED TO GO HERE? IT JUST INITS DATUMS init_skyrat_stack_recipes() //SKYRAT EDIT ADDITION - More sheet recipes -======= - GLOB.emote_list = init_emote_list() // WHY DOES THIS NEED TO GO HERE? IT JUST INITS DATUMS ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 init_crafting_recipes() init_crafting_recipes_atoms() @@ -33,11 +26,7 @@ if(ispath(path, /datum/crafting_recipe/stack)) continue var/datum/crafting_recipe/recipe = new path() -<<<<<<< HEAD var/is_cooking = ((recipe.category in GLOB.crafting_category_food) || (recipe.category in GLOB.crafting_category_food_skyrat)) // SKYRAT EDIT CHANGE - ORIGINAL: var/is_cooking = (recipe.category in GLOB.crafting_category_food) -======= - var/is_cooking = (recipe.category in GLOB.crafting_category_food) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 recipe.reqs = sort_list(recipe.reqs, GLOBAL_PROC_REF(cmp_crafting_req_priority)) if(recipe.name != "" && recipe.result) if(is_cooking) @@ -199,10 +188,7 @@ GLOBAL_LIST_INIT(WALLITEMS_INTERIOR, typecacheof(list( /obj/machinery/status_display, /obj/machinery/ticket_machine, /obj/machinery/turretid, -<<<<<<< HEAD /obj/machinery/time_clock, //SKYRAT EDIT TIME CLOCK -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/barsign, /obj/structure/extinguisher_cabinet, /obj/structure/fireaxecabinet, diff --git a/code/__HELPERS/heap.dm b/code/__HELPERS/heap.dm index 308dc5e2d27..ede4c39f950 100644 --- a/code/__HELPERS/heap.dm +++ b/code/__HELPERS/heap.dm @@ -26,11 +26,7 @@ swim(length(L)) //removes and returns the first element of the heap -<<<<<<< HEAD -//(i.e the max or the min dependant on the comparison function) -======= //(i.e the max or the min dependent on the comparison function) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/heap/proc/pop() if(!length(L)) return 0 diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 14b012170bd..09dcea7e1f3 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -272,11 +272,7 @@ world Blend(mask_icon, ICON_ADD) /// Converts an rgb color into a list storing hsva -<<<<<<< HEAD -/// Exists because it's useful to have a guarenteed alpha value -======= /// Exists because it's useful to have a guaranteed alpha value ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/rgb2hsv(rgb) var/list/hsv = rgb2num(rgb, COLORSPACE_HSV) if(length(hsv) < 4) @@ -770,11 +766,7 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) if(job) body.dna.species.pre_equip_species_outfit(job, body, TRUE) if(outfit) -<<<<<<< HEAD body.equip_outfit_and_loadout(outfit, prefs, TRUE) //SKYRAT EDIT CHANGE -======= - body.equipOutfit(outfit, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/icon/out_icon = icon('icons/effects/effects.dmi', "nothing") for(var/direction in showDirs) @@ -823,19 +815,11 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) /// generates a filename for a given asset. /// like generate_asset_name(), except returns the rsc reference and the rsc file hash as well as the asset name (sans extension) -<<<<<<< HEAD -/// used so that certain asset files dont have to be hashed twice -/proc/generate_and_hash_rsc_file(file, dmi_file_path) - var/rsc_ref = fcopy_rsc(file) - var/hash - //if we have a valid dmi file path we can trust md5'ing the rsc file because we know it doesnt have the bug described in http://www.byond.com/forum/post/2611357 -======= /// used so that certain asset files don't have to be hashed twice /proc/generate_and_hash_rsc_file(file, dmi_file_path) var/rsc_ref = fcopy_rsc(file) var/hash //if we have a valid dmi file path we can trust md5'ing the rsc file because we know it doesn't have the bug described in http://www.byond.com/forum/post/2611357 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(dmi_file_path) hash = md5(rsc_ref) else //otherwise, we need to do the expensive fcopy() workaround @@ -861,11 +845,7 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) fdel(savefile_path) return new /savefile(savefile_path) catch(var/exception/error) -<<<<<<< HEAD - // if we failed to create a dummy once, try again; maybe someone slept somewhere they shouldnt have -======= // if we failed to create a dummy once, try again; maybe someone slept somewhere they shouldn't have ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(from_failure) // this *is* the retry, something fucked up CRASH("get_dummy_savefile failed to create a dummy savefile: '[error]'") return get_dummy_savefile(from_failure = TRUE) @@ -910,30 +890,18 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) var/atom/atom_icon = icon icon = atom_icon.icon //atom icons compiled in from 'icons/path/to/dmi_file.dmi' are weird and not really icon objects that you generate with icon(). -<<<<<<< HEAD - //if theyre unchanged dmi's then they're stringifiable to "icons/path/to/dmi_file.dmi" - - if(isicon(icon) && isfile(icon)) - //icons compiled in from 'icons/path/to/dmi_file.dmi' at compile time are weird and arent really /icon objects, - ///but they pass both isicon() and isfile() checks. theyre the easiest case since stringifying them gives us the path we want -======= //if they're unchanged dmi's then they're stringifiable to "icons/path/to/dmi_file.dmi" if(isicon(icon) && isfile(icon)) //icons compiled in from 'icons/path/to/dmi_file.dmi' at compile time are weird and aren't really /icon objects, ///but they pass both isicon() and isfile() checks. they're the easiest case since stringifying them gives us the path we want ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/icon_ref = text_ref(icon) var/locate_icon_string = "[locate(icon_ref)]" icon_path = locate_icon_string else if(isicon(icon) && "[icon]" == "/icon") -<<<<<<< HEAD - // icon objects generated from icon() at runtime are icons, but they ARENT files themselves, they represent icon files. -======= // icon objects generated from icon() at runtime are icons, but they AREN'T files themselves, they represent icon files. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // if the files they represent are compile time dmi files in the rsc, then // the rsc reference returned by fcopy_rsc() will be stringifiable to "icons/path/to/dmi_file.dmi" var/rsc_ref = fcopy_rsc(icon) @@ -992,11 +960,7 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) if(!length(targets)) return -<<<<<<< HEAD - //check if the given object is associated with a dmi file in the icons folder. if it is then we dont need to do a lot of work -======= //check if the given object is associated with a dmi file in the icons folder. if it is then we don't need to do a lot of work ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //for asset generation to get around byond limitations var/icon_path = get_icon_dmi_path(thing) @@ -1040,11 +1004,7 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) var/list/name_and_ref = generate_and_hash_rsc_file(icon2collapse, icon_path)//pretend that tuples exist -<<<<<<< HEAD - var/rsc_ref = name_and_ref[1] //weird object thats not even readable to the debugger, represents a reference to the icons rsc entry -======= var/rsc_ref = name_and_ref[1] //weird object that's not even readable to the debugger, represents a reference to the icons rsc entry ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/file_hash = name_and_ref[2] key = "[name_and_ref[3]].png" diff --git a/code/__HELPERS/levels.dm b/code/__HELPERS/levels.dm index 6e1aaa336e7..ca2cd3c5db3 100644 --- a/code/__HELPERS/levels.dm +++ b/code/__HELPERS/levels.dm @@ -56,9 +56,5 @@ // Syndicate recon outpost is on some moon or something return TRUE -<<<<<<< HEAD - // Finally, more specific checks are ran for edge cases, such as lazyily loaded map templates or away missions. Not perfect. -======= // Finally, more specific checks are ran for edge cases, such as lazily loaded map templates or away missions. Not perfect. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return istype(what_turf) && what_turf.planetary_atmos && what_turf.has_gravity() diff --git a/code/__HELPERS/logging/_logging.dm b/code/__HELPERS/logging/_logging.dm index b3abc019531..12487a5c240 100644 --- a/code/__HELPERS/logging/_logging.dm +++ b/code/__HELPERS/logging/_logging.dm @@ -99,7 +99,6 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global")) if(!log_globally) return -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN #ifndef SPACEMAN_DMM if(CONFIG_GET(flag/sql_game_log) && CONFIG_GET(flag/sql_enabled)) @@ -118,8 +117,6 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global")) return #endif //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/log_text = "[key_name_and_tag(src)] [message] [loc_name(src)]" switch(message_type) /// ship both attack logs and victim logs to the end of round attack.log just to ensure we don't lose information @@ -131,15 +128,12 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global")) log_whisper(log_text, data) if(LOG_EMOTE) log_emote(log_text, data) -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(LOG_SUBTLE) log_subtle(log_text, data) if(LOG_SUBTLER) log_subtler(log_text, data) //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(LOG_RADIO_EMOTE) log_radio_emote(log_text, data) if(LOG_DSAY) diff --git a/code/__HELPERS/logging/mob.dm b/code/__HELPERS/logging/mob.dm index b2377623e22..eaa825735c9 100644 --- a/code/__HELPERS/logging/mob.dm +++ b/code/__HELPERS/logging/mob.dm @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD - * Logs a mesage to the mob_tags log, including the mobs tag -======= * Logs a message to the mob_tags log, including the mobs tag ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Arguments: * * text - text to log. */ @@ -48,15 +44,12 @@ colored_message = "(ASAY) [colored_message]" if(LOG_EMOTE) colored_message = "(EMOTE) [colored_message]" -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(LOG_SUBTLE) colored_message = "(EMOTE) (SUBTLE) [colored_message]" if(LOG_SUBTLER) colored_message = "(EMOTE) (SUBTLER) [colored_message]" //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(LOG_RADIO_EMOTE) colored_message = "(RADIOEMOTE) [colored_message]" diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index b2bec972ddc..631e06c8718 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -72,7 +72,6 @@ /proc/random_backpack() return pick(GLOB.backpacklist) -<<<<<<< HEAD // SKYRAT EDIT REMOVAL - CUSTOMIZATION (moved to modular) /* /proc/random_features() @@ -131,8 +130,6 @@ */ //SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/random_hairstyle(gender) switch(gender) if(MALE) @@ -595,13 +592,8 @@ GLOBAL_LIST_INIT(skin_tone_names, list( * When passed the difference between two temperatures returns the amount of change to temperature to apply. * The change rate should be kept at a low value tween 0.16 and 0.02 for optimal results. * vars: -<<<<<<< HEAD - * * temp_diff (required) The differance between two temperatures - * * change_rate (optional)(Default: 0.06) The rate of range multiplyer -======= * * temp_diff (required) The difference between two temperatures * * change_rate (optional)(Default: 0.06) The rate of range multiplier ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ /proc/get_temp_change_amount(temp_diff, change_rate = 0.06) if(temp_diff < 0) @@ -645,16 +637,11 @@ GLOBAL_LIST_INIT(skin_tone_names, list( // We've already added slimes. if(isslime(mob_to_sort)) continue -<<<<<<< HEAD // SKYRAT EDIT START - SOULCATCHERS for(var/mob/living/soulcatcher_soul/mob_to_sort in sortmob) moblist += mob_to_sort // SKYRAT EDIT END - SOULCATCHERS return moblist -======= - return moblist - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///returns a mob type controlled by a specified ckey /proc/get_mob_by_ckey(key) if(!key) @@ -759,11 +746,8 @@ GLOBAL_LIST_INIT(skin_tone_names, list( slot_strings += "dextrous storage" if(slot_flags & ITEM_SLOT_BACKPACK) slot_strings += "backpack" -<<<<<<< HEAD -======= if(slot_flags & ITEM_SLOT_BELTPACK) slot_strings += "belt" // ? ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return slot_strings ///Returns the direction that the initiator and the target are facing diff --git a/code/__HELPERS/paths/path.dm b/code/__HELPERS/paths/path.dm index 863bafa4f0a..9530a545235 100644 --- a/code/__HELPERS/paths/path.dm +++ b/code/__HELPERS/paths/path.dm @@ -16,11 +16,7 @@ */ /proc/get_path_to(atom/movable/caller, atom/end, max_distance = 30, mintargetdist, access=list(), simulated_only = TRUE, turf/exclude, skip_first=TRUE, diagonal_handling=DIAGONAL_REMOVE_CLUNKY) var/list/hand_around = list() -<<<<<<< HEAD - // We're guarenteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list -======= // We're guaranteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/callback/await = list(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(pathfinding_finished), hand_around)) if(!SSpathfinder.pathfind(caller, end, max_distance, mintargetdist, access, simulated_only, exclude, skip_first, diagonal_handling, await)) return list() @@ -53,11 +49,7 @@ */ /proc/get_swarm_path_to(atom/movable/caller, atom/end, max_distance = 30, mintargetdist, age = MAP_REUSE_INSTANT, access = list(), simulated_only = TRUE, turf/exclude, skip_first=TRUE) var/list/hand_around = list() -<<<<<<< HEAD - // We're guarenteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list -======= // We're guaranteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/callback/await = list(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(pathfinding_finished), hand_around)) if(!SSpathfinder.swarmed_pathfind(caller, end, max_distance, mintargetdist, age, access, simulated_only, exclude, skip_first, await)) return list() @@ -70,11 +62,7 @@ /proc/get_sssp(atom/movable/caller, max_distance = 30, access = list(), simulated_only = TRUE, turf/exclude) var/list/hand_around = list() -<<<<<<< HEAD - // We're guarenteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list -======= // We're guaranteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/callback/await = list(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(pathfinding_finished), hand_around)) if(!SSpathfinder.build_map(caller, get_turf(caller), max_distance, access, simulated_only, exclude, await)) return null @@ -347,11 +335,7 @@ src.has_gravity = construct_from.has_gravity() if(ismob(construct_from)) var/mob/living/mob_construct = construct_from -<<<<<<< HEAD - src.incapacitated = mob_construct.incapacitated() -======= src.incapacitated = mob_construct.incapacitated ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(mob_construct.buckled) src.buckled_info = new(mob_construct.buckled, access, no_id, call_depth + 1) if(isobserver(construct_from)) diff --git a/code/__HELPERS/paths/sssp.dm b/code/__HELPERS/paths/sssp.dm index 752138264a9..21e520ea016 100644 --- a/code/__HELPERS/paths/sssp.dm +++ b/code/__HELPERS/paths/sssp.dm @@ -130,11 +130,7 @@ /// Returns a new /datum/pathfind/sssp based off our settings /// Will have an invalid source mob, no max distance, and no ending callback /datum/path_map/proc/settings_to_path() -<<<<<<< HEAD - // Default creation to not set any vars incidentially -======= // Default creation to not set any vars incidentally ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/static/mob/jeremy = new() var/datum/pathfind/sssp/based_on_what = new() based_on_what.setup(pass_info, null, INFINITY, pass_space, avoid) @@ -159,11 +155,7 @@ working_index -= 1 var/list/hand_around = list() -<<<<<<< HEAD - // We're guarenteed that hand_around will be the first list in pathfinding_finished's argset because of how callback handles the arguments list -======= // We're guaranteed that hand_around will be the first list in pathfinding_finished's argset because of how callback handles the arguments list ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/callback/await = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(pathfinding_finished), hand_around) // We're gonna build a pathfind datum from our settings and set it running diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index 955881c2584..b9964b9be93 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -142,11 +142,7 @@ else finalized_announcement = CHAT_ALERT_DEFAULT_SPAN(jointext(minor_announcement_strings, "")) -<<<<<<< HEAD var/custom_sound = sound_override || (alert ? 'modular_skyrat/modules/alerts/sound/alerts/alert1.ogg' : 'sound/misc/notice2.ogg') // SKYRAT EDIT CHANGE - CUSTOM ANNOUNCEMENTS - Original: 'sound/misc/notice1.ogg' -======= - var/custom_sound = sound_override || (alert ? 'sound/misc/notice1.ogg' : 'sound/misc/notice2.ogg') ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dispatch_announcement_to_players(finalized_announcement, players, custom_sound, should_play_sound) /// Sends an announcement about the level changing to players. Uses the passed in datum and the subsystem's previous security level to generate the message. @@ -190,12 +186,9 @@ /// Proc that just dispatches the announcement to our applicable audience. Only the announcement is a mandatory arg. /proc/dispatch_announcement_to_players(announcement, list/players = GLOB.player_list, sound_override = null, should_play_sound = TRUE) -<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN - CUSTOM ANNOUNCEMENTS /* Original: -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/sound_to_play = !isnull(sound_override) ? sound_override : 'sound/misc/notice2.ogg' for(var/mob/target in players) @@ -208,7 +201,6 @@ if(target.client?.prefs.read_preference(/datum/preference/toggle/sound_announcements)) SEND_SOUND(target, sound(sound_to_play)) -<<<<<<< HEAD */ if(!sound_override) sound_override = SSstation.announcer.get_rand_alert_sound() @@ -228,8 +220,6 @@ to_chat(target, announcement) // SKYRAT EDIT CHANGE END - CUSTOM ANNOUNCEMENTS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef MAJOR_ANNOUNCEMENT_TITLE #undef MAJOR_ANNOUNCEMENT_TEXT diff --git a/code/__HELPERS/reagents.dm b/code/__HELPERS/reagents.dm index a3f460fd098..51ff7df475e 100644 --- a/code/__HELPERS/reagents.dm +++ b/code/__HELPERS/reagents.dm @@ -180,16 +180,6 @@ else return null -<<<<<<< HEAD -///Returns a random reagent object minus blacklisted reagents -/proc/get_random_reagent_id() - var/static/list/random_reagents = list() - if(!random_reagents.len) - for(var/datum/reagent/reagent_path as anything in subtypesof(/datum/reagent)) - if(initial(reagent_path.chemical_flags) & REAGENT_CAN_BE_SYNTHESIZED) - random_reagents += reagent_path - var/picked_reagent = pick(random_reagents) -======= ///Returns a random reagent object, with the option to blacklist reagents. /proc/get_random_reagent_id(list/blacklist) var/static/list/reagent_static_list = list() //This is static, and will be used by default if a blacklist is not passed. @@ -207,7 +197,6 @@ reagent_list_to_process += reagent_path var/picked_reagent = pick(reagent_list_to_process) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return picked_reagent ///Returns a random reagent consumable ethanol object minus blacklisted reagents diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index bfb2bb47e18..2ff1e78ac68 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -192,11 +192,7 @@ GLOBAL_LIST_INIT(achievements_unlocked, list()) if(human_mob.mind && (length(human_mob.mind.antag_datums) > 0)) for(var/datum/antagonist/antag_datums as anything in human_mob.mind.antag_datums) -<<<<<<< HEAD - if(!antag_datums.hardcore_random_bonus) //dont give bonusses to dumb stuff like revs or hypnos -======= if(!antag_datums.hardcore_random_bonus) //don't give bonuses to dumb stuff like revs or hypnos ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue if(initial(antag_datums.can_assign_self_objectives) && !antag_datums.can_assign_self_objectives) continue // You don't get a prize if you picked your own objective, you can't fail those @@ -475,11 +471,7 @@ GLOBAL_LIST_INIT(achievements_unlocked, list()) var/mob/living/silicon/ai/aiPlayer = i var/datum/mind/aiMind = aiPlayer.deployed_shell?.mind || aiPlayer.mind if(aiMind) -<<<<<<< HEAD parts += "[aiPlayer.name]'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was [span_redtext("deactivated")]"] were:" //SKYRAT EDIT CHANGE -======= - parts += "[aiPlayer.name] (Played by: [aiMind.key])'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was [span_redtext("deactivated")]"] were:" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 parts += aiPlayer.laws.get_law_list(include_zeroth=TRUE) parts += "Total law changes: [aiPlayer.law_change_counter]" @@ -490,27 +482,19 @@ GLOBAL_LIST_INIT(achievements_unlocked, list()) for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) borg_num-- if(robo.mind) -<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - ROUNDEND //parts += "[robo.name] (Played by: [robo.mind.key])[robo.stat == DEAD ? " [span_redtext("(Deactivated)")]" : ""][borg_num ?", ":""]" - SKYRAT EDIT - ORIGINAL parts += "[robo.name] [robo.stat == DEAD ? " [span_redtext("(Deactivated)")]" : ""][borg_num ?", ":""]" //SKYRAT EDIT CHANGE END -======= - parts += "[robo.name] (Played by: [robo.mind.key])[robo.stat == DEAD ? " [span_redtext("(Deactivated)")]" : ""][borg_num ?", ":""]" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!borg_spacer) borg_spacer = TRUE for (var/mob/living/silicon/robot/robo in GLOB.silicon_mobs) if (!robo.connected_ai && robo.mind) -<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - ROUNDEND //parts += "[borg_spacer?"
":""][robo.name] (Played by: [robo.mind.key]) [(robo.stat != DEAD)? "[span_greentext("survived")] as an AI-less borg!" : "was [span_redtext("unable to survive")] the rigors of being a cyborg without an AI."] Its laws were:" parts += "[borg_spacer?"
":""][robo.name] [(robo.stat != DEAD)? "[span_greentext("survived")] as an AI-less borg!" : "was [span_redtext("unable to survive")] the rigors of being a cyborg without an AI."] Its laws were:" //SKYRAT EDIT CHANGE END -======= - parts += "[borg_spacer?"
":""][robo.name] (Played by: [robo.mind.key]) [(robo.stat != DEAD)? "[span_greentext("survived")] as an AI-less borg!" : "was [span_redtext("unable to survive")] the rigors of being a cyborg without an AI."] Its laws were:" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(robo) //How the hell do we lose robo between here and the world messages directly above this? parts += robo.laws.get_law_list(include_zeroth=TRUE) @@ -719,14 +703,10 @@ GLOBAL_LIST_INIT(achievements_unlocked, list()) var/jobtext = "" if(!is_unassigned_job(ply.assigned_role)) jobtext = " the [ply.assigned_role.title]" -<<<<<<< HEAD - //SKYRAT EDIT CHANGE BEGIN - ROUNDEND + //SKYRAT EDIT CHANGE BEGIN - ROUNDEND //var/text = "[ply.key] was [ply.name][jobtext] and" - SKYRAT EDIT - ORIGINAL var/text = "[ply.name][jobtext]" //SKYRAT EDIT CHANGE END -======= - var/text = "[ply.key] was [ply.name][jobtext] and" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ply.current) if(ply.current.stat == DEAD) text += " [span_redtext("died")]" @@ -770,11 +750,7 @@ GLOBAL_LIST_INIT(achievements_unlocked, list()) parts += "Total Achievements Earned: [length(GLOB.achievements_unlocked)]!
" parts += "" return "
" diff --git a/code/__HELPERS/spatial_info.dm b/code/__HELPERS/spatial_info.dm index 5a94cef45e6..2a8b61bd01d 100644 --- a/code/__HELPERS/spatial_info.dm +++ b/code/__HELPERS/spatial_info.dm @@ -195,17 +195,12 @@ var/turf/inbetween_turf = center_turf //this is the lowest overhead way of doing a loop in dm other than a goto. distance is guaranteed to be >= steps taken to target by this algorithm -<<<<<<< HEAD - for(var/step_counter in 1 to distance) - inbetween_turf = get_step_towards(inbetween_turf, target_turf) -======= var/list/steps = get_steps_to(inbetween_turf, target_turf) if(isnull(steps)) return steps.Cut(distance + 1) for(var/direction in steps) inbetween_turf = get_step(inbetween_turf, direction) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(inbetween_turf == target_turf)//we've gotten to target's turf without returning due to turf opacity, so we must be able to see target break diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index ca46638c8ea..3d61534638e 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -157,11 +157,7 @@ * * allow_numbers - allows numbers and common special characters - used for silicon/other weird things names * * cap_after_symbols - words like Bob's will be capitalized to Bob'S by default. False is good for titles. */ -<<<<<<< HEAD /proc/reject_bad_name(t_in, allow_numbers = TRUE, max_length = MAX_NAME_LEN, ascii_only = TRUE, strict = FALSE, cap_after_symbols = TRUE) // SKYRAT EDIT CHANGE - allow_numbers to TRUE -======= -/proc/reject_bad_name(t_in, allow_numbers = FALSE, max_length = MAX_NAME_LEN, ascii_only = TRUE, strict = FALSE, cap_after_symbols = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!t_in) return //Rejects the input if it is null @@ -1232,8 +1228,6 @@ GLOBAL_LIST_INIT(binary, list("0","1")) var/input_length = LAZYLEN(ending) return !!findtext(input_text, ending, -input_length) -<<<<<<< HEAD -======= /// Returns TRUE if the input_text starts with any of the beginnings /proc/starts_with_any(input_text, list/beginnings) for(var/beginning in beginnings) @@ -1241,7 +1235,6 @@ GLOBAL_LIST_INIT(binary, list("0","1")) return TRUE return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Generate a grawlix string of length of the text argument. /proc/grawlix(text) var/grawlix = "" diff --git a/code/__HELPERS/turfs.dm b/code/__HELPERS/turfs.dm index a2a44309664..c4867ba9993 100644 --- a/code/__HELPERS/turfs.dm +++ b/code/__HELPERS/turfs.dm @@ -76,11 +76,7 @@ Turf and target are separate in case you want to teleport some distance from a t //destination_list = new() /*This will draw a block around the target turf, given what the error is. Specifying the values above will basically draw a different sort of block. -<<<<<<< HEAD - If the values are the same, it will be a square. If they are different, it will be a rectengle. -======= If the values are the same, it will be a square. If they are different, it will be a rectangle. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 In either case, it will center based on offset. Offset is position from center. Offset always calculates in relation to direction faced. In other words, depending on the direction of the teleport, the offset should remain positioned in relation to destination.*/ @@ -210,11 +206,7 @@ Turf and target are separate in case you want to teleport some distance from a t * NOTE: if your atom has non-standard bounds then this proc * will handle it, but: * if the bounds are even, then there are an even amount of "middle" turfs, the one to the EAST, NORTH, or BOTH is picked -<<<<<<< HEAD - * this may seem bad, but you're atleast as close to the center of the atom as possible, better than byond's default loc being all the way off) -======= * this may seem bad, but you're at least as close to the center of the atom as possible, better than byond's default loc being all the way off) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * if the bounds are odd, the true middle turf of the atom is returned **/ /proc/get_turf_pixel(atom/checked_atom) diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 35f1156170f..3fe456e488e 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -19,11 +19,7 @@ /// We'll use another define to convert uses of the proc over. That'll be all // #define APPEARANCE_SUCCESS_TRACKING -<<<<<<< HEAD -///Used to find the sources of harddels, quite laggy, don't be surpised if it freezes your client for a good while -======= ///Used to find the sources of harddels, quite laggy, don't be surprised if it freezes your client for a good while ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //#define REFERENCE_TRACKING #ifdef REFERENCE_TRACKING @@ -135,11 +131,7 @@ #warn compiling in TESTING mode. testing() debug messages will be visible. #endif -<<<<<<< HEAD -#ifdef CIBUILDING -======= #if defined(CIBUILDING) && !defined(OPENDREAM) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define UNIT_TESTS #endif @@ -164,12 +156,6 @@ #define CBT #endif -<<<<<<< HEAD -#if !defined(CBT) && !defined(SPACEMAN_DMM) -#warn Building with Dream Maker is no longer supported and will result in errors. -#warn In order to build, run BUILD.bat in the root directory. -#warn Consider switching to VSCode editor instead, where you can press Ctrl+Shift+B to build. -======= #if defined(OPENDREAM) #if !defined(CIBUILDING) #warn You are building with OpenDream. Remember to build TGUI manually. @@ -181,7 +167,6 @@ #warn In order to build, run BUILD.cmd in the root directory. #warn Consider switching to VSCode editor instead, where you can press Ctrl+Shift+B to build. #endif ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #endif /// Runs the game in "map test mode" diff --git a/code/_globalvars/admin.dm b/code/_globalvars/admin.dm index 23635891313..e14a56c1681 100644 --- a/code/_globalvars/admin.dm +++ b/code/_globalvars/admin.dm @@ -76,10 +76,7 @@ GLOBAL_LIST_INIT(spanname_to_formatting, list( "Drone Radio" = "drone", "Engineering Radio" = "engradio", "Extremely Big" = "extremelybig", -<<<<<<< HEAD -======= "Entertainment Radio" = "enteradio", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Game Say" = "game say", "Ghost Alert" = "ghostalert", "Green" = "green", diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 819fff7e5a4..aa06e53c37b 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -205,13 +205,10 @@ DEFINE_BITFIELD(flags_inv, list( "HIDESHOES" = HIDESHOES, "HIDESNOUT" = HIDESNOUT, "HIDESUITSTORAGE" = HIDESUITSTORAGE, -<<<<<<< HEAD "SHOWSPRITEEARS" = SHOWSPRITEEARS, // SKYRAT EDIT ADDITION START "HIDETAIL" = HIDETAIL, "HIDESPINE" = HIDESPINE, "HIDESEXTOY" = HIDESEXTOY, // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) DEFINE_BITFIELD(machine_stat, list( @@ -416,15 +413,12 @@ DEFINE_BITFIELD(bodyshape, list( "BODYSHAPE_MONKEY" = BODYSHAPE_MONKEY, "BODYSHAPE_DIGITIGRADE" = BODYSHAPE_DIGITIGRADE, "BODYSHAPE_SNOUTED" = BODYSHAPE_SNOUTED, -<<<<<<< HEAD // SKYRAT EDIT ADDITION - customization "BODYSHAPE__CUSTOM" = BODYSHAPE_CUSTOM, "BODYSHAPE__TAUR" = BODYSHAPE_TAUR, "BODYSHAPE__HIDE_SHOES" = BODYSHAPE_HIDE_SHOES, "BODYSHAPE__ALT_FACEWEAR_LAYER" = BODYSHAPE_ALT_FACEWEAR_LAYER, // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) DEFINE_BITFIELD(acceptable_bodyshape, list( @@ -432,15 +426,12 @@ DEFINE_BITFIELD(acceptable_bodyshape, list( "BODYSHAPE_MONKEY" = BODYSHAPE_MONKEY, "BODYSHAPE_DIGITIGRADE" = BODYSHAPE_DIGITIGRADE, "BODYSHAPE_SNOUTED" = BODYSHAPE_SNOUTED, -<<<<<<< HEAD // SKYRAT EDIT ADDITION - customization "BODYSHAPE__CUSTOM" = BODYSHAPE_CUSTOM, "BODYSHAPE__TAUR" = BODYSHAPE_TAUR, "BODYSHAPE__HIDE_SHOES" = BODYSHAPE_HIDE_SHOES, "BODYSHAPE__ALT_FACEWEAR_LAYER" = BODYSHAPE_ALT_FACEWEAR_LAYER, // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) DEFINE_BITFIELD(bodypart_flags, list( @@ -467,14 +458,13 @@ DEFINE_BITFIELD(supports_variations_flags, list( "CLOTHING_NO_VARIATION" = CLOTHING_NO_VARIATION, "CLOTHING_DIGITIGRADE_VARIATION" = CLOTHING_DIGITIGRADE_VARIATION, "CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON" = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON, -<<<<<<< HEAD + "CLOTHING_DIGITIGRADE_MASK" = CLOTHING_DIGITIGRADE_MASK, + // SKYRAT EDIT START "CLOTHING_SNOUTED_VARIATION" = CLOTHING_SNOUTED_VARIATION, "CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON" = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON, "CLOTHING_SNOUTED_VOX_VARIATION" = CLOTHING_SNOUTED_VOX_VARIATION, - "CLOTHING_SNOUTED_VOX_VARIATION_NO_NEW_ICON" = CLOTHING_SNOUTED_VOX_VARIATION_NO_NEW_ICON, // SKYRAT EDIT END -======= - "CLOTHING_DIGITIGRADE_MASK" = CLOTHING_DIGITIGRADE_MASK, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + "CLOTHING_SNOUTED_VOX_VARIATION_NO_NEW_ICON" = CLOTHING_SNOUTED_VOX_VARIATION_NO_NEW_ICON, + // SKYRAT EDIT END )) DEFINE_BITFIELD(flora_flags, list( @@ -531,10 +521,7 @@ DEFINE_BITFIELD(liked_foodtypes, list( "BUGS" = BUGS, "GORE" = GORE, "STONE" = STONE, -<<<<<<< HEAD "BLOODY" = BLOODY, // SKYRAT EDIT - Hemophage Food -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) DEFINE_BITFIELD(disliked_foodtypes, list( @@ -559,10 +546,7 @@ DEFINE_BITFIELD(disliked_foodtypes, list( "BUGS" = BUGS, "GORE" = GORE, "STONE" = STONE, -<<<<<<< HEAD "BLOODY" = BLOODY, // SKYRAT EDIT - Hemophage Food -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) DEFINE_BITFIELD(toxic_foodtypes, list( @@ -587,10 +571,7 @@ DEFINE_BITFIELD(toxic_foodtypes, list( "BUGS" = BUGS, "GORE" = GORE, "STONE" = STONE, -<<<<<<< HEAD "BLOODY" = BLOODY, // SKYRAT EDIT - Hemophage Food -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) DEFINE_BITFIELD(sharpness, list( diff --git a/code/_globalvars/lists/ambience.dm b/code/_globalvars/lists/ambience.dm index d1ba50f5053..3a9ab81dde4 100644 --- a/code/_globalvars/lists/ambience.dm +++ b/code/_globalvars/lists/ambience.dm @@ -1,7 +1,4 @@ -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL BEGIN -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOBAL_LIST_INIT(generic_ambience,list( 'sound/ambience/ambigen1.ogg', 'sound/ambience/ambigen2.ogg', @@ -17,10 +14,7 @@ GLOBAL_LIST_INIT(generic_ambience,list( 'sound/ambience/ambigen13.ogg', 'sound/ambience/ambigen14.ogg', )) -<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOBAL_LIST_INIT(holy_ambience,list( 'sound/ambience/ambicha1.ogg', @@ -117,10 +111,7 @@ GLOBAL_LIST_INIT(spooky_ambience,list( )) GLOBAL_LIST_INIT(space_ambience,list( -<<<<<<< HEAD 'modular_skyrat/master_files/sound/ambience/starlight.ogg', //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambispace.ogg', 'sound/ambience/ambispace2.ogg', diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 21b20b95d76..03dd87ad456 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -254,17 +254,12 @@ GLOBAL_LIST_INIT(status_display_approved_pictures, list( "lockdown", "greenalert", "bluealert", -<<<<<<< HEAD "violetalert", // SKYRAT EDIT ADD - Alert Levels "orangealert", // SKYRAT EDIT ADD - Alert Levels "amberalert", // SKYRAT EDIT ADD - Alert Levels "redalert", "deltaalert", "gammaalert", // SKYRAT EDIT ADD - Alert Levels -======= - "redalert", - "deltaalert", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "radiation", "currentalert", //For automatic set of status display on current level )) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 5b74ee059f4..4ccca8fae56 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -257,20 +257,12 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items list(//computer disks /obj/item/computer_disk/maintenance/scanner = 1, -<<<<<<< HEAD ///obj/item/computer_disk/maintenance/camera = 1, //SKYRAT EDIT REMOVAL - Available To Crew Now -======= - /obj/item/computer_disk/maintenance/camera = 1, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/computer_disk/maintenance/modsuit_control = 1, /obj/item/computer_disk/maintenance/spectre_meter = 1, /obj/item/computer_disk/maintenance/arcade = 1, /obj/item/computer_disk/maintenance/theme = 3, -<<<<<<< HEAD ) = 3, //SKYRAT EDIT CHANGE - Original : 4 -======= - ) = 4, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 list(//modsuits /obj/effect/spawner/random/mod/maint = 3, diff --git a/code/_globalvars/lists/poll_ignore.dm b/code/_globalvars/lists/poll_ignore.dm index 3e01fbc8015..9dcdf05db73 100644 --- a/code/_globalvars/lists/poll_ignore.dm +++ b/code/_globalvars/lists/poll_ignore.dm @@ -1,10 +1,7 @@ //Each lists stores ckeys for "Never for this round" option category #define POLL_IGNORE_ACADEMY_WIZARD "academy_wizard" -<<<<<<< HEAD #define POLL_IGNORE_CORTICAL_BORER "cortical_borer" // SKYRAT EDIT - Cortical Borer -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define POLL_IGNORE_ALIEN_LARVA "alien_larva" #define POLL_IGNORE_ASH_SPIRIT "ash_spirit" #define POLL_IGNORE_ASHWALKER "ashwalker" @@ -43,10 +40,7 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list( POLL_IGNORE_ACADEMY_WIZARD = "Academy Wizard Defender", -<<<<<<< HEAD POLL_IGNORE_CORTICAL_BORER = "Cortical Borer", // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 POLL_IGNORE_ALIEN_LARVA = "Xenomorph larva", POLL_IGNORE_ASH_SPIRIT = "Ash Spirit", POLL_IGNORE_ASHWALKER = "Ashwalker eggs", diff --git a/code/_globalvars/lists/quirks.dm b/code/_globalvars/lists/quirks.dm index 2afc1f65586..0f7bd890888 100644 --- a/code/_globalvars/lists/quirks.dm +++ b/code/_globalvars/lists/quirks.dm @@ -8,11 +8,8 @@ GLOBAL_LIST_INIT(nearsighted_glasses, list( "Thin" = /obj/item/clothing/glasses/regular/thin, "Jamjar" = /obj/item/clothing/glasses/regular/jamjar, "Binoclard" = /obj/item/clothing/glasses/regular/kim, -<<<<<<< HEAD "Modern" = /obj/item/clothing/glasses/regular/betterunshit, // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) ///Options for the prosthetic limb quirk to choose from diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm index cd532b321cc..6cd4cf62e07 100644 --- a/code/_globalvars/lists/reagents.dm +++ b/code/_globalvars/lists/reagents.dm @@ -35,7 +35,6 @@ GLOBAL_LIST_INIT(reagent_containers, list( CAT_PATCHES = typecacheof(list( /obj/item/reagent_containers/pill/patch/style )), -<<<<<<< HEAD // SKYRAT EDIT ADDITION START CAT_HYPOS = typecacheof(list( /obj/item/reagent_containers/cup/vial/small/style, @@ -45,8 +44,6 @@ GLOBAL_LIST_INIT(reagent_containers, list( /obj/item/reagent_containers/syringe/smartdart )), // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /// list of all /datum/chemical_reaction datums indexed by their typepath. Use this for general lookup stuff @@ -61,11 +58,7 @@ GLOBAL_LIST_INIT(chemical_reagents_list, init_chemical_reagent_list()) GLOBAL_LIST(chemical_reactions_results_lookup_list) /// list of all reagents that are parent types used to define a bunch of children - but aren't used themselves as anything. GLOBAL_LIST(fake_reagent_blacklist) -<<<<<<< HEAD -/// Turfs metalgen cant touch -======= /// Turfs metalgen can't touch ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOBAL_LIST_INIT(blacklisted_metalgen_types, typecacheof(list( /turf/closed/indestructible, //indestructible turfs should be indestructible, metalgen transmutation to plasma allows them to be destroyed /turf/open/indestructible @@ -192,11 +185,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagentlist()) /proc/build_name2reagentlist() . = list() -<<<<<<< HEAD - //build map with keys stored seperatly -======= //build map with keys stored separately ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/name_to_reagent = list() var/list/only_names = list() for (var/datum/reagent/reagent as anything in GLOB.chemical_reagents_list) diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm index 89b38ee7fe0..2f05cedf316 100644 --- a/code/_globalvars/logging.dm +++ b/code/_globalvars/logging.dm @@ -41,10 +41,6 @@ DECLARE_LOG_NAMED(harddel_log, "harddels", START_LOG) DECLARE_LOG_NAMED(test_log, "tests", START_LOG) #endif -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Picture logging GLOBAL_VAR(picture_log_directory) GLOBAL_PROTECT(picture_log_directory) diff --git a/code/_globalvars/tgui.dm b/code/_globalvars/tgui.dm index df34a04efe6..a81078420f5 100644 --- a/code/_globalvars/tgui.dm +++ b/code/_globalvars/tgui.dm @@ -1,7 +1,4 @@ GLOBAL_DATUM(crew_manifest_tgui, /datum/crew_manifest) GLOBAL_DATUM(changelog_tgui, /datum/changelog) GLOBAL_DATUM(hotkeys_tgui, /datum/hotkeys_help) -<<<<<<< HEAD GLOBAL_DATUM(record_manifest_tgui, /datum/record_manifest) //SKYRAT EDIT ADDITION -- EXPLOITABLE VERB -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index 1d3b2c4d80f..98bfcea121b 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -19,26 +19,16 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_DRYABLE" = TRAIT_DRYABLE, "TRAIT_FOOD_CHEF_MADE" = TRAIT_FOOD_CHEF_MADE, "TRAIT_FOOD_FRIED" = TRAIT_FOOD_FRIED, -<<<<<<< HEAD - "TRAIT_FOOD_SILVER" = TRAIT_FOOD_SILVER, - "TRAIT_KEEP_TOGETHER" = TRAIT_KEEP_TOGETHER, - "TRAIT_LIGHTING_DEBUGGED" = TRAIT_LIGHTING_DEBUGGED, -======= "TRAIT_QUALITY_FOOD_INGREDIENT" = TRAIT_QUALITY_FOOD_INGREDIENT, "TRAIT_FOOD_SILVER" = TRAIT_FOOD_SILVER, "TRAIT_KEEP_TOGETHER" = TRAIT_KEEP_TOGETHER, "TRAIT_LIGHTING_DEBUGGED" = TRAIT_LIGHTING_DEBUGGED, "TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION" = TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_RECENTLY_COINED" = TRAIT_RECENTLY_COINED, "TRAIT_RUSTY" = TRAIT_RUSTY, "TRAIT_SPINNING" = TRAIT_SPINNING, "TRAIT_STICKERED" = TRAIT_STICKERED, "TRAIT_UNHITTABLE_BY_PROJECTILES" = TRAIT_UNHITTABLE_BY_PROJECTILES, -<<<<<<< HEAD - "TRAIT_COMMISSIONED" = TRAIT_COMMISSIONED, -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ), /atom/movable = list( "TRAIT_ACTIVE_STORAGE" = TRAIT_ACTIVE_STORAGE, @@ -123,30 +113,22 @@ GLOBAL_LIST_INIT(traits_by_type, list( /datum/wound = list( "TRAIT_WOUND_SCANNED" = TRAIT_WOUND_SCANNED, ), -<<<<<<< HEAD // SKYRAT EDIT ADDITON BEGIN - Synthetic wounds /datum/wound/electrical_damage = list( "TRAIT_ELECTRICAL_DAMAGE_REPAIRING" = TRAIT_ELECTRICAL_DAMAGE_REPAIRING, ), // SKYRAT EDIT ADDITON END - Synthetic wounds -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj = list( "TRAIT_WALLMOUNTED" = TRAIT_WALLMOUNTED, "TRAIT_CONTRABAND" = TRAIT_CONTRABAND, ), /mob = list( -<<<<<<< HEAD - "TRAIT_ABDUCTOR_SCIENTIST_TRAINING" = TRAIT_ABDUCTOR_SCIENTIST_TRAINING, - "TRAIT_ABDUCTOR_TRAINING" = TRAIT_ABDUCTOR_TRAINING, -======= "TRAIT_AI_ACCESS" = TRAIT_AI_ACCESS, "TRAIT_ABDUCTOR_SCIENTIST_TRAINING" = TRAIT_ABDUCTOR_SCIENTIST_TRAINING, "TRAIT_ABDUCTOR_TRAINING" = TRAIT_ABDUCTOR_TRAINING, "TRAIT_ACT_AS_CULTIST" = TRAIT_ACT_AS_CULTIST, "TRAIT_ACT_AS_HERETIC" = TRAIT_ACT_AS_HERETIC, "TRAIT_ACTIVELY_FISHING" = TRAIT_ACTIVELY_FISHING, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_ADAMANTINE_EXTRACT_ARMOR" = TRAIT_ADAMANTINE_EXTRACT_ARMOR, "TRAIT_ADVANCEDTOOLUSER" = TRAIT_ADVANCEDTOOLUSER, "TRAIT_AGENDER" = TRAIT_AGENDER, @@ -176,10 +158,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_BIRTHDAY_BOY" = TRAIT_BIRTHDAY_BOY, "TRAIT_BLOB_ALLY" = TRAIT_BLOB_ALLY, "TRAIT_BLOCK_SHUTTLE_MOVEMENT" = TRAIT_BLOCK_SHUTTLE_MOVEMENT, -<<<<<<< HEAD -======= "TRAIT_BLOCKING_PROJECTILES" = TRAIT_BLOCKING_PROJECTILES, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_BLOOD_CLANS" = TRAIT_BLOOD_CLANS, "TRAIT_BLOODSHOT_EYES" = TRAIT_BLOODSHOT_EYES, "TRAIT_BLOODY_MESS" = TRAIT_BLOODY_MESS, @@ -477,18 +456,11 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_SHOCKIMMUNE" = TRAIT_SHOCKIMMUNE, "TRAIT_SIGN_LANG" = TRAIT_SIGN_LANG, "TRAIT_SILENT_FOOTSTEPS" = TRAIT_SILENT_FOOTSTEPS, -<<<<<<< HEAD -======= "TRAIT_SILICON_ACCESS" = TRAIT_SILICON_ACCESS, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_SILICON_EMOTES_ALLOWED" = TRAIT_SILICON_EMOTES_ALLOWED, "TRAIT_SIXTHSENSE" = TRAIT_SIXTHSENSE, "TRAIT_SKITTISH" = TRAIT_SKITTISH, "TRAIT_SLEEPIMMUNE" = TRAIT_SLEEPIMMUNE, -<<<<<<< HEAD - "TRAIT_SLOW_FLIP" = TRAIT_SLOW_FLIP, -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_SMOKER" = TRAIT_SMOKER, "TRAIT_SNEAK" = TRAIT_SNEAK, "TRAIT_SNOB" = TRAIT_SNOB, @@ -577,11 +549,8 @@ GLOBAL_LIST_INIT(traits_by_type, list( ), /obj/item = list( "TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING, -<<<<<<< HEAD -======= "TRAIT_BAIT_ALLOW_FISHING_DUD" = TRAIT_BAIT_ALLOW_FISHING_DUD, "TRAIT_BAIT_IGNORE_ENVIRONMENT" = TRAIT_BAIT_IGNORE_ENVIRONMENT, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_BAIT_UNCONSUMABLE" = TRAIT_BAIT_UNCONSUMABLE, "TRAIT_BAKEABLE" = TRAIT_BAKEABLE, "TRAIT_BASIC_QUALITY_BAIT" = TRAIT_BASIC_QUALITY_BAIT, @@ -607,10 +576,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_NODROP" = TRAIT_NODROP, "TRAIT_OMNI_BAIT" = TRAIT_OMNI_BAIT, "TRAIT_PLANT_WILDMUTATE" = TRAIT_PLANT_WILDMUTATE, -<<<<<<< HEAD -======= "TRAIT_POISONOUS_BAIT" = TRAIT_POISONOUS_BAIT, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_T_RAY_VISIBLE" = TRAIT_T_RAY_VISIBLE, "TRAIT_TRANSFORM_ACTIVE" = TRAIT_TRANSFORM_ACTIVE, "TRAIT_UNCATCHABLE" = TRAIT_UNCATCHABLE, @@ -641,20 +607,6 @@ GLOBAL_LIST_INIT(traits_by_type, list( /obj/item/fish = list( "TRAIT_FISH_AMPHIBIOUS" = TRAIT_FISH_AMPHIBIOUS, "TRAIT_FISH_CROSSBREEDER" = TRAIT_FISH_CROSSBREEDER, -<<<<<<< HEAD - "TRAIT_FISH_FED_LUBE" = TRAIT_FISH_FED_LUBE, - "TRAIT_FISH_FLOPPING" = TRAIT_FISH_FLOPPING, - "TRAIT_FISH_FROM_CASE" = TRAIT_FISH_FROM_CASE, - "TRAIT_FISH_NO_HUNGER" = TRAIT_FISH_NO_HUNGER, - "TRAIT_FISH_NO_MATING" = TRAIT_FISH_NO_MATING, - "TRAIT_FISH_SELF_REPRODUCE" = TRAIT_FISH_SELF_REPRODUCE, - "TRAIT_FISH_STASIS" = TRAIT_FISH_STASIS, - "TRAIT_FISH_TOXIN_IMMUNE" = TRAIT_FISH_TOXIN_IMMUNE, - "TRAIT_FISH_ELECTROGENESIS" = TRAIT_FISH_ELECTROGENESIS, - "TRAIT_RESIST_EMULSIFY" = TRAIT_RESIST_EMULSIFY, - "TRAIT_YUCKY_FISH" = TRAIT_YUCKY_FISH, - ), -======= "TRAIT_FISH_ELECTROGENESIS" = TRAIT_FISH_ELECTROGENESIS, "TRAIT_FISH_FED_LUBE" = TRAIT_FISH_FED_LUBE, "TRAIT_FISH_FLOPPING" = TRAIT_FISH_FLOPPING, @@ -674,7 +626,6 @@ GLOBAL_LIST_INIT(traits_by_type, list( /obj/item/fishing_rod = list( "TRAIT_ROD_REMOVE_FISHING_DUD" = TRAIT_ROD_REMOVE_FISHING_DUD, ), ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/integrated_circuit = list( "TRAIT_CIRCUIT_UI_OPEN" = TRAIT_CIRCUIT_UI_OPEN, "TRAIT_CIRCUIT_UNDUPABLE" = TRAIT_CIRCUIT_UNDUPABLE, @@ -708,12 +659,6 @@ GLOBAL_LIST_INIT(traits_by_type, list( /obj/machinery/modular_computer = list( "TRAIT_MODPC_INTERACTING_WITH_FRAME" = TRAIT_MODPC_INTERACTING_WITH_FRAME, ), -<<<<<<< HEAD - /obj/projectile = list( - "TRAIT_ALWAYS_HIT_ZONE" = TRAIT_ALWAYS_HIT_ZONE, - ), -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure = list( "TRAIT_RADSTORM_IMMUNE" = TRAIT_RADSTORM_IMMUNE, ), @@ -737,7 +682,6 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_TURF_IGNORE_SLIPPERY" = TRAIT_TURF_IGNORE_SLIPPERY, "TRAIT_TURF_IGNORE_SLOWDOWN" = TRAIT_TURF_IGNORE_SLOWDOWN, ), -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - SKYRAT TRAITS /obj/item/toy/plush/skyrat = list( "TRAIT_AFFECTION_AVERSION" = TRAIT_AFFECTION_AVERSION, @@ -815,8 +759,6 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_CLOTHES_DAMAGED_BY_PIERCING" = TRAIT_CLOTHES_DAMAGED_BY_PIERCING, ), // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /// value -> trait name, list of ALL traits that exist in the game, used for any type of accessing. diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm index 69e6c78c810..c96dfda1a68 100644 --- a/code/_globalvars/traits/admin_tooling.dm +++ b/code/_globalvars/traits/admin_tooling.dm @@ -26,11 +26,8 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( /mob = list( "TRAIT_ABDUCTOR_SCIENTIST_TRAINING" = TRAIT_ABDUCTOR_SCIENTIST_TRAINING, "TRAIT_ABDUCTOR_TRAINING" = TRAIT_ABDUCTOR_TRAINING, -<<<<<<< HEAD -======= "TRAIT_ACT_AS_CULTIST" = TRAIT_ACT_AS_CULTIST, "TRAIT_ACT_AS_HERETIC" = TRAIT_ACT_AS_HERETIC, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_ADVANCEDTOOLUSER" = TRAIT_ADVANCEDTOOLUSER, "TRAIT_AGENDER" = TRAIT_AGENDER, "TRAIT_AGEUSIA" = TRAIT_AGEUSIA, @@ -263,10 +260,6 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_SIXTHSENSE" = TRAIT_SIXTHSENSE, "TRAIT_SKITTISH" = TRAIT_SKITTISH, "TRAIT_SLEEPIMMUNE" = TRAIT_SLEEPIMMUNE, -<<<<<<< HEAD - "TRAIT_SLOW_FLIP" = TRAIT_SLOW_FLIP, -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "TRAIT_SMOKER" = TRAIT_SMOKER, "TRAIT_SNOB" = TRAIT_SNOB, "TRAIT_SOFTSPOKEN" = TRAIT_SOFTSPOKEN, @@ -341,18 +334,6 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_MAGNETIC_ID_CARD" = TRAIT_MAGNETIC_ID_CARD, ), /obj/item/fish = list( -<<<<<<< HEAD - "TRAIT_FISH_CROSSBREEDER" = TRAIT_FISH_CROSSBREEDER, - "TRAIT_FISH_FED_LUBE" = TRAIT_FISH_FED_LUBE, - "TRAIT_FISH_NO_HUNGER" = TRAIT_FISH_NO_HUNGER, - "TRAIT_FISH_NO_MATING" = TRAIT_FISH_NO_MATING, - "TRAIT_FISH_SELF_REPRODUCE" = TRAIT_FISH_SELF_REPRODUCE, - "TRAIT_FISH_STASIS" = TRAIT_FISH_STASIS, - "TRAIT_FISH_TOXIN_IMMUNE" = TRAIT_FISH_TOXIN_IMMUNE, - "TRAIT_RESIST_EMULSIFY" = TRAIT_RESIST_EMULSIFY, - "TRAIT_YUCKY_FISH" = TRAIT_YUCKY_FISH, - ), -======= "TRAIT_FISH_AMPHIBIOUS" = TRAIT_FISH_AMPHIBIOUS, "TRAIT_FISH_CROSSBREEDER" = TRAIT_FISH_CROSSBREEDER, "TRAIT_FISH_ELECTROGENESIS" = TRAIT_FISH_ELECTROGENESIS, @@ -373,7 +354,6 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( /obj/item/fishing_rod = list( "TRAIT_ROD_REMOVE_FISHING_DUD" = TRAIT_ROD_REMOVE_FISHING_DUD, ), ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/liver = list( "TRAIT_BALLMER_SCIENTIST" = TRAIT_BALLMER_SCIENTIST, "TRAIT_COMEDY_METABOLISM" = TRAIT_COMEDY_METABOLISM, @@ -389,7 +369,6 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( /obj/item/organ/internal/lungs = list( "TRAIT_SPACEBREATHING" = TRAIT_SPACEBREATHING, ), -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - SKYRAT TRAITS /obj/item/toy/plush/skyrat = list( "TRAIT_AFFECTION_AVERSION" = TRAIT_AFFECTION_AVERSION, @@ -466,8 +445,6 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_CLOTHES_DAMAGED_BY_PIERCING" = TRAIT_CLOTHES_DAMAGED_BY_PIERCING, ), // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /// value -> trait name, generated as needed for adminning. diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index 9bc25f034fe..a06e6f56293 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -111,11 +111,7 @@ for AI shift, ctrl, and alt clicking. */ -<<<<<<< HEAD /mob/living/silicon/ai/CtrlShiftClickOn(atom/target) // Procs overriden in modular_skyrat/modules/Silicon_QoL -======= -/mob/living/silicon/ai/CtrlShiftClickOn(atom/target) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.AICtrlShiftClick(src) /mob/living/silicon/ai/ShiftClickOn(atom/target) @@ -151,19 +147,6 @@ /* Atom Procs */ /atom/proc/AICtrlClick(mob/living/silicon/ai/user) -<<<<<<< HEAD -======= - return - -/atom/proc/ai_click_alt(mob/living/silicon/ai/user) - SHOULD_CALL_PARENT(FALSE) - return - -/atom/proc/AIShiftClick(mob/living/silicon/ai/user) - return - -/atom/proc/AICtrlShiftClick(mob/living/silicon/ai/user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return /atom/proc/ai_click_alt(mob/living/silicon/ai/user) @@ -175,6 +158,7 @@ /atom/proc/AICtrlShiftClick(mob/living/silicon/ai/user) return + /* Airlocks */ /obj/machinery/door/airlock/AICtrlClick(mob/living/silicon/ai/user) // Bolts doors if(obj_flags & EMAGGED) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 17fd56856c6..6696d985d0b 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -101,11 +101,7 @@ CtrlClickOn(A) return -<<<<<<< HEAD - if(incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS)) -======= if(INCAPACITATED_IGNORING(src, INCAPABLE_RESTRAINTS|INCAPABLE_STASIS)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return face_atom(A) @@ -263,17 +259,12 @@ var/obj/dummy = new(get_turf(here)) dummy.pass_flags |= PASSTABLE dummy.SetInvisibility(INVISIBILITY_ABSTRACT) -<<<<<<< HEAD - for(var/i in 1 to reach) //Limit it to that many tries - var/turf/T = get_step(dummy, get_dir(dummy, there)) -======= var/list/steps = get_steps_to(dummy, there) if(isnull(steps) || length(steps) > reach) // If the path is further than the reach, no way we can reach it anyways. qdel(dummy) return FALSE for(var/direction in steps) var/turf/next_step = get_step(dummy, direction) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(dummy.CanReach(there)) qdel(dummy) return TRUE diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 0e30fb12c37..de63932c5f6 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -58,11 +58,7 @@ return if(W) -<<<<<<< HEAD - if(incapacitated()) -======= if(incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return //while buckled, you can still connect to and control things like doors, but you can't use your modules @@ -95,11 +91,7 @@ //Give cyborgs hotkey clicks without breaking existing uses of hotkey clicks // for non-doors/apcs -<<<<<<< HEAD /mob/living/silicon/robot/CtrlShiftClickOn(atom/target) // Procs overriden in modular_skyrat/modules/Silicon_QoL -======= -/mob/living/silicon/robot/CtrlShiftClickOn(atom/target) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.BorgCtrlShiftClick(src) /mob/living/silicon/robot/ShiftClickOn(atom/target) @@ -211,10 +203,7 @@ attack_ai(user) return -<<<<<<< HEAD */ //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * What happens when the cyborg without active module holds right-click on an item. Returns a SECONDARY_ATTACK_* value. diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm index 18e0cedaec6..aaad7457f6d 100644 --- a/code/_onclick/hud/ai.dm +++ b/code/_onclick/hud/ai.dm @@ -2,11 +2,7 @@ icon = 'icons/hud/screen_ai.dmi' /atom/movable/screen/ai/Click() -<<<<<<< HEAD - if(isobserver(usr) || usr.incapacitated()) -======= if(isobserver(usr) || usr.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /atom/movable/screen/ai/aicore diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 9fd5cacfdaa..c3a94e932db 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -49,7 +49,6 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( var/inventory_shown = FALSE //Equipped item inventory var/hotkey_ui_hidden = FALSE //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons) -<<<<<<< HEAD var/atom/movable/screen/ammo_counter //SKYRAT EDIT ADDITION var/atom/movable/screen/blobpwrdisplay @@ -59,15 +58,6 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( var/atom/movable/screen/combo/combo_display -======= - var/atom/movable/screen/blobpwrdisplay - - var/atom/movable/screen/alien_plasma_display - var/atom/movable/screen/alien_queen_finder - - var/atom/movable/screen/combo/combo_display - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/atom/movable/screen/action_intent var/atom/movable/screen/zone_select var/atom/movable/screen/pull_icon @@ -138,21 +128,13 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( // and avoid needing to make changes to all idk 300 consumers if we want to change the appearance var/list/asset_refs_for_reuse = list() - // List of weakrefs to objects that we add to our screen that we don't expect to DO anything - // They typically use * in their render target. They exist solely so we can reuse them, - // and avoid needing to make changes to all idk 300 consumers if we want to change the appearance - var/list/asset_refs_for_reuse = list() - /datum/hud/New(mob/owner) mymob = owner if (!ui_style) // will fall back to the default if any of these are null ui_style = ui_style2icon(owner.client?.prefs?.read_preference(/datum/preference/choiced/ui_style)) -<<<<<<< HEAD erp_ui_style = erp_ui_style2icon(owner.client?.prefs?.read_preference(/datum/preference/choiced/ui_style)) //SKYRAT EDIT - ADDITION - ERP ICONS FIX -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 toggle_palette = new() toggle_palette.set_hud(src) @@ -288,13 +270,10 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( alien_queen_finder = null combo_display = null -<<<<<<< HEAD //SKYRAT EDIT ADDITION START - SKYRAT HUD wanted_lvl = null // SKYRAT EDIT ADDITION END - SKYRAT HUD -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 QDEL_LIST_ASSOC_VAL(master_groups) QDEL_LIST_ASSOC_VAL(plane_master_controllers) QDEL_LIST(always_visible_inventory) diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 45fe1886fe0..2d7e06289a6 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -295,12 +295,9 @@ combo_display = new /atom/movable/screen/combo(null, src) infodisplay += combo_display -<<<<<<< HEAD ammo_counter = new /atom/movable/screen/ammo_counter(null, src) //SKYRAT EDIT ADDITION infodisplay += ammo_counter //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv @@ -376,11 +373,8 @@ screenmob.client.screen -= H.wear_neck if(H.head) screenmob.client.screen -= H.head -<<<<<<< HEAD -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/hud/human/persistent_inventory_update(mob/viewer) if(!mymob) diff --git a/code/_onclick/hud/new_player.dm b/code/_onclick/hud/new_player.dm index 2bae526986d..e909870eb00 100644 --- a/code/_onclick/hud/new_player.dm +++ b/code/_onclick/hud/new_player.dm @@ -1,7 +1,4 @@ -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - Custom HTML Lobby Screen -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define SHUTTER_MOVEMENT_DURATION 0.4 SECONDS #define SHUTTER_WAIT_DURATION 0.2 SECONDS /// Maximum number of station trait buttons we will display, please think hard before creating scenarios where there are more than this @@ -114,10 +111,6 @@ return flick("[base_icon_state]_pressed", src) update_appearance(UPDATE_ICON) -<<<<<<< HEAD - SEND_SOUND(hud.mymob, sound('modular_skyrat/master_files/sound/effects/save.ogg')) //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /atom/movable/screen/lobby/button/MouseEntered(location,control,params) @@ -216,16 +209,6 @@ if(!.) return var/mob/dead/new_player/new_player = hud.mymob -<<<<<<< HEAD - - // SKYRAT EDIT BEGIN - if(!is_admin(new_player.client) && length_char(new_player.client?.prefs?.read_preference(/datum/preference/text/flavor_text)) < FLAVOR_TEXT_CHAR_REQUIREMENT) - to_chat(new_player, span_notice("You need at least [FLAVOR_TEXT_CHAR_REQUIREMENT] characters of flavor text to ready up for the round. You have [length_char(new_player.client.prefs.read_preference(/datum/preference/text/flavor_text))] characters.")) - return - // SKYRAT EDIT END - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ready = !ready if(ready) new_player.ready = PLAYER_READY_TO_PLAY @@ -289,25 +272,12 @@ to_chat(new_player, span_notice("You have been added to the queue to join the game. Your position in queue is [SSticker.queued_players.len].")) return -<<<<<<< HEAD - // SKYRAT EDIT BEGIN - if(length_char(new_player.client.prefs.read_preference(/datum/preference/text/flavor_text)) <= FLAVOR_TEXT_CHAR_REQUIREMENT) - to_chat(new_player, span_notice("You need at least [FLAVOR_TEXT_CHAR_REQUIREMENT] characters of flavor text to join the round. You have [length_char(new_player.client.prefs.read_preference(/datum/preference/text/flavor_text))] characters.")) - return - // SKYRAT EDIT END - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!LAZYACCESS(params2list(params), CTRL_CLICK)) GLOB.latejoin_menu.ui_interact(new_player) else to_chat(new_player, span_warning("Opening emergency fallback late join menu! If THIS doesn't show, ahelp immediately!")) GLOB.latejoin_menu.fallback_ui(new_player) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/screen/lobby/button/join/proc/show_join_button() SIGNAL_HANDLER set_button_status(TRUE) @@ -601,7 +571,4 @@ #undef SHUTTER_MOVEMENT_DURATION #undef SHUTTER_WAIT_DURATION #undef MAX_STATION_TRAIT_BUTTONS_VERTICAL -<<<<<<< HEAD */ // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/_onclick/hud/parallax/parallax.dm b/code/_onclick/hud/parallax/parallax.dm index 91055ec565b..135c3f0caef 100755 --- a/code/_onclick/hud/parallax/parallax.dm +++ b/code/_onclick/hud/parallax/parallax.dm @@ -273,11 +273,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/parallax_layer) /atom/movable/screen/parallax_layer/Initialize(mapload, datum/hud/hud_owner, template = FALSE) . = ..() -<<<<<<< HEAD - // Parallax layers are independant of hud, they care about client -======= // Parallax layers are independent of hud, they care about client ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Not doing this will just create a bunch of hard deletes set_new_hud(hud_owner = null) @@ -339,11 +335,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/parallax_layer) /atom/movable/screen/parallax_layer/planet icon_state = "planet" blend_mode = BLEND_OVERLAY -<<<<<<< HEAD - absolute = TRUE //Status of seperation -======= absolute = TRUE //Status of separation ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 speed = 3 layer = 30 diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index b608ced23d4..6ee994cf79c 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -119,9 +119,6 @@ GLOBAL_LIST_EMPTY(radial_menus) ///A replacement icon state for the generic radial slice bg icon. Doesn't affect the next page nor the center buttons var/radial_slice_icon - ///A replacement icon state for the generic radial slice bg icon. Doesn't affect the next page nor the center buttons - var/radial_slice_icon - //If we swap to vis_contens inventory these will need a redo /datum/radial_menu/proc/check_screen_border(mob/user) var/atom/movable/AM = anchor @@ -165,10 +162,7 @@ GLOBAL_LIST_EMPTY(radial_menus) var/elements_to_add = max_elements - elements.len for(var/i in 1 to elements_to_add) //Create all elements var/atom/movable/screen/radial/slice/new_element = new /atom/movable/screen/radial/slice -<<<<<<< HEAD new_element.icon = icon_path //SKYRAT EDIT ADDITION - GUNPOINT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new_element.tooltips = use_tooltips new_element.set_parent(src) elements += new_element diff --git a/code/_onclick/hud/rendering/_render_readme.md b/code/_onclick/hud/rendering/_render_readme.md index 1d21b610415..493b9c68491 100644 --- a/code/_onclick/hud/rendering/_render_readme.md +++ b/code/_onclick/hud/rendering/_render_readme.md @@ -8,19 +8,11 @@ ## Byond internal functionality This part of the guide will assume that you have read the byond reference entry for rendering at www.byond.com/docs/ref//#/{notes}/renderer -<<<<<<< HEAD -When you create an atom, this will always create an internal byond structure called an "appearance". This appearance you will likely be familiar with, as it is exposed through the /atom/var/appearance var. This appearance var holds data on how to render the object, ie what icon/icon_state/color etc it is using. Note that appearance vars will always copy, and do not hold a reference. When you update a var, for example lets pretend we add a filter, the appearance will be updated to include the filter. Note that, however, vis_contents objets are uniquely excluded from appearances. Then, when the filter is updated, the appearance will be recreated, and the atom marked as "dirty". After it has been updated, the SendMaps() function (sometimes also called maptick), which is a internal byond function that iterates over all objects in a clients view and in the clients.mob.contents, checks for "dirty" atoms, then resends any "dirty" appearances to clients as needed and unmarks them as dirty. This function is notoriosly slow, but we can see its tick usage through the world.map_cpu var. We can also avoid more complex checks checking whether an object is visible on a clients screen by using the TILE_BOUND appearance flag. - -Finally, we arrive at clientside behavior, where we have two main clientside functions: GetMapIcons, and Render. GetMapIcons is repsonsible for actual rendering calculations on the clientside, such as "Group Icons and Set bounds", which performs clientside calculations for transform matrixes. Note that particles here are handled in a separate thread and are not diplayed in the clientside profiler. Render handles the actual drawing of the screen. - -For debugging rendering issues its reccomended you do two things: -======= When you create an atom, this will always create an internal byond structure called an "appearance". This appearance you will likely be familiar with, as it is exposed through the /atom/var/appearance var. This appearance var holds data on how to render the object, ie what icon/icon_state/color etc it is using. Note that appearance vars will always copy, and do not hold a reference. When you update a var, for example lets pretend we add a filter, the appearance will be updated to include the filter. Note that, however, vis_contents objets are uniquely excluded from appearances. Then, when the filter is updated, the appearance will be recreated, and the atom marked as "dirty". After it has been updated, the SendMaps() function (sometimes also called maptick), which is a internal byond function that iterates over all objects in a clients view and in the clients.mob.contents, checks for "dirty" atoms, then resends any "dirty" appearances to clients as needed and unmarks them as dirty. This function is notoriously slow, but we can see its tick usage through the world.map_cpu var. We can also avoid more complex checks checking whether an object is visible on a clients screen by using the TILE_BOUND appearance flag. Finally, we arrive at clientside behavior, where we have two main clientside functions: GetMapIcons, and Render. GetMapIcons is responsible for actual rendering calculations on the clientside, such as "Group Icons and Set bounds", which performs clientside calculations for transform matrixes. Note that particles here are handled in a separate thread and are not displayed in the clientside profiler. Render handles the actual drawing of the screen. For debugging rendering issues its recommended you do two things: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 A) Talk to someone who has inside knowledge(like lummox) about it, most of this is undocumented and bugs often B) Use the undocumented debug printer which reads of data on icons rendering, this is very dense but can be useful in some cases. To use: Right click top tab -> Options & Messages -> Client -> Command -> Enter ".debug profile mapicons" and press Enter -> go to your Byond directory and find BYOND/cfg/mapicons.json . Yes this is one giant one-line json. @@ -30,15 +22,9 @@ The following is an incomplete list of pitfalls that come from byond snowflake t 1. Transforms are very slow on clientside. This is not usually noticable, but if you start using large amounts of them it will grind you to a halt quickly, regardless of whether its on overlays or objs 2. The darkness plane. This is unused, as it doesn't work with our rendering format, so this section is purely academic. The darkness plane has specific variables it needs to render correctly, and these can be found in the plane masters file. it is composed internally of two parts, a black mask over the clients screen, and a non rendering mask that blocks all luminosity=0 turfs and their contents from rendering if the SEE_BLACKNESS flag is set properly. The blocker will always block rendering but the mask can be layered under other objects. 3. render_target/source. Render_target/source will only copy certain rendering instructions, and these are only defined as "etc." in the byond reference. Known non copied appearance vars include: blend_mode, plane, layer, vis_contents, mouse_opacity... -<<<<<<< HEAD -4. Large icons on the screen that peek over the edge will instead of only rendering partly like you would expect will instead stretch the screen while not adgusting the render buffer, which means that you can actively see as tiles and map objects are rendered. You can use this for an easy "offscreen" UI. -5. Numerically large filters on objects of any size will torpedo performance, even though large objects with small filters will perform massively better. (ie blur(size=20) BAD) -6. Texture Atlas: the texture atlas byond uses to render icons is very susceptible to corruption and can regularily replace icons with other icons or just not render at all. This can be exasperated by alt tabbing or pausing the dreamseeker process. -======= 4. Large icons on the screen that peek over the edge will instead of only rendering partly like you would expect will instead stretch the screen while not adjusting the render buffer, which means that you can actively see as tiles and map objects are rendered. You can use this for an easy "offscreen" UI. 5. Numerically large filters on objects of any size will torpedo performance, even though large objects with small filters will perform massively better. (ie blur(size=20) BAD) 6. Texture Atlas: the texture atlas byond uses to render icons is very susceptible to corruption and can regularly replace icons with other icons or just not render at all. This can be exasperated by alt tabbing or pausing the dreamseeker process. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 7. The renderer is awful code and lummox said he will try changing a large part of it for 515 so keep an eye on that 8. Byond uses DirectX 9 (Lummox said he wants to update to DirectX 11) 9. Particles are just fancy overlays and are not independent of their owner @@ -46,11 +32,7 @@ The following is an incomplete list of pitfalls that come from byond snowflake t 11. Displacement filter: The byond "displacement filter" does not, as the name would make you expect, use displacement maps, but instead uses normal maps. ## The rendering solution -<<<<<<< HEAD -One of the main issues with making pretty effects is how objects can only render to one plane, and how filters can only be applied to single objects. Quite simply it means we cant apply effects to multiple planes at once, and an effect to one plane only by treating it as a single unit: -======= One of the main issues with making pretty effects is how objects can only render to one plane, and how filters can only be applied to single objects. Quite simply it means we can't apply effects to multiple planes at once, and an effect to one plane only by treating it as a single unit: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ![](https://raw.githubusercontent.com/tgstation/documentation-assets/main/rendering/renderpipe_old.png) @@ -68,15 +50,8 @@ Through these this allows us to treat planes as single objects, and lets us dist ## Render plates -<<<<<<< HEAD -The rendering system uses two objects to unify planes: render_relay and render_plates. Render relays use render_target/source and the relay_render_to_plane proc to replicate the plane master on the render relay. This render relay is then rendered onto a render_plate, which is a plane master that renders the render_relays onto itself. This plate can then be hierachically rendered with the same process until it reaches the master render_plate, which is the plate that will actually render to the player. These plates naturally in the byond style have quirks. For example, rendering to two plates will double any effects such as color or filters, and as such you need to carefully manage how you render them. Keep in mind as well that when sorting the layers for rendering on a plane that they should not be negative, this is handled automatically in relay_render_to_plane. When debugging note that mouse_opacity can act bizzarly with this method, such as only allowing you to click things that are layered over objects on a certain plane but auomatically setting the mouse_opacity should be handling this. Note that if you decide to manipulate a plane with internal byond objects that you will have to manually extrapolate the vars that are set if you want to render them to another plane (See blackness plane for example), and that this is not documented anywhere. - - -Goodluck and godspeed with coding -======= The rendering system uses two objects to unify planes: render_relay and render_plates. Render relays use render_target/source and the relay_render_to_plane proc to replicate the plane master on the render relay. This render relay is then rendered onto a render_plate, which is a plane master that renders the render_relays onto itself. This plate can then be hierarchically rendered with the same process until it reaches the master render_plate, which is the plate that will actually render to the player. These plates naturally in the byond style have quirks. For example, rendering to two plates will double any effects such as color or filters, and as such you need to carefully manage how you render them. Keep in mind as well that when sorting the layers for rendering on a plane that they should not be negative, this is handled automatically in relay_render_to_plane. When debugging note that mouse_opacity can act bizarrely with this method, such as only allowing you to click things that are layered over objects on a certain plane but automatically setting the mouse_opacity should be handling this. Note that if you decide to manipulate a plane with internal byond objects that you will have to manually extrapolate the vars that are set if you want to render them to another plane (See blackness plane for example), and that this is not documented anywhere. Good luck and godspeed with coding ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - Just another contributor diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index b7ea5a7719b..dc7b9a54be4 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -143,11 +143,7 @@ screen_loc = ui_building /atom/movable/screen/area_creator/Click() -<<<<<<< HEAD - if(usr.incapacitated() || (isobserver(usr) && !isAdminGhostAI(usr))) -======= if(usr.incapacitated || (isobserver(usr) && !isAdminGhostAI(usr))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE var/area/A = get_area(usr) if(!A.outdoors) @@ -208,11 +204,7 @@ if(world.time <= usr.next_move) return TRUE -<<<<<<< HEAD - if(usr.incapacitated(IGNORE_STASIS)) -======= if(INCAPACITATED_IGNORING(usr, INCAPABLE_STASIS)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE if(ismecha(usr.loc)) // stops inventory actions in a mech return TRUE @@ -744,11 +736,7 @@ var/client/holder INITIALIZE_IMMEDIATE(/atom/movable/screen/splash) -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/screen/splash/Initialize(mapload, datum/hud/hud_owner, client/C, visible, use_previous_title) . = ..() if(!istype(C)) @@ -768,11 +756,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/splash) icon = SStitle.previous_icon holder.screen += src -<<<<<<< HEAD */ // SKYRAT EDIT END -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/screen/splash/proc/Fade(out, qdel_after = TRUE) if(QDELETED(src)) return diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index dab3c844084..90d5d499b5e 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -32,11 +32,7 @@ if (SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) return TRUE if (SECONDARY_ATTACK_CONTINUE_CHAIN) -<<<<<<< HEAD - // Normal behavior -======= EMPTY_BLOCK_GUARD // Normal behavior ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else CRASH("pre_attack_secondary must return an SECONDARY_ATTACK_* define, please consult code/__DEFINES/combat.dm") else @@ -55,11 +51,7 @@ if (SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) return TRUE if (SECONDARY_ATTACK_CONTINUE_CHAIN) -<<<<<<< HEAD - // Normal behavior -======= EMPTY_BLOCK_GUARD // Normal behavior ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else CRASH("attackby_secondary must return an SECONDARY_ATTACK_* define, please consult code/__DEFINES/combat.dm") else @@ -417,11 +409,7 @@ // rev deconversion through blunt trauma. // this can be signalized to the rev datum -<<<<<<< HEAD if(mind && stat == CONSCIOUS && src != attacker && prob(damage_done + ((maxHealth - health) * 0.5))) // SKYRAT EDIT CHANGE - ORIGINAL : if(mind && stat == CONSCIOUS && src != attacker && prob(damage_done + ((100 - health) * 0.5))) -======= - if(mind && stat == CONSCIOUS && src != attacker && prob(damage_done + ((100 - health) * 0.5))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/antagonist/rev/rev = mind.has_antag_datum(/datum/antagonist/rev) rev?.remove_revolutionary(attacker) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index d2dbc398538..eab5f0a7cd9 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -109,19 +109,11 @@ if(!(interaction_flags_atom & INTERACT_ATOM_IGNORE_INCAPACITATED)) var/ignore_flags = NONE if(interaction_flags_atom & INTERACT_ATOM_IGNORE_RESTRAINED) -<<<<<<< HEAD - ignore_flags |= IGNORE_RESTRAINTS - if(!(interaction_flags_atom & INTERACT_ATOM_CHECK_GRAB)) - ignore_flags |= IGNORE_GRAB - - if(user.incapacitated(ignore_flags)) -======= ignore_flags |= INCAPABLE_RESTRAINTS if(!(interaction_flags_atom & INTERACT_ATOM_CHECK_GRAB)) ignore_flags |= INCAPABLE_GRAB if(INCAPACITATED_IGNORING(user, ignore_flags)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index b1eb683a5d4..5af3f7b8422 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -104,14 +104,11 @@ if(CONFIG_GET(flag/usewhitelist)) load_whitelist() -<<<<<<< HEAD // SKYRAT EDIT ADDITION START populate_interaction_instances() remove_erp_things() // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 loaded = TRUE if (Master) diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 42f761c9152..2ed157019db 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -115,13 +115,9 @@ /// log attack messages /datum/config_entry/flag/log_attack -<<<<<<< HEAD -/datum/config_entry/flag/log_subtler // log subtler emotes //SKYRAT EDIT ADDITION +// log subtler emotes +/datum/config_entry/flag/log_subtler //SKYRAT EDIT ADDITION -/datum/config_entry/flag/log_econ // log economy actions - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// log emotes /datum/config_entry/flag/log_emote @@ -320,11 +316,7 @@ /datum/config_entry/string/banappeals /datum/config_entry/string/wikiurl -<<<<<<< HEAD default = "https://wiki.skyrat13.space/index.php" //SKYRAT EDIT - Original: "http://www.tgstation13.org/wiki" -======= - default = "http://www.tgstation13.org/wiki" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/config_entry/string/forumurl default = "http://tgstation13.org/phpBB/index.php" diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 3a2e18458a6..08ab4ae61cf 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -324,11 +324,7 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie init_stage_completed = 0 var/mc_started = FALSE -<<<<<<< HEAD add_startup_message("Initializing subsystems...") //SKYRAT EDIT CHANGE - Custom HTML Lobby Screen -======= - to_chat(world, span_boldannounce("Initializing subsystems...")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/stage_sorted_subsystems = new(INITSTAGE_MAX) for (var/i in 1 to INITSTAGE_MAX) @@ -362,11 +358,8 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie SetRunLevel(1) // Intentionally not using the defines here because the MC doesn't care about them // Loop. Master.StartProcessing(0) -<<<<<<< HEAD add_startup_message("Clearing clutter...") //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/time = (REALTIMEOFDAY - start_timeofday) / 10 @@ -464,19 +457,12 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie chat_warning = TRUE var/message = "[message_prefix] [seconds] second[seconds == 1 ? "" : "s"]!" -<<<<<<< HEAD // SKYRAT EDIT REMOVAL BEGIN -- chat_message not used anymore due to change below // var/chat_message = chat_warning ? span_boldwarning(message) : span_boldannounce(message) // SKYRAT EDIT REMOVAL END if(result != SS_INIT_NO_MESSAGE) add_startup_message(message, chat_warning) //SKYRAT EDIT CHANGE - ORIGINAL: to_chat(world, chat_message) -======= - var/chat_message = chat_warning ? span_boldwarning(message) : span_boldannounce(message) - - if(result != SS_INIT_NO_MESSAGE) - to_chat(world, chat_message) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_world(message) /datum/controller/master/proc/SetRunLevel(new_runlevel) @@ -593,11 +579,7 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie //Anti-tick-contention heuristics: if (init_stage == INITSTAGE_MAX) -<<<<<<< HEAD - //if there are mutiple sleeping procs running before us hogging the cpu, we have to run later. -======= //if there are multiple sleeping procs running before us hogging the cpu, we have to run later. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // (because sleeps are processed in the order received, longer sleeps are more likely to run first) if (starting_tick_usage > TICK_LIMIT_MC) //if there isn't enough time to bother doing anything this tick, sleep a bit. sleep_delta *= 2 diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index 33b793596d0..4bde26e3c9d 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -272,11 +272,7 @@ /datum/controller/subsystem/proc/OnConfigLoad() /** -<<<<<<< HEAD - * Used to initialize the subsystem. This is expected to be overriden by subtypes. -======= * Used to initialize the subsystem. This is expected to be overridden by subtypes. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ /datum/controller/subsystem/Initialize() return SS_INIT_NONE diff --git a/code/controllers/subsystem/ai_controllers.dm b/code/controllers/subsystem/ai_controllers.dm index 4d74fd66898..30d3c4986f2 100644 --- a/code/controllers/subsystem/ai_controllers.dm +++ b/code/controllers/subsystem/ai_controllers.dm @@ -9,14 +9,6 @@ SUBSYSTEM_DEF(ai_controllers) ///type of status we are interested in running var/planning_status = AI_STATUS_ON /// The tick cost of all active AI, calculated on fire. -<<<<<<< HEAD - - var/cost_on - /// The tick cost of all idle AI, calculated on fire. - var/cost_idle - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/our_cost /datum/controller/subsystem/ai_controllers/Initialize() diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index 457c44ac2ca..20d5a093be6 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -75,11 +75,7 @@ SUBSYSTEM_DEF(atoms) rustg_file_write(json_encode(mapload_init_times), "[GLOB.log_directory]/init_times.json") #endif -<<<<<<< HEAD -/// Actually creates the list of atoms. Exists soley so a runtime in the creation logic doesn't cause initalized to totally break -======= /// Actually creates the list of atoms. Exists solely so a runtime in the creation logic doesn't cause initialized to totally break ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/atoms/proc/CreateAtoms(list/atoms, list/atoms_to_return = null, mapload_source = null) if (atoms_to_return) LAZYINITLIST(created_atoms) @@ -141,13 +137,8 @@ SUBSYSTEM_DEF(atoms) return null return initialized_state[state_length][1] -<<<<<<< HEAD -/// Use this to set initialized to prevent error states where the old initialized is overriden, and we end up losing all context -/// Accepts a state and a source, the most recent state is used, sources exist to prevent overriding old values accidentially -======= /// Use this to set initialized to prevent error states where the old initialized is overridden, and we end up losing all context /// Accepts a state and a source, the most recent state is used, sources exist to prevent overriding old values accidentally ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/atoms/proc/set_tracked_initalized(state, source) if(!length(initialized_state)) base_initialized = initialized diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index 900f78efcb0..0ffc0b5bdda 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -47,8 +47,7 @@ SUBSYSTEM_DEF(blackbox) /* // SKYRAT EDIT CHANGE - MULTISERVER - ORIGINAL: var/datum/db_query/query_record_playercount = SSdbcore.NewQuery({" INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port, round_id) -<<<<<<< HEAD - VALUES (:playercount, :admincount, NOW(), INET_ATON(:server_ip), :server_port, :round_id) + VALUES (:playercount, :admincount, NOW(), INET_ATON(:server_ip), :server_port, :round_id) */ var/datum/db_query/query_record_playercount = SSdbcore.NewQuery({" INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_name, server_ip, server_port, round_id) @@ -57,12 +56,6 @@ SUBSYSTEM_DEF(blackbox) "playercount" = playercount, "admincount" = admincount, "server_name" = CONFIG_GET(string/serversqlname), // SKYRAT EDIT ADDITION - MULTISERVER -======= - VALUES (:playercount, :admincount, NOW(), INET_ATON(:server_ip), :server_port, :round_id) - "}, list( - "playercount" = playercount, - "admincount" = admincount, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "server_ip" = world.internet_address || "0", "server_port" = "[world.port]", "round_id" = GLOB.round_id, @@ -352,13 +345,10 @@ Versioning var/datum/db_query/query_report_death = SSdbcore.NewQuery({" INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, staminaloss, last_words, suicide) VALUES (:pod, :x_coord, :y_coord, :z_coord, :map, INET_ATON(:internet_address), :port, :round_id, NOW(), :job, :special, :name, :key, :laname, :lakey, :brute, :fire, :brain, :oxy, :tox, :stamina, :last_words, :suicide) -<<<<<<< HEAD */ var/datum/db_query/query_report_death = SSdbcore.NewQuery({" INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_name, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, staminaloss, last_words, suicide) VALUES (:pod, :x_coord, :y_coord, :z_coord, :map, :server_name, INET_ATON(:internet_address), :port, :round_id, NOW(), :job, :special, :name, :key, :laname, :lakey, :brute, :fire, :brain, :oxy, :tox, :clone, :stamina, :last_words, :suicide) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "}, list( "name" = L.real_name, "key" = L.ckey, diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 7dcab6daf7e..0e8e3dfd90b 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -189,17 +189,12 @@ SUBSYSTEM_DEF(dbcore) //Take over control of all active queries var/queries_to_check = queries_active.Copy() queries_active.Cut() -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Start all waiting queries for(var/datum/db_query/query in queries_standby) run_query(query) queries_to_check += query queries_standby -= query -<<<<<<< HEAD //wait for them all to finish for(var/datum/db_query/query in queries_to_check) @@ -210,13 +205,6 @@ SUBSYSTEM_DEF(dbcore) MassInsert(table, rows = queued_log_entries_by_table[table], duplicate_key = FALSE, ignore_errors = FALSE, warn = FALSE, async = TRUE, special_columns = null) // SKYRAT EDIT END -======= - - //wait for them all to finish - for(var/datum/db_query/query in queries_to_check) - UNTIL(query.process() || REALTIMEOFDAY > endtime) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //log shutdown to the db var/datum/db_query/query_round_shutdown = SSdbcore.NewQuery( "UPDATE [format_table_name("round")] SET shutdown_datetime = Now(), end_state = :end_state WHERE id = :round_id", @@ -264,12 +252,7 @@ SUBSYSTEM_DEF(dbcore) /datum/controller/subsystem/dbcore/proc/Connect() if(IsConnected()) return TRUE - - if(connection) - Disconnect() //clear the current connection handle so isconnected() calls stop invoking rustg - connection = null //make sure its cleared even if runtimes happened -<<<<<<< HEAD if(connection) Disconnect() //clear the current connection handle so isconnected() calls stop invoking rustg connection = null //make sure its cleared even if runtimes happened @@ -278,12 +261,6 @@ SUBSYSTEM_DEF(dbcore) failed_connections = 0 failed_connection_timeout = 0 -======= - if(failed_connection_timeout <= world.time) //it's been long enough since we failed to connect, reset the counter - failed_connections = 0 - failed_connection_timeout = 0 - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(failed_connection_timeout > 0) return FALSE @@ -321,11 +298,7 @@ SUBSYSTEM_DEF(dbcore) log_sql("Connect() failed | [last_error]") ++failed_connections //If it failed to establish a connection more than 5 times in a row, don't bother attempting to connect for a time. -<<<<<<< HEAD if(failed_connections > max_connection_failures) -======= - if(failed_connections > max_connection_failures) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 failed_connection_timeout_count++ //basic exponential backoff algorithm failed_connection_timeout = world.time + ((2 ** failed_connection_timeout_count) SECONDS) diff --git a/code/controllers/subsystem/dynamic/dynamic.dm b/code/controllers/subsystem/dynamic/dynamic.dm index da654339b69..bf674965247 100644 --- a/code/controllers/subsystem/dynamic/dynamic.dm +++ b/code/controllers/subsystem/dynamic/dynamic.dm @@ -140,17 +140,10 @@ SUBSYSTEM_DEF(dynamic) /// The maximum amount of time for antag random events to be hijacked. var/random_event_hijack_maximum = 18 MINUTES -<<<<<<< HEAD - /// What is the lower bound of when the roundstart annoucement is sent out? - var/waittime_l = 600 - - /// What is the higher bound of when the roundstart annoucement is sent out? -======= /// What is the lower bound of when the roundstart announcement is sent out? var/waittime_l = 600 /// What is the higher bound of when the roundstart announcement is sent out? ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/waittime_h = 1800 /// A number between 0 and 100. The maximum amount of threat allowed to generate. @@ -578,14 +571,10 @@ SUBSYSTEM_DEF(dynamic) if (!CONFIG_GET(flag/no_intercept_report)) addtimer(CALLBACK(src, PROC_REF(send_intercept)), rand(waittime_l, waittime_h)) -<<<<<<< HEAD //SKYRAT EDIT START - DIVERGENCY/GOALS REPORT else addtimer(CALLBACK(src, PROC_REF(send_trait_report)), rand(waittime_l, waittime_h)) //SKYRAT EDIT END -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 addtimer(CALLBACK(src, PROC_REF(display_roundstart_logout_report)), ROUNDSTART_LOGOUT_REPORT_TIME) if(CONFIG_GET(flag/reopen_roundstart_suicide_roles)) @@ -957,7 +946,6 @@ SUBSYSTEM_DEF(dynamic) ruleset.restricted_roles |= ruleset.protected_roles if(CONFIG_GET(flag/protect_assistant_from_antagonist)) ruleset.restricted_roles |= JOB_ASSISTANT -<<<<<<< HEAD // SKYRAT EDIT ADDITION for(var/datum/job/iterating_job as anything in subtypesof(/datum/job)) if(!initial(iterating_job.antagonist_restricted)) @@ -970,8 +958,6 @@ SUBSYSTEM_DEF(dynamic) else ruleset.restricted_roles |= initial(iterating_job.title) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!(ruleset.ruleset_category & GLOB.dynamic_ruleset_categories)) ruleset.requirements = list(101,101,101,101,101,101,101,101,101,101) diff --git a/code/controllers/subsystem/dynamic/dynamic_rulesets.dm b/code/controllers/subsystem/dynamic/dynamic_rulesets.dm index f5ef98805ab..8460307009e 100644 --- a/code/controllers/subsystem/dynamic/dynamic_rulesets.dm +++ b/code/controllers/subsystem/dynamic/dynamic_rulesets.dm @@ -262,7 +262,6 @@ candidates.Remove(candidate_player) continue -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(!candidate_client.prefs?.read_preference(/datum/preference/toggle/be_antag)) candidates.Remove(candidate_player) @@ -273,8 +272,6 @@ continue //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(candidate_client.get_remaining_days(minimum_required_age) > 0) candidates.Remove(candidate_player) continue diff --git a/code/controllers/subsystem/dynamic/dynamic_rulesets_latejoin.dm b/code/controllers/subsystem/dynamic/dynamic_rulesets_latejoin.dm index 9fd2217bb66..afc3bca78d0 100644 --- a/code/controllers/subsystem/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/controllers/subsystem/dynamic/dynamic_rulesets_latejoin.dm @@ -16,7 +16,6 @@ candidates.Remove(P) else if (!((antag_preference || antag_flag) in P.client.prefs.be_special) || is_banned_from(P.ckey, list(antag_flag_override || antag_flag, ROLE_SYNDICATE))) candidates.Remove(P) -<<<<<<< HEAD // SKYRAT EDIT ADDITION - PROTECTED JOBS else if(P.client?.prefs && !P.client.prefs.read_preference(/datum/preference/toggle/be_antag)) candidates.Remove(P) @@ -25,8 +24,6 @@ candidates.Remove(P) continue // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/dynamic_ruleset/latejoin/ready(forced = 0) if (forced) diff --git a/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm b/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm index 69b6066216c..fb7b7db9bb9 100644 --- a/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm +++ b/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm @@ -63,7 +63,6 @@ if (isnull(creature.client)) // Are they connected? trimmed_list.Remove(creature) continue -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(is_banned_from(creature.client.ckey, BAN_ANTAGONIST)) trimmed_list.Remove(creature) @@ -72,8 +71,6 @@ trimmed_list.Remove(creature) continue //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(creature.client.get_remaining_days(minimum_required_age) > 0) trimmed_list.Remove(creature) continue diff --git a/code/controllers/subsystem/dynamic/ruleset_picking.dm b/code/controllers/subsystem/dynamic/ruleset_picking.dm index a8bdf6bc683..4373fe76da0 100644 --- a/code/controllers/subsystem/dynamic/ruleset_picking.dm +++ b/code/controllers/subsystem/dynamic/ruleset_picking.dm @@ -1,8 +1,4 @@ -<<<<<<< HEAD #define ADMIN_CANCEL_MIDROUND_TIME (180 SECONDS) //SKYRAT EDIT - ORIGINAL 10 SECONDS -======= -#define ADMIN_CANCEL_MIDROUND_TIME (10 SECONDS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// /// @@ -70,19 +66,14 @@ ADMIN_CANCEL_MIDROUND_TIME, \ TIMER_STOPPABLE, \ ) -<<<<<<< HEAD // SKYRAT EDIT REMOVAL BEGIN - Event notification /** -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_dynamic("[rule] ruleset executing...") message_admins("DYNAMIC: Executing midround ruleset [rule] in [DisplayTimeText(ADMIN_CANCEL_MIDROUND_TIME)]. \ CANCEL | \ SOMETHING ELSE") return rule -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END - Event notification @@ -102,8 +93,6 @@ return rule // SKYRAT EDIT ADDITION END - Event notification -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Fired after admins do not cancel a midround injection. /datum/controller/subsystem/dynamic/proc/execute_midround_rule(datum/dynamic_ruleset/rule) diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index 1d601bb6769..f4b8c8138b8 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -17,11 +17,8 @@ SUBSYSTEM_DEF(events) ///Will wizard events be included in the event pool? var/wizardmode = FALSE -<<<<<<< HEAD var/list/previously_run = list() //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/events/Initialize() for(var/type in typesof(/datum/round_event_control)) var/datum/round_event_control/event = new type() diff --git a/code/controllers/subsystem/explosions.dm b/code/controllers/subsystem/explosions.dm index e547a324891..31de67361bf 100644 --- a/code/controllers/subsystem/explosions.dm +++ b/code/controllers/subsystem/explosions.dm @@ -454,14 +454,11 @@ ADMIN_VERB(check_bomb_impacts, R_DEBUG, "Check Bomb Impact", "See what the effec if(EXPLODE_LIGHT) SSexplosions.lowturf += explode -<<<<<<< HEAD //SKYRAT EDIT ADDITION for(var/obj/machinery/light/iterating_light in explode) iterating_light.start_flickering() //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(prob(40) && dist < flame_range && !isspaceturf(explode) && !explode.density) flameturf += explode diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 980b86a425b..ad1b9e4132f 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -346,10 +346,7 @@ SUBSYSTEM_DEF(garbage) /// Datums passed to this will be given a chance to clean up references to allow the GC to collect them. /proc/qdel(datum/to_delete, force = FALSE) if(!istype(to_delete)) -<<<<<<< HEAD -======= DREAMLUAU_CLEAR_REF_USERDATA(to_delete) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 del(to_delete) return diff --git a/code/controllers/subsystem/id_access.dm b/code/controllers/subsystem/id_access.dm index fe0c46c8d6d..a9f32228a26 100644 --- a/code/controllers/subsystem/id_access.dm +++ b/code/controllers/subsystem/id_access.dm @@ -330,10 +330,7 @@ SUBSYSTEM_DEF(id_access) desc_by_access["[ACCESS_CENT_CAPTAIN]"] = "Code Gold" desc_by_access["[ACCESS_CENT_BAR]"] = "Code Scotch" desc_by_access["[ACCESS_BIT_DEN]"] = "Bitrunner Den" -<<<<<<< HEAD desc_by_access["[ACCESS_BARBER]"] = "Barber" // SKYRAT EDIT ADD - BARBER UPDATE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Returns the access bitflags associated with any given access level. @@ -402,11 +399,8 @@ SUBSYSTEM_DEF(id_access) id_card.clear_access() id_card.trim = trim -<<<<<<< HEAD -======= id_card.big_pointer = trim.big_pointer id_card.pointer_color = trim.pointer_color ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(copy_access) id_card.access = trim.access.Copy() @@ -450,11 +444,8 @@ SUBSYSTEM_DEF(id_access) id_card.department_color_override = trim.department_color id_card.department_state_override = trim.department_state id_card.subdepartment_color_override = trim.subdepartment_color -<<<<<<< HEAD -======= id_card.big_pointer = trim.big_pointer id_card.pointer_color = trim.pointer_color ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!check_forged || !id_card.forged) id_card.assignment = trim.assignment @@ -475,11 +466,8 @@ SUBSYSTEM_DEF(id_access) id_card.department_color_override = null id_card.department_state_override = null id_card.subdepartment_color_override = null -<<<<<<< HEAD -======= id_card.big_pointer = id_card.trim.big_pointer id_card.pointer_color = id_card.trim.pointer_color ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Adds the accesses associated with a trim to an ID card. diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 4b54eb4ac5e..7207c611ea0 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -294,15 +294,12 @@ SUBSYSTEM_DEF(job) JobDebug("GRJ skipping command role, Player: [player], Job: [job]") continue -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(job.departments_bitflags & DEPARTMENT_BITFLAG_CENTRAL_COMMAND) //If you want a CC position, select it! JobDebug("GRJ skipping Central Command role, Player: [player], Job: [job]") continue //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // This check handles its own output to JobDebug. if(check_job_eligibility(player, job, "GRJ", add_job_to_log = TRUE) != JOB_AVAILABLE) continue @@ -562,7 +559,6 @@ SUBSYSTEM_DEF(job) //Gives the player the stuff he should have with his rank /datum/controller/subsystem/job/proc/EquipRank(mob/living/equipping, datum/job/job, client/player_client) -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - ALTERNATIVE_JOB_TITLES // The alt job title, if user picked one, or the default var/alt_title = player_client?.prefs.alt_job_titles[job.title] @@ -573,29 +569,16 @@ SUBSYSTEM_DEF(job) SEND_SIGNAL(equipping, COMSIG_JOB_RECEIVED, job) equipping.mind?.set_assigned_role_with_greeting(job, player_client, alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: equipping.mind?.set_assigned_role_with_greeting(job, player_client) - equipping.on_job_equipping(job, player_client) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: equipping.on_job_equipping(job) + equipping.on_job_equipping(job, player_client) job.announce_job(equipping, alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: job.announce_job(equipping) -======= - equipping.job = job.title - - SEND_SIGNAL(equipping, COMSIG_JOB_RECEIVED, job) - - equipping.mind?.set_assigned_role_with_greeting(job, player_client) - equipping.on_job_equipping(job, player_client) - job.announce_job(equipping) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(player_client?.holder) if(CONFIG_GET(flag/auto_deadmin_players) || (player_client.prefs?.toggles & DEADMIN_ALWAYS)) player_client.holder.auto_deadmin() else handle_auto_deadmin_roles(player_client, job.title) -<<<<<<< HEAD setup_alt_job_items(equipping, job, player_client) // SKYRAT EDIT ADDITION - ALTERNATIVE_JOB_TITLES -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 job.after_spawn(equipping, player_client) /datum/controller/subsystem/job/proc/handle_auto_deadmin_roles(client/C, rank) @@ -702,10 +685,7 @@ SUBSYSTEM_DEF(job) if(!run_divide_occupation_pure) to_chat(player, "You have failed to qualify for any job you desired.") player.ready = PLAYER_NOT_READY -<<<<<<< HEAD player.client << output(player.ready, "lobby_browser:imgsrc") //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/job/Recover() @@ -934,7 +914,6 @@ SUBSYSTEM_DEF(job) JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_AGE)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") return JOB_UNAVAILABLE_AGE -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION if(!CONFIG_GET(flag/bypass_veteran_system) && possible_job.veteran_only && !SSplayer_ranks.is_veteran(player.client)) JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_NOT_VETERAN)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") @@ -966,8 +945,6 @@ SUBSYSTEM_DEF(job) // Run this check after is_banned_from since it can query the DB which may sleep. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Need to recheck the player exists after is_banned_from since it can query the DB which may sleep. if(QDELETED(player)) JobDebug("[debug_prefix] player is qdeleted, Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") diff --git a/code/controllers/subsystem/lag_switch.dm b/code/controllers/subsystem/lag_switch.dm index d66bfc1c78f..fdd9a9287e5 100644 --- a/code/controllers/subsystem/lag_switch.dm +++ b/code/controllers/subsystem/lag_switch.dm @@ -124,7 +124,6 @@ SUBSYSTEM_DEF(lag_switch) to_chat(world, span_boldannounce("Footstep sounds have been disabled for performance concerns.")) else to_chat(world, span_boldannounce("Footstep sounds have been re-enabled.")) -<<<<<<< HEAD // SKYRAT EDIT ADDITION if (DISABLE_CREATOR) if (state) @@ -132,8 +131,6 @@ SUBSYSTEM_DEF(lag_switch) else to_chat(world, span_boldannounce("The character creator has been re-enabled.")) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE diff --git a/code/controllers/subsystem/lua.dm b/code/controllers/subsystem/lua.dm index 0645ea81f2b..99df8cf3354 100644 --- a/code/controllers/subsystem/lua.dm +++ b/code/controllers/subsystem/lua.dm @@ -2,10 +2,6 @@ SUBSYSTEM_DEF(lua) name = "Lua Scripting" runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT wait = 0.1 SECONDS -<<<<<<< HEAD - flags = SS_OK_TO_FAIL_INIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A list of all lua states var/list/datum/lua_state/states = list() @@ -21,33 +17,6 @@ SUBSYSTEM_DEF(lua) var/list/current_run = list() var/list/current_states_run = list() -<<<<<<< HEAD - /// Protects return values from getting GCed before getting converted to lua values - /// Gets cleared every tick. - var/list/gc_guard = list() - -/datum/controller/subsystem/lua/Initialize() - if(!CONFIG_GET(flag/auxtools_enabled)) - warning("SSlua requires auxtools to be enabled to run.") - return SS_INIT_NO_NEED - - try - // Initialize the auxtools library - AUXTOOLS_CHECK(AUXLUA) - - // Set the wrappers for setting vars and calling procs - __lua_set_set_var_wrapper("/proc/wrap_lua_set_var") - __lua_set_datum_proc_call_wrapper("/proc/wrap_lua_datum_proc_call") - __lua_set_global_proc_call_wrapper("/proc/wrap_lua_global_proc_call") - __lua_set_print_wrapper("/proc/wrap_lua_print") - return SS_INIT_SUCCESS - catch(var/exception/e) - // Something went wrong, best not allow the subsystem to run - var/crash_message = "Error initializing SSlua: [e.name]" - initialization_failure_message = crash_message - warning(crash_message) - return SS_INIT_FAILURE -======= var/list/needs_gc_cycle = list() /datum/controller/subsystem/lua/Initialize() @@ -61,7 +30,6 @@ SUBSYSTEM_DEF(lua) // Set the print wrapper, as otherwise, the print function is meaningless DREAMLUAU_SET_PRINT_WRAPPER("/proc/wrap_lua_print") return SS_INIT_SUCCESS ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/lua/OnConfigLoad() // Read the paths from the config file @@ -71,12 +39,6 @@ SUBSYSTEM_DEF(lua) lua_path += path world.SetConfig("env", "LUAU_PATH", jointext(lua_path, ";")) -<<<<<<< HEAD -/datum/controller/subsystem/lua/Shutdown() - AUXTOOLS_FULL_SHUTDOWN(AUXLUA) - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/lua/proc/queue_resume(datum/lua_state/state, index, arguments) if(!initialized) return @@ -86,38 +48,6 @@ SUBSYSTEM_DEF(lua) arguments = list() else if(!islist(arguments)) arguments = list(arguments) -<<<<<<< HEAD - resumes += list(list("state" = state, "index" = index, "arguments" = arguments)) - -/datum/controller/subsystem/lua/proc/kill_task(datum/lua_state/state, list/task_info) - if(!istype(state)) - return - if(!islist(task_info)) - return - if(!(istext(task_info["name"]) && istext(task_info["status"]) && isnum(task_info["index"]))) - return - switch(task_info["status"]) - if("sleep") - var/task_index = task_info["index"] - var/state_index = 1 - - // Get the nth sleep in the sleep list corresponding to the target state - for(var/i in 1 to length(sleeps)) - var/datum/lua_state/sleeping_state = sleeps[i] - if(sleeping_state == state) - if(state_index == task_index) - sleeps.Cut(i, i+1) - break - state_index++ - if("yield") - // Remove the resumt from the resumt list - for(var/i in 1 to length(resumes)) - var/resume = resumes[i] - if(resume["state"] == state && resume["index"] == task_info["index"]) - resumes.Cut(i, i+1) - break - state.kill_task(task_info) -======= else var/list/args_list = arguments arguments = args_list.Copy() @@ -145,7 +75,6 @@ SUBSYSTEM_DEF(lua) resumes.Cut(i, i+1) break state.kill_task(is_sleep, index) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/lua/fire(resumed) // Each fire of SSlua awakens every sleeping task in the order they slept, @@ -156,10 +85,6 @@ SUBSYSTEM_DEF(lua) sleeps.Cut() resumes.Cut() -<<<<<<< HEAD - gc_guard.Cut() -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/current_sleeps = current_run["sleeps"] var/list/affected_states = list() while(length(current_sleeps)) @@ -202,11 +127,6 @@ SUBSYSTEM_DEF(lua) if(MC_TICK_CHECK) break -<<<<<<< HEAD - // Update every lua editor TGUI open for each state that had a task awakened or resumed - for(var/datum/lua_state/state in affected_states) - INVOKE_ASYNC(state, TYPE_PROC_REF(/datum/lua_state, update_editors)) -======= while(length(needs_gc_cycle)) var/datum/lua_state/state = needs_gc_cycle[needs_gc_cycle.len] needs_gc_cycle.len-- @@ -236,4 +156,3 @@ SUBSYSTEM_DEF(lua) continue state.log_result(json_data) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 60f118b17d3..6374a69e95e 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -416,10 +416,7 @@ Used by the AI doomsday and the self-destruct nuke. // load the maps for (var/P in parsed_maps) var/datum/parsed_map/pm = P -<<<<<<< HEAD pm.turf_blacklist = turf_blacklist // SKYRAT EDIT ADDITION - apply blacklist -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/bounds = pm.bounds var/x_offset = bounds ? round(world.maxx / 2 - bounds[MAP_MAXX] / 2) + 1 : 1 var/y_offset = bounds ? round(world.maxy / 2 - bounds[MAP_MAXY] / 2) + 1 : 1 @@ -934,11 +931,8 @@ ADMIN_VERB(load_away_mission, R_FUN, "Load Away Mission", "Load a specific away /datum/controller/subsystem/mapping/proc/lazy_load_template(template_key, force = FALSE) RETURN_TYPE(/datum/turf_reservation) -<<<<<<< HEAD -======= UNTIL(initialized) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/static/lazy_loading = FALSE UNTIL(!lazy_loading) diff --git a/code/controllers/subsystem/materials.dm b/code/controllers/subsystem/materials.dm index 7cc537ff789..673414ea3c2 100644 --- a/code/controllers/subsystem/materials.dm +++ b/code/controllers/subsystem/materials.dm @@ -26,22 +26,11 @@ SUBSYSTEM_DEF(materials) new /datum/stack_recipe("Sink Frame", /obj/structure/sinkframe, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_FURNITURE), new /datum/stack_recipe("Material floor tile", /obj/item/stack/tile/material, 1, 4, 20, crafting_flags = CRAFT_APPLIES_MATS, category = CAT_TILES), new /datum/stack_recipe("Material airlock assembly", /obj/structure/door_assembly/door_assembly_material, 4, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_DOORS), -<<<<<<< HEAD -======= - ) - ///List of stackcrafting recipes for materials using rigid recipes - var/list/rigid_stack_recipes = list( - new /datum/stack_recipe("Carving block", /obj/structure/carving_block, 5, time = 3 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_STRUCTURE), ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) ///List of stackcrafting recipes for materials using rigid recipes var/list/rigid_stack_recipes = list( new /datum/stack_recipe("Carving block", /obj/structure/carving_block, 5, time = 3 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_STRUCTURE), ) - - ///A list of dimensional themes used by the dimensional anomaly and other things, most of which require materials to function. - var/list/datum/dimension_theme/dimensional_themes - ///A list of dimensional themes used by the dimensional anomaly and other things, most of which require materials to function. var/list/datum/dimension_theme/dimensional_themes @@ -63,11 +52,7 @@ SUBSYSTEM_DEF(materials) /** Creates and caches a material datum. * -<<<<<<< HEAD - * Arugments: -======= * Arguments: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * - [arguments][/list]: The arguments to use to create the material datum * - The first element is the type of material to initialize. */ @@ -148,11 +133,7 @@ SUBSYSTEM_DEF(materials) value = arguments[key] if(!(istext(key) || isnum(key))) key = REF(key) -<<<<<<< HEAD - key = "[key]" // Key is stringified so numbers dont break things -======= key = "[key]" // Key is stringified so numbers don't break things ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!isnull(value)) if(!(istext(value) || isnum(value))) value = REF(value) diff --git a/code/controllers/subsystem/minor_mapping.dm b/code/controllers/subsystem/minor_mapping.dm index 6bdb93ccd30..9dbc3cd2a05 100644 --- a/code/controllers/subsystem/minor_mapping.dm +++ b/code/controllers/subsystem/minor_mapping.dm @@ -13,11 +13,7 @@ SUBSYSTEM_DEF(minor_mapping) return SS_INIT_NO_NEED #else trigger_migration(CONFIG_GET(number/mice_roundstart)) -<<<<<<< HEAD place_satchels(satchel_amount = 10) //SKYRAT EDIT CHANGE - ORIGINAL : place_satchels(satchel_amount = 2) -======= - place_satchels(satchel_amount = 2) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return SS_INIT_SUCCESS #endif diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm index ea3258c0971..fda892be7a4 100644 --- a/code/controllers/subsystem/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -17,11 +17,7 @@ SUBSYSTEM_DEF(overlays) /// Don't have access to that type tho, so this is the best you're gonna get /proc/overlays2text(list/overlays) var/list/unique_overlays = list() -<<<<<<< HEAD - // As anything because we're basically doing type coerrsion, rather then actually filtering for mutable apperances -======= // As anything because we're basically doing type coercion, rather then actually filtering for mutable appearances ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/mutable_appearance/overlay as anything in overlays) var/key = "[overlay.icon]-[overlay.icon_state]-[overlay.dir]" unique_overlays[key] += 1 diff --git a/code/controllers/subsystem/pathfinder.dm b/code/controllers/subsystem/pathfinder.dm index 938aebc20a4..70dc152b06d 100644 --- a/code/controllers/subsystem/pathfinder.dm +++ b/code/controllers/subsystem/pathfinder.dm @@ -158,11 +158,7 @@ SUBSYSTEM_DEF(pathfinder) /// Takes a set of pathfind info, returns the first valid pathmap that would work if one exists /// Optionally takes a max age to accept (defaults to 0 seconds) and a minimum acceptable range -<<<<<<< HEAD -/// If include_building is true and we can only find a building path, ew'll use that instead. tho we will wait for it to finish first -======= /// If include_building is true and we can only find a building path, we'll use that instead. tho we will wait for it to finish first ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/pathfinder/proc/get_valid_map(datum/can_pass_info/pass_info, turf/target, simulated_only = TRUE, turf/exclude, age = MAP_REUSE_INSTANT, min_range = -INFINITY, include_building = FALSE) // Walk all the maps that match our caller's turf OR our target's // Then hold onto em. If their cache time is short we can reuse/expand them, if not we'll have to make a new one diff --git a/code/controllers/subsystem/persistence/_persistence.dm b/code/controllers/subsystem/persistence/_persistence.dm index fdc2f22a456..77490121879 100644 --- a/code/controllers/subsystem/persistence/_persistence.dm +++ b/code/controllers/subsystem/persistence/_persistence.dm @@ -48,8 +48,6 @@ SUBSYSTEM_DEF(persistence) var/tram_hits_this_round = 0 var/tram_hits_last_round = 0 -<<<<<<< HEAD -======= /// A json database to data/message_bottles.json var/datum/json_database/message_bottles_database /// An index used to create unique ids for the message bottles database @@ -61,7 +59,6 @@ SUBSYSTEM_DEF(persistence) */ var/list/queued_message_bottles ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/persistence/Initialize() load_poly() load_wall_engravings() @@ -72,10 +69,7 @@ SUBSYSTEM_DEF(persistence) load_randomized_recipes() load_custom_outfits() load_delamination_counter() -<<<<<<< HEAD load_panic_bunker() //SKYRAT EDIT ADDITION - PANICBUNKER -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 load_tram_counter() load_adventures() return SS_INIT_SUCCESS @@ -89,22 +83,14 @@ SUBSYSTEM_DEF(persistence) save_randomized_recipes() save_scars() save_custom_outfits() -<<<<<<< HEAD save_modular_persistence() // SKYRAT EDIT ADDITION - MODULAR_PERSISTENCE save_delamination_counter() -======= - save_delamination_counter() save_queued_message_bottles() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SStransport.can_fire) for(var/datum/transport_controller/linear/tram/transport as anything in SStransport.transports_by_type[TRANSPORT_TYPE_TRAM]) save_tram_history(transport.specific_transport_id) save_tram_counter() -<<<<<<< HEAD save_panic_bunker() //SKYRAT EDIT ADDITION - PANICBUNKER -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Loads up Poly's speech buffer. /datum/controller/subsystem/persistence/proc/load_poly() diff --git a/code/controllers/subsystem/persistence/engravings.dm b/code/controllers/subsystem/persistence/engravings.dm index b56a8093aa2..6808a101bb8 100644 --- a/code/controllers/subsystem/persistence/engravings.dm +++ b/code/controllers/subsystem/persistence/engravings.dm @@ -27,11 +27,7 @@ var/successfully_loaded_engravings = 0 -<<<<<<< HEAD - for(var/iteration in 1 to rand(MIN_PERSISTENT_ENGRAVINGS, MAX_PERSISTENT_ENGRAVINGS)) -======= for(var/iteration in 1 to min(rand(MIN_PERSISTENT_ENGRAVINGS, MAX_PERSISTENT_ENGRAVINGS), saved_engravings.len)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/engraving = pick_n_take(saved_engravings) if(!islist(engraving)) stack_trace("something's wrong with the engraving data! one of the saved engravings wasn't a list!") diff --git a/code/controllers/subsystem/polling.dm b/code/controllers/subsystem/polling.dm index d9903ef430a..aba0cbbcfea 100644 --- a/code/controllers/subsystem/polling.dm +++ b/code/controllers/subsystem/polling.dm @@ -281,15 +281,12 @@ SUBSYSTEM_DEF(polling) if(is_banned_from(potential_candidate.ckey, list(check_jobban, ROLE_SYNDICATE))) return FALSE -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(is_banned_from(potential_candidate.ckey, BAN_GHOST_TAKEOVER) || is_banned_from(potential_candidate.ckey, BAN_ANTAGONIST)) to_chat(potential_candidate, "There was a ghost prompt for: [role], unfortunately you are banned from ghost takeovers.") return FALSE //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /datum/controller/subsystem/polling/proc/polling_finished(datum/candidate_poll/finishing_poll) diff --git a/code/controllers/subsystem/processing/fishing.dm b/code/controllers/subsystem/processing/fishing.dm index d38a4826907..a81ff0dec67 100644 --- a/code/controllers/subsystem/processing/fishing.dm +++ b/code/controllers/subsystem/processing/fishing.dm @@ -1,12 +1,3 @@ -<<<<<<< HEAD -/** - * So far, only used by the fishing minigame. Feel free to rename it to something like veryfastprocess - * if you need one that fires 10 times a second - */ -PROCESSING_SUBSYSTEM_DEF(fishing) - name = "Fishing" - wait = 0.1 SECONDS -======= /// subsystem for the fishing minigame processing. PROCESSING_SUBSYSTEM_DEF(fishing) name = "Fishing" @@ -40,4 +31,3 @@ PROCESSING_SUBSYSTEM_DEF(fishing) qdel(lure) return SS_INIT_SUCCESS ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 72aaad287db..6a0b2bd05c0 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -17,11 +17,7 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( list(/datum/quirk/transhumanist, /datum/quirk/body_purist), list(/datum/quirk/prosthetic_organ, /datum/quirk/tin_man, /datum/quirk/body_purist), list(/datum/quirk/quadruple_amputee, /datum/quirk/paraplegic, /datum/quirk/hemiplegic), -<<<<<<< HEAD //list(/datum/quirk/quadruple_amputee, /datum/quirk/frail), // SKYRAT EDIT REMOVAL- Since we have synth wounds now, frail has a large downside for prosthetics and such -======= - list(/datum/quirk/quadruple_amputee, /datum/quirk/frail), ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 list(/datum/quirk/social_anxiety, /datum/quirk/mute), list(/datum/quirk/mute, /datum/quirk/softspoken), list(/datum/quirk/poor_aim, /datum/quirk/bighands), @@ -30,7 +26,6 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( list(/datum/quirk/photophobia, /datum/quirk/nyctophobia), list(/datum/quirk/item_quirk/settler, /datum/quirk/freerunning), list(/datum/quirk/numb, /datum/quirk/selfaware), -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN list(/datum/quirk/equipping/nerve_staple, /datum/quirk/nonviolent), list(/datum/quirk/equipping/nerve_staple, /datum/quirk/item_quirk/nearsighted), @@ -44,8 +39,6 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( list(/datum/quirk/oversized, /datum/quirk/item_quirk/settler), list(/datum/quirk/echolocation, /datum/quirk/item_quirk/blindness, /datum/quirk/item_quirk/nearsighted, /datum/quirk/item_quirk/deafness), //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) GLOBAL_LIST_INIT(quirk_string_blacklist, generate_quirk_string_blacklist()) @@ -96,7 +89,6 @@ PROCESSING_SUBSYSTEM_DEF(quirks) if(initial(quirk_type.abstract_parent_type) == type) continue -<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(initial(quirk_type.erp_quirk) && CONFIG_GET(flag/disable_erp_preferences)) continue @@ -105,8 +97,6 @@ PROCESSING_SUBSYSTEM_DEF(quirks) continue // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 quirks[initial(quirk_type.name)] = quirk_type quirk_points[initial(quirk_type.name)] = initial(quirk_type.value) @@ -203,11 +193,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks) /// be valid. /// If no changes need to be made, will return the same list. /// Expects all quirk names to be unique, but makes no other expectations. -<<<<<<< HEAD /datum/controller/subsystem/processing/quirks/proc/filter_invalid_quirks(list/quirks, list/augments) // SKYRAT EDIT - AUGMENTS+ -======= -/datum/controller/subsystem/processing/quirks/proc/filter_invalid_quirks(list/quirks) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/new_quirks = list() var/list/positive_quirks = list() var/points_enabled = !CONFIG_GET(flag/disable_quirk_points) @@ -216,14 +202,11 @@ PROCESSING_SUBSYSTEM_DEF(quirks) var/list/all_quirks = get_quirks() -<<<<<<< HEAD // SKYRAT EDIT BEGIN - AUGMENTS+ for(var/key in augments) var/datum/augment_item/aug = GLOB.augment_items[augments[key]] balance += aug.cost // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for (var/quirk_name in quirks) var/datum/quirk/quirk = all_quirks[quirk_name] if (isnull(quirk)) diff --git a/code/controllers/subsystem/processing/reagents.dm b/code/controllers/subsystem/processing/reagents.dm index 18533e9c0cb..c4b86a23efc 100644 --- a/code/controllers/subsystem/processing/reagents.dm +++ b/code/controllers/subsystem/processing/reagents.dm @@ -17,7 +17,6 @@ PROCESSING_SUBSYSTEM_DEF(reagents) GLOB.fake_reagent_blacklist = list(/datum/reagent/medicine/c2, /datum/reagent/medicine, /datum/reagent/reaction_agent) //Build GLOB lists - see holder.dm build_chemical_reactions_lists() -<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(CONFIG_GET(flag/disable_erp_preferences)) @@ -31,8 +30,6 @@ PROCESSING_SUBSYSTEM_DEF(reagents) if(reaction_list) reaction_list -= reaction_datum // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return SS_INIT_SUCCESS /datum/controller/subsystem/processing/reagents/fire(resumed = FALSE) diff --git a/code/controllers/subsystem/processing/station.dm b/code/controllers/subsystem/processing/station.dm index afcd008346a..064f1446bf9 100644 --- a/code/controllers/subsystem/processing/station.dm +++ b/code/controllers/subsystem/processing/station.dm @@ -24,11 +24,7 @@ PROCESSING_SUBSYSTEM_DEF(station) // Autowiki also wants consistent outputs, for example making sure the vending machine page always reports the normal products #if !defined(UNIT_TESTS) && !defined(AUTOWIKI) SetupTraits() -<<<<<<< HEAD //display_lobby_traits() SKYRAT EDIT REMOVAL -======= - display_lobby_traits() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #endif announcer = new announcer() //Initialize the station's announcer datum @@ -177,10 +173,7 @@ PROCESSING_SUBSYSTEM_DEF(station) var/datum/station_trait/trait_to_remove = i selectable_traits_by_types[initial(trait_to_remove.trait_type)] -= trait_to_remove -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Update station trait lobby buttons for clients who joined before we initialised this subsystem /datum/controller/subsystem/processing/station/proc/display_lobby_traits() for (var/mob/dead/new_player/player as anything in GLOB.new_player_list) @@ -189,7 +182,4 @@ PROCESSING_SUBSYSTEM_DEF(station) continue observer_hud.add_station_trait_buttons() observer_hud.show_hud(observer_hud.hud_version) -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index 704b3bc12a4..fe8a002d9c4 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -78,11 +78,8 @@ SUBSYSTEM_DEF(research) new /datum/techweb/science new /datum/techweb/admin new /datum/techweb/oldstation -<<<<<<< HEAD new /datum/techweb/tarkon //Skyrat Edit new /datum/techweb/interdyne //Skyrat Edit -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 autosort_categories() error_design = new error_node = new diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index ebf7ee70eb5..d0fef0291cf 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -147,11 +147,11 @@ SUBSYSTEM_DEF(shuttle) while(length(pack_processing)) var/datum/supply_pack/pack = pack_processing[length(pack_processing)] pack_processing.len-- -<<<<<<< HEAD //SKYRAT EDIT START if(pack == /datum/supply_pack/armament) continue //SKYRAT EDIT END + if(ispath(pack, /datum/supply_pack)) pack = new pack @@ -160,16 +160,6 @@ SUBSYSTEM_DEF(shuttle) pack_processing += generated_packs continue -======= - if(ispath(pack, /datum/supply_pack)) - pack = new pack - - var/list/generated_packs = pack.generate_supply_packs() - if(generated_packs) - pack_processing += generated_packs - continue - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //we have to create the pack before checking if it has 'contains' because generate_supply_packs manually sets it, therefore we cant check initial. if(!pack.contains) continue @@ -290,11 +280,7 @@ SUBSYSTEM_DEF(shuttle) priority_announce( text = "Emergency shuttle uplink interference detected, shuttle call disabled while the system reinitializes. Estimated restore in [DisplayTimeText(lockout_timer, round_seconds_to = 60)].", title = "Uplink Interference", -<<<<<<< HEAD sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', -======= - sound = 'sound/misc/announce_dig.ogg', ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sender_override = "Emergency Shuttle Uplink Alert", color_override = "grey", ) @@ -308,11 +294,7 @@ SUBSYSTEM_DEF(shuttle) priority_announce( text= "Emergency shuttle uplink services are now back online.", title = "Uplink Restored", -<<<<<<< HEAD sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', -======= - sound = 'sound/misc/announce_dig.ogg', ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sender_override = "Emergency Shuttle Uplink Alert", color_override = "green", ) @@ -465,12 +447,8 @@ SUBSYSTEM_DEF(shuttle) if(emergency.timeLeft(1) < emergency_call_time) return if(SEC_LEVEL_BLUE) -<<<<<<< HEAD //if(emergency.timeLeft(1) < emergency_call_time * 0.5) ORIGINAL if(emergency.timeLeft(1) < emergency_call_time * 0.6) //SKYRAT EDIT CHANGE - ALERTS -======= - if(emergency.timeLeft(1) < emergency_call_time * 0.5) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return //SKYRAT EDIT ADDITION BEGIN - ALERTS if(SEC_LEVEL_ORANGE) @@ -1075,11 +1053,7 @@ SUBSYSTEM_DEF(shuttle) return data -<<<<<<< HEAD -/datum/controller/subsystem/shuttle/ui_act(action, params) -======= /datum/controller/subsystem/shuttle/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/controllers/subsystem/sprite_accessories.dm b/code/controllers/subsystem/sprite_accessories.dm index 85449d07cd4..445f8a6d6d1 100644 --- a/code/controllers/subsystem/sprite_accessories.dm +++ b/code/controllers/subsystem/sprite_accessories.dm @@ -31,7 +31,6 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity var/list/undershirt_m //! stores only undershirt name var/list/undershirt_f //! stores only undershirt name -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Underwear/bra split var/list/bra_list var/list/bra_m @@ -42,21 +41,12 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity var/list/socks_list //! stores /datum/sprite_accessory/socks indexed by name /* SKYRAT EDIT REMOVAL START - Customization - Moved to sprite_accessories var -======= - //Socks - var/list/socks_list //! stores /datum/sprite_accessory/socks indexed by name - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Lizard Bits (all datum lists indexed by name) var/list/lizard_markings_list var/list/snouts_list var/list/horns_list var/list/frills_list var/list/spines_list -<<<<<<< HEAD - var/list/legs_list -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/tail_spines_list //Mutant Human bits @@ -68,7 +58,6 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity var/list/wings_open_list var/list/moth_wings_list var/list/moth_antennae_list -<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END var/list/moth_markings_list var/list/pod_hair_list @@ -90,19 +79,11 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity var/list/dna_mutant_bodypart_blocks = list() var/list/features_block_lengths = list() // SKYRAT EDIT ADDITION END -======= - var/list/moth_markings_list - var/list/caps_list - var/list/pod_hair_list ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/accessories/PreInit() // this stuff NEEDS to be set up before GLOB for preferences and stuff to work so this must go here. sorry setup_lists() init_hair_gradients() -<<<<<<< HEAD make_sprite_accessory_references() // SKYRAT EDIT ADDITION - Customization -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Sets up all of the lists for later utilization in the round and building sprites. /// In an ideal world we could tack everything that just needed `DEFAULT_SPRITE_LIST` into static variables on the top, but due to the initialization order @@ -129,7 +110,6 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity undershirt_m = undershirt_lists[MALE_SPRITE_LIST] undershirt_f = undershirt_lists[FEMALE_SPRITE_LIST] -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Underwear/bra split var/bra_lists = init_sprite_accessory_subtypes(/datum/sprite_accessory/bra) bra_list = bra_lists[DEFAULT_SPRITE_LIST] @@ -140,10 +120,8 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity socks_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/socks)[DEFAULT_SPRITE_LIST] /* // SKYRAT EDIT REMOVAL START - Customization -======= socks_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/socks)[DEFAULT_SPRITE_LIST] ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lizard_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/lizard_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST] tails_list_human = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/human, add_blank = TRUE)[DEFAULT_SPRITE_LIST] tails_list_lizard = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard)[DEFAULT_SPRITE_LIST] @@ -156,7 +134,6 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity frills_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/frills, add_blank = TRUE)[DEFAULT_SPRITE_LIST] spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/spines, add_blank = TRUE)[DEFAULT_SPRITE_LIST] tail_spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/tail_spines, add_blank = TRUE)[DEFAULT_SPRITE_LIST] -<<<<<<< HEAD legs_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/legs)[DEFAULT_SPRITE_LIST] caps_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/caps)[DEFAULT_SPRITE_LIST] moth_wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings)[DEFAULT_SPRITE_LIST] @@ -179,15 +156,6 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity // SKYRAT EDIT ADDITION END /// This proc just intializes all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name -======= - caps_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/caps)[DEFAULT_SPRITE_LIST] - moth_wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings)[DEFAULT_SPRITE_LIST] - moth_antennae_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_antennae)[DEFAULT_SPRITE_LIST] - moth_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST] - pod_hair_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair)[DEFAULT_SPRITE_LIST] - -/// This proc just initializes all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/accessories/proc/init_hair_gradients() hair_gradients_list = list() facial_hair_gradients_list = list() diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 65753b8325d..7b1394ada16 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -23,10 +23,7 @@ SUBSYSTEM_DEF(statpanels) if (!resumed) num_fires++ var/datum/map_config/cached = SSmapping.next_map_config -<<<<<<< HEAD /* SKYRAT EDIT CHANGE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 global_data = list( "Map: [SSmapping.config?.map_name || "Loading..."]", cached ? "Next Map: [cached.map_name]" : null, @@ -36,7 +33,6 @@ SUBSYSTEM_DEF(statpanels) "Station Time: [station_time_timestamp()]", "Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)" ) -<<<<<<< HEAD */ var/round_time = world.time - SSticker.round_start_time var/real_round_time = world.timeofday - SSticker.real_round_start_time @@ -58,8 +54,6 @@ SUBSYSTEM_DEF(statpanels) "Actual Round Timer: [time2text(real_round_time, "hh:mm:ss", 0)]" ) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SSshuttle.emergency) var/ETA = SSshuttle.emergency.getModeStr() diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index cf967015a0d..16793dc63e0 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -67,13 +67,10 @@ SUBSYSTEM_DEF(ticker) /// Why an emergency shuttle was called var/emergency_reason -<<<<<<< HEAD var/real_round_start_time = 0 //SKYRAT EDIT ADDITION var/discord_alerted = FALSE //SKYRAT EDIT - DISCORD PING SPAM PREVENTION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/ticker/Initialize() var/list/byond_sound_formats = list( "mid" = TRUE, @@ -164,7 +161,6 @@ SUBSYSTEM_DEF(ticker) for(var/client/C in GLOB.clients) window_flash(C, ignorepref = TRUE) //let them know lobby has opened up. to_chat(world, span_notice("Welcome to [station_name()]!")) -<<<<<<< HEAD /* ORIGINAL: send2chat("New round starting on [SSmapping.config.map_name]!", CONFIG_GET(string/channel_announce_new_game)) */ // SKYRAT EDIT START - DISCORD SPAM PREVENTION @@ -177,12 +173,7 @@ SUBSYSTEM_DEF(ticker) addtimer(CALLBACK(SStitle, TYPE_PROC_REF(/datum/controller/subsystem/title, change_title_screen)), 1 SECONDS) //SKYRAT EDIT ADDITION - Title screen //Everyone who wants to be an observer is now spawned SEND_SIGNAL(src, COMSIG_TICKER_ENTER_PREGAME) -======= - send2chat(new /datum/tgs_message_content("New round starting on [SSmapping.config.map_name]!"), CONFIG_GET(string/channel_announce_new_game)) - current_state = GAME_STATE_PREGAME - SEND_SIGNAL(src, COMSIG_TICKER_ENTER_PREGAME) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fire() if(GAME_STATE_PREGAME) //lobby stats for statpanels @@ -300,11 +291,8 @@ SUBSYSTEM_DEF(ticker) round_start_time = world.time //otherwise round_start_time would be 0 for the signals SEND_SIGNAL(src, COMSIG_TICKER_ROUND_STARTING, world.time) -<<<<<<< HEAD real_round_start_time = REALTIMEOFDAY //SKYRAT EDIT ADDITION SSautotransfer.new_shift(real_round_start_time) //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_world("Game start took [(world.timeofday - init_start)/10]s") INVOKE_ASYNC(SSdbcore, TYPE_PROC_REF(/datum/controller/subsystem/dbcore,SetRoundStart)) @@ -351,10 +339,7 @@ SUBSYSTEM_DEF(ticker) iter_human.increment_scar_slot() iter_human.load_persistent_scars() -<<<<<<< HEAD SSpersistence.load_modular_persistence(iter_human.get_organ_slot(ORGAN_SLOT_BRAIN)) // SKYRAT EDIT ADDITION - MODULAR_PERSISTENCE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!iter_human.hardcore_survival_score) continue @@ -388,7 +373,6 @@ SUBSYSTEM_DEF(ticker) GLOB.joined_player_list += player.ckey var/atom/destination = player.mind.assigned_role.get_roundstart_spawn_point() if(!destination) // Failed to fetch a proper roundstart location, won't be going anywhere. -<<<<<<< HEAD player.show_title_screen() //SKYRAT EDIT CHANGE continue player.create_character(destination) @@ -396,10 +380,6 @@ SUBSYSTEM_DEF(ticker) player.show_title_screen() //SKYRAT EDIT ADDITION -======= - continue - player.create_character(destination) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CHECK_TICK /datum/controller/subsystem/ticker/proc/collect_minds() @@ -469,10 +449,6 @@ SUBSYSTEM_DEF(ticker) if(new_player_mob.client?.prefs?.should_be_random_hardcore(player_assigned_role, new_player_living.mind)) new_player_mob.client.prefs.hardcore_random_setup(new_player_living) SSquirks.AssignQuirks(new_player_living, new_player_mob.client) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CHECK_TICK if(captainless) @@ -612,7 +588,6 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/send_news_report() var/news_message var/news_source = "Nanotrasen News Network" -<<<<<<< HEAD var/decoded_station_name = html_decode(CONFIG_GET(string/cross_comms_name)) //decode station_name to avoid minor_announce double encode // SKYRAT EDIT: CROSS COMMS CONFIG switch(news_report) @@ -722,101 +697,6 @@ SUBSYSTEM_DEF(ticker) else return "We regret to inform you that shit be whack, yo. None of our reporters have any idea of what may or may not have gone on." //SKYRAT EDIT - END -======= - var/decoded_station_name = html_decode(station_name()) //decode station_name to avoid minor_announce double encode - - switch(news_report) - // The nuke was detonated on the syndicate recon outpost - if(NUKE_SYNDICATE_BASE) - news_message = "In a daring raid, the heroic crew of [decoded_station_name] \ - detonated a nuclear device in the heart of a terrorist base." - // The station was destroyed by nuke ops - if(STATION_DESTROYED_NUKE) - news_message = "We would like to reassure all employees that the reports of a Syndicate \ - backed nuclear attack on [decoded_station_name] are, in fact, a hoax. Have a secure day!" - // The station was evacuated (normal result) - if(STATION_EVACUATED) - // Had an emergency reason supplied to pass along - if(emergency_reason) - news_message = "[decoded_station_name] has been evacuated after transmitting \ - the following distress beacon:\n\n[html_decode(emergency_reason)]" - else - news_message = "The crew of [decoded_station_name] has been \ - evacuated amid unconfirmed reports of enemy activity." - // A blob won - if(BLOB_WIN) - news_message = "[decoded_station_name] was overcome by an unknown biological outbreak, killing \ - all crew on board. Don't let it happen to you! Remember, a clean work station is a safe work station." - // A blob was destroyed - if(BLOB_DESTROYED) - news_message = "[decoded_station_name] is currently undergoing decontamination procedures \ - after the destruction of a biological hazard. As a reminder, any crew members experiencing \ - cramps or bloating should report immediately to security for incineration." - // A certain percentage of all cultists managed to escape at the end of round - if(CULT_ESCAPE) - news_message = "Security Alert: A group of religious fanatics have escaped from [decoded_station_name]." - // Cult was completely or almost completely wiped out - if(CULT_FAILURE) - news_message = "Following the dismantling of a restricted cult aboard [decoded_station_name], \ - we would like to remind all employees that worship outside of the Chapel is strictly prohibited, \ - and cause for termination." - // Cult summoned Nar'sie - if(CULT_SUMMON) - news_message = "Company officials would like to clarify that [decoded_station_name] was scheduled \ - to be decommissioned following meteor damage earlier this year. Earlier reports of an \ - unknowable eldritch horror were made in error." - // Nuke detonated, but missed the station entirely - if(NUKE_MISS) - news_message = "The Syndicate have bungled a terrorist attack [decoded_station_name], \ - detonating a nuclear weapon in empty space nearby." - // All nuke ops got killed - if(OPERATIVES_KILLED) - news_message = "Repairs to [decoded_station_name] are underway after an elite \ - Syndicate death squad was wiped out by the crew." - // Nuke ops results inconclusive - Crew escaped without the disk, or nukies were left alive, or something - if(OPERATIVE_SKIRMISH) - news_message = "A skirmish between security forces and Syndicate agents aboard [decoded_station_name] \ - ended with both sides bloodied but intact." - // Revolution victory - if(REVS_WIN) - news_message = "Company officials have reassured investors that despite a union led revolt \ - aboard [decoded_station_name] there will be no wage increases for workers." - // Revolution defeat - if(REVS_LOSE) - news_message = "[decoded_station_name] quickly put down a misguided attempt at mutiny. \ - Remember, unionizing is illegal!" - // All wizards (plus apprentices) have been killed - if(WIZARD_KILLED) - news_message = "Tensions have flared with the Space Wizard Federation following the death \ - of one of their members aboard [decoded_station_name]." - // The station was nuked generically - if(STATION_NUKED) - // There was a blob on board, guess it was nuked to stop it - if(length(GLOB.overminds)) - for(var/mob/camera/blob/overmind as anything in GLOB.overminds) - if(overmind.max_count < overmind.announcement_size) - continue - - news_message = "[decoded_station_name] is currently undergoing decontanimation after a controlled \ - burst of radiation was used to remove a biological ooze. All employees were safely evacuated prior, \ - and are enjoying a relaxing vacation." - break - // A self destruct or something else - else - news_message = "[decoded_station_name] activated its self-destruct device for unknown reasons. \ - Attempts to clone the Captain for arrest and execution are underway." - // The emergency escape shuttle was hijacked - if(SHUTTLE_HIJACK) - news_message = "During routine evacuation procedures, the emergency shuttle of [decoded_station_name] \ - had its navigation protocols corrupted and went off course, but was recovered shortly after." - // A supermatter cascade triggered - if(SUPERMATTER_CASCADE) - news_message = "Officials are advising nearby colonies about a newly declared exclusion zone in \ - the sector surrounding [decoded_station_name]." - - if(news_message) - send2otherserver(news_source, news_message, "News_Report") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/controller/subsystem/ticker/proc/GetTimeLeft() if(isnull(SSticker.timeLeft)) diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index c6ae79bc3a4..c314fa7d38b 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -524,11 +524,7 @@ SUBSYSTEM_DEF(timer) 2 = timeToRun, 3 = wait, 4 = flags, -<<<<<<< HEAD - 5 = callBack, /* Safe to hold this directly becasue it's never del'd */ -======= 5 = callBack, /* Safe to hold this directly because it's never del'd */ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 6 = "[callBack.object]", 7 = text_ref(callBack.object), 8 = getcallingtype(), @@ -543,11 +539,7 @@ SUBSYSTEM_DEF(timer) 2 = timeToRun, 3 = wait, 4 = flags, -<<<<<<< HEAD - 5 = callBack, /* Safe to hold this directly becasue it's never del'd */ -======= 5 = callBack, /* Safe to hold this directly because it's never del'd */ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 6 = "[callBack.object]", 7 = getcallingtype(), 8 = callBack.delegate, diff --git a/code/controllers/subsystem/verb_manager.dm b/code/controllers/subsystem/verb_manager.dm index ef73c41c466..f09c0509641 100644 --- a/code/controllers/subsystem/verb_manager.dm +++ b/code/controllers/subsystem/verb_manager.dm @@ -8,17 +8,6 @@ * plus TICK_BYOND_RESERVE from the tick and uses up to that amount of time (minus the percentage of the tick used by the time it executes subsystems) * on subsystems running cool things like atmospherics or Life or SSInput or whatever. * -<<<<<<< HEAD - * Without this subsystem, verbs are likely to cause overtime if the MC uses all of the time it has alloted for itself in the tick, and SendMaps - * uses as much as its expected to, and an expensive verb ends up executing that tick. This is because the MC is completely blind to the cost of - * verbs, it can't account for it at all. The only chance for verbs to not cause overtime in a tick where the MC used as much of the tick - * as it alloted itself and where SendMaps costed as much as it was expected to is if the verb(s) take less than TICK_BYOND_RESERVE percent of - * the tick, which isnt much. Not to mention if SendMaps takes more than 30% of the tick and the MC forces itself to take at least 70% of the - * normal tick duration which causes ticks to naturally overrun even in the absence of verbs. - * - * With this subsystem, the MC can account for the cost of verbs and thus stop major overruns of ticks. This means that the most important subsystems - * like SSinput can start at the same time they were supposed to, leading to a smoother experience for the player since ticks arent riddled with -======= * Without this subsystem, verbs are likely to cause overtime if the MC uses all of the time it has allotted for itself in the tick, and SendMaps * uses as much as its expected to, and an expensive verb ends up executing that tick. This is because the MC is completely blind to the cost of * verbs, it can't account for it at all. The only chance for verbs to not cause overtime in a tick where the MC used as much of the tick @@ -28,7 +17,6 @@ * * With this subsystem, the MC can account for the cost of verbs and thus stop major overruns of ticks. This means that the most important subsystems * like SSinput can start at the same time they were supposed to, leading to a smoother experience for the player since ticks aren't riddled with ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * minor hangs over and over again. */ SUBSYSTEM_DEF(verb_manager) @@ -48,28 +36,17 @@ SUBSYSTEM_DEF(verb_manager) ///if TRUE we treat usr's with holders just like usr's without holders. otherwise they always execute immediately var/can_queue_admin_verbs = FALSE -<<<<<<< HEAD - ///if this is true all verbs immediately execute and dont queue. in case the mc is fucked or something -======= ///if this is true all verbs immediately execute and don't queue. in case the mc is fucked or something ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/FOR_ADMINS_IF_VERBS_FUCKED_immediately_execute_all_verbs = FALSE ///used for subtypes to determine if they use their own stats for the stat entry var/use_default_stats = TRUE ///if TRUE this will... message admins every time a verb is queued to this subsystem for the next tick with stats. -<<<<<<< HEAD - ///for obvious reasons dont make this be TRUE on the code level this is for admins to turn on - var/message_admins_on_queue = FALSE - - ///always queue if possible. overides can_queue_admin_verbs but not FOR_ADMINS_IF_VERBS_FUCKED_immediately_execute_all_verbs -======= ///for obvious reasons don't make this be TRUE on the code level this is for admins to turn on var/message_admins_on_queue = FALSE ///always queue if possible. overrides can_queue_admin_verbs but not FOR_ADMINS_IF_VERBS_FUCKED_immediately_execute_all_verbs ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/always_queue = FALSE /** @@ -110,11 +87,7 @@ SUBSYSTEM_DEF(verb_manager) #else if(QDELETED(usr) || isnull(usr.client)) -<<<<<<< HEAD - stack_trace("_queue_verb() returned false because it wasnt called from player input!") -======= stack_trace("_queue_verb() returned false because it wasn't called from player input!") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE #endif diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index beb48171029..7bed63cc36f 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -356,11 +356,7 @@ SUBSYSTEM_DEF(vote) data["VoteCD"] = CONFIG_GET(number/vote_delay) return data -<<<<<<< HEAD -/datum/controller/subsystem/vote/ui_act(action, params) -======= /datum/controller/subsystem/vote/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/datums/actions/items/toggles.dm b/code/datums/actions/items/toggles.dm index 85d037d1b7f..1ff88f41a73 100644 --- a/code/datums/actions/items/toggles.dm +++ b/code/datums/actions/items/toggles.dm @@ -15,11 +15,8 @@ name = "Toggle Hood" /datum/action/item_action/toggle_firemode -<<<<<<< HEAD button_icon = 'modular_skyrat/master_files/icons/mob/actions/actions_items.dmi' //SKYRAT EDIT ADDITION button_icon_state = "fireselect_no" //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Toggle Firemode" /datum/action/item_action/toggle_gunlight diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm index e6fe63fc8e3..a2fc1cdc62e 100644 --- a/code/datums/ai/_ai_controller.dm +++ b/code/datums/ai/_ai_controller.dm @@ -63,15 +63,12 @@ multiple modular subtrees with behaviors ///What distance should we be checking for interesting things when considering idling/deidling? Defaults to AI_DEFAULT_INTERESTING_DIST var/interesting_dist = AI_DEFAULT_INTERESTING_DIST -<<<<<<< HEAD -======= /// TRUE if we're able to run, FALSE if we aren't /// Should not be set manually, override get_able_to_run() instead /// Make sure you hook update_able_to_run() in setup_able_to_run() to whatever parameters changing that you added /// Otherwise we will not pay attention to them changing var/able_to_run = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/ai_controller/New(atom/new_pawn) change_ai_movement_type(ai_movement) init_subtrees() @@ -118,10 +115,7 @@ multiple modular subtrees with behaviors ///Proc to move from one pawn to another, this will destroy the target's existing controller. /datum/ai_controller/proc/PossessPawn(atom/new_pawn) -<<<<<<< HEAD -======= SHOULD_CALL_PARENT(TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(pawn) //Reset any old signals UnpossessPawn(FALSE) @@ -146,11 +140,8 @@ multiple modular subtrees with behaviors RegisterSignal(pawn, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_changed)) RegisterSignal(pawn, COMSIG_MOB_LOGIN, PROC_REF(on_sentience_gained)) RegisterSignal(pawn, COMSIG_QDELETING, PROC_REF(on_pawn_qdeleted)) -<<<<<<< HEAD -======= update_able_to_run() setup_able_to_run() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 our_cells = new(interesting_dist, interesting_dist, 1) set_new_cells() @@ -278,19 +269,13 @@ multiple modular subtrees with behaviors ///Proc for deinitializing the pawn to the old controller /datum/ai_controller/proc/UnpossessPawn(destroy) -<<<<<<< HEAD -======= SHOULD_CALL_PARENT(TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(pawn)) return // instantiated without an applicable pawn, fine set_ai_status(AI_STATUS_OFF) UnregisterSignal(pawn, list(COMSIG_MOVABLE_Z_CHANGED, COMSIG_MOB_LOGIN, COMSIG_MOB_LOGOUT, COMSIG_MOB_STATCHANGE, COMSIG_QDELETING)) -<<<<<<< HEAD -======= clear_able_to_run() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ai_movement.moving_controllers[src]) ai_movement.stop_moving_towards(src) var/turf/pawn_turf = get_turf(pawn) @@ -303,10 +288,6 @@ multiple modular subtrees with behaviors if(destroy) qdel(src) -<<<<<<< HEAD -///Returns TRUE if the ai controller can actually run at the moment. -/datum/ai_controller/proc/able_to_run() -======= /datum/ai_controller/proc/setup_able_to_run() // paused_until is handled by PauseAi() manually RegisterSignals(pawn, list(SIGNAL_ADDTRAIT(TRAIT_AI_PAUSED), SIGNAL_REMOVETRAIT(TRAIT_AI_PAUSED)), PROC_REF(update_able_to_run)) @@ -320,7 +301,6 @@ multiple modular subtrees with behaviors ///Returns TRUE if the ai controller can actually run at the moment, FALSE otherwise /datum/ai_controller/proc/get_able_to_run() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HAS_TRAIT(pawn, TRAIT_AI_PAUSED)) return FALSE if(world.time < paused_until) @@ -330,11 +310,7 @@ multiple modular subtrees with behaviors ///Runs any actions that are currently running /datum/ai_controller/process(seconds_per_tick) -<<<<<<< HEAD - if(!able_to_run()) -======= if(!able_to_run) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.move_manager.stop_looping(pawn) //stop moving return //this should remove them from processing in the future through event-based stuff. @@ -451,11 +427,8 @@ multiple modular subtrees with behaviors /datum/ai_controller/proc/PauseAi(time) paused_until = world.time + time -<<<<<<< HEAD -======= update_able_to_run() addtimer(CALLBACK(src, PROC_REF(update_able_to_run)), time) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/ai_controller/proc/modify_cooldown(datum/ai_behavior/behavior, new_cooldown) behavior_cooldowns[behavior] = new_cooldown diff --git a/code/datums/ai/bane/bane_controller.dm b/code/datums/ai/bane/bane_controller.dm index 02cf8fb1ea3..64e1dcf31af 100644 --- a/code/datums/ai/bane/bane_controller.dm +++ b/code/datums/ai/bane/bane_controller.dm @@ -12,9 +12,6 @@ And the only victory you achieved was a lie. Now you understand Gotham is beyond return AI_CONTROLLER_INCOMPATIBLE return ..() //Run parent at end -<<<<<<< HEAD -/datum/ai_controller/bane/able_to_run() -======= /datum/ai_controller/bane/on_stat_changed(mob/living/source, new_stat) . = ..() update_able_to_run() @@ -28,7 +25,6 @@ And the only victory you achieved was a lie. Now you understand Gotham is beyond return ..() /datum/ai_controller/bane/get_able_to_run() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/living_pawn = pawn if(IS_DEAD_OR_INCAP(living_pawn)) return FALSE diff --git a/code/datums/ai/basic_mobs/base_basic_controller.dm b/code/datums/ai/basic_mobs/base_basic_controller.dm index bbda7d822b1..a14630fa0e8 100644 --- a/code/datums/ai/basic_mobs/base_basic_controller.dm +++ b/code/datums/ai/basic_mobs/base_basic_controller.dm @@ -12,19 +12,6 @@ return ..() //Run parent at end -<<<<<<< HEAD - -/datum/ai_controller/basic_controller/able_to_run() - . = ..() - if(!isliving(pawn)) - return - var/mob/living/living_pawn = pawn - var/incap_flags = NONE - if (ai_traits & CAN_ACT_IN_STASIS) - incap_flags |= IGNORE_STASIS - if(!(ai_traits & CAN_ACT_WHILE_DEAD) && (living_pawn.incapacitated(incap_flags) || living_pawn.stat)) - return FALSE -======= /datum/ai_controller/basic_controller/on_stat_changed(mob/living/source, new_stat) . = ..() update_able_to_run() @@ -48,7 +35,6 @@ return FALSE else if(IS_DEAD_OR_INCAP(living_pawn)) return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ai_traits & PAUSE_DURING_DO_AFTER && LAZYLEN(living_pawn.do_afters)) return FALSE diff --git a/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm index b033ccfd079..3ed8b2df2b2 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm @@ -12,11 +12,6 @@ var/atom/flee_from = controller.blackboard[target_key] if(!should_flee(controller, flee_from)) return -<<<<<<< HEAD - if(!should_flee(controller, flee_from)) - return -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/flee_distance = controller.blackboard[BB_BASIC_MOB_FLEE_DISTANCE] || DEFAULT_BASIC_FLEE_DISTANCE if (get_dist(controller.pawn, flee_from) >= flee_distance) return diff --git a/code/datums/ai/cursed/cursed_controller.dm b/code/datums/ai/cursed/cursed_controller.dm index 2d980ad41e4..aa32496f357 100644 --- a/code/datums/ai/cursed/cursed_controller.dm +++ b/code/datums/ai/cursed/cursed_controller.dm @@ -27,15 +27,9 @@ return ..() //Run parent at end ///signal called by the pawn hitting something after a throw -<<<<<<< HEAD -/datum/ai_controller/cursed/proc/on_throw_hit(datum/source, atom/hit_atom, datum/thrownthing/throwingdatum) - SIGNAL_HANDLER - if(!iscarbon(hit_atom)) -======= /datum/ai_controller/cursed/proc/on_throw_hit(datum/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught) SIGNAL_HANDLER if(caught || !iscarbon(hit_atom)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return //equipcode has sleeps all over it. INVOKE_ASYNC(src, PROC_REF(try_equipping_to_target_slot), hit_atom) diff --git a/code/datums/ai/generic/find_and_set.dm b/code/datums/ai/generic/find_and_set.dm index efeb20ebb5f..5a424f304f2 100644 --- a/code/datums/ai/generic/find_and_set.dm +++ b/code/datums/ai/generic/find_and_set.dm @@ -177,8 +177,6 @@ var/mob/living/living_pawn = controller.pawn var/potential_friend = living_pawn.faction.Find(REF(friend)) ? friend : null return potential_friend -<<<<<<< HEAD -======= /datum/ai_behavior/find_and_set/in_list/turf_types @@ -193,4 +191,3 @@ if(can_see(controller.pawn, possible_turf, search_range)) return possible_turf return null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm index ea73050cc22..e92ec519b20 100644 --- a/code/datums/ai/monkey/monkey_controller.dm +++ b/code/datums/ai/monkey/monkey_controller.dm @@ -104,12 +104,6 @@ have ways of interacting with a specific mob and control it. . = ..() set_trip_mode(mode = TRUE) -<<<<<<< HEAD -/datum/ai_controller/monkey/able_to_run() - var/mob/living/living_pawn = pawn - - if(living_pawn.incapacitated(IGNORE_RESTRAINTS | IGNORE_GRAB | IGNORE_STASIS) || living_pawn.stat > CONSCIOUS) -======= /datum/ai_controller/monkey/on_stat_changed(mob/living/source, new_stat) . = ..() update_able_to_run() @@ -126,7 +120,6 @@ have ways of interacting with a specific mob and control it. var/mob/living/living_pawn = pawn if(INCAPACITATED_IGNORING(living_pawn, INCAPABLE_RESTRAINTS|INCAPABLE_STASIS|INCAPABLE_GRAB) || living_pawn.stat > CONSCIOUS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return ..() @@ -153,11 +146,7 @@ have ways of interacting with a specific mob and control it. for(var/obj/item/item in oview(2, living_pawn)) nearby_items += item -<<<<<<< HEAD - for(var/obj/item/item in living_pawn.held_items) // If we've got some garbage in out hands thats going to stop us from effectivly attacking, we should get rid of it. -======= for(var/obj/item/item in living_pawn.held_items) // If we've got some garbage in out hands that's going to stop us from effectively attacking, we should get rid of it. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(item.force < 2) living_pawn.dropItemToGround(item) @@ -174,11 +163,7 @@ have ways of interacting with a specific mob and control it. if(!weapon || (weapon in living_pawn.held_items)) return FALSE -<<<<<<< HEAD - if(weapon.force < 2) // our bite does 2 damage on avarage, no point in settling for anything less -======= if(weapon.force < 2) // our bite does 2 damage on average, no point in settling for anything less ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE set_blackboard_key(BB_MONKEY_PICKUPTARGET, weapon) diff --git a/code/datums/ai/movement/_ai_movement.dm b/code/datums/ai/movement/_ai_movement.dm index 16005f7d92b..c1b3aae5bd6 100644 --- a/code/datums/ai/movement/_ai_movement.dm +++ b/code/datums/ai/movement/_ai_movement.dm @@ -59,11 +59,7 @@ var/datum/ai_controller/controller = source.extra_info // Check if this controller can actually run, so we don't chase people with corpses -<<<<<<< HEAD - if(!controller.able_to_run()) -======= if(!controller.able_to_run) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 controller.CancelActions() qdel(source) //stop moving return MOVELOOP_SKIP_STEP diff --git a/code/datums/ai/oldhostile/hostile_tameable.dm b/code/datums/ai/oldhostile/hostile_tameable.dm index 3053a99a233..907ab955a8d 100644 --- a/code/datums/ai/oldhostile/hostile_tameable.dm +++ b/code/datums/ai/oldhostile/hostile_tameable.dm @@ -50,9 +50,6 @@ if(buckler != blackboard[BB_HOSTILE_FRIEND]) return COMPONENT_BLOCK_BUCKLE -<<<<<<< HEAD -/datum/ai_controller/hostile_friend/able_to_run() -======= /datum/ai_controller/hostile_friend/on_stat_changed(mob/living/source, new_stat) . = ..() update_able_to_run() @@ -66,7 +63,6 @@ return ..() /datum/ai_controller/hostile_friend/get_able_to_run() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/living_pawn = pawn if(IS_DEAD_OR_INCAP(living_pawn)) @@ -93,22 +89,14 @@ if(pawn.Adjacent(pawn, new_friend)) new_friend.visible_message("[pawn] looks at [new_friend] in a friendly manner!", span_notice("[pawn] looks at you in a friendly manner!")) set_blackboard_key(BB_HOSTILE_FRIEND, new_friend) -<<<<<<< HEAD - RegisterSignal(new_friend, COMSIG_MOB_POINTED, PROC_REF(check_point)) -======= RegisterSignal(new_friend, COMSIG_MOVABLE_POINTED, PROC_REF(check_point)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(new_friend, COMSIG_MOB_SAY, PROC_REF(check_verbal_command)) /// Someone is being mean to us, take them off our friends (add actual enemies behavior later) /datum/ai_controller/hostile_friend/proc/unfriend() var/mob/living/old_friend = blackboard[BB_HOSTILE_FRIEND] if(old_friend) -<<<<<<< HEAD - UnregisterSignal(old_friend, list(COMSIG_MOB_POINTED, COMSIG_MOB_SAY)) -======= UnregisterSignal(old_friend, list(COMSIG_MOVABLE_POINTED, COMSIG_MOB_SAY)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 clear_blackboard_key(BB_HOSTILE_FRIEND) /// Someone is looking at us, if we're currently carrying something then show what it is, and include a message if they're our friend @@ -153,11 +141,7 @@ /datum/ai_controller/hostile_friend/proc/check_menu(mob/user) if(!istype(user)) CRASH("A non-mob is trying to issue an order to [pawn].") -<<<<<<< HEAD - if(user.incapacitated() || !can_see(user, pawn)) -======= if(user.incapacitated || !can_see(user, pawn)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -218,11 +202,7 @@ set_blackboard_key(BB_HOSTILE_ORDER_MODE, HOSTILE_COMMAND_ATTACK) /// Someone we like is pointing at something, see if it's something we might want to interact with (like if they might want us to fetch something for them) -<<<<<<< HEAD -/datum/ai_controller/hostile_friend/proc/check_point(mob/pointing_friend, atom/movable/pointed_movable) -======= /datum/ai_controller/hostile_friend/proc/check_point(mob/pointing_friend, atom/movable/pointed_movable, obj/effect/temp_visual/point/point) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER var/mob/living/simple_animal/hostile/living_pawn = pawn diff --git a/code/datums/announcers/default_announcer.dm b/code/datums/announcers/default_announcer.dm index 559ed31d97c..c5dc142f818 100644 --- a/code/datums/announcers/default_announcer.dm +++ b/code/datums/announcers/default_announcer.dm @@ -1,7 +1,4 @@ -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/centcom_announcer/default welcome_sounds = list('sound/ai/default/welcome.ogg') alert_sounds = list('sound/ai/default/attention.ogg') @@ -22,7 +19,4 @@ ANNOUNCER_SHUTTLEDOCK = 'sound/ai/default/shuttledock.ogg', ANNOUNCER_SHUTTLERECALLED = 'sound/ai/default/shuttlerecalled.ogg', ANNOUNCER_SPANOMALIES = 'sound/ai/default/spanomalies.ogg') -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/atmosphere/planetary.dm b/code/datums/atmosphere/planetary.dm index 680e3f27e88..29db62369b9 100644 --- a/code/datums/atmosphere/planetary.dm +++ b/code/datums/atmosphere/planetary.dm @@ -17,11 +17,7 @@ /datum/gas/miasma=1.2, /datum/gas/water_vapor=0.1, ) -<<<<<<< HEAD restricted_chance = 0 // SKYRAT EDIT: Disables restricted gases from rolling - Original value (30) -======= - restricted_chance = 30 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 minimum_pressure = HAZARD_LOW_PRESSURE + 10 maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1 @@ -46,11 +42,7 @@ /datum/gas/water_vapor=0.1, /datum/gas/miasma=1.2, ) -<<<<<<< HEAD restricted_chance = 0 // SKYRAT EDIT: Disables restricted gases from rolling - Original value (20) -======= - restricted_chance = 20 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 minimum_pressure = HAZARD_LOW_PRESSURE + 10 maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1 diff --git a/code/datums/bodypart_overlays/bodypart_overlay.dm b/code/datums/bodypart_overlays/bodypart_overlay.dm index 0860a959bf5..15e9bd62f44 100644 --- a/code/datums/bodypart_overlays/bodypart_overlay.dm +++ b/code/datums/bodypart_overlays/bodypart_overlay.dm @@ -4,11 +4,7 @@ ///Sometimes we need multiple layers, for like the back, middle and front of the person (EXTERNAL_FRONT, EXTERNAL_ADJACENT, EXTERNAL_BEHIND) var/layers ///List of all possible layers. Used for looping through in drawing -<<<<<<< HEAD var/static/list/all_layers = list(EXTERNAL_FRONT, EXTERNAL_ADJACENT, EXTERNAL_BEHIND, EXTERNAL_FRONT_UNDER_CLOTHES, EXTERNAL_FRONT_OVER, EXTERNAL_FRONT_ABOVE_HAIR) // SKYRAT EDIT - Customization - ORIGINAL: var/static/list/all_layers = list(EXTERNAL_FRONT, EXTERNAL_ADJACENT, EXTERNAL_BEHIND) -======= - var/static/list/all_layers = list(EXTERNAL_FRONT, EXTERNAL_ADJACENT, EXTERNAL_BEHIND) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Key of the icon states of all the sprite_datums for easy caching var/cache_key = "" @@ -61,7 +57,6 @@ return "ADJ" if(-BODY_FRONT_LAYER) return "FRONT" -<<<<<<< HEAD //SKYRAT EDIT ADDITION - Customization if(-BODY_FRONT_UNDER_CLOTHES) return "FRONT_UNDER" @@ -70,8 +65,6 @@ if(-HEAD_LAYER) return "FRONT_OVER_HAIR" //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Converts a bitflag to the right layer. I'd love to make this a static index list, but byond made an attempt on my life when i did /datum/bodypart_overlay/proc/bitflag_to_layer(layer) @@ -82,7 +75,6 @@ return -BODY_ADJ_LAYER if(EXTERNAL_FRONT) return -BODY_FRONT_LAYER -<<<<<<< HEAD //SKYRAT EDIT ADDITION - Customization if(EXTERNAL_FRONT_UNDER_CLOTHES) return -BODY_FRONT_UNDER_CLOTHES @@ -91,8 +83,6 @@ if(EXTERNAL_FRONT_ABOVE_HAIR) return -HEAD_LAYER //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Check whether we can draw the overlays. You generally don't want lizard snouts to draw over an EVA suit /datum/bodypart_overlay/proc/can_draw_on_bodypart(mob/living/carbon/human/human) diff --git a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm index 2561d993148..0ac3e5c3c1a 100644 --- a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm +++ b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm @@ -13,8 +13,6 @@ ///Take on the dna/preference from whoever we're gonna be inserted in var/imprint_on_next_insertion = TRUE -<<<<<<< HEAD -======= /datum/bodypart_overlay/mutant/New(obj/item/organ/attached_organ) . = ..() @@ -33,7 +31,6 @@ set_appearance_from_name(feature_name) imprint_on_next_insertion = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bodypart_overlay/mutant/get_overlay(layer, obj/item/bodypart/limb) inherit_color(limb) // If draw_color is not set yet, go ahead and do that return ..() @@ -88,10 +85,6 @@ return appearance /datum/bodypart_overlay/mutant/color_image(image/overlay, layer, obj/item/bodypart/limb) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlay.color = sprite_datum.color_src ? draw_color : null /datum/bodypart_overlay/mutant/added_to_limb(obj/item/bodypart/limb) @@ -123,19 +116,13 @@ /datum/bodypart_overlay/mutant/proc/inherit_color(obj/item/bodypart/bodypart_owner, force) if(isnull(bodypart_owner)) draw_color = null -<<<<<<< HEAD alpha = 255 // SKYRAT ADDITION - Mutant bodyparts transparency are based on limb transparency -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE if(draw_color && !force) return FALSE -<<<<<<< HEAD alpha = bodypart_owner.alpha // SKYRAT ADDITION - Mutant bodyparts transparency are based on limb transparency -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(color_source) if(ORGAN_COLOR_OVERRIDE) draw_color = override_color(bodypart_owner.draw_color) @@ -171,7 +158,3 @@ CRASH("External organ [type] couldn't find sprite accessory [accessory_name]!") else CRASH("External organ [type] had fetch_sprite_datum called with a null accessory name!") -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/brain_damage/creepy_trauma.dm b/code/datums/brain_damage/creepy_trauma.dm index 73f20eda4a4..d7526aa7779 100644 --- a/code/datums/brain_damage/creepy_trauma.dm +++ b/code/datums/brain_damage/creepy_trauma.dm @@ -136,13 +136,10 @@ continue if(!(player.mind.assigned_role.job_flags & JOB_CREW_MEMBER)) continue -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Players in the interlink can't be obsession targets if(SSticker.IsRoundInProgress() && istype(get_area(player), /area/centcom/interlink)) continue // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 viable_minds += player.mind for(var/datum/mind/possible_target as anything in viable_minds) if(possible_target != owner && ishuman(possible_target.current)) diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index 372dca594e0..cd45ae1abf4 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -407,11 +407,7 @@ var/obj/item/bodypart/bodypart = owner.get_bodypart(owner.get_random_valid_zone(even_weights = TRUE)) if(!(bodypart && IS_ORGANIC_LIMB(bodypart)) && bodypart.bodypart_flags & BODYPART_PSEUDOPART) return -<<<<<<< HEAD - if(owner.incapacitated()) -======= if(owner.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return bodypart.receive_damage(scratch_damage) if(SPT_PROB(33, seconds_per_tick)) diff --git a/code/datums/callback.dm b/code/datums/callback.dm index 95a344cd8f4..c2941c92029 100644 --- a/code/datums/callback.dm +++ b/code/datums/callback.dm @@ -111,11 +111,7 @@ else calling_arguments = args if(datum_flags & DF_VAR_EDITED) -<<<<<<< HEAD - if(usr != GLOB.AdminProcCallHandler && !usr?.client?.ckey) //This happens when a timer or the MC invokes a callback -======= if(usr != GLOB.AdminProcCallHandler && !(usr && usr?.client?.ckey)) //This happens when a timer or the MC invokes a callback ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return HandleUserlessProcCall(usr, object, delegate, calling_arguments) return WrapAdminProcCall(object, delegate, calling_arguments) if (object == GLOBAL_PROC) @@ -152,11 +148,7 @@ else calling_arguments = args if(datum_flags & DF_VAR_EDITED) -<<<<<<< HEAD - if(usr != GLOB.AdminProcCallHandler && !usr?.client?.ckey) //This happens when a timer or the MC invokes a callback -======= if(usr != GLOB.AdminProcCallHandler && !(usr && usr?.client?.ckey)) //This happens when a timer or the MC invokes a callback ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return HandleUserlessProcCall(usr, object, delegate, calling_arguments) return WrapAdminProcCall(object, delegate, calling_arguments) if (object == GLOBAL_PROC) diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index b51e72e514c..ba2b91e08fa 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -121,15 +121,12 @@ if (length_char(text) > maxlen) text = copytext_char(text, 1, maxlen + 1) + "..." // BYOND index moment -<<<<<<< HEAD // Calculate target color if not already present if (!target.chat_color || target.chat_color_name != target.name) target.chat_color = get_chat_color_string(target.name) // SKYRAT EDIT CHANGE - ORIGINAL: target.chat_color = colorize_string(target.name) target.chat_color_darkened = get_chat_color_string(target.name, darkened = TRUE) // SKYRAT EDIT CHANGE - ORIGINAL: target.chat_color_darkened = colorize_string(target.name, 0.85, 0.85) target.chat_color_name = target.name -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Get rid of any URL schemes that might cause BYOND to automatically wrap something in an anchor tag var/static/regex/url_scheme = new(@"[A-Za-z][A-Za-z0-9+-\.]*:\/\/", "g") text = replacetext(text, url_scheme, "") diff --git a/code/datums/communications.dm b/code/datums/communications.dm index 8c8764116b5..79f660a4cfa 100644 --- a/code/datums/communications.dm +++ b/code/datums/communications.dm @@ -39,11 +39,7 @@ GLOBAL_DATUM_INIT(communications_controller, /datum/communciations_controller, n if(syndicate) priority_announce(html_decode(message_data["message"]), null, 'sound/misc/announce_syndi.ogg', ANNOUNCEMENT_TYPE_SYNDICATE, has_important_message = TRUE, players = players, color_override = "red") else -<<<<<<< HEAD priority_announce(html_decode(message_data["message"]), null, ANNOUNCER_CAPTAIN, ANNOUNCEMENT_TYPE_CAPTAIN, has_important_message = TRUE, players = players) // SKYRAT EDIT CHANGE - 'sound/misc/announce.ogg' to ANNOUNCER_CAPTAIN -======= - priority_announce(html_decode(message_data["message"]), null, 'sound/misc/announce.ogg', ANNOUNCEMENT_TYPE_CAPTAIN, has_important_message = TRUE, players = players) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 COOLDOWN_START(src, nonsilicon_message_cooldown, COMMUNICATION_COOLDOWN) user.log_talk(input, LOG_SAY, tag="priority announcement") message_admins("[ADMIN_LOOKUPFLW(user)] has made a priority announcement.") diff --git a/code/datums/components/appearance_on_aggro.dm b/code/datums/components/appearance_on_aggro.dm index 629242a9caa..6d4cab3d914 100644 --- a/code/datums/components/appearance_on_aggro.dm +++ b/code/datums/components/appearance_on_aggro.dm @@ -13,11 +13,6 @@ var/alpha_on_aggro /// visibility of our icon when deaggroed var/alpha_on_deaggro -<<<<<<< HEAD - /// do we currently have a target - var/atom/current_target -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/appearance_on_aggro/Initialize(aggro_state, overlay_icon, overlay_state, alpha_on_aggro, alpha_on_deaggro) if (!isliving(parent)) @@ -30,11 +25,7 @@ /datum/component/appearance_on_aggro/RegisterWithParent() RegisterSignal(parent, COMSIG_AI_BLACKBOARD_KEY_SET(target_key), PROC_REF(on_set_target)) -<<<<<<< HEAD - RegisterSignal(parent, COMSIG_AI_BLACKBOARD_KEY_CLEARED(target_key), PROC_REF(on_clear_target)) -======= RegisterSignals(parent, list(COMSIG_AI_BLACKBOARD_KEY_CLEARED(target_key), COMSIG_LIVING_DEATH), PROC_REF(on_clear_or_death)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!isnull(aggro_state)) RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON_STATE, PROC_REF(on_icon_state_updated)) if (!isnull(aggro_overlay)) @@ -42,53 +33,29 @@ /datum/component/appearance_on_aggro/UnregisterFromParent() . = ..() -<<<<<<< HEAD - UnregisterSignal(parent, list(COMSIG_AI_BLACKBOARD_KEY_SET(target_key), COMSIG_AI_BLACKBOARD_KEY_CLEARED(target_key))) -======= UnregisterSignal(parent, list(COMSIG_AI_BLACKBOARD_KEY_SET(target_key), COMSIG_AI_BLACKBOARD_KEY_CLEARED(target_key), COMSIG_LIVING_DEATH)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/appearance_on_aggro/proc/on_set_target(mob/living/source) SIGNAL_HANDLER -<<<<<<< HEAD - var/atom/target = source.ai_controller.blackboard[target_key] - if (QDELETED(target)) - return - - current_target = target -======= var/atom/target = source.ai_controller?.blackboard[target_key] if (QDELETED(target)) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!isnull(aggro_overlay) || !isnull(aggro_state)) source.update_appearance(UPDATE_ICON) if (!isnull(alpha_on_aggro)) animate(source, alpha = alpha_on_aggro, time = 2 SECONDS) /datum/component/appearance_on_aggro/Destroy() -<<<<<<< HEAD - if (!isnull(current_target)) - revert_appearance(parent) - return ..() - -/datum/component/appearance_on_aggro/proc/on_clear_target(atom/source) -======= revert_appearance(parent) return ..() /datum/component/appearance_on_aggro/proc/on_clear_or_death(atom/source) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER revert_appearance(parent) /datum/component/appearance_on_aggro/proc/revert_appearance(mob/living/source) -<<<<<<< HEAD - current_target = null -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!isnull(aggro_overlay) || !isnull(aggro_state)) source.update_appearance(UPDATE_ICON) if (!isnull(alpha_on_deaggro)) @@ -98,20 +65,11 @@ SIGNAL_HANDLER if (source.stat == DEAD) return -<<<<<<< HEAD - source.icon_state = isnull(current_target) ? initial(source.icon_state) : aggro_state - -/datum/component/appearance_on_aggro/proc/on_overlays_updated(atom/source, list/overlays) - SIGNAL_HANDLER - - if (isnull(current_target)) -======= source.icon_state = source.ai_controller?.blackboard_key_exists(target_key) ? aggro_state : initial(source.icon_state) /datum/component/appearance_on_aggro/proc/on_overlays_updated(mob/living/basic/source, list/overlays) SIGNAL_HANDLER if(!(source.ai_controller?.blackboard_key_exists(target_key))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return overlays += aggro_overlay diff --git a/code/datums/components/aquarium_content.dm b/code/datums/components/aquarium_content.dm index 386458f233d..57d62cdb0ee 100644 --- a/code/datums/components/aquarium_content.dm +++ b/code/datums/components/aquarium_content.dm @@ -24,17 +24,6 @@ //Current layer for the visual object var/base_layer -<<<<<<< HEAD - - /** - * Fish sprite how to: - * Need to be centered on 16,16 in the dmi and facing left by default. - * sprite_height/sprite_width is the size it will have in aquarium and used to control animation boundaries. - * source_height/source_width is the size of the original icon (ideally only the non-empty parts) - */ - - -======= /** * Fish sprite how to: * The aquarium icon state needs to be centered on 16,16 in the dmi and facing left by default. @@ -44,7 +33,6 @@ * cover the extra pixels anyway. */ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Icon used for in aquarium sprite var/icon = 'icons/obj/aquarium/fish.dmi' /// If this is set this icon state will be used for the holder while icon_state will only be used for item/catalog. Transformation from source_width/height WON'T be applied. @@ -64,13 +52,6 @@ var/sprite_height = 3 var/sprite_width = 3 -<<<<<<< HEAD - //This is the size of the source sprite. This will be used to calculate scale down factor. - var/source_width = 32 - var/source_height = 32 - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Currently playing animation var/current_animation @@ -112,10 +93,7 @@ ADD_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, REF(src)) RegisterSignal(parent, COMSIG_TRY_INSERTING_IN_AQUARIUM, PROC_REF(is_ready_to_insert)) RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(enter_aquarium)) -<<<<<<< HEAD -======= RegisterSignal(parent, COMSIG_FISH_PETTED, PROC_REF(on_fish_petted)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //If component is added to something already in aquarium at the time initialize it properly. var/atom/movable/movable_parent = parent @@ -131,24 +109,9 @@ sprite_width = fish.sprite_width aquarium_vc_color = fish.aquarium_vc_color -<<<<<<< HEAD - if(fish.dedicated_in_aquarium_icon_state) - if(fish.dedicated_in_aquarium_icon) - icon = fish.dedicated_in_aquarium_icon - icon_state = fish.dedicated_in_aquarium_icon_state - base_transform = matrix() - else - icon_state = fish.icon_state - var/matrix/matrix = matrix() - var/x_scale = fish.sprite_width / fish.source_width - var/y_scale = fish.sprite_height / fish.source_height - matrix.Scale(x_scale, y_scale) - base_transform = matrix -======= icon = fish.dedicated_in_aquarium_icon icon_state = fish.dedicated_in_aquarium_icon_state base_transform = matrix() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 randomize_position = TRUE @@ -299,10 +262,6 @@ dead_animation() return -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Create looping random path animation, pixel offsets parameters include offsets already /datum/component/aquarium_content/proc/swim_animation() var/avg_width = round(sprite_width / 2) @@ -353,14 +312,11 @@ base_layer = current_aquarium.request_layer(layer_mode) vc_obj.layer = base_layer -<<<<<<< HEAD -======= /datum/component/aquarium_content/proc/on_fish_petted() SIGNAL_HANDLER new /obj/effect/temp_visual/heart(get_turf(parent)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/aquarium_content/proc/randomize_base_position() var/list/aq_properties = current_aquarium.get_surface_properties() var/avg_width = round(sprite_width / 2) diff --git a/code/datums/components/bakeable.dm b/code/datums/components/bakeable.dm index b65bedcb537..93e96f65d58 100644 --- a/code/datums/components/bakeable.dm +++ b/code/datums/components/bakeable.dm @@ -93,19 +93,11 @@ var/list/asomnia_hadders = list() for(var/mob/smeller in get_hearers_in_view(DEFAULT_MESSAGE_RANGE, used_oven)) if(HAS_TRAIT(smeller, TRAIT_ANOSMIA)) -<<<<<<< HEAD - asomnia_hadders += smeller - - if(positive_result) - used_oven.visible_message( - span_notice("You smell something great coming from [used_oven]."), -======= asomnia_hadders += smeller if(positive_result) used_oven.visible_message( span_notice("You smell something great coming from [used_oven]."), ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blind_message = span_notice("You smell something great..."), ignored_mobs = asomnia_hadders, ) diff --git a/code/datums/components/boomerang.dm b/code/datums/components/boomerang.dm index 9c833cc3b26..954e752da1e 100644 --- a/code/datums/components/boomerang.dm +++ b/code/datums/components/boomerang.dm @@ -60,20 +60,11 @@ * * hit_atom: The atom that has been hit by the boomerang component. * * init_throwing_datum: The thrownthing datum that originally impacted the object, that we use to build the new throwing datum for the rebound. */ -<<<<<<< HEAD -/datum/component/boomerang/proc/return_hit_throw(datum/source, atom/hit_atom, datum/thrownthing/init_throwing_datum) - SIGNAL_HANDLER - if (!COOLDOWN_FINISHED(src, last_boomerang_throw)) - return - var/obj/item/true_parent = parent - aerodynamic_swing(init_throwing_datum, true_parent) -======= /datum/component/boomerang/proc/return_hit_throw(datum/source, atom/hit_atom, datum/thrownthing/init_throwing_datum, caught) SIGNAL_HANDLER if (!COOLDOWN_FINISHED(src, last_boomerang_throw) || caught) return aerodynamic_swing(init_throwing_datum, parent) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Proc that triggers when the thrown boomerang does not hit a target. diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index bbcb3616042..d4f1df1778b 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -97,13 +97,10 @@ return if (!(flags & CALTROP_BYPASS_SHOES)) -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - Hardened Soles Quirk if(HAS_TRAIT(digitigrade_fan, TRAIT_HARD_SOLES)) return // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if ((digitigrade_fan.wear_suit?.body_parts_covered | digitigrade_fan.w_uniform?.body_parts_covered | digitigrade_fan.shoes?.body_parts_covered) & FEET) return diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm index 4fcce604074..c1bdeede088 100644 --- a/code/datums/components/chasm.dm +++ b/code/datums/components/chasm.dm @@ -14,11 +14,7 @@ /obj/effect/constructing_effect, /obj/effect/dummy/phased_mob, /obj/effect/ebeam, -<<<<<<< HEAD - /obj/effect/fishing_lure, -======= /obj/effect/fishing_float, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/hotspot, /obj/effect/landmark, /obj/effect/light_emitter/tendril, @@ -255,25 +251,13 @@ GLOBAL_LIST_EMPTY(chasm_fallen_mobs) /obj/effect/abstract/chasm_storage/Entered(atom/movable/arrived) . = ..() if(isliving(arrived)) -<<<<<<< HEAD - RegisterSignal(arrived, COMSIG_LIVING_REVIVE, PROC_REF(on_revive)) - GLOB.chasm_fallen_mobs += arrived -======= - //Mobs that have fallen in reserved area should be deleted to avoid fishing stuff from the deathmatch or VR. - if(is_reserved_level(loc.z) && !istype(get_area(loc), /area/shuttle)) - qdel(arrived) - return RegisterSignal(arrived, COMSIG_LIVING_REVIVE, PROC_REF(on_revive)) LAZYADD(GLOB.chasm_fallen_mobs[get_chasm_category(loc)], arrived) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/abstract/chasm_storage/Exited(atom/movable/gone) . = ..() if(isliving(gone)) UnregisterSignal(gone, COMSIG_LIVING_REVIVE) -<<<<<<< HEAD - GLOB.chasm_fallen_mobs -= gone -======= LAZYREMOVE(GLOB.chasm_fallen_mobs[get_chasm_category(loc)], gone) /obj/effect/abstract/chasm_storage/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) @@ -308,7 +292,6 @@ GLOBAL_LIST_EMPTY(chasm_fallen_mobs) return ZTRAIT_RESERVED return ZTRAIT_SPACE_RUINS ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define CHASM_TRAIT "chasm trait" /** diff --git a/code/datums/components/connect_mob_behalf.dm b/code/datums/components/connect_mob_behalf.dm index f4e2ae1e586..18ab0eebed8 100644 --- a/code/datums/components/connect_mob_behalf.dm +++ b/code/datums/components/connect_mob_behalf.dm @@ -1,10 +1,6 @@ /// This component behaves similar to connect_loc_behalf, but working off clients and mobs instead of loc /// To be clear, we hook into a signal on a tracked client's mob -<<<<<<< HEAD -/// We retain the ability to react to that signal on a seperate listener, which makes this quite powerful -======= /// We retain the ability to react to that signal on a separate listener, which makes this quite powerful ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/connect_mob_behalf dupe_mode = COMPONENT_DUPE_UNIQUE diff --git a/code/datums/components/connect_range.dm b/code/datums/components/connect_range.dm index 5da1f95a5e1..af8ec247eb2 100644 --- a/code/datums/components/connect_range.dm +++ b/code/datums/components/connect_range.dm @@ -1,10 +1,6 @@ /** * This component behaves similar to connect_loc_behalf but for all turfs in range, hooking into a signal on each of them. -<<<<<<< HEAD - * Just like connect_loc_behalf, It can react to that signal on behalf of a seperate listener. -======= * Just like connect_loc_behalf, It can react to that signal on behalf of a separate listener. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Good for components, though it carries some overhead. Can't be an element as that may lead to bugs. */ /datum/component/connect_range diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index 66d7e5f640c..2ecde012ea6 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -248,7 +248,6 @@ return ", must be made on a tram!" //If we're a mob we'll try a do_after; non mobs will instead instantly construct the item -<<<<<<< HEAD //SKYRAT EDIT START: Two Skills (Construction) var/mob/crafter_mob var/skill_modifier = 1 @@ -256,9 +255,6 @@ crafter_mob = crafter skill_modifier = crafter_mob.mind.get_skill_modifier(/datum/skill/construction, SKILL_SPEED_MODIFIER) if(!do_after(crafter, recipe.time * skill_modifier, target = crafter)) -======= - if(ismob(crafter) && !do_after(crafter, recipe.time, target = crafter)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return "." contents = get_surroundings(crafter, recipe.blacklist) if(!check_contents(crafter, recipe, contents)) @@ -276,12 +272,9 @@ if(result.atom_storage && recipe.delete_contents) for(var/obj/item/thing in result) qdel(thing) -<<<<<<< HEAD if(crafter_mob) crafter_mob.mind.adjust_experience(/datum/skill/construction, 5) - //SKYRAT EDIT STOP: Construction Skill -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + //SKYRAT EDIT END var/datum/reagents/holder = locate() in parts if(holder) //transfer reagents from ingredients to result if(!ispath(recipe.result, /obj/item/reagent_containers) && result.reagents) @@ -324,10 +317,6 @@ var/datum/reagents/holder var/list/surroundings var/list/Deletion = list() -<<<<<<< HEAD - var/data -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/amt var/list/requirements = list() if(R.reqs) @@ -364,10 +353,6 @@ RC.reagents.trans_to(holder, reagent_volume, target_id = path_key, no_react = TRUE) surroundings -= RC amt -= reagent_volume -<<<<<<< HEAD - SEND_SIGNAL(RC.reagents, COMSIG_REAGENTS_CRAFTING_PING) // - [] TODO: Make this entire thing less spaghetti -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else surroundings -= RC RC.update_appearance(UPDATE_ICON) @@ -559,11 +544,7 @@ return TRUE -<<<<<<< HEAD -/datum/component/personal_crafting/ui_act(action, params) -======= /datum/component/personal_crafting/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/datums/components/crafting/equipment.dm b/code/datums/components/crafting/equipment.dm index 56f889a2da4..98595647ea2 100644 --- a/code/datums/components/crafting/equipment.dm +++ b/code/datums/components/crafting/equipment.dm @@ -272,11 +272,8 @@ category = CAT_EQUIPMENT tool_behaviors = list(TOOL_WELDER, TOOL_WIRECUTTER) -<<<<<<< HEAD // SKYRAT EDIT REMOVAL START /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/crafting_recipe/arrow_quiver name = "Archery Quiver" result = /obj/item/storage/bag/quiver/lesser @@ -287,7 +284,4 @@ ) category = CAT_EQUIPMENT tool_behaviors = list(TOOL_WELDER, TOOL_WIRECUTTER) -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm index 85e33ba8f4a..dc30d31e2d4 100644 --- a/code/datums/components/crafting/tailoring.dm +++ b/code/datums/components/crafting/tailoring.dm @@ -218,8 +218,6 @@ result = /obj/effect/spawner/random/clothing/lizardboots reqs = list(/obj/item/stack/sheet/animalhide/lizard = 1, /obj/item/stack/sheet/leather = 1) time = 6 SECONDS -<<<<<<< HEAD -======= category = CAT_CLOTHING /datum/crafting_recipe/prisonsuit @@ -644,7 +642,6 @@ reqs = list( /obj/item/clothing/head/fedora/beige = 1, ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 category = CAT_CLOTHING /datum/crafting_recipe/prisonsuit diff --git a/code/datums/components/crafting/tools.dm b/code/datums/components/crafting/tools.dm index 623f8461096..e286e49616c 100644 --- a/code/datums/components/crafting/tools.dm +++ b/code/datums/components/crafting/tools.dm @@ -14,11 +14,7 @@ reqs = list(/obj/item/grown/log = 5) parts = list(/obj/item/grown/log = 5) blacklist = list(/obj/item/grown/log/steel) -<<<<<<< HEAD result = /obj/structure/bonfire/player_made // SKYRAT EDIT - Pollution - ORIGINAL: result = /obj/structure/bonfire -======= - result = /obj/structure/bonfire ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 category = CAT_TOOLS /datum/crafting_recipe/boneshovel diff --git a/code/datums/components/crank_recharge.dm b/code/datums/components/crank_recharge.dm index f19e5cee9d0..b5196579f3c 100644 --- a/code/datums/components/crank_recharge.dm +++ b/code/datums/components/crank_recharge.dm @@ -61,10 +61,7 @@ is_charging = FALSE return charging_cell.give(charge_amount) -<<<<<<< HEAD SEND_SIGNAL(parent, COMSIG_UPDATE_AMMO_HUD) // SKYRAT EDIT ADDITION - AMMO COUNT HUD -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 source.update_appearance() is_charging = FALSE if(spin_to_win) diff --git a/code/datums/components/cult_ritual_item.dm b/code/datums/components/cult_ritual_item.dm index 42f5dd79128..71e07e6380e 100644 --- a/code/datums/components/cult_ritual_item.dm +++ b/code/datums/components/cult_ritual_item.dm @@ -404,11 +404,7 @@ if(!rune.Adjacent(cultist)) return FALSE -<<<<<<< HEAD - if(cultist.incapacitated()) -======= if(cultist.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(cultist.stat == DEAD) @@ -431,11 +427,7 @@ if(QDELETED(tool) || !cultist.is_holding(tool)) return FALSE -<<<<<<< HEAD - if(cultist.incapacitated() || cultist.stat == DEAD) -======= if(cultist.incapacitated || cultist.stat == DEAD) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(cultist, span_warning("You can't draw a rune right now.")) return FALSE diff --git a/code/datums/components/echolocation.dm b/code/datums/components/echolocation.dm index 6ad64c3367f..f5181a98147 100644 --- a/code/datums/components/echolocation.dm +++ b/code/datums/components/echolocation.dm @@ -32,11 +32,7 @@ /// Cooldown for the echolocation. COOLDOWN_DECLARE(cooldown_last) -<<<<<<< HEAD /datum/component/echolocation/Initialize(echo_range, cooldown_time, image_expiry_time, fade_in_time, fade_out_time, images_are_static, blocking_trait, echo_group, echo_icon, color_path, use_echo = TRUE, show_own_outline = FALSE, personal_color = "#ffffff") // SKYRAT EDIT CHANGE - ORIGINAL: /datum/component/echolocation/Initialize(echo_range, cooldown_time, image_expiry_time, fade_in_time, fade_out_time, images_are_static, blocking_trait, echo_group, echo_icon = "echo", color_path) -======= -/datum/component/echolocation/Initialize(echo_range, cooldown_time, image_expiry_time, fade_in_time, fade_out_time, images_are_static, blocking_trait, echo_group, echo_icon, color_path) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() var/mob/living/echolocator = parent if(!istype(echolocator)) @@ -59,26 +55,19 @@ src.images_are_static = images_are_static if(!isnull(blocking_trait)) src.blocking_trait = blocking_trait -<<<<<<< HEAD // SKYRAT ADDITION START: echolocation src.show_own_outline = show_own_outline src.echo_color = personal_color // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ispath(color_path)) client_color = echolocator.add_client_colour(color_path) src.echo_group = echo_group || REF(src) echolocator.add_traits(list(TRAIT_ECHOLOCATION_RECEIVER, TRAIT_TRUE_NIGHT_VISION), echo_group) //so they see all the tiles they echolocated, even if they are in the dark echolocator.become_blind(ECHOLOCATION_TRAIT) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START if (use_echo) // add constructor toggle to not use the eye overlay echolocator.overlay_fullscreen("echo", /atom/movable/screen/fullscreen/echo, echo_icon) // SKYRAT EDIT ADDITION END -======= - echolocator.overlay_fullscreen("echo", /atom/movable/screen/fullscreen/echo, echo_icon) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 START_PROCESSING(SSfastprocess, src) /datum/component/echolocation/Destroy(force) @@ -103,11 +92,7 @@ echolocate() /datum/component/echolocation/proc/echolocate() -<<<<<<< HEAD if(stall || !COOLDOWN_FINISHED(src, cooldown_last)) // SKYRAT EDIT CHANGE - ORIGINAL: if(!COOLDOWN_FINISHED(src, cooldown_last)) -======= - if(!COOLDOWN_FINISHED(src, cooldown_last)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return COOLDOWN_START(src, cooldown_last, cooldown_time) var/mob/living/echolocator = parent @@ -143,7 +128,6 @@ if(images_are_static) final_image.pixel_x = input.pixel_x final_image.pixel_y = input.pixel_y -<<<<<<< HEAD // SKYRAT ADDITION START: echolocation (show outlines on self) if(HAS_TRAIT_FROM(input, TRAIT_ECHOLOCATION_RECEIVER, echo_group)) //mark other echolocation with full white, except ourselves var/datum/component/echolocation/located_component = input.GetComponent(/datum/component/echolocation) @@ -156,13 +140,6 @@ var/list/fade_ins = list(final_image) for(var/mob/living/echolocate_receiver as anything in receivers) if(echolocate_receiver == input && !show_own_outline) // SKYRAT EDIT CHANGE - ORIGINAL: if(echolocate_receiver == input) -======= - if(HAS_TRAIT_FROM(input, TRAIT_ECHOLOCATION_RECEIVER, echo_group)) //mark other echolocation with full white - final_image.color = white_matrix - var/list/fade_ins = list(final_image) - for(var/mob/living/echolocate_receiver as anything in receivers) - if(echolocate_receiver == input) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue if(receivers[echolocate_receiver][input]) var/previous_image = receivers[echolocate_receiver][input]["image"] diff --git a/code/datums/components/explodable.dm b/code/datums/components/explodable.dm index 06606857356..9dc8db3bbc4 100644 --- a/code/datums/components/explodable.dm +++ b/code/datums/components/explodable.dm @@ -60,18 +60,11 @@ return check_if_detonate(I) -<<<<<<< HEAD -/datum/component/explodable/proc/explodable_impact(datum/source, atom/hit_atom, datum/thrownthing/throwingdatum) - SIGNAL_HANDLER - - check_if_detonate(hit_atom) -======= /datum/component/explodable/proc/explodable_impact(datum/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught) SIGNAL_HANDLER if(!caught) check_if_detonate(hit_atom) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/explodable/proc/explodable_bump(datum/source, atom/A) SIGNAL_HANDLER diff --git a/code/datums/components/face_decal.dm b/code/datums/components/face_decal.dm index 3d89f607f15..df70f8a3f49 100644 --- a/code/datums/components/face_decal.dm +++ b/code/datums/components/face_decal.dm @@ -53,11 +53,8 @@ carbon_parent.update_body_parts() else normal_overlay = get_normal_overlay() -<<<<<<< HEAD -======= normal_overlay.color = color ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignals(parent, list( COMSIG_COMPONENT_CLEAN_ACT, @@ -118,42 +115,6 @@ SIGNAL_HANDLER qdel(src) -<<<<<<< HEAD -/// Creampie subtype, handling signals and mood logic - -GLOBAL_LIST_INIT(creamable, typecacheof(list( - /mob/living/carbon/human, - /mob/living/basic/pet/dog/corgi, - /mob/living/silicon/ai, -))) - -/datum/component/face_decal/creampie/Initialize() - . = ..() - if(!is_type_in_typecache(parent, GLOB.creamable)) - return COMPONENT_INCOMPATIBLE - - SEND_SIGNAL(parent, COMSIG_MOB_CREAMED, src) - add_memory_in_range(parent, 7, /datum/memory/witnessed_creampie, protagonist = parent) - -/datum/component/face_decal/creampie/get_normal_overlay() - if(iscorgi(parent)) - return mutable_appearance('icons/mob/effects/creampie.dmi', "[icon_state]_corgi") - - if(isAI(parent)) - return mutable_appearance('icons/mob/effects/creampie.dmi', "[icon_state]_ai") - -/datum/component/face_decal/creampie/RegisterWithParent() - . = ..() - if(iscarbon(parent)) - var/mob/living/carbon/human/carbon_parent = parent - carbon_parent.add_mood_event("creampie", /datum/mood_event/creampie) - -/datum/component/face_decal/creampie/UnregisterFromParent() - . = ..() - if(iscarbon(parent)) - var/mob/living/carbon/carbon_parent = parent - carbon_parent.clear_mood_event("creampie") -======= /// splat subtype, handling signals and mood logic GLOBAL_LIST_INIT(splattable, zebra_typecacheof(list( @@ -190,4 +151,3 @@ GLOBAL_LIST_INIT(splattable, zebra_typecacheof(list( if(iscarbon(parent)) var/mob/living/carbon/carbon_parent = parent carbon_parent.clear_mood_event("splat") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/components/fishing_spot.dm b/code/datums/components/fishing_spot.dm index d011f28a1bd..b825354d7be 100644 --- a/code/datums/components/fishing_spot.dm +++ b/code/datums/components/fishing_spot.dm @@ -12,11 +12,7 @@ fish_source = configuration else return COMPONENT_INCOMPATIBLE -<<<<<<< HEAD - fish_source.on_fishing_spot_init() -======= fish_source.on_fishing_spot_init(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(handle_attackby)) RegisterSignal(parent, COMSIG_FISHING_ROD_CAST, PROC_REF(handle_cast)) RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examined)) @@ -26,10 +22,7 @@ ADD_TRAIT(parent, TRAIT_FISHING_SPOT, REF(src)) /datum/component/fishing_spot/Destroy() -<<<<<<< HEAD -======= fish_source.on_fishing_spot_del(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fish_source = null return ..() @@ -51,19 +44,7 @@ if(!HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT)) return -<<<<<<< HEAD - var/has_known_fishes = FALSE - for(var/reward in fish_source.fish_table) - if(!ispath(reward, /obj/item/fish)) - continue - var/obj/item/fish/prototype = reward - if(initial(prototype.show_in_catalog)) - has_known_fishes = TRUE - break - if(!has_known_fishes) -======= if(!fish_source.has_known_fishes()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return examine_text += span_tinynoticeital("This is a fishing spot. You can look again to list its fishes...") @@ -73,22 +54,7 @@ if(!HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT)) return -<<<<<<< HEAD - var/list/known_fishes = list() - for(var/reward in fish_source.fish_table) - if(!ispath(reward, /obj/item/fish)) - continue - var/obj/item/fish/prototype = reward - if(initial(prototype.show_in_catalog)) - known_fishes += initial(prototype.name) - - if(!length(known_fishes)) - return - - examine_text += span_info("You can catch the following fish here: [english_list(known_fishes)].") -======= fish_source.get_catchable_fish_names(user, parent, examine_text) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/fishing_spot/proc/try_start_fishing(obj/item/possibly_rod, mob/user) SIGNAL_HANDLER @@ -109,11 +75,7 @@ /datum/component/fishing_spot/proc/start_fishing_challenge(obj/item/fishing_rod/rod, mob/user) /// Roll what we caught based on modified table -<<<<<<< HEAD - var/result = fish_source.roll_reward(rod, user) -======= var/result = fish_source.roll_reward(rod, user, parent) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/fishing_challenge/challenge = new(src, result, rod, user) fish_source.pre_challenge_started(rod, user, challenge) challenge.start(user) diff --git a/code/datums/components/food/decomposition.dm b/code/datums/components/food/decomposition.dm index ae11428eca7..acb44d4c9e9 100644 --- a/code/datums/components/food/decomposition.dm +++ b/code/datums/components/food/decomposition.dm @@ -1,14 +1,8 @@ //"Don't leave food on the floor, that's how we get ants" -<<<<<<< HEAD #define DECOMPOSITION_TIME (20 MINUTES) // SKYRAT EDIT CHANGE - ORIGINAL: #define DECOMPOSITION_TIME (10 MINUTES) #define DECOMPOSITION_TIME_RAW (15 MINUTES) // SKYRAT EDIT CHANGE - ORIGINAL: #define DECOMPOSITION_TIME_RAW (5 MINUTES) #define DECOMPOSITION_TIME_GROSS (10 MINUTES) // SKYRAT EDIT CHANGE, - ORIGINAL: #define DECOMPOSITION_TIME_GROSS (7 MINUTES) -======= -#define DECOMPOSITION_TIME (10 MINUTES) -#define DECOMPOSITION_TIME_RAW (5 MINUTES) -#define DECOMPOSITION_TIME_GROSS (7 MINUTES) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Makes things decompose when exposed to germs. Requires /datum/component/germ_sensitive to detect exposure. /datum/component/decomposition diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index 95a44f82d34..c034300f982 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -256,11 +256,7 @@ Behavior that's still missing from this component that original food items had t if(!(food_flags & FOOD_IN_CONTAINER)) switch(bitecount) if(0) -<<<<<<< HEAD - // pass -======= pass() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(1) examine_list += span_notice("[owner] was bitten by someone!") if(2, 3) @@ -532,21 +528,13 @@ Behavior that's still missing from this component that original food items had t /datum/component/edible/proc/apply_buff(mob/eater) var/buff var/recipe_complexity = get_recipe_complexity() -<<<<<<< HEAD - if(recipe_complexity == 0) -======= if(recipe_complexity <= 0) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/obj/item/food/food = parent if(!isnull(food.crafted_food_buff)) buff = food.crafted_food_buff else -<<<<<<< HEAD - buff = pick_weight(GLOB.food_buffs[recipe_complexity]) -======= buff = pick_weight(GLOB.food_buffs[min(recipe_complexity, FOOD_COMPLEXITY_5)]) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!isnull(buff)) var/mob/living/living_eater = eater var/atom/owner = parent @@ -607,12 +595,6 @@ Behavior that's still missing from this component that original food items had t /// Get the complexity of the crafted food /datum/component/edible/proc/get_recipe_complexity() -<<<<<<< HEAD - if(!HAS_TRAIT(parent, TRAIT_FOOD_CHEF_MADE) || !istype(parent, /obj/item/food)) - return 0 // It is factory made. Soulless. - var/obj/item/food/food = parent - return food.crafting_complexity -======= var/list/extra_complexity = list(0) SEND_SIGNAL(parent, COMSIG_FOOD_GET_EXTRA_COMPLEXITY, extra_complexity) var/complexity_to_add = extra_complexity[1] @@ -620,7 +602,6 @@ Behavior that's still missing from this component that original food items had t return complexity_to_add // It is factory made. Soulless. var/obj/item/food/food = parent return food.crafting_complexity + complexity_to_add ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Get food quality adjusted according to eater's preferences /datum/component/edible/proc/get_perceived_food_quality(mob/living/carbon/human/eater) diff --git a/code/datums/components/food/germ_sensitive.dm b/code/datums/components/food/germ_sensitive.dm index 5eaedafd345..3e47c3fe1ec 100644 --- a/code/datums/components/food/germ_sensitive.dm +++ b/code/datums/components/food/germ_sensitive.dm @@ -25,11 +25,7 @@ GLOBAL_LIST_INIT(floor_diseases, list( RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(handle_movement)) -<<<<<<< HEAD - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(wash)) //Wash germs off dirty things -======= RegisterSignals(parent, list(COMSIG_COMPONENT_CLEAN_ACT, COMSIG_ITEM_FRIED, COMSIG_ITEM_BARBEQUE_GRILLED, COMSIG_ATOM_FIRE_ACT), PROC_REF(delete_germs)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignals(parent, list( COMSIG_ITEM_DROPPED, //Dropped into the world @@ -54,12 +50,9 @@ GLOBAL_LIST_INIT(floor_diseases, list( COMSIG_ATOM_EXAMINE, COMSIG_ATOM_EXITED, COMSIG_COMPONENT_CLEAN_ACT, -<<<<<<< HEAD -======= COMSIG_ITEM_FRIED, COMSIG_ITEM_BARBEQUE_GRILLED, COMSIG_ATOM_FIRE_ACT, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 COMSIG_ITEM_DROPPED, COMSIG_ITEM_PICKUP, COMSIG_MOVABLE_MOVED, @@ -126,11 +119,7 @@ GLOBAL_LIST_INIT(floor_diseases, list( var/random_disease = pick_weight(GLOB.floor_diseases) parent.AddComponent(/datum/component/infective, new random_disease, weak = TRUE) -<<<<<<< HEAD -/datum/component/germ_sensitive/proc/wash() -======= /datum/component/germ_sensitive/proc/delete_germs() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER if(infective) infective = FALSE diff --git a/code/datums/components/fov_handler.dm b/code/datums/components/fov_handler.dm index b285ba1fc45..9f64c648502 100644 --- a/code/datums/components/fov_handler.dm +++ b/code/datums/components/fov_handler.dm @@ -125,8 +125,5 @@ /datum/component/fov_handler/UnregisterFromParent() . = ..() UnregisterSignal(parent, list(COMSIG_MOB_RESET_PERSPECTIVE, COMSIG_ATOM_DIR_CHANGE, COMSIG_LIVING_DEATH, COMSIG_LIVING_REVIVE, COMSIG_MOB_LOGOUT)) -<<<<<<< HEAD UnregisterSignal(parent, COMSIG_LIVING_COMBAT_MODE_TOGGLE) //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/components/fullauto.dm b/code/datums/components/fullauto.dm index 54e9ca5fc3d..a3f2009b3b5 100644 --- a/code/datums/components/fullauto.dm +++ b/code/datums/components/fullauto.dm @@ -275,11 +275,7 @@ // Gun procs. /obj/item/gun/proc/on_autofire_start(mob/living/shooter) -<<<<<<< HEAD - if(semicd || shooter.incapacitated() || !can_trigger_gun(shooter)) -======= if(semicd || shooter.incapacitated || !can_trigger_gun(shooter)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(!can_shoot()) shoot_with_empty_chamber(shooter) @@ -299,11 +295,7 @@ /obj/item/gun/proc/do_autofire(datum/source, atom/target, mob/living/shooter, allow_akimbo, params) SIGNAL_HANDLER -<<<<<<< HEAD - if(semicd || shooter.incapacitated()) -======= if(semicd || shooter.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return NONE if(!can_shoot()) shoot_with_empty_chamber(shooter) diff --git a/code/datums/components/grillable.dm b/code/datums/components/grillable.dm index bfba9142e09..72c2e75e8cb 100644 --- a/code/datums/components/grillable.dm +++ b/code/datums/components/grillable.dm @@ -83,14 +83,11 @@ SIGNAL_HANDLER . = COMPONENT_HANDLED_GRILLING -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(pollutant_type) var/turf/parent_turf = get_turf(parent) parent_turf.pollute_turf(pollutant_type, 10) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 current_cook_time += seconds_per_tick * 10 //turn it into ds if(current_cook_time >= required_cook_time) diff --git a/code/datums/components/jukebox.dm b/code/datums/components/jukebox.dm index 15da24482bf..0bb65e818e8 100644 --- a/code/datums/components/jukebox.dm +++ b/code/datums/components/jukebox.dm @@ -1,8 +1,4 @@ -<<<<<<< HEAD /* SKYRAT EDIT: See modular_skyrat/modules/jukebox /// Checks if the mob has jukebox muted in their preferences -======= -/// Checks if the mob has jukebox muted in their preferences ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define IS_PREF_MUTED(mob) (!isnull(mob.client) && !mob.client.prefs.read_preference(/datum/preference/toggle/sound_jukebox)) // Reasons for appling STATUS_MUTE to a mob's sound status @@ -407,8 +403,5 @@ song_path = 'sound/ambience/title3.ogg' song_name = "Tintin on the Moon" song_length = 3 MINUTES + 52 SECONDS -<<<<<<< HEAD - song_beat = 1 SECONDS SKYRAT EDIT END*/ -======= song_beat = 1 SECONDS ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +SKYRAT EDIT END*/ diff --git a/code/datums/components/listen_and_repeat.dm b/code/datums/components/listen_and_repeat.dm index d0e87421677..88c64ef4dbc 100644 --- a/code/datums/components/listen_and_repeat.dm +++ b/code/datums/components/listen_and_repeat.dm @@ -71,14 +71,11 @@ if(over_radio && prob(RADIO_IGNORE_CHANCE)) return -<<<<<<< HEAD //SKYRAT EDIT ADDITION START - parrot commands var/mob/living/basic/parrot/maybe_parrot = parent if(!over_radio && istype(maybe_parrot)) maybe_parrot.check_command(message, speaker) // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/number_of_excess_strings = LAZYLEN(speech_buffer) - MAX_SPEECH_BUFFER_SIZE if(number_of_excess_strings > 0) // only remove if we're overfull diff --git a/code/datums/components/material/material_container.dm b/code/datums/components/material/material_container.dm index edf08526057..10544116ce5 100644 --- a/code/datums/components/material/material_container.dm +++ b/code/datums/components/material/material_container.dm @@ -124,17 +124,10 @@ * Material Validation : Checks how much materials are available, Extracts materials from items if the container can hold them * Material Removal : Removes material from the container * -<<<<<<< HEAD - * Each Proc furthur belongs to a specific category - * LOW LEVEL: Procs that are used internally & should not be used anywhere else unless you know what your doing - * MID LEVEL: Procs that can be used by machines(like recycler, stacking machines) to bypass majority of checks - * HIGH LEVEL: Procs that can be used by anyone publically and guarentees safty checks & limits -======= * Each Proc further belongs to a specific category * LOW LEVEL: Procs that are used internally & should not be used anywhere else unless you know what your doing * MID LEVEL: Procs that can be used by machines(like recycler, stacking machines) to bypass majority of checks * HIGH LEVEL: Procs that can be used by anyone publicly and guarantees safety checks & limits ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ //================================Material Insertion procs============================== @@ -243,11 +236,7 @@ //do the insert var/last_inserted_id = insert_item_materials(target, multiplier, context) if(!isnull(last_inserted_id)) -<<<<<<< HEAD - if(delete_item || target != weapon) //we could have split the stack ourself -======= if(delete_item || target != weapon) //we could have split the stack ourselves ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qdel(target) //item gone return material_amount else if(!isnull(item_stack) && item_stack != target) //insertion failed, merge the split stack back into the original @@ -261,11 +250,7 @@ //===================================HIGH LEVEL=================================================== /** -<<<<<<< HEAD - * inserts an item from the players hand into the container. Loops through all the contents inside reccursively -======= * inserts an item from the players hand into the container. Loops through all the contents inside recursively ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Does all explicit checking for mat flags & callbacks to check if insertion is valid * This proc is what you should be using for almost all cases * @@ -599,11 +584,7 @@ for(var/x in mats) //Loop through all required materials var/wanted = OPTIMAL_COST(mats[x] * coefficient) * multiplier if(!has_enough_of_material(x, wanted))//Not a category, so just check the normal way -<<<<<<< HEAD - testing("didnt have: [x] wanted: [wanted]") -======= testing("didn't have: [x] wanted: [wanted]") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -624,11 +605,7 @@ //round amount amt = OPTIMAL_COST(amt) -<<<<<<< HEAD - //get ref if nessassary -======= //get ref if necessary ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!istype(mat)) mat = GET_MATERIAL_REF(mat) diff --git a/code/datums/components/mind_linker.dm b/code/datums/components/mind_linker.dm index b392ab89798..507860fa934 100644 --- a/code/datums/components/mind_linker.dm +++ b/code/datums/components/mind_linker.dm @@ -56,25 +56,15 @@ if(post_unlink_callback) src.post_unlink_callback = post_unlink_callback -<<<<<<< HEAD src.speech_action_icon = speech_action_icon src.speech_action_icon_state = speech_action_icon_state src.speech_action_background_icon_state = speech_action_background_icon_state - /* ORIGINAL CODE - master_speech = new(src) - master_speech.Grant(owner) - */ //ORIGINAL CODE END - //SKYRAT EDIT - NIFs if(speech_action) master_speech = new(src) master_speech.Grant(owner) //SKYRAT EDIT END -======= - master_speech = new(src) - master_speech.Grant(owner) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/mind_linker/Destroy(force) for(var/mob/living/remaining_mob as anything in linked_mobs) @@ -100,22 +90,6 @@ /datum/component/mind_linker/proc/link_mob(mob/living/to_link) if(QDELETED(to_link) || to_link.stat == DEAD) return FALSE -<<<<<<< HEAD - - /* ORIGINAL CODE - if(HAS_TRAIT(to_link, TRAIT_MINDSHIELD)) // Mindshield implant - no dice - return FALSE - if(to_link.can_block_magic(MAGIC_RESISTANCE_MIND, charge_cost = 0)) - return FALSE - */ //ORIGINAL CODE END - //SKYRAT EDIT START - if(HAS_TRAIT(to_link, TRAIT_MINDSHIELD) && linking_protection) // Mindshield implant - no dice - return FALSE - if(to_link.can_block_magic(MAGIC_RESISTANCE_MIND, charge_cost = 0) && linking_protection) - return FALSE - //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(linked_mobs[to_link]) return FALSE diff --git a/code/datums/components/omen.dm b/code/datums/components/omen.dm index 4233e2c3aff..bb72654f978 100644 --- a/code/datums/components/omen.dm +++ b/code/datums/components/omen.dm @@ -143,20 +143,12 @@ return for(var/obj/machinery/light/evil_light in the_turf) -<<<<<<< HEAD - if((evil_light.status == LIGHT_BURNED || evil_light.status == LIGHT_BROKEN) || (HAS_TRAIT(living_guy, TRAIT_SHOCKIMMUNE))) // we cant do anything :( // Why in the world is there no get_siemens_coeff proc??? -======= if((evil_light.status == LIGHT_BURNED || evil_light.status == LIGHT_BROKEN) || (HAS_TRAIT(living_guy, TRAIT_SHOCKIMMUNE))) // we can't do anything :( // Why in the world is there no get_siemens_coeff proc??? ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(living_guy, span_warning("[evil_light] sparks weakly for a second.")) do_sparks(2, FALSE, evil_light) // hey maybe it'll ignite them return -<<<<<<< HEAD - to_chat(living_guy, span_warning("[evil_light] glows ominously...")) // omenously -======= to_chat(living_guy, span_warning("[evil_light] glows ominously...")) // ominously ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 evil_light.visible_message(span_boldwarning("[evil_light] suddenly flares brightly and sparks!")) evil_light.break_light_tube(skip_sound_and_sparks = FALSE) do_sparks(number = 4, cardinal_only = FALSE, source = evil_light) diff --git a/code/datums/components/overlay_lighting.dm b/code/datums/components/overlay_lighting.dm index 6f844d3b36e..642feee3ac0 100644 --- a/code/datums/components/overlay_lighting.dm +++ b/code/datums/components/overlay_lighting.dm @@ -62,15 +62,6 @@ var/directional = FALSE ///Whether we're a beam light var/beam = FALSE -<<<<<<< HEAD - ///A cone overlay for directional light, its alpha and color are dependant on the light - var/image/cone - ///Current tracked direction for the directional cast behaviour - var/current_direction - ///Tracks current directional x offset so we dont update unecessarily - var/directional_offset_x - ///Tracks current directional y offset so we dont update unecessarily -======= ///A cone overlay for directional light, its alpha and color are dependent on the light var/image/cone ///Current tracked direction for the directional cast behaviour @@ -78,7 +69,6 @@ ///Tracks current directional x offset so we don't update unnecessarily var/directional_offset_x ///Tracks current directional y offset so we don't update unnecessarily ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/directional_offset_y ///Cast range for the directional cast (how far away the atom is moved) var/cast_range = 2 diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm index f5f7447ddc5..2b59305be14 100644 --- a/code/datums/components/pellet_cloud.dm +++ b/code/datums/components/pellet_cloud.dm @@ -88,13 +88,10 @@ RegisterSignal(parent, COMSIG_MINE_TRIGGERED, PROC_REF(create_blast_pellets)) else if(issupplypod(parent)) RegisterSignal(parent, COMSIG_SUPPLYPOD_LANDED, PROC_REF(create_blast_pellets)) -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN else if(ishorrorling(parent)) RegisterSignal(parent, COMSIG_HORRORFORM_EXPLODE, PROC_REF(create_blast_pellets)) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/pellet_cloud/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_PREQDELETED, COMSIG_FIRE_CASING, COMSIG_GRENADE_DETONATE, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED)) diff --git a/code/datums/components/pet_commands/pet_command.dm b/code/datums/components/pet_commands/pet_command.dm index 3a0bc585791..52b4cc88349 100644 --- a/code/datums/components/pet_commands/pet_command.dm +++ b/code/datums/components/pet_commands/pet_command.dm @@ -186,16 +186,6 @@ /datum/pet_command/point_targeting/add_new_friend(mob/living/tamer) . = ..() -<<<<<<< HEAD - RegisterSignal(tamer, COMSIG_MOB_POINTED, PROC_REF(on_point)) - -/datum/pet_command/point_targeting/remove_friend(mob/living/unfriended) - . = ..() - UnregisterSignal(unfriended, COMSIG_MOB_POINTED) - -/// Target the pointed atom for actions -/datum/pet_command/point_targeting/proc/on_point(mob/living/friend, atom/pointed_atom) -======= RegisterSignal(tamer, COMSIG_MOVABLE_POINTED, PROC_REF(on_point)) /datum/pet_command/point_targeting/remove_friend(mob/living/unfriended) @@ -204,7 +194,6 @@ /// Target the pointed atom for actions /datum/pet_command/point_targeting/proc/on_point(mob/living/friend, atom/pointed_atom, obj/effect/temp_visual/point/point) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER var/mob/living/parent = weak_parent.resolve() diff --git a/code/datums/components/phylactery.dm b/code/datums/components/phylactery.dm index e5f4cb8ee75..572f816b5ad 100644 --- a/code/datums/components/phylactery.dm +++ b/code/datums/components/phylactery.dm @@ -18,11 +18,7 @@ var/phylactery_color = COLOR_VERY_DARK_LIME_GREEN // Internal vars. -<<<<<<< HEAD - /// The number of ressurections that have occured from this phylactery. -======= /// The number of resurrections that have occurred from this phylactery. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/num_resurrections = 0 /// A timerid to the current revival timer. var/revive_timer @@ -154,11 +150,7 @@ UnregisterSignal(source, COMSIG_LIVING_REVIVE) /** -<<<<<<< HEAD - * Actually undergo the process of reviving the lich at the site of the phylacery. -======= * Actually undergo the process of reviving the lich at the site of the phylactery. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * * Arguments * * corpse - optional, the old body of the lich. Can be QDELETED or null. diff --git a/code/datums/components/profound_fisher.dm b/code/datums/components/profound_fisher.dm index f5a57d5b959..5bd5af12943 100644 --- a/code/datums/components/profound_fisher.dm +++ b/code/datums/components/profound_fisher.dm @@ -1,41 +1,8 @@ -<<<<<<< HEAD -///component that allows player mobs to play the fishing minigame, non-player mobs will "pretend" fish -======= ///component that allows player mobs to play the fishing minigame without a rod equipped, non-player mobs will "pretend" fish ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/profound_fisher ///the fishing rod this mob will use var/obj/item/fishing_rod/mob_fisher/our_rod -<<<<<<< HEAD -/datum/component/profound_fisher/Initialize(list/npc_fishing_preset = list()) - if(!isliving(parent)) - return - our_rod = new(parent) - ADD_TRAIT(parent, TRAIT_PROFOUND_FISHER, REF(src)) - -/datum/component/profound_fisher/RegisterWithParent() - RegisterSignal(parent, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(pre_attack)) - -/datum/component/profound_fisher/UnregisterFromParent() - UnregisterSignal(parent, COMSIG_HOSTILE_PRE_ATTACKINGTARGET) - REMOVE_TRAIT(parent, TRAIT_PROFOUND_FISHER, REF(src)) - -/datum/component/profound_fisher/Destroy() - QDEL_NULL(our_rod) - return ..() - -/datum/component/profound_fisher/proc/pre_attack(datum/source, atom/target) - SIGNAL_HANDLER - - if(!HAS_TRAIT(target, TRAIT_FISHING_SPOT)) - return NONE - var/mob/living/living_parent = parent - if(living_parent.combat_mode || !living_parent.CanReach(target)) - return NONE - if(living_parent.client) - INVOKE_ASYNC(our_rod, TYPE_PROC_REF(/obj/item, melee_attack_chain), parent, target) -======= /datum/component/profound_fisher/Initialize(our_rod) var/isgloves = istype(parent, /obj/item/clothing/gloves) if(!isliving(parent) && !isgloves) @@ -109,13 +76,10 @@ return if(source.client) INVOKE_ASYNC(src, PROC_REF(begin_fishing), source, target) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else INVOKE_ASYNC(src, PROC_REF(pretend_fish), target) return COMPONENT_HOSTILE_NO_ATTACK -<<<<<<< HEAD -======= /datum/component/profound_fisher/proc/should_fish_on(mob/living/user, atom/target) if(!HAS_TRAIT(target, TRAIT_FISHING_SPOT) || HAS_TRAIT(user, TRAIT_GONE_FISHING)) return FALSE @@ -138,7 +102,6 @@ REMOVE_TRAIT(source, TRAIT_PROFOUND_FISHER, TRAIT_GENERIC) UnregisterSignal(source, SIGNAL_REMOVETRAIT(TRAIT_GONE_FISHING)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/profound_fisher/proc/pretend_fish(atom/target) var/mob/living/living_parent = parent if(DOING_INTERACTION_WITH_TARGET(living_parent, target)) @@ -148,26 +111,6 @@ var/datum/fish_source/fish_spot = fish_spot_container[NPC_FISHING_SPOT] if(isnull(fish_spot)) return null -<<<<<<< HEAD - var/obj/effect/fishing_lure/lure = new(get_turf(target), target) - playsound(lure, 'sound/effects/splash.ogg', 100) - var/happiness_percentage = living_parent.ai_controller?.blackboard[BB_BASIC_HAPPINESS] / 100 - var/fishing_speed = 10 SECONDS - round(4 SECONDS * happiness_percentage) - if(!do_after(living_parent, fishing_speed, target = target) && !QDELETED(fish_spot)) - qdel(lure) - return - var/reward_loot = fish_spot.roll_reward(our_rod, parent) - fish_spot.dispense_reward(reward_loot, parent, target) - playsound(lure, 'sound/effects/bigsplash.ogg', 100) - qdel(lure) - -/obj/item/fishing_rod/mob_fisher - display_fishing_line = FALSE - line = /obj/item/fishing_line/reinforced - bait = /obj/item/food/bait/doughball/synthetic/unconsumable - - -======= var/obj/effect/fishing_float/float = new(get_turf(target), target) playsound(float, 'sound/effects/splash.ogg', 100) var/happiness_percentage = living_parent.ai_controller?.blackboard[BB_BASIC_HAPPINESS] / 100 @@ -184,4 +127,3 @@ line = /obj/item/fishing_line/reinforced bait = /obj/item/food/bait/doughball/synthetic/unconsumable resistance_flags = INDESTRUCTIBLE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/components/riding/riding_mob.dm b/code/datums/components/riding/riding_mob.dm index a90b9755f02..97481ff8233 100644 --- a/code/datums/components/riding/riding_mob.dm +++ b/code/datums/components/riding/riding_mob.dm @@ -1,14 +1,11 @@ // For any mob that can be ridden -<<<<<<< HEAD //SKYRAT EDIT START: Human Riding Defines #define OVERSIZED_OFFSET 18 #define OVERSIZED_SIDE_OFFSET 11 #define REGULAR_OFFSET 6 #define REGULAR_SIDE_OFFSET 4 //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/riding/creature /// If TRUE, this creature's movements can be controlled by the rider while mounted (as opposed to riding cyborgs and humans, which is passive) var/can_be_driven = TRUE @@ -67,17 +64,10 @@ if(living_parent.body_position != STANDING_UP) // if we move while on the ground, the rider falls off . = FALSE // for piggybacks and (redundant?) borg riding, check if the rider is stunned/restrained -<<<<<<< HEAD - else if((ride_check_flags & RIDER_NEEDS_ARMS) && (HAS_TRAIT(rider, TRAIT_RESTRAINED) || rider.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB))) - . = FALSE - // for fireman carries, check if the ridden is stunned/restrained - else if((ride_check_flags & CARRIER_NEEDS_ARM) && (HAS_TRAIT(living_parent, TRAIT_RESTRAINED) || living_parent.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB))) -======= else if((ride_check_flags & RIDER_NEEDS_ARMS) && (HAS_TRAIT(rider, TRAIT_RESTRAINED) || INCAPACITATED_IGNORING(rider, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB))) . = FALSE // for fireman carries, check if the ridden is stunned/restrained else if((ride_check_flags & CARRIER_NEEDS_ARM) && (HAS_TRAIT(living_parent, TRAIT_RESTRAINED) || INCAPACITATED_IGNORING(living_parent, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = FALSE else if((ride_check_flags & JUST_FRIEND_RIDERS) && !(living_parent.faction.Find(REF(rider)))) . = FALSE @@ -305,7 +295,6 @@ /datum/component/riding/creature/human/get_offsets(pass_index) var/mob/living/carbon/human/H = parent -<<<<<<< HEAD //SKYRAT EDIT BEGIN - Oversized Overhaul if(H.buckle_lying) return HAS_TRAIT(H, TRAIT_OVERSIZED) ? list( @@ -332,13 +321,6 @@ TEXT_WEST = list(REGULAR_OFFSET, REGULAR_SIDE_OFFSET) ) //SKYRAT EDIT END -======= - if(H.buckle_lying) - return list(TEXT_NORTH = list(0, 6), TEXT_SOUTH = list(0, 6), TEXT_EAST = list(0, 6), TEXT_WEST = list(0, 6)) - else - return list(TEXT_NORTH = list(0, 6), TEXT_SOUTH = list(0, 6), TEXT_EAST = list(-6, 4), TEXT_WEST = list( 6, 4)) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/riding/creature/human/force_dismount(mob/living/dismounted_rider) var/atom/movable/AM = parent AM.unbuckle_mob(dismounted_rider) @@ -558,15 +540,9 @@ /datum/component/riding/creature/leaper/Initialize(mob/living/riding_mob, force = FALSE, ride_check_flags = NONE, potion_boost = FALSE) . = ..() -<<<<<<< HEAD - RegisterSignal(riding_mob, COMSIG_MOB_POINTED, PROC_REF(attack_pointed)) - -/datum/component/riding/creature/leaper/proc/attack_pointed(mob/living/rider, atom/pointed) -======= RegisterSignal(riding_mob, COMSIG_MOVABLE_POINTED, PROC_REF(attack_pointed)) /datum/component/riding/creature/leaper/proc/attack_pointed(mob/living/rider, atom/pointed, obj/effect/temp_visual/point/point) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER if(!isclosedturf(pointed)) return @@ -578,11 +554,7 @@ /datum/component/riding/leaper/handle_unbuckle(mob/living/rider) . = ..() -<<<<<<< HEAD - UnregisterSignal(rider, COMSIG_MOB_POINTED) -======= UnregisterSignal(rider, COMSIG_MOVABLE_POINTED) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/riding/creature/raptor require_minigame = TRUE @@ -733,7 +705,6 @@ mounter = null host = null return ..() -<<<<<<< HEAD //SKYRAT EDIT START: Human Riding Defines #undef OVERSIZED_OFFSET @@ -741,5 +712,3 @@ #undef REGULAR_OFFSET #undef REGULAR_SIDE_OFFSET //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/components/riding/riding_vehicle.dm b/code/datums/components/riding/riding_vehicle.dm index 39ba5b3e2e7..0d6d4a4c967 100644 --- a/code/datums/components/riding/riding_vehicle.dm +++ b/code/datums/components/riding/riding_vehicle.dm @@ -291,11 +291,7 @@ vehicle_move_delay += 1 /datum/component/riding/vehicle/scooter/skateboard/wheelys -<<<<<<< HEAD vehicle_move_delay = 1.75 // SKYRAT EDIT - ORIGINAL: 0 -======= - vehicle_move_delay = 0 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 can_slow_down = FALSE /datum/component/riding/vehicle/scooter/skateboard/wheelys/handle_specials() diff --git a/code/datums/components/sitcomlaughter.dm b/code/datums/components/sitcomlaughter.dm index b10ffab6783..02ed818ea30 100644 --- a/code/datums/components/sitcomlaughter.dm +++ b/code/datums/components/sitcomlaughter.dm @@ -1,10 +1,6 @@ /datum/component/wearertargeting/sitcomlaughter valid_slots = list(ITEM_SLOT_HANDS, ITEM_SLOT_BELT, ITEM_SLOT_ID, ITEM_SLOT_LPOCKET, ITEM_SLOT_RPOCKET, ITEM_SLOT_SUITSTORE, ITEM_SLOT_DEX_STORAGE) -<<<<<<< HEAD - signals = list(COMSIG_MOB_CREAMED, COMSIG_ON_CARBON_SLIP, COMSIG_POST_TILT_AND_CRUSH, COMSIG_MOB_CLUMSY_SHOOT_FOOT) -======= signals = list(COMSIG_MOB_HIT_BY_SPLAT, COMSIG_ON_CARBON_SLIP, COMSIG_POST_TILT_AND_CRUSH, COMSIG_MOB_CLUMSY_SHOOT_FOOT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 proctype = PROC_REF(EngageInComedy) mobtype = /mob/living ///Sounds used for when user has a sitcom action occur diff --git a/code/datums/components/space_kidnap.dm b/code/datums/components/space_kidnap.dm index 7aa0baa4de1..7d59a6d7f9f 100644 --- a/code/datums/components/space_kidnap.dm +++ b/code/datums/components/space_kidnap.dm @@ -23,11 +23,7 @@ target.balloon_alert(parent, "is dead!") return COMPONENT_CANCEL_ATTACK_CHAIN -<<<<<<< HEAD - if(!victim.incapacitated()) -======= if(!victim.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(!isspaceturf(get_turf(target))) @@ -43,11 +39,7 @@ var/obj/particles = new /obj/effect/abstract/particle_holder (victim, /particles/void_kidnap) kidnapping = TRUE -<<<<<<< HEAD - if(do_after(parent, kidnap_time, victim, extra_checks = CALLBACK(victim, TYPE_PROC_REF(/mob, incapacitated)))) -======= if(do_after(parent, kidnap_time, victim, extra_checks = victim.incapacitated)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 take_them(victim) qdel(particles) diff --git a/code/datums/components/sticker.dm b/code/datums/components/sticker.dm index de1bcf96f55..a11ab10e7c6 100644 --- a/code/datums/components/sticker.dm +++ b/code/datums/components/sticker.dm @@ -13,14 +13,6 @@ var/atom/movable/our_sticker /// Reference to the created overlay, used during component deletion. var/mutable_appearance/sticker_overlay -<<<<<<< HEAD - // Callback invoked when sticker is applied to the parent. - var/datum/callback/stick_callback - // Callback invoked when sticker is peeled (not removed) from the parent. - var/datum/callback/peel_callback - -/datum/component/sticker/Initialize(atom/stickering_atom, dir = NORTH, px = 0, py = 0, datum/callback/stick_callback, datum/callback/peel_callback) -======= /// Callback invoked when sticker is applied to the parent. var/datum/callback/stick_callback /// Callback invoked when sticker is peeled (not removed) from the parent. @@ -29,17 +21,13 @@ var/examine_text /datum/component/sticker/Initialize(atom/stickering_atom, dir = NORTH, px = 0, py = 0, datum/callback/stick_callback, datum/callback/peel_callback, examine_text) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!isatom(parent)) return COMPONENT_INCOMPATIBLE src.our_sticker = our_sticker src.stick_callback = stick_callback src.peel_callback = peel_callback -<<<<<<< HEAD -======= src.examine_text = examine_text ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 stick(stickering_atom, px, py) register_turf_signals(dir) @@ -60,16 +48,10 @@ /datum/component/sticker/RegisterWithParent() RegisterSignal(parent, COMSIG_LIVING_IGNITED, PROC_REF(on_ignite)) RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean)) -<<<<<<< HEAD - -/datum/component/sticker/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_LIVING_IGNITED, COMSIG_COMPONENT_CLEAN_ACT)) -======= RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/sticker/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_LIVING_IGNITED, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_ATOM_EXAMINE)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Subscribes to `COMSIG_TURF_EXPOSE` if parent atom is a turf. If turf is closed - subscribes to signal /datum/component/sticker/proc/register_turf_signals(dir) @@ -138,12 +120,9 @@ if(exposed_temperature >= FIRE_MINIMUM_TEMPERATURE_TO_EXIST) qdel(our_sticker) // which qdels us -<<<<<<< HEAD -======= /datum/component/sticker/proc/on_examine(atom/source, mob/user, list/examine_list) SIGNAL_HANDLER if(!isnull(examine_text)) examine_list += span_warning(examine_text) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/components/style/style.dm b/code/datums/components/style/style.dm index 77b32b6143c..2d60d27ebb8 100644 --- a/code/datums/components/style/style.dm +++ b/code/datums/components/style/style.dm @@ -94,21 +94,13 @@ if(multitooled) src.multitooled = multitooled -<<<<<<< HEAD ADD_TRAIT(mob_parent, TRAIT_STYLISH, REF(src)) // SKYRAT EDIT ADD - allows style meter chads to do flips -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/component/style/RegisterWithParent() RegisterSignal(parent, COMSIG_USER_ITEM_INTERACTION, PROC_REF(hotswap)) RegisterSignal(parent, COMSIG_MOB_MINED, PROC_REF(on_mine)) RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(on_take_damage)) -<<<<<<< HEAD - RegisterSignal(parent, COMSIG_MOB_EMOTED("flip"), PROC_REF(on_flip)) - RegisterSignal(parent, COMSIG_MOB_EMOTED("spin"), PROC_REF(on_spin)) -======= RegisterSignal(parent, COMSIG_MOB_EMOTED("taunt"), PROC_REF(on_taunt)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(parent, COMSIG_MOB_ITEM_ATTACK, PROC_REF(on_attack)) RegisterSignal(parent, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_punch)) RegisterSignal(SSdcs, COMSIG_GLOB_MOB_DEATH, PROC_REF(on_death)) @@ -123,11 +115,7 @@ UnregisterSignal(parent, COMSIG_USER_ITEM_INTERACTION) UnregisterSignal(parent, COMSIG_MOB_MINED) UnregisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE) -<<<<<<< HEAD - UnregisterSignal(parent, list(COMSIG_MOB_EMOTED("flip"), COMSIG_MOB_EMOTED("spin"))) -======= UnregisterSignal(parent, COMSIG_MOB_EMOTED("taunt")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UnregisterSignal(parent, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_LIVING_UNARMED_ATTACK)) UnregisterSignal(SSdcs, COMSIG_GLOB_MOB_DEATH) UnregisterSignal(parent, COMSIG_LIVING_RESONATOR_BURST) @@ -143,10 +131,7 @@ if(mob_parent.hud_used) mob_parent.hud_used.static_inventory -= meter mob_parent.hud_used.show_hud(mob_parent.hud_used.hud_version) -<<<<<<< HEAD REMOVE_TRAIT(mob_parent, TRAIT_STYLISH, REF(src)) // SKYRAT EDIT ADD - allows style meter chads to do flips -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /datum/component/style/process(seconds_per_tick) @@ -406,31 +391,23 @@ add_action(ACTION_GIBTONITE_DEFUSED, min(40, 20 * (10 - det_time))) // 40 to 180 points depending on speed -<<<<<<< HEAD //SKYRAT EDIT START /* /datum/component/style/proc/on_crusher_detonate(datum/source, mob/living/target, obj/item/kinetic_crusher/crusher, backstabbed) */ /datum/component/style/proc/on_crusher_detonate(datum/component/kinetic_crusher/source, mob/living/target, obj/item/kinetic_crusher/crusher, backstabbed) //SKYRAT EDIT END -======= -/datum/component/style/proc/on_crusher_detonate(datum/source, mob/living/target, obj/item/kinetic_crusher/crusher, backstabbed) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER if(target.stat == DEAD) return -<<<<<<< HEAD //SKYRAT EDIT START /* var/has_brimdemon_trophy = locate(/obj/item/crusher_trophy/brimdemon_fang) in crusher.trophies */ var/has_brimdemon_trophy = locate(/obj/item/crusher_trophy/brimdemon_fang) in source.stored_trophies //SKYRAT EDIT END -======= - var/has_brimdemon_trophy = locate(/obj/item/crusher_trophy/brimdemon_fang) in crusher.trophies ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 add_action(ACTION_MARK_DETONATED, round((backstabbed ? 60 : 30) * (ismegafauna(target) ? 1.5 : 1) * (has_brimdemon_trophy ? 1.25 : 1))) @@ -442,26 +419,12 @@ // Emote-based multipliers -<<<<<<< HEAD -/datum/component/style/proc/on_flip() -======= /datum/component/style/proc/on_taunt() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER point_multiplier = round(min(point_multiplier + 0.5, 3), 0.1) update_screen() -<<<<<<< HEAD -/datum/component/style/proc/on_spin() - SIGNAL_HANDLER - - point_multiplier = round(min(point_multiplier + 0.3, 3), 0.1) - update_screen() - - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Negative effects /datum/component/style/proc/on_take_damage(...) SIGNAL_HANDLER diff --git a/code/datums/components/subtype_picker.dm b/code/datums/components/subtype_picker.dm index f3460b1d2c2..2cc76e42ecf 100644 --- a/code/datums/components/subtype_picker.dm +++ b/code/datums/components/subtype_picker.dm @@ -87,10 +87,6 @@ return FALSE if(QDELETED(target)) return FALSE -<<<<<<< HEAD - if(user.incapacitated() || !user.is_holding(target)) -======= if(user.incapacitated || !user.is_holding(target)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/datums/components/surgery_initiator.dm b/code/datums/components/surgery_initiator.dm index f6b03a0d7d8..d360478b8b2 100644 --- a/code/datums/components/surgery_initiator.dm +++ b/code/datums/components/surgery_initiator.dm @@ -229,7 +229,6 @@ if (surgery_needs_exposure(surgery, surgery_target)) surgery_info["blocked"] = TRUE -<<<<<<< HEAD surgery_info["blocked_reason"] = "Their body is covered!" // SKYRAT EDIT ADDITION - Surgically unremovable bodyparts // SKYRAT EDIT START - Surgically unremovable bodyparts @@ -241,8 +240,6 @@ surgery_info["blocked"] = TRUE surgery_info["blocked_reason"] = "That limb cannot be surgically removed!" // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 surgeries += list(surgery_info) @@ -306,15 +303,12 @@ target.balloon_alert(user, "no wound to operate on!") return -<<<<<<< HEAD // SKYRAT EDIT START - Limbs that can't be surgically removed if (surgery.removes_target_bodypart && !isnull(affecting_limb) && !affecting_limb.can_be_surgically_removed) target.balloon_alert(user, "limb can't be surgically removed!") return // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (IS_IN_INVALID_SURGICAL_POSITION(target, surgery)) target.balloon_alert(user, "patient is not lying down!") return @@ -339,12 +333,9 @@ span_notice("You drape [parent] over [target]'s [target.parse_zone_with_bodypart(selected_zone)] to prepare for \an [procedure.name]."), ) -<<<<<<< HEAD if(!(HAS_TRAIT(target, TRAIT_ANALGESIA) || target.stat >= UNCONSCIOUS)) ///skyrat add start - warning for unanesthetized surgery target.balloon_alert(user, "not numbed!") ///skyrat add end -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_combat(user, target, "operated on", null, "(OPERATION TYPE: [procedure.name]) (TARGET AREA: [selected_zone])") /datum/component/surgery_initiator/proc/surgery_needs_exposure(datum/surgery/surgery, mob/living/target) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 86489b9c949..aacd7e6978b 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -74,14 +74,7 @@ if(modifiers[ALT_CLICK] || modifiers[SHIFT_CLICK] || modifiers[CTRL_CLICK] || modifiers[MIDDLE_CLICK]) return -<<<<<<< HEAD - if(!modifiers[RIGHT_CLICK]) - return - - if(!user.throw_mode || user.get_active_held_item() || user.pulling || user.buckled || user.incapacitated()) -======= if(!user.throw_mode || user.get_active_held_item() || user.pulling || user.buckled || user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(!clicked_atom || !(isturf(clicked_atom) || isturf(clicked_atom.loc))) @@ -113,11 +106,7 @@ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(checkObstacle)) playsound(user, 'sound/weapons/thudswoosh.ogg', 40, TRUE, -1) -<<<<<<< HEAD var/leap_word = isfeline(user) ? "pounce" : "leap" //If cat, "pounce" instead of "leap". // SKYRAT EDIT - FELINE TRAITS. Was: isfelinid(user) -======= - var/leap_word = isfelinid(user) ? "pounce" : "leap" //If cat, "pounce" instead of "leap". ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(can_see(user, clicked_atom, 7)) user.visible_message(span_warning("[user] [leap_word]s at [clicked_atom]!"), span_danger("You [leap_word] at [clicked_atom]!")) else @@ -163,11 +152,7 @@ return var/mob/living/carbon/target = hit -<<<<<<< HEAD - var/tackle_word = isfeline(user) ? "pounce" : "tackle" //If cat, "pounce" instead of "tackle". // SKYRAT EDIT - FELINE TRAITS - ORIGINAL : var/tackle_word = isfelinid(user) ? "pounce" : "tackle" -======= - var/tackle_word = isfelinid(user) ? "pounce" : "tackle" //If cat, "pounce" instead of "tackle". ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + var/tackle_word = isfeline(user) ? "pounce" : "tackle" //If cat, "pounce" instead of "tackle". // SKYRAT EDIT - FELINE TRAITS - ORIGINAL : var/tackle_word = isfelinid(user) ? "pounce" : "tackle" var/roll = rollTackle(target) tackling = FALSE diff --git a/code/datums/components/toggle_attached_clothing.dm b/code/datums/components/toggle_attached_clothing.dm index d32f689a760..9ba42fe0917 100644 --- a/code/datums/components/toggle_attached_clothing.dm +++ b/code/datums/components/toggle_attached_clothing.dm @@ -67,10 +67,7 @@ RegisterSignal(parent, COMSIG_ITEM_UI_ACTION_CLICK, PROC_REF(on_toggle_pressed)) RegisterSignal(parent, COMSIG_ITEM_UI_ACTION_SLOT_CHECKED, PROC_REF(on_action_slot_checked)) RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_parent_equipped)) -<<<<<<< HEAD -======= RegisterSignal(parent, COMSIG_ITEM_POST_UNEQUIP, PROC_REF(remove_deployable)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(parent, COMSIG_ITEM_EQUIPPED_AS_OUTFIT, PROC_REF(on_parent_equipped_outfit)) if (down_overlay_state_suffix) var/overlay_state = "[initial(clothing_parent.icon_state)][down_overlay_state_suffix]" @@ -193,10 +190,7 @@ /// Removes our deployed equipment from the wearer /datum/component/toggle_attached_clothing/proc/remove_deployable() -<<<<<<< HEAD -======= SIGNAL_HANDLER ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unequip_deployable() if (!currently_deployed) return diff --git a/code/datums/components/trapdoor.dm b/code/datums/components/trapdoor.dm index e70eac3edfd..cf989a9b996 100644 --- a/code/datums/components/trapdoor.dm +++ b/code/datums/components/trapdoor.dm @@ -59,14 +59,11 @@ RegisterSignal(SSdcs, COMSIG_GLOB_TRAPDOOR_LINK, PROC_REF(on_link_requested)) else RegisterSignal(assembly, COMSIG_ASSEMBLY_PULSED, PROC_REF(toggle_trapdoor)) -<<<<<<< HEAD // SKYRAT EDIT START - Trapdoors shouldn't be targeted by SSDecay. if(isturf(parent)) var/turf/turf_parent = parent turf_parent.turf_flags &= ~CAN_DECAY_BREAK_1 // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(try_unlink)) /datum/component/trapdoor/UnregisterFromParent() diff --git a/code/datums/components/unobserved_actor.dm b/code/datums/components/unobserved_actor.dm index a823424a594..007d39a0ae8 100644 --- a/code/datums/components/unobserved_actor.dm +++ b/code/datums/components/unobserved_actor.dm @@ -99,11 +99,7 @@ // We aren't in darkness, loop for viewers. for(var/mob/living/mob_target in oview(my_turf, 7)) // They probably cannot see us if we cannot see them... can they? -<<<<<<< HEAD - if(mob_target.client && !mob_target.is_blind() && !mob_target.has_unlimited_silicon_privilege && !HAS_TRAIT(mob_target, TRAIT_UNOBSERVANT)) -======= if(mob_target.client && !mob_target.is_blind() && !HAS_TRAIT(mob_target, TRAIT_UNOBSERVANT)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE for(var/obj/vehicle/sealed/mecha/mecha_mob_target in oview(my_turf, 7)) for(var/mob/mechamob_target as anything in mecha_mob_target.occupants) diff --git a/code/datums/datum.dm b/code/datums/datum.dm index 4e1f8db82a2..a4169004fc9 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -142,13 +142,10 @@ _clear_signal_refs() //END: ECS SHIT -<<<<<<< HEAD -======= if(!(datum_flags & DF_STATIC_OBJECT)) DREAMLUAU_CLEAR_REF_USERDATA(vars) // vars ceases existing when src does, so we need to clear any lua refs to it that exist. DREAMLUAU_CLEAR_REF_USERDATA(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return QDEL_HINT_QUEUE ///Only override this if you know what you're doing. You do not know what you're doing diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm index ef9d0281d1c..3fe097920cc 100644 --- a/code/datums/diseases/advance/symptoms/fire.dm +++ b/code/datums/diseases/advance/symptoms/fire.dm @@ -2,11 +2,7 @@ * Slightly hidden. * Lowers resistance tremendously. * Decreases stage speed tremendously. -<<<<<<< HEAD - * Decreases transmittablity tremendously. -======= * Decreases transmittability tremendously. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Fatal level * Bonus: Ignites infected mob. */ diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index 2c765161201..ea235af2b0e 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -280,11 +280,7 @@ . = ..() if(!.) return -<<<<<<< HEAD if(A.totalStageSpeed() >= 7)//SKYRAT EDIT: Brings Noc regen into line with the rest of the healing symptoms. -======= - if(A.totalStageSpeed() >= 8) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 power = 2 /datum/symptom/heal/darkness/CanHeal(datum/disease/advance/A) @@ -382,11 +378,7 @@ return power * 0.9 if(SOFT_CRIT) return power * 0.5 -<<<<<<< HEAD if(M.getBruteLoss() + M.getFireLoss() >= 103 && !active_coma) //SKYRAT EDIT: ORIGINAL: 70 - Adjusts this to remain 37.5% of total health(plus crit health). Because 70 is alot less health here then it is on tg. -======= - if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(M, span_warning("You feel yourself slip into a regenerative coma...")) active_coma = TRUE addtimer(CALLBACK(src, PROC_REF(coma), M), 6 SECONDS) diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 39f4532c9e5..e06c6849286 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -17,19 +17,6 @@ GLOBAL_LIST_INIT(identity_block_lengths, list( )) /** -<<<<<<< HEAD - * The same rules of the above also apply here, with the exception that this is for the unique_features string variable - * (commonly abbreviated with uf) and its blocks. Both ui and uf have a standard block length of 3 ASCII characters. - */ -GLOBAL_LIST_INIT(features_block_lengths, list( - "[DNA_MUTANT_COLOR_BLOCK]" = DNA_BLOCK_SIZE_COLOR, - "[DNA_ETHEREAL_COLOR_BLOCK]" = DNA_BLOCK_SIZE_COLOR, - )) - -/** - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Some identity blocks (basically pieces of the unique_identity string variable of the dna datum, commonly abbreviated with ui) * may have a length that differ from standard length of 3 ASCII characters. This list is necessary * for these non-standard blocks to work, as well as the entire unique identity string. @@ -78,12 +65,8 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) for(var/blocknumber in 1 to DNA_FEATURE_BLOCKS) . += total_block_len total_block_len += GET_UF_BLOCK_LEN(blocknumber) -<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /////////////////////////// DNA DATUM /datum/dna ///An md5 hash of the dna holder's real name @@ -158,12 +141,8 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) destination.dna.mutation_index = mutation_index destination.dna.default_mutation_genes = default_mutation_genes if(transfer_species) -<<<<<<< HEAD //destination.set_species(species.type, icon_update=0) - ORIGINAL destination.set_species(species.type, TRUE, FALSE, features.Copy(), mutant_bodyparts.Copy(), body_markings.Copy()) //SKYRAT EDIT CHANGE - CUSTOMIZATION -======= - destination.set_species(species.type, icon_update=0) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/dna/proc/copy_dna(datum/dna/new_dna) new_dna.unique_enzymes = unique_enzymes @@ -173,14 +152,11 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) new_dna.unique_features = unique_features new_dna.blood_type = blood_type new_dna.features = features.Copy() -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION new_dna.mutant_bodyparts = mutant_bodyparts.Copy() new_dna.body_markings = body_markings.Copy() new_dna.update_body_size() //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //if the new DNA has a holder, transform them immediately, otherwise save it if(new_dna.holder) new_dna.holder.set_species(species.type, icon_update = 0) @@ -255,11 +231,8 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) for(var/blocknum in 1 to DNA_UNI_IDENTITY_BLOCKS) . += L[blocknum] || random_string(GET_UI_BLOCK_LEN(blocknum), GLOB.hex_characters) -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular_skyrat/modules/customization/code/datums/dna.dm) /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/dna/proc/generate_unique_features() . = "" var/list/L = new /list(DNA_FEATURE_BLOCKS) @@ -297,13 +270,8 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) for(var/blocknum in 1 to DNA_FEATURE_BLOCKS) . += L[blocknum] || random_string(GET_UI_BLOCK_LEN(blocknum), GLOB.hex_characters) -<<<<<<< HEAD - - return data.Join() */ //SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/dna/proc/generate_dna_blocks() var/bonus @@ -409,11 +377,8 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(DNA_FACIAL_HAIR_COLOR_GRADIENT_BLOCK) set_uni_identity_block(blocknumber, sanitize_hexcolor(H.grad_color[GRADIENT_FACIAL_HAIR_KEY], include_crunch = FALSE)) -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular_skyrat/modules/customization/code/datums/dna.dm) /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/dna/proc/update_uf_block(blocknumber) if(!blocknumber) CRASH("UF block index is null") @@ -450,11 +415,8 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) set_uni_feature_block(blocknumber, construct_block(SSaccessories.caps_list.Find(features["caps"]), length(SSaccessories.caps_list))) if(DNA_POD_HAIR_BLOCK) set_uni_feature_block(blocknumber, construct_block(SSaccessories.pod_hair_list.Find(features["pod_hair"]), length(SSaccessories.pod_hair_list))) -<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Please use add_mutation or activate_mutation instead /datum/dna/proc/force_give(datum/mutation/human/human_mutation) @@ -540,7 +502,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(create_mutation_blocks) //I hate this generate_dna_blocks() if(randomize_features) -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - We don't really want this. We instead let get_mutant_bodyparts() handle the bodypart randomization on our end, to prevent getting any crazy cross-species features. var/static/list/all_species_protoypes if(isnull(all_species_protoypes)) @@ -555,19 +516,10 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) features = species.randomize_features() | features // SKYRAT EDIT CHANGE - Where applicable, replace features with the features generated by species/randomize_features() - Original: features["mcolor"] = "#[random_color()]" body_markings = species.get_random_body_markings(features) // SKYRAT EDIT ADDITION -======= - for(var/species_type in GLOB.species_prototypes) - var/list/new_features = GLOB.species_prototypes[species_type].randomize_features() - for(var/feature in new_features) - features[feature] = new_features[feature] ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 features["mcolor"] = "#[random_color()]" -<<<<<<< HEAD mutant_bodyparts = species.get_mutant_bodyparts(features, existing_mutant_bodyparts = randomize_features ? list() : mutant_bodyparts) // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 update_dna_identity() /datum/dna/stored //subtype used by brain mob's stored_dna and the crew manifest @@ -601,41 +553,13 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) stored_dna.species = mrace //not calling any species update procs since we're a brain, not a monkey/human -<<<<<<< HEAD /mob/living/carbon/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE, list/override_features, list/override_mutantparts, list/override_markings) // SKYRAT EDIT CHANGE - ORIGINAL: /mob/living/carbon/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE) -======= -/mob/living/carbon/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(src)) CRASH("You're trying to change your species post deletion, this is a recipe for madness") if(isnull(mrace)) CRASH("set_species called without a species to set to") if(!has_dna()) return -<<<<<<< HEAD -======= - - var/datum/species/new_race - if(ispath(mrace)) - new_race = new mrace - else if(istype(mrace)) - if(QDELING(mrace)) - CRASH("someone is calling set_species() and is passing it a qdeling species datum, this is VERY bad, stop it") - new_race = mrace - else - CRASH("set_species called with an invalid mrace [mrace]") - - death_sound = new_race.death_sound - - var/datum/species/old_species = dna.species - dna.species = new_race - - if (old_species.properly_gained) - old_species.on_species_loss(src, new_race, pref_load) - - dna.species.on_species_gain(src, old_species, pref_load) - log_mob_tag("TAG: [tag] SPECIES: [key_name(src)] \[[mrace]\]") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/species/new_race if(ispath(mrace)) @@ -770,11 +694,8 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) else gender = PLURAL -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular_skyrat/modules/customization/code/datums/dna.dm) /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/updateappearance(icon_update = TRUE, mutcolor_update = FALSE, mutations_overlay_update = FALSE) ..() var/structure = dna.unique_identity @@ -817,10 +738,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(dna.features["tail_cat"]) dna.features["tail_cat"] = SSaccessories.tails_list_human[deconstruct_block(get_uni_feature_block(features, DNA_TAIL_BLOCK), length(SSaccessories.tails_list_human))] if(dna.features["tail_lizard"]) -<<<<<<< HEAD - dna.features["tail_cat"] = GLOB.tails_list_lizard[deconstruct_block(get_uni_feature_block(features, DNA_LIZARD_TAIL_BLOCK), GLOB.tails_list_lizard.len)] -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dna.features["tail_lizard"] = SSaccessories.tails_list_lizard[deconstruct_block(get_uni_feature_block(features, DNA_LIZARD_TAIL_BLOCK), length(SSaccessories.tails_list_lizard))] if(dna.features["ears"]) dna.features["ears"] = SSaccessories.ears_list[deconstruct_block(get_uni_feature_block(features, DNA_EARS_BLOCK), length(SSaccessories.ears_list))] @@ -831,31 +748,13 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(dna.features["moth_antennae"]) var/genetic_value = SSaccessories.moth_antennae_list[deconstruct_block(get_uni_feature_block(features, DNA_MOTH_ANTENNAE_BLOCK), length(SSaccessories.moth_antennae_list))] dna.features["original_moth_antennae"] = genetic_value -<<<<<<< HEAD - if(dna.features["moth_antennae"] != "Burnt Off") - dna.features["moth_antennae"] = genetic_value -======= dna.features["moth_antennae"] = genetic_value ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(dna.features["moth_markings"]) dna.features["moth_markings"] = SSaccessories.moth_markings_list[deconstruct_block(get_uni_feature_block(features, DNA_MOTH_MARKINGS_BLOCK), length(SSaccessories.moth_markings_list))] if(dna.features["caps"]) dna.features["caps"] = SSaccessories.caps_list[deconstruct_block(get_uni_feature_block(features, DNA_MUSHROOM_CAPS_BLOCK), length(SSaccessories.caps_list))] if(dna.features["pod_hair"]) dna.features["pod_hair"] = SSaccessories.pod_hair_list[deconstruct_block(get_uni_feature_block(features, DNA_POD_HAIR_BLOCK), length(SSaccessories.pod_hair_list))] -<<<<<<< HEAD - - - for(var/obj/item/organ/external/external_organ in organs) - external_organ.mutate_feature(features, src) - - if(icon_update) - update_body(is_creating = mutcolor_update) -*/ -//SKYRAT EDIT REMOVAL END - -======= - for(var/obj/item/organ/organ in organs) organ.mutate_feature(features, src) @@ -863,8 +762,9 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) update_body(is_creating = mutcolor_update) if(mutations_overlay_update) update_mutations_overlay() +*/ +//SKYRAT EDIT REMOVAL END ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/proc/domutcheck() return @@ -973,11 +873,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(!has_dna()) CRASH("[src] does not have DNA") var/num = rand(1, DNA_UNI_IDENTITY_BLOCKS) -<<<<<<< HEAD - dna.set_uni_identity_block(num, random_string(GET_UI_BLOCK_LEN(num), GLOB.hex_characters)) -======= dna.set_uni_feature_block(num, random_string(GET_UI_BLOCK_LEN(num), GLOB.hex_characters)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 updateappearance(mutations_overlay_update=1) /mob/living/carbon/proc/random_mutate_unique_features() @@ -1009,11 +905,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(ui) for(var/blocknum in 1 to DNA_UNI_IDENTITY_BLOCKS) if(prob(probability)) -<<<<<<< HEAD - M.dna.set_uni_identity_block(blocknum, random_string(GET_UI_BLOCK_LEN(blocknum), GLOB.hex_characters)) -======= M.dna.set_uni_feature_block(blocknum, random_string(GET_UI_BLOCK_LEN(blocknum), GLOB.hex_characters)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(uf) for(var/blocknum in 1 to DNA_FEATURE_BLOCKS) if(prob(probability)) diff --git a/code/datums/elements/can_shatter.dm b/code/datums/elements/can_shatter.dm index 507c8df6c9d..df19e4ef123 100644 --- a/code/datums/elements/can_shatter.dm +++ b/code/datums/elements/can_shatter.dm @@ -45,16 +45,10 @@ shatter(source, impacted_turf) /// Tells the parent to shatter if we are thrown and impact something -<<<<<<< HEAD -/datum/element/can_shatter/proc/on_throw_impact(datum/source, atom/hit_atom) - SIGNAL_HANDLER - -======= /datum/element/can_shatter/proc/on_throw_impact(datum/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught) SIGNAL_HANDLER if(caught) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 shatter(source, hit_atom) /// Handles the actual shattering part, throwing shards of whatever is defined on the component everywhere diff --git a/code/datums/elements/crusher_loot.dm b/code/datums/elements/crusher_loot.dm index 34dab9db01b..7d53794d5b0 100644 --- a/code/datums/elements/crusher_loot.dm +++ b/code/datums/elements/crusher_loot.dm @@ -35,15 +35,11 @@ SIGNAL_HANDLER var/datum/status_effect/crusher_damage/damage = target.has_status_effect(/datum/status_effect/crusher_damage) -<<<<<<< HEAD // SKYRAT EDIT START - ASHWALKER TROPHIES var/datum/status_effect/ashwalker_damage/ashie_damage = target.has_status_effect(/datum/status_effect/ashwalker_damage) // SKYRAT EDIT ADDITION var/damage_total = damage?.total_damage + ashie_damage?.total_damage // SKYRAT EDIT ADDITION if(damage_total && prob((damage_total/target.maxHealth) * drop_mod)) //on average, you'll need to kill 4 creatures before getting the item. by default. // SKYRAT EDIT - ORIGINAL: if(damage && prob((damage.total_damage/target.maxHealth) * drop_mod)) // SKYRAT EDIT END - ASHWALKER TROPHIES -======= - if(damage && prob((damage.total_damage/target.maxHealth) * drop_mod)) //on average, you'll need to kill 4 creatures before getting the item. by default. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(drop_immediately) new trophy_type(get_turf(target)) else diff --git a/code/datums/elements/firestacker.dm b/code/datums/elements/firestacker.dm index 2bcfceb1e97..a512e5e89c7 100644 --- a/code/datums/elements/firestacker.dm +++ b/code/datums/elements/firestacker.dm @@ -27,17 +27,10 @@ /datum/element/firestacker/proc/stack_on(datum/owner, mob/living/target) target.adjust_fire_stacks(amount) -<<<<<<< HEAD -/datum/element/firestacker/proc/impact(datum/source, atom/hit_atom, datum/thrownthing/throwingdatum) - SIGNAL_HANDLER - - if(isliving(hit_atom)) -======= /datum/element/firestacker/proc/impact(datum/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught) SIGNAL_HANDLER if(!caught && isliving(hit_atom)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 stack_on(source, hit_atom) /datum/element/firestacker/proc/item_attack(datum/source, atom/movable/target, mob/living/user) diff --git a/code/datums/elements/food/food_trash.dm b/code/datums/elements/food/food_trash.dm index a4df744cd46..244de8d7e84 100644 --- a/code/datums/elements/food/food_trash.dm +++ b/code/datums/elements/food/food_trash.dm @@ -22,13 +22,6 @@ RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, PROC_REF(open_trash)) if(flags & FOOD_TRASH_POPABLE) RegisterSignal(target, COMSIG_FOOD_CROSSED, PROC_REF(food_crossed)) -<<<<<<< HEAD - RegisterSignal(target, COMSIG_ITEM_ON_GRIND, PROC_REF(generate_trash)) - RegisterSignal(target, COMSIG_ITEM_ON_JUICE, PROC_REF(generate_trash)) - RegisterSignal(target, COMSIG_ITEM_USED_AS_INGREDIENT, PROC_REF(generate_trash)) - RegisterSignal(target, COMSIG_ITEM_ON_COMPOSTED, PROC_REF(generate_trash)) - RegisterSignal(target, COMSIG_ITEM_SOLD_TO_CUSTOMER, PROC_REF(generate_trash)) -======= RegisterSignals(target, list( COMSIG_ITEM_ON_GRIND, COMSIG_ITEM_ON_JUICE, @@ -37,7 +30,6 @@ COMSIG_ITEM_SOLD_TO_CUSTOMER, COMSIG_MOVABLE_SPLAT, ), PROC_REF(generate_trash)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/element/food_trash/Detach(datum/target) . = ..() @@ -49,13 +41,9 @@ COMSIG_ITEM_ON_JUICE, COMSIG_ITEM_USED_AS_INGREDIENT, COMSIG_ITEM_ON_COMPOSTED, -<<<<<<< HEAD - COMSIG_ITEM_SOLD_TO_CUSTOMER,)) -======= COMSIG_ITEM_SOLD_TO_CUSTOMER, COMSIG_MOVABLE_SPLAT, )) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/element/food_trash/proc/generate_trash(datum/source, mob/living/eater, mob/living/feeder) SIGNAL_HANDLER diff --git a/code/datums/elements/food/grilled_item.dm b/code/datums/elements/food/grilled_item.dm index d6dbacf7370..74e772eb73c 100644 --- a/code/datums/elements/food/grilled_item.dm +++ b/code/datums/elements/food/grilled_item.dm @@ -28,11 +28,8 @@ if(grill_time > 30 SECONDS && isnull(this_food.GetComponent(/datum/component/edible))) this_food.AddComponent(/datum/component/edible, foodtypes = FRIED) -<<<<<<< HEAD -======= SEND_SIGNAL(this_food, COMSIG_ITEM_BARBEQUE_GRILLED) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/element/grilled_item/Detach(atom/source, ...) source.name = initial(source.name) source.desc = initial(source.desc) diff --git a/code/datums/elements/food/microwavable.dm b/code/datums/elements/food/microwavable.dm index fe8f4a5c82d..5fdd4c084ad 100644 --- a/code/datums/elements/food/microwavable.dm +++ b/code/datums/elements/food/microwavable.dm @@ -44,10 +44,7 @@ var/efficiency = istype(used_microwave) ? used_microwave.efficiency : 1 SEND_SIGNAL(result, COMSIG_ITEM_MICROWAVE_COOKED, source, efficiency) -<<<<<<< HEAD -======= SEND_SIGNAL(source, COMSIG_ITEM_MICROWAVE_COOKED_FROM, result, efficiency) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(IS_EDIBLE(result) && (result_typepath != default_typepath)) BLACKBOX_LOG_FOOD_MADE(result.type) diff --git a/code/datums/elements/frozen.dm b/code/datums/elements/frozen.dm index 5673dfcaf8a..df857cdd6ef 100644 --- a/code/datums/elements/frozen.dm +++ b/code/datums/elements/frozen.dm @@ -28,11 +28,7 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0 organ.organ_flags |= ORGAN_FROZEN RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) -<<<<<<< HEAD - RegisterSignal(target, COMSIG_MOVABLE_THROW_LANDED, PROC_REF(shatter_on_throw)) -======= RegisterSignal(target, COMSIG_MOVABLE_THROW_LANDED, PROC_REF(shatter_on_landed)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(shatter_on_throw)) RegisterSignal(target, COMSIG_OBJ_UNFREEZE, PROC_REF(on_unfreeze)) @@ -58,10 +54,6 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0 SIGNAL_HANDLER Detach(source) -<<<<<<< HEAD -///signal handler for COMSIG_MOVABLE_POST_THROW that shatters our target after impacting after a throw -/datum/element/frozen/proc/shatter_on_throw(datum/target, datum/thrownthing/throwingdatum) -======= /datum/element/frozen/proc/shatter_on_throw(datum/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught) SIGNAL_HANDLER if(!caught) @@ -69,7 +61,6 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0 ///signal handler that shatters our target after impacting after a throw. /datum/element/frozen/proc/shatter_on_landed(datum/target, datum/thrownthing/throwingdatum) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER var/obj/obj_target = target if(ismob(throwingdatum.thrower)) diff --git a/code/datums/elements/lazy_fishing_spot.dm b/code/datums/elements/lazy_fishing_spot.dm index a39f697bad2..b84826def1e 100644 --- a/code/datums/elements/lazy_fishing_spot.dm +++ b/code/datums/elements/lazy_fishing_spot.dm @@ -41,19 +41,7 @@ var/datum/fish_source/fish_source = GLOB.preset_fish_sources[configuration] -<<<<<<< HEAD - var/has_known_fishes = FALSE - for(var/reward in fish_source.fish_table) - if(!ispath(reward, /obj/item/fish)) - continue - var/obj/item/fish/prototype = reward - if(initial(prototype.show_in_catalog)) - has_known_fishes = TRUE - break - if(!has_known_fishes) -======= if(!fish_source.has_known_fishes()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return examine_text += span_tinynoticeital("This is a fishing spot. You can look again to list its fishes...") @@ -64,23 +52,7 @@ return var/datum/fish_source/fish_source = GLOB.preset_fish_sources[configuration] -<<<<<<< HEAD - - var/list/known_fishes = list() - for(var/reward in fish_source.fish_table) - if(!ispath(reward, /obj/item/fish)) - continue - var/obj/item/fish/prototype = reward - if(initial(prototype.show_in_catalog)) - known_fishes += initial(prototype.name) - - if(!length(known_fishes)) - return - - examine_text += span_info("You can catch the following fish here: [english_list(known_fishes)].") -======= fish_source.get_catchable_fish_names(user, source, examine_text) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/element/lazy_fishing_spot/proc/explosive_fishing(atom/location, severity) SIGNAL_HANDLER diff --git a/code/datums/elements/leeching_walk.dm b/code/datums/elements/leeching_walk.dm index 60a495be260..c9f547189e6 100644 --- a/code/datums/elements/leeching_walk.dm +++ b/code/datums/elements/leeching_walk.dm @@ -55,8 +55,5 @@ // Heals blood loss if(source.blood_volume < BLOOD_VOLUME_NORMAL) source.blood_volume += 2.5 * seconds_per_tick -<<<<<<< HEAD -======= // Slowly regulates your body temp source.adjust_bodytemperature((source.get_body_temp_normal() - source.bodytemperature)/5) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/elements/loomable.dm b/code/datums/elements/loomable.dm index b4266561855..d02b062f668 100644 --- a/code/datums/elements/loomable.dm +++ b/code/datums/elements/loomable.dm @@ -73,18 +73,11 @@ /datum/element/loomable/proc/loom_me(obj/item/source, mob/living/user, atom/target) //this allows us to count the amount of times it has successfully used the stack's required amount var/spawning_amount = 0 -<<<<<<< HEAD var/skill_modifier = user.mind.get_skill_modifier(/datum/skill/production, SKILL_SPEED_MODIFIER) //SKYRAT EDIT if(isstack(source)) var/obj/item/stack/stack_we_use = source while(stack_we_use.amount >= required_amount) if(!do_after(user, loom_time * skill_modifier, target)) //SKYRAT EDIT -======= - if(isstack(source)) - var/obj/item/stack/stack_we_use = source - while(stack_we_use.amount >= required_amount) - if(!do_after(user, loom_time, target)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 break if(!stack_we_use.use(required_amount)) @@ -92,25 +85,16 @@ break spawning_amount++ -<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/production, 5) //SKYRAT EDIT else if(!do_after(user, loom_time * skill_modifier, target)) //SKYRAT EDIT -======= - - else - if(!do_after(user, loom_time, target)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.balloon_alert(user, "interrupted!") return qdel(source) spawning_amount++ -<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/production, 5) //SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(spawning_amount == 0) return diff --git a/code/datums/elements/lube_walking.dm b/code/datums/elements/lube_walking.dm index 934c88d2fca..f85b3e995f8 100644 --- a/code/datums/elements/lube_walking.dm +++ b/code/datums/elements/lube_walking.dm @@ -47,7 +47,6 @@ if(new_resting && lubricate(snail)) snail.add_movespeed_modifier(/datum/movespeed_modifier/snail_crawl) RegisterSignal(snail, COMSIG_MOVABLE_MOVED, PROC_REF(lubricate)) -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - This is to prevent snails from achieving FTL speeds without gravity, think of it like snails affixing to walls irl. ADD_TRAIT(snail, TRAIT_NEGATES_GRAVITY, TRAIT_GENERIC) snail.AddElement(/datum/element/forced_gravity, 0) @@ -61,11 +60,6 @@ REMOVE_TRAIT(snail, TRAIT_NEGATES_GRAVITY, TRAIT_GENERIC) snail.RemoveElement(/datum/element/forced_gravity, 0) //SKYRAT EDIT ADDITION END -======= - else - snail.remove_movespeed_modifier(/datum/movespeed_modifier/snail_crawl) - UnregisterSignal(snail, COMSIG_MOVABLE_MOVED) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/element/lube_walking/proc/lubricate(atom/movable/snail) SIGNAL_HANDLER @@ -73,11 +67,7 @@ var/turf/open/turf_standing_on = get_turf(snail) if(!istype(turf_standing_on)) return FALSE -<<<<<<< HEAD turf_standing_on.MakeSlippery(TURF_WET_WATER, 1 SECONDS) //SKYRAT EDIT CHANGE: Roundstart Snails - No more lube - ORIGINAL: turf_standing_on.MakeSlippery(wet_flags, min_wet_time = min_time_wet_for) turf_standing_on.wash(CLEAN_WASH) //SKYRAT EDIT ADDITION: Roundstart Snails - Snails Keep Clean -======= - turf_standing_on.MakeSlippery(wet_flags, min_wet_time = min_time_wet_for) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE diff --git a/code/datums/elements/muffles_speech.dm b/code/datums/elements/muffles_speech.dm index 4de8844c2f2..161d911bd17 100644 --- a/code/datums/elements/muffles_speech.dm +++ b/code/datums/elements/muffles_speech.dm @@ -24,13 +24,10 @@ /datum/element/muffles_speech/proc/emote_override(mob/living/source, key, params, type_override, intentional, datum/emote/emote) SIGNAL_HANDLER -<<<<<<< HEAD // SKYRAT EDIT ADDITION: muzzle_ignore flag if(emote.muzzle_ignore) return NONE // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!emote.hands_use_check && (emote.emote_type & EMOTE_AUDIBLE)) source.audible_message("makes a [pick("strong ", "weak ", "")]noise.", audible_message_flags = EMOTE_MESSAGE|ALWAYS_SHOW_SELF_MESSAGE) return COMPONENT_CANT_EMOTE diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index 680eb760c01..a668fa5ba5d 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -80,12 +80,9 @@ /// Should we give feedback messages? var/show_visible_message = TRUE -<<<<<<< HEAD /// Can it be silent? var/can_be_silent = FALSE //SKYRAT EDIT ADDITION - THIEVING GLOVES -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Gets the item from the given source. /datum/strippable_item/proc/get_item(atom/source) @@ -147,7 +144,6 @@ if (HAS_TRAIT(item, TRAIT_NO_STRIP)) return FALSE -<<<<<<< HEAD //SKYRAT EDIT CHANGE START - THIEVING GLOVES var/is_silent = can_be_silent && HAS_TRAIT(user, TRAIT_STICKY_FINGERS) if (!is_silent) @@ -158,25 +154,13 @@ ignored_mobs = user, ) //SKYRAT EDIT CHANGE END -======= - source.visible_message( - span_warning("[user] tries to remove [source]'s [item.name]."), - span_userdanger("[user] tries to remove your [item.name]."), - blind_message = span_hear("You hear rustling."), - ignored_mobs = user, - ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_danger("You try to remove [source]'s [item.name]...")) user.log_message("is stripping [key_name(source)] of [item].", LOG_ATTACK, color="red") source.log_message("is being stripped of [item] by [key_name(user)].", LOG_VICTIM, color="orange", log_globally=FALSE) item.add_fingerprint(src) -<<<<<<< HEAD if(ishuman(source) && !is_silent) //SKYRAT EDIT ADDITION - THIEVING GLOVES ORIGINAL if(ishuman(source)) -======= - if(ishuman(source)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/carbon/human/victim_human = source if(victim_human.key && !victim_human.client) // AKA braindead if(victim_human.stat <= SOFT_CRIT && LAZYLEN(victim_human.afk_thefts) <= AFK_THEFT_MAX_MESSAGES) @@ -313,11 +297,7 @@ /// A utility function for `/datum/strippable_item`s to start unequipping an item from a mob. /proc/start_unequip_mob(obj/item/item, mob/source, mob/user, strip_delay, hidden = FALSE) -<<<<<<< HEAD if (!do_after(user, (strip_delay || item.strip_delay) * (HAS_TRAIT(user, TRAIT_STICKY_FINGERS) ? THIEVING_GLOVES_STRIP_SLOWDOWN : NORMAL_STRIP_SLOWDOWN), source, interaction_key = REF(item), hidden = hidden)) // SKYRAT EDIT CHANGE - ORIGINAL: if (!do_after(user, strip_delay || item.strip_delay, source, interaction_key = REF(item), hidden = hidden)) -======= - if (!do_after(user, strip_delay || item.strip_delay, source, interaction_key = REF(item), hidden = hidden)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/datums/elements/waddling.dm b/code/datums/elements/waddling.dm index 1ec712b673f..45c7fe5e937 100644 --- a/code/datums/elements/waddling.dm +++ b/code/datums/elements/waddling.dm @@ -18,11 +18,7 @@ return if(isliving(moved)) var/mob/living/living_moved = moved -<<<<<<< HEAD - if (living_moved.incapacitated() || living_moved.body_position == LYING_DOWN) -======= if (living_moved.incapacitated || living_moved.body_position == LYING_DOWN) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return waddling_animation(moved) diff --git a/code/datums/elements/wheel.dm b/code/datums/elements/wheel.dm index 57822b68161..a50addb15a3 100644 --- a/code/datums/elements/wheel.dm +++ b/code/datums/elements/wheel.dm @@ -17,11 +17,7 @@ return if(isliving(moved)) var/mob/living/living_moved = moved -<<<<<<< HEAD - if (living_moved.incapacitated() || living_moved.body_position == LYING_DOWN) -======= if (living_moved.incapacitated || living_moved.body_position == LYING_DOWN) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/rotation_degree = (360 / 3) if(direction & SOUTHWEST) diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 06da343369e..5ddebaaca88 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -102,7 +102,6 @@ var/tmp_sound = get_sound(user) if(tmp_sound && should_play_sound(user, intentional) && TIMER_COOLDOWN_FINISHED(user, type)) TIMER_COOLDOWN_START(user, type, audio_cooldown) -<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN //playsound(source = user,soundin = tmp_sound,vol = 50, vary = vary, ignore_walls = sound_wall_ignore) - SKYRAT EDIT - ORIGINAL if(istype(src, /datum/emote/living/lewd)) @@ -110,17 +109,11 @@ else playsound(source = user, soundin = tmp_sound, vol = sound_volume, vary = vary, ignore_walls = sound_wall_ignore) //SKYRAT EDIT CHANGE END -======= - playsound(source = user,soundin = tmp_sound,vol = 50, vary = vary, ignore_walls = sound_wall_ignore) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/is_important = emote_type & EMOTE_IMPORTANT var/is_visual = emote_type & EMOTE_VISIBLE var/is_audible = emote_type & EMOTE_AUDIBLE -<<<<<<< HEAD var/space = should_have_space_before_emote(html_decode(msg)[1]) ? " " : "" // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Emote doesn't get printed to chat, runechat only if(emote_type & EMOTE_RUNECHAT) @@ -132,13 +125,10 @@ continue if(is_visual && viewer.is_blind()) continue -<<<<<<< HEAD // SKYRAT EDIT BEGIN - Pref checked emotes if(!pref_check_emote(viewer)) continue // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(user.runechat_prefs_check(viewer, EMOTE_MESSAGE)) viewer.create_chat_message( speaker = user, @@ -161,13 +151,10 @@ // The emote has some important information, and should always be shown to the user else if(is_important) for(var/mob/viewer as anything in viewers(user)) -<<<<<<< HEAD // SKYRAT EDIT BEGIN - Pref checked emotes if(!pref_check_emote(viewer)) continue // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(viewer, "[user] [msg]") if(user.runechat_prefs_check(viewer, EMOTE_MESSAGE)) viewer.create_chat_message( @@ -183,11 +170,8 @@ deaf_message = "You see how [user] [msg]", self_message = msg, audible_message_flags = EMOTE_MESSAGE|ALWAYS_SHOW_SELF_MESSAGE, -<<<<<<< HEAD separation = space, // SKYRAT EDIT ADDITION pref_to_check = pref_to_check // SKYRAT EDIT ADDITION - Pref checked emotes -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) // Emote is entirely audible, no visible component else if(is_audible) @@ -195,11 +179,8 @@ message = msg, self_message = msg, audible_message_flags = EMOTE_MESSAGE, -<<<<<<< HEAD separation = space, // SKYRAT EDIT ADDITION pref_to_check = pref_to_check // SKYRAT EDIT ADDITION - Pref checked emotes -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) // Emote is entirely visible, no audible component else if(is_visual) @@ -207,16 +188,12 @@ message = msg, self_message = msg, visible_message_flags = EMOTE_MESSAGE|ALWAYS_SHOW_SELF_MESSAGE, -<<<<<<< HEAD separation = space, // SKYRAT EDIT ADDITION pref_to_check = pref_to_check // SKYRAT EDIT ADDITION - Pref checked emotes -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) else CRASH("Emote [type] has no valid emote type set!") -<<<<<<< HEAD // SKYRAT EDIT -- BEGIN -- ADDITION -- AI QOL - RELAY EMOTES OVER HOLOPADS var/obj/effect/overlay/holo_pad_hologram/hologram = GLOB.hologram_impersonators[user] if(hologram) @@ -254,25 +231,17 @@ if(!isnull(user.client)) var/dchatmsg = "[user][space][msg]" // SKYRAT EDIT - Better emotes - Original: var/dchatmsg = "[user] [msg]" -======= - if(!isnull(user.client)) - var/dchatmsg = "[user] [msg]" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/mob/ghost as anything in GLOB.dead_mob_list - viewers(get_turf(user))) if(isnull(ghost.client) || isnewplayer(ghost)) continue if(!(get_chat_toggles(ghost.client) & CHAT_GHOSTSIGHT)) continue -<<<<<<< HEAD // SKYRAT EDIT BEGIN - Pref checked emotes if(!pref_check_emote(ghost)) continue // SKYRAT EDIT END ghost.show_message("[FOLLOW_LINK(ghost, user)] [dchatmsg]") // SKYRAT EDIT CHANGE - Indented -======= - to_chat(ghost, "[FOLLOW_LINK(ghost, user)] [dchatmsg]") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return @@ -290,19 +259,12 @@ /datum/emote/proc/check_cooldown(mob/user, intentional) if(!intentional) return TRUE -<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - EMOTES - GLOBAL COOLDOWN //if(user.emotes_used && user.emotes_used[src] + cooldown > world.time) - SKYRAT EDIT - ORIGINAL if(user.nextsoundemote > world.time) var/datum/emote/default_emote = new /datum/emote if(cooldown > initial(default_emote.cooldown)) // only worry about longer-than-normal emotes to_chat(user, span_danger("You must wait another [DisplayTimeText(user.nextsoundemote - world.time)] before using that emote.")) -======= - if(user.emotes_used && user.emotes_used[src] + cooldown > world.time) - var/datum/emote/default_emote = /datum/emote - if(cooldown > initial(default_emote.cooldown)) // only worry about longer-than-normal emotes - to_chat(user, span_danger("You must wait another [DisplayTimeText(user.emotes_used[src] - world.time + cooldown)] before using that emote.")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE //if(!user.emotes_used) // user.emotes_used = list() @@ -426,7 +388,6 @@ if(HAS_TRAIT(user, TRAIT_EMOTEMUTE)) return FALSE -<<<<<<< HEAD //SKYRAT EDIT BEGIN if(allowed_species && ishuman(user)) var/mob/living/carbon/human/sender = user @@ -435,7 +396,6 @@ else return FALSE //SKYRAT EDIT END - return TRUE /** @@ -451,23 +411,6 @@ if(emote_type & EMOTE_AUDIBLE && !hands_use_check) if(HAS_TRAIT(user, TRAIT_MUTE)) return FALSE -======= - return TRUE - -/** - * Check to see if the user should play a sound when performing the emote. - * - * Arguments: - * * user - Person that is doing the emote. - * * intentional - Bool that says whether the emote was forced (FALSE) or not (TRUE). - * - * Returns a bool about whether or not the user should play a sound when performing the emote. - */ -/datum/emote/proc/should_play_sound(mob/user, intentional = FALSE) - if(emote_type & EMOTE_AUDIBLE && !hands_use_check) - if(HAS_TRAIT(user, TRAIT_MUTE)) - return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ishuman(user)) var/mob/living/carbon/human/loud_mouth = user if(HAS_MIND_TRAIT(loud_mouth, TRAIT_MIMING)) // vow of silence prevents outloud noises diff --git a/code/datums/ert.dm b/code/datums/ert.dm index 5b6c968acda..36af740490b 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -1,8 +1,5 @@ /datum/ert -<<<<<<< HEAD -======= ///Antag datum team for this type of ERT. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/team = /datum/team/ert ///Do we open the doors to the "high-impact" weapon/explosive cabinets? Used for combat-focused ERTs. var/opendoors = TRUE @@ -28,11 +25,8 @@ var/spawn_admin = FALSE /// If TRUE, we try and pick one of the most experienced players who volunteered to fill the leader slot var/leader_experience = TRUE -<<<<<<< HEAD ///SKYRAT EDIT: Do we want to notify the players of this ERT? var/notify_players = TRUE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A custom map template to spawn the ERT at. If this is null or use_custom_shuttle is FALSE, the ERT will spawn at Centcom. var/datum/map_template/ert_template /// If we should actually _use_ the ert_template custom shuttle @@ -145,8 +139,6 @@ mission = "Having heard the station's request for aid, assist the crew in defending themselves." polldesc = "an independent station defense militia" random_names = TRUE -<<<<<<< HEAD -======= /datum/ert/medical opendoors = FALSE @@ -158,4 +150,3 @@ code = "Violet" mission = "Provide emergency medical services to the crew." polldesc = "an emergency medical response team" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/greyscale/README.md b/code/datums/greyscale/README.md index 6a06f98d292..0d8106ebec6 100644 --- a/code/datums/greyscale/README.md +++ b/code/datums/greyscale/README.md @@ -4,11 +4,7 @@ If you're wanting to add easy recolors for your sprite then this is the system f - Multiple color layers so your sprite can be generated from more than one color. - Mixed greyscale and colored sprite layers; You can choose to only greyscale a part of the sprite or have premade filters applied to layers. -<<<<<<< HEAD -- Blend modes; Instead of just putting layers of sprites on top of eachother you can use the more advanced blend modes. -======= - Blend modes; Instead of just putting layers of sprites on top of each other you can use the more advanced blend modes. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - Reusable configurations; You can reference greyscale sprites from within the configuration of another, allowing you to have a bunch of styles with minimal additional configuration. ## Other Documents @@ -35,11 +31,7 @@ This is simply some pointers in the code linking together your dmi and the json ## Json Configuration File -<<<<<<< HEAD -The json is made up of some metadata and a list of layers used while creating the sprite. Inner lists are processed as their own chunk before being applied elsewhere, this is useful when you start using more advanced blend modes. Most of the time though you're just going to want a list of icons overlaid on top of eachother. -======= The json is made up of some metadata and a list of layers used while creating the sprite. Inner lists are processed as their own chunk before being applied elsewhere, this is useful when you start using more advanced blend modes. Most of the time though you're just going to want a list of icons overlaid on top of each other. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ```json { diff --git a/code/datums/greyscale/_greyscale_config.dm b/code/datums/greyscale/_greyscale_config.dm index 377b0031740..d549149493f 100644 --- a/code/datums/greyscale/_greyscale_config.dm +++ b/code/datums/greyscale/_greyscale_config.dm @@ -57,7 +57,6 @@ if(!json_config) stack_trace("Greyscale config object [DebugName()] is missing a json configuration, make sure `json_config` has been assigned a value.") string_json_config = "[json_config]" -<<<<<<< HEAD /* SKYRAT EDIT - Added recognition for the Skyrat GAGS folder - ORIGINAL: if(findtext(string_json_config, "code/datums/greyscale/json_configs/") != 1) stack_trace("All greyscale json configuration files should be located within 'code/datums/greyscale/json_configs/'") @@ -66,10 +65,6 @@ if(findtext(string_json_config, "code/datums/greyscale/json_configs/") != 1 && skyrat_gags_regex.Find(string_json_config) != 1) stack_trace("All greyscale json configuration files should be located within '/greyscale/json_configs/' or 'modular_skyrat/modules/GAGS/json_configs/'.") // SKYRAT EDIT END -======= - if(findtext(string_json_config, "code/datums/greyscale/json_configs/") != 1) - stack_trace("All greyscale json configuration files should be located within 'code/datums/greyscale/json_configs/'") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!icon_file) stack_trace("Greyscale config object [DebugName()] is missing an icon file, make sure `icon_file` has been assigned a value.") string_icon_file = "[icon_file]" diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm index 98c8e5f4bd5..82964313844 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -35,40 +35,21 @@ name = "Held Sombrero Style (Held, Right)" json_config = 'code/datums/greyscale/json_configs/sombrero_base_righthand.json' -<<<<<<< HEAD /* SKYRAT EDIT START - Beret-lliant (moved to modular_skyrat/modules/berets/code/datums/config_types) /datum/greyscale_config/beret/worn name = "Beret Worn" -======= -/datum/greyscale_config/beret - name = "Beret" - icon_file = 'icons/obj/clothing/head/beret.dmi' - json_config = 'code/datums/greyscale/json_configs/beret.json' - -/datum/greyscale_config/beret/worn ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Beret (Worn)" json_config = 'code/datums/greyscale/json_configs/beret_worn.json' /datum/greyscale_config/beret_badge -<<<<<<< HEAD - name = "Beret With Badge" -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Badged Beret" icon_file = 'icons/obj/clothing/head/beret.dmi' json_config = 'code/datums/greyscale/json_configs/beret_badge.json' /datum/greyscale_config/beret_badge/worn -<<<<<<< HEAD - name = "Beret With Badge Worn" name = "Badged Beret (Worn)" json_config = 'code/datums/greyscale/json_configs/beret_badge_worn.json' SKYRAT EDIT END */ -======= - name = "Badged Beret (Worn)" - json_config = 'code/datums/greyscale/json_configs/beret_badge_worn.json' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/greyscale_config/beanie name = "Beanie" @@ -293,14 +274,11 @@ SKYRAT EDIT END */ icon_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' json_config = 'code/datums/greyscale/json_configs/jumpsuit_prison_inhand.json' -<<<<<<< HEAD -======= /datum/greyscale_config/jumpsuit/worn_digi name = "Jumpsuit Worn (Digitigrate)" icon_file = 'icons/mob/clothing/under/digi_template.dmi' json_config = 'code/datums/greyscale/json_configs/jumpsuit_worn_digilegs.json' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/greyscale_config/eth_tunic name = "Ethereal Tunic" icon_file = 'icons/obj/clothing/under/ethereal.dmi' diff --git a/code/datums/greyscale/layer.dm b/code/datums/greyscale/layer.dm index c76492ea31a..f12fb1992c9 100644 --- a/code/datums/greyscale/layer.dm +++ b/code/datums/greyscale/layer.dm @@ -64,11 +64,7 @@ /datum/greyscale_layer/proc/CrossVerify() return -<<<<<<< HEAD -/// Used to actualy create the layer using the given colors -======= /// Used to actually create the layer using the given colors ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Do not override, use InternalGenerate instead /datum/greyscale_layer/proc/Generate(list/colors, list/render_steps, icon/new_icon) var/list/processed_colors = list() diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index ec24f5592d5..fead0417db9 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -179,11 +179,7 @@ if(QDELETED(src)) return FALSE -<<<<<<< HEAD - . = !QDELETED(user) && !user.incapacitated() && !QDELETED(calling_holopad) && calling_holopad.is_operational && user.loc == calling_holopad.loc -======= . = !QDELETED(user) && !user.incapacitated && !QDELETED(calling_holopad) && calling_holopad.is_operational && user.loc == calling_holopad.loc ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(.) if(!connected_holopad) diff --git a/code/datums/hud.dm b/code/datums/hud.dm index 9263eb54f4d..4ef6df96daa 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -19,22 +19,15 @@ GLOBAL_LIST_INIT(huds, list( DATA_HUD_AI_DETECT = new /datum/atom_hud/ai_detector(), DATA_HUD_FAN = new /datum/atom_hud/data/human/fan_hud(), DATA_HUD_MALF_APC = new /datum/atom_hud/data/malf_apc(), -<<<<<<< HEAD DATA_HUD_PERMIT = new/datum/atom_hud/data/human/permit(), // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) GLOBAL_LIST_INIT(trait_to_hud, list( TRAIT_SECURITY_HUD = DATA_HUD_SECURITY_ADVANCED, TRAIT_MEDICAL_HUD = DATA_HUD_MEDICAL_ADVANCED, TRAIT_DIAGNOSTIC_HUD = DATA_HUD_DIAGNOSTIC, -<<<<<<< HEAD - TRAIT_BOT_PATH_HUD = DATA_HUD_BOT_PATH, // SKYRAT EDIT CHANGE - TRAIT_PERMIT_HUD = DATA_HUD_PERMIT, // SKYRAT EDIT ADDITION -======= TRAIT_BOT_PATH_HUD = DATA_HUD_BOT_PATH, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + TRAIT_PERMIT_HUD = DATA_HUD_PERMIT, // SKYRAT EDIT ADDITION )) /datum/atom_hud @@ -48,19 +41,11 @@ GLOBAL_LIST_INIT(trait_to_hud, list( // by z level so when they change z's we can adjust what images they see from this hud. var/list/hud_users = list() -<<<<<<< HEAD - ///used for signal tracking purposes, associative list of the form: list(hud atom = TRUE) that isnt separated by z level - var/list/atom/hud_atoms_all_z_levels = list() - - ///used for signal tracking purposes, associative list of the form: list(hud user = number of times this hud was added to this user). - ///that isnt separated by z level -======= ///used for signal tracking purposes, associative list of the form: list(hud atom = TRUE) that isn't separated by z level var/list/atom/hud_atoms_all_z_levels = list() ///used for signal tracking purposes, associative list of the form: list(hud user = number of times this hud was added to this user). ///that isn't separated by z level ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/mob/hud_users_all_z_levels = list() ///these will be the indexes for the atom's hud_list @@ -70,17 +55,10 @@ GLOBAL_LIST_INIT(trait_to_hud, list( var/list/next_time_allowed = list() ///mobs that have triggered the cooldown and are queued to see the hud, but do not yet var/list/queued_to_see = list() -<<<<<<< HEAD - /// huduser = list(atoms with their hud hidden) - aka everyone hates targeted invisiblity - var/list/hud_exceptions = list() - ///whether or not this atom_hud type updates the global huds_by_category list. - ///some subtypes cant work like this since theyre supposed to "belong" to -======= /// huduser = list(atoms with their hud hidden) - aka everyone hates targeted invisibility var/list/hud_exceptions = list() ///whether or not this atom_hud type updates the global huds_by_category list. ///some subtypes can't work like this since they're supposed to "belong" to ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///one target atom each. it will still go in the other global hud lists. var/uses_global_hud_category = TRUE @@ -199,15 +177,9 @@ GLOBAL_LIST_INIT(trait_to_hud, list( hud_users_all_z_levels[former_viewer] -= 1//decrement number of sources for this hud on this user (bad way to track i know) -<<<<<<< HEAD - if (absolute || hud_users_all_z_levels[former_viewer] <= 0)//if forced or there arent any sources left, remove the user - - if(!hud_atoms_all_z_levels[former_viewer])//make sure we arent unregistering changes on a mob thats also a hud atom for this hud -======= if (absolute || hud_users_all_z_levels[former_viewer] <= 0)//if forced or there aren't any sources left, remove the user if(!hud_atoms_all_z_levels[former_viewer])//make sure we aren't unregistering changes on a mob that's also a hud atom for this hud ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UnregisterSignal(former_viewer, COMSIG_MOVABLE_Z_CHANGED) UnregisterSignal(former_viewer, COMSIG_QDELETING) @@ -252,11 +224,7 @@ GLOBAL_LIST_INIT(trait_to_hud, list( if(!hud_atom_to_remove || !hud_atoms_all_z_levels[hud_atom_to_remove]) return FALSE -<<<<<<< HEAD - //make sure we arent unregistering a hud atom thats also a hud user mob -======= //make sure we aren't unregistering a hud atom that's also a hud user mob ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!hud_users_all_z_levels[hud_atom_to_remove]) UnregisterSignal(hud_atom_to_remove, COMSIG_MOVABLE_Z_CHANGED) UnregisterSignal(hud_atom_to_remove, COMSIG_QDELETING) @@ -312,21 +280,12 @@ GLOBAL_LIST_INIT(trait_to_hud, list( for(var/mob/hud_user as anything in get_hud_users_for_z_level(atom_turf.z)) if(!hud_user.client) continue -<<<<<<< HEAD - hud_user.client.images -= hud_atom.active_hud_list[hud_category_to_remove]//by this point it shouldnt be in active_hud_list - - return TRUE - -///when a hud atom or hud user changes z levels this makes sure it gets the images it needs and removes the images it doesnt need. -///because of how signals work we need the same proc to handle both use cases because being a hud atom and being a hud user arent mutually exclusive -======= hud_user.client.images -= hud_atom.active_hud_list[hud_category_to_remove]//by this point it shouldn't be in active_hud_list return TRUE ///when a hud atom or hud user changes z levels this makes sure it gets the images it needs and removes the images it doesn't need. ///because of how signals work we need the same proc to handle both use cases because being a hud atom and being a hud user aren't mutually exclusive ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/atom_hud/proc/on_atom_or_user_z_level_changed(atom/movable/moved_atom, turf/old_turf, turf/new_turf) SIGNAL_HANDLER if(old_turf) @@ -343,11 +302,7 @@ GLOBAL_LIST_INIT(trait_to_hud, list( if(new_turf) if(hud_users_all_z_levels[moved_atom]) -<<<<<<< HEAD - hud_users[new_turf.z][moved_atom] = TRUE //hud users is associative, hud atoms isnt -======= hud_users[new_turf.z][moved_atom] = TRUE //hud users is associative, hud atoms isn't ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 add_all_atoms_to_single_mob_hud(moved_atom, get_hud_atoms_for_z_level(new_turf.z)) diff --git a/code/datums/id_trim/_id_trim.dm b/code/datums/id_trim/_id_trim.dm index cd3d0a8f4a5..562232214b3 100644 --- a/code/datums/id_trim/_id_trim.dm +++ b/code/datums/id_trim/_id_trim.dm @@ -24,14 +24,11 @@ /// Accesses that this trim unlocks on a card that require wildcard slots to apply. If a card cannot accept all a trim's wildcard accesses, the card is incompatible with the trim. var/list/wildcard_access = list() -<<<<<<< HEAD -======= ///If true, IDs with this trim will grant wearers with bigger arrows when pointing var/big_pointer = FALSE ///If set, IDs with this trim will give wearers arrows of different colors when pointing var/pointer_color ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Returns the SecHUD job icon state for whatever this object's ID card is, if it has one. /obj/item/proc/get_sechud_job_icon_state() var/obj/item/card/id/id_card = GetID() diff --git a/code/datums/id_trim/admin.dm b/code/datums/id_trim/admin.dm index eaaf2a6b51d..ee0cf1b977e 100644 --- a/code/datums/id_trim/admin.dm +++ b/code/datums/id_trim/admin.dm @@ -5,11 +5,8 @@ department_color = COLOR_CENTCOM_BLUE subdepartment_color = COLOR_SERVICE_LIME threat_modifier = -INFINITY -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_GREEN ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/admin/New() . = ..() diff --git a/code/datums/id_trim/centcom.dm b/code/datums/id_trim/centcom.dm index a5b3505126e..498a4de254e 100644 --- a/code/datums/id_trim/centcom.dm +++ b/code/datums/id_trim/centcom.dm @@ -7,11 +7,8 @@ department_color = COLOR_CENTCOM_BLUE subdepartment_color = COLOR_CENTCOM_BLUE threat_modifier = -10 // Centcom are legally allowed to do whatever they want -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_CENTCOM_BLUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Centcom VIPs /datum/id_trim/centcom/vip @@ -25,10 +22,7 @@ trim_state = "trim_janitor" department_color = COLOR_CENTCOM_BLUE subdepartment_color = COLOR_SERVICE_LIME -<<<<<<< HEAD -======= big_pointer = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Centcom Thunderdome Overseers. /datum/id_trim/centcom/thunderdome_overseer @@ -44,18 +38,12 @@ /datum/id_trim/centcom/intern access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_WEAPONS) assignment = "CentCom Intern" -<<<<<<< HEAD -======= big_pointer = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Centcom Head Interns. Different assignment, common station access added on. /datum/id_trim/centcom/intern/head assignment = "CentCom Head Intern" -<<<<<<< HEAD -======= big_pointer = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/intern/head/New() . = ..() @@ -66,19 +54,13 @@ /datum/id_trim/centcom/bounty_hunter access = list(ACCESS_CENT_GENERAL) assignment = "Bounty Hunter" -<<<<<<< HEAD -======= big_pointer = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Centcom Bartenders. /datum/id_trim/centcom/bartender access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_BAR) assignment = JOB_CENTCOM_BARTENDER -<<<<<<< HEAD -======= big_pointer = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Centcom Medical Officers. /datum/id_trim/centcom/medical_officer @@ -93,10 +75,7 @@ /// Trim for Centcom Specops Officers. All Centcom and Station Access. /datum/id_trim/centcom/specops_officer assignment = JOB_CENTCOM_SPECIAL_OFFICER -<<<<<<< HEAD -======= big_pointer = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/specops_officer/New() . = ..() @@ -158,10 +137,7 @@ trim_state = "trim_securityofficer" subdepartment_color = COLOR_SECURITY_RED sechud_icon_state = SECHUD_SECURITY_RESPONSE_OFFICER -<<<<<<< HEAD -======= big_pointer = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/ert/security/New() . = ..() @@ -174,10 +150,7 @@ trim_state = "trim_stationengineer" subdepartment_color = COLOR_ENGINEERING_ORANGE sechud_icon_state = SECHUD_ENGINEERING_RESPONSE_OFFICER -<<<<<<< HEAD -======= big_pointer = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/ert/engineer/New() . = ..() @@ -190,10 +163,7 @@ trim_state = "trim_medicaldoctor" subdepartment_color = COLOR_MEDICAL_BLUE sechud_icon_state = SECHUD_MEDICAL_RESPONSE_OFFICER -<<<<<<< HEAD -======= big_pointer = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/ert/medical/New() . = ..() @@ -206,10 +176,7 @@ trim_state = "trim_chaplain" subdepartment_color = COLOR_SERVICE_LIME sechud_icon_state = SECHUD_RELIGIOUS_RESPONSE_OFFICER -<<<<<<< HEAD -======= big_pointer = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/ert/chaplain/New() . = ..() @@ -222,10 +189,7 @@ trim_state = "trim_ert_janitor" subdepartment_color = COLOR_SERVICE_LIME sechud_icon_state = SECHUD_JANITORIAL_RESPONSE_OFFICER -<<<<<<< HEAD -======= big_pointer = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/ert/janitor/New() . = ..() @@ -238,10 +202,7 @@ trim_state = "trim_clown" subdepartment_color = COLOR_MAGENTA sechud_icon_state = SECHUD_ENTERTAINMENT_RESPONSE_OFFICER -<<<<<<< HEAD -======= big_pointer = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/centcom/ert/clown/New() . = ..() @@ -250,14 +211,8 @@ /datum/id_trim/centcom/ert/militia assignment = "Frontier Militia" -<<<<<<< HEAD - -/datum/id_trim/centcom/ert/militia/general - assignment = "Frontier Militia General" -======= big_pointer = FALSE /datum/id_trim/centcom/ert/militia/general assignment = "Frontier Militia General" big_pointer = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index 00d8b38ea6c..a42018406b2 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -238,11 +238,8 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/captain -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_COMMAND_BLUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Captain gets all station accesses hardcoded in because it's the Captain. /datum/id_trim/job/captain/New() @@ -365,11 +362,8 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/chief_engineer -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_ENGINEERING_ORANGE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/chief_medical_officer assignment = JOB_CHIEF_MEDICAL_OFFICER @@ -409,11 +403,8 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/chief_medical_officer -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_MEDICAL_BLUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/clown assignment = JOB_CLOWN @@ -627,11 +618,8 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/head_of_personnel -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_SERVICE_LIME ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/head_of_security assignment = JOB_HEAD_OF_SECURITY @@ -681,11 +669,8 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/head_of_security -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_SECURITY_RED ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/head_of_security/refresh_trim_access() . = ..() @@ -918,11 +903,8 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/quartermaster -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_CARGO_BROWN ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/research_director assignment = JOB_RESEARCH_DIRECTOR @@ -971,11 +953,8 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/research_director -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_SCIENCE_PINK ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/roboticist assignment = JOB_ROBOTICIST @@ -1241,10 +1220,7 @@ extra_access = list() template_access = list() job = /datum/job/veteran_advisor -<<<<<<< HEAD -======= big_pointer = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/job/veteran_advisor/refresh_trim_access() . = ..() @@ -1314,8 +1290,5 @@ extra_access = list() template_access = list() job = /datum/job/human_ai -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_MODERATE_BLUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/id_trim/ruins.dm b/code/datums/id_trim/ruins.dm index 13fd7ba0213..1eccc77a985 100644 --- a/code/datums/id_trim/ruins.dm +++ b/code/datums/id_trim/ruins.dm @@ -72,10 +72,7 @@ /datum/id_trim/centcom/corpse/commander assignment = "Commander" access = list(ACCESS_CENT_CAPTAIN, ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_STORAGE) -<<<<<<< HEAD -======= big_pointer = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for various Centcom corpses. /datum/id_trim/centcom/corpse/private_security @@ -119,10 +116,7 @@ /datum/id_trim/pirate/captain assignment = "Pirate Captain" trim_state = "trim_captain" -<<<<<<< HEAD -======= big_pointer = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/pirate/silverscale assignment = "Silver Scale Member" @@ -138,10 +132,7 @@ /datum/id_trim/away/dangerous_research/head_occultist assignment = "Head Occultist" access = list(ACCESS_AWAY_SCIENCE, ACCESS_AWAY_COMMAND) -<<<<<<< HEAD -======= big_pointer = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Trims for waystation.dmm space ruin /datum/id_trim/away/waystation/cargo_technician @@ -155,10 +146,7 @@ trim_state = "trim_quartermaster" department_color = COLOR_CARGO_BROWN access = list(ACCESS_AWAY_SUPPLY, ACCESS_AWAY_COMMAND) -<<<<<<< HEAD -======= big_pointer = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/away/waystation/security assignment = "Waystation Security Officer" @@ -178,14 +166,9 @@ /datum/id_trim/away/the_outlet/mad_manager assignment = "The Mad Manager" access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MEDICAL, ACCESS_AWAY_SEC) -<<<<<<< HEAD - -//Haunted Trading Post IDs // -======= big_pointer = TRUE //Haunted Trading Post IDs ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/away/hauntedtradingpost assignment = "Donk Co. Employee" department_color = COLOR_ENGINEERING_ORANGE @@ -196,8 +179,4 @@ /datum/id_trim/away/hauntedtradingpost/boss assignment = "Donk Co. Executive" access = list(ACCESS_SYNDICATE, ACCESS_AWAY_COMMAND) -<<<<<<< HEAD -// // -======= big_pointer = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/id_trim/syndicate.dm b/code/datums/id_trim/syndicate.dm index 9aa6feae44e..41c76aaf378 100644 --- a/code/datums/id_trim/syndicate.dm +++ b/code/datums/id_trim/syndicate.dm @@ -7,20 +7,14 @@ sechud_icon_state = SECHUD_SYNDICATE access = list(ACCESS_SYNDICATE) threat_modifier = 5 // Bad guy on deck -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_SYNDIE_RED ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Syndicate mobs, outfits and corpses. /datum/id_trim/syndicom/crew assignment = "Syndicate Operative" access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS) -<<<<<<< HEAD -======= big_pointer = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Interdyne medical Staff /datum/id_trim/syndicom/Interdyne/pharmacist @@ -28,11 +22,8 @@ trim_state = "trim_medicaldoctor" sechud_icon_state = SECHUD_SYNDICATE_INTERDYNE access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS, ACCESS_SURGERY) -<<<<<<< HEAD -======= big_pointer = FALSE pointer_color = null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Interdyne head medical Staff /datum/id_trim/syndicom/Interdyne/pharmacist_director @@ -42,11 +33,8 @@ subdepartment_color = COLOR_SYNDIE_RED_HEAD sechud_icon_state = SECHUD_SYNDICATE_INTERDYNE_HEAD access = list(ACCESS_SYNDICATE, ACCESS_ROBOTICS, ACCESS_SURGERY) -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_SYNDIE_RED_HEAD ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for the space IRS agents (why are they syndie access? I wouldn't worry about it.) /datum/id_trim/syndicom/irs @@ -56,20 +44,14 @@ subdepartment_color = COLOR_COMMAND_BLUE sechud_icon_state = SECHUD_DEATH_COMMANDO access = list(ACCESS_SYNDICATE, ACCESS_MAINT_TUNNELS) -<<<<<<< HEAD -======= big_pointer = FALSE pointer_color = null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/id_trim/syndicom/irs/auditor assignment = "Internal Revenue Service Head Auditor" trim_state = "trim_quartermaster" sechud_icon_state = SECHUD_QUARTERMASTER -<<<<<<< HEAD -======= big_pointer = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Syndicate mobs, outfits and corpses. /datum/id_trim/syndicom/captain @@ -88,11 +70,8 @@ /datum/id_trim/battlecruiser/captain assignment = "Syndicate Battlecruiser Captain" access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_SYNDIE_RED ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Chameleon ID cards. Many outfits, nuke ops and some corpses hold Chameleon ID cards. /datum/id_trim/chameleon @@ -112,11 +91,8 @@ /datum/id_trim/chameleon/operative/nuke_leader assignment = "Syndicate Operative Leader" access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_SYNDIE_RED ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trim for Chameleon ID cards. Many outfits, nuke ops and some corpses hold Chameleon ID cards. /datum/id_trim/chameleon/operative/clown @@ -127,8 +103,5 @@ /datum/id_trim/chameleon/operative/clown_leader assignment = "Syndicate Entertainment Operative Leader" access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) -<<<<<<< HEAD -======= big_pointer = TRUE pointer_color = COLOR_SYNDIE_RED ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/json_database.dm b/code/datums/json_database.dm index 510be35898e..6baeb44ab09 100644 --- a/code/datums/json_database.dm +++ b/code/datums/json_database.dm @@ -61,8 +61,6 @@ /datum/json_database/proc/get_key(key) return cached_data[key] -<<<<<<< HEAD -======= /// Picks the data of a random key and then removes that key from the database. /// Since the list is no longer inside the database, you can mutate and use it as you like. /datum/json_database/proc/pick_and_take_key() @@ -73,7 +71,6 @@ cached_data -= key queue_save() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Sets the data at the key to the value, and queues a save. /datum/json_database/proc/set_key(key, value) cached_data[key] = value diff --git a/code/datums/keybinding/communication.dm b/code/datums/keybinding/communication.dm index 9b120ea062c..92c8f3c4984 100644 --- a/code/datums/keybinding/communication.dm +++ b/code/datums/keybinding/communication.dm @@ -15,12 +15,8 @@ return TRUE /datum/keybinding/client/communication/radio -<<<<<<< HEAD //hotkey_keys = list("Y") // ORIGINAL hotkey_keys = list(";") // SKYRAT EDIT CHANGE - CUSTOMIZATION -======= - hotkey_keys = list("Y") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = RADIO_CHANNEL full_name = "IC Radio (;)" keybind_signal = COMSIG_KB_CLIENT_RADIO_DOWN diff --git a/code/datums/keybinding/living.dm b/code/datums/keybinding/living.dm index 046528392fd..84e3685f5f8 100644 --- a/code/datums/keybinding/living.dm +++ b/code/datums/keybinding/living.dm @@ -121,11 +121,7 @@ user_mob.set_combat_mode(FALSE, silent = FALSE) /datum/keybinding/living/toggle_move_intent -<<<<<<< HEAD hotkey_keys = list("Alt") //SKYRAT EDIT CHANGE - C IS FOR COMBAT INDICATOR - ORIGINAL: hotkey_keys = list("C") -======= - hotkey_keys = list("C") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "toggle_move_intent" full_name = "Hold to toggle move intent" description = "Held down to cycle to the other move intent, release to cycle back" diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 066e668e1fe..9535bcf8576 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -34,11 +34,7 @@ "cargo" = "cargo_skyrat", "ferry" = "ferry_fancy", "whiteship" = "whiteship_meta", -<<<<<<< HEAD "emergency" = "emergency_skyrat") //SKYRAT EDIT CHANGE -======= - "emergency" = "emergency_meta") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Dictionary of job sub-typepath to template changes dictionary var/job_changes = list() diff --git a/code/datums/mapgen/CaveGenerator.dm b/code/datums/mapgen/CaveGenerator.dm index dffa59d0789..2c8be2edaa8 100644 --- a/code/datums/mapgen/CaveGenerator.dm +++ b/code/datums/mapgen/CaveGenerator.dm @@ -114,13 +114,10 @@ string_gen = rustg_cnoise_generate("[initial_closed_chance]", "[smoothing_iterations]", "[birth_limit]", "[death_limit]", "[world.maxx]", "[world.maxy]") //Generate the raw CA data for(var/turf/gen_turf as anything in turfs) //Go through all the turfs and generate them -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(istype(gen_turf, /turf/open/space/mirage)) continue //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/closed = string_gen[world.maxx * (gen_turf.y - 1) + gen_turf.x] != "0" var/turf/new_turf = pick(closed ? closed_turf_types : open_turf_types) @@ -303,11 +300,7 @@ CHECK_TICK var/message = "[name] terrain population finished in [(REALTIMEOFDAY - start_time)/10]s!" -<<<<<<< HEAD add_startup_message(message) //SKYRAT EDIT CHANGE - ORIGINAL: to_chat(world, span_boldannounce("[message]")) -======= - to_chat(world, span_boldannounce("[message]")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_world(message) diff --git a/code/datums/mapgen/Cavegens/IcemoonCaves.dm b/code/datums/mapgen/Cavegens/IcemoonCaves.dm index d1cf2c2e457..1d983582625 100644 --- a/code/datums/mapgen/Cavegens/IcemoonCaves.dm +++ b/code/datums/mapgen/Cavegens/IcemoonCaves.dm @@ -72,11 +72,7 @@ /datum/map_generator/cave_generator/icemoon/surface/noruins //use this for when you don't want ruins to spawn in a certain area /datum/map_generator/cave_generator/icemoon/deep -<<<<<<< HEAD weighted_closed_turf_types = list(/turf/closed/mineral/random/snow/underground = 1) // SKYRAT EDIT: Original: list(/turf/closed/mineral/random/snow = 1) -======= - weighted_closed_turf_types = list(/turf/closed/mineral/random/snow = 1) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 weighted_mob_spawn_list = list( SPAWN_MEGAFAUNA = 1, /mob/living/basic/mining/ice_demon = 100, diff --git a/code/datums/martial/_martial.dm b/code/datums/martial/_martial.dm index 27518952507..8475c9e43f9 100644 --- a/code/datums/martial/_martial.dm +++ b/code/datums/martial/_martial.dm @@ -211,11 +211,7 @@ * Resets the current streak. * * Arguments -<<<<<<< HEAD - * * mob/living/new_target - (Optional) The mob being attacked while the reset is occuring. -======= * * mob/living/new_target - (Optional) The mob being attacked while the reset is occurring. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * * update_icon - If TRUE, the combo display will be updated. */ /datum/martial_art/proc/reset_streak(mob/living/new_target, update_icon = TRUE) diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index afb75a66484..9d6252855d3 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -232,11 +232,7 @@ /datum/martial_art/boxing/proc/check_block(mob/living/boxer, atom/movable/hitby, damage, attack_text, attack_type, ...) SIGNAL_HANDLER -<<<<<<< HEAD - if(!can_use(boxer) || !boxer.throw_mode || boxer.incapacitated(IGNORE_GRAB)) -======= if(!can_use(boxer) || !boxer.throw_mode || INCAPACITATED_IGNORING(boxer, INCAPABLE_GRAB)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return NONE if(attack_type != UNARMED_ATTACK) diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index b2ac63a788f..28b820278e2 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -46,11 +46,7 @@ /datum/martial_art/cqc/proc/check_block(mob/living/cqc_user, atom/movable/hitby, damage, attack_text, attack_type, ...) SIGNAL_HANDLER -<<<<<<< HEAD - if(!can_use(cqc_user) || !cqc_user.throw_mode || cqc_user.incapacitated(IGNORE_GRAB)) -======= if(!can_use(cqc_user) || !cqc_user.throw_mode || INCAPACITATED_IGNORING(cqc_user, INCAPABLE_GRAB)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return NONE if(attack_type == PROJECTILE_ATTACK) return NONE diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm index d7820ec2df5..8a73f47093b 100644 --- a/code/datums/martial/plasma_fist.dm +++ b/code/datums/martial/plasma_fist.dm @@ -112,10 +112,7 @@ human_attacker.underwear = "Nude" human_attacker.undershirt = "Nude" human_attacker.socks = "Nude" -<<<<<<< HEAD human_attacker.bra = "Nude" // SKYRAT EDIT ADDITION - Underwear and bra split -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 human_attacker.update_body() var/turf/boomspot = get_turf(user) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index bf351efaf9a..02d0452fad2 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -184,11 +184,7 @@ /datum/martial_art/the_sleeping_carp/proc/can_deflect(mob/living/carp_user) if(!can_use(carp_user) || !carp_user.combat_mode) return FALSE -<<<<<<< HEAD - if(carp_user.incapacitated(IGNORE_GRAB)) //NO STUN -======= if(INCAPACITATED_IGNORING(carp_user, INCAPABLE_GRAB)) //NO STUN ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(!(carp_user.mobility_flags & MOBILITY_USE)) //NO UNABLE TO USE return FALSE diff --git a/code/datums/materials/_material.dm b/code/datums/materials/_material.dm index 1c6565a1350..5dc8c26d0f6 100644 --- a/code/datums/materials/_material.dm +++ b/code/datums/materials/_material.dm @@ -70,11 +70,7 @@ Simple datum which is instanced once per type and is used for every object of sa /** Handles initializing the material. * -<<<<<<< HEAD - * Arugments: -======= * Arguments: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * - _id: The ID the material should use. Overrides the existing ID. */ /datum/material/proc/Initialize(_id, ...) diff --git a/code/datums/memory/general_memories.dm b/code/datums/memory/general_memories.dm index 0a5324a677d..eca745d3283 100644 --- a/code/datums/memory/general_memories.dm +++ b/code/datums/memory/general_memories.dm @@ -162,8 +162,6 @@ "[protagonist_name] [mood_verb] as they lick off some of the pie", ) -<<<<<<< HEAD -======= /// Witnessed someone get splashed with squid ink. /datum/memory/witnessed_inking story_value = STORY_VALUE_OKAY @@ -186,7 +184,6 @@ "[protagonist_name] [mood_verb] as they wipe the ink off their face.", ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Got slipped by something. /datum/memory/was_slipped story_value = STORY_VALUE_MEH diff --git a/code/datums/mind/_mind.dm b/code/datums/mind/_mind.dm index 0139c291f83..dddc99c0722 100644 --- a/code/datums/mind/_mind.dm +++ b/code/datums/mind/_mind.dm @@ -505,7 +505,6 @@ log_admin("[key_name(usr)] tried and failed to give [current] an uplink.") else log_admin("[key_name(usr)] gave [current] an uplink.") -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN -- EXPLOITABLES if("toggle_exploitables") has_exploitables_override = !has_exploitables_override //First we set the override to be the opposite of whatever it was apon execution, then we @@ -513,8 +512,6 @@ log_admin("[key_name(usr)] toggled [current]'s exploitables override to [(has_exploitables_override) ? "true" : "false"].") message_admins("[key_name(usr)] toggled [current]'s exploitables override to [(has_exploitables_override) ? "true" : "false"].") //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if (href_list["obj_announce"]) announce_objectives() @@ -563,20 +560,12 @@ /// Sets us to the passed job datum, then greets them to their new job. /// Use this one for when you're assigning this mind to a new job for the first time, /// or for when someone's receiving a job they'd really want to be greeted to. -<<<<<<< HEAD /datum/mind/proc/set_assigned_role_with_greeting(datum/job/new_role, client/incoming_client, alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: /datum/mind/proc/set_assigned_role_with_greeting(datum/job/new_role, client/incoming_client) -======= -/datum/mind/proc/set_assigned_role_with_greeting(datum/job/new_role, client/incoming_client) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = set_assigned_role(new_role) if(assigned_role != new_role) return -<<<<<<< HEAD var/intro_message = new_role.get_spawn_message(alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: var/intro_message = new_role.get_spawn_message() -======= - var/intro_message = new_role.get_spawn_message() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(incoming_client && intro_message) to_chat(incoming_client, intro_message) diff --git a/code/datums/mind/antag.dm b/code/datums/mind/antag.dm index 80923349707..b71a5325392 100644 --- a/code/datums/mind/antag.dm +++ b/code/datums/mind/antag.dm @@ -25,10 +25,7 @@ antag_team.add_member(src) INVOKE_ASYNC(A, TYPE_PROC_REF(/datum/antagonist, on_gain)) log_game("[key_name(src)] has gained antag datum [A.name]([A.type]).") -<<<<<<< HEAD handle_exploitables() //SKYRAT EDIT ADDITION - EXPLOITABLES MENU -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return A /datum/mind/proc/remove_antag_datum(datum_type) diff --git a/code/datums/mood.dm b/code/datums/mood.dm index 701cffeffeb..cdc7074fd5f 100644 --- a/code/datums/mood.dm +++ b/code/datums/mood.dm @@ -288,7 +288,6 @@ if (SANITY_LEVEL_INSANE) mood_screen_object.color = "#f15d36" -<<<<<<< HEAD if (!conflicting_moodies.len) // theres no special icons, use the normal icon states //SKYRAT EDIT ADDITION BEGIN - ALEXITHYMIA if(HAS_TRAIT(mob_parent, TRAIT_MOOD_NOEXAMINE)) @@ -296,9 +295,6 @@ mood_screen_object.color = "#4b96c4" return //SKYRAT EDIT ADDITION END -======= - if (!conflicting_moodies.len) // there's no special icons, use the normal icon states ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mood_screen_object.icon_state = "mood[mood_level]" return @@ -341,11 +337,8 @@ /datum/mood/proc/print_mood(mob/user) var/msg = "[span_info("My current mental status:")]\n" msg += span_notice("My current sanity: ") //Long term -<<<<<<< HEAD //ORIGINAL /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(sanity) if(SANITY_GREAT to INFINITY) msg += "[span_boldnicegreen("My mind feels like a temple!")]\n" @@ -359,7 +352,6 @@ msg += "[span_warning("I'm freaking out!!")]\n" if(SANITY_INSANE to SANITY_CRAZY) msg += "[span_boldwarning("AHAHAHAHAHAHAHAHAHAH!!")]\n" -<<<<<<< HEAD */ //SKYRAT EDIT CHANGE BEGIN - ALEXITHYMIA if(!HAS_TRAIT(user, TRAIT_MOOD_NOEXAMINE)) @@ -383,10 +375,6 @@ msg += span_notice("My current mood: ") //Short term //ORIGINAL /* -======= - - msg += span_notice("My current mood: ") //Short term ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(mood_level) if(MOOD_LEVEL_SAD4) msg += "[span_boldwarning("I wish I was dead!")]\n" @@ -406,7 +394,6 @@ msg += "[span_boldnicegreen("I feel amazing!")]\n" if(MOOD_LEVEL_HAPPY4) msg += "[span_boldnicegreen("I love life!")]\n" -<<<<<<< HEAD */ //SKYRAT EDIT CHANGE BEGIN - ALEXITHYMIA / ALCOHOL_PROCESSING if(!HAS_TRAIT(user, TRAIT_MOOD_NOEXAMINE)) @@ -437,11 +424,6 @@ msg += get_drunk_mood(user) if(mood_events.len && !HAS_TRAIT(user, TRAIT_MOOD_NOEXAMINE)) // ORIGINAL - //if(mood_events.len) //SKYRAT EDIT CHANGE END -======= - - msg += "[span_notice("Moodlets:")]\n"//All moodlets - if(mood_events.len) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/category in mood_events) var/datum/mood_event/event = mood_events[category] switch(event.mood_change) diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 910057c2daa..54b276fa71a 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -351,14 +351,6 @@ mood_change = 1 timeout = 2 MINUTES -<<<<<<< HEAD -/datum/mood_event/it_was_on_the_mouse - description = "Heh heh. \"It's on the mouse\". What a play on words." - mood_change = 1 - timeout = 2 MINUTES - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/mood_event/birthday description = "It's my birthday!" mood_change = 2 diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm index 7090f8911da..dc7b64089bd 100644 --- a/code/datums/mutations/_mutations.dm +++ b/code/datums/mutations/_mutations.dm @@ -118,13 +118,10 @@ /datum/mutation/human/proc/on_acquiring(mob/living/carbon/human/acquirer) if(!acquirer || !istype(acquirer) || acquirer.stat == DEAD || (src in acquirer.dna.mutations)) return TRUE -<<<<<<< HEAD // SKYRAT EDIT ADDITION if(acquirer.has_borer()) to_chat(acquirer, span_warning("Something inside holds dearly to your humanity!")) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(species_allowed && !species_allowed.Find(acquirer.dna.species.id)) return TRUE if(health_req && acquirer.health < health_req) diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index 9d1268185e2..e3165fea475 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -172,12 +172,7 @@ // This is specifically happening because they're not used to their new height and are stumbling around into machinery made for normal humans /datum/mutation/human/acromegaly/proc/head_bonk(mob/living/parent) SIGNAL_HANDLER -<<<<<<< HEAD - var/turf/airlock_turf = get_turf(parent) - var/atom/movable/whacked_by = locate(/obj/machinery/door/airlock) in airlock_turf || locate(/obj/machinery/door/firedoor) in airlock_turf || locate(/obj/structure/mineral_door) in airlock_turf -======= var/atom/movable/whacked_by = (locate(/obj/machinery/door/airlock) in parent.loc) || (locate(/obj/machinery/door/firedoor) in parent.loc) || (locate(/obj/structure/mineral_door) in parent.loc) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!whacked_by || prob(100 - (8 * GET_MUTATION_SYNCHRONIZER(src)))) return to_chat(parent, span_danger("You hit your head on \the [whacked_by]'s header!")) @@ -197,15 +192,12 @@ /datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/human/owner) if(..()) return -<<<<<<< HEAD // SKYRAT EDIT BEGIN if(owner.dna.features["body_size"] > 1) to_chat(owner, "You feel your body expanding even further, but it feels like your bones are expanding too much!") owner.adjustBruteLoss(25) // take some DAMAGE return // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION) owner.update_transform(1.25) owner.visible_message(span_danger("[owner] suddenly grows!"), span_notice("Everything around you seems to shrink..")) @@ -213,18 +205,14 @@ /datum/mutation/human/gigantism/on_losing(mob/living/carbon/human/owner) if(..()) return -<<<<<<< HEAD // SKYRAT EDIT BEGIN if(owner.dna.features["body_size"] > 1) to_chat(owner, "You feel relief as your bones cease their growth spurt.") - REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION) return // SKYRAT EDIT END -======= REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION) owner.update_transform(0.8) owner.visible_message(span_danger("[owner] suddenly shrinks!"), span_notice("Everything around you seems to grow..")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Clumsiness has a very large amount of small drawbacks depending on item. /datum/mutation/human/clumsy diff --git a/code/datums/mutations/chameleon.dm b/code/datums/mutations/chameleon.dm index 42bc4cdd537..01932fcfc9a 100644 --- a/code/datums/mutations/chameleon.dm +++ b/code/datums/mutations/chameleon.dm @@ -22,7 +22,6 @@ RegisterSignal(owner, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_attack_hand)) /datum/mutation/human/chameleon/on_life(seconds_per_tick, times_fired) -<<<<<<< HEAD /// SKYRAT EDIT BEGIN if(HAS_TRAIT(owner, TRAIT_CHAMELEON_SKIN)) owner.alpha = max(owner.alpha - (12.5 * (GET_MUTATION_POWER(src)) * seconds_per_tick), 0) @@ -66,43 +65,6 @@ /datum/mutation/human/chameleon/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity, list/modifiers) SIGNAL_HANDLER -======= - owner.alpha = max(owner.alpha - (12.5 * (GET_MUTATION_POWER(src)) * seconds_per_tick), 0) - -//Upgraded mutation of the base variant, used for changelings. No instability and better power_coeff -/datum/mutation/human/chameleon/changeling - instability = 0 - power_coeff = 2.5 - locked = TRUE - -/** - * Resets the alpha of the host to the chameleon default if they move. - * - * Arguments: - * - [source][/atom/movable]: The source of the signal. Presumably the host mob. - * - [old_loc][/atom]: The location the host mob used to be in. - * - move_dir: The direction the host mob moved in. - * - forced: Whether the movement was caused by a forceMove or moveToNullspace. - * - [old_locs][/list/atom]: The locations the host mob used to be in. - */ -/datum/mutation/human/chameleon/proc/on_move(atom/movable/source, atom/old_loc, move_dir, forced, list/atom/old_locs) - SIGNAL_HANDLER - - owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY - -/** - * Resets the alpha of the host if they click on something nearby. - * - * Arguments: - * - [source][/mob/living/carbon/human]: The host mob that just clicked on something. - * - [target][/atom]: The thing the host mob clicked on. - * - proximity: Whether the host mob can physically reach the thing that they clicked on. - * - [modifiers][/list]: The set of click modifiers associated with this attack chain call. - */ -/datum/mutation/human/chameleon/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity, list/modifiers) - SIGNAL_HANDLER - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!proximity) //stops tk from breaking chameleon return @@ -118,9 +80,6 @@ return owner.alpha = 255 UnregisterSignal(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_UNARMED_ATTACK)) -<<<<<<< HEAD /// SKYRAT EDIT BEGIN REMOVE_TRAIT(owner, TRAIT_CHAMELEON_SKIN, GENETIC_MUTATION) /// SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index b627536887f..b4e13d888c9 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -113,11 +113,7 @@ return if(!user.throw_mode || user.get_active_held_item() || user.zone_selected != BODY_ZONE_PRECISE_GROIN) return -<<<<<<< HEAD - if(user.grab_state < GRAB_NECK || !iscarbon(user.pulling) || user.buckled || user.incapacitated()) -======= if(user.grab_state < GRAB_NECK || !iscarbon(user.pulling) || user.buckled || user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/mob/living/carbon/possible_throwable = user.pulling @@ -126,12 +122,8 @@ if(ishuman(possible_throwable)) var/mob/living/carbon/human/human_throwable = possible_throwable -<<<<<<< HEAD //if(human_throwable.wear_suit && (human_throwable.wear_suit.flags_inv & HIDEJUMPSUIT)) // ORIGINAL if(human_throwable.wear_suit && (human_throwable.wear_suit.flags_inv & HIDETAIL)) // SKYRAT EDIT CHANGE -======= - if(human_throwable.wear_suit && (human_throwable.wear_suit.flags_inv & HIDEJUMPSUIT)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_warning("You can't reach [human_throwable]'s tail through [human_throwable.p_their()] [human_throwable.wear_suit.name]!")) return @@ -175,11 +167,7 @@ * For each step of the swinging, with the delay getting shorter along the way. Checks to see we still have them in our grasp at each step. */ /datum/mutation/human/hulk/proc/swing_loop(mob/living/carbon/human/the_hulk, mob/living/carbon/yeeted_person, step, original_dir) -<<<<<<< HEAD - if(!yeeted_person || !the_hulk || the_hulk.incapacitated()) -======= if(!yeeted_person || !the_hulk || the_hulk.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(get_dist(the_hulk, yeeted_person) > 1 || !isturf(the_hulk.loc) || !isturf(yeeted_person.loc)) to_chat(the_hulk, span_warning("You lose your grasp on [yeeted_person]!")) @@ -250,11 +238,7 @@ /// Time to toss the victim at high speed /datum/mutation/human/hulk/proc/finish_swing(mob/living/carbon/human/the_hulk, mob/living/carbon/yeeted_person, original_dir) -<<<<<<< HEAD - if(!yeeted_person || !the_hulk || the_hulk.incapacitated()) -======= if(!yeeted_person || !the_hulk || the_hulk.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(get_dist(the_hulk, yeeted_person) > 1 || !isturf(the_hulk.loc) || !isturf(yeeted_person.loc)) to_chat(the_hulk, span_warning("You lose your grasp on [yeeted_person]!")) diff --git a/code/datums/mutations/reach.dm b/code/datums/mutations/reach.dm index 70060673d38..829ed5bded2 100644 --- a/code/datums/mutations/reach.dm +++ b/code/datums/mutations/reach.dm @@ -13,12 +13,7 @@ /datum/mutation/human/telekinesis/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut) ..() if(!(type in visual_indicators)) -<<<<<<< HEAD visual_indicators[type] = list(mutable_appearance('modular_skyrat/master_files/icons/effects/tele_effects.dmi', "telekinesishead", -MUTATIONS_LAYER)) // SKYRAT EDIT CHANGE - ORIGINAL: visual_indicators[type] = list(mutable_appearance('icons/mob/effects/genetics.dmi', "telekinesishead", -MUTATIONS_LAYER)) -======= - visual_indicators[type] = list(mutable_appearance('icons/mob/effects/genetics.dmi', "telekinesishead", -MUTATIONS_LAYER)) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/mutation/human/telekinesis/on_acquiring(mob/living/carbon/human/homan) . = ..() if(.) diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm index 4ee1de6771a..5a8d7458f3d 100644 --- a/code/datums/mutations/sight.dm +++ b/code/datums/mutations/sight.dm @@ -110,11 +110,7 @@ ///X-ray Vision lets you see through walls. /datum/mutation/human/xray name = "X Ray Vision" -<<<<<<< HEAD - desc = "A strange genome that allows the user to see between the spaces of walls." //actual x-ray would mean you'd constantly be blasting rads, wich might be fun for later //hmb -======= desc = "A strange genome that allows the user to see between the spaces of walls." //actual x-ray would mean you'd constantly be blasting rads, which might be fun for later //hmb ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 text_gain_indication = span_notice("The walls suddenly disappear!") instability = POSITIVE_INSTABILITY_MAJOR locked = TRUE diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 369f4e749b7..5862b661004 100644 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -49,8 +49,6 @@ /// Type path of item to go in belt slot var/belt = null -<<<<<<< HEAD -======= /** * list of items that should go in the belt of the user * @@ -58,7 +56,6 @@ */ var/list/belt_contents = null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Type path of item to go in ears slot var/ears = null @@ -229,15 +226,12 @@ if(socks) user.socks = initial(socks.name) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Underwear and bra split if(bra) user.bra = initial(bra.name) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(accessory) var/obj/item/clothing/under/U = user.w_uniform @@ -271,8 +265,6 @@ for(var/i in 1 to number) EQUIP_OUTFIT_ITEM(path, ITEM_SLOT_BACKPACK) -<<<<<<< HEAD -======= if(belt_contents) for(var/path in belt_contents) var/number = belt_contents[path] @@ -281,7 +273,6 @@ for(var/i in 1 to number) EQUIP_OUTFIT_ITEM(path, ITEM_SLOT_BELTPACK) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 post_equip(user, visualsOnly) if(!visualsOnly) @@ -327,7 +318,6 @@ */ /datum/outfit/proc/apply_fingerprints(mob/living/carbon/human/user) if(!istype(user)) -<<<<<<< HEAD return if(user.back) user.back.add_fingerprint(user, ignoregloves = TRUE) @@ -367,80 +357,6 @@ item.add_fingerprint(user, ignoregloves = TRUE) return TRUE -//SKYRAT EDIT -/** - * Copies the outfit from a human to itself. - **/ -/datum/outfit/proc/copy_outfit_from_target(mob/living/carbon/human/H) - if(!istype(H)) - return - if(H.back) - back = H.back.type - if(H.wear_id) - id = H.wear_id.type - if(H.w_uniform) - uniform = H.w_uniform.type - if(H.wear_suit) - suit = H.wear_suit.type - if(H.wear_mask) - mask = H.wear_mask.type - if(H.wear_neck) - neck = H.wear_neck.type - if(H.head) - head = H.head.type - if(H.shoes) - shoes = H.shoes.type - if(H.gloves) - gloves = H.gloves.type - if(H.ears) - ears = H.ears.type - if(H.glasses) - glasses = H.glasses.type - if(H.belt) - belt = H.belt.type - return TRUE -// SKYRAT EDIT END -======= - return - if(user.back) - user.back.add_fingerprint(user, ignoregloves = TRUE) - for(var/obj/item/item in user.back.contents) - item.add_fingerprint(user, ignoregloves = TRUE) - if(user.wear_id) - user.wear_id.add_fingerprint(user, ignoregloves = TRUE) - if(user.w_uniform) - user.w_uniform.add_fingerprint(user, ignoregloves = TRUE) - if(user.wear_suit) - user.wear_suit.add_fingerprint(user, ignoregloves = TRUE) - if(user.wear_mask) - user.wear_mask.add_fingerprint(user, ignoregloves = TRUE) - if(user.wear_neck) - user.wear_neck.add_fingerprint(user, ignoregloves = TRUE) - if(user.head) - user.head.add_fingerprint(user, ignoregloves = TRUE) - if(user.shoes) - user.shoes.add_fingerprint(user, ignoregloves = TRUE) - if(user.gloves) - user.gloves.add_fingerprint(user, ignoregloves = TRUE) - if(user.ears) - user.ears.add_fingerprint(user, ignoregloves = TRUE) - if(user.glasses) - user.glasses.add_fingerprint(user, ignoregloves = TRUE) - if(user.belt) - user.belt.add_fingerprint(user, ignoregloves = TRUE) - for(var/obj/item/item in user.belt.contents) - item.add_fingerprint(user, ignoregloves = TRUE) - if(user.s_store) - user.s_store.add_fingerprint(user, ignoregloves = TRUE) - if(user.l_store) - user.l_store.add_fingerprint(user, ignoregloves = TRUE) - if(user.r_store) - user.r_store.add_fingerprint(user, ignoregloves = TRUE) - for(var/obj/item/item in user.held_items) - item.add_fingerprint(user, ignoregloves = TRUE) - return TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - /// Return a list of all the types that are required to disguise as this outfit type /datum/outfit/proc/get_chameleon_disguise_info() var/list/types = list(uniform, suit, back, belt, gloves, shoes, head, mask, neck, ears, glasses, id, l_pocket, r_pocket, suit_store, r_hand, l_hand) @@ -465,8 +381,6 @@ num_to_load = 1 for(var/i in 1 to num_to_load) preload += type_to_load -<<<<<<< HEAD -======= //Load in belt gear and shit for(var/type_to_load in belt_contents) var/num_to_load = belt_contents[type_to_load] @@ -474,7 +388,6 @@ num_to_load = 1 for(var/i in 1 to num_to_load) preload += type_to_load ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 preload += belt preload += ears preload += glasses @@ -494,11 +407,8 @@ for(var/skillpath in skillchips) preload += skillpath -<<<<<<< HEAD preload -= typesof(/obj/item/clothing/under/color/random) // SKYRAT EDIT - Don't preload random jumpsuit spawners that delete themselves -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return preload /// Return a json list of this outfit @@ -554,10 +464,7 @@ l_hand = target.l_hand internals_slot = target.internals_slot backpack_contents = target.backpack_contents -<<<<<<< HEAD -======= belt_contents = target.belt_contents ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 box = target.box implants = target.implants accessory = target.accessory diff --git a/code/datums/pod_style.dm b/code/datums/pod_style.dm index 83dd90df9f0..8888048980c 100644 --- a/code/datums/pod_style.dm +++ b/code/datums/pod_style.dm @@ -67,11 +67,7 @@ /datum/pod_style/missile name = "cruise missile" ui_name = "Missile" -<<<<<<< HEAD - desc = "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible." -======= desc = "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxiliary payload hatch on the side, though manually opening it is likely impossible." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 shape = POD_SHAPE_OTHER icon_state = "missile" has_door = FALSE @@ -83,11 +79,7 @@ /datum/pod_style/missile/syndicate name = "\improper Syndicate cruise missile" ui_name = "Syndie Missile" -<<<<<<< HEAD - desc = "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible." -======= desc = "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxiliary payload hatch on the side, though manually opening it is likely impossible." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "smissile" id = "syndie_missile" diff --git a/code/datums/quirks/_quirk.dm b/code/datums/quirks/_quirk.dm index b5e79b888aa..4e11099989c 100644 --- a/code/datums/quirks/_quirk.dm +++ b/code/datums/quirks/_quirk.dm @@ -28,11 +28,7 @@ var/abstract_parent_type = /datum/quirk /// The icon to show in the preferences menu. /// This references a tgui icon, so it can be FontAwesome or a tgfont (with a tg- prefix). -<<<<<<< HEAD var/icon = "bug" //SKYRAT EDIT CHANGE -======= - var/icon ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A lazylist of items people can receive from mail who have this quirk enabled /// The base weight for the each quirk's mail goodies list to be selected is 5 /// then the item selected is determined by pick(selected_quirk.mail_goodies) @@ -207,7 +203,6 @@ */ /mob/living/proc/get_quirk_string(medical = FALSE, category = CAT_QUIRK_ALL, from_scan = FALSE) var/list/dat = list() -<<<<<<< HEAD // SKYRAT EDIT ADDITION START // The health analyzer will first check if the target is a changeling, and if they are, load the quirks of the person they're disguising as. @@ -220,9 +215,6 @@ // SKYRAT EDIT END for(var/datum/quirk/candidate as anything in target_quirks) // SKYRAT EDIT CHANGE - ORIGINAL : for(var/datum/quirk/candidate as anything in quirks) -======= - for(var/datum/quirk/candidate as anything in quirks) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(from_scan & candidate.quirk_flags & QUIRK_HIDE_FROM_SCAN) continue switch(category) diff --git a/code/datums/quirks/_quirk_constant_data.dm b/code/datums/quirks/_quirk_constant_data.dm index 2b24351a783..34bde6d9883 100644 --- a/code/datums/quirks/_quirk_constant_data.dm +++ b/code/datums/quirks/_quirk_constant_data.dm @@ -35,11 +35,7 @@ GLOBAL_LIST_INIT_TYPED(all_quirk_constant_data, /datum/quirk_constant_data, gene /datum/quirk_constant_data/New() . = ..() -<<<<<<< HEAD - ASSERT(abstract_type != type && !isnull(associated_typepath), "associated_typepath null - please set it! occured on: [src.type]") -======= ASSERT(abstract_type != type && !isnull(associated_typepath), "associated_typepath null - please set it! occurred on: [src.type]") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Returns a list of savefile_keys derived from the preference typepaths in [customization_options]. Used in quirks middleware to supply the preferences to render. /datum/quirk_constant_data/proc/get_customization_data() @@ -51,11 +47,7 @@ GLOBAL_LIST_INIT_TYPED(all_quirk_constant_data, /datum/quirk_constant_data, gene var/datum/preference/pref_instance = GLOB.preference_entries[pref_type] if (isnull(pref_instance)) stack_trace("get_customization_data was called before instantiation of [pref_type]!") -<<<<<<< HEAD - continue // just in case its a fluke and its only this one thats not instantiated, we'll check the other pref entries -======= continue // just in case its a fluke and its only this one that's not instantiated, we'll check the other pref entries ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 customization_data += pref_instance.savefile_key diff --git a/code/datums/quirks/negative_quirks/claustrophobia.dm b/code/datums/quirks/negative_quirks/claustrophobia.dm index 994c0135730..95a75102b28 100644 --- a/code/datums/quirks/negative_quirks/claustrophobia.dm +++ b/code/datums/quirks/negative_quirks/claustrophobia.dm @@ -1,10 +1,6 @@ /datum/quirk/claustrophobia name = "Claustrophobia" -<<<<<<< HEAD - desc = "You are terrified of small spaces. If you are placed inside any container, locker, or machinery, a panic attack sets in and you struggle to breathe." // SKYRAT EDIT CHANGE - ORIGINAL: desc = "You are terrified of small spaces and certain jolly figures. If you are placed inside any container, locker, or machinery, a panic attack sets in and you struggle to breathe." -======= desc = "You are terrified of small spaces and certain jolly figures. If you are placed inside any container, locker, or machinery, a panic attack sets in and you struggle to breathe." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = FA_ICON_BOX_OPEN value = -4 medical_record_text = "Patient demonstrates a fear of tight spaces." @@ -24,18 +20,12 @@ var/nick_spotted = FALSE -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/mob/living/carbon/human/possible_claus in view(5, quirk_holder)) if(evaluate_jolly_levels(possible_claus)) nick_spotted = TRUE break -<<<<<<< HEAD SKYRAT EDIT REMOVAL END */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!nick_spotted && isturf(quirk_holder.loc)) quirk_holder.clear_mood_event("claustrophobia") diff --git a/code/datums/quirks/negative_quirks/cursed.dm b/code/datums/quirks/negative_quirks/cursed.dm index b5738b6110a..4b99ff850b8 100644 --- a/code/datums/quirks/negative_quirks/cursed.dm +++ b/code/datums/quirks/negative_quirks/cursed.dm @@ -1,8 +1,5 @@ -<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/quirk/cursed name = "Cursed" desc = "You are cursed with bad luck. You are much more likely to suffer from accidents and mishaps. When it rains, it pours." @@ -16,8 +13,5 @@ /datum/quirk/cursed/add(client/client_source) quirk_holder.AddComponent(/datum/component/omen/quirk) -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/quirks/neutral_quirks/colorist.dm b/code/datums/quirks/neutral_quirks/colorist.dm index c59fe7ee081..f82fd5bf6fe 100644 --- a/code/datums/quirks/neutral_quirks/colorist.dm +++ b/code/datums/quirks/neutral_quirks/colorist.dm @@ -1,7 +1,4 @@ -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/quirk/item_quirk/colorist name = "Colorist" desc = "You like carrying around a hair dye spray to quickly apply color patterns to your hair." @@ -12,8 +9,5 @@ /datum/quirk/item_quirk/colorist/add_unique(client/client_source) give_item_to_holder(/obj/item/dyespray, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK, LOCATION_HANDS = ITEM_SLOT_HANDS)) -<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/datums/quirks/neutral_quirks/transhumanist.dm b/code/datums/quirks/neutral_quirks/transhumanist.dm index 523bd913af8..aa8ae075df3 100644 --- a/code/datums/quirks/neutral_quirks/transhumanist.dm +++ b/code/datums/quirks/neutral_quirks/transhumanist.dm @@ -127,17 +127,10 @@ else if(isorgan(new_part)) var/obj/item/organ/new_organ = new_part old_part = human_holder.get_organ_slot(new_organ.slot) -<<<<<<< HEAD - if(new_organ.Insert(human_holder, special = TRUE)) - old_part.moveToNullspace() - STOP_PROCESSING(SSobj, old_part) - slot_string = new_organ.name -======= new_organ.Insert(human_holder, special = TRUE) old_part.moveToNullspace() STOP_PROCESSING(SSobj, old_part) slot_string = new_organ.name ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/quirk/transhumanist/post_add() if(!slot_string) diff --git a/code/datums/quirks/positive_quirks/empath.dm b/code/datums/quirks/positive_quirks/empath.dm index 57f10c08c9e..3379f8a97c4 100644 --- a/code/datums/quirks/positive_quirks/empath.dm +++ b/code/datums/quirks/positive_quirks/empath.dm @@ -2,11 +2,7 @@ name = "Empath" desc = "Whether it's a sixth sense or careful study of body language, it only takes you a quick glance at someone to understand how they feel." icon = FA_ICON_SMILE_BEAM -<<<<<<< HEAD value = 6 // SKYRAT EDIT CHANGE - Quirk Rebalance - Original: value = 8 -======= - value = 8 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mob_trait = TRAIT_EMPATH gain_text = span_notice("You feel in tune with those around you.") lose_text = span_danger("You feel isolated from others.") diff --git a/code/datums/quirks/positive_quirks/settler.dm b/code/datums/quirks/positive_quirks/settler.dm index b4bede4c1d3..37eff5cb03a 100644 --- a/code/datums/quirks/positive_quirks/settler.dm +++ b/code/datums/quirks/positive_quirks/settler.dm @@ -25,14 +25,10 @@ /datum/quirk/item_quirk/settler/add(client/client_source) var/mob/living/carbon/human/human_quirkholder = quirk_holder -<<<<<<< HEAD //SKYRAT EDIT BEGIN - This is so Teshari don't get the height decrease. if(!isteshari(human_quirkholder)) human_quirkholder.set_mob_height(HUMAN_HEIGHT_SHORTEST) //SKYRAT EDIT END -======= - human_quirkholder.set_mob_height(HUMAN_HEIGHT_SHORTEST) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 human_quirkholder.add_movespeed_modifier(/datum/movespeed_modifier/settler) human_quirkholder.physiology.hunger_mod *= 0.5 //good for you, shortass, you don't get hungry nearly as often human_quirkholder.add_traits(settler_traits, QUIRK_TRAIT) diff --git a/code/datums/quirks/positive_quirks/spacer.dm b/code/datums/quirks/positive_quirks/spacer.dm index fbdcb8ae945..24f25c32e8a 100644 --- a/code/datums/quirks/positive_quirks/spacer.dm +++ b/code/datums/quirks/positive_quirks/spacer.dm @@ -4,21 +4,13 @@ /datum/quirk/spacer_born name = "Spacer" desc = "You were born in space, and have never known the comfort of a planet's gravity. Your body has adapted to this. \ -<<<<<<< HEAD - You are more comfortable in zero and artifical gravity and are more resistant to the effects of space, \ -======= You are more comfortable in zero and artificial gravity and are more resistant to the effects of space, \ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 but travelling to a planet's surface for an extended period of time will make you feel sick." gain_text = span_notice("You feel at home in space.") lose_text = span_danger("You feel homesick.") icon = FA_ICON_USER_ASTRONAUT value = 7 -<<<<<<< HEAD quirk_flags = QUIRK_CHANGES_APPEARANCE //SKYRAT EDIT CHANGE - ORIGINAL: quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_CHANGES_APPEARANCE -======= - quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_CHANGES_APPEARANCE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 medical_record_text = "Patient is well-adapted to non-terrestrial environments." mail_goodies = list( /obj/item/storage/pill_bottle/ondansetron, diff --git a/code/datums/quirks/positive_quirks/spiritual.dm b/code/datums/quirks/positive_quirks/spiritual.dm index ad4d1482da2..b08fe8b60c6 100644 --- a/code/datums/quirks/positive_quirks/spiritual.dm +++ b/code/datums/quirks/positive_quirks/spiritual.dm @@ -2,11 +2,7 @@ name = "Spiritual" desc = "You hold a spiritual belief, whether in God, nature or the arcane rules of the universe. You gain comfort from the presence of holy people, and believe that your prayers are more special than others. Being in the chapel makes you happy." icon = FA_ICON_BIBLE -<<<<<<< HEAD value = 2 /// SKYRAT EDIT - Quirk Rebalance - Original: value = 4 -======= - value = 4 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mob_trait = TRAIT_SPIRITUAL gain_text = span_notice("You have faith in a higher power.") lose_text = span_danger("You lose faith!") diff --git a/code/datums/records/manifest.dm b/code/datums/records/manifest.dm index d71a26b0dc7..ddb92ea7629 100644 --- a/code/datums/records/manifest.dm +++ b/code/datums/records/manifest.dm @@ -15,11 +15,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) if(readied_player.new_character) log_manifest(readied_player.ckey, readied_player.new_character.mind, readied_player.new_character) if(ishuman(readied_player.new_character)) -<<<<<<< HEAD inject(readied_player.new_character, readied_player.client) // SKYRAT EDIT - RP Records - ORIGINAL: inject(readied_player.new_character) -======= - inject(readied_player.new_character) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CHECK_TICK /// Gets the current manifest. @@ -102,11 +98,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) /// Injects a record into the manifest. -<<<<<<< HEAD /datum/manifest/proc/inject(mob/living/carbon/human/person, client/person_client) // SKYRAT EDIT - RP Records - ORIGINAL: /datum/manifest/proc/inject(mob/living/carbon/human/person) -======= -/datum/manifest/proc/inject(mob/living/carbon/human/person) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set waitfor = FALSE if(!(person.mind?.assigned_role.job_flags & JOB_CREW_MANIFEST)) return @@ -124,7 +116,6 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) var/datum/dna/stored/record_dna = new() person.dna.copy_dna(record_dna) -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - ALTERNATIVE_JOB_TITLES // The alt job title, if user picked one, or the default var/chosen_assignment = person_client?.prefs.alt_job_titles[assignment] || assignment @@ -133,10 +124,6 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) var/datum/record/locked/lockfile = new( age = person.age, chrono_age = person.chrono_age, // SKYRAT EDIT ADDITION - Chronological age -======= - var/datum/record/locked/lockfile = new( - age = person.age, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_type = record_dna.blood_type, character_appearance = character_appearance, dna_string = record_dna.unique_enzymes, @@ -144,11 +131,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) gender = person_gender, initial_rank = assignment, name = person.real_name, -<<<<<<< HEAD rank = chosen_assignment, // SKYRAT EDIT - Alt job titles - ORIGINAL: rank = assignment, -======= - rank = assignment, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 species = record_dna.species.name, trim = assignment, // Locked specifics @@ -158,10 +141,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) new /datum/record/crew( age = person.age, -<<<<<<< HEAD chrono_age = person.chrono_age, // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_type = record_dna.blood_type, character_appearance = character_appearance, dna_string = record_dna.unique_enzymes, @@ -169,11 +149,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) gender = person_gender, initial_rank = assignment, name = person.real_name, -<<<<<<< HEAD rank = chosen_assignment, // SKYRAT EDIT - Alt job titles - ORIGINAL: rank = assignment, -======= - rank = assignment, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 species = record_dna.species.name, trim = assignment, // Crew specific @@ -183,7 +159,6 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) minor_disabilities = person.get_quirk_string(FALSE, CAT_QUIRK_MINOR_DISABILITY, from_scan = TRUE), minor_disabilities_desc = person.get_quirk_string(TRUE, CAT_QUIRK_MINOR_DISABILITY), quirk_notes = person.get_quirk_string(TRUE, CAT_QUIRK_NOTES), -<<<<<<< HEAD // SKYRAT EDIT START - RP Records background_information = person_client?.prefs.read_preference(/datum/preference/text/background) || "", exploitable_information = person_client?.prefs.read_preference(/datum/preference/text/exploitable) || "", @@ -191,8 +166,6 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) past_medical_records = person_client?.prefs.read_preference(/datum/preference/text/medical) || "", past_security_records = person_client?.prefs.read_preference(/datum/preference/text/security) || "", // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /// Edits the rank and trim of the found record. diff --git a/code/datums/records/record.dm b/code/datums/records/record.dm index 53d972b341e..7c1e6be5568 100644 --- a/code/datums/records/record.dm +++ b/code/datums/records/record.dm @@ -29,10 +29,7 @@ /datum/record/New( age = 18, -<<<<<<< HEAD chrono_age = 18, // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_type = "?", character_appearance, dna_string = "Unknown", @@ -46,10 +43,7 @@ voice = "?????", ) src.age = age -<<<<<<< HEAD src.chrono_age = chrono_age // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 src.blood_type = blood_type src.character_appearance = character_appearance src.dna_string = dna_string @@ -97,10 +91,7 @@ /datum/record/crew/New( age = 18, -<<<<<<< HEAD chrono_age = 18, // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_type = "?", character_appearance, dna_string = "Unknown", @@ -120,7 +111,6 @@ physical_status = PHYSICAL_ACTIVE, mental_status = MENTAL_STABLE, quirk_notes, -<<<<<<< HEAD // SKYRAT EDIT START - RP Records background_information = "", exploitable_information = "", @@ -128,8 +118,6 @@ past_medical_records = "", past_security_records = "", // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) . = ..() src.lock_ref = lock_ref @@ -140,7 +128,6 @@ src.physical_status = physical_status src.mental_status = mental_status src.quirk_notes = quirk_notes -<<<<<<< HEAD // SKYRAT EDIT START - RP Records src.background_information = background_information src.exploitable_information = exploitable_information @@ -148,8 +135,6 @@ src.past_medical_records = past_medical_records src.past_security_records = past_security_records // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.manifest.general += src @@ -171,10 +156,7 @@ /datum/record/locked/New( age = 18, -<<<<<<< HEAD chrono_age = 18, // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_type = "?", character_appearance, dna_string = "Unknown", @@ -286,16 +268,12 @@ var/final_paper_text = "
SR-[print_count]: [header]

" final_paper_text += "Name: [name]
Gender: [gender]
Age: [age]
" -<<<<<<< HEAD final_paper_text += "Chronological Age: [chrono_age]
" // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(alias != name) final_paper_text += "Alias: [alias]
" final_paper_text += "Species: [species]
Fingerprint: [fingerprint]
Wanted Status: [wanted_status]

" -<<<<<<< HEAD //SKYRAT EDIT ADD - RP RECORDS if(past_general_records != "") final_paper_text += "
General Records:" @@ -309,10 +287,6 @@ final_paper_text += "
[past_security_records]
" //SKYRAT EDIT END -======= - final_paper_text += "
Security Data


" - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 final_paper_text += "Crimes:
" final_paper_text += {" @@ -358,14 +332,10 @@ final_paper_text += "- [description]
" printed_paper.name = "SR-[print_count] '[name]'" -<<<<<<< HEAD /// SKYRAT EDIT ADD - TRUE printed_paper.add_raw_text(final_paper_text,TRUE) /// SKYRAT EDIT ADD END -======= - printed_paper.add_raw_text(final_paper_text) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 printed_paper.update_appearance() return printed_paper diff --git a/code/datums/ruins/icemoon.dm b/code/datums/ruins/icemoon.dm index 874a9835dc0..f75b99876b8 100644 --- a/code/datums/ruins/icemoon.dm +++ b/code/datums/ruins/icemoon.dm @@ -48,8 +48,6 @@ id = "abandoned_homestead" description = "This homestead was once host to a happy homesteading family. It's now host to hungry bears." suffix = "icemoon_underground_abandoned_homestead.dmm" -<<<<<<< HEAD -======= /datum/map_template/ruin/icemoon/entemology name = "Ice-Ruin Insect Research Station" @@ -76,7 +74,6 @@ suffix = "icemoon_surface_smoking_room.dmm" // above and below ground together ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/map_template/ruin/icemoon/entemology name = "Ice-Ruin Insect Research Station" diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index d8e4cda86ec..26981c4b176 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -179,11 +179,7 @@ /datum/map_template/ruin/space/spacehotel id = "spacehotel" -<<<<<<< HEAD suffix = "spacehotel_skyrat.dmm" // SKYRAT EDIT CHANGE - ORIGINAL: suffix = "spacehotel.dmm" -======= - suffix = "spacehotel.dmm" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Space-Ruin The Twin-Nexus Hotel" description = "An interstellar hotel, where the weary spaceman can rest their head and relax, assured that the residental staff will not murder them in their sleep. Probably." @@ -290,7 +286,6 @@ // SKYRAT EDIT CHANGE START -- Reworked whiteship ruin /* SKYRAT EDIT CHANGE -- ORIGINAL COMMENTED OUT /datum/map_template/ruin/space/whiteshipruin_box -<<<<<<< HEAD id = "whiteshipruin_box" suffix = "whiteshipruin_box.dmm"*/ @@ -298,10 +293,6 @@ suffix = "whiteshipruin_box.dmm"*/ id = "whiteshipruin_box_skyrat" suffix = "whiteshipruin_box_skyrat.dmm" // SKYRAT EDIT CHANGE END -======= - id = "whiteshipruin_box" - suffix = "whiteshipruin_box.dmm" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Space-Ruin NT Medical Ship" description = "An ancient ship, said to be among the first discovered derelicts near Space Station 13 that was still in working order. \ Aged and deprecated by time, this relic of a vessel is now broken beyond repair." diff --git a/code/datums/shuttles/emergency.dm b/code/datums/shuttles/emergency.dm index b8e6865511b..4c1dd016680 100644 --- a/code/datums/shuttles/emergency.dm +++ b/code/datums/shuttles/emergency.dm @@ -1,10 +1,6 @@ #define EMAG_LOCKED_SHUTTLE_COST (CARGO_CRATE_VALUE * 50) -<<<<<<< HEAD /datum/map_template/shuttle/emergency // SKYRAT EDIT OVERRIDE - OVERRIDDEN IN ADVANCED_SHUTTLES - shuttles.dm -======= -/datum/map_template/shuttle/emergency ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 port_id = "emergency" name = "Base Shuttle Template (Emergency)" ///assoc list of shuttle events to add to this shuttle on spawn (typepath = weight) @@ -134,10 +130,7 @@ credit_cost = EMAG_LOCKED_SHUTTLE_COST * 1.8 movement_force = list("KNOCKDOWN" = 3, "THROW" = 5) occupancy_limit = "70" -<<<<<<< HEAD who_can_purchase = null //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/map_template/shuttle/emergency/luxury suffix = "luxury" diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm index c88b2a9ee53..35fd07ff3bc 100644 --- a/code/datums/sprite_accessories.dm +++ b/code/datums/sprite_accessories.dm @@ -34,11 +34,6 @@ * This is the source that this accessory will get its color from. Default is MUTCOLOR, but can also be HAIR, FACEHAIR, EYECOLOR and 0 if none. */ var/color_src = MUTANT_COLOR -<<<<<<< HEAD - /// Decides if this sprite has an "inner" part, such as the fleshy parts on ears. - var/hasinner = FALSE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Is this part locked from roundstart selection? Used for parts that apply effects. var/locked = FALSE /// Should we center the sprite? @@ -1896,16 +1891,8 @@ /datum/sprite_accessory/ears/cat name = "Cat" icon_state = "cat" -<<<<<<< HEAD - hasinner = TRUE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 color_src = HAIR_COLOR -/datum/sprite_accessory/ears/cat/big - name = "Big" - icon_state = "big" - /datum/sprite_accessory/ears/cat/miqo name = "Coeurl" icon_state = "miqo" @@ -1926,10 +1913,6 @@ icon = 'icons/mob/human/fox_features.dmi' name = "Fox" icon_state = "fox" -<<<<<<< HEAD - hasinner = TRUE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 color_src = HAIR_COLOR locked = TRUE @@ -2092,13 +2075,6 @@ icon = 'icons/mob/human/species/lizard/lizard_spines.dmi' em_block = TRUE -<<<<<<< HEAD -/datum/sprite_accessory/spines/none - name = SPRITE_ACCESSORY_NONE - icon_state = "none" - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/sprite_accessory/tail_spines icon = 'icons/mob/human/species/lizard/lizard_spines.dmi' em_block = TRUE @@ -2143,19 +2119,6 @@ name = "Aquatic" icon_state = "aqua" -<<<<<<< HEAD -/datum/sprite_accessory/legs //legs are a special case, they aren't actually sprite_accessories but are updated with them. - icon = null //These datums exist for selecting legs on preference, and little else - em_block = TRUE - -/datum/sprite_accessory/legs/none - name = "Normal Legs" - -/datum/sprite_accessory/legs/digitigrade_lizard - name = DIGITIGRADE_LEGS - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/sprite_accessory/caps icon = 'icons/mob/human/species/mush_cap.dmi' color_src = HAIR_COLOR diff --git a/code/datums/station_alert.dm b/code/datums/station_alert.dm index ff4a00d51dd..4c5f3ca7c51 100644 --- a/code/datums/station_alert.dm +++ b/code/datums/station_alert.dm @@ -61,11 +61,7 @@ data["alarms"] += list(nominal_category) return data -<<<<<<< HEAD -/datum/station_alert/ui_act(action, params) -======= /datum/station_alert/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/datums/station_traits/_station_trait.dm b/code/datums/station_traits/_station_trait.dm index f4e89b6b256..bae9540fa25 100644 --- a/code/datums/station_traits/_station_trait.dm +++ b/code/datums/station_traits/_station_trait.dm @@ -92,10 +92,7 @@ GLOBAL_LIST_EMPTY(lobby_station_traits) /datum/station_trait/proc/can_display_lobby_button(client/player) return sign_up_button && !SSticker.HasRoundStarted() -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Apply any additional handling we need to our lobby button /datum/station_trait/proc/setup_lobby_button(atom/movable/screen/lobby/button/sign_up/lobby_button) SHOULD_CALL_PARENT(TRUE) @@ -120,10 +117,7 @@ GLOBAL_LIST_EMPTY(lobby_station_traits) /datum/station_trait/proc/on_lobby_button_destroyed(atom/movable/screen/lobby/button/sign_up/lobby_button) SIGNAL_HANDLER lobby_buttons -= lobby_button -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Proc ran when round starts. Use this for roundstart effects. By default we clean up our buttons here. /datum/station_trait/proc/on_round_start() diff --git a/code/datums/station_traits/job_traits.dm b/code/datums/station_traits/job_traits.dm index 0236d476004..4ac95ced846 100644 --- a/code/datums/station_traits/job_traits.dm +++ b/code/datums/station_traits/job_traits.dm @@ -29,11 +29,7 @@ SSstation.antag_restricted_roles += job_to_add::title blacklist += subtypesof(/datum/station_trait/job) - type // All but ourselves RegisterSignal(SSdcs, COMSIG_GLOB_PRE_JOBS_ASSIGNED, PROC_REF(pre_jobs_assigned)) -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/station_trait/job/setup_lobby_button(atom/movable/screen/lobby/button/sign_up/lobby_button) RegisterSignal(lobby_button, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_lobby_button_update_overlays)) lobby_button.desc = button_desc @@ -55,11 +51,7 @@ /datum/station_trait/job/proc/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) SIGNAL_HANDLER overlays += LAZYFIND(lobby_candidates, lobby_button.get_mob()) ? "tick" : "cross" -<<<<<<< HEAD */ -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Called before we start assigning roles, assign ours first /datum/station_trait/job/proc/pre_jobs_assigned() SIGNAL_HANDLER @@ -97,18 +89,11 @@ . = ..() RegisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(replace_cargo)) -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL /datum/station_trait/job/cargorilla/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) . = ..() overlays += LAZYFIND(lobby_candidates, lobby_button.get_mob()) ? "gorilla_on" : "gorilla_off" */ -======= -/datum/station_trait/job/cargorilla/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) - . = ..() - overlays += LAZYFIND(lobby_candidates, lobby_button.get_mob()) ? "gorilla_on" : "gorilla_off" - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Remove the cargo equipment and personnel that are being replaced by a gorilla. /datum/station_trait/job/cargorilla/proc/replace_cargo(datum/source) SIGNAL_HANDLER @@ -137,19 +122,11 @@ /datum/station_trait/job/bridge_assistant/New() . = ..() RegisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(add_coffeemaker)) -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL /datum/station_trait/job/bridge_assistant/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) . = ..() overlays += "bridge_assistant" */ -======= - -/datum/station_trait/job/bridge_assistant/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) - . = ..() - overlays += "bridge_assistant" - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Creates a coffeemaker in the bridge, if we don't have one yet. /datum/station_trait/job/bridge_assistant/proc/add_coffeemaker(datum/source) SIGNAL_HANDLER @@ -196,17 +173,11 @@ can_roll_antag = CAN_ROLL_PROTECTED job_to_add = /datum/job/veteran_advisor -<<<<<<< HEAD /* SKYRAT EDIT -- REMOVAL -- We handle the lobby a bit differently for time being /datum/station_trait/job/veteran_advisor/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) . = ..() overlays += "veteran_advisor" */ -======= -/datum/station_trait/job/veteran_advisor/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) - . = ..() - overlays += "veteran_advisor" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/station_trait/job/human_ai name = "Human AI" @@ -229,17 +200,11 @@ UnregisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE) return ..() -<<<<<<< HEAD /* SKYRAT EDIT - REMOVAL /datum/station_trait/job/human_ai/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) . = ..() overlays += LAZYFIND(lobby_candidates, lobby_button.get_mob()) ? "human_ai_on" : "human_ai_off" */ -======= -/datum/station_trait/job/human_ai/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) - . = ..() - overlays += LAZYFIND(lobby_candidates, lobby_button.get_mob()) ? "human_ai_on" : "human_ai_off" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/station_trait/job/human_ai/proc/remove_ai_job(datum/source) SIGNAL_HANDLER diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm index 39485e37380..14300bedf59 100644 --- a/code/datums/station_traits/negative_traits.dm +++ b/code/datums/station_traits/negative_traits.dm @@ -507,14 +507,11 @@ var/list/shielding = list() /datum/station_trait/nebula/hostile/process(seconds_per_tick) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(!storms_enabled) get_shielding_level() // So shields still produce tritium return // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 calculate_nebula_strength() apply_nebula_effect(nebula_intensity - get_shielding_level()) @@ -580,11 +577,7 @@ threat_reduction = 30 dynamic_threat_id = "Radioactive Nebula" -<<<<<<< HEAD intensity_increment_time = 10 MINUTES // SKYRAT EDIT longer shield duration - ORIGINAL: intensity_increment_time = 5 MINUTES / -======= - intensity_increment_time = 5 MINUTES ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 maximum_nebula_intensity = 1 HOURS + 40 MINUTES nebula_layer = /atom/movable/screen/parallax_layer/random/space_gas/radioactive @@ -706,10 +699,7 @@ new /obj/effect/pod_landingzone (get_safe_random_station_turf(), new /obj/structure/closet/supplypod/centcompod (), new /obj/machinery/nebula_shielding/emergency/radiation ()) /datum/station_trait/nebula/hostile/radiation/send_instructions() -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - No more radiation storms on station -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/machinery/nebula_shielding/shielder = /obj/machinery/nebula_shielding/radiation var/obj/machinery/gravity_generator/main/innate_shielding = /obj/machinery/gravity_generator/main //How long do we have untill the first shielding unit needs to be up? @@ -728,15 +718,12 @@ You have [deadline] before the nebula enters the station. \ Every shielding unit will provide an additional [shielder_time] of protection, fully protecting the station with [max_shielders] shielding units. "} -<<<<<<< HEAD SKYRAT EDIT REMOVAL END */ // SKYRAT EDIT CHANGE START - ORIGINAL: See above var/announcement = {"Your station has been constructed inside a radioactive nebula. \ Standard spacesuits will not protect against the nebula and using them is strongly discouraged. "} // SKYRAT EDIT CHANGE END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 priority_announce(announcement, sound = 'sound/misc/notice1.ogg') diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm index 18db6ef37f4..74a8e542400 100644 --- a/code/datums/station_traits/neutral_traits.dm +++ b/code/datums/station_traits/neutral_traits.dm @@ -396,10 +396,6 @@ targets += pick_n_take(roundstart_closets) GLOB.eigenstate_manager.create_new_link(targets) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define PRO_SKUB "pro-skub" #define ANTI_SKUB "anti-skub" #define SKUB_IDFC "i don't frikkin' care" @@ -419,10 +415,7 @@ . = ..() RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, PROC_REF(on_job_after_spawn)) -<<<<<<< HEAD /* SKYRAT EDIT -- REMOVAL -- I swear, we need to update our UI in near future to account for the new buttons and shit -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/station_trait/skub/setup_lobby_button(atom/movable/screen/lobby/button/sign_up/lobby_button) RegisterSignal(lobby_button, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_lobby_button_update_overlays)) lobby_button.desc = "Are you pro-skub or anti-skub? Click to cycle through pro-skub, anti-skub, random and neutral." @@ -477,11 +470,7 @@ overlays += "neutral_skub" if(RANDOM_SKUB) overlays += "random_skub" -<<<<<<< HEAD */ -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/station_trait/skub/proc/on_job_after_spawn(datum/source, datum/job/job, mob/living/spawned, client/player_client) SIGNAL_HANDLER @@ -490,11 +479,7 @@ return if((skub_stance == RANDOM_SKUB && prob(50)) || skub_stance == PRO_SKUB) -<<<<<<< HEAD - var/obj/item/storage/box/skub/boxie = new(spawned.loc) -======= var/obj/item/storage/box/stickers/skub/boxie = new(spawned.loc) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 spawned.equip_to_slot_if_possible(boxie, ITEM_SLOT_BACKPACK, indirect_action = TRUE) if(ishuman(spawned)) var/obj/item/clothing/suit/costume/wellworn_shirt/skub/shirt = new(spawned.loc) @@ -511,19 +496,6 @@ shirt.forceMove(boxie) /// A box containing a skub, for easier carry because skub is a bulky item. -<<<<<<< HEAD -/obj/item/storage/box/skub - name = "skub box" - desc = "A box to store your skub and pro-skub shirt in. A label on the back reads: \"Skubtide, Stationwide\"." - icon_state = "hugbox" - illustration = "skub" - -/obj/item/storage/box/skub/Initialize(mapload) - . = ..() - atom_storage.exception_hold = typecacheof(list(/obj/item/skub, /obj/item/clothing/suit/costume/wellworn_shirt/skub)) - -/obj/item/storage/box/skub/PopulateContents() -======= /obj/item/storage/box/stickers/skub name = "skub fan pack" desc = "A vinyl pouch to store your skub and pro-skub shirt in. A label on the back reads: \"Skubtide, Stationwide\"." @@ -537,21 +509,15 @@ atom_storage.exception_hold = typecacheof(list(/obj/item/skub, /obj/item/clothing/suit/costume/wellworn_shirt/skub)) /obj/item/storage/box/stickers/skub/PopulateContents() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/skub(src) new /obj/item/sticker/skub(src) new /obj/item/sticker/skub(src) /obj/item/storage/box/stickers/anti_skub -<<<<<<< HEAD - name = "anti-skub stickers box" - desc = "The enemy may have been given a skub and a shirt, but I've more stickers! Plus the box can hold my anti-skub shirt." -======= name = "anti-skub stickers pack" desc = "The enemy may have been given a skub and a shirt, but I've got more stickers! Plus the pack can hold my anti-skub shirt." icon_state = "skubpack" illustration = "label_anti_skub" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/stickers/anti_skub/Initialize(mapload) . = ..() diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index c6183c95073..dfa4fc2ce9c 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -293,7 +293,6 @@ /datum/job/shaft_miner = /obj/item/organ/internal/monster_core/rush_gland, /datum/job/station_engineer = /obj/item/organ/internal/cyberimp/arm/toolset, /datum/job/warden = /obj/item/organ/internal/cyberimp/eyes/hud/security, -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - MODULAR JOBS /datum/job/blueshield = /obj/item/organ/internal/cyberimp/brain/anti_stun, /datum/job/nanotrasen_consultant = /obj/item/organ/internal/heart/cybernetic/tier3, @@ -306,8 +305,6 @@ /datum/job/engineering_guard = /obj/item/organ/internal/cyberimp/arm/flash, /datum/job/telecomms_specialist = /obj/item/organ/internal/ears/cybernetic/xray, // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /datum/station_trait/cybernetic_revolution/New() diff --git a/code/datums/status_effects/debuffs/debuffs.dm b/code/datums/status_effects/debuffs/debuffs.dm index 51b1e003e77..7f451efd90c 100644 --- a/code/datums/status_effects/debuffs/debuffs.dm +++ b/code/datums/status_effects/debuffs/debuffs.dm @@ -1,20 +1,11 @@ /// The damage healed per tick while sleeping without any modifiers #define HEALING_SLEEP_DEFAULT 0.2 -<<<<<<< HEAD -/// The sleep healing multipler for organ passive healing (since organs heal slowly) -#define HEALING_SLEEP_ORGAN_MULTIPLIER 5 -/// The sleep multipler for fitness xp conversion -#define SLEEP_QUALITY_WORKOUT_MULTIPLER 10 - -//Largely negative status effects go here, even if they have small benificial effects -======= /// The sleep healing multiplier for organ passive healing (since organs heal slowly) #define HEALING_SLEEP_ORGAN_MULTIPLIER 5 /// The sleep multiplier for fitness xp conversion #define SLEEP_QUALITY_WORKOUT_MULTIPLER 10 //Largely negative status effects go here, even if they have small beneficial effects ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //STUN EFFECTS /datum/status_effect/incapacitating tick_interval = -1 @@ -289,12 +280,8 @@ . = ..() if(!.) return -<<<<<<< HEAD owner.add_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS, TRAIT_ANALGESIA), TRAIT_STATUS_EFFECT(id)) // SKYRAT EDIT CHANGE - ORIGINAL: owner.add_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS), TRAIT_STATUS_EFFECT(id)) owner.throw_alert("stasis numbed", /atom/movable/screen/alert/numbed) //SKYRAT EDIT ADDITION - STASIS APPLIES NUMBED -======= - owner.add_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS), TRAIT_STATUS_EFFECT(id)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 owner.add_filter("stasis_status_ripple", 2, list("type" = "ripple", "flags" = WAVE_BOUNDED, "radius" = 0, "size" = 2)) var/filter = owner.get_filter("stasis_status_ripple") animate(filter, radius = 0, time = 0.2 SECONDS, size = 2, easing = JUMP_EASING, loop = -1, flags = ANIMATION_PARALLEL) @@ -305,18 +292,12 @@ /datum/status_effect/grouped/stasis/tick(seconds_between_ticks) update_time_of_death() -<<<<<<< HEAD if(owner.stat >= UNCONSCIOUS) //SKYRAT EDIT START - STASIS KEEPS SLEEP GOING owner.Sleeping(15 SECONDS) //SKYRAT EDIT END /datum/status_effect/grouped/stasis/on_remove() owner.remove_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS, TRAIT_ANALGESIA), TRAIT_STATUS_EFFECT(id)) // SKYRAT EDIT CHANGE - ORIGINAL: owner.remove_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS), TRAIT_STATUS_EFFECT(id)) owner.clear_alert("stasis numbed") //SKYRAT EDIT ADDITION - STASIS APPLIED NUMBED -======= - -/datum/status_effect/grouped/stasis/on_remove() - owner.remove_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS), TRAIT_STATUS_EFFECT(id)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 owner.remove_filter("stasis_status_ripple") update_time_of_death() if(iscarbon(owner)) @@ -359,20 +340,14 @@ /datum/status_effect/cultghost/on_apply() owner.set_invis_see(SEE_INVISIBLE_OBSERVER) -<<<<<<< HEAD -======= return TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/status_effect/cultghost/tick(seconds_between_ticks) if(owner.reagents) owner.reagents.del_reagent(/datum/reagent/water/holywater) //can't be deconverted -<<<<<<< HEAD //SKYRAT EDIT START - OVERRIDEN IN MODULAR /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/status_effect/crusher_mark id = "crusher_mark" duration = 300 //if you leave for 30 seconds you lose the mark, deal with it @@ -386,11 +361,7 @@ boosted = was_boosted /datum/status_effect/crusher_mark/on_apply() -<<<<<<< HEAD - if(owner.mob_size >= MOB_SIZE_LARGE && !HAS_TRAIT(owner, TRAIT_OVERSIZED)) // SKYRAT EDIT CHANGE - Original: if(owner.mob_size >= MOB_SIZE_LARGE) -======= if(owner.mob_size >= MOB_SIZE_LARGE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 marked_underlay = mutable_appearance('icons/effects/effects.dmi', boosted ? "shield" : "shield2") marked_underlay.pixel_x = -owner.pixel_x marked_underlay.pixel_y = -owner.pixel_y @@ -404,12 +375,9 @@ QDEL_NULL(marked_underlay) return ..() -<<<<<<< HEAD */ //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/status_effect/stacking/saw_bleed id = "saw_bleed" tick_interval = 0.6 SECONDS @@ -647,11 +615,7 @@ alert_type = null /datum/status_effect/spasms/tick(seconds_between_ticks) -<<<<<<< HEAD - if(owner.stat >= UNCONSCIOUS || owner.incapacitated() || HAS_TRAIT(owner, TRAIT_HANDS_BLOCKED) || HAS_TRAIT(owner, TRAIT_IMMOBILIZED)) -======= if(owner.stat >= UNCONSCIOUS || owner.incapacitated || HAS_TRAIT(owner, TRAIT_HANDS_BLOCKED) || HAS_TRAIT(owner, TRAIT_IMMOBILIZED)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(!prob(15)) return @@ -777,11 +741,7 @@ status_type = STATUS_EFFECT_REPLACE tick_interval = 0.2 SECONDS alert_type = null -<<<<<<< HEAD - var/msg_stage = 0//so you dont get the most intense messages immediately -======= var/msg_stage = 0//so you don't get the most intense messages immediately ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/status_effect/fake_virus/on_apply() if(HAS_TRAIT(owner, TRAIT_VIRUSIMMUNE)) diff --git a/code/datums/status_effects/debuffs/drunk.dm b/code/datums/status_effects/debuffs/drunk.dm index f918f747668..51cdd7747ce 100644 --- a/code/datums/status_effects/debuffs/drunk.dm +++ b/code/datums/status_effects/debuffs/drunk.dm @@ -1,4 +1,3 @@ -<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN - ALCOHOL_PROCESSING // Defines for the ballmer peak. #define BALLMER_PEAK_LOW_END 25.8 // Original 12.9 @@ -8,15 +7,6 @@ /// The threshld which determine if someone is tipsy vs drunk #define TIPSY_THRESHOLD 23.4 // Original 6 // SKYRAT EDIT CHANGE END - ALCOHOL_PROCESSING -======= -// Defines for the ballmer peak. -#define BALLMER_PEAK_LOW_END 12.9 -#define BALLMER_PEAK_HIGH_END 13.8 -#define BALLMER_PEAK_WINDOWS_ME 26 - -/// The threshld which determine if someone is tipsy vs drunk -#define TIPSY_THRESHOLD 6 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * The drunk status effect. @@ -81,11 +71,7 @@ // Every tick, the drunk value decrases by // 4% the current drunk_value + 0.01 // (until it reaches 0 and terminates) -<<<<<<< HEAD set_drunk_value(drunk_value - (drunk_value * 0.0015)) // SKYRAT EDIT CHANGE - ALCOHOL_PROCESSING - ORIGINAL: set_drunk_value(drunk_value - (0.01 + drunk_value * 0.04) -======= - set_drunk_value(drunk_value - (0.01 + drunk_value * 0.04)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(src)) return @@ -160,11 +146,8 @@ if(drunk_value > BALLMER_PEAK_WINDOWS_ME) // by this point you're into windows ME territory owner.say(pick_list_replacements(VISTA_FILE, "ballmer_windows_me_msg"), forced = "ballmer") -<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN - ALCOHOL_PROCESSING /* ORIGINAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Drunk slurring scales in intensity based on how drunk we are -at 16 you will likely not even notice it, // but when we start to scale up you definitely will if(drunk_value >= 16) @@ -192,7 +175,6 @@ // Over 71, we will constantly have blurry eyes if(drunk_value >= 71) owner.set_eye_blur_if_lower((drunk_value * 2 SECONDS) - 140 SECONDS) -<<<<<<< HEAD */ // And drunk people will always lose jitteriness @@ -223,39 +205,23 @@ // Over 81, we will gain constant toxloss if(drunk_value >= 83.4) -======= - - // Over 81, we will gain constant toxloss - if(drunk_value >= 81) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 owner.adjustToxLoss(1) if(owner.stat == CONSCIOUS && prob(5)) to_chat(owner, span_warning("Maybe you should lie down for a bit...")) // Over 91, we gain even more toxloss, brain damage, and have a chance of dropping into a long sleep -<<<<<<< HEAD - if(drunk_value >= 93.4) -======= if(drunk_value >= 91) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 owner.adjustToxLoss(1) owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.4) if(owner.stat == CONSCIOUS) attempt_to_blackout() // And finally, over 100 - let's be honest, you shouldn't be alive by now. -<<<<<<< HEAD if(drunk_value >= 103.4) owner.adjustToxLoss(2) /datum/status_effect/inebriated/drunk/proc/attempt_to_blackout() /* SKYRAT EDIT REMOVAL - Blackout drunk begone -======= - if(drunk_value >= 101) - owner.adjustToxLoss(2) - -/datum/status_effect/inebriated/drunk/proc/attempt_to_blackout() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/carbon/drunkard = owner if(drunkard.has_trauma_type(/datum/brain_trauma/severe/split_personality/blackout))// prevent ping spamming if(prob(10)) @@ -265,10 +231,7 @@ if(drunkard.gain_trauma(/datum/brain_trauma/severe/split_personality/blackout, TRAUMA_LIMIT_ABSOLUTE)) drunk_value -= 70 //So that the drunk personality can spice things up without being killed by liver failure return -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SSshuttle.emergency.mode == SHUTTLE_DOCKED && is_station_level(owner.z))// Don't put us in a deep sleep if the shuttle's here. QoL, mainly. to_chat(owner, span_warning("You're so tired... but you can't miss that shuttle...")) else diff --git a/code/datums/status_effects/debuffs/slime/slime_leech.dm b/code/datums/status_effects/debuffs/slime/slime_leech.dm index 21eb241a61c..78ccacc89d8 100644 --- a/code/datums/status_effects/debuffs/slime/slime_leech.dm +++ b/code/datums/status_effects/debuffs/slime/slime_leech.dm @@ -66,11 +66,7 @@ if(need_mob_update) owner.updatehealth() -<<<<<<< HEAD - if(totaldamage >= 0) // AdjustBruteLoss returns a negative value on succesful damage adjustment -======= if(totaldamage >= 0) // AdjustBruteLoss returns a negative value on successful damage adjustment ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 our_slime.balloon_alert(our_slime, "not food!") our_slime.stop_feeding() return diff --git a/code/datums/status_effects/debuffs/stamcrit.dm b/code/datums/status_effects/debuffs/stamcrit.dm index 07ea19cc91a..0edd589ab9c 100644 --- a/code/datums/status_effects/debuffs/stamcrit.dm +++ b/code/datums/status_effects/debuffs/stamcrit.dm @@ -15,11 +15,7 @@ // This should be in on apply but we need it to happen AFTER being added to the mob // (Because we need to wait until the status effect is in their status effect list, or we'll add two) -<<<<<<< HEAD if(owner.getStaminaLoss() < 162) // SKYRAT EDIT CHANGE -======= - if(owner.getStaminaLoss() < 120) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems. owner.adjustStaminaLoss(30, FALSE) diff --git a/code/datums/status_effects/debuffs/strandling.dm b/code/datums/status_effects/debuffs/strandling.dm index b9c06a73de1..0ce0ad41882 100644 --- a/code/datums/status_effects/debuffs/strandling.dm +++ b/code/datums/status_effects/debuffs/strandling.dm @@ -57,11 +57,7 @@ * tool - the tool the user's using to remove the strange. Can be null. */ /datum/status_effect/strandling/proc/try_remove_effect(mob/user, obj/item/tool) -<<<<<<< HEAD - if(user.incapacitated() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) -======= if(user.incapacitated || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return user.visible_message( diff --git a/code/datums/status_effects/drug_effects.dm b/code/datums/status_effects/drug_effects.dm index b0d47abec30..bb86e2b014b 100644 --- a/code/datums/status_effects/drug_effects.dm +++ b/code/datums/status_effects/drug_effects.dm @@ -52,11 +52,7 @@ owner.set_jitter_if_lower(100 SECONDS) owner.Paralyze(duration) owner.visible_message(span_warning("[owner] drops to the ground as [owner.p_they()] start seizing up."), \ -<<<<<<< HEAD - span_warning("[pick("You can't collect your thoughts...", "You suddenly feel extremely dizzy...", "You cant think straight...","You can't move your face properly anymore...")]")) -======= span_warning("[pick("You can't collect your thoughts...", "You suddenly feel extremely dizzy...", "You can't think straight...","You can't move your face properly anymore...")]")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /atom/movable/screen/alert/status_effect/seizure diff --git a/code/datums/status_effects/stacking_effect.dm b/code/datums/status_effects/stacking_effect.dm index 67ff9d0ad34..b54734155ad 100644 --- a/code/datums/status_effects/stacking_effect.dm +++ b/code/datums/status_effects/stacking_effect.dm @@ -8,11 +8,7 @@ /// How many stacks are currently accumulated. /// Also, the default stacks number given on application. var/stacks = 0 -<<<<<<< HEAD - // Deciseconds until ticks start occuring, which removes stacks -======= // Deciseconds until ticks start occurring, which removes stacks ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// (first stack will be removed at this time plus tick_interval) var/delay_before_decay /// How many stacks are lost per tick (decay trigger) @@ -35,19 +31,11 @@ /// Put the state name without the number in these state vars var/overlay_state /// Icon state for underlays applied when the status effect is applied -<<<<<<< HEAD - /// The number is concatonated onto the string based on the number of stacks to get the correct state name. - var/underlay_state - /// A reference to our overlay appearance - var/mutable_appearance/status_overlay - /// A referenceto our underlay appearance -======= /// The number is concatenated onto the string based on the number of stacks to get the correct state name. var/underlay_state /// A reference to our overlay appearance var/mutable_appearance/status_overlay /// A reference to our underlay appearance ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mutable_appearance/status_underlay /// Effects that occur when the stack count crosses stack_threshold @@ -102,11 +90,7 @@ owner.underlays -= status_underlay stacks += stacks_added if(stacks > 0) -<<<<<<< HEAD - if(stacks >= stack_threshold && !threshold_crossed) //threshold_crossed check prevents threshold effect from occuring if changing from above threshold to still above threshold -======= if(stacks >= stack_threshold && !threshold_crossed) //threshold_crossed check prevents threshold effect from occurring if changing from above threshold to still above threshold ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 threshold_crossed = TRUE on_threshold_cross() if(consumed_on_threshold) diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm index 453a87ade8e..8bdfa3f3de2 100644 --- a/code/datums/storage/storage.dm +++ b/code/datums/storage/storage.dm @@ -389,11 +389,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) user.balloon_alert(user, "no room!") return FALSE -<<<<<<< HEAD - var/can_hold_it = isnull(can_hold) || is_type_in_typecache(to_insert, can_hold) -======= var/can_hold_it = isnull(can_hold) || is_type_in_typecache(to_insert, can_hold) || is_type_in_typecache(to_insert, exception_hold) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/cant_hold_it = is_type_in_typecache(to_insert, cant_hold) var/trait_says_no = HAS_TRAIT(to_insert, TRAIT_NO_STORAGE_INSERT) if(!can_hold_it || cant_hold_it || trait_says_no) @@ -742,11 +738,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) /datum/storage/proc/on_mousedrop_onto(datum/source, atom/over_object, mob/user) SIGNAL_HANDLER -<<<<<<< HEAD - if(ismecha(user.loc) || !user.canUseStorage()) -======= if(ismecha(user.loc) || user.incapacitated || !user.canUseStorage()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(istype(over_object, /atom/movable/screen/inventory/hand)) @@ -835,12 +827,9 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) return if(!iscarbon(user) && !isdrone(user)) return -<<<<<<< HEAD -======= var/mob/living/user_living = user if(user_living.incapacitated) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 attempt_insert(dropping, user) return COMPONENT_CANCEL_MOUSEDROPPED_ONTO diff --git a/code/datums/storage/subtypes/surgery_tray.dm b/code/datums/storage/subtypes/surgery_tray.dm index c4d8780e051..b2bb4f49778 100644 --- a/code/datums/storage/subtypes/surgery_tray.dm +++ b/code/datums/storage/subtypes/surgery_tray.dm @@ -18,6 +18,7 @@ /obj/item/cautery, /obj/item/circular_saw, /obj/item/clothing/mask/surgical, + /obj/item/clothing/suit/toggle/labcoat/hospitalgown, // SKYRAT EDIT ADDITION /obj/item/hemostat, /obj/item/razor, /obj/item/retractor, diff --git a/code/datums/visual_data.dm b/code/datums/visual_data.dm index 15bea475f8d..e6c89544a33 100644 --- a/code/datums/visual_data.dm +++ b/code/datums/visual_data.dm @@ -11,11 +11,8 @@ var/sight = NONE /// see_invisible values var/see_invis -<<<<<<< HEAD -======= /// see_in_dark values var/see_dark ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// What the client is seeing "out of", client.eye var/datum/weakref/client_eye /// Weakref to the mob we're mirroring off @@ -44,10 +41,7 @@ // Note: we explicitly do NOT use setters here, since it would break the behavior paint_to.sight = sight paint_to.see_invisible = see_invis -<<<<<<< HEAD -======= paint_to.see_in_dark = see_dark ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(paint_to.client) var/atom/eye = client_eye?.resolve() if(eye) diff --git a/code/datums/votes/map_vote.dm b/code/datums/votes/map_vote.dm index 5e017ad6d87..2942a40b833 100644 --- a/code/datums/votes/map_vote.dm +++ b/code/datums/votes/map_vote.dm @@ -14,11 +14,7 @@ var/list/maps = shuffle(global.config.maplist) for(var/map in maps) var/datum/map_config/possible_config = config.maplist[map] -<<<<<<< HEAD if(!possible_config.votable || (possible_config.map_name in SSpersistence.blocked_maps) || possible_config.map_name == SSmapping.config?.map_name) // SKYRAT EDIT - Can't vote for the current map -======= - if(!possible_config.votable || (possible_config.map_name in SSpersistence.blocked_maps)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue default_choices += possible_config.map_name diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm index e24b04856aa..3ca117681b6 100644 --- a/code/datums/weather/weather_types/radiation_storm.dm +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -20,11 +20,7 @@ protected_areas = list(/area/station/maintenance, /area/station/ai_monitored/turret_protected/ai_upload, /area/station/ai_monitored/turret_protected/ai_upload_foyer, /area/station/ai_monitored/turret_protected/aisat/maint, /area/station/ai_monitored/command/storage/satellite, /area/station/ai_monitored/turret_protected/ai, /area/station/commons/storage/emergency/starboard, /area/station/commons/storage/emergency/port, -<<<<<<< HEAD - /area/shuttle, /area/station/security/prison/safe, /area/station/security/prison/toilet, /area/icemoon/underground, /area/ruin/comms_agent/maint) -======= /area/shuttle, /area/station/security/prison/safe, /area/station/security/prison/toilet, /area/mine/maintenance, /area/icemoon/underground, /area/ruin/comms_agent/maint) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target_trait = ZTRAIT_STATION immunity_type = TRAIT_RADSTORM_IMMUNE diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm index 5cf73d1e047..73bdc511ee4 100644 --- a/code/datums/wires/_wires.dm +++ b/code/datums/wires/_wires.dm @@ -348,11 +348,7 @@ data["proper_name"] = (proper_name != "Unknown") ? proper_name : null return data -<<<<<<< HEAD -/datum/wires/ui_act(action, params) -======= /datum/wires/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(. || !interactable(usr)) return diff --git a/code/datums/wires/mecha.dm b/code/datums/wires/mecha.dm index 843aadff496..2fe8f195174 100644 --- a/code/datums/wires/mecha.dm +++ b/code/datums/wires/mecha.dm @@ -95,14 +95,6 @@ if(mecha.Adjacent(target) && !TIMER_COOLDOWN_RUNNING(mecha, COOLDOWN_MECHA_MELEE_ATTACK) && target.mech_melee_attack(mecha)) TIMER_COOLDOWN_START(mecha, COOLDOWN_MECHA_MELEE_ATTACK, mecha.melee_cooldown) -<<<<<<< HEAD -/datum/wires/mecha/ui_act(action, params) - . = ..() - if(.) - return - var/obj/vehicle/sealed/mecha/mecha = holder - if(!HAS_SILICON_ACCESS(usr) && mecha.internal_damage & MECHA_INT_SHORT_CIRCUIT && mecha.shock(usr)) -======= /datum/wires/mecha/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) @@ -110,7 +102,6 @@ var/mob/user = ui.user var/obj/vehicle/sealed/mecha/mecha = holder if(!HAS_SILICON_ACCESS(user) && mecha.internal_damage & MECHA_INT_SHORT_CIRCUIT && mecha.shock(usr)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE /datum/wires/mecha/can_reveal_wires(mob/user) diff --git a/code/datums/wires/mod.dm b/code/datums/wires/mod.dm index cfc5155292c..8250bc45f69 100644 --- a/code/datums/wires/mod.dm +++ b/code/datums/wires/mod.dm @@ -50,16 +50,10 @@ if(WIRE_INTERFACE) mod.interface_break = !mend -<<<<<<< HEAD -/datum/wires/mod/ui_act(action, params) - var/obj/item/mod/control/mod = holder - if(!HAS_SILICON_ACCESS(usr) && mod.seconds_electrified && mod.shock(usr)) -======= /datum/wires/mod/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) var/obj/item/mod/control/mod = holder var/mob/user = ui.user if(!HAS_SILICON_ACCESS(user) && mod.seconds_electrified && mod.shock(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return ..() diff --git a/code/datums/wounds/_wound_static_data.dm b/code/datums/wounds/_wound_static_data.dm index d5a780f49e7..f8b03d1856b 100644 --- a/code/datums/wounds/_wound_static_data.dm +++ b/code/datums/wounds/_wound_static_data.dm @@ -1,10 +1,6 @@ // This datum is merely a singleton instance that allows for custom "can be applied" behaviors without instantiating a wound instance. // For example: You can make a pregen_data subtype for your wound that overrides can_be_applied_to to only apply to specifically slimeperson limbs. -<<<<<<< HEAD -// Without this, youre stuck with very static initial variables. -======= // Without this, you're stuck with very static initial variables. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A singleton datum that holds pre-gen and static data about a wound. Each wound datum should have a corresponding wound_pregen_data. /datum/wound_pregen_data @@ -60,15 +56,9 @@ if (!abstract) if (required_limb_biostate == null) -<<<<<<< HEAD - stack_trace("required_limb_biostate null - please set it! occured on: [src.type]") - if (wound_path_to_generate == null) - stack_trace("wound_path_to_generate null - please set it! occured on: [src.type]") -======= stack_trace("required_limb_biostate null - please set it! occurred on: [src.type]") if (wound_path_to_generate == null) stack_trace("wound_path_to_generate null - please set it! occurred on: [src.type]") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 scar_priorities = generate_scar_priorities() @@ -92,13 +82,8 @@ * * random_roll = FALSE: If this is in the context of a random wound generation, and this wound wasn't specifically checked. * * Returns: -<<<<<<< HEAD - * FALSE if the limb cannot be wounded, if the wounding types dont match ours (via wounding_types_valid()), if we have a higher severity wound already in our series, - * if we have a biotype mismatch, if the limb isnt in a viable zone, or if theres any duplicate wound types. -======= * FALSE if the limb cannot be wounded, if the wounding types don't match ours (via wounding_types_valid()), if we have a higher severity wound already in our series, * if we have a biotype mismatch, if the limb isn't in a viable zone, or if there's any duplicate wound types. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * TRUE otherwise. */ /datum/wound_pregen_data/proc/can_be_applied_to(obj/item/bodypart/limb, list/suggested_wounding_types = required_wounding_types, datum/wound/old_wound, random_roll = FALSE, duplicates_allowed = src.duplicates_allowed, care_about_existing_wounds = TRUE) diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index 64636299eb0..eb531dd3dc9 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -127,11 +127,7 @@ return ..() -<<<<<<< HEAD -/// If we should have an actionspeed_mod, ensures we do and updates its slowdown. Otherwise, ensures we dont have one -======= /// If we should have an actionspeed_mod, ensures we do and updates its slowdown. Otherwise, ensures we don't have one ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// by qdeleting any existing modifier. /datum/wound/proc/update_actionspeed_modifier() if (should_have_actionspeed_modifier()) @@ -327,11 +323,7 @@ SIGNAL_HANDLER qdel(src) -<<<<<<< HEAD -/// Remove the wound from whatever it's afflicting, and cleans up whateverstatus effects it had or modifiers it had on interaction times. ignore_limb is used for detachments where we only want to forget the victim -======= /// Remove the wound from whatever it's afflicting, and cleans up whatever status effects it had or modifiers it had on interaction times. ignore_limb is used for detachments where we only want to forget the victim ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/wound/proc/remove_wound(ignore_limb, replaced = FALSE) //TODO: have better way to tell if we're getting removed without replacement (full heal) scar stuff var/old_victim = victim @@ -349,11 +341,7 @@ if(limb && !ignore_limb) set_limb(null, replaced) // since we're removing limb's ref to us, we should do the same -<<<<<<< HEAD - // if you want to keep the ref, do it externally, theres no reason for us to remember it -======= // if you want to keep the ref, do it externally, there's no reason for us to remember it ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (ismob(old_victim)) var/mob/mob_victim = old_victim @@ -700,11 +688,7 @@ /datum/wound/proc/get_limb_examine_description() return -<<<<<<< HEAD -/// Gets the flat percentage chance increment of a dismember occuring, if a dismember is attempted (requires mangled flesh and bone). returning 15 = +15%. -======= /// Gets the flat percentage chance increment of a dismember occurring, if a dismember is attempted (requires mangled flesh and bone). returning 15 = +15%. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/wound/proc/get_dismember_chance_bonus(existing_chance) SHOULD_BE_PURE(TRUE) diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm index 46ea0ed0bcc..13877c8223b 100644 --- a/code/datums/wounds/bones.dm +++ b/code/datums/wounds/bones.dm @@ -13,11 +13,7 @@ /datum/wound/blunt/bone name = "Blunt (Bone) Wound" -<<<<<<< HEAD wound_flags = (ACCEPTS_GAUZE | SPLINT_OVERLAY) // SKYRAT EDIT: MEDICAL -- Makes bone wounds have a splint overlay -======= - wound_flags = (ACCEPTS_GAUZE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 default_scar_file = BONE_SCAR_FILE @@ -340,11 +336,7 @@ brain_trauma_group = BRAIN_TRAUMA_MILD trauma_cycle_cooldown = 1.5 MINUTES internal_bleeding_chance = 40 -<<<<<<< HEAD wound_flags = (ACCEPTS_GAUZE | MANGLES_INTERIOR | SPLINT_OVERLAY) // SKYRAT EDIT - MEDICAL (SPLINT_OVERLAY) -======= - wound_flags = (ACCEPTS_GAUZE | MANGLES_INTERIOR) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 regen_ticks_needed = 120 // ticks every 2 seconds, 240 seconds, so roughly 4 minutes default simple_desc = "Patient's bone has cracked in the middle, drastically reducing limb functionality." @@ -380,11 +372,7 @@ brain_trauma_group = BRAIN_TRAUMA_SEVERE trauma_cycle_cooldown = 2.5 MINUTES internal_bleeding_chance = 60 -<<<<<<< HEAD wound_flags = (ACCEPTS_GAUZE | MANGLES_INTERIOR | SPLINT_OVERLAY) // SKYRAT EDIT - MEDICAL (SPLINT_OVERLAY) -======= - wound_flags = (ACCEPTS_GAUZE | MANGLES_INTERIOR) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 regen_ticks_needed = 240 // ticks every 2 seconds, 480 seconds, so roughly 8 minutes default simple_desc = "Patient's bones have effectively shattered completely, causing total immobilization of the limb." diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm index 43a65e2b636..f44721169a3 100644 --- a/code/datums/wounds/burns.dm +++ b/code/datums/wounds/burns.dm @@ -1,7 +1,3 @@ -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* Burn wounds */ @@ -92,10 +88,6 @@ victim.adjustToxLoss(0.2) if(prob(6)) to_chat(victim, span_warning("The blisters on your [limb.plaintext_zone] ooze a strange pus...")) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(WOUND_INFECTION_SEVERE to WOUND_INFECTION_CRITICAL) if(!disabling) if(SPT_PROB(1, seconds_per_tick)) @@ -366,10 +358,6 @@ desc = "Patient is suffering extreme burns from a strange brand marking, creating serious risk of infection and greatly reduced limb integrity." examine_desc = "appears to have holy symbols painfully branded into their flesh, leaving severe burns." occur_text = "chars rapidly into a strange pattern of holy symbols, burned into the flesh." -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 simple_desc = "Patient's skin has had strange markings burned onto it, significantly weakening the limb and compounding further damage!!" /datum/wound_pregen_data/flesh_burn/third_degree/holy @@ -377,13 +365,8 @@ can_be_randomly_generated = FALSE wound_path_to_generate = /datum/wound/burn/flesh/severe/brand -<<<<<<< HEAD - -/// special severe wound caused by the cursed slot machine. -======= /// special severe wound caused by the cursed slot machine. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/wound/burn/flesh/severe/cursed_brand name = "Ancient Brand" desc = "Patient is suffering extreme burns with oddly ornate brand markings, creating serious risk of infection and greatly reduced limb integrity." diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm index 5a9cb50605c..c0be047b938 100644 --- a/code/datums/wounds/pierce.dm +++ b/code/datums/wounds/pierce.dm @@ -1,7 +1,3 @@ -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* Piercing wounds */ diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 9a413672981..04d26a5e50a 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -128,11 +128,7 @@ * A list of teleport locations * * Adding a wizard area teleport list because motherfucking lag -- Urist -<<<<<<< HEAD - * I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game -======= * I am far too lazy to make it a proper list of areas so I'll just make it run the usual teleport routine at the start of the game ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ GLOBAL_LIST_EMPTY(teleportlocs) @@ -172,15 +168,9 @@ GLOBAL_LIST_EMPTY(teleportlocs) return ..() /* -<<<<<<< HEAD - * Initalize this area - * - * intializes the dynamic area lighting and also registers the area with the z level via -======= * Initialize this area * * initializes the dynamic area lighting and also registers the area with the z level via ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * reg_in_areas_in_z * * returns INITIALIZE_HINT_LATELOAD @@ -424,11 +414,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) /** * Update the icon state of the area * -<<<<<<< HEAD - * Im not sure what the heck this does, somethign to do with weather being able to set icon -======= * I'm not sure what the heck this does, something to do with weather being able to set icon ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * states on areas?? where the heck would that even display? */ /area/update_icon_state() @@ -453,11 +439,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) /** * Returns int 1 or 0 if the area has power for the given channel * -<<<<<<< HEAD - * evalutes a mixture of variables mappers can set, requires_power, always_unpowered and then -======= * evaluates a mixture of variables mappers can set, requires_power, always_unpowered and then ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * per channel power_equip, power_light, power_environ */ /area/proc/powered(chan) // return true if the area has power to given channel diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm index 919405c63f2..5e2219ef857 100644 --- a/code/game/area/areas/away_content.dm +++ b/code/game/area/areas/away_content.dm @@ -11,11 +11,7 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30" has_gravity = STANDARD_GRAVITY ambience_index = AMBIENCE_AWAY sound_environment = SOUND_ENVIRONMENT_ROOM -<<<<<<< HEAD - area_flags = NOTELEPORT|UNIQUE_AREA //SKYRAT EDIT CHANGE -======= area_flags = UNIQUE_AREA ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/awaymission/museum name = "Nanotrasen Museum" diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm index 5a47d7f6999..f5ac4fac78e 100644 --- a/code/game/area/areas/centcom.dm +++ b/code/game/area/areas/centcom.dm @@ -87,14 +87,11 @@ name = "Supplypod Loading Facility" icon_state = "supplypod_loading" var/loading_id = "" -<<<<<<< HEAD // SKYRAT EDIT START - Dynamic lights on CentCom static_lighting = FALSE base_lighting_color = COLOR_WHITE base_lighting_alpha = 255 // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/centcom/central_command_areas/supplypod/loading/Initialize(mapload) . = ..() diff --git a/code/game/area/areas/ruins/icemoon.dm b/code/game/area/areas/ruins/icemoon.dm index 4d829412707..d0049e7007c 100644 --- a/code/game/area/areas/ruins/icemoon.dm +++ b/code/game/area/areas/ruins/icemoon.dm @@ -44,11 +44,7 @@ mood_message = "I feel like I am being watched..." /area/ruin/bughabitat -<<<<<<< HEAD - name = "\improper Entemology Outreach Center" -======= name = "\improper Entomology Outreach Center" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mood_bonus = 1 mood_message = "This place seems strangely serene." diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm index 387bd5929cc..79181d38d17 100644 --- a/code/game/area/areas/ruins/lavaland.dm +++ b/code/game/area/areas/ruins/lavaland.dm @@ -98,16 +98,12 @@ //ash walker nest /area/ruin/unpowered/ash_walkers -<<<<<<< HEAD - //SKYRAT EDIT ADDITION BEGIN - ASH WALKER MACHINES FIX + //SKYRAT EDIT ADDITION BEGIN - ASH WALKER MACHINES FIX //SKYRAT TODO - Fix this proper holy hell always_unpowered = FALSE power_equip = TRUE //SKYRAT EDIT ADDITION END ambient_buzz = 'sound/ambience/magma.ogg' -======= - ambient_buzz = 'sound/ambience/magma.ogg' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/ruin/unpowered/ratvar outdoors = TRUE ambient_buzz = 'sound/ambience/magma.ogg' diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index a5b498ce22b..5eac7addb4e 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -89,10 +89,6 @@ /area/ruin/space/has_grav/hotel/pool name = "\improper Hotel Pool Room" -<<<<<<< HEAD - icon_state = "fitness" -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /area/ruin/space/has_grav/hotel/bar name = "\improper Hotel Bar" diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index e15d5a52a93..78b887173b9 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -154,11 +154,7 @@ name = "Labor Camp Shuttle" /area/shuttle/supply -<<<<<<< HEAD name = "NLV Consign" //SKYRAT EDIT CHANGE -======= - name = "Supply Shuttle" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 area_flags = NOTELEPORT /area/shuttle/escape diff --git a/code/game/atom/_atom.dm b/code/game/atom/_atom.dm index ea0f6835804..e54d13c1c6f 100644 --- a/code/game/atom/_atom.dm +++ b/code/game/atom/_atom.dm @@ -186,8 +186,6 @@ if(smoothing_flags & SMOOTH_QUEUED) SSicon_smooth.remove_from_queues(src) -<<<<<<< HEAD -======= // These lists cease existing when src does, so we need to clear any lua refs to them that exist. if(!(datum_flags & DF_STATIC_OBJECT)) DREAMLUAU_CLEAR_REF_USERDATA(contents) @@ -195,7 +193,6 @@ DREAMLUAU_CLEAR_REF_USERDATA(overlays) DREAMLUAU_CLEAR_REF_USERDATA(underlays) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /atom/proc/handle_ricochet(obj/projectile/ricocheting_projectile) @@ -862,14 +859,11 @@ var/mob/user = client?.mob if (isnull(user)) return -<<<<<<< HEAD ///SKYRAT EDIT ADDITION BEGIN // Face directions on combat mode. No procs, no typechecks, just a var for speed if(user.face_mouse) user.face_atom(src) ///SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Screentips var/datum/hud/active_hud = user.hud_used diff --git a/code/game/atom/atom_act.dm b/code/game/atom/atom_act.dm index 56628b881e2..5d8d9decd70 100644 --- a/code/game/atom/atom_act.dm +++ b/code/game/atom/atom_act.dm @@ -67,12 +67,8 @@ * We then return the protection value */ /atom/proc/emp_act(severity) -<<<<<<< HEAD // SKYRAT EDIT - REMOVAL //SHOULD_CALL_PARENT(TRUE) -======= - SHOULD_CALL_PARENT(TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/protection = SEND_SIGNAL(src, COMSIG_ATOM_PRE_EMP_ACT, severity) if(!(protection & EMP_PROTECT_WIRES) && istype(wires)) wires.emp_pulse() @@ -120,21 +116,15 @@ * Im not sure why this the case, maybe to prevent lots of hitby's if the thrown object is * deleted shortly after hitting something (during explosions or other massive events that * throw lots of items around - singularity being a notable example) -<<<<<<< HEAD -======= * * Worth of note: If hitby returns TRUE, it means the object has been blocked or catched by src. * So far, this is only possible for living mobs and carbons, who can hold shields and catch thrown items. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ /atom/proc/hitby(atom/movable/hitting_atom, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) SEND_SIGNAL(src, COMSIG_ATOM_HITBY, hitting_atom, skipcatch, hitpush, blocked, throwingdatum) if(density && !has_gravity(hitting_atom)) //thrown stuff bounces off dense stuff in no grav, unless the thrown stuff ends up inside what it hit(embedding, bola, etc...). addtimer(CALLBACK(src, PROC_REF(hitby_react), hitting_atom), 0.2 SECONDS) -<<<<<<< HEAD -======= return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * We have have actually hit the passed in atom @@ -223,11 +213,7 @@ ///wrapper proc that passes our mob's rust_strength to the target we are rusting /mob/living/proc/do_rust_heretic_act(atom/target) -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_data = IS_HERETIC(src) -======= var/datum/antagonist/heretic/heretic_data = GET_HERETIC(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.rust_heretic_act(heretic_data?.rust_strength) /mob/living/basic/heretic_summon/rust_walker/do_rust_heretic_act(atom/target) diff --git a/code/game/atom/atom_defense.dm b/code/game/atom/atom_defense.dm index 1f0a25bae70..0b6eb5ab649 100644 --- a/code/game/atom/atom_defense.dm +++ b/code/game/atom/atom_defense.dm @@ -94,42 +94,26 @@ CRASH("/atom/proc/run_atom_armor was called on [src] without being implemented as a type that uses integrity!") if(damage_flag == MELEE && damage_amount < damage_deflection) return 0 -<<<<<<< HEAD - switch(damage_type) - if(BRUTE) - if(BURN) - else - return 0 -======= if(damage_type != BRUTE && damage_type != BURN) return 0 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/armor_protection = 0 if(damage_flag) armor_protection = get_armor_rating(damage_flag) if(armor_protection) //Only apply weak-against-armor/hollowpoint effects if there actually IS armor. armor_protection = clamp(PENETRATE_ARMOUR(armor_protection, armour_penetration), min(armor_protection, 0), 100) -<<<<<<< HEAD - return round(damage_amount * (100 - armor_protection)*0.01, DAMAGE_PRECISION) -======= return round(damage_amount * (100 - armor_protection) * 0.01, DAMAGE_PRECISION) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///the sound played when the atom is damaged. /atom/proc/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) if(damage_amount) -<<<<<<< HEAD //SKYRAT EDIT ADDITION - CREDITS TO WHITEDREAM(valtos) playsound(src, pick('modular_skyrat/master_files/sound/effects/metalblock1.wav', 'modular_skyrat/master_files/sound/effects/metalblock2.wav', \ 'modular_skyrat/master_files/sound/effects/metalblock3.wav', 'modular_skyrat/master_files/sound/effects/metalblock4.wav', \ 'modular_skyrat/master_files/sound/effects/metalblock5.wav', 'modular_skyrat/master_files/sound/effects/metalblock6.wav', \ 'modular_skyrat/master_files/sound/effects/metalblock7.wav', 'modular_skyrat/master_files/sound/effects/metalblock8.wav'), 50, TRUE) //SKYRAT EDIT END -======= - playsound(src, 'sound/weapons/smash.ogg', 50, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else playsound(src, 'sound/weapons/tap.ogg', 50, TRUE) if(BURN) diff --git a/code/game/atom/atom_examine.dm b/code/game/atom/atom_examine.dm index 8b5e7c9b753..e728781ee01 100644 --- a/code/game/atom/atom_examine.dm +++ b/code/game/atom/atom_examine.dm @@ -13,11 +13,7 @@ /atom/proc/examine(mob/user) var/examine_string = get_examine_string(user, thats = TRUE) if(examine_string) -<<<<<<< HEAD . = list("[examine_string].", EXAMINE_SECTION_BREAK) // SKYRAT EDIT CHANGE -======= - . = list("[examine_string].") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else . = list() @@ -26,25 +22,19 @@ . += desc if(custom_materials) -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - HR sections if(length(custom_materials) > 1) . += EXAMINE_SECTION_BREAK //SKYRAT EDIT ADDITION //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/materials_list = list() for(var/custom_material in custom_materials) var/datum/material/current_material = GET_MATERIAL_REF(custom_material) materials_list += "[current_material.name]" . += "It is made out of [english_list(materials_list)]." -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - HR sections if(length(custom_materials) > 1) . += EXAMINE_SECTION_BREAK //SKYRAT EDIT ADDITION //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(reagents) var/user_sees_reagents = user.can_see_reagents() diff --git a/code/game/atom/atom_tool_acts.dm b/code/game/atom/atom_tool_acts.dm index dbb32985083..abe580958a4 100644 --- a/code/game/atom/atom_tool_acts.dm +++ b/code/game/atom/atom_tool_acts.dm @@ -109,7 +109,6 @@ act_result = is_left_clicking ? welder_act(user, tool) : welder_act_secondary(user, tool) if(TOOL_ANALYZER) act_result = is_left_clicking ? analyzer_act(user, tool) : analyzer_act_secondary(user, tool) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - SKYRAT TOOLS if(TOOL_BILLOW) act_result = is_left_clicking ? billow_act(user, tool) : billow_act_secondary(user, tool) @@ -120,8 +119,6 @@ if(TOOL_BLOWROD) act_result = is_left_clicking ? blowrod_act(user, tool) : blowrod_act_secondary(user, tool) // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!act_result) return NONE diff --git a/code/game/atom/atoms_initializing_EXPENSIVE.dm b/code/game/atom/atoms_initializing_EXPENSIVE.dm index 3857cfd331b..9ce5104a935 100644 --- a/code/game/atom/atoms_initializing_EXPENSIVE.dm +++ b/code/game/atom/atoms_initializing_EXPENSIVE.dm @@ -1,9 +1,5 @@ /// Init this specific atom /datum/controller/subsystem/atoms/proc/InitAtom(atom/A, from_template = FALSE, list/arguments) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/the_type = A.type if(QDELING(A)) @@ -28,11 +24,7 @@ switch(result) if (INITIALIZE_HINT_NORMAL) -<<<<<<< HEAD - // pass -======= EMPTY_BLOCK_GUARD // Pass ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(INITIALIZE_HINT_LATELOAD) if(arguments[1]) //mapload late_loaders += A diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index a2766cdbe6c..d50ac738ed2 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -101,12 +101,9 @@ /// The degree of pressure protection that mobs in list/contents have from the external environment, between 0 and 1 var/contents_pressure_protection = 0 -<<<<<<< HEAD /// Whether a user will face atoms on entering them with a mouse. Despite being a mob variable, it is here for performances //SKYRAT EDIT ADDITION var/face_mouse = FALSE //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The voice that this movable makes when speaking var/voice @@ -237,13 +234,10 @@ LAZYNULL(client_mobs_in_contents) -<<<<<<< HEAD -======= // These lists cease existing when src does, so we need to clear any lua refs to them that exist. DREAMLUAU_CLEAR_REF_USERDATA(vis_contents) DREAMLUAU_CLEAR_REF_USERDATA(vis_locs) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() for(var/movable_content in contents) @@ -647,11 +641,7 @@ if(!direction) direction = get_dir(src, newloc) -<<<<<<< HEAD if(set_dir_on_move && dir != direction && update_dir && !face_mouse) // SKYRAT EDIT - && !face_mouse -======= - if(set_dir_on_move && dir != direction && update_dir) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 setDir(direction) var/is_multi_tile_object = is_multi_tile_object(src) @@ -778,11 +768,7 @@ moving_diagonally = SECOND_DIAG_STEP . = step(src, SOUTH) if(moving_diagonally == SECOND_DIAG_STEP) -<<<<<<< HEAD if(!. && set_dir_on_move && update_dir && !face_mouse) // SKYRAT EDIT CHANGE - && !face_mouse -======= - if(!. && set_dir_on_move && update_dir) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 setDir(first_step_dir) else if(!inertia_moving) newtonian_move(direct) @@ -829,11 +815,7 @@ last_move = direct -<<<<<<< HEAD if(set_dir_on_move && dir != direct && update_dir && !face_mouse) // SKYRAT EDIT CHANGE - && !face_mouse) -======= - if(set_dir_on_move && dir != direct && update_dir) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 setDir(direct) if(. && has_buckled_mobs() && !handle_buckled_mob_movement(loc, direct, glide_size_override)) //movement failed due to buckled mob(s) . = FALSE @@ -1278,12 +1260,9 @@ if(locate(/obj/structure/lattice) in range(1, get_turf(src))) //Not realistic but makes pushing things in space easier return TRUE -<<<<<<< HEAD if(locate(/obj/structure/spacevine) in range(1, get_turf(src))) //SKYRAT EDIT: allow walking when vines are around return TRUE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE @@ -1310,18 +1289,6 @@ /atom/movable/proc/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) set waitfor = FALSE var/hitpush = TRUE -<<<<<<< HEAD - var/impact_signal = SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_IMPACT, hit_atom, throwingdatum) - if(impact_signal & COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH) - hitpush = FALSE // hacky, tie this to something else or a proper workaround later - - if(impact_signal && (impact_signal & COMPONENT_MOVABLE_IMPACT_NEVERMIND)) - return // in case a signal interceptor broke or deleted the thing before we could process our hit - if(SEND_SIGNAL(hit_atom, COMSIG_ATOM_PREHITBY, src, throwingdatum) & COMSIG_HIT_PREVENTED) - return - SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum) - return hit_atom.hitby(src, throwingdatum=throwingdatum, hitpush=hitpush) -======= var/impact_flags = pre_impact(hit_atom, throwingdatum) if(impact_flags & COMPONENT_MOVABLE_IMPACT_NEVERMIND) return // in case a signal interceptor broke or deleted the thing before we could process our hit @@ -1338,7 +1305,6 @@ if(target_flags & COMSIG_HIT_PREVENTED) impact_flags |= COMPONENT_MOVABLE_IMPACT_NEVERMIND return impact_flags ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/hitby(atom/movable/hitting_atom, skipcatch, hitpush = TRUE, blocked, datum/thrownthing/throwingdatum) if(HAS_TRAIT(src, TRAIT_NO_THROW_HITPUSH)) diff --git a/code/game/communications.dm b/code/game/communications.dm index 8da755a45b7..f28348cbb91 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -154,18 +154,11 @@ GLOBAL_LIST_INIT(radiocolors, list( RADIO_CHANNEL_SUPPLY = "#a8732b", RADIO_CHANNEL_SERVICE = "#6eaa2c", RADIO_CHANNEL_AI_PRIVATE = "#ff00ff", -<<<<<<< HEAD - RADIO_CHANNEL_CTF_RED = "#ff0000", - RADIO_CHANNEL_CTF_BLUE = "#0000ff", - RADIO_CHANNEL_CTF_GREEN = "#00ff00", - RADIO_CHANNEL_CTF_YELLOW = "#d1ba22" -======= RADIO_CHANNEL_ENTERTAINMENT = "#00ff99", RADIO_CHANNEL_CTF_RED = "#ff0000", RADIO_CHANNEL_CTF_BLUE = "#0000ff", RADIO_CHANNEL_CTF_GREEN = "#00ff00", RADIO_CHANNEL_CTF_YELLOW = "#d1ba22", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /datum/radio_frequency diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 6aa98d9158e..c24f6156a61 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -18,11 +18,7 @@ /datum/atom_hud/data /datum/atom_hud/data/human/medical -<<<<<<< HEAD hud_icons = list(STATUS_HUD, HEALTH_HUD, DNR_HUD) // SKYRAT EDIT ADDITION - DNR_HUD -======= - hud_icons = list(STATUS_HUD, HEALTH_HUD) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/atom_hud/data/human/medical/basic @@ -51,11 +47,7 @@ hud_icons = list(ID_HUD) /datum/atom_hud/data/human/security/advanced -<<<<<<< HEAD hud_icons = list(ID_HUD, IMPSEC_FIRST_HUD, IMPLOYAL_HUD, IMPSEC_SECOND_HUD, WANTED_HUD, PERMIT_HUD, DNR_HUD) //SKYRAT EDIT ADDITION - PERMIT_HUD, DNR_HUD -======= - hud_icons = list(ID_HUD, IMPSEC_FIRST_HUD, IMPLOYAL_HUD, IMPSEC_SECOND_HUD, WANTED_HUD) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/atom_hud/data/human/fan_hud hud_icons = list(FAN_HUD) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 5ba5c82c7b6..4e7410eef67 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -19,19 +19,13 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION var/admin_grantable = FALSE /datum/objective/New(text) -<<<<<<< HEAD GLOB.objectives += src //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(text) explanation_text = text //Apparently objectives can be qdel'd. Learn a new thing every day /datum/objective/Destroy() -<<<<<<< HEAD GLOB.objectives -= src //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /datum/objective/proc/get_owners() // Combine owner and team into a single list. @@ -146,7 +140,6 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION if(!HAS_TRAIT(SSstation, STATION_TRAIT_LATE_ARRIVALS) && istype(target_area, /area/shuttle/arrival)) return FALSE -<<<<<<< HEAD // SKYRAT EDIT ADDITION if(SSticker.IsRoundInProgress() && istype(target_area, /area/centcom/interlink)) return FALSE @@ -155,8 +148,6 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION return FALSE // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE //dupe_search_range is a list of antag datums / minds / teams @@ -250,11 +241,7 @@ GLOBAL_LIST_EMPTY(objectives) //SKYRAT EDIT ADDITION /datum/objective/assassinate/update_explanation_text() ..() if(target?.current) -<<<<<<< HEAD explanation_text = "Assassinate [target.name], the [!target_role_type ? target.assigned_role.title : target.special_role] ONCE." //SKYRAT EDIT CHANGE -======= - explanation_text = "Assassinate [target.name], the [!target_role_type ? target.assigned_role.title : target.special_role]." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else explanation_text = "Free objective." diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index dc9d4d46565..2e82e549cd5 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -388,15 +388,10 @@ return add_item_to_steal(src, /obj/item/clothing/accessory/medal/gold/captain) /datum/objective_item/steal/hypo -<<<<<<< HEAD //name = "the hypospray" // ORIGINAL name = "the Chief Medical Officer's hypospray" // SKYRAT EDIT CHANGE //targetitem = /obj/item/reagent_containers/hypospray/cmo // ORIGINAL targetitem = /obj/item/hypospray/mkii/deluxe/cmo // SKYRAT EDIT CHANGE -======= - name = "the hypospray" - targetitem = /obj/item/reagent_containers/hypospray/cmo ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 excludefromjob = list(JOB_CHIEF_MEDICAL_OFFICER) item_owner = list(JOB_CHIEF_MEDICAL_OFFICER) exists_on_map = TRUE @@ -404,13 +399,8 @@ steal_hint = "The Chief Medical Officer's personal medical injector. \ Usually found amongst their medical supplies on their person, in their belt, or otherwise in their locker." -<<<<<<< HEAD /obj/item/hypospray/mkii/deluxe/cmo/add_stealing_item_objective() // SKYRAT EDIT CHANGE return add_item_to_steal(src, /obj/item/hypospray/mkii/deluxe/cmo) // SKYRAT EDIT CHANGE -======= -/obj/item/reagent_containers/hypospray/cmo/add_stealing_item_objective() - return add_item_to_steal(src, /obj/item/reagent_containers/hypospray/cmo) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/objective_item/steal/nukedisc name = "the nuclear authentication disk" @@ -528,19 +518,12 @@ if(istype(potential_storage, /obj/item/aicard)) var/obj/item/aicard/card = potential_storage being = card.AI // why is this one capitalized and the other one not? i wish i knew. -<<<<<<< HEAD // SKYRAT EDIT REMOVAL START - MOD PAI /*else if(istype(potential_storage, /obj/item/mod/control)) var/obj/item/mod/control/suit = potential_storage if(isAI(suit.ai_assistant)) being = suit.ai_assistant */ // SKYRAT EDIT REMOVAL END -======= - else if(istype(potential_storage, /obj/item/mod/control)) - var/obj/item/mod/control/suit = potential_storage - if(isAI(suit.ai_assistant)) - being = suit.ai_assistant ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else stack_trace("check_special_completion() called on [src] with [potential_storage] ([potential_storage.type])! That's not supposed to happen!") return FALSE diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index b652b9147f0..16a6615497c 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -279,11 +279,7 @@ return data -<<<<<<< HEAD -/obj/machinery/pdapainter/ui_act(action, params) -======= /obj/machinery/pdapainter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 7868bf1fe45..8a7e9846561 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -634,10 +634,6 @@ if(!.) return FALSE -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if((interaction_flags_machine & INTERACT_MACHINE_REQUIRES_SIGHT) && user.is_blind()) to_chat(user, span_warning("This machine requires sight to use.")) return FALSE @@ -690,18 +686,11 @@ return ..() /obj/machinery/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) -<<<<<<< HEAD - add_fingerprint(usr) - update_last_used(usr) - if(HAS_AI_ACCESS(usr) && !GLOB.cameranet.checkTurfVis(get_turf(src))) //We check if they're an AI specifically here, so borgs can still access off-camera stuff. - to_chat(usr, span_warning("You can no longer connect to this device!")) -======= var/mob/user = ui.user add_fingerprint(user) update_last_used(user) if(isAI(user) && !GLOB.cameranet.checkTurfVis(get_turf(src))) //We check if they're an AI specifically here, so borgs/adminghosts/human wand can still access off-camera stuff. to_chat(user, span_warning("You can no longer connect to this device!")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return ..() diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index feb45cbadba..cf10c591286 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -7,11 +7,7 @@ circuit = /obj/item/circuitboard/machine/cell_charger pass_flags = PASSTABLE var/obj/item/stock_parts/power_store/cell/charging = null -<<<<<<< HEAD - var/charge_rate = STANDARD_CELL_RATE //SKYRAT EDIT CHANGE - ORIGINAL: 0.25 * STANDARD_CELL_RATE -======= - var/charge_rate = 0.25 * STANDARD_CELL_RATE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + var/charge_rate = 0.5 * STANDARD_CELL_RATE //SKYRAT EDIT CHANGE - ORIGINAL: 0.25 * STANDARD_CELL_RATE /* OVERWRITTEN IN modular_skyrat\modules\aesthetics\cells\cell.dm /obj/machinery/cell_charger/update_overlays() @@ -29,10 +25,7 @@ . += "ccharger-[charging.connector_type]-on" if((charging.charge > 0.01) && charging.charge_light_type) . += mutable_appearance('icons/obj/machines/cell_charger.dmi', "cell-[charging.charge_light_type]-o[(charging.percent() >= 99.5) ? 2 : 1]") -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/cell_charger/examine(mob/user) . = ..() @@ -140,11 +133,7 @@ /obj/machinery/cell_charger/RefreshParts() . = ..() -<<<<<<< HEAD - charge_rate = STANDARD_CELL_RATE //SKYRAT EDIT CHANGE - ORIGINAL: 0.25 * STANDARD_CELL_RATE -======= - charge_rate = 0.25 * STANDARD_CELL_RATE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + charge_rate = 0.5 * STANDARD_CELL_RATE //SKYRAT EDIT CHANGE - ORIGINAL: 0.25 * STANDARD_CELL_RATE for(var/datum/stock_part/capacitor/capacitor in component_parts) charge_rate *= capacitor.tier diff --git a/code/game/machinery/civilian_bounties.dm b/code/game/machinery/civilian_bounties.dm index af495556bed..7760a646d9f 100644 --- a/code/game/machinery/civilian_bounties.dm +++ b/code/game/machinery/civilian_bounties.dm @@ -151,11 +151,7 @@ say("Requesting ID card has no job assignment registered!") return FALSE var/list/datum/bounty/crumbs = list(random_bounty(pot_acc.account_job.bounty_types), // We want to offer 2 bounties from their appropriate job catagories -<<<<<<< HEAD - random_bounty(pot_acc.account_job.bounty_types), // and 1 guarenteed assistant bounty if the other 2 suck. -======= random_bounty(pot_acc.account_job.bounty_types), // and 1 guaranteed assistant bounty if the other 2 suck. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 random_bounty(CIV_JOB_BASIC)) COOLDOWN_START(pot_acc, bounty_timer, (5 MINUTES) - cooldown_reduction) pot_acc.bounties = crumbs @@ -207,11 +203,7 @@ return data -<<<<<<< HEAD -/obj/machinery/computer/piratepad_control/civilian/ui_act(action, params) -======= /obj/machinery/computer/piratepad_control/civilian/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index efa31ad8c2f..e37e915aff6 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -132,14 +132,11 @@ /obj/machinery/computer/ui_interact(mob/user, datum/tgui/ui) SHOULD_CALL_PARENT(TRUE) -<<<<<<< HEAD //SKYRAT EDIT ADDITON BEGIN - AESTHETICS if(clicksound && world.time > next_clicksound && isliving(user)) next_clicksound = world.time + rand(50, 150) playsound(src, get_sfx_skyrat(clicksound), clickvol) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() update_use_power(ACTIVE_POWER_USE) diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index d6cafec3803..e0a7f364600 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -46,11 +46,7 @@ return data -<<<<<<< HEAD -/obj/machinery/computer/aifixer/ui_act(action, params) -======= /obj/machinery/computer/aifixer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/arcade/orion.dm b/code/game/machinery/computer/arcade/orion.dm index a2bc73e0ac4..3300370d18e 100644 --- a/code/game/machinery/computer/arcade/orion.dm +++ b/code/game/machinery/computer/arcade/orion.dm @@ -181,11 +181,7 @@ return static_data -<<<<<<< HEAD -/obj/machinery/computer/arcade/orion_trail/ui_act(action, list/params) -======= /obj/machinery/computer/arcade/orion_trail/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index a9a6e529461..3ed359a0062 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -28,11 +28,7 @@ return data -<<<<<<< HEAD -/obj/machinery/computer/atmos_alert/ui_act(action, params) -======= /obj/machinery/computer/atmos_alert/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/atmos_computers/_atmos_control.dm b/code/game/machinery/computer/atmos_computers/_atmos_control.dm index 814f577ff8d..25e51738611 100644 --- a/code/game/machinery/computer/atmos_computers/_atmos_control.dm +++ b/code/game/machinery/computer/atmos_computers/_atmos_control.dm @@ -152,11 +152,7 @@ data["chambers"] += list(chamber_info) return data -<<<<<<< HEAD -/obj/machinery/computer/atmos_control/ui_act(action, params) -======= /obj/machinery/computer/atmos_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(. || !(control || reconnecting)) return diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 0292f30e1d9..750a1d5d53e 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -304,13 +304,10 @@ new_machine.balloon_alert(user, "monitor connected") new_machine.setDir(dir) transfer_fingerprints_to(new_machine) -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - Connecting Computers for(var/obj/machinery/computer/selected in range(1,src)) selected.update_overlays() // SKYRAT EDIT ADDITION END - Connecting Computers -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(istype(new_machine, /obj/machinery/computer)) var/obj/machinery/computer/new_computer = new_machine diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 7197ab0683d..2d8fd7e7dca 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -50,11 +50,7 @@ /obj/machinery/computer/security/ui_interact(mob/user, datum/tgui/ui) . = ..() -<<<<<<< HEAD - if(!user.can_perform_action(src, NEED_DEXTERITY|ALLOW_SILICON_REACH)) //prevents monkeys from using camera consoles -======= if(!user.client) //prevents errors by trying to pass clients that don't exist. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return // Update UI ui = SStgui.try_update_ui(user, src, ui) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 11960116063..0e47a752b01 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -60,11 +60,7 @@ return ..() /obj/machinery/computer/camera_advanced/process() -<<<<<<< HEAD - if(!can_use(current_user) || (issilicon(current_user) && !current_user.has_unlimited_silicon_privilege)) -======= if(!can_use(current_user) || (issilicon(current_user) && !HAS_SILICON_ACCESS(current_user))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unset_machine() return PROCESS_KILL diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 92b7bb7cb86..4aca3f43577 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -5,7 +5,6 @@ #define STATE_CHANGING_STATUS "changing_status" #define STATE_MAIN "main" #define STATE_MESSAGES "messages" -<<<<<<< HEAD //SKYRAT EDIT ADDITION GLOBAL_VAR_INIT(cops_arrived, FALSE) #define EMERGENCY_RESPONSE_POLICE "WOOP WOOP THAT'S THE SOUND OF THE POLICE" @@ -13,8 +12,6 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) #define EMERGENCY_RESPONSE_EMT "AAAAAUGH, I'M DYING, I NEEEEEEEEEED A MEDIC BAG" #define EMERGENCY_RESPONSE_EMAG "AYO THE PIZZA HERE" //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // The communications computer /obj/machinery/computer/communications @@ -119,15 +116,14 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) if (HAS_SILICON_ACCESS(user)) return TRUE return authenticated -<<<<<<< HEAD -/// Skyrat Edit Start - Are we the AI? +// SKYRAT EDIT START - Are we the AI? +/// Are we the ai, or captain? /obj/machinery/computer/communications/proc/authenticated_as_ai_or_captain(mob/user) if (isAI(user)) return TRUE - return ACCESS_CAPTAIN in authorize_access //Skyrat Edit End -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + return ACCESS_CAPTAIN in authorize_access +// SKYRAT EDIT END /obj/machinery/computer/communications/attackby(obj/I, mob/user, params) if(isidcard(I)) @@ -150,10 +146,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) caller_card.use_charge(user) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(summon_battlecruiser), caller_card.team), rand(20 SECONDS, 1 MINUTES)) playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE) -<<<<<<< HEAD priority_announce("Attention crew: deep-space sensors detect a Syndicate battlecruiser-class signature subspace rift forming near your station. Estimated time until arrival: three to five minutes.", "[command_name()] High-Priority Update") //SKYRAT EDIT ADDITION: announcement on battlecruiser call -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE if(obj_flags & EMAGGED) @@ -165,11 +158,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE) return TRUE -<<<<<<< HEAD -/obj/machinery/computer/communications/ui_act(action, list/params) -======= /obj/machinery/computer/communications/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/static/list/approved_states = list(STATE_BUYING_SHUTTLE, STATE_CHANGING_STATUS, STATE_MAIN, STATE_MESSAGES) . = ..() @@ -179,19 +168,12 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) if (!has_communication()) return -<<<<<<< HEAD -======= var/mob/user = ui.user ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = TRUE switch (action) if ("answerMessage") -<<<<<<< HEAD - if (!authenticated(usr)) -======= if (!authenticated(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/answer_index = params["answer"] @@ -199,11 +181,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) // If either of these aren't numbers, then bad voodoo. if(!isnum(answer_index) || !isnum(message_index)) -<<<<<<< HEAD - message_admins("[ADMIN_LOOKUPFLW(usr)] provided an invalid index type when replying to a message on [src] [ADMIN_JMP(src)]. This should not happen. Please check with a maintainer and/or consult tgui logs.") -======= message_admins("[ADMIN_LOOKUPFLW(user)] provided an invalid index type when replying to a message on [src] [ADMIN_JMP(src)]. This should not happen. Please check with a maintainer and/or consult tgui logs.") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CRASH("Non-numeric index provided when answering comms console message.") if (!answer_index || !message_index || answer_index < 1 || message_index < 1) @@ -214,33 +192,11 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) message.answered = answer_index message.answer_callback.InvokeAsync() if ("callShuttle") -<<<<<<< HEAD - if (!authenticated(usr) || syndicate) -======= if (!authenticated(user) || syndicate) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/reason = trim(params["reason"], MAX_MESSAGE_LEN) if (length(reason) < CALL_SHUTTLE_REASON_LENGTH) return -<<<<<<< HEAD - SSshuttle.requestEvac(usr, reason) - post_status("shuttle") - if ("changeSecurityLevel") - if (!authenticated_as_silicon_or_captain(usr)) - return - - // Check if they have - if (!HAS_SILICON_ACCESS(usr)) - var/obj/item/held_item = usr.get_active_held_item() - var/obj/item/card/id/id_card = held_item?.GetID() - if (!istype(id_card)) - to_chat(usr, span_warning("You need to swipe your ID!")) - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) - return - if (!(ACCESS_CAPTAIN in id_card.access)) - to_chat(usr, span_warning("You are not authorized to do this!")) -======= SSshuttle.requestEvac(user, reason) post_status("shuttle") if ("changeSecurityLevel") @@ -257,35 +213,17 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) return if (!(ACCESS_CAPTAIN in id_card.access)) to_chat(user, span_warning("You are not authorized to do this!")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) return var/new_sec_level = SSsecurity_level.text_level_to_number(params["newSecurityLevel"]) -<<<<<<< HEAD if (new_sec_level < SEC_LEVEL_GREEN || new_sec_level > SEC_LEVEL_AMBER) //SKYRAT EDIT CHANGE - ALERTS -======= - if (new_sec_level != SEC_LEVEL_GREEN && new_sec_level != SEC_LEVEL_BLUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if (SSsecurity_level.get_current_level_as_number() == new_sec_level) return SSsecurity_level.set_level(new_sec_level) -<<<<<<< HEAD - to_chat(usr, span_notice("Authorization confirmed. Modifying security level.")) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) - - // Only notify people if an actual change happened - usr.log_message("changed the security level to [params["newSecurityLevel"]] with [src].", LOG_GAME) - message_admins("[ADMIN_LOOKUPFLW(usr)] has changed the security level to [params["newSecurityLevel"]] with [src] at [AREACOORD(usr)].") - deadchat_broadcast(" has changed the security level to [params["newSecurityLevel"]] with [src] at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr, message_type=DEADCHAT_ANNOUNCEMENT) - - alert_level_tick += 1 - if ("deleteMessage") - if (!authenticated(usr)) -======= to_chat(user, span_notice("Authorization confirmed. Modifying security level.")) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) @@ -297,26 +235,17 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) alert_level_tick += 1 if ("deleteMessage") if (!authenticated(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/message_index = text2num(params["message"]) if (!message_index) return LAZYREMOVE(messages, LAZYACCESS(messages, message_index)) if ("makePriorityAnnouncement") -<<<<<<< HEAD if (!authenticated_as_silicon_or_captain(usr) && !syndicate) return make_announcement(usr) if ("messageAssociates") if (!authenticated_as_ai_or_captain(usr)) //Skyrat edit | Allows AI and Captain to send messages -======= - if (!authenticated_as_silicon_or_captain(user) && !syndicate) - return - make_announcement(user) - if ("messageAssociates") - if (!authenticated_as_non_silicon_captain(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if (!COOLDOWN_FINISHED(src, important_action_cooldown)) return @@ -326,26 +255,6 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) var/emagged = obj_flags & EMAGGED if (emagged) -<<<<<<< HEAD - message_syndicate(message, usr) - to_chat(usr, span_danger("SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.")) - else if(syndicate) - message_syndicate(message, usr) - to_chat(usr, span_danger("Message transmitted to Syndicate Command.")) - else - message_centcom(message, usr) - to_chat(usr, span_notice("Message transmitted to Central Command.")) - - var/associates = (emagged || syndicate) ? "the Syndicate": "CentCom" - usr.log_talk(message, LOG_SAY, tag = "message to [associates]") - deadchat_broadcast(" has messaged [associates], \"[message]\" at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr, message_type = DEADCHAT_ANNOUNCEMENT) - COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) - if ("purchaseShuttle") - var/can_buy_shuttles_or_fail_reason = can_buy_shuttles(usr) - if (can_buy_shuttles_or_fail_reason != TRUE) - if (can_buy_shuttles_or_fail_reason != FALSE) - to_chat(usr, span_alert("[can_buy_shuttles_or_fail_reason]")) -======= message_syndicate(message, user) to_chat(user, span_danger("SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.")) else if(syndicate) @@ -364,7 +273,6 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) if (can_buy_shuttles_or_fail_reason != TRUE) if (can_buy_shuttles_or_fail_reason != FALSE) to_chat(user, span_alert("[can_buy_shuttles_or_fail_reason]")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/list/shuttles = flatten_list(SSmapping.shuttle_templates) var/datum/map_template/shuttle/shuttle = locate(params["shuttle"]) in shuttles @@ -373,11 +281,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) if (!can_purchase_this_shuttle(shuttle)) return if (!shuttle.prerequisites_met()) -<<<<<<< HEAD - to_chat(usr, span_alert("You have not met the requirements for purchasing this shuttle.")) -======= to_chat(user, span_alert("You have not met the requirements for purchasing this shuttle.")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/datum/bank_account/bank_account = SSeconomy.get_dep_account(ACCOUNT_CAR) if (bank_account.account_balance < shuttle.credit_cost) @@ -390,60 +294,24 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) SSshuttle.action_load(shuttle, replace = TRUE) bank_account.adjust_money(-shuttle.credit_cost) -<<<<<<< HEAD - var/purchaser_name = (obj_flags & EMAGGED) ? scramble_message_replace_chars("AUTHENTICATION FAILURE: CVE-2018-17107", 60) : usr.real_name - minor_announce("[purchaser_name] has purchased [shuttle.name] for [shuttle.credit_cost] credits.[shuttle.extra_desc ? " [shuttle.extra_desc]" : ""]" , "Shuttle Purchase") - - message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [shuttle.name].") - log_shuttle("[key_name(usr)] has purchased [shuttle.name].") -======= var/purchaser_name = (obj_flags & EMAGGED) ? scramble_message_replace_chars("AUTHENTICATION FAILURE: CVE-2018-17107", 60) : user.real_name minor_announce("[purchaser_name] has purchased [shuttle.name] for [shuttle.credit_cost] credits.[shuttle.extra_desc ? " [shuttle.extra_desc]" : ""]" , "Shuttle Purchase") message_admins("[ADMIN_LOOKUPFLW(user)] purchased [shuttle.name].") log_shuttle("[key_name(user)] has purchased [shuttle.name].") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SSblackbox.record_feedback("text", "shuttle_purchase", 1, shuttle.name) state = STATE_MAIN if ("recallShuttle") // AIs cannot recall the shuttle -<<<<<<< HEAD - if (!authenticated(usr) || HAS_SILICON_ACCESS(usr) || syndicate) - return - SSshuttle.cancelEvac(usr) - if ("requestNukeCodes") - if (!authenticated_as_non_silicon_captain(usr)) -======= if (!authenticated(user) || HAS_SILICON_ACCESS(user) || syndicate) return SSshuttle.cancelEvac(user) if ("requestNukeCodes") if (!authenticated_as_non_silicon_captain(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if (!COOLDOWN_FINISHED(src, important_action_cooldown)) return var/reason = trim(html_encode(params["reason"]), MAX_MESSAGE_LEN) -<<<<<<< HEAD - nuke_request(reason, usr) - to_chat(usr, span_notice("Request sent.")) - usr.log_message("has requested the nuclear codes from CentCom with reason \"[reason]\"", LOG_SAY) - priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self-Destruct Codes Requested", SSstation.announcer.get_rand_report_sound()) - playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE) - COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) - if ("restoreBackupRoutingData") - if (!authenticated_as_non_silicon_captain(usr)) - return - if (!(obj_flags & EMAGGED)) - return - to_chat(usr, span_notice("Backup routing data restored.")) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) - obj_flags &= ~EMAGGED - if ("sendToOtherSector") - if (!authenticated_as_non_silicon_captain(usr)) - return - if (!can_send_messages_to_other_sectors(usr)) -======= nuke_request(reason, user) to_chat(user, span_notice("Request sent.")) user.log_message("has requested the nuclear codes from CentCom with reason \"[reason]\"", LOG_SAY) @@ -462,7 +330,6 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) if (!authenticated_as_non_silicon_captain(user)) return if (!can_send_messages_to_other_sectors(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if (!COOLDOWN_FINISHED(src, important_action_cooldown)) return @@ -474,66 +341,32 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) GLOB.communications_controller.soft_filtering = FALSE var/list/hard_filter_result = is_ic_filtered(message) if(hard_filter_result) -<<<<<<< HEAD - tgui_alert(usr, "Your message contains: (\"[hard_filter_result[CHAT_FILTER_INDEX_WORD]]\"), which is not allowed on this server.") -======= tgui_alert(user, "Your message contains: (\"[hard_filter_result[CHAT_FILTER_INDEX_WORD]]\"), which is not allowed on this server.") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/list/soft_filter_result = is_soft_ooc_filtered(message) if(soft_filter_result) -<<<<<<< HEAD - if(tgui_alert(usr,"Your message contains \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\". \"[soft_filter_result[CHAT_FILTER_INDEX_REASON]]\", Are you sure you want to use it?", "Soft Blocked Word", list("Yes", "No")) != "Yes") - return - message_admins("[ADMIN_LOOKUPFLW(usr)] has passed the soft filter for \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\". They may be using a disallowed term for a cross-station message. Increasing delay time to reject.\n\n Message: \"[html_encode(message)]\"") - log_admin_private("[key_name(usr)] has passed the soft filter for \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\". They may be using a disallowed term for a cross-station message. Increasing delay time to reject.\n\n Message: \"[message]\"") -======= if(tgui_alert(user,"Your message contains \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\". \"[soft_filter_result[CHAT_FILTER_INDEX_REASON]]\", Are you sure you want to use it?", "Soft Blocked Word", list("Yes", "No")) != "Yes") return message_admins("[ADMIN_LOOKUPFLW(user)] has passed the soft filter for \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\". They may be using a disallowed term for a cross-station message. Increasing delay time to reject.\n\n Message: \"[html_encode(message)]\"") log_admin_private("[key_name(user)] has passed the soft filter for \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\". They may be using a disallowed term for a cross-station message. Increasing delay time to reject.\n\n Message: \"[message]\"") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.communications_controller.soft_filtering = TRUE playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) var/destination = params["destination"] -<<<<<<< HEAD - usr.log_message("is about to send the following message to [destination]: [message]", LOG_GAME) - to_chat( - GLOB.admins, - span_adminnotice( \ - "CROSS-SECTOR MESSAGE (OUTGOING): [ADMIN_LOOKUPFLW(usr)] is about to send \ -======= user.log_message("is about to send the following message to [destination]: [message]", LOG_GAME) to_chat( GLOB.admins, span_adminnotice( \ "CROSS-SECTOR MESSAGE (OUTGOING): [ADMIN_LOOKUPFLW(user)] is about to send \ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 the following message to [destination] (will autoapprove in [GLOB.communications_controller.soft_filtering ? DisplayTimeText(EXTENDED_CROSS_SECTOR_CANCEL_TIME) : DisplayTimeText(CROSS_SECTOR_CANCEL_TIME)]): \ REJECT
\ [html_encode(message)]" \ ) ) -<<<<<<< HEAD - send_cross_comms_message_timer = addtimer(CALLBACK(src, PROC_REF(send_cross_comms_message), usr, destination, message), GLOB.communications_controller.soft_filtering ? EXTENDED_CROSS_SECTOR_CANCEL_TIME : CROSS_SECTOR_CANCEL_TIME, TIMER_STOPPABLE) - - COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) - if ("setState") - if (!authenticated(usr)) - return - if (!(params["state"] in approved_states)) - return - if (state == STATE_BUYING_SHUTTLE && can_buy_shuttles(usr) != TRUE) - return - set_state(usr, params["state"]) - if ("setStatusMessage") - if (!authenticated(usr)) -======= send_cross_comms_message_timer = addtimer(CALLBACK(src, PROC_REF(send_cross_comms_message), user, destination, message), GLOB.communications_controller.soft_filtering ? EXTENDED_CROSS_SECTOR_CANCEL_TIME : CROSS_SECTOR_CANCEL_TIME, TIMER_STOPPABLE) COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) @@ -547,18 +380,13 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) set_state(usr, params["state"]) if ("setStatusMessage") if (!authenticated(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/line_one = reject_bad_text(params["upperText"] || "", MAX_STATUS_LINE_LENGTH) var/line_two = reject_bad_text(params["lowerText"] || "", MAX_STATUS_LINE_LENGTH) post_status("message", line_one, line_two) last_status_display = list(line_one, line_two) if ("setStatusPicture") -<<<<<<< HEAD - if (!authenticated(usr)) -======= if (!authenticated(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/picture = params["picture"] if (!(picture in GLOB.status_display_approved_pictures)) @@ -584,17 +412,10 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) authenticated = TRUE authorize_access = SSid_access.get_region_access_list(list(REGION_ALL_STATION)) authorize_name = "Unknown" -<<<<<<< HEAD - to_chat(usr, span_warning("[src] lets out a quiet alarm as its login is overridden.")) - playsound(src, 'sound/machines/terminal_alert.ogg', 25, FALSE) - else if(isliving(usr)) - var/mob/living/L = usr -======= to_chat(user, span_warning("[src] lets out a quiet alarm as its login is overridden.")) playsound(src, 'sound/machines/terminal_alert.ogg', 25, FALSE) else if(isliving(user)) var/mob/living/L = user ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/card/id/id_card = L.get_idcard(hand_first = TRUE) if (check_access(id_card)) authenticated = TRUE @@ -606,37 +427,36 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) imprint_gps(gps_tag = "Encrypted Communications Channel") if ("toggleEmergencyAccess") -<<<<<<< HEAD - if(emergency_access_cooldown(usr)) //if were in cooldown, dont allow the following code + if(emergency_access_cooldown(user)) //if were in cooldown, dont allow the following code return - if (!authenticated_as_silicon_or_captain(usr)) + if (!authenticated_as_silicon_or_captain(user)) return if (GLOB.emergency_access) revoke_maint_all_access() - usr.log_message("disabled emergency maintenance access.", LOG_GAME) - message_admins("[ADMIN_LOOKUPFLW(usr)] disabled emergency maintenance access.") - deadchat_broadcast(" disabled emergency maintenance access at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr, message_type = DEADCHAT_ANNOUNCEMENT) + user.log_message("disabled emergency maintenance access.", LOG_GAME) + message_admins("[ADMIN_LOOKUPFLW(user)] disabled emergency maintenance access.") + deadchat_broadcast(" disabled emergency maintenance access at [span_name("[get_area_name(user, TRUE)]")].", span_name("[user.real_name]"), user, message_type = DEADCHAT_ANNOUNCEMENT) else make_maint_all_access() - usr.log_message("enabled emergency maintenance access.", LOG_GAME) - message_admins("[ADMIN_LOOKUPFLW(usr)] enabled emergency maintenance access.") - deadchat_broadcast(" enabled emergency maintenance access at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr, message_type = DEADCHAT_ANNOUNCEMENT) + user.log_message("enabled emergency maintenance access.", LOG_GAME) + message_admins("[ADMIN_LOOKUPFLW(user)] enabled emergency maintenance access.") + deadchat_broadcast(" enabled emergency maintenance access at [span_name("[get_area_name(user, TRUE)]")].", span_name("[user.real_name]"), user, message_type = DEADCHAT_ANNOUNCEMENT) // Request codes for the Captain's Spare ID safe. if("requestSafeCodes") if(SSjob.assigned_captain) - to_chat(usr, span_warning("There is already an assigned Captain or Acting Captain on deck!")) + to_chat(user, span_warning("There is already an assigned Captain or Acting Captain on deck!")) return if(SSjob.safe_code_timer_id) - to_chat(usr, span_warning("The safe code has already been requested and is being delivered to your station!")) + to_chat(user, span_warning("The safe code has already been requested and is being delivered to your station!")) return if(SSjob.safe_code_requested) - to_chat(usr, span_warning("The safe code has already been requested and delivered to your station!")) + to_chat(user, span_warning("The safe code has already been requested and delivered to your station!")) return if(!SSid_access.spare_id_safe_code) - to_chat(usr, span_warning("There is no safe code to deliver to your station!")) + to_chat(user, span_warning("There is no safe code to deliver to your station!")) return var/turf/pod_location = get_turf(src) @@ -645,6 +465,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) SSjob.safe_code_requested = TRUE SSjob.safe_code_timer_id = addtimer(CALLBACK(SSjob, TYPE_PROC_REF(/datum/controller/subsystem/job, send_spare_id_safe_code), pod_location), 120 SECONDS, TIMER_UNIQUE | TIMER_STOPPABLE) minor_announce("Due to staff shortages, your station has been approved for delivery of access codes to secure the Captain's Spare ID. Delivery via drop pod at [get_area(pod_location)]. ETA 120 seconds.") + // SKYRAT EDIT ADDITION START if ("callThePolice") if(!pre_911_check(usr)) @@ -685,59 +506,6 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) usr.log_message("enabled airlock engineering override.", LOG_GAME) deadchat_broadcast(" enabled airlock engineering override at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr, message_type = DEADCHAT_ANNOUNCEMENT) // SKYRAT EDIT ADDITION END -/obj/machinery/computer/communications/proc/emergency_access_cooldown(mob/user) - if(toggle_uses == toggle_max_uses) //you have used up free uses already, do it one more time and start a cooldown - to_chat(user, span_warning("This was your last free use without cooldown, you will not be able to use this again for [DisplayTimeText(EMERGENCY_ACCESS_COOLDOWN)].")) - COOLDOWN_START(src, emergency_access_cooldown, EMERGENCY_ACCESS_COOLDOWN) - ++toggle_uses //add a use so that this if() is false the next time you try this button - return FALSE - - if(!COOLDOWN_FINISHED(src, emergency_access_cooldown)) - var/time_left = DisplayTimeText(COOLDOWN_TIMELEFT(src, emergency_access_cooldown), 1) - to_chat(user, span_warning("Emergency Access is still in cooldown for [time_left]!")) - return TRUE //dont use the button, we are in cooldown - else if((last_toggled + EMERGENCY_ACCESS_COOLDOWN) < world.time) - toggle_uses = 0 //either cooldown is done, or we just havent touched it in 30 seconds, either way reset uses - -======= - if(emergency_access_cooldown(user)) //if were in cooldown, dont allow the following code - return - if (!authenticated_as_silicon_or_captain(user)) - return - if (GLOB.emergency_access) - revoke_maint_all_access() - user.log_message("disabled emergency maintenance access.", LOG_GAME) - message_admins("[ADMIN_LOOKUPFLW(user)] disabled emergency maintenance access.") - deadchat_broadcast(" disabled emergency maintenance access at [span_name("[get_area_name(user, TRUE)]")].", span_name("[user.real_name]"), user, message_type = DEADCHAT_ANNOUNCEMENT) - else - make_maint_all_access() - user.log_message("enabled emergency maintenance access.", LOG_GAME) - message_admins("[ADMIN_LOOKUPFLW(user)] enabled emergency maintenance access.") - deadchat_broadcast(" enabled emergency maintenance access at [span_name("[get_area_name(user, TRUE)]")].", span_name("[user.real_name]"), user, message_type = DEADCHAT_ANNOUNCEMENT) - // Request codes for the Captain's Spare ID safe. - if("requestSafeCodes") - if(SSjob.assigned_captain) - to_chat(user, span_warning("There is already an assigned Captain or Acting Captain on deck!")) - return - - if(SSjob.safe_code_timer_id) - to_chat(user, span_warning("The safe code has already been requested and is being delivered to your station!")) - return - - if(SSjob.safe_code_requested) - to_chat(user, span_warning("The safe code has already been requested and delivered to your station!")) - return - - if(!SSid_access.spare_id_safe_code) - to_chat(user, span_warning("There is no safe code to deliver to your station!")) - return - - var/turf/pod_location = get_turf(src) - - SSjob.safe_code_request_loc = pod_location - SSjob.safe_code_requested = TRUE - SSjob.safe_code_timer_id = addtimer(CALLBACK(SSjob, TYPE_PROC_REF(/datum/controller/subsystem/job, send_spare_id_safe_code), pod_location), 120 SECONDS, TIMER_UNIQUE | TIMER_STOPPABLE) - minor_announce("Due to staff shortages, your station has been approved for delivery of access codes to secure the Captain's Spare ID. Delivery via drop pod at [get_area(pod_location)]. ETA 120 seconds.") /obj/machinery/computer/communications/proc/emergency_access_cooldown(mob/user) if(toggle_uses == toggle_max_uses) //you have used up free uses already, do it one more time and start a cooldown @@ -753,7 +521,6 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) else if((last_toggled + EMERGENCY_ACCESS_COOLDOWN) < world.time) toggle_uses = 0 //either cooldown is done, or we just havent touched it in 30 seconds, either way reset uses ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ++toggle_uses //add a use last_toggled = world.time return FALSE //if we are not in cooldown, allow using the button @@ -763,32 +530,20 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) var/list/payload = list() -<<<<<<< HEAD - payload["sender_ckey"] = usr.ckey -======= payload["sender_ckey"] = user.ckey ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/network_name = CONFIG_GET(string/cross_comms_network) if(network_name) payload["network"] = network_name if(GLOB.communications_controller.soft_filtering) payload["is_filtered"] = TRUE -<<<<<<< HEAD var/name_to_send = "[CONFIG_GET(string/cross_comms_name)]([station_name()])" //SKYRAT EDIT ADDITION send2otherserver(html_decode(name_to_send), message, "Comms_Console", destination == "all" ? null : list(destination), additional_data = payload) //SKYRAT EDIT END minor_announce(message, title = "Outgoing message to allied station") - usr.log_talk(message, LOG_SAY, tag = "message to the other server") - message_admins("[ADMIN_LOOKUPFLW(usr)] has sent a message to the other server\[s].") - deadchat_broadcast(" has sent an outgoing message to the other station(s).", "[usr.real_name]", usr, message_type = DEADCHAT_ANNOUNCEMENT) -======= - send2otherserver(html_decode(station_name()), message, "Comms_Console", destination == "all" ? null : list(destination), additional_data = payload) - minor_announce(message, title = "Outgoing message to allied station") user.log_talk(message, LOG_SAY, tag = "message to the other server") message_admins("[ADMIN_LOOKUPFLW(user)] has sent a message to the other server\[s].") deadchat_broadcast(" has sent an outgoing message to the other station(s).", "[user.real_name]", user, message_type = DEADCHAT_ANNOUNCEMENT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.communications_controller.soft_filtering = FALSE // set it to false at the end of the proc to ensure that everything prior reads as intended /obj/machinery/computer/communications/ui_data(mob/user) @@ -833,10 +588,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) data["canSendToSectors"] = FALSE data["canSetAlertLevel"] = FALSE data["canToggleEmergencyAccess"] = FALSE -<<<<<<< HEAD data["canToggleEngineeringOverride"] = FALSE //SKYRAT EDIT - Engineering Override -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 data["importantActionReady"] = COOLDOWN_FINISHED(src, important_action_cooldown) data["shuttleCalled"] = FALSE data["shuttleLastCalled"] = FALSE @@ -868,24 +620,17 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) if (authenticated_as_silicon_or_captain(user)) data["canToggleEmergencyAccess"] = TRUE data["emergencyAccess"] = GLOB.emergency_access -<<<<<<< HEAD data["canToggleEngineeringOverride"] = TRUE //SKYRAT EDIT - Engineering Override Toggle data["engineeringOverride"] = GLOB.force_eng_override //SKYRAT EDIT - Engineering Override Toggle -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 data["alertLevelTick"] = alert_level_tick data["canMakeAnnouncement"] = TRUE data["canSetAlertLevel"] = HAS_SILICON_ACCESS(user) ? "NO_SWIPE_NEEDED" : "SWIPE_NEEDED" else if(syndicate) data["canMakeAnnouncement"] = TRUE -<<<<<<< HEAD if (authenticated_as_ai_or_captain(user)) data["canMessageAssociates"] = TRUE //Skyrat Edit | Allows AI to report to CC in the event of there being no command alive/to begin with -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (SSshuttle.emergency.mode != SHUTTLE_IDLE && SSshuttle.emergency.mode != SHUTTLE_RECALL) data["shuttleCalled"] = TRUE data["shuttleRecallable"] = SSshuttle.canRecall() || syndicate @@ -1059,11 +804,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) var/list/players = get_communication_players() GLOB.communications_controller.make_announcement(user, is_ai, input, syndicate || (obj_flags & EMAGGED), players) -<<<<<<< HEAD - deadchat_broadcast(" made a priority announcement from [span_name("[get_area_name(usr, TRUE)]")].", span_name("[user.real_name]"), user, message_type=DEADCHAT_ANNOUNCEMENT) -======= deadchat_broadcast(" made a priority announcement from [span_name("[get_area_name(user, TRUE)]")].", span_name("[user.real_name]"), user, message_type=DEADCHAT_ANNOUNCEMENT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/computer/communications/proc/get_communication_players() return GLOB.player_list @@ -1261,7 +1002,6 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) #undef STATE_CHANGING_STATUS #undef STATE_MAIN #undef STATE_MESSAGES -<<<<<<< HEAD //SKYRAT EDIT ADDITION #undef EMERGENCY_RESPONSE_POLICE @@ -1269,5 +1009,3 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) #undef EMERGENCY_RESPONSE_EMT #undef EMERGENCY_RESPONSE_EMAG //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 1c207551f09..f90281df6b2 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -44,10 +44,7 @@ . += create_table_notices(list( "name", "job", -<<<<<<< HEAD "is_robot", //SKYRAT EDIT ADDITION - Displaying robotic species Icon -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "life_status", "suffocation", "toxin", @@ -68,10 +65,7 @@ var/list/entry = list() entry["name"] = player_record["name"] entry["job"] = player_record["assignment"] -<<<<<<< HEAD entry["is_robot"] = player_record["is_robot"] //SKYRAT EDIT ADDITION - Displaying robotic species Icon -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 entry["life_status"] = player_record["life_status"] entry["suffocation"] = player_record["oxydam"] entry["toxin"] = player_record["toxdam"] @@ -109,59 +103,40 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) JOB_HEAD_OF_SECURITY = 10, JOB_WARDEN = 11, JOB_SECURITY_OFFICER = 12, -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - We need those slots for our own jobs, these jobs aren't on Skyrat anymore anyway. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JOB_SECURITY_OFFICER_MEDICAL = 13, JOB_SECURITY_OFFICER_ENGINEERING = 14, JOB_SECURITY_OFFICER_SCIENCE = 15, JOB_SECURITY_OFFICER_SUPPLY = 16, -<<<<<<< HEAD */ JOB_CORRECTIONS_OFFICER = 13, // SKYRAT EDIT ADDITION JOB_DETECTIVE = 14, -======= - JOB_DETECTIVE = 17, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // 20-29: Medbay JOB_CHIEF_MEDICAL_OFFICER = 20, JOB_CHEMIST = 21, JOB_MEDICAL_DOCTOR = 22, JOB_PARAMEDIC = 23, JOB_CORONER = 24, -<<<<<<< HEAD JOB_ORDERLY = 25, // SKYRAT EDIT ADDITION JOB_PSYCHOLOGIST = 26, // SKYRAT EDIT - ORIGINAL: JOB_PSYCHOLOGIST = 71, -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // 30-39: Science JOB_RESEARCH_DIRECTOR = 30, JOB_SCIENTIST = 31, JOB_ROBOTICIST = 32, JOB_GENETICIST = 33, -<<<<<<< HEAD JOB_SCIENCE_GUARD = 34, // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // 40-49: Engineering JOB_CHIEF_ENGINEER = 40, JOB_STATION_ENGINEER = 41, JOB_ATMOSPHERIC_TECHNICIAN = 42, -<<<<<<< HEAD JOB_ENGINEERING_GUARD = 43, // SKYRAT EDIT ADDITION - JOB_TELECOMMS_SPECIALIST = 44, // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + JOB_TELECOMMS_SPECIALIST = 44, // SKYRAT EDIT ADDITION // 50-59: Cargo JOB_QUARTERMASTER = 50, JOB_SHAFT_MINER = 51, JOB_CARGO_TECHNICIAN = 52, JOB_BITRUNNER = 53, -<<<<<<< HEAD JOB_CUSTOMS_AGENT = 54, // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // 60+: Service JOB_HEAD_OF_PERSONNEL = 60, JOB_BARTENDER = 61, @@ -174,12 +149,9 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) JOB_MIME = 68, JOB_JANITOR = 69, JOB_LAWYER = 71, -<<<<<<< HEAD - JOB_BARBER = 72, // SKYRAT EDIT ADDITION + JOB_BARBER = 74, // SKYRAT EDIT ADDITION JOB_BOUNCER = 73, // SKYRAT EDIT ADDITION -======= JOB_PSYCHOLOGIST = 72, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // 200-229: Centcom JOB_CENTCOM_ADMIRAL = 200, JOB_CENTCOM = 201, @@ -197,11 +169,8 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) JOB_ERT_CHAPLAIN = 225, JOB_ERT_JANITOR = 226, JOB_ERT_DEATHSQUAD = 227, -<<<<<<< HEAD JOB_NT_REP = 230, // SKYRAT EDIT ADDITION JOB_BLUESHIELD = 231, // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // ANYTHING ELSE = UNKNOWN_JOB_ID, Unknowns/custom jobs will appear after civilians, and before assistants JOB_ASSISTANT = 999, @@ -228,11 +197,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) z = T.z . = list( "sensors" = update_data(z), -<<<<<<< HEAD - "link_allowed" = HAS_AI_ACCESS(user) -======= "link_allowed" = HAS_AI_ACCESS(user), ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /datum/crewmonitor/proc/update_data(z) @@ -295,7 +260,6 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) if (jobs[trim_assignment] != null) entry["ijob"] = jobs[trim_assignment] -<<<<<<< HEAD // SKYRAT EDIT BEGIN: Checking for robotic race if (issynthetic(tracked_human)) entry["is_robot"] = TRUE @@ -325,42 +289,14 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) results[++results.len] = entry -======= - // Current status - if (sensor_mode >= SENSOR_LIVING) - entry["life_status"] = tracked_living_mob.stat - - // Damage - if (sensor_mode >= SENSOR_VITALS) - entry += list( - "oxydam" = round(tracked_living_mob.getOxyLoss(), 1), - "toxdam" = round(tracked_living_mob.getToxLoss(), 1), - "burndam" = round(tracked_living_mob.getFireLoss(), 1), - "brutedam" = round(tracked_living_mob.getBruteLoss(), 1), - "health" = round(tracked_living_mob.health, 1), - ) - - // Location - if (sensor_mode >= SENSOR_COORDS) - entry["area"] = get_area_name(tracked_living_mob, format_text = TRUE) - - // Trackability - entry["can_track"] = tracked_living_mob.can_track() - - results[++results.len] = entry - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Cache result data_by_z["[z]"] = results last_update["[z]"] = world.time return results -<<<<<<< HEAD -/datum/crewmonitor/ui_act(action, params) -======= /datum/crewmonitor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + . = ..() if(.) return diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index fcee0761982..d029b004b98 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -398,11 +398,7 @@ return data -<<<<<<< HEAD -/obj/machinery/computer/scan_consolenew/ui_act(action, list/params) -======= /obj/machinery/computer/scan_consolenew/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/static/list/gene_letters = list("A", "T", "C", "G"); var/static/gene_letter_count = length(gene_letters) @@ -724,14 +720,11 @@ var/datum/mutation/human/matched_mutation = null //Go through all sequences for matching gene, and set the mutation for (var/M in subtypesof(/datum/mutation/human)) -<<<<<<< HEAD // SKYRAT EDIT ADDITION var/datum/mutation/human/iterating_mutation = M if(initial(iterating_mutation.disabled)) continue // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/true_sequence = GET_SEQUENCE(M) if (new_sequence == true_sequence) matched_mutation = M diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm index e729a65680d..1502e5af506 100644 --- a/code/game/machinery/computer/launchpad_control.dm +++ b/code/game/machinery/computer/launchpad_control.dm @@ -116,11 +116,7 @@ return data -<<<<<<< HEAD -/obj/machinery/computer/launchpad/ui_act(action, params) -======= /obj/machinery/computer/launchpad/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/mechlaunchpad.dm b/code/game/machinery/computer/mechlaunchpad.dm index 3ede8afd4d4..050f3447a8c 100644 --- a/code/game/machinery/computer/mechlaunchpad.dm +++ b/code/game/machinery/computer/mechlaunchpad.dm @@ -205,11 +205,7 @@ data["mechonly"] = current_pad.mech_only return data -<<<<<<< HEAD -/obj/machinery/computer/mechpad/ui_act(action, params) -======= /obj/machinery/computer/mechpad/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/operating_computer.dm b/code/game/machinery/computer/operating_computer.dm index 99586a2138e..0354806d85e 100644 --- a/code/game/machinery/computer/operating_computer.dm +++ b/code/game/machinery/computer/operating_computer.dm @@ -163,11 +163,7 @@ )) return data -<<<<<<< HEAD -/obj/machinery/computer/operating/ui_act(action, params) -======= /obj/machinery/computer/operating/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/orders/order_computer/mining_order.dm b/code/game/machinery/computer/orders/order_computer/mining_order.dm index 775c8f6e0c1..54ccad56f64 100644 --- a/code/game/machinery/computer/orders/order_computer/mining_order.dm +++ b/code/game/machinery/computer/orders/order_computer/mining_order.dm @@ -62,11 +62,7 @@ /obj/machinery/computer/order_console/mining/retrieve_points(obj/item/card/id/id_card) return round(id_card.registered_account.mining_points) -<<<<<<< HEAD -/obj/machinery/computer/order_console/mining/ui_act(action, params) -======= /obj/machinery/computer/order_console/mining/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(!.) flick("mining-deny", src) @@ -75,14 +71,11 @@ if(istype(weapon, /obj/item/mining_voucher)) redeem_voucher(weapon, user) return -<<<<<<< HEAD //SKYRAT EDIT ADDITON BEGIN - SEVA if(istype(weapon, /obj/item/suit_voucher)) redeem_suit_voucher(weapon, user) return //SKYRAT EDIT ADDITON END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /obj/machinery/computer/order_console/mining/update_icon_state() @@ -133,11 +126,7 @@ /obj/machinery/computer/order_console/mining/proc/check_menu(obj/item/mining_voucher/voucher, mob/living/redeemer) if(!istype(redeemer)) return FALSE -<<<<<<< HEAD - if(redeemer.incapacitated()) -======= if(redeemer.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(QDELETED(voucher)) return FALSE diff --git a/code/game/machinery/computer/orders/order_computer/order_computer.dm b/code/game/machinery/computer/orders/order_computer/order_computer.dm index c547d91b5f5..9c4613208f6 100644 --- a/code/game/machinery/computer/orders/order_computer/order_computer.dm +++ b/code/game/machinery/computer/orders/order_computer/order_computer.dm @@ -124,11 +124,8 @@ GLOBAL_LIST_EMPTY(order_console_products) )) return data -<<<<<<< HEAD -/obj/machinery/computer/order_console/ui_act(action, params) -======= /obj/machinery/computer/order_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + . = ..() if(.) return diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 6be8a5aaacc..798f20c21a8 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -78,11 +78,7 @@ break return data -<<<<<<< HEAD -/obj/machinery/computer/pod/ui_act(action, list/params) -======= /obj/machinery/computer/pod/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/prisoner/gulag_teleporter.dm b/code/game/machinery/computer/prisoner/gulag_teleporter.dm index 0323e66663f..f03c08a8d82 100644 --- a/code/game/machinery/computer/prisoner/gulag_teleporter.dm +++ b/code/game/machinery/computer/prisoner/gulag_teleporter.dm @@ -67,11 +67,7 @@ return data -<<<<<<< HEAD -/obj/machinery/computer/prisoner/gulag_teleporter_computer/ui_act(action, list/params) -======= /obj/machinery/computer/prisoner/gulag_teleporter_computer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/prisoner/management.dm b/code/game/machinery/computer/prisoner/management.dm index 612761e9202..32c2ddba984 100644 --- a/code/game/machinery/computer/prisoner/management.dm +++ b/code/game/machinery/computer/prisoner/management.dm @@ -20,11 +20,7 @@ GLOBAL_LIST_EMPTY_TYPED(tracked_implants, /obj/item/implant) /obj/machinery/computer/prisoner/management/ui_data(mob/user) var/list/data = list() -<<<<<<< HEAD - data["authorized"] = (authenticated && isliving(user)) || isAdminGhostAI(user) || issilicon(user) -======= data["authorized"] = (authenticated && isliving(user)) || HAS_SILICON_ACCESS(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 data["inserted_id"] = null if(!isnull(contained_id)) data["inserted_id"] = list( @@ -47,11 +43,7 @@ GLOBAL_LIST_EMPTY_TYPED(tracked_implants, /obj/item/implant) return data -<<<<<<< HEAD -/obj/machinery/computer/prisoner/management/ui_act(action, list/params) -======= /obj/machinery/computer/prisoner/management/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/records/medical.dm b/code/game/machinery/computer/records/medical.dm index 3e0b5a71335..2043e129da3 100644 --- a/code/game/machinery/computer/records/medical.dm +++ b/code/game/machinery/computer/records/medical.dm @@ -52,10 +52,7 @@ records += list(list( age = target.age, -<<<<<<< HEAD chrono_age = target.chrono_age, // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_type = target.blood_type, crew_ref = REF(target), dna = target.dna_string, @@ -70,13 +67,10 @@ rank = target.rank, species = target.species, trim = target.trim, -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Expanded records! past_medical_records = target.past_medical_records, past_general_records = target.past_general_records, // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) data["records"] = records @@ -87,10 +81,7 @@ var/list/data = list() data["min_age"] = AGE_MIN data["max_age"] = AGE_MAX -<<<<<<< HEAD data["max_chrono_age"] = AGE_CHRONO_MAX // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 data["physical_statuses"] = PHYSICAL_STATUSES data["mental_statuses"] = MENTAL_STATUSES return data @@ -156,10 +147,7 @@ return FALSE target.age = 18 -<<<<<<< HEAD target.chrono_age = 18 // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.blood_type = pick(list("A+", "A-", "B+", "B-", "O+", "O-", "AB+", "AB-")) target.dna_string = "Unknown" target.gender = "Unknown" diff --git a/code/game/machinery/computer/records/security.dm b/code/game/machinery/computer/records/security.dm index 6de06b8db12..eda93ad579d 100644 --- a/code/game/machinery/computer/records/security.dm +++ b/code/game/machinery/computer/records/security.dm @@ -119,10 +119,7 @@ records += list(list( age = target.age, -<<<<<<< HEAD chrono_age = target.chrono_age, // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 citations = citations, crew_ref = REF(target), crimes = crimes, @@ -134,13 +131,10 @@ species = target.species, trim = target.trim, wanted_status = target.wanted_status, -<<<<<<< HEAD // SKYRAT EDIT ADDITION - RP Records past_general_records = target.past_general_records, past_security_records = target.past_security_records, // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) data["records"] = records @@ -151,10 +145,7 @@ var/list/data = list() data["min_age"] = AGE_MIN data["max_age"] = AGE_MAX -<<<<<<< HEAD data["max_chrono_age"] = AGE_CHRONO_MAX // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data /obj/machinery/computer/records/security/ui_act(action, list/params, datum/tgui/ui) @@ -384,19 +375,12 @@ printable = wanted_poster if("rapsheet") -<<<<<<< HEAD /// SKYRAT EDIT REMOVE - REMOVE CRIMES REQUIREMENT FOR PRINTING RECORDS //var/list/crimes = target.crimes //if(!length(crimes)) //balloon_alert(user, "no crimes") //return FALSE /// SKYRAT EDIT REMOVE END -======= - var/list/crimes = target.crimes - if(!length(crimes)) - balloon_alert(user, "no crimes") - return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/paper/rapsheet = target.get_rapsheet(input_alias, input_header, input_description) printable = rapsheet diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 6f83b4d3727..12aa1c3ce03 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -81,11 +81,7 @@ return data -<<<<<<< HEAD -/obj/machinery/computer/robotics/ui_act(action, params) -======= /obj/machinery/computer/robotics/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index ca04ad79563..df3cc6e26a5 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -31,11 +31,7 @@ . = ..() if(machine_stat & (NOPOWER|BROKEN)) return -<<<<<<< HEAD - if(length(alert_control?.listener.alarms)) /// SKYRAT EDIT - Fixing master - Original: if(length(alert_control.listener.alarms)) -======= - if(length(alert_control.listener.alarms)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + if(length(alert_control?.listener.alarms)) /// SKYRAT TODO - look into what broke this - Original: if(length(alert_control.listener.alarms)) . += "alert:2" /** diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index e9f356df708..8cd12610c74 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -84,11 +84,7 @@ power_station.teleporter_hub.update_appearance() power_station.teleporter_hub.calibrated = FALSE -<<<<<<< HEAD -/obj/machinery/computer/teleporter/ui_act(action, params) -======= /obj/machinery/computer/teleporter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/computer/telescreen.dm b/code/game/machinery/computer/telescreen.dm index d7839760366..6058d3bf131 100644 --- a/code/game/machinery/computer/telescreen.dm +++ b/code/game/machinery/computer/telescreen.dm @@ -40,11 +40,8 @@ circuit = null interaction_flags_atom = INTERACT_ATOM_UI_INTERACT | INTERACT_ATOM_NO_FINGERPRINT_INTERACT | INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND | INTERACT_MACHINE_REQUIRES_SIGHT frame_type = /obj/item/wallframe/telescreen/entertainment -<<<<<<< HEAD -======= /// Virtual radio inside of the entertainment monitor to broadcast audio var/obj/item/radio/entertainment/speakers/speakers ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/icon_state_off = "entertainment_blank" var/icon_state_on = "entertainment" @@ -60,10 +57,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai . = ..() RegisterSignal(src, COMSIG_CLICK, PROC_REF(BigClick)) find_and_hang_on_wall() -<<<<<<< HEAD - -// Bypass clickchain to allow humans to use the telescreen from a distance -======= speakers = new(src) /obj/machinery/computer/security/telescreen/entertainment/Destroy() @@ -71,7 +64,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai QDEL_NULL(speakers) /// Bypass clickchain to allow humans to use the telescreen from a distance ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/computer/security/telescreen/entertainment/proc/BigClick() SIGNAL_HANDLER @@ -81,11 +73,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, interact), usr) -<<<<<<< HEAD -///Sets the monitor's icon to the selected state, and says an announcement -======= /// Sets the monitor's icon to the selected state, and says an announcement ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/computer/security/telescreen/entertainment/proc/notify(on, announcement) if(on && icon_state == icon_state_off) icon_state = icon_state_on diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 9e49a196297..816e2a1c172 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -384,7 +384,4 @@ /obj/machinery/jukebox/disco/proc/dance4_revert(mob/living/dancer, matrix/starting_matrix) animate(dancer, transform = starting_matrix, time = 5, loop = 0) REMOVE_TRAIT(dancer, TRAIT_DISCO_DANCER, REF(src)) -<<<<<<< HEAD SKYRAT EDIT END*/ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm index d49c379487b..1ccb0af11b5 100644 --- a/code/game/machinery/dish_drive.dm +++ b/code/game/machinery/dish_drive.dm @@ -11,12 +11,7 @@ pass_flags = PASSTABLE interaction_flags_click = ALLOW_SILICON_REACH /// List of dishes the drive can hold -<<<<<<< HEAD - var/list/collectable_items = list(/obj/item/trash/waffles, // SKYRAT EDIT CHANGE - non-static list - /obj/item/trash/waffles, -======= - var/static/list/collectable_items = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + var/list/collectable_items = list( // SKYRAT EDIT CHANGE - non static list /obj/item/broken_bottle, /obj/item/kitchen/fork, /obj/item/plate, @@ -27,12 +22,7 @@ /obj/item/trash/tray, ) /// List of items the drive detects as trash -<<<<<<< HEAD - var/static/list/disposable_items = list(/obj/item/trash/waffles, - /obj/item/trash/waffles, -======= var/static/list/disposable_items = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/broken_bottle, /obj/item/plate_shard, /obj/item/shard, @@ -46,10 +36,8 @@ var/list/dish_drive_contents /// Distance this is capable of sucking dishes up over. (2 + servo tier) var/suck_distance = 0 -<<<<<<< HEAD + var/binrange = 7 //SKYRAT EDIT ADDITION - SEC_HAUL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 COOLDOWN_DECLARE(time_since_dishes) @@ -137,10 +125,6 @@ do_the_dishes() if(!suction_enabled) return -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/obj/item/dish in view(2 + suck_distance, src)) if(is_type_in_list(dish, collectable_items) && dish.loc != src && (!dish.reagents || !dish.reagents.total_volume) && (dish.contents.len < 1)) if(dish.Adjacent(src)) diff --git a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_one_entries.dm b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_one_entries.dm index 448e43303ff..bd8734643f8 100644 --- a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_one_entries.dm +++ b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_one_entries.dm @@ -1,10 +1,6 @@ /* * Tier one entries are unlocked at the start, and are for dna mutants that are: -<<<<<<< HEAD - * - easy to aquire (rats) -======= * - easy to acquire (rats) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * - have a bonus for getting past a threshold * - might serve a job purpose for others (goliath) and thus should be gainable early enough */ diff --git a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_two_entries.dm b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_two_entries.dm index 83191d530da..1620607d5f0 100644 --- a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_two_entries.dm +++ b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_two_entries.dm @@ -1,10 +1,6 @@ /* * Tier two entries are unlocked after infusing someone/being infused and achieving a bonus, and are for dna mutants that are: -<<<<<<< HEAD - * - harder to aquire (gondolas) but not *necessarily* requiring job help -======= * - harder to acquire (gondolas) but not *necessarily* requiring job help ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * - have a bonus for getting past a threshold * * todos for the future: diff --git a/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm index 15f3ee6cd02..3ffad6dcba3 100644 --- a/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm @@ -48,7 +48,6 @@ "s" = "z", "S" = "Z", ) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Russian version var/static/list/russian_speech_replacements = list( new /regex("z+", "g") = "zzz", @@ -65,12 +64,6 @@ /obj/item/organ/internal/tongue/fly/New(class, timer, datum/mutation/human/copymut) . = ..() AddComponent(/datum/component/speechmod, replacements = CONFIG_GET(flag/russian_text_formation) ? russian_speech_replacements : speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech))) // SKYRAT EDIT CHANGE - ORIGINAL:AddComponent(/datum/component/speechmod, replacements = speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech))) -======= - -/obj/item/organ/internal/tongue/fly/New(class, timer, datum/mutation/human/copymut) - . = ..() - AddComponent(/datum/component/speechmod, replacements = speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/tongue/fly/Initialize(mapload) . = ..() @@ -144,10 +137,6 @@ //useless organs we throw in just to fuck with surgeons a bit more. they aren't part of a bonus, just the (absolute) state of flies /obj/item/organ/internal/fly desc = FLY_INFUSED_ORGAN_DESC -<<<<<<< HEAD - visual = FALSE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/fly/Initialize(mapload) . = ..() diff --git a/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm index ae7b9047855..db12c7fb9ee 100644 --- a/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm @@ -6,7 +6,6 @@ visual = TRUE damage_multiplier = 2 -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION /* /obj/item/organ/internal/ears/fox/on_mob_insert(mob/living/carbon/human/ear_owner) @@ -23,8 +22,7 @@ color = ear_owner.hair_color ear_owner.dna.species.mutant_bodyparts -= "ears" ear_owner.update_body() + + sprite_accessory_override = /datum/sprite_accessory/ears/fox */ //SKYRAT EDIT REMOVAL END -======= - sprite_accessory_override = /datum/sprite_accessory/ears/fox ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm b/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm index b91c899ce98..9fcf7e483bb 100644 --- a/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm @@ -34,11 +34,7 @@ Fluoride Stare: After someone says 5 words, blah blah blah... AddElement(/datum/element/noticable_organ, "%PRONOUN_They radiate%PRONOUN_s an aura of serenity.") AddElement(/datum/element/update_icon_blocker) -<<<<<<< HEAD -/obj/item/organ/internal/heart/gondola/Insert(mob/living/carbon/receiver, special, movement_flags) -======= /obj/item/organ/internal/heart/gondola/mob_insert(mob/living/carbon/receiver, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(!(FACTION_HOSTILE in receiver.faction)) factions_to_remove += FACTION_HOSTILE @@ -46,11 +42,7 @@ Fluoride Stare: After someone says 5 words, blah blah blah... factions_to_remove += FACTION_MINING receiver.faction |= list(FACTION_HOSTILE, FACTION_MINING) -<<<<<<< HEAD -/obj/item/organ/internal/heart/gondola/Remove(mob/living/carbon/heartless, special, movement_flags) -======= /obj/item/organ/internal/heart/gondola/mob_remove(mob/living/carbon/heartless, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() for(var/faction in factions_to_remove) heartless.faction -= faction @@ -72,19 +64,11 @@ Fluoride Stare: After someone says 5 words, blah blah blah... AddElement(/datum/element/noticable_organ, "%PRONOUN_Their mouth is permanently affixed into a relaxed smile.", BODY_ZONE_PRECISE_MOUTH) AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/gondola) -<<<<<<< HEAD -/obj/item/organ/internal/tongue/gondola/Insert(mob/living/carbon/tongue_owner, special, movement_flags) - . = ..() - tongue_owner.add_mood_event("gondola_zen", /datum/mood_event/gondola_serenity) - -/obj/item/organ/internal/tongue/gondola/Remove(mob/living/carbon/tongue_owner, special, movement_flags) -======= /obj/item/organ/internal/tongue/gondola/mob_insert(mob/living/carbon/tongue_owner, special, movement_flags) . = ..() tongue_owner.add_mood_event("gondola_zen", /datum/mood_event/gondola_serenity) /obj/item/organ/internal/tongue/gondola/mob_remove(mob/living/carbon/tongue_owner, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tongue_owner.clear_mood_event("gondola_zen") return ..() @@ -103,11 +87,7 @@ Fluoride Stare: After someone says 5 words, blah blah blah... AddElement(/datum/element/noticable_organ, "%PRONOUN_Their left arm has small needles breaching the skin all over it.", BODY_ZONE_L_ARM) AddElement(/datum/element/noticable_organ, "%PRONOUN_Their right arm has small needles breaching the skin all over it.", BODY_ZONE_R_ARM) -<<<<<<< HEAD -/obj/item/organ/internal/liver/gondola/Insert(mob/living/carbon/liver_owner, special, movement_flags) -======= /obj/item/organ/internal/liver/gondola/mob_insert(mob/living/carbon/liver_owner, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() var/has_left = liver_owner.has_left_hand(check_disabled = FALSE) var/has_right = liver_owner.has_right_hand(check_disabled = FALSE) @@ -122,11 +102,7 @@ Fluoride Stare: After someone says 5 words, blah blah blah... RegisterSignal(liver_owner, COMSIG_LIVING_TRY_PULL, PROC_REF(on_owner_try_pull)) RegisterSignal(liver_owner, COMSIG_CARBON_HELPED, PROC_REF(on_hug)) -<<<<<<< HEAD -/obj/item/organ/internal/liver/gondola/Remove(mob/living/carbon/liver_owner, special, movement_flags) -======= /obj/item/organ/internal/liver/gondola/mob_remove(mob/living/carbon/liver_owner, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() UnregisterSignal(liver_owner, list(COMSIG_HUMAN_EQUIPPING_ITEM, COMSIG_LIVING_TRY_PULL, COMSIG_CARBON_HELPED)) diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 82154802d8e..0c84e401d6c 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -117,10 +117,7 @@ return TRUE -<<<<<<< HEAD -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/dna_scannernew/relaymove(mob/living/user, direction) if(user.stat || locked) if(message_cooldown <= world.time) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 1106ef65ad4..de8755d03d2 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -22,7 +22,6 @@ /// Someone, for the love of god, profile this. Is there a reason to cache mutable_appearance /// if so, why are we JUST doing the airlocks when we can put this in mutable_appearance.dm for /// everything -<<<<<<< HEAD /proc/get_airlock_overlay(icon_state, icon_file, atom/offset_spokesman, em_block, state_color = null) // SKYRAT EDIT - Airlock accent greyscale color support - Added `state_color = null` var/static/list/airlock_overlays = list() @@ -38,14 +37,6 @@ . = airlock_overlays[base_icon_key] = airlock_overlay // SKYRAT EDIT END -======= -/proc/get_airlock_overlay(icon_state, icon_file, atom/offset_spokesman, em_block) - var/static/list/airlock_overlays = list() - - var/base_icon_key = "[icon_state][REF(icon_file)]" - if(!(. = airlock_overlays[base_icon_key])) - . = airlock_overlays[base_icon_key] = mutable_appearance(icon_file, icon_state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(em_block)) return @@ -70,16 +61,6 @@ #define AIRLOCK_FRAME_OPEN "open" #define AIRLOCK_FRAME_OPENING "opening" -<<<<<<< HEAD -#define AIRLOCK_SECURITY_NONE 0 //Normal airlock //Wires are not secured -#define AIRLOCK_SECURITY_IRON 1 //Medium security airlock //There is a simple iron plate over wires (use welder) -#define AIRLOCK_SECURITY_PLASTEEL_I_S 2 //Sliced inner plating (use crowbar), jumps to 0 -#define AIRLOCK_SECURITY_PLASTEEL_I 3 //Removed outer plating, second layer here (use welder) -#define AIRLOCK_SECURITY_PLASTEEL_O_S 4 //Sliced outer plating (use crowbar) -#define AIRLOCK_SECURITY_PLASTEEL_O 5 //There is first layer of plasteel (use welder) -#define AIRLOCK_SECURITY_PLASTEEL 6 //Max security airlock //Fully secured wires (use wirecutters to remove grille, that is electrified) - -======= #define AIRLOCK_FRAME_CLOSED "closed" #define AIRLOCK_FRAME_CLOSING "closing" #define AIRLOCK_FRAME_OPEN "open" @@ -93,7 +74,6 @@ #define AIRLOCK_SECURITY_PLASTEEL_O 5 //There is first layer of plasteel (use welder) #define AIRLOCK_SECURITY_PLASTEEL 6 //Max security airlock //Fully secured wires (use wirecutters to remove grille, that is electrified) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define AIRLOCK_INTEGRITY_N 300 // Normal airlock integrity #define AIRLOCK_INTEGRITY_MULTIPLIER 1.5 // How much reinforced doors health increases /// How much extra health airlocks get when braced with a seal @@ -106,11 +86,8 @@ #define DOOR_CLOSE_WAIT 60 /// Time before a door closes, if not overridden #define DOOR_VISION_DISTANCE 11 ///The maximum distance a door will see out to -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END - moved to code/__DEFINES/~skyrat_defines/airlock.dm -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/door/airlock name = "Airlock" @@ -175,15 +152,9 @@ var/previous_airlock = /obj/structure/door_assembly /// Material of inner filling; if its an airlock with glass, this should be set to "glass" var/airlock_material -<<<<<<< HEAD var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE /// Used for papers and photos pinned to the airlock var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi'//OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= - var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' - /// Used for papers and photos pinned to the airlock - var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Airlock pump that overrides airlock controlls when set up for cycling var/obj/machinery/atmospherics/components/unary/airlock_pump/cycle_pump @@ -560,10 +531,7 @@ if(AIRLOCK_DENY, AIRLOCK_OPENING, AIRLOCK_CLOSING, AIRLOCK_EMAG) icon_state = "nonexistenticonstate" //MADNESS -<<<<<<< HEAD /* SKYRAT EDIT MOVED TO AIRLOCK.DM IN AESTHETICS MODULE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/door/airlock/update_overlays() . = ..() @@ -642,10 +610,7 @@ floorlight.pixel_x = -32 floorlight.pixel_y = 0 . += floorlight -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/door/airlock/run_animation(animation) switch(animation) @@ -885,12 +850,8 @@ if(!istype(H.head, /obj/item/clothing/head/helmet)) H.visible_message(span_danger("[user] headbutts the airlock."), \ span_userdanger("You headbutt the airlock!")) -<<<<<<< HEAD //H.Paralyze(100) - SKYRAT EDIT REMOVAL - COMBAT H.StaminaKnockdown(10, TRUE, TRUE) -======= - H.Paralyze(100) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 H.apply_damage(10, BRUTE, BODY_ZONE_HEAD) else visible_message(span_danger("[user] headbutts the airlock. Good thing [user.p_theyre()] wearing a helmet.")) @@ -1362,12 +1323,8 @@ return TRUE if(BYPASS_DOOR_CHECKS) // No power usage, special sound, get it open. -<<<<<<< HEAD //playsound(src, 'sound/machines/airlockforced.ogg', 30, TRUE) - ORIGINAL playsound(src, forcedOpen, 30, TRUE) //SKYRAT EDIT CHANGE - AESTHETICS -======= - playsound(src, 'sound/machines/airlockforced.ogg', 30, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE else @@ -1627,14 +1584,8 @@ if(!disassembled) A?.update_integrity(A.max_integrity * 0.5) -<<<<<<< HEAD - else if(obj_flags & EMAGGED) - //no electronics nothing - else -======= else if(!(obj_flags & EMAGGED)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/electronics/airlock/ae if(!electronics) ae = new/obj/item/electronics/airlock(loc) @@ -1730,11 +1681,7 @@ data["wires"] = wire return data -<<<<<<< HEAD -/obj/machinery/door/airlock/ui_act(action, params) -======= /obj/machinery/door/airlock/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -1858,8 +1805,6 @@ /obj/machinery/door/airlock/proc/get_wires() var/area/source_area = get_area(src) return source_area?.airlock_wires ? new source_area.airlock_wires(src) : new /datum/wires/airlock(src) -<<<<<<< HEAD -======= /obj/structure/fluff/airlock_filler/Destroy(force) filled_airlock = null @@ -2584,731 +2529,7 @@ set_density(TRUE) operating = FALSE return TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 -/obj/structure/fluff/airlock_filler/Destroy(force) - filled_airlock = null - return ..() - -/** - * Create a ref to our parent airlock and listen for a QDEL, which we will al - */ -/obj/structure/fluff/airlock_filler/proc/pair_airlock(obj/machinery/door/parent_airlock) - if(isnull(parent_airlock)) - stack_trace("Attempted to pair an airlock filler with no parent airlock specified!") - return - - filled_airlock = parent_airlock - RegisterSignal(filled_airlock, COMSIG_QDELETING, PROC_REF(no_airlock)) - -/** - * Multi-tile airlocks pair with a filler panel, if one goes so does the other. - */ -/obj/structure/fluff/airlock_filler/proc/no_airlock() - SIGNAL_HANDLER - - qdel(src) - -/** - * Multi-tile airlocks (using a filler panel) have special handling for movables with PASSGLASS - */ -/obj/structure/fluff/airlock_filler/CanAllowThrough(atom/movable/mover, turf/target) - . = ..() - if(.) - return - - if(istype(mover) && (mover.pass_flags & PASSGLASS)) - return !opacity - -/obj/structure/fluff/airlock_filler/can_be_pulled(user, grab_state, force) - return FALSE - -/obj/structure/fluff/airlock_filler/singularity_act() - return - -/obj/structure/fluff/airlock_filler/singularity_pull(S, current_size) - return - -/obj/machinery/door/airlock/proc/set_cycle_pump(obj/machinery/atmospherics/components/unary/airlock_pump/pump) - RegisterSignal(pump, COMSIG_QDELETING, PROC_REF(unset_cycle_pump)) - cycle_pump = pump - -/obj/machinery/door/airlock/proc/unset_cycle_pump() - SIGNAL_HANDLER - if(locked) - unbolt() - say("Link broken, unbolting.") - cycle_pump = null - -// Station Airlocks Regular - -/obj/machinery/door/airlock/command - name = "command airlock" - icon = 'icons/obj/doors/airlocks/station/command.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_com - normal_integrity = 450 - -/obj/machinery/door/airlock/security - name = "security airlock" - icon = 'icons/obj/doors/airlocks/station/security.dmi' - var/id = null - assemblytype = /obj/structure/door_assembly/door_assembly_sec - normal_integrity = 450 - -/obj/machinery/door/airlock/engineering - name = "engineering airlock" - icon = 'icons/obj/doors/airlocks/station/engineering.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_eng - -/obj/machinery/door/airlock/medical - name = "medical airlock" - icon = 'icons/obj/doors/airlocks/station/medical.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_med - -/obj/machinery/door/airlock/hydroponics //Hydroponics front doors! - name = "hydroponics airlock" - icon = 'icons/obj/doors/airlocks/station/hydroponics.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_hydro - -/obj/machinery/door/airlock/maintenance - name = "maintenance access" - icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_mai - normal_integrity = 250 - -/obj/machinery/door/airlock/maintenance/external - name = "external airlock access" - icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_extmai - -/obj/machinery/door/airlock/mining - name = "mining airlock" - icon = 'icons/obj/doors/airlocks/station/mining.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_min - -/obj/machinery/door/airlock/atmos - name = "atmospherics airlock" - icon = 'icons/obj/doors/airlocks/station/atmos.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_atmo - -/obj/machinery/door/airlock/research - name = "research airlock" - icon = 'icons/obj/doors/airlocks/station/research.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_research - -/obj/machinery/door/airlock/freezer - name = "freezer airlock" - icon = 'icons/obj/doors/airlocks/station/freezer.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_fre - -/obj/machinery/door/airlock/science - name = "science airlock" - icon = 'icons/obj/doors/airlocks/station/science.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_science - -/obj/machinery/door/airlock/virology - name = "virology airlock" - icon = 'icons/obj/doors/airlocks/station/virology.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_viro - -// Station Airlocks Glass - -/obj/machinery/door/airlock/glass - name = "glass airlock" - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/glass/incinerator - autoclose = FALSE - heat_proof = TRUE - req_access = list(ACCESS_SYNDICATE) - -/obj/machinery/door/airlock/glass/incinerator/syndicatelava_interior - name = "Turbine Interior Airlock" - id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR - -/obj/machinery/door/airlock/glass/incinerator/syndicatelava_exterior - name = "Turbine Exterior Airlock" - id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR - -/obj/machinery/door/airlock/command/glass - name = "command glass airlock" - opacity = FALSE - glass = TRUE - normal_integrity = 400 - -/obj/machinery/door/airlock/engineering/glass - name = "engineering glass airlock" - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/engineering/glass/critical - critical_machine = TRUE //stops greytide virus from opening & bolting doors in critical positions, such as the SM chamber. - -/obj/machinery/door/airlock/security/glass - name = "security glass airlock" - opacity = FALSE - glass = TRUE - normal_integrity = 400 - -/obj/machinery/door/airlock/medical/glass - name = "medical glass airlock" - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/hydroponics/glass //Uses same icon as medical/glass, maybe update it with its own unique icon one day? - name = "hydroponics glass airlock" - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/research/glass - name = "research glass airlock" - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/research/glass/incinerator - autoclose = FALSE - heat_proof = TRUE - -/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior - name = "Mixing Room Interior Airlock" - id_tag = INCINERATOR_ORDMIX_AIRLOCK_INTERIOR - -/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior - name = "Mixing Room Exterior Airlock" - id_tag = INCINERATOR_ORDMIX_AIRLOCK_EXTERIOR - -/obj/machinery/door/airlock/mining/glass - name = "mining glass airlock" - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/atmos/glass - name = "atmospheric glass airlock" - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/atmos/glass/critical - critical_machine = TRUE //stops greytide virus from opening & bolting doors in critical positions, such as the SM chamber. - -/obj/machinery/door/airlock/science/glass - name = "science glass airlock" - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/virology/glass - name = "virology glass airlock" - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/maintenance/glass - name = "maintainence glass airlock" - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/maintenance/external/glass - name = "maintainence external glass airlock" - opacity = FALSE - glass = TRUE - normal_integrity = 200 - -// Station Airlocks Mineral - -/obj/machinery/door/airlock/gold - name = "gold airlock" - icon = 'icons/obj/doors/airlocks/station/gold.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_gold - -/obj/machinery/door/airlock/gold/discoinferno - heat_proof = TRUE - resistance_flags = FIRE_PROOF - armor_type = /datum/armor/discoinferno_airlock - -/datum/armor/discoinferno_airlock - melee = 30 - bullet = 30 - laser = 20 - energy = 20 - bomb = 10 - fire = 100 - acid = 100 - -/obj/machinery/door/airlock/gold/glass - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/silver - name = "silver airlock" - icon = 'icons/obj/doors/airlocks/station/silver.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_silver - -/obj/machinery/door/airlock/silver/glass - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/diamond - name = "diamond airlock" - icon = 'icons/obj/doors/airlocks/station/diamond.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_diamond - normal_integrity = 1000 - explosion_block = 2 - -/obj/machinery/door/airlock/diamond/glass - normal_integrity = 950 - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/uranium - name = "uranium airlock" - icon = 'icons/obj/doors/airlocks/station/uranium.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_uranium - var/last_event = 0 - //Is this airlock actually radioactive? - var/actually_radioactive = TRUE - -/obj/machinery/door/airlock/uranium/process() - if(actually_radioactive && world.time > last_event+20) - if(prob(50)) - radiate() - last_event = world.time - -/obj/machinery/door/airlock/uranium/proc/radiate() - radiation_pulse( - src, - max_range = 2, - threshold = RAD_LIGHT_INSULATION, - chance = URANIUM_IRRADIATION_CHANCE, - minimum_exposure_time = URANIUM_RADIATION_MINIMUM_EXPOSURE_TIME, - ) - -/obj/machinery/door/airlock/uranium/glass - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/uranium/safe - actually_radioactive = FALSE - -/obj/machinery/door/airlock/uranium/glass/safe - actually_radioactive = FALSE - -/obj/machinery/door/airlock/plasma - name = "plasma airlock" - desc = "No way this can end badly." - icon = 'icons/obj/doors/airlocks/station/plasma.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_plasma - material_flags = MATERIAL_EFFECTS - material_modifier = 0.25 - -/obj/machinery/door/airlock/plasma/Initialize(mapload) - custom_materials = custom_materials ? custom_materials : list(/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 10) - . = ..() - -/obj/machinery/door/airlock/plasma/block_superconductivity() //we don't stop the heat~ - return 0 - -/obj/machinery/door/airlock/plasma/glass - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/bananium - name = "bananium airlock" - desc = "Honkhonkhonk" - icon = 'icons/obj/doors/airlocks/station/bananium.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_bananium - doorOpen = 'sound/items/bikehorn.ogg' - -/obj/machinery/door/airlock/bananium/glass - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/sandstone - name = "sandstone airlock" - icon = 'icons/obj/doors/airlocks/station/sandstone.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_sandstone - -/obj/machinery/door/airlock/sandstone/glass - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/wood - name = "wooden airlock" - icon = 'icons/obj/doors/airlocks/station/wood.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_wood - -/obj/machinery/door/airlock/wood/glass - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/titanium - name = "shuttle airlock" - assemblytype = /obj/structure/door_assembly/door_assembly_titanium - icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' - overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' - normal_integrity = 400 - -/obj/machinery/door/airlock/titanium/glass - normal_integrity = 350 - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/bronze - name = "bronze airlock" - icon = 'icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi' - overlays_file = 'icons/obj/doors/airlocks/clockwork/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_bronze - -/obj/machinery/door/airlock/bronze/seethru - assemblytype = /obj/structure/door_assembly/door_assembly_bronze/seethru - opacity = FALSE - glass = TRUE - - -// Public Airlocks - -/obj/machinery/door/airlock/public - name = "public airlock" - icon = 'icons/obj/doors/airlocks/public/glass.dmi' - overlays_file = 'icons/obj/doors/airlocks/public/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_public - -/obj/machinery/door/airlock/public/glass - name = "public glass airlock" - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/public/glass/incinerator - autoclose = FALSE - heat_proof = TRUE - -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior - name = "Turbine Interior Airlock" - id_tag = INCINERATOR_ATMOS_AIRLOCK_INTERIOR - -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior - name = "Turbine Exterior Airlock" - id_tag = INCINERATOR_ATMOS_AIRLOCK_EXTERIOR - -// External Airlocks - -/obj/machinery/door/airlock/external - name = "external airlock" - icon = 'icons/obj/doors/airlocks/external/external.dmi' - overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi' - note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_ext - - /// Whether or not the airlock can be opened without access from a certain direction while powered, or with bare hands from any direction while unpowered OR pressurized. - var/space_dir = null - -/obj/machinery/door/airlock/external/Initialize(mapload, ...) - // default setting is for mapping only, let overrides work - if(!mapload) - req_access = null - - return ..() - -/obj/machinery/door/airlock/external/post_machine_initialize() - . = ..() - if(space_dir) - unres_sides |= space_dir - -/obj/machinery/door/airlock/external/examine(mob/user) - . = ..() - if(space_dir) - . += span_notice("It has labels indicating that it has an emergency mechanism to open from the [dir2text(space_dir)] side with just your hands even if there's no power.") - -/obj/machinery/door/airlock/external/cyclelinkairlock() - . = ..() - var/obj/machinery/door/airlock/external/cycle_linked_external_airlock = cyclelinkedairlock - if(istype(cycle_linked_external_airlock)) - cycle_linked_external_airlock.space_dir |= space_dir - space_dir |= cycle_linked_external_airlock.space_dir - -/obj/machinery/door/airlock/external/try_safety_unlock(mob/user) - if(space_dir && density) - if(!hasPower()) - to_chat(user, span_notice("You begin unlocking the airlock safety mechanism...")) - if(do_after(user, 15 SECONDS, target = src)) - try_to_crowbar(null, user, TRUE) - return TRUE - else - // always open from the space side - // get_dir(src, user) & space_dir, checked in unresricted_sides - var/should_safety_open = shuttledocked || cyclelinkedairlock?.shuttledocked || is_safe_turf(get_step(src, space_dir), TRUE, FALSE) - return try_to_activate_door(user, should_safety_open) - - return ..() - -// Access free external airlocks -/obj/machinery/door/airlock/external/ruin - -/obj/machinery/door/airlock/external/glass - name = "external glass airlock" - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/external/glass/ruin - -// CentCom Airlocks - -/obj/machinery/door/airlock/centcom //Use grunge as a station side version, as these have special effects related to them via phobias and such. - icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' - overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_centcom - normal_integrity = 1000 - security_level = 6 - explosion_block = 2 - -/obj/machinery/door/airlock/grunge - icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' - overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_grunge - - -// Vault Airlocks - -/obj/machinery/door/airlock/vault - name = "vault door" - icon = 'icons/obj/doors/airlocks/vault/vault.dmi' - overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_vault - explosion_block = 2 - normal_integrity = 400 // reverse engieneerd: 400 * 1.5 (sec lvl 6) = 600 = original - security_level = 6 - - -// Hatch Airlocks - -/obj/machinery/door/airlock/hatch - name = "airtight hatch" - icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi' - overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' - note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_hatch - -/obj/machinery/door/airlock/maintenance_hatch - name = "maintenance hatch" - icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi' - overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' - note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_mhatch - -// High Security Airlocks - -/obj/machinery/door/airlock/highsecurity - name = "high tech security airlock" - icon = 'icons/obj/doors/airlocks/highsec/highsec.dmi' - overlays_file = 'icons/obj/doors/airlocks/highsec/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_highsecurity - explosion_block = 2 - normal_integrity = 500 - security_level = 1 - damage_deflection = 30 - -// Shuttle Airlocks - -/obj/machinery/door/airlock/shuttle - name = "shuttle airlock" - icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' - overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_shuttle - -/obj/machinery/door/airlock/shuttle/glass - opacity = FALSE - glass = TRUE - -/obj/machinery/door/airlock/abductor - name = "alien airlock" - desc = "With humanity's current technological level, it could take years to hack this advanced airlock... or maybe we should give a screwdriver a try?" - icon = 'icons/obj/doors/airlocks/abductor/abductor_airlock.dmi' - overlays_file = 'icons/obj/doors/airlocks/abductor/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_abductor - note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi' - damage_deflection = 30 - explosion_block = 3 - hackProof = TRUE - aiControlDisabled = AI_WIRE_DISABLED - normal_integrity = 700 - security_level = 1 - -// Cult Airlocks - -/obj/machinery/door/airlock/cult - name = "cult airlock" - icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi' - overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_cult - hackProof = TRUE - aiControlDisabled = AI_WIRE_DISABLED - req_access = list(ACCESS_BLOODCULT) - damage_deflection = 10 - var/openingoverlaytype = /obj/effect/temp_visual/cult/door - var/friendly = FALSE - var/stealthy = FALSE - -/obj/machinery/door/airlock/cult/Initialize(mapload) - . = ..() - new openingoverlaytype(loc) - AddElement(/datum/element/empprotection, EMP_PROTECT_ALL) - -/obj/machinery/door/airlock/cult/canAIControl(mob/user) - return (IS_CULTIST(user) && !isAllPowerCut()) - -/obj/machinery/door/airlock/cult/on_break() - set_panel_open(TRUE) - -/obj/machinery/door/airlock/cult/isElectrified() - return FALSE - -/obj/machinery/door/airlock/cult/hasPower() - return TRUE - -/obj/machinery/door/airlock/cult/allowed(mob/living/L) - if(!density) - return TRUE - if(friendly || IS_CULTIST(L) || isshade(L) || isconstruct(L)) - if(!stealthy) - new openingoverlaytype(loc) - return TRUE - else - if(!stealthy) - new /obj/effect/temp_visual/cult/sac(loc) - var/atom/throwtarget - throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src))) - SEND_SOUND(L, sound(pick('sound/hallucinations/turn_around1.ogg','sound/hallucinations/turn_around2.ogg'),0,1,50)) - flash_color(L, flash_color=COLOR_CULT_RED, flash_time=20) - L.Paralyze(40) - L.throw_at(throwtarget, 5, 1) - return FALSE - -/obj/machinery/door/airlock/cult/proc/conceal() - icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' - overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' - name = "Airlock" - desc = "It opens and closes." - stealthy = TRUE - update_appearance() - -/obj/machinery/door/airlock/cult/proc/reveal() - icon = initial(icon) - overlays_file = initial(overlays_file) - name = initial(name) - desc = initial(desc) - stealthy = initial(stealthy) - update_appearance() - -/obj/machinery/door/airlock/cult/narsie_act() - return - -/obj/machinery/door/airlock/cult/friendly - friendly = TRUE - -/obj/machinery/door/airlock/cult/glass - glass = TRUE - opacity = FALSE - -/obj/machinery/door/airlock/cult/glass/friendly - friendly = TRUE - -/obj/machinery/door/airlock/cult/unruned - icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi' - overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_cult/unruned - openingoverlaytype = /obj/effect/temp_visual/cult/door/unruned - -/obj/machinery/door/airlock/cult/unruned/friendly - friendly = TRUE - -/obj/machinery/door/airlock/cult/unruned/glass - glass = TRUE - opacity = FALSE - -/obj/machinery/door/airlock/cult/unruned/glass/friendly - friendly = TRUE - -/obj/machinery/door/airlock/cult/weak - name = "brittle cult airlock" - desc = "An airlock hastily corrupted by blood magic, it is unusually brittle in this state." - normal_integrity = 150 - damage_deflection = 5 - armor_type = /datum/armor/none - -// Material Airlocks - -/obj/machinery/door/airlock/material - name = "Airlock" - material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_GREYSCALE | MATERIAL_AFFECT_STATISTICS - greyscale_config = /datum/greyscale_config/material_airlock - assemblytype = /obj/structure/door_assembly/door_assembly_material - -/obj/machinery/door/airlock/material/close(forced, force_crush) - . = ..() - if(!.) - return - for(var/datum/material/mat in custom_materials) - if(mat.alpha < 255) - set_opacity(FALSE) - break - -/obj/machinery/door/airlock/material/prepare_deconstruction_assembly(obj/structure/door_assembly/assembly) - assembly.set_custom_materials(custom_materials) - ..() - -/obj/machinery/door/airlock/material/glass - opacity = FALSE - glass = TRUE - -// Multi-tile (Large) Airlocks - -/obj/machinery/door/airlock/multi_tile - icon = 'icons/obj/doors/airlocks/multi_tile/public/glass.dmi' - overlays_file = 'icons/obj/doors/airlocks/multi_tile/public/overlays.dmi' - assemblytype = /obj/structure/door_assembly/multi_tile/door_assembly_public - multi_tile = TRUE - opacity = FALSE - glass = TRUE - -/obj/structure/fluff/airlock_filler - name = "airlock fluff" - desc = "You shouldn't be able to see this fluff!" - icon = null - icon_state = null - density = TRUE - opacity = TRUE - anchored = TRUE - invisibility = INVISIBILITY_MAXIMUM - can_atmos_pass = ATMOS_PASS_DENSITY - /// The door/airlock this fluff panel is attached to - var/obj/machinery/door/filled_airlock - -/obj/machinery/door/airlock/multi_tile/public/glass - -/obj/machinery/door/airlock/multi_tile/narsie_act() - return - -/* - * Subtype used in unit tests to ensure instant airlock opening/closing. - * - * Pretty much just excises everything that would delay the process or is un-needed - * for the sake of the test (sleeps, icon animations). -*/ -/obj/machinery/door/airlock/instant - -// set_density on both open and close procs has a check and return builtin. - -/obj/machinery/door/airlock/instant/open(forced = DEFAULT_DOOR_CHECKS) - operating = TRUE - SEND_SIGNAL(src, COMSIG_AIRLOCK_OPEN, forced) - set_density(FALSE) - operating = FALSE - return TRUE - -/obj/machinery/door/airlock/instant/close(forced = DEFAULT_DOOR_CHECKS, force_crush = FALSE) - operating = TRUE - SEND_SIGNAL(src, COMSIG_AIRLOCK_CLOSE, forced) - set_density(TRUE) - operating = FALSE - return TRUE // SKYRAT EDIT REMOVAL START - moved to code/__DEFINES/~skyrat_defines/airlock.dm /* #undef AIRLOCK_SECURITY_NONE @@ -3335,8 +2556,5 @@ #undef AIRLOCK_FRAME_CLOSING #undef AIRLOCK_FRAME_OPEN #undef AIRLOCK_FRAME_OPENING -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END - moved to code/__DEFINES/~skyrat_defines/airlock.dm -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index aeb1eec4681..2973579153a 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -109,11 +109,7 @@ var/new_cycle_id = trim(params["passedCycleId"], 30) passed_cycle_id = new_cycle_id -<<<<<<< HEAD -/obj/item/electronics/airlock/ui_act(action, params) -======= /obj/item/electronics/airlock/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 7105d3bf483..3b66f304eb3 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -1,4 +1,3 @@ -<<<<<<< HEAD //#define MAX_TIMER (15 MINUTES) //ORIGINAL #define MAX_TIMER (60 MINUTES) //SKYRAT EDIT CHANGE //#define PRESET_SHORT (2 MINUTES) //ORIGINAL @@ -7,12 +6,6 @@ #define PRESET_MEDIUM (10 MINUTES) //SKYRAT EDIT CHANGE //#define PRESET_LONG (5 MINUTES) //ORIGINAL #define PRESET_LONG (15 MINUTES) //SKYRAT EDIT CHANGE -======= -#define MAX_TIMER (15 MINUTES) -#define PRESET_SHORT (2 MINUTES) -#define PRESET_MEDIUM (3 MINUTES) -#define PRESET_LONG (5 MINUTES) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Brig Door control displays. @@ -85,11 +78,7 @@ if(!timing) return PROCESS_KILL -<<<<<<< HEAD - if(REALTIMEOFDAY - activation_time >= timer_duration) // SKYRAT EDIT CHANGE: original was world.time -======= if(world.time - activation_time >= timer_duration) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 timer_end() // open doors, reset timer, clear status screen update_content() @@ -115,7 +104,7 @@ if(machine_stat & (NOPOWER|BROKEN)) return 0 - activation_time = REALTIMEOFDAY // SKYRAT EDIT CHANGE: original was world.time + activation_time = world.time timing = TRUE begin_processing() @@ -188,11 +177,7 @@ * * seconds - Return the time in seconds if TRUE, else deciseconds. */ /obj/machinery/status_display/door_timer/proc/time_left(seconds = FALSE) -<<<<<<< HEAD - . = max(0, timer_duration + (activation_time ? activation_time - REALTIMEOFDAY : 0)) // SKYRAT EDIT CHANGE, Original: . = max(0, timer_duration + (activation_time ? activation_time - world.time : 0)) -======= . = max(0, timer_duration + (activation_time ? activation_time - world.time : 0)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(seconds) . /= (1 SECONDS) @@ -233,11 +218,7 @@ break return data -<<<<<<< HEAD -/obj/machinery/status_display/door_timer/ui_act(action, params) -======= /obj/machinery/status_display/door_timer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -288,7 +269,7 @@ user.investigate_log("set cell [id]'s timer to [preset_time/10] seconds", INVESTIGATE_RECORDS) user.log_message("set cell [id]'s timer to [preset_time/10] seconds", LOG_ATTACK) if(timing) - activation_time = REALTIMEOFDAY // SKYRAT EDIT CHANGE: original was world.time + activation_time = world.time else . = FALSE diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 5c3adb22cbf..2edd188c6e8 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -576,19 +576,11 @@ else if(ismonkey(future_pancake)) //For monkeys future_pancake.emote("screech") future_pancake.adjustBruteLoss(DOOR_CRUSH_DAMAGE) -<<<<<<< HEAD future_pancake.StaminaKnockdown(20, TRUE, TRUE) // SKYRAT EDIT CHANGE - AIRLOCKS - ORIGINAL: future_pancake.Paralyze(100) else if(ishuman(future_pancake)) //For humans future_pancake.adjustBruteLoss(DOOR_CRUSH_DAMAGE) future_pancake.emote("scream") future_pancake.StaminaKnockdown(20, TRUE, TRUE) // SKYRAT EDIT CHANGE - AIRLOCKS - ORIGINAL: future_pancake.Paralyze(100) -======= - future_pancake.Paralyze(100) - else if(ishuman(future_pancake)) //For humans - future_pancake.adjustBruteLoss(DOOR_CRUSH_DAMAGE) - future_pancake.emote("scream") - future_pancake.Paralyze(100) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else //for simple_animals & borgs future_pancake.adjustBruteLoss(DOOR_CRUSH_DAMAGE) var/turf/location = get_turf(src) @@ -699,8 +691,4 @@ return ..() return ..(0) -<<<<<<< HEAD // #undef DOOR_CLOSE_WAIT // SKYRAT EDIT REMOVAL - moved to code/__DEFINES/~skyrat_defines/airlock.dm -======= -#undef DOOR_CLOSE_WAIT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 1725ae4ffc2..88731b5c6a1 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -279,21 +279,13 @@ /obj/machinery/door/firedoor/proc/check_atmos(turf/checked_turf) var/datum/gas_mixture/environment = checked_turf.return_air() -<<<<<<< HEAD - + if(!environment) + stack_trace("We tried to check a gas_mixture that doesn't exist for its firetype, what are you DOING") + return var/pressure = environment?.return_pressure() //SKYRAT EDIT ADDITION - Micro optimisation if(environment?.temperature >= BODYTEMP_HEAT_DAMAGE_LIMIT || pressure > WARNING_HIGH_PRESSURE) //SKYRAT EDIT CHANGE - BETTER LOCKS return FIRELOCK_ALARM_TYPE_HOT if(environment?.temperature <= BODYTEMP_COLD_DAMAGE_LIMIT || pressure < WARNING_LOW_PRESSURE) //SKYRAT EDIT CHANGE - BETTER LOCKS -======= - if(!environment) - stack_trace("We tried to check a gas_mixture that doesn't exist for its firetype, what are you DOING") - return - - if(environment.temperature >= FIRE_MINIMUM_TEMPERATURE_TO_EXIST) - return FIRELOCK_ALARM_TYPE_HOT - if(environment.temperature <= BODYTEMP_COLD_DAMAGE_LIMIT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FIRELOCK_ALARM_TYPE_COLD return diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 2fc64ff1208..83b16269002 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -31,11 +31,7 @@ return TRUE /obj/machinery/door_buttons/access_button -<<<<<<< HEAD - icon = 'icons/obj/machines/wallmounts.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE -======= icon = 'icons/obj/machines/wallmounts.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "access_button_standby" base_icon_state = "access_button" name = "access button" diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index 1dbb0c473cb..18e88090296 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -6,11 +6,7 @@ #define AIRLOCK_STATE_OUTOPEN "outopen" /obj/machinery/airlock_controller -<<<<<<< HEAD - icon = 'icons/obj/machines/wallmounts.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE -======= icon = 'icons/obj/machines/wallmounts.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "airlock_control_standby" base_icon_state = "airlock_control" @@ -248,11 +244,7 @@ return data -<<<<<<< HEAD -/obj/machinery/airlock_controller/ui_act(action, params) -======= /obj/machinery/airlock_controller/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/flatpacker.dm b/code/game/machinery/flatpacker.dm index b58d27e86e3..01224ad8b00 100644 --- a/code/game/machinery/flatpacker.dm +++ b/code/game/machinery/flatpacker.dm @@ -112,11 +112,7 @@ /obj/machinery/flatpacker/proc/AfterMaterialInsert(container, obj/item/item_inserted, last_inserted_id, mats_consumed, amount_inserted, atom/context) SIGNAL_HANDLER -<<<<<<< HEAD - //we use initial(active_power_usage) because higher tier parts will have higher active usage but we have no benifit from it -======= //we use initial(active_power_usage) because higher tier parts will have higher active usage but we have no benefit from it ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(directly_use_energy(ROUND_UP((amount_inserted / (MAX_STACK_SIZE * SHEET_MATERIAL_AMOUNT)) * 0.4 * initial(active_power_usage)))) flick_overlay_view(mutable_appearance('icons/obj/machines/lathes.dmi', "flatpacker_bar"), 1 SECONDS) @@ -296,11 +292,7 @@ if(isnull(amount)) return -<<<<<<< HEAD - //we use initial(active_power_usage) because higher tier parts will have higher active usage but we have no benifit from it -======= //we use initial(active_power_usage) because higher tier parts will have higher active usage but we have no benefit from it ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!directly_use_energy(ROUND_UP((amount / MAX_STACK_SIZE) * 0.4 * initial(active_power_usage)))) say("No power to dispense sheets") return diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index c7b046e15d9..93f60beeb8a 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -82,11 +82,7 @@ return data -<<<<<<< HEAD -/obj/machinery/gulag_item_reclaimer/ui_act(action, params) -======= /obj/machinery/gulag_item_reclaimer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 0bcdda80539..2e40b0b8e48 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -168,11 +168,7 @@ Possible to do for anyone motivated enough: /obj/machinery/holopad/tutorial/attack_hand(mob/user, list/modifiers) if(!istype(user)) return -<<<<<<< HEAD - if(user.incapacitated() || !is_operational) -======= if(user.incapacitated || !is_operational) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(replay_mode) replay_stop() @@ -554,7 +550,6 @@ Possible to do for anyone motivated enough: if(AI) AI.eyeobj.setLoc(get_turf(src)) //ensure the AI camera moves to the holopad -<<<<<<< HEAD hologram.Impersonation = AI //SKYRAT EDIT -- ADDITION -- Customization; puts the AI core as the impersonated mob so that the examine proc can be redirected else //make it like real life hologram.Impersonation = user @@ -564,15 +559,6 @@ Possible to do for anyone motivated enough: hologram.set_anchored(TRUE)//So space wind cannot drag it. //hologram.name = "[user.name] (Hologram)"//If someone decides to right click. // ORIGINAL hologram.name = user.name //SKYRAT EDIT -- Make the name exact, so that the double-emotes are less jarring in the chat -======= - else //make it like real life - hologram.Impersonation = user - hologram.mouse_opacity = MOUSE_OPACITY_TRANSPARENT//So you can't click on it. - hologram.layer = FLY_LAYER //Above all the other objects/mobs. Or the vast majority of them. - SET_PLANE_EXPLICIT(hologram, ABOVE_GAME_PLANE, src) - hologram.set_anchored(TRUE)//So space wind cannot drag it. - hologram.name = "[user.name] (Hologram)"//If someone decides to right click. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_holo(user, hologram) set_holo(user, hologram) @@ -691,11 +677,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ if(!isliving(owner)) return TRUE var/mob/living/user = owner -<<<<<<< HEAD - if(user.incapacitated() || !user.client) -======= if(user.incapacitated || !user.client) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/machinery/hypnochair.dm b/code/game/machinery/hypnochair.dm index 2a8d7b90cb5..b5ec2c58b38 100644 --- a/code/game/machinery/hypnochair.dm +++ b/code/game/machinery/hypnochair.dm @@ -63,11 +63,7 @@ return data -<<<<<<< HEAD -/obj/machinery/hypnochair/ui_act(action, params) -======= /obj/machinery/hypnochair/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 1105aa34702..e1b10dae6e4 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -106,11 +106,7 @@ .["containerMaxVolume"] = drip_reagents.maximum_volume .["containerReagentColor"] = mix_color_from_reagents(drip_reagents.reagent_list) -<<<<<<< HEAD -/obj/machinery/iv_drip/ui_act(action, params) -======= /obj/machinery/iv_drip/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -323,19 +319,11 @@ if(!isliving(usr)) to_chat(usr, span_warning("You can't do that!")) -<<<<<<< HEAD - return - if(!usr.can_perform_action(src)) - return - if(usr.incapacitated()) - return -======= return if(!usr.can_perform_action(src)) return if(usr.incapacitated) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(reagent_container) if(attached) visible_message(span_warning("[attached] is detached from [src].")) @@ -352,11 +340,7 @@ if(!isliving(usr)) to_chat(usr, span_warning("You can't do that!")) return -<<<<<<< HEAD - if(!usr.can_perform_action(src) || usr.incapacitated()) -======= if(!usr.can_perform_action(src) || usr.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(inject_only) mode = IV_INJECTING diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index b12dcdcd341..67ad9168150 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -417,11 +417,7 @@ return pad.doteleport(user, sending) -<<<<<<< HEAD -/obj/item/launchpad_remote/ui_act(action, params) -======= /obj/item/launchpad_remote/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index d9198a7ddb4..c8d0249fca0 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -1,11 +1,7 @@ /// The light switch. Can have multiple per area. /obj/machinery/light_switch name = "light switch" -<<<<<<< HEAD - icon = 'icons/obj/machines/wallmounts.dmi' //SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= icon = 'icons/obj/machines/wallmounts.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "light-nopower" base_icon_state = "light" desc = "Make dark." diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 9f3c1e66dad..cd36dcce09a 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -149,11 +149,7 @@ if(user.combat_mode) //so we can hit the machine return ..() -<<<<<<< HEAD -/obj/machinery/limbgrower/ui_act(action, list/params) -======= /obj/machinery/limbgrower/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm index b51682ee070..d9fe1f2c3a7 100644 --- a/code/game/machinery/medical_kiosk.dm +++ b/code/game/machinery/medical_kiosk.dm @@ -263,13 +263,10 @@ var/list/trauma_text = list() for(var/t in patient.get_traumas()) var/datum/brain_trauma/trauma = t -<<<<<<< HEAD //SKYRAT EDIT: Scary Traits (Bimbo) if(!trauma.display_scanner) continue //SKYRAT EDIT: Scary Traits (Bimbo) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/trauma_desc = "" switch(trauma.resilience) if(TRAUMA_RESILIENCE_SURGERY) @@ -281,10 +278,7 @@ trauma_desc += "soul-bound " if(TRAUMA_RESILIENCE_ABSOLUTE) trauma_desc += "permanent " -<<<<<<< HEAD // SKYRAT EDIT CHANGE END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 trauma_desc += trauma.scan_desc trauma_text += trauma_desc trauma_status = "Cerebral traumas detected: patient appears to be suffering from [english_list(trauma_text)]." diff --git a/code/game/machinery/modular_shield.dm b/code/game/machinery/modular_shield.dm index 8224b2e7fd7..b4fa6bed17b 100644 --- a/code/game/machinery/modular_shield.dm +++ b/code/game/machinery/modular_shield.dm @@ -276,11 +276,7 @@ data["initiating_field"] = initiating return data -<<<<<<< HEAD -/obj/machinery/modular_shield_generator/ui_act(action, params) -======= /obj/machinery/modular_shield_generator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index f1139125c88..f6f4270835c 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -181,55 +181,6 @@ data["static_controls"] = static_controls return data -<<<<<<< HEAD -/obj/machinery/navbeacon/ui_act(action, params) - . = ..() - if(.) - return - - if(action == "lock" && allowed(usr)) - controls_locked = !controls_locked - return TRUE - - if(controls_locked && !HAS_SILICON_ACCESS(usr)) - return - - switch(action) - if("reset_codes") - glob_lists_deregister() - location = original_location - set_codes() - glob_lists_register() - return TRUE - if("toggle_cover") - cover_locked = !cover_locked - return TRUE - if("toggle_patrol") - toggle_code(NAVBEACON_PATROL_MODE) - return TRUE - if("toggle_delivery") - toggle_code(NAVBEACON_DELIVERY_MODE) - return TRUE - if("set_location") - var/input_text = tgui_input_text(usr, "Enter the beacon's location tag", "Beacon Location", location, 20) - if (!input_text || location == input_text) - return - glob_lists_deregister() - location = input_text - glob_lists_register() - return TRUE - if("set_patrol_next") - var/next_patrol = codes[NAVBEACON_PATROL_NEXT] - var/input_text = tgui_input_text(usr, "Enter the tag of the next patrol location", "Beacon Location", next_patrol, 20) - if (!input_text || location == input_text) - return - codes[NAVBEACON_PATROL_NEXT] = input_text - return TRUE - if("set_delivery_direction") - codes[NAVBEACON_DELIVERY_DIRECTION] = "[text2dir(params["direction"])]" - return TRUE - -======= /obj/machinery/navbeacon/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) @@ -278,7 +229,6 @@ codes[NAVBEACON_DELIVERY_DIRECTION] = "[text2dir(params["direction"])]" return TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Adds or removes a specific code /obj/machinery/navbeacon/proc/toggle_code(code) if(codes[code]) diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm index 482c34187c2..3186d2081e5 100644 --- a/code/game/machinery/newscaster/newscaster_machine.dm +++ b/code/game/machinery/newscaster/newscaster_machine.dm @@ -64,11 +64,7 @@ acid = 30 /obj/machinery/newscaster/pai/ui_state(mob/user) -<<<<<<< HEAD - return GLOB.reverse_contained_state -======= return GLOB.deep_inventory_state ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30) @@ -268,11 +264,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30) return data -<<<<<<< HEAD -/obj/machinery/newscaster/ui_act(action, params) -======= /obj/machinery/newscaster/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 66889d8b3f5..1e90b270c8c 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -62,11 +62,7 @@ data["init_directions"] = init_directions return data -<<<<<<< HEAD -/obj/machinery/pipedispenser/ui_act(action, params) -======= /obj/machinery/pipedispenser/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(..()) return switch(action) @@ -191,12 +187,9 @@ //Allow you to drag-drop disposal pipes and transit tubes into it /obj/machinery/pipedispenser/disposal/mouse_drop_receive(obj/structure/pipe, mob/user, params) -<<<<<<< HEAD -======= if(user.incapacitated) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!istype(pipe, /obj/structure/disposalconstruct) && !istype(pipe, /obj/structure/c_transit_tube) && !istype(pipe, /obj/structure/c_transit_tube_pod)) return diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 44ff9bc1b24..b1b5fc2b8f8 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -1043,11 +1043,7 @@ DEFINE_BITFIELD(turret_flags, list( if(!HAS_SILICON_ACCESS(user)) return if((obj_flags & EMAGGED) || (machine_stat & BROKEN)) -<<<<<<< HEAD - to_chat(usr, span_warning("The turret control is unresponsive!")) -======= to_chat(user, span_warning("The turret control is unresponsive!")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return locked = !locked return TRUE diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 2a914a6ca42..3469ddae3a9 100755 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -99,7 +99,6 @@ if(!energy_gun.can_charge) to_chat(user, span_notice("Your gun has no external power connector.")) return TRUE -<<<<<<< HEAD //SKYRAT EDIT ADDITION if (istype(attacking_item, /obj/item/gun/microfusion)) @@ -115,8 +114,6 @@ return TRUE //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.transferItemToLoc(attacking_item, src) return TRUE diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index e1e0880aefe..45610b47e7a 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -72,11 +72,7 @@ recharge_speed = 0 repairs = 0 for(var/datum/stock_part/capacitor/capacitor in component_parts) -<<<<<<< HEAD - recharge_speed += (capacitor.tier * STANDARD_CELL_CHARGE * 0.1) -======= recharge_speed += 5e-3 * capacitor.tier ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/stock_part/servo/servo in component_parts) repairs += servo.tier - 1 for(var/obj/item/stock_parts/power_store/cell in component_parts) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index a0b7940460c..f2b1ba303eb 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -200,11 +200,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) var/mob/living/L = usr message = L.treat_message(message)["message"] -<<<<<<< HEAD minor_announce(message, "[department] Announcement:", html_encode = FALSE, sound_override = ANNOUNCER_DEPARTMENTAL) // SKYRAT EDIT CHANGE - Announcer Sounds -======= - minor_announce(message, "[department] Announcement:", html_encode = FALSE, sound_override = 'sound/misc/announce_dig.ogg') ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.news_network.submit_article(message, department, "Station Announcements", null) usr.log_talk(message, LOG_SAY, tag="station announcement from [src]") message_admins("[ADMIN_LOOKUPFLW(usr)] has made a station announcement from [src] at [AREACOORD(usr)].") diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm index 8b0117176e3..468992b1246 100644 --- a/code/game/machinery/roulette_machine.dm +++ b/code/game/machinery/roulette_machine.dm @@ -98,11 +98,7 @@ return data -<<<<<<< HEAD -/obj/machinery/roulette/ui_act(action, params) -======= /obj/machinery/roulette/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -460,7 +456,7 @@ "path" = /obj/structure/closet/supplypod/centcompod, "spawn" = /obj/machinery/roulette )) - + qdel(src) #undef ROULETTE_DOZ_COL_PAYOUT diff --git a/code/game/machinery/satellite/satellite_control.dm b/code/game/machinery/satellite/satellite_control.dm index b85b14156b6..9983cc439e3 100644 --- a/code/game/machinery/satellite/satellite_control.dm +++ b/code/game/machinery/satellite/satellite_control.dm @@ -11,11 +11,7 @@ ui = new(user, src, "SatelliteControl", name) ui.open() -<<<<<<< HEAD -/obj/machinery/computer/sat_control/ui_act(action, params) -======= /obj/machinery/computer/sat_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/scanner_gate.dm b/code/game/machinery/scanner_gate.dm index db3f7c8b1eb..680ff39c054 100644 --- a/code/game/machinery/scanner_gate.dm +++ b/code/game/machinery/scanner_gate.dm @@ -17,7 +17,6 @@ #define SCANGATE_POD "pod" #define SCANGATE_GOLEM "golem" #define SCANGATE_ZOMBIE "zombie" -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - MORE SCANNER GATE OPTIONS #define SCANGATE_MAMMAL "mammal" #define SCANGATE_VOX "vox" @@ -33,8 +32,6 @@ #define SCANGATE_SNAIL "snail" #define SCANGATE_GENDER "Gender" //SKYRAT EDIT ADDITION END - MORE SCANNER GATE OPTIONS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/scanner_gate name = "scanner gate" @@ -64,10 +61,7 @@ var/light_fail = FALSE ///Does the scanner ignore light_pass and light_fail for sending signals? var/ignore_signals = FALSE -<<<<<<< HEAD var/detect_gender = "male" //SKYRAT EDIT ADDITION - MORE SCANNER GATE OPTIONS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Modifier to the chance of scanner being false positive/negative var/minus_false_beep = 0 ///Base false positive/negative chance @@ -254,7 +248,6 @@ if(SCANGATE_ZOMBIE) detected_thing = "Zombie" scan_species = /datum/species/zombie -<<<<<<< HEAD //SKYRAT EDIT BEGIN - MORE SCANNER GATE OPTIONS if(SCANGATE_MAMMAL) scan_species = /datum/species/mammal @@ -281,8 +274,6 @@ if(SCANGATE_SNAIL) scan_species = /datum/species/snail //SKYRAT EDIT END - MORE SCANNER GATE OPTIONS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(is_species(scanned_human, scan_species)) beep = TRUE if(detect_species == SCANGATE_ZOMBIE) //Can detect dormant zombies @@ -317,7 +308,6 @@ if(scanned_human.nutrition >= detect_nutrition && detect_nutrition == NUTRITION_LEVEL_FAT) beep = TRUE detected_thing = "Obesity" -<<<<<<< HEAD //SKYRAT EDIT BEGIN - MORE SCANNER GATE OPTIONS if(SCANGATE_GENDER) detected_thing = detect_gender @@ -327,8 +317,6 @@ if(scanned_human.gender == detect_gender) beep = TRUE //SKYRAT EDIT END - MORE SCANNER GATE OPTIONS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SCANGATE_CONTRABAND) for(var/obj/item/content in thing.get_all_contents_skipping_traits(TRAIT_CONTRABAND_BLOCKER)) detected_thing = "Contraband" @@ -391,18 +379,11 @@ data["disease_threshold"] = disease_threshold data["target_species"] = detect_species data["target_nutrition"] = detect_nutrition -<<<<<<< HEAD data["target_gender"] = detect_gender //SKYRAT EDIT - MORE SCANNER GATE OPTIONS data["contraband_enabled"] = !!n_spect return data -/obj/machinery/scanner_gate/ui_act(action, params) -======= - data["contraband_enabled"] = !!n_spect - return data - /obj/machinery/scanner_gate/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -441,7 +422,6 @@ if("Obese") detect_nutrition = NUTRITION_LEVEL_FAT . = TRUE -<<<<<<< HEAD //SKYRAT EDIT BEGIN - MORE SCANNER GATE OPTIONS if("set_target_gender") var/new_gender = params["new_gender"] @@ -457,8 +437,6 @@ detect_gender = "female" . = TRUE //SKYRAT EDIT END - MORE SCANNER GATE OPTIONS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/scanner_gate/preset_guns locked = TRUE @@ -484,7 +462,6 @@ #undef SCANGATE_POD #undef SCANGATE_GOLEM #undef SCANGATE_ZOMBIE -<<<<<<< HEAD //SKYRAT EDIT BEGIN - MORE SCANNER GATE OPTIONS #undef SCANGATE_MAMMAL #undef SCANGATE_VOX @@ -501,5 +478,3 @@ #undef SCANGATE_GENDER //SKYRAT EDIT END - MORE SCANNER GATE OPTIONS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 462b107e44d..97b0adf5601 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -283,11 +283,7 @@ /obj/machinery/power/shieldwallgen name = "shield wall generator" desc = "A shield generator." -<<<<<<< HEAD - icon ='icons/obj/machines/shield_generator.dmi' //SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= icon = 'icons/obj/machines/shield_generator.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "shield_wall_gen" base_icon_state = "shield_wall_gen" light_on = FALSE diff --git a/code/game/machinery/sleepers.dm b/code/game/machinery/sleepers.dm index 34d416498f6..9b843cd5506 100644 --- a/code/game/machinery/sleepers.dm +++ b/code/game/machinery/sleepers.dm @@ -237,11 +237,7 @@ return data -<<<<<<< HEAD -/obj/machinery/sleeper/ui_act(action, params) -======= /obj/machinery/sleeper/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -304,33 +300,21 @@ * Can be controlled from the inside and can be deconstructed. */ /obj/machinery/sleeper/syndie -<<<<<<< HEAD -======= name = "syndicate sleeper" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "sleeper_s" base_icon_state = "sleeper_s" controls_inside = TRUE deconstructable = TRUE -<<<<<<< HEAD - -///Fully upgraded variant, the circuit using tier 4 parts. -/obj/machinery/sleeper/syndie/fullupgrade -======= circuit = /obj/item/circuitboard/machine/sleeper/syndie ///Fully upgraded variant, the circuit using tier 4 parts. /obj/machinery/sleeper/syndie/fullupgrade name = "upgraded syndicate sleeper" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 circuit = /obj/item/circuitboard/machine/sleeper/fullupgrade ///Fully upgraded, not deconstructable, while using the normal sprite. /obj/machinery/sleeper/syndie/fullupgrade/nt -<<<<<<< HEAD -======= name = "\improper Nanotrasen sleeper" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "sleeper" base_icon_state = "sleeper" deconstructable = FALSE diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index b9eca3c52bc..41aa0876169 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -109,11 +109,7 @@ else if(!user.temporarilyRemoveItemFromInventory(inserted_coin)) return ITEM_INTERACT_BLOCKING -<<<<<<< HEAD - balloon_alert(user, "coin insterted") -======= balloon_alert(user, "coin inserted") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balance += inserted_coin.value qdel(inserted_coin) return ITEM_INTERACT_SUCCESS diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index b597fd9e8c2..76c086edfff 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -8,11 +8,7 @@ anchored = FALSE density = TRUE interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN -<<<<<<< HEAD icon = 'icons/obj/pipes_n_cables/atmos.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= - icon = 'icons/obj/pipes_n_cables/atmos.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "sheater-off" base_icon_state = "sheater" name = "space heater" @@ -266,11 +262,7 @@ data["currentTemp"] = round(current_temperature - T0C, 1) return data -<<<<<<< HEAD -/obj/machinery/space_heater/ui_act(action, params) -======= /obj/machinery/space_heater/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -395,11 +387,7 @@ .["beaker"] = beaker .["currentTemp"] = beaker ? (round(beaker.reagents.chem_temp - T0C)) : "N/A" -<<<<<<< HEAD -/obj/machinery/space_heater/improvised_chem_heater/ui_act(action, params) -======= /obj/machinery/space_heater/improvised_chem_heater/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 62643f1f924..d6ffef1b2d6 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -14,11 +14,7 @@ GLOBAL_DATUM_INIT(status_font, /datum/font, new /datum/font/tiny_unicode/size_12 /obj/machinery/status_display name = "status display" desc = null -<<<<<<< HEAD icon = 'icons/obj/machines/status_display.dmi' //// SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= - icon = 'icons/obj/machines/status_display.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "frame" verb_say = "beeps" verb_ask = "beeps" @@ -202,11 +198,7 @@ GLOBAL_LIST_EMPTY(key_to_status_display) if(message1 == "" && message2 == "") return -<<<<<<< HEAD - . += emissive_appearance('modular_skyrat/modules/aesthetics/status_display/icons/status_display.dmi', "outline", src, alpha = src.alpha) // SKYRAT EDIT CHANGE - AESTHETICS -======= . += emissive_appearance(icon, "outline", src, alpha = src.alpha) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Timed process - performs nothing in the base class /obj/machinery/status_display/process() @@ -542,13 +534,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/status_display/ai, 32) "Red Alert" = "redalert", "Blue Alert" = "bluealert", "Green Alert" = "greenalert", -<<<<<<< HEAD "Violet Alert" = "violetalert", // SKYRAT EDIT ADD - Alert Levels "Orange Alert" = "orangealert", // SKYRAT EDIT ADD - Alert Levels "Amber Alert" = "amberalert", // SKYRAT EDIT ADD - Alert Levels "Gamma Alert" = "gammaalert", // SKYRAT EDIT ADD - Alert Levels -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "Biohazard" = "biohazard", "Lockdown" = "lockdown", "Radiation" = "radiation", diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 9b3a7666669..3232dc524ab 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -230,11 +230,7 @@ /obj/machinery/suit_storage_unit/update_overlays() . = ..() -<<<<<<< HEAD - //if things arent powered, these show anyways -======= //if things aren't powered, these show anyways ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(panel_open) . += "[base_icon_state]_panel" if(state_open) @@ -797,11 +793,7 @@ */ /obj/machinery/suit_storage_unit/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/screwdriver) if(screwdriver.tool_behaviour == TOOL_SCREWDRIVER && (uv || locked)) -<<<<<<< HEAD - to_chat(user, span_warning("You cant open the panel while its [locked ? "locked" : "decontaminating"]")) -======= to_chat(user, span_warning("You can't open the panel while its [locked ? "locked" : "decontaminating"]")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE return ..() diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index fa8529b2168..0ac1f7ee44d 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -621,11 +621,7 @@ balloon_alert(user, "set to [chosen_theme?.name || DIMENSION_CHOICE_RANDOM]") /obj/item/bombcore/dimensional/proc/check_menu(mob/user) -<<<<<<< HEAD - if(!user.is_holding(src) || user.incapacitated()) -======= if(!user.is_holding(src) || user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm index 8b9211418d8..06d390e5f2e 100644 --- a/code/game/machinery/telecomms/broadcasting.dm +++ b/code/game/machinery/telecomms/broadcasting.dm @@ -155,11 +155,7 @@ if (TRANSMISSION_SUPERSPACE) // Only radios which are independent for(var/obj/item/radio/independent_radio in GLOB.all_radios["[frequency]"]) -<<<<<<< HEAD - if(independent_radio.independent && independent_radio.can_receive(frequency, signal_reaches_every_z_level)) -======= if((independent_radio.special_channels & RADIO_SPECIAL_CENTCOM) && independent_radio.can_receive(frequency, signal_reaches_every_z_level)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 radios += independent_radio for(var/obj/item/radio/called_radio as anything in radios) diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 1958e7ae225..22a41a6ada6 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -95,11 +95,7 @@ return data -<<<<<<< HEAD -/obj/machinery/computer/telecomms/server/ui_act(action, params) -======= /obj/machinery/computer/telecomms/server/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm index 10605434f89..05186da8bc0 100644 --- a/code/game/machinery/telecomms/computers/message.dm +++ b/code/game/machinery/telecomms/computers/message.dm @@ -117,11 +117,7 @@ data["requests"] = request_list return data -<<<<<<< HEAD -/obj/machinery/computer/message_monitor/ui_act(action, params) -======= /obj/machinery/computer/message_monitor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return . diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm index 2828449d9f8..e70c7f7de17 100644 --- a/code/game/machinery/telecomms/computers/telemonitor.dm +++ b/code/game/machinery/telecomms/computers/telemonitor.dm @@ -81,11 +81,7 @@ return data -<<<<<<< HEAD -/obj/machinery/computer/telecomms/monitor/ui_act(action, params) -======= /obj/machinery/computer/telecomms/monitor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 3e94605eff0..c92384aa4b6 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -82,11 +82,7 @@ return data -<<<<<<< HEAD -/obj/machinery/telecomms/ui_act(action, params) -======= /obj/machinery/telecomms/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/machinery/telecomms/machines/hub.dm b/code/game/machinery/telecomms/machines/hub.dm index 600546679e0..6583cfe4105 100644 --- a/code/game/machinery/telecomms/machines/hub.dm +++ b/code/game/machinery/telecomms/machines/hub.dm @@ -70,10 +70,7 @@ "common", "command", "engineering", -<<<<<<< HEAD -======= "entertainment", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "security", "receiverA", "receiverB", diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 2981dc58142..f06ac5d9209 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -266,11 +266,7 @@ */ /atom/movable/proc/is_user_buckle_possible(mob/living/target, mob/user, check_loc = TRUE) // Standard adjacency and other checks. -<<<<<<< HEAD - if(!Adjacent(user) || !Adjacent(target) || !isturf(user.loc) || user.incapacitated() || target.anchored) -======= if(!Adjacent(user) || !Adjacent(target) || !isturf(user.loc) || user.incapacitated || target.anchored) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(iscarbon(user)) diff --git a/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm b/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm index 87d10805300..ab53099ed34 100644 --- a/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm +++ b/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm @@ -103,7 +103,3 @@ /obj/effect/temp_visual/circle_wave/bioscrambler/light max_alpha = 128 -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/effects/anomalies/anomalies_bluespace.dm b/code/game/objects/effects/anomalies/anomalies_bluespace.dm index d6d89478b10..0a71427776e 100644 --- a/code/game/objects/effects/anomalies/anomalies_bluespace.dm +++ b/code/game/objects/effects/anomalies/anomalies_bluespace.dm @@ -53,11 +53,7 @@ var/turf/TO = get_turf(chosen) // the turf of origin we're travelling TO playsound(TO, 'sound/effects/phasein.ogg', 100, TRUE) -<<<<<<< HEAD - priority_announce("Massive bluespace translocation detected.", "Anomaly Alert", ANNOUNCER_TRANSLOCATION) //SKYRAT EDIT CHANGE - ANNOUNCER -======= priority_announce("Massive bluespace translocation detected.", "Anomaly Alert") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/flashers = list() for(var/mob/living/carbon/C in viewers(TO, null)) diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index 8ece10922c7..da7c4701230 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -29,10 +29,7 @@ /obj/effect/bump_teleporter/singularity_pull() return -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - MOVED TO BLACK_MESA -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/bump_teleporter/Bumped(atom/movable/bumper) if(!validate_setup(bumper)) return @@ -43,10 +40,7 @@ return stack_trace("Bump_teleporter [src] could not find a teleporter with id [id_target]!") -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Check to see if our teleporter was set up correctly mapside. Return TRUE if everything is fine, FALSE if not. /obj/effect/bump_teleporter/proc/validate_setup(atom/movable/checkable) diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 56a99f6cea7..9c2890e924c 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -136,11 +136,7 @@ . = ..() if(!.) return -<<<<<<< HEAD //AddComponent(/datum/component/rot, 0, 5 MINUTES, 0.7) skyrat edit -======= - AddComponent(/datum/component/rot, 0, 5 MINUTES, 0.7) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target) return FALSE diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index 09c9ed4e1b7..55cd7cd98d0 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -18,36 +18,23 @@ return !istype(here_turf, /obj/structure/closet/crate/grave/filled) && ..() /obj/effect/decal/remains/human/smokey -<<<<<<< HEAD - desc = "They look like human remains. They have a strange, smokey aura about them..." -======= name = "remains of Charles Morlbaro" desc = "I guess we figured out what happened to the guy who lives here. You'd best tread lightly around this..." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Our proximity monitor, for detecting nearby looters. var/datum/proximity_monitor/proximity_monitor ///The reagent we will release when our remains are disturbed. var/datum/reagent/that_shit_that_killed_saddam -<<<<<<< HEAD - COOLDOWN_DECLARE(gas_cooldown) -======= ///A cooldown for how frequently the gas is released when disturbed. COOLDOWN_DECLARE(gas_cooldown) ///The length of the aforementioned cooldown. var/gas_cooldown_length = (20 SECONDS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/decal/remains/human/smokey/Initialize(mapload) . = ..() -<<<<<<< HEAD - proximity_monitor = new(src, 0) - that_shit_that_killed_saddam = get_random_reagent_id() -======= proximity_monitor = new(src, 1) var/list/blocked_reagents = subtypesof(/datum/reagent/medicine) + subtypesof(/datum/reagent/consumable) //Boooooriiiiing that_shit_that_killed_saddam = get_random_reagent_id(blacklist = blocked_reagents) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/decal/remains/human/smokey/HasProximity(atom/movable/tomb_raider) if(!COOLDOWN_FINISHED(src, gas_cooldown)) @@ -55,18 +42,11 @@ if(iscarbon(tomb_raider)) var/mob/living/carbon/nearby_carbon = tomb_raider -<<<<<<< HEAD - if (nearby_carbon.move_intent != MOVE_INTENT_WALK || prob(15)) - release_smoke(nearby_carbon) - COOLDOWN_START(src, gas_cooldown, rand(20 SECONDS, 2 MINUTES)) - -======= if(nearby_carbon.move_intent != MOVE_INTENT_WALK || prob(5)) release_smoke(nearby_carbon) COOLDOWN_START(src, gas_cooldown, gas_cooldown_length) ///Releases a cloud of smoke based on the randomly generated reagent in Initialize(). ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/decal/remains/human/smokey/proc/release_smoke(mob/living/smoke_releaser) visible_message(span_warning("[smoke_releaser] disturbs the [src], which releases a huge cloud of gas!")) var/datum/effect_system/fluid_spread/smoke/chem/cigarette_puff = new() @@ -75,8 +55,6 @@ cigarette_puff.set_up(range = 2, amount = DIAMOND_AREA(2), holder = src, location = get_turf(src), silent = TRUE) cigarette_puff.start() -<<<<<<< HEAD -======= ///Subtype of smokey remains used for rare maintenance spawns. /obj/effect/decal/remains/human/smokey/maintenance name = "smokey remains" @@ -86,7 +64,6 @@ . = ..() gas_cooldown_length = rand(4 MINUTES, 6 MINUTES) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/decal/remains/plasma icon_state = "remainsplasma" diff --git a/code/game/objects/effects/decals/turfdecal/markings.dm b/code/game/objects/effects/decals/turfdecal/markings.dm index 6da704c999e..3aeb1c4f38f 100644 --- a/code/game/objects/effects/decals/turfdecal/markings.dm +++ b/code/game/objects/effects/decals/turfdecal/markings.dm @@ -244,11 +244,7 @@ icon_state = "siding_plain_end" /obj/effect/turf_decal/siding/red -<<<<<<< HEAD color = "#486091" //SKYRAT EDIT CHANGE -======= - color = "#DE3A3A" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/turf_decal/siding/red/corner icon_state = "siding_plain_corner" diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm index aec76ea2a3a..ca091cd5019 100644 --- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm +++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm @@ -83,7 +83,6 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/yellow) /obj/effect/turf_decal/tile/red name = "red tile decal" -<<<<<<< HEAD color = "#486091" // SKYRAT EDIT CHANGE TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/red) @@ -97,9 +96,6 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/red) TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_red) /// Bar tiles -======= - color = "#DE3A3A" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/red) diff --git a/code/game/objects/effects/spawners/random/ai_module.dm b/code/game/objects/effects/spawners/random/ai_module.dm index 63368b3afd0..eff8ceeb0fa 100644 --- a/code/game/objects/effects/spawners/random/ai_module.dm +++ b/code/game/objects/effects/spawners/random/ai_module.dm @@ -39,12 +39,9 @@ /obj/item/ai_module/supplied/quarantine, /obj/item/ai_module/core/full/yesman, /obj/item/ai_module/remove, -<<<<<<< HEAD /obj/item/ai_module/core/full/dagothbot, // SKYRAT EDIT - EDITION /obj/item/ai_module/core/full/texas, // SKYRAT EDIT - EDITION /obj/item/ai_module/core/full/emperor, // SKYRAT EDIT - EDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/effect/spawner/random/aimodule/harmful diff --git a/code/game/objects/effects/spawners/random/decoration.dm b/code/game/objects/effects/spawners/random/decoration.dm index 274943b3724..35ad503cb27 100644 --- a/code/game/objects/effects/spawners/random/decoration.dm +++ b/code/game/objects/effects/spawners/random/decoration.dm @@ -114,8 +114,7 @@ /obj/item/flashlight/glowstick/pink, ) -<<<<<<< HEAD -======= + /obj/effect/spawner/random/decoration/glowstick/on name = "random colored glowstick (on)" icon_state = "glowstick" @@ -136,7 +135,6 @@ glowstick.set_light_on(TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/spawner/random/decoration/paint name = "paint spawner" icon_state = "paint" diff --git a/code/game/objects/effects/spawners/random/medical.dm b/code/game/objects/effects/spawners/random/medical.dm index 61a6285df7b..050223525e6 100644 --- a/code/game/objects/effects/spawners/random/medical.dm +++ b/code/game/objects/effects/spawners/random/medical.dm @@ -70,11 +70,7 @@ icon_state = "xeno_egg" loot = list( /obj/effect/decal/remains/xeno = 49, -<<<<<<< HEAD - /obj/item/clothing/mask/facehugger/toy = 1, // SKYRAT EDIT - They should be handled by dynamic - ORIGIGNAL: /obj/effect/spawner/xeno_egg_delivery = 1, -======= /obj/effect/spawner/xeno_egg_delivery = 1, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/effect/spawner/random/medical/surgery_tool diff --git a/code/game/objects/effects/spawners/random/structure.dm b/code/game/objects/effects/spawners/random/structure.dm index 32954676514..289a2aba276 100644 --- a/code/game/objects/effects/spawners/random/structure.dm +++ b/code/game/objects/effects/spawners/random/structure.dm @@ -23,10 +23,7 @@ /obj/effect/spawner/random/trash/mess = 30, /obj/item/kirbyplants/fern = 20, /obj/structure/closet/crate/decorations = 15, -<<<<<<< HEAD -======= /obj/effect/decal/remains/human/smokey/maintenance = 7, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/destructible/cult/pants_altar = 1, ) diff --git a/code/game/objects/effects/spawners/random/trash.dm b/code/game/objects/effects/spawners/random/trash.dm index c088697596d..9cf00c20ee3 100644 --- a/code/game/objects/effects/spawners/random/trash.dm +++ b/code/game/objects/effects/spawners/random/trash.dm @@ -89,10 +89,6 @@ /obj/item/trash/cnds = 1, /obj/item/trash/syndi_cakes = 1, /obj/item/trash/shrimp_chips = 1, -<<<<<<< HEAD - /obj/item/trash/waffles = 1, -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/trash/tray = 1, ) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 19896aa2839..6b95ecefa11 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -39,15 +39,12 @@ ///The config type to use for greyscaled belt overlays. Both this and greyscale_colors must be assigned to work. var/greyscale_config_belt -<<<<<<< HEAD -======= /// Greyscale config used when generating digitigrade versions of the sprite. var/digitigrade_greyscale_config_worn /// Greyscale colors used when generating digitigrade versions of the sprite. /// Optional - If not set it will default to normal greyscale colors, or approximate them if those are unset as well var/digitigrade_greyscale_colors ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* !!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!! IF YOU ADD MORE ICON CRAP TO THIS @@ -232,13 +229,10 @@ var/override_notes = FALSE /// Used if we want to have a custom verb text for throwing. "John Spaceman flicks the ciggerate" for example. var/throw_verb -<<<<<<< HEAD // SKYRAT EDIT ADDITION START /// Does this use the advanced reskinning setup? var/uses_advanced_reskins = FALSE // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A lazylist used for applying fantasy values, contains the actual modification applied to a variable. var/list/fantasy_modifications = null @@ -425,7 +419,6 @@ return if(greyscale_config_worn) worn_icon = SSgreyscale.GetColoredIconByType(greyscale_config_worn, greyscale_colors) -<<<<<<< HEAD // SKYRAT EDIT ADD START if(greyscale_config_worn_digi) worn_icon_digi = SSgreyscale.GetColoredIconByType(greyscale_config_worn_digi, greyscale_colors) @@ -446,8 +439,6 @@ if(greyscale_config_worn_taur_hoof) worn_icon_taur_hoof = SSgreyscale.GetColoredIconByType(greyscale_config_worn_taur_hoof, greyscale_colors) // SKYRAT EDIT ADD END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(greyscale_config_inhand_left) lefthand_file = SSgreyscale.GetColoredIconByType(greyscale_config_inhand_left, greyscale_colors) if(greyscale_config_inhand_right) @@ -864,38 +855,6 @@ . = ..() do_drop_animation(master_storage.parent) -<<<<<<< HEAD -/obj/item/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) - if(QDELETED(hit_atom)) - return - if(SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_IMPACT, hit_atom, throwingdatum) & COMPONENT_MOVABLE_IMPACT_NEVERMIND) - return - if(SEND_SIGNAL(hit_atom, COMSIG_ATOM_PREHITBY, src, throwingdatum) & COMSIG_HIT_PREVENTED) - return - - SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum) - if(get_temperature() && isliving(hit_atom)) - var/mob/living/L = hit_atom - L.ignite_mob() - var/itempush = 1 - if(w_class < WEIGHT_CLASS_BULKY) - itempush = 0 //too light to push anything - if(isliving(hit_atom)) //Living mobs handle hit sounds differently. - var/volume = get_volume_by_throwforce_and_or_w_class() - if (throwforce > 0 || HAS_TRAIT(src, TRAIT_CUSTOM_TAP_SOUND)) - if (mob_throw_hit_sound) - playsound(hit_atom, mob_throw_hit_sound, volume, TRUE, -1) - else if(hitsound) - playsound(hit_atom, hitsound, volume, TRUE, -1) - else - playsound(hit_atom, 'sound/weapons/genhit.ogg',volume, TRUE, -1) - else - playsound(hit_atom, 'sound/weapons/throwtap.ogg', 1, volume, -1) - - else - playsound(src, drop_sound, YEET_SOUND_VOLUME, ignore_walls = FALSE) - return hit_atom.hitby(src, 0, itempush, throwingdatum=throwingdatum) -======= /obj/item/pre_impact(atom/hit_atom, datum/thrownthing/throwingdatum) var/impact_flags = ..() if(w_class < WEIGHT_CLASS_BULKY) @@ -920,7 +879,6 @@ playsound(hit_atom, 'sound/weapons/genhit.ogg',volume, TRUE, -1) else playsound(hit_atom, 'sound/weapons/throwtap.ogg', 1, volume, -1) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE, quickstart = TRUE) if(HAS_TRAIT(src, TRAIT_NODROP)) @@ -1141,11 +1099,7 @@ var/timedelay = usr.client.prefs.read_preference(/datum/preference/numeric/tooltip_delay) / 100 tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, usr), timedelay, TIMER_STOPPABLE)//timer takes delay in deciseconds, but the pref is in milliseconds. dividing by 100 converts it. if(usr.client.prefs.read_preference(/datum/preference/toggle/item_outlines)) -<<<<<<< HEAD - if(istype(L) && L.incapacitated()) -======= if(istype(L) && L.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 apply_outline(COLOR_RED_GRAY) //if they're dead or handcuffed, let's show the outline as red to indicate that they can't interact with that right now else apply_outline() //if the player's alive and well we send the command with no color set, so it uses the theme's color @@ -1425,11 +1379,7 @@ return source_item?.reagents?.add_reagent(/datum/reagent/blood, 2) -<<<<<<< HEAD - else if(custom_materials?.len) //if we've got materials, lets see whats in it -======= else if(custom_materials?.len) //if we've got materials, let's see what's in it ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // How many mats have we found? You can only be affected by two material datums by default var/found_mats = 0 // How much of each material is in it? Used to determine if the glass should break @@ -1532,7 +1482,6 @@ if(SEND_SIGNAL(src, COMSIG_ITEM_OFFER_TAKEN, offerer, taker) & COMPONENT_OFFER_INTERRUPT) return TRUE -<<<<<<< HEAD /// SKYRAT EDIT ADDITION START /obj/item/reskin_obj(mob/M) if(!uses_advanced_reskins) @@ -1602,8 +1551,6 @@ /// SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Special stuff you want to do when an outfit equips this item. /obj/item/proc/on_outfit_equip(mob/living/carbon/human/outfit_wearer, visuals_only, item_slot) SHOULD_CALL_PARENT(TRUE) @@ -1923,8 +1870,6 @@ RETURN_TYPE(/obj/item) return src -<<<<<<< HEAD -======= /// Checks if the bait is liked by the fish type or not. Returns a multiplier that affects the chance of catching it. /obj/item/proc/check_bait(obj/item/fish/fish_type) @@ -1959,4 +1904,3 @@ return bait.reagents?.has_reagent(special_identifier[FISH_BAIT_VALUE], special_identifier[FISH_BAIT_AMOUNT], check_subtypes = TRUE) else CRASH("Unknown bait identifier in fish favourite/disliked list") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/AI_modules/_AI_modules.dm b/code/game/objects/items/AI_modules/_AI_modules.dm index 7bd4d6ceae5..1405dc6880c 100644 --- a/code/game/objects/items/AI_modules/_AI_modules.dm +++ b/code/game/objects/items/AI_modules/_AI_modules.dm @@ -104,10 +104,7 @@ affected_cyborgs += owned_borg borg_flw += "[ADMIN_LOOKUPFLW(owned_borg)], " borg_txt += "[owned_borg.name]([owned_borg.key]), " -<<<<<<< HEAD owned_borg.lawsync() // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 borg_txt = borg_txt.Join() GLOB.lawchanges.Add("[time] : [user.name]([user.key]) used [src.name] on [ainame]([aikey]).[law2log ? " The law specified [law2log]" : ""], [length(affected_cyborgs) ? ", impacting synced borgs [borg_txt]" : ""]") diff --git a/code/game/objects/items/AI_modules/hacked.dm b/code/game/objects/items/AI_modules/hacked.dm index 4d27ee6c553..fafde17acb5 100644 --- a/code/game/objects/items/AI_modules/hacked.dm +++ b/code/game/objects/items/AI_modules/hacked.dm @@ -55,11 +55,7 @@ to_chat(sender, span_warning("You should use [src] on an AI upload console or the AI core itself.")) return if(malf_candidate.mind?.has_antag_datum(/datum/antagonist/malf_ai)) //Already malf -<<<<<<< HEAD - to_chat(sender, span_warning("Unknown error occured. Upload process aborted.")) -======= to_chat(sender, span_warning("Unknown error occurred. Upload process aborted.")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/datum/antagonist/malf_ai/infected/malf_datum = new (give_objectives = TRUE, new_boss = sender.mind) diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index c763ee40a01..672ec158623 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -229,11 +229,7 @@ * Actually add current decal to the floor. * * Responsible for actually adding the element to the turf for maximum flexibility.area -<<<<<<< HEAD - * Can be overriden for different decal behaviors. -======= * Can be overridden for different decal behaviors. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Arguments: * * target - The turf being painted to */ @@ -302,11 +298,7 @@ .["current_dir"] = stored_dir .["current_custom_color"] = stored_custom_color -<<<<<<< HEAD -/obj/item/airlock_painter/decal/ui_act(action, list/params) -======= /obj/item/airlock_painter/decal/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -401,11 +393,8 @@ list("Neutral", "#D4D4D432"), list("Dark", "#0e0f0f"), list("Bar Burgundy", "#79150082"), -<<<<<<< HEAD list("Sec Blue", "#486091"), // SKYRAT EDIT CHANGE -======= list("Sec Red", "#DE3A3A"), ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 list("Cargo Brown", "#A46106"), list("Engi Yellow", "#EFB341"), list("Service Green", "#9FED58"), diff --git a/code/game/objects/items/bear_armor.dm b/code/game/objects/items/bear_armor.dm index c2477546f97..140a3d295f1 100644 --- a/code/game/objects/items/bear_armor.dm +++ b/code/game/objects/items/bear_armor.dm @@ -1,11 +1,7 @@ /obj/item/bear_armor name = "pile of bear armor" desc = "A scattered pile of various shaped armor pieces fitted for a bear, some duct tape, and a nail filer. Crude instructions \ -<<<<<<< HEAD - are written on the back of one of the plates in russian. This seems like an awful idea." -======= are written on the back of one of the plates in Russian. This seems like an awful idea." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/obj/tools.dmi' icon_state = "bear_armor_upgrade" diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm index 03fcada3b27..d8b48e0789b 100644 --- a/code/game/objects/items/body_egg.dm +++ b/code/game/objects/items/body_egg.dm @@ -15,22 +15,6 @@ if(iscarbon(loc)) Insert(loc) -<<<<<<< HEAD -/obj/item/organ/internal/body_egg/Insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) - . = ..() - if(!.) - return - egg_owner.add_traits(list(TRAIT_XENO_HOST, TRAIT_XENO_IMMUNE), ORGAN_TRAIT) - egg_owner.med_hud_set_status() - INVOKE_ASYNC(src, PROC_REF(AddInfectionImages), egg_owner) - -/obj/item/organ/internal/body_egg/Remove(mob/living/carbon/egg_owner, special, movement_flags) - . = ..() - egg_owner.remove_traits(list(TRAIT_XENO_HOST, TRAIT_XENO_IMMUNE), ORGAN_TRAIT) - egg_owner.med_hud_set_status() - INVOKE_ASYNC(src, PROC_REF(RemoveInfectionImages), egg_owner) - -======= /obj/item/organ/internal/body_egg/mob_insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() @@ -44,7 +28,6 @@ egg_owner.med_hud_set_status() INVOKE_ASYNC(src, PROC_REF(RemoveInfectionImages), egg_owner) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/body_egg/on_death(seconds_per_tick, times_fired) . = ..() if(!owner) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 26216eaa603..4adb8d28b8c 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -86,11 +86,7 @@ return item_bag /obj/item/bodybag/bluespace/container_resist_act(mob/living/user) -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_warning("You can't get out while you're restrained like this!")) return user.changeNext_move(CLICK_CD_BREAKOUT) @@ -101,11 +97,7 @@ return // you are still in the bag? time to go unless you KO'd, honey! // if they escape during this time and you rebag them the timer is still clocking down and does NOT reset so they can very easily get out. -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(loc, span_warning("The pressure subsides. It seems that they've stopped resisting...")) return loc.visible_message(span_warning("[user] suddenly appears in front of [loc]!"), span_userdanger("[user] breaks free of [src]!")) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index ac7e782b36d..67577e62b41 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -87,11 +87,7 @@ var/holopay_name = "holographic pay stand" /// Registered owner's age. -<<<<<<< HEAD - var/registered_age = 18 //SKYRAT EDIT - ORIGINAL (13) -======= - var/registered_age = 30 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + var/registered_age = 18 //SKYRAT EDIT - ORIGINAL (30) /// The job name registered on the card (for example: Assistant). var/assignment @@ -108,14 +104,11 @@ /// Boolean value. If TRUE, the [Intern] tag gets prepended to this ID card when the label is updated. var/is_intern = FALSE -<<<<<<< HEAD -======= ///If true, the wearer will have bigger arrow when pointing at things. Passed down by trims. var/big_pointer = FALSE ///If set, the arrow will have a different color. var/pointer_color ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/armor/card_id fire = 100 acid = 100 @@ -156,8 +149,6 @@ QDEL_NULL(my_store) return ..() -<<<<<<< HEAD -======= /obj/item/card/id/equipped(mob/user, slot) . = ..() if(slot == ITEM_SLOT_ID) @@ -181,7 +172,6 @@ UnregisterSignal(user, COMSIG_MOVABLE_POINTED) return ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/card/id/get_id_examine_strings(mob/user) . = ..() . += list("[icon2html(get_cached_flat_icon(), user, extra_classes = "bigicon")]") @@ -459,11 +449,7 @@ if(Adjacent(user)) var/minor if(registered_name && registered_age && registered_age < AGE_MINOR) -<<<<<<< HEAD minor = " [registered_age]" //SKYRAT EDIT CHANGE -======= - minor = " (MINOR)" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.visible_message(span_notice("[user] shows you: [icon2html(src, viewers(user))] [src.name][minor]."), span_notice("You show \the [src.name][minor].")) add_fingerprint(user) @@ -608,14 +594,11 @@ return ITEM_INTERACT_BLOCKING to_chat(user, span_notice("You stuff the contents into the card! They disappear in a puff of bluespace smoke, adding [money_added] worth of credits to the linked account.")) return ITEM_INTERACT_SUCCESS -<<<<<<< HEAD /// SKYRAT EDIT BEGINS - Trim Tokens - Proc defined in modular_skyrat/modules/trim_tokens/code/cards_id.dm else if(istype(tool, /obj/item/trim_token)) apply_token(tool, user) return /// SKYRAT EDIT ENDS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return NONE /** @@ -1469,11 +1452,7 @@ desc = "A highly advanced chameleon ID card. Touch this card on another ID card or player to choose which accesses to copy. \ Has special magnetic properties which force it to the front of wallets." trim = /datum/id_trim/chameleon -<<<<<<< HEAD wildcard_slots = WILDCARD_LIMIT_CHAMELEON_PLUS // SKYRAT EDIT - Original WILDCARD_LIMIT_CHAMELEON -======= - wildcard_slots = WILDCARD_LIMIT_CHAMELEON ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 actions_types = list(/datum/action/item_action/chameleon/change/id, /datum/action/item_action/chameleon/change/id_trim) /// Have we set a custom name and job assignment, or will we use what we're given when we chameleon change? @@ -1608,11 +1587,7 @@ return data -<<<<<<< HEAD -/obj/item/card/id/advanced/chameleon/ui_act(action, list/params) -======= /obj/item/card/id/advanced/chameleon/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -1917,11 +1892,7 @@ /obj/item/card/cardboard/proc/after_input_check(mob/living/user, obj/item/item, input, value) if(!input || (value && input == value)) return FALSE -<<<<<<< HEAD - if(QDELETED(user) || QDELETED(item) || QDELETED(src) || user.incapacitated() || !user.is_holding(item) || !user.CanReach(src) || !user.can_write(item)) -======= if(QDELETED(user) || QDELETED(item) || QDELETED(src) || user.incapacitated || !user.is_holding(item) || !user.CanReach(src) || !user.can_write(item)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm index e951a0bcb78..7eb62ca1b63 100644 --- a/code/game/objects/items/chainsaw.dm +++ b/code/game/objects/items/chainsaw.dm @@ -79,12 +79,7 @@ /** * Handles adding components to the chainsaw. Added in Initialize() - * -<<<<<<< HEAD - * Applies components to the chainsaw. Added as a seperate proc to allow for -======= * Applies components to the chainsaw. Added as a separate proc to allow for ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * variance between subtypes */ /obj/item/chainsaw/proc/apply_components() diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 70c3df834ee..666c7ae8b8b 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -43,14 +43,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/match/proc/matchignite() if(lit || burnt) return -<<<<<<< HEAD //SKYRAT EDIT ADDITION var/turf/my_turf = get_turf(src) my_turf.pollute_turf(/datum/pollutant/sulphur, 5) //SKYRAT EDIT END -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 playsound(src, 'sound/items/match_strike.ogg', 15, TRUE) lit = TRUE icon_state = "match_lit" @@ -191,11 +187,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM /// Which people ate cigarettes and how many var/static/list/cigarette_eaters = list() -<<<<<<< HEAD var/pollution_type = /datum/pollutant/smoke //SKYRAT EDIT ADDITION /// What type of pollution does this produce on smoking, changed to weed pollution sometimes -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/cigarette/Initialize(mapload) . = ..() create_reagents(chem_volume, INJECTABLE | NO_REACT) @@ -256,11 +249,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!QDELETED(src) && !QDELETED(dropee) && how_long_have_we_been_smokin >= 4 SECONDS && iscarbon(dropee) && iscarbon(loc)) var/mob/living/carbon/smoker = dropee // This relies on the fact that dropped is called before slot is nulled -<<<<<<< HEAD - if(src == smoker.wear_mask && !smoker.incapacitated()) -======= if(src == smoker.wear_mask && !smoker.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 long_exhale(smoker) UnregisterSignal(dropee, list(COMSIG_HUMAN_FORCESAY, COMSIG_ATOM_DIR_CHANGE)) @@ -484,14 +473,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM extinguish() return -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Pollution var/turf/location = get_turf(src) location.pollute_turf(pollution_type, 5, POLLUTION_PASSIVE_EMITTER_CAP) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 smoketime -= seconds_per_tick * (1 SECONDS) if(smoketime <= 0) put_out(user) @@ -1184,19 +1170,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/vape name = "\improper E-Cigarette" desc = "A classy and highly sophisticated electronic cigarette, for classy and dignified gentlemen. A warning label reads \"Warning: Do not fill with flammable materials.\""//<<< i'd vape to that. -<<<<<<< HEAD icon = 'icons/obj/clothing/masks.dmi' worn_icon_muzzled = 'modular_skyrat/master_files/icons/mob/clothing/mask.dmi' //SKYRAT EDIT: ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "vape" worn_icon_state = "vape_worn" greyscale_config = /datum/greyscale_config/vape greyscale_config_worn = /datum/greyscale_config/vape/worn -<<<<<<< HEAD greyscale_config_worn_muzzled = /datum/greyscale_config/vape/worn/muzzled //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#2e2e2e" inhand_icon_state = null w_class = WEIGHT_CLASS_TINY @@ -1340,7 +1320,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM STOP_PROCESSING(SSobj, src) //it's reusable so it won't unequip when empty return -<<<<<<< HEAD if(!COOLDOWN_FINISHED(src, drag_cooldown)) return @@ -1354,14 +1333,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM my_turf.pollute_turf(/datum/pollutant/smoke/vape, 5, POLLUTION_PASSIVE_EMITTER_CAP) //SKYRAT EDIT END -======= - - if(!COOLDOWN_FINISHED(src, drag_cooldown)) - return - - //Time to start puffing those fat vapes, yo. - COOLDOWN_START(src, drag_cooldown, dragtime) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(obj_flags & EMAGGED) var/datum/effect_system/fluid_spread/smoke/chem/smoke_machine/puff = new puff.set_up(4, holder = src, location = loc, carry = reagents, efficiency = 24) diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm index a2da37bfdcf..eb878581b5a 100644 --- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm @@ -631,10 +631,7 @@ /obj/machinery/vending/coffee = "Solar's Best Hot Drinks", /obj/machinery/vending/cola = "Robust Softdrinks", /obj/machinery/vending/custom = "Custom Vendor", -<<<<<<< HEAD -======= /obj/machinery/vending/cytopro = "CytoPro", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/vending/dinnerware = "Plasteel Chef's Dinnerware Vendor", /obj/machinery/vending/drugs = "NanoDrug Plus", /obj/machinery/vending/engineering = "Robco Tool Maker", @@ -670,7 +667,6 @@ /obj/machinery/vending/wardrobe/science_wardrobe = "SciDrobe", /obj/machinery/vending/wardrobe/sec_wardrobe = "SecDrobe", /obj/machinery/vending/wardrobe/viro_wardrobe = "ViroDrobe", -<<<<<<< HEAD // SKYRAT STUFF AT THE BOTTOM I SUPPOSE FOR SIMPLICITY'S SAKE /obj/machinery/vending/access/command = "Command Outfitting Station", //SKYRAT EDIT ADDITION /obj/machinery/vending/barbervend = "Fab-O-Vend", //SKYRAT EDIT ADDITION @@ -681,8 +677,6 @@ /obj/machinery/vending/imported/yangyu = "Fudobenda", //SKYRAT EDIT ADDITION /obj/machinery/vending/security = "Armadyne Peacekeeper Equipment Vendor", //SKYRAT EDIT CHANGE - SEC_HUAL - ORIGINAL: /obj/machinery/vending/security = "SecTech", /obj/machinery/vending/deforest_medvend = "DeForest Med-Vend", //SKYRAT PORT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/circuitboard/machine/vendor/screwdriver_act(mob/living/user, obj/item/tool) @@ -939,12 +933,9 @@ /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/glass = 2) -<<<<<<< HEAD -======= /obj/item/circuitboard/machine/sleeper/syndie build_path = /obj/machinery/sleeper/syndie ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/circuitboard/machine/sleeper/fullupgrade build_path = /obj/machinery/sleeper/syndie/fullupgrade req_components = list( @@ -1126,10 +1117,6 @@ /obj/item/stack/sheet/glass = 1, /obj/item/stack/cable_coil = 2) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/circuitboard/machine/dna_infuser name = "DNA Infuser" greyscale_colors = CIRCUIT_COLOR_SCIENCE diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index 2fa56b786d4..d3b1ce94086 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -6,11 +6,7 @@ gender = PLURAL name = "red lipstick" desc = "A generic brand of lipstick." -<<<<<<< HEAD icon = 'modular_skyrat/modules/salon/icons/items.dmi' //SKYRAT EDIT CHANGE - ORIGINAL: icon = 'icons/obj/cosmetic.dmi' -======= - icon = 'icons/obj/cosmetic.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "lipstick" base_icon_state = "lipstick" inhand_icon_state = "lipstick" @@ -41,11 +37,6 @@ . += "Alt-click to change the style." /obj/item/lipstick/update_icon_state() -<<<<<<< HEAD - icon_state = "lipstick[open ? "_uncap" : null]" - inhand_icon_state = "lipstick[open ? "open" : null]" -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "[base_icon_state][open ? "_uncap" : null]" inhand_icon_state = "[base_icon_state][open ? "open" : null]" return ..() @@ -84,11 +75,7 @@ /obj/item/lipstick/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated() || !user.is_holding(src)) -======= if(user.incapacitated || !user.is_holding(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -126,19 +113,10 @@ name = "syndie lipstick" desc = "Syndicate branded lipstick with a killer dose of kisses. Observe safety regulations!" icon_state = "slipstick" -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 base_icon_state = "slipstick" lipstick_color = COLOR_SYNDIE_RED lipstick_trait = TRAIT_SYNDIE_KISS random_spawn = FALSE -<<<<<<< HEAD - lipstick_color = COLOR_SYNDIE_RED - lipstick_trait = TRAIT_SYNDIE_KISS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/lipstick/random name = "lipstick" @@ -203,18 +181,6 @@ to_chat(user, span_notice("You wipe off the lipstick with [src].")) target.update_lips(null) return -<<<<<<< HEAD -======= - - user.visible_message(span_warning("[user] begins to wipe [target]'s lipstick off with \the [src]."), \ - span_notice("You begin to wipe off [target]'s lipstick...")) - if(!do_after(user, 1 SECONDS, target = target)) - return - user.visible_message(span_notice("[user] wipes [target]'s lipstick off with \the [src]."), \ - span_notice("You wipe off [target]'s lipstick.")) - target.update_lips(null) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - user.visible_message(span_warning("[user] begins to wipe [target]'s lipstick off with \the [src]."), \ span_notice("You begin to wipe off [target]'s lipstick...")) if(!do_after(user, 1 SECONDS, target = target)) @@ -362,10 +328,7 @@ shave(human_target, location) return return ..() -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/razor/surgery name = "surgical razor" diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 69b3cae552b..4c4a29dd5bb 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -372,11 +372,7 @@ .["selected_color"] = GLOB.pipe_color_name[paint_color] || paint_color .["paint_colors"] = GLOB.pipe_paint_colors -<<<<<<< HEAD -/obj/item/toy/crayon/ui_act(action, list/params) -======= /obj/item/toy/crayon/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 5c17f57e3ed..4b2712f1763 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -137,20 +137,12 @@ return ..() /obj/item/defibrillator/mouse_drop_dragged(atom/over_object, mob/user, src_location, over_location, params) -<<<<<<< HEAD - if(ismob(loc)) - var/mob/M = loc - if(istype(over_object, /atom/movable/screen/inventory/hand)) - var/atom/movable/screen/inventory/hand/H = over_object - M.putItemFromInventoryInHandIfPossible(src, H.held_index) -======= if(!ismob(loc)) return var/mob/living_mob = loc if(!living_mob.incapacitated && istype(over_object, /atom/movable/screen/inventory/hand)) var/atom/movable/screen/inventory/hand/hand = over_object living_mob.putItemFromInventoryInHandIfPossible(src, hand.held_index) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/defibrillator/screwdriver_act(mob/living/user, obj/item/tool) if(!cell || !cell_removable) @@ -585,15 +577,12 @@ do_cancel() /obj/item/shockpaddles/proc/do_help(mob/living/carbon/H, mob/living/user) -<<<<<<< HEAD var/target_synthetic = (H.mob_biotypes & MOB_ROBOTIC) // SKYRAT EDIT ADDITION BEGIN - SYNTH REVIVAL if (target_synthetic) to_chat(user, span_boldwarning("[H] is a synthetic lifeform! This defibrillator probably isn't calibrated to revive [H.p_them()] properly and could have some serious consequences! \ [span_warning("You might want to [span_blue("surgically revive [H.p_them()]")]...")]")) balloon_alert(user, "target is synthetic!") // immediately grabs their attention even if they dont see chat // SKYRAT EDIT ADDITION END - SYNTH REVIVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.visible_message(span_warning("[user] begins to place [src] on [H]'s chest."), span_warning("You begin to place [src] on [H]'s chest...")) busy = TRUE update_appearance() @@ -640,13 +629,11 @@ fail_reason = "Patient's brain is missing. Further attempts futile." if (DEFIB_FAIL_BLACKLISTED) fail_reason = "Patient has been blacklisted from revival. Further attempts futile." -<<<<<<< HEAD //SKYRAT EDIT ADDITION - DNR TRAIT if (DEFIB_FAIL_DNR) fail_reason = "Patient has been flagged as Do Not Resuscitate. Further attempts futile." //SKYRAT EDIT ADDITION END - DNR TRAIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + if(fail_reason) user.visible_message(span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - [fail_reason]")) @@ -676,17 +663,16 @@ H.revive() H.emote("gasp") H.set_jitter_if_lower(200 SECONDS) -<<<<<<< HEAD + to_chat(H, "[CONFIG_GET(string/blackoutpolicy)]") //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK) if(HAS_MIND_TRAIT(user, TRAIT_MORBID)) user.add_mood_event("morbid_saved_life", /datum/mood_event/morbid_saved_life) else user.add_mood_event("saved_life", /datum/mood_event/saved_life) log_combat(user, H, "revived", defib) -<<<<<<< HEAD + // SKYRAT EDIT ADDITION BEGIN - SYNTH REVIVAL if (target_synthetic) user.visible_message(span_boldwarning("[src] fire a powerful jolt of electricity into [H]'s vulnerable circuitry!")) @@ -704,8 +690,7 @@ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_synth_defib_trauma), brain_organ, trauma), SYNTH_DEFIBBED_TRAUMA_DURATION) // SKYRAT EDIT ADDITION END - SYNTH REVIVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + do_success() return else if (!H.get_organ_by_type(/obj/item/organ/internal/heart)) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 2be8ab69d12..588de216860 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -41,16 +41,9 @@ set_light_on(TRUE) update_brightness() register_context() -<<<<<<< HEAD - if(toggle_context) RegisterSignal(src, COMSIG_HIT_BY_SABOTEUR, PROC_REF(on_saboteur)) -======= - if(toggle_context) - RegisterSignal(src, COMSIG_HIT_BY_SABOTEUR, PROC_REF(on_saboteur)) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/flashlight_eyes) AddElement( @@ -547,10 +540,7 @@ randomize_fuel = FALSE trash_type = /obj/item/trash/candle can_be_extinguished = TRUE -<<<<<<< HEAD var/scented_type //SKYRAT EDIT ADDITION /// Pollutant type for scented candles -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The current wax level, used for drawing the correct icon var/current_wax_level = 1 /// The previous wax level, remembered so we only have to make 3 update_appearance calls total as opposed to every tick diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 6605218c9d3..23882782e6c 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -271,11 +271,7 @@ //catpeople: make any felinid near the target to face the target, chance for felinids to pounce at the light, stepping to the target for(var/mob/living/carbon/human/target_felinid in view(1, targloc)) -<<<<<<< HEAD - if(!isfeline(target_felinid) || target_felinid.stat == DEAD || target_felinid.is_blind() || target_felinid.incapacitated()) // SKYRAT EDIT - FELINE TRAITS. Was: isfelinid(H) -======= - if(!isfelinid(target_felinid) || target_felinid.stat == DEAD || target_felinid.is_blind() || target_felinid.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + if(!isfeline(target_felinid) || target_felinid.stat == DEAD || target_felinid.is_blind() || target_felinid.incapacitated) // SKYRAT EDIT - FELINE TRAITS. Was: isfelinid(H) continue if(target_felinid.body_position == STANDING_UP) target_felinid.setDir(get_dir(target_felinid, targloc)) // kitty always looks at the light @@ -304,11 +300,7 @@ if(outmsg) user.visible_message(span_danger("[user] points [src] at [target]!"), outmsg) //SKYRAT EDIT CHANGE - ORIGINAL: to_chat(user, outmsg) else -<<<<<<< HEAD - user.visible_message(span_notice("[user] points [src] at [target]."), span_notice("You point [src] at [target].")) //SKYRAT EDIT CHANGE - ORIGINAL: to_chat(user, span_info("You point [src] at [target].")) -======= to_chat(user, span_info("You point [src] at [target].")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //we have successfully shone our pointer, reduce our battery depending on whether we have an extra lens or not energy -= crystal_lens ? 2 : 1 diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 8ea1b5f0a26..13821a42de4 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -208,11 +208,7 @@ for(var/obj/machinery/light/target in user.loc) replace_light(target, user) on_a_light = TRUE -<<<<<<< HEAD - if(!on_a_light) //So we dont give a ballon alert when we just used replace_light -======= if(!on_a_light) //So we don't give a balloon alert when we just used replace_light ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.balloon_alert(user, "[uses] lights, [bulb_shards]/[BULB_SHARDS_REQUIRED] fragments") /** diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 0180c223462..d250139e38e 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -87,11 +87,8 @@ // Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby. /obj/item/multitool/ai_detect -<<<<<<< HEAD special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit special_desc = "A special sensor embedded stealthily into this device can detect and warn of nearby silicon activity and camera vision range." // Skyrat edit -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 actions_types = list(/datum/action/item_action/toggle_multitool) var/detect_state = PROXIMITY_NONE var/rangealert = 8 //Glows red when inside diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 29090fd8234..364550f062a 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -2,15 +2,9 @@ #define CLAMPED_OFF 1 #define OPERATING 2 -<<<<<<< HEAD -#define FRACTION_TO_RELEASE 50 -#define ALERT 90 -#define MINIMUM_HEAT 10000 -======= #define FRACTION_TO_RELEASE 25 #define ALERT 90 #define MINIMUM_HEAT 20000 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Powersink - used to drain station power @@ -29,11 +23,7 @@ throw_speed = 1 throw_range = 2 custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT* 7.5) -<<<<<<< HEAD - var/max_heat = 5e7 // Maximum contained heat before exploding. Not actual temperature. -======= var/max_heat = 100 * STANDARD_BATTERY_CHARGE // Maximum contained heat before exploding. Not actual temperature. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/internal_heat = 0 // Contained heat, goes down every tick. var/mode = DISCONNECTED // DISCONNECTED, CLAMPED_OFF, OPERATING var/warning_given = FALSE //! Stop warning spam, only warn the admins/deadchat once that we are about to boom. @@ -181,11 +171,7 @@ if(istype(terminal.master, /obj/machinery/power/apc)) var/obj/machinery/power/apc/apc = terminal.master if(apc.operating && apc.cell) -<<<<<<< HEAD - drained += 0.001 * apc.cell.use(0.05 * STANDARD_CELL_CHARGE, force = TRUE) -======= drained += 0.001 * apc.cell.use(0.1 * STANDARD_BATTERY_CHARGE, force = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 internal_heat += drained /obj/item/powersink/process() diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 537e7fc3984..b127a650e2d 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -104,11 +104,7 @@ data["maxFrequency"] = MAX_FREE_FREQ return data -<<<<<<< HEAD -/obj/item/electropack/ui_act(action, params) -======= /obj/item/electropack/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index fa70311b0b3..2eab06806dd 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -4,41 +4,22 @@ icon = 'icons/obj/devices/circuitry_n_data.dmi' icon_state = "cypherkey_basic" w_class = WEIGHT_CLASS_TINY -<<<<<<< HEAD - /// Can this radio key access the binary radio channel? - var/translate_binary = FALSE - /// Decrypts Syndicate radio transmissions. - var/syndie = FALSE - /// If true, the radio can say/hear on the special CentCom channel. - var/independent = FALSE - /// What channels does this encryption key grant to the parent headset. - var/list/channels = list() -======= /// What channels does this encryption key grant to the parent headset. var/list/channels = list() /// Flags for which "special" radio networks should be accessible var/special_channels = NONE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/language/translated_language greyscale_config = /datum/greyscale_config/encryptionkey_basic greyscale_colors = "#820a16#3758c4" /obj/item/encryptionkey/examine(mob/user) . = ..() -<<<<<<< HEAD - if(LAZYLEN(channels) || translate_binary) -======= if(LAZYLEN(channels) || special_channels & RADIO_SPECIAL_BINARY) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/examine_text_list = list() for(var/i in channels) examine_text_list += "[GLOB.channel_tokens[i]] - [LOWER_TEXT(i)]" -<<<<<<< HEAD - if(translate_binary) -======= if(special_channels & RADIO_SPECIAL_BINARY) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 examine_text_list += "[GLOB.channel_tokens[MODE_BINARY]] - [MODE_BINARY]" . += span_notice("It can access the following channels; [jointext(examine_text_list, ", ")].") @@ -49,22 +30,14 @@ name = "syndicate encryption key" icon_state = "cypherkey_syndicate" channels = list(RADIO_CHANNEL_SYNDICATE = 1) -<<<<<<< HEAD - syndie = TRUE -======= special_channels = RADIO_SPECIAL_SYNDIE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_config = /datum/greyscale_config/encryptionkey_syndicate greyscale_colors = "#171717#990000" /obj/item/encryptionkey/binary name = "binary translator key" icon_state = "cypherkey_basic" -<<<<<<< HEAD - translate_binary = TRUE -======= special_channels = RADIO_SPECIAL_BINARY ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 translated_language = /datum/language/machine greyscale_config = /datum/greyscale_config/encryptionkey_basic greyscale_colors = "#24a157#3758c4" @@ -124,8 +97,6 @@ channels = list(RADIO_CHANNEL_MEDICAL = 1, RADIO_CHANNEL_SERVICE = 1) greyscale_config = /datum/greyscale_config/encryptionkey_service greyscale_colors = "#ebebeb#3bca5a" -<<<<<<< HEAD -======= /obj/item/encryptionkey/headset_srvent name = "press radio encryption key" @@ -133,7 +104,6 @@ channels = list(RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_ENTERTAINMENT = 0) greyscale_config = /datum/greyscale_config/encryptionkey_service greyscale_colors = "#83eb8f#3bca5a" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/encryptionkey/headset_com name = "command radio encryption key" @@ -215,11 +185,7 @@ /obj/item/encryptionkey/headset_cent name = "\improper CentCom radio encryption key" icon_state = "cypherkey_centcom" -<<<<<<< HEAD - independent = TRUE -======= special_channels = RADIO_SPECIAL_CENTCOM ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 channels = list(RADIO_CHANNEL_CENTCOM = 1) greyscale_config = /datum/greyscale_config/encryptionkey_centcom greyscale_colors = "#24a157#dca01b" @@ -234,10 +200,7 @@ RADIO_CHANNEL_SUPPLY = 1, RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_AI_PRIVATE = 1, -<<<<<<< HEAD -======= RADIO_CHANNEL_ENTERTAINMENT = 1, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/encryptionkey/ai_with_binary @@ -251,25 +214,16 @@ RADIO_CHANNEL_SUPPLY = 1, RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_AI_PRIVATE = 1, -<<<<<<< HEAD - ) - translate_binary = TRUE -======= RADIO_CHANNEL_ENTERTAINMENT = 1, ) special_channels = RADIO_SPECIAL_BINARY ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 translated_language = /datum/language/machine /obj/item/encryptionkey/ai/evil //ported from NT, this goes 'inside' the AI. name = "syndicate binary encryption key" icon_state = "cypherkey_syndicate" channels = list(RADIO_CHANNEL_SYNDICATE = 1) -<<<<<<< HEAD - syndie = TRUE -======= special_channels = RADIO_SPECIAL_SYNDIE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_config = /datum/greyscale_config/encryptionkey_syndicate greyscale_colors = "#171717#990000" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index a4e0ea8f4f6..82108c50abc 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -209,8 +209,6 @@ GLOBAL_LIST_INIT(channel_tokens, list( icon_state = "srv_headset" worn_icon_state = "srv_headset" keyslot = /obj/item/encryptionkey/headset_srvmed -<<<<<<< HEAD -======= /obj/item/radio/headset/headset_srvent name = "press headset" @@ -218,7 +216,6 @@ GLOBAL_LIST_INIT(channel_tokens, list( icon_state = "srvent_headset" worn_icon_state = "srv_headset" keyslot = /obj/item/encryptionkey/headset_srvent ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/radio/headset/headset_com name = "command radio headset" @@ -447,16 +444,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( if(!(ch_name in src.channels)) LAZYSET(channels, ch_name, keyslot2.channels[ch_name]) -<<<<<<< HEAD - if(keyslot2.translate_binary) - translate_binary = TRUE - if(keyslot2.syndie) - syndie = TRUE - if(keyslot2.independent) - independent = TRUE -======= special_channels |= keyslot2.special_channels ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/ch_name in channels) secure_radio_connections[ch_name] = add_radio(src, GLOB.radiochannels[ch_name]) @@ -480,11 +468,8 @@ GLOBAL_LIST_INIT(channel_tokens, list( grant_headset_languages(mob_loc) /obj/item/radio/headset/click_alt(mob/living/user) -<<<<<<< HEAD -======= if(!istype(user) || !Adjacent(user) || user.incapacitated) return CLICK_ACTION_BLOCKING ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!command) return CLICK_ACTION_BLOCKING use_command = !use_command diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index b06ae76d7b2..3b690693bd4 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -219,11 +219,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom, 27) command = TRUE icon_off = "intercom_command-p" -<<<<<<< HEAD -MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/prison, 27) -MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/chapel, 27) -MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/command, 27) -======= /obj/item/radio/intercom/syndicate name = "syndicate intercom" desc = "Talk smack through this." @@ -240,4 +235,3 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/chapel, 27) MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/command, 27) MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/syndicate, 27) MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/syndicate/freerange, 27) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 9a2a6bbd0f0..8b897227c7c 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -57,28 +57,16 @@ var/use_command = FALSE /// If true, use_command can be toggled at will. var/command = FALSE -<<<<<<< HEAD -======= /// Does it play radio noise? var/radio_noise = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///makes anyone who is talking through this anonymous. var/anonymize = FALSE /// Encryption key handling var/obj/item/encryptionkey/keyslot -<<<<<<< HEAD - /// If true, can hear the special binary channel. - var/translate_binary = FALSE - /// If true, can say/hear on the special CentCom channel. - var/independent = FALSE - /// If true, hears all well-known channels automatically, and can say/hear on the Syndicate channel. Also protects from radio jammers. - var/syndie = FALSE -======= /// Flags for which "special" radio networks should be accessible var/special_channels = NONE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// associative list of the encrypted radio channels this radio is currently set to listen/broadcast to, of the form: list(channel name = TRUE or FALSE) var/list/channels /// associative list of the encrypted radio channels this radio can listen/broadcast to, of the form: list(channel name = channel frequency) @@ -119,11 +107,7 @@ perform_update_icon = FALSE set_listening(listening) set_broadcasting(broadcasting) -<<<<<<< HEAD - set_frequency(sanitize_frequency(frequency, freerange, syndie)) -======= set_frequency(sanitize_frequency(frequency, freerange, (special_channels & RADIO_SPECIAL_SYNDIE))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_on(on) perform_update_icon = TRUE @@ -180,21 +164,8 @@ /obj/item/radio/proc/resetChannels() channels = list() secure_radio_connections = list() -<<<<<<< HEAD - translate_binary = FALSE - syndie = FALSE - independent = FALSE -======= special_channels = NONE -///goes through all radio channels we should be listening for and readds them to the global list -/obj/item/radio/proc/readd_listening_radio_channels() - for(var/channel_name in channels) - add_radio(src, GLOB.radiochannels[channel_name]) - - add_radio(src, frequency) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - ///goes through all radio channels we should be listening for and readds them to the global list /obj/item/radio/proc/readd_listening_radio_channels() for(var/channel_name in channels) @@ -205,11 +176,7 @@ /obj/item/radio/proc/make_syndie() // Turns normal radios into Syndicate radios! qdel(keyslot) keyslot = new /obj/item/encryptionkey/syndicate() -<<<<<<< HEAD - syndie = TRUE -======= special_channels |= RADIO_SPECIAL_SYNDIE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 recalculateChannels() /obj/item/radio/interact(mob/user) @@ -366,11 +333,7 @@ channel = null // Nearby active jammers prevent the message from transmitting -<<<<<<< HEAD - if(is_within_radio_jammer_range(src) && !syndie) -======= if(is_within_radio_jammer_range(src) && !(special_channels & RADIO_SPECIAL_SYNDIE)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return // Determine the identity information which will be attached to the signal. @@ -380,11 +343,7 @@ var/datum/signal/subspace/vocal/signal = new(src, freq, speaker, language, radio_message, spans, message_mods) // Independent radios, on the CentCom frequency, reach all independent radios -<<<<<<< HEAD - if (independent && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_CTF_GREEN || freq == FREQ_CTF_YELLOW || freq == FREQ_FACTION || freq == FREQ_CYBERSUN || freq == FREQ_INTERDYNE || freq == FREQ_GUILD || freq == FREQ_TARKON || freq == FREQ_SOLFED)) //SKYRAT EDIT CHANGE - FACTION, MAPPING, SOLFED -======= - if (special_channels & RADIO_SPECIAL_CENTCOM && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_CTF_GREEN || freq == FREQ_CTF_YELLOW)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + if (special_channels & RADIO_SPECIAL_CENTCOM && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_CTF_GREEN || freq == FREQ_CTF_YELLOW || freq == FREQ_FACTION || freq == FREQ_CYBERSUN || freq == FREQ_INTERDYNE || freq == FREQ_GUILD || freq == FREQ_TARKON || freq == FREQ_SOLFED)) //SKYRAT EDIT CHANGE - FACTION, MAPPING, SOLFED signal.data["compression"] = 0 signal.transmission_method = TRANSMISSION_SUPERSPACE signal.levels = list(0) @@ -394,11 +353,7 @@ if(isliving(talking_movable)) var/mob/living/talking_living = talking_movable -<<<<<<< HEAD - if(talking_living.client?.prefs.read_preference(/datum/preference/toggle/radio_noise) && !HAS_TRAIT(talking_living, TRAIT_DEAF)) -======= if(radio_noise && !HAS_TRAIT(talking_living, TRAIT_DEAF) && talking_living.client?.prefs.read_preference(/datum/preference/toggle/radio_noise)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SOUND(talking_living, 'sound/misc/radio_talk.ogg') // All radios make an attempt to use the subspace system first @@ -446,11 +401,7 @@ // left hands are odd slots if (idx && (idx % 2) == (message_mods[RADIO_EXTENSION] == MODE_L_HAND)) return -<<<<<<< HEAD - talk_into(speaker, raw_message, , spans, language=message_language, message_mods=filtered_mods) -======= talk_into(speaker, raw_message, spans=spans, language=message_language, message_mods=filtered_mods) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Checks if this radio can receive on the given frequency. /obj/item/radio/proc/can_receive(input_frequency, list/levels) @@ -460,11 +411,7 @@ if(!position || !(position.z in levels)) return FALSE -<<<<<<< HEAD - if (input_frequency == FREQ_SYNDICATE && !syndie) -======= if (input_frequency == FREQ_SYNDICATE && !(special_channels & RADIO_SPECIAL_SYNDIE)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE // allow checks: are we listening on that frequency? @@ -472,11 +419,7 @@ return TRUE for(var/ch_name in channels) if(channels[ch_name] & FREQ_LISTENING) -<<<<<<< HEAD - if(GLOB.radiochannels[ch_name] == text2num(input_frequency) || syndie) -======= if(GLOB.radiochannels[ch_name] == text2num(input_frequency) || special_channels & RADIO_SPECIAL_SYNDIE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE return FALSE @@ -488,11 +431,7 @@ return var/mob/living/holder = loc -<<<<<<< HEAD - if(!holder.client?.prefs.read_preference(/datum/preference/toggle/radio_noise) && !HAS_TRAIT(holder, TRAIT_DEAF)) -======= if(!radio_noise || HAS_TRAIT(holder, TRAIT_DEAF) || !holder.client?.prefs.read_preference(/datum/preference/toggle/radio_noise)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/list/spans = data["spans"] @@ -551,11 +490,7 @@ tune = tune * 10 . = TRUE if(.) -<<<<<<< HEAD - set_frequency(sanitize_frequency(tune, freerange, syndie)) -======= set_frequency(sanitize_frequency(tune, freerange, (special_channels & RADIO_SPECIAL_SYNDIE))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("listen") set_listening(!listening) . = TRUE @@ -659,11 +594,7 @@ channels[ch_name] = TRUE /obj/item/radio/borg/syndicate -<<<<<<< HEAD - syndie = TRUE -======= special_channels = RADIO_SPECIAL_SYNDIE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 keyslot = /obj/item/encryptionkey/syndicate /obj/item/radio/borg/syndicate/Initialize(mapload) @@ -711,8 +642,6 @@ . = ..() set_listening(FALSE) -<<<<<<< HEAD -======= // RADIOS USED BY BROADCASTING /obj/item/radio/entertainment desc = "You should not hold this." @@ -769,5 +698,4 @@ inhand_icon_state = "microphone" canhear_range = 3 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef FREQ_LISTENING diff --git a/code/game/objects/items/devices/scanners/gas_analyzer.dm b/code/game/objects/items/devices/scanners/gas_analyzer.dm index 71a82c3d736..43df72d8a5b 100644 --- a/code/game/objects/items/devices/scanners/gas_analyzer.dm +++ b/code/game/objects/items/devices/scanners/gas_analyzer.dm @@ -134,21 +134,13 @@ return list("gasmixes" = last_gasmix_data) /obj/item/analyzer/attack_self(mob/user, modifiers) -<<<<<<< HEAD if(user.stat != CONSCIOUS || !user.can_read(src)) //SKYRAT EDIT: Blind People Can Analyze Again -======= - if(user.stat != CONSCIOUS || !user.can_read(src) || user.is_blind()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return atmos_scan(user=user, target=get_turf(src), silent=FALSE) on_analyze(source=src, target=get_turf(src)) /obj/item/analyzer/attack_self_secondary(mob/user, modifiers) -<<<<<<< HEAD if(user.stat != CONSCIOUS || !user.can_read(src)) //SKYRAT EDIT: Blind People Can Analyze Again -======= - if(user.stat != CONSCIOUS || !user.can_read(src) || user.is_blind()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ui_interact(user) diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm index b41827cb45d..96ba6aa0547 100644 --- a/code/game/objects/items/devices/scanners/health_analyzer.dm +++ b/code/game/objects/items/devices/scanners/health_analyzer.dm @@ -45,11 +45,7 @@ return BRUTELOSS /obj/item/healthanalyzer/attack_self(mob/user) -<<<<<<< HEAD if(!user.can_read(src)) //SKYRAT EDIT: Blind People Can Analyze Again -======= - if(!user.can_read(src) || user.is_blind()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return scanmode = (scanmode + 1) % SCANMODE_COUNT @@ -62,11 +58,7 @@ /obj/item/healthanalyzer/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!isliving(interacting_with)) return NONE -<<<<<<< HEAD if(!user.can_read(src)) //SKYRAT EDIT CHANGE - Blind People Can Analyze Again- ORIGINAL: if(!user.can_read(src) || user.is_blind()) -======= - if(!user.can_read(src) || user.is_blind()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_BLOCKING var/mob/living/M = interacting_with @@ -104,11 +96,7 @@ /obj/item/healthanalyzer/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers) if(!isliving(interacting_with)) return NONE -<<<<<<< HEAD if(!user.can_read(src)) // SKYRAT EDIT CHANGE - Blind people can analyze again - ORIGINAL: if(!user.can_read(src) || user.is_blind()) -======= - if(!user.can_read(src) || user.is_blind()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_BLOCKING chemscan(user, interacting_with) @@ -144,11 +132,7 @@ * tochat - Whether to immediately post the result into the chat of the user, otherwise it will return the results. */ /proc/healthscan(mob/user, mob/living/target, mode = SCANNER_VERBOSE, advanced = FALSE, tochat = TRUE) -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return // the final list of strings to render @@ -180,7 +164,6 @@ if(HAS_TRAIT(target, TRAIT_HUSK)) if(advanced) if(HAS_TRAIT_FROM(target, TRAIT_HUSK, BURN)) -<<<<<<< HEAD /* SKYRAT EDIT START: More unhusking information */ render_list += "Subject has been husked by severe burns. Proceed by repairing burn damage and following up with \ application of [SYNTHFLESH_UNHUSK_AMOUNT]u synthflesh or injection of rezadone as treatment.\n" @@ -188,11 +171,6 @@ render_list += "Subject has been husked by dessication. Use application of [SYNTHFLESH_LING_UNHUSK_AMOUNT]u \ of synthflesh or injection of rezadone as treatment.\n" /* SKYRAT EDIT END */ -======= - render_list += "Subject has been husked by severe burns.\n" - else if (HAS_TRAIT_FROM(target, TRAIT_HUSK, CHANGELING_DRAIN)) - render_list += "Subject has been husked by dessication.\n" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else render_list += "Subject has been husked by mysterious causes.\n" @@ -207,22 +185,16 @@ if (!target.get_organ_slot(ORGAN_SLOT_BRAIN)) // kept exclusively for soul purposes render_list += "Subject lacks a brain.\n" -<<<<<<< HEAD var/death_consequences_status_text // SKYRAT EDIT ADDITION: Death consequences quirk -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(iscarbon(target)) var/mob/living/carbon/carbontarget = target if(LAZYLEN(carbontarget.get_traumas())) var/list/trauma_text = list() for(var/datum/brain_trauma/trauma in carbontarget.get_traumas()) -<<<<<<< HEAD //SKYRAT EDIT: Scary Traits (Bimbo) if(!trauma.display_scanner) continue //SKYRAT EDIT: Scary Traits (Bimbo) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/trauma_desc = "" switch(trauma.resilience) if(TRAUMA_RESILIENCE_SURGERY) @@ -231,7 +203,6 @@ trauma_desc += "deep-rooted " if(TRAUMA_RESILIENCE_WOUND) trauma_desc += "fracture-derived " -<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN - Curable permanent traumas if(TRAUMA_RESILIENCE_MAGIC) trauma_desc += "soul-bound " @@ -245,19 +216,12 @@ var/datum/brain_trauma/severe/death_consequences/consequences_trauma = trauma death_consequences_status_text = consequences_trauma.get_health_analyzer_link_text(user) // SKYRAT EDIT ADDITION END: Death Consequences Quirk -======= - if(TRAUMA_RESILIENCE_MAGIC, TRAUMA_RESILIENCE_ABSOLUTE) - trauma_desc += "permanent " - trauma_desc += trauma.scan_desc - trauma_text += trauma_desc ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 render_list += "Cerebral traumas detected: subject appears to be suffering from [english_list(trauma_text)].\n" if(carbontarget.quirks.len) render_list += "Subject Major Disabilities: [carbontarget.get_quirk_string(FALSE, CAT_QUIRK_MAJOR_DISABILITY, from_scan = TRUE)].\n" if(advanced) render_list += "Subject Minor Disabilities: [carbontarget.get_quirk_string(FALSE, CAT_QUIRK_MINOR_DISABILITY, TRUE)].\n" -<<<<<<< HEAD // SKYRAT EDIT ADDITION START -- Show increased/decreased brute/burn mods, to "leave a paper trail" for the fragility quirk if(ishuman(target)) var/mob/living/carbon/human/humantarget = target @@ -269,8 +233,6 @@ render_list += "Subject takes [(physiology.burn_mod) * 100]% burn damage.\n" // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (HAS_TRAIT(target, TRAIT_IRRADIATED)) render_list += "Subject is irradiated. Supply toxin healing.\n" @@ -470,30 +432,20 @@ render_list += "[cyberimp_detect]\n" // we handled the last
so we don't need handholding -<<<<<<< HEAD - // SKYRAT EDIT ADDITION - Mutant stuff + // SKYRAT EDIT ADDITION - Mutant stuff and DEATH CONSEQUENCES if(target.GetComponent(/datum/component/mutant_infection)) render_list += span_userdanger("UNKNOWN PROTO-VIRAL INFECTION DETECTED. ISOLATE IMMEDIATELY.") - // SKYRAT EDIT END - - // SKYRAT EDIT ADDITION - DEATH CONSEQUENCES QUIRK if(death_consequences_status_text) render_list += death_consequences_status_text // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(tochat) to_chat(user, examine_block(jointext(render_list, "")), trailing_newline = FALSE, type = MESSAGE_TYPE_INFO) else return(jointext(render_list, "")) /proc/chemscan(mob/living/user, mob/living/target) -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(istype(target) && target.reagents) @@ -579,11 +531,7 @@ /// Displays wounds with extended information on their status vs medscanners /proc/woundscan(mob/user, mob/living/carbon/patient, obj/item/healthanalyzer/scanner, simple_scan = FALSE) -<<<<<<< HEAD - if(!istype(patient) || user.incapacitated()) -======= if(!istype(patient) || user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/render_list = "" @@ -667,11 +615,7 @@ /obj/item/healthanalyzer/simple/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!isliving(interacting_with)) return NONE -<<<<<<< HEAD if(!user.can_read(src)) //SKYRAT EDIT CHANGE - Blind People Can Analyze Again - ORIGINAL: if(!user.can_read(src) || user.is_blind()) -======= - if(!user.can_read(src) || user.is_blind()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_BLOCKING add_fingerprint(user) @@ -756,11 +700,7 @@ /// Checks the individual for any diseases that are visible to the scanner, and displays the diseases in the attacked to the attacker. /proc/diseasescan(mob/user, mob/living/carbon/patient, obj/item/healthanalyzer/simple/scanner) -<<<<<<< HEAD - if(!istype(patient) || user.incapacitated()) -======= if(!istype(patient) || user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/list/render = list() diff --git a/code/game/objects/items/devices/scanners/slime_scanner.dm b/code/game/objects/items/devices/scanners/slime_scanner.dm index 57775a92f50..bf55265f783 100644 --- a/code/game/objects/items/devices/scanners/slime_scanner.dm +++ b/code/game/objects/items/devices/scanners/slime_scanner.dm @@ -16,11 +16,7 @@ /obj/item/slime_scanner/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!isliving(interacting_with)) return NONE -<<<<<<< HEAD if(!user.can_read(src)) //SKYRAT EDIT CHANGE - Blind People Can Analyze Again - ORIGINAL : if(!user.can_read(src) || user.is_blind()) -======= - if(!user.can_read(src) || user.is_blind()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_BLOCKING if (!isslime(interacting_with)) to_chat(user, span_warning("This device can only scan slimes!")) diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 85516c81560..8327e185ea6 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -138,11 +138,7 @@ effective or pretty fucking useless. data["cooldown"] = DisplayTimeText(get_cooldown()) return data -<<<<<<< HEAD -/obj/item/healthanalyzer/rad_laser/ui_act(action, params) -======= /obj/item/healthanalyzer/rad_laser/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index aa1a45f3210..d17530c8010 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -291,11 +291,7 @@ data["valve"] = valve_open return data -<<<<<<< HEAD -/obj/item/transfer_valve/ui_act(action, params) -======= /obj/item/transfer_valve/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index 5b0c5727f3d..218a59a646d 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -23,22 +23,15 @@ light_on = FALSE attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") -<<<<<<< HEAD - block_chance = 45 //SKYRAT EDIT - Lowered ORIGINAL:75 -======= block_chance = 75 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 block_sound = 'sound/weapons/block_blade.ogg' max_integrity = 200 armor_type = /datum/armor/item_dualsaber resistance_flags = FIRE_PROOF wound_bonus = -10 bare_wound_bonus = 20 -<<<<<<< HEAD special_desc_requirement = EXAMINE_CHECK_SYNDICATE_TOY // Skyrat edit special_desc = "A double bladed energy sword employed by the Syndicate in raids" // Skyrat edit -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 demolition_mod = 1.5 //1.5x damage to objects, robots, etc. item_flags = NO_BLOOD_ON_ITEM var/w_class_on = WEIGHT_CLASS_BULKY diff --git a/code/game/objects/items/dyespray.dm b/code/game/objects/items/dyespray.dm index e95eadb0bd4..78358cb9891 100644 --- a/code/game/objects/items/dyespray.dm +++ b/code/game/objects/items/dyespray.dm @@ -1,19 +1,12 @@ /obj/item/dyespray name = "hair dye spray" -<<<<<<< HEAD - desc = "A spray to dye hair as well as giving it any gradient you'd like." // SKYRAT EDIT - Making the dyespray change hair color -======= - desc = "A spray to dye your hair any gradients you'd like." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + desc = "A spray to dye your hair any colors and gradients you'd like." // SKYRAT EDIT - Making the dyespray change hair color w_class = WEIGHT_CLASS_TINY icon = 'icons/obj/cosmetic.dmi' icon_state = "dyespray" -<<<<<<< HEAD var/uses = 40 //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/dyespray/attack_self(mob/user) dye(user, user) @@ -27,7 +20,6 @@ * Arguments: * * target - The mob who we will apply the gradient and gradient color to. */ -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - MOVED TO MODULAR (modular_skyrat\master_files\code\game\objects\items\dyekit.dm) /obj/item/dyespray/proc/dye(mob/target, mob/user) if(!ishuman(target)) @@ -36,12 +28,6 @@ if(!uses) //SKYRAT EDIT ADDITION return //SKYRAT EDIT ADDITION -======= - -/obj/item/dyespray/proc/dye(mob/target, mob/user) - if(!ishuman(target)) - return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/carbon/human/human_target = target var/beard_or_hair = tgui_alert(user, "What do you want to dye?", "Character Preference", list("Hair", "Facial Hair")) if(!beard_or_hair || !user.can_perform_action(src, NEED_DEXTERITY)) @@ -68,7 +54,4 @@ human_target.set_facial_hair_gradient_style(new_grad_style, update = FALSE) human_target.set_facial_hair_gradient_color(new_grad_color, update = TRUE) playsound(src, 'sound/effects/spray.ogg', 10, vary = TRUE) -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm index 3d9fab73470..4445cdd1b72 100644 --- a/code/game/objects/items/eightball.dm +++ b/code/game/objects/items/eightball.dm @@ -219,11 +219,7 @@ data["answers"] += list(answer_data) return data -<<<<<<< HEAD -/obj/item/toy/eightball/haunted/ui_act(action, params) -======= /obj/item/toy/eightball/haunted/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 294fe2d96de..0012dd08f26 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -1,11 +1,7 @@ /obj/item/extinguisher name = "fire extinguisher" desc = "A traditional red fire extinguisher." -<<<<<<< HEAD icon = 'icons/obj/tools.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= - icon = 'icons/obj/tools.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "fire_extinguisher0" worn_icon_state = "fire_extinguisher" inhand_icon_state = "fire_extinguisher" diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm index eb49fa9adf4..eb73f4736b1 100644 --- a/code/game/objects/items/food/burgers.dm +++ b/code/game/objects/items/food/burgers.dm @@ -580,11 +580,7 @@ /obj/item/food/burger/rib name = "mcrib" -<<<<<<< HEAD - desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it." -======= desc = "An elusive rib shaped burger with limited availability across the galaxy. Not as good as you remember it." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "mcrib" food_reagents = list( /datum/reagent/consumable/nutriment = 2, diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm index a49a35e81dd..5ad5cea20fa 100644 --- a/code/game/objects/items/food/meatdish.dm +++ b/code/game/objects/items/food/meatdish.dm @@ -36,8 +36,6 @@ w_class = WEIGHT_CLASS_SMALL starting_reagent_purity = 1.0 -<<<<<<< HEAD -======= /obj/item/food/fishmeat/quality name = "quality fish fillet" desc = "A fillet of some precious fish meat." @@ -68,7 +66,6 @@ . = ..() AddElement(/datum/element/quality_food_ingredient, FOOD_COMPLEXITY_1) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/food/fishmeat/carp name = "carp fillet" desc = "A fillet of spess carp meat." @@ -524,11 +521,7 @@ /obj/item/food/patty name = "patty" -<<<<<<< HEAD - desc = "The nanotrasen patty is the patty for you and me!" -======= desc = "The Nanotrasen patty is the patty for you and me!" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/obj/food/meat.dmi' icon_state = "patty" food_reagents = list(/datum/reagent/consumable/nutriment/protein = 2) diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm index 91174f67fc1..ed391a57bd2 100644 --- a/code/game/objects/items/food/meatslab.dm +++ b/code/game/objects/items/food/meatslab.dm @@ -353,11 +353,7 @@ /obj/item/food/meat/rawbacon name = "raw piece of bacon" desc = "A raw piece of bacon." -<<<<<<< HEAD - icon_state = "baconb" -======= icon_state = "bacon" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bite_consumption = 2 food_reagents = list( /datum/reagent/consumable/nutriment/protein = 2, @@ -373,11 +369,7 @@ /obj/item/food/meat/bacon name = "piece of bacon" desc = "A delicious piece of bacon." -<<<<<<< HEAD - icon_state = "baconcookedb" -======= icon_state = "baconcooked" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 food_reagents = list( /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 1, diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index b0966644440..b2cf4d132c5 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -292,8 +292,6 @@ foodtypes = FRUIT | ALCOHOL crafting_complexity = FOOD_COMPLEXITY_2 -<<<<<<< HEAD -======= /obj/item/food/melonkeg/CheckParts(list/parts_list) . = ..() var/obj/item/reagent_containers/cup/glass/bottle/bottle = locate() in contents @@ -302,7 +300,6 @@ if(bottle.message_in_a_bottle) bottle.message_in_a_bottle.forceMove(drop_location()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/food/honeybar name = "honey nut bar" desc = "Oats and nuts compressed together into a bar, held together with a honey glaze." @@ -579,11 +576,7 @@ tastes = list() /obj/item/food/pacoca -<<<<<<< HEAD - name = "pacoca" -======= name = "paçoca" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "A traditional Brazilian treat made of ground peanuts, sugar, and salt compressed into a cylinder." icon = 'icons/obj/food/food.dmi' icon_state = "pacoca" @@ -812,8 +805,6 @@ foodtypes = VEGETABLES | GRAIN w_class = WEIGHT_CLASS_TINY crafting_complexity = FOOD_COMPLEXITY_4 -<<<<<<< HEAD -======= ///Extracted from squids, or any fish with the ink fish trait. /obj/item/food/ink_sac @@ -841,4 +832,3 @@ victim.Paralyze(2 SECONDS) //splat! victim.visible_message(span_warning("[victim] is inked by [src]!"), span_userdanger("You've been inked by [src]!")) playsound(victim, SFX_DESECRATION, 50, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/food/packaged.dm b/code/game/objects/items/food/packaged.dm index afb6a1b9a19..b3578204a2d 100644 --- a/code/game/objects/items/food/packaged.dm +++ b/code/game/objects/items/food/packaged.dm @@ -156,8 +156,6 @@ tastes = list("seafood" = 7, "tin" = 1) foodtypes = SEAFOOD -<<<<<<< HEAD -======= /obj/item/food/canned/squid_ink/open_can(mob/user) . = ..() AddComponent(/datum/component/splat, \ @@ -177,7 +175,6 @@ victim.visible_message(span_warning("[victim] is inked by [src]!"), span_userdanger("You've been inked by [src]!")) playsound(victim, SFX_DESECRATION, 50, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/food/canned/chap name = "can of CHAP" desc = "CHAP: Chopped Ham And Pork. The classic American canned meat product that won a world war, then sent millions of servicemen home with heart congestion." diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index 666caaeb112..0b96101a99d 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -67,10 +67,6 @@ name = "waffles" desc = "Mmm, waffles." icon_state = "waffles" -<<<<<<< HEAD - trash_type = /obj/item/trash/waffles -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 food_reagents = list( /datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2, @@ -88,10 +84,6 @@ name = "\improper Soylent Green" desc = "Not made of people. Honest." //Totally people. icon_state = "soylent_green" -<<<<<<< HEAD - trash_type = /obj/item/trash/waffles -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 food_reagents = list( /datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2, @@ -106,10 +98,6 @@ name = "\improper Soylent Virdians" desc = "Not made of people. Honest." //Actually honest for once. icon_state = "soylent_yellow" -<<<<<<< HEAD - trash_type = /obj/item/trash/waffles -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 food_reagents = list( /datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2, @@ -124,10 +112,6 @@ name = "roffle waffles" desc = "Waffles from Roffle. Co." icon_state = "rofflewaffles" -<<<<<<< HEAD - trash_type = /obj/item/trash/waffles -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bite_consumption = 4 food_reagents = list( /datum/reagent/consumable/nutriment = 8, diff --git a/code/game/objects/items/food/pie.dm b/code/game/objects/items/food/pie.dm index 7c1da650219..6d73bc2f5df 100644 --- a/code/game/objects/items/food/pie.dm +++ b/code/game/objects/items/food/pie.dm @@ -74,34 +74,6 @@ var/stunning = TRUE crafting_complexity = FOOD_COMPLEXITY_3 -<<<<<<< HEAD -/obj/item/food/pie/cream/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) - . = ..() - if(!.) //if we're not being caught - splat(hit_atom) - -/obj/item/food/pie/cream/proc/splat(atom/movable/hit_atom) - if(isliving(loc)) //someone caught us! - return - var/turf/hit_turf = get_turf(hit_atom) - new/obj/effect/decal/cleanable/food/pie_smudge(hit_turf) - if(reagents?.total_volume) - reagents.expose(hit_atom, TOUCH) - var/is_creamable = TRUE - if(isliving(hit_atom)) - var/mob/living/living_target_getting_hit = hit_atom - if(stunning) - living_target_getting_hit.Paralyze(2 SECONDS) //splat! - if(iscarbon(living_target_getting_hit)) - is_creamable = !!(living_target_getting_hit.get_bodypart(BODY_ZONE_HEAD)) - if(is_creamable) - living_target_getting_hit.adjust_eye_blur(2 SECONDS) - living_target_getting_hit.visible_message(span_warning("[living_target_getting_hit] is creamed by [src]!"), span_userdanger("You've been creamed by [src]!")) - playsound(living_target_getting_hit, SFX_DESECRATION, 50, TRUE) - if(is_creamable && is_type_in_typecache(hit_atom, GLOB.creamable)) - hit_atom.AddComponent(/datum/component/face_decal/creampie, "creampie", EXTERNAL_FRONT) - qdel(src) -======= /obj/item/food/pie/cream/Initialize(mapload) . = ..() AddComponent(/datum/component/splat, hit_callback = CALLBACK(src, PROC_REF(stun_and_blur))) @@ -113,7 +85,6 @@ victim.adjust_eye_blur(2 SECONDS) victim.visible_message(span_warning("[victim] is creamed by [src]!"), span_userdanger("You've been creamed by [src]!")) playsound(victim, SFX_DESECRATION, 50, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/food/pie/cream/nostun stunning = FALSE diff --git a/code/game/objects/items/granters/crafting/fletching.dm b/code/game/objects/items/granters/crafting/fletching.dm index d11bb35d2de..482cc2cd33e 100644 --- a/code/game/objects/items/granters/crafting/fletching.dm +++ b/code/game/objects/items/granters/crafting/fletching.dm @@ -7,11 +7,7 @@ /datum/crafting_recipe/plastic_arrow, /datum/crafting_recipe/shortbow, /datum/crafting_recipe/holy_arrow, -<<<<<<< HEAD - ///datum/crafting_recipe/arrow_quiver, // SKYRAT EDIT REMOVAL: public-knowledge quiver -======= - /datum/crafting_recipe/arrow_quiver, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + // /datum/crafting_recipe/arrow_quiver, // SKYRAT EDIT REMOVAL: public-knowledge quiver /datum/crafting_recipe/violin, ) icon_state = "book4" diff --git a/code/game/objects/items/granters/magic/lightning_bolt.dm b/code/game/objects/items/granters/magic/lightning_bolt.dm index 62fc2faf250..9fb6494bcc3 100644 --- a/code/game/objects/items/granters/magic/lightning_bolt.dm +++ b/code/game/objects/items/granters/magic/lightning_bolt.dm @@ -13,7 +13,3 @@ "UNLIMITED power? Well... maybe if I practice...", "Wait until they're grouped up...", ) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/grenades/_grenade.dm b/code/game/objects/items/grenades/_grenade.dm index e29be9d700c..ca7da893bb4 100644 --- a/code/game/objects/items/grenades/_grenade.dm +++ b/code/game/objects/items/grenades/_grenade.dm @@ -19,10 +19,7 @@ max_integrity = 40 pickup_sound = 'sound/items/grenade_pick_up.ogg' drop_sound = 'sound/items/grenade_drop.ogg' -<<<<<<< HEAD -======= sound_vary = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Bitfields which prevent the grenade from detonating if set. Includes ([GRENADE_DUD]|[GRENADE_USED]) var/dud_flags = NONE ///Is this grenade currently armed? diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index 28b06dde666..c39e947e2bf 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -493,12 +493,8 @@ beaker_one.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40) beaker_two.reagents.add_reagent(/datum/reagent/water, 40) -<<<<<<< HEAD beaker_one.reagents.add_reagent(/datum/reagent/space_cleaner, 20) // SKYRAT EDIT - Bump to 20 to make it work with cellulose beaker_two.reagents.add_reagent(/datum/reagent/cellulose, 20) // SKYRAT EDIT - Cellulose for liquid puddle cleaning -======= - beaker_two.reagents.add_reagent(/datum/reagent/space_cleaner, 10) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 beakers += beaker_one beakers += beaker_two diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index bece36a38b7..98e7a4bab79 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -49,10 +49,6 @@ living_mob.Paralyze(5) living_mob.Knockdown(30) living_mob.soundbang_act(1, max(200 / max(1, distance), 60), rand(0, 5)) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/grenade/stingbang name = "stingbang" diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index b6159aeb0e8..9e8f1d73088 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -50,10 +50,7 @@ custom_price = PAYCHECK_COMMAND * 0.35 pickup_sound = 'sound/items/handcuffs_pick_up.ogg' drop_sound = 'sound/items/handcuffs_drop.ogg' -<<<<<<< HEAD -======= sound_vary = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///How long it takes to handcuff someone var/handcuff_time = 4 SECONDS diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index abbdadae64b..819091eef6b 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -27,11 +27,8 @@ /obj/item/implanter/emp name = "implanter" // Skyrat edit, was implanter (EMP) imp_type = /obj/item/implant/emp -<<<<<<< HEAD special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit special_desc = "A Syndicate implanter used for a EMP implant" // Skyrat edit -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/implant/radio name = "internal radio implant" @@ -91,9 +88,6 @@ /obj/item/implanter/radio/syndicate name = "implanter" // Skyrat edit , was originally implanter (internal syndicate radio) imp_type = /obj/item/implant/radio/syndicate -<<<<<<< HEAD special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit special_desc = "A Syndicate implanter used for a internal radio implant" // Skyrat edit -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm index 64a3d2cfdfb..ffef74de3c1 100644 --- a/code/game/objects/items/implants/implantcase.dm +++ b/code/game/objects/items/implants/implantcase.dm @@ -1,11 +1,7 @@ /** * Item used to store implants. Can be renamed with a pen. Implants are moved between those and implanters when a mob uses an implanter on a case. */ -<<<<<<< HEAD -/obj/item/implantcase//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE -======= /obj/item/implantcase ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "implant case" desc = "A glass case containing an implant." icon = 'icons/obj/medical/syringe.dmi' diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index 55529f89d8c..50302173a79 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -55,11 +55,7 @@ return data -<<<<<<< HEAD -/obj/machinery/implantchair/ui_act(action, params) -======= /obj/machinery/implantchair/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm index 268683f1946..ab1a3b0ea6f 100644 --- a/code/game/objects/items/implants/implanter.dm +++ b/code/game/objects/items/implants/implanter.dm @@ -1,11 +1,7 @@ /** * Players can use this item to put obj/item/implant's in living mobs. Can be renamed with a pen. */ -<<<<<<< HEAD /obj/item/implanter//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE -======= -/obj/item/implanter ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "implanter" desc = "A sterile automatic implant injector." icon = 'icons/obj/medical/syringe.dmi' diff --git a/code/game/objects/items/kirby_plants/kirbyplants.dm b/code/game/objects/items/kirby_plants/kirbyplants.dm index 44493637385..f5e550be4a7 100644 --- a/code/game/objects/items/kirby_plants/kirbyplants.dm +++ b/code/game/objects/items/kirby_plants/kirbyplants.dm @@ -1,11 +1,7 @@ /obj/item/kirbyplants name = "potted plant" -<<<<<<< HEAD - //icon = 'icons/obj/fluff/flora/plants.dmi' // ORIGINAL + //icon = 'icons/obj/fluff/flora/plants.dmi' // SKYRAT EDIT - ORIGINAL icon = 'modular_skyrat/modules/aesthetics/plants/plants.dmi' // SKYRAT EDIT CHANGE -======= - icon = 'icons/obj/fluff/flora/plants.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "plant-01" base_icon_state = "plant-01" desc = "A little bit of nature contained in a pot." @@ -24,11 +20,8 @@ ///If it's a special named plant, set this to true to prevent dead-name overriding. var/custom_plant_name = FALSE var/list/static/random_plant_states -<<<<<<< HEAD /// Maximum icon state number - KEEP THIS UP TO DATE var/random_state_cap = 43 // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/kirbyplants/Initialize(mapload) . = ..() @@ -78,31 +71,19 @@ generate_states() var/current = random_plant_states.Find(icon_state) var/next = WRAP(current+1,1,length(random_plant_states)) -<<<<<<< HEAD - icon_state = random_plant_states[next] - -/obj/item/kirbyplants/proc/generate_states() - random_plant_states = list() - for(var/i in 1 to random_state_cap) //SKYRAT EDIT CHANGE - ORIGINAL: for(var/i in 1 to 24) -======= base_icon_state = random_plant_states[next] update_appearance(UPDATE_ICON) /obj/item/kirbyplants/proc/generate_states() random_plant_states = list() - for(var/i in 1 to 24) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + for(var/i in 1 to random_state_cap) //SKYRAT EDIT CHANGE - ORIGINAL: for(var/i in 1 to 24) var/number if(i < 10) number = "0[i]" else number = "[i]" random_plant_states += "plant-[number]" -<<<<<<< HEAD random_plant_states += list("applebush", "monkeyplant") //SKYRAT EDIT CHANGE - ORIGINAL:random_plant_states += "applebush" -======= - random_plant_states += "applebush" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/kirbyplants/random icon = 'icons/obj/fluff/flora/_flora.dmi' @@ -110,12 +91,8 @@ /obj/item/kirbyplants/random/Initialize(mapload) . = ..() -<<<<<<< HEAD - //icon = 'icons/obj/flora/plants.dmi' // ORIGINAL + //icon = 'icons/obj/flora/plants.dmi' // SKYRAT EDIT - ORIGINAL icon = 'modular_skyrat/modules/aesthetics/plants/plants.dmi' //SKYRAT EDIT CHANGE -======= - icon = 'icons/obj/fluff/flora/plants.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 randomize_base_icon_state() //Handles randomizing the icon during initialize() @@ -150,7 +127,6 @@ base_icon_state = "plant-[rand(26, 29)]" update_appearance(UPDATE_ICON) -<<<<<<< HEAD //SKYRAT EDIT ADDITION START /obj/item/kirbyplants/monkey name = "monkey plant" @@ -159,8 +135,6 @@ trimmable = FALSE //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/kirbyplants/photosynthetic name = "photosynthetic potted plant" desc = "A bioluminescent plant." diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 3ce87ebbfa0..9a55b1cd574 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -163,10 +163,6 @@ custom_price = PAYCHECK_CREW * 1.5 tool_behaviour = TOOL_ROLLINGPIN -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/kitchen/rollingpin/illegal name = "metal rolling pin" desc = "A heavy metallic rolling pin used to bash in those annoying ingredients." diff --git a/code/game/objects/items/machine_wand.dm b/code/game/objects/items/machine_wand.dm index 4705b713f8b..75c765730f7 100644 --- a/code/game/objects/items/machine_wand.dm +++ b/code/game/objects/items/machine_wand.dm @@ -24,8 +24,6 @@ bug_appearance = mutable_appearance('icons/effects/effects.dmi', "fly-surrounding", ABOVE_WINDOW_LAYER) register_context() -<<<<<<< HEAD -======= /obj/item/machine_remote/equipped(mob/user, slot, initial) . = ..() if(user.get_active_held_item() == src) @@ -38,7 +36,6 @@ REMOVE_TRAIT(user, TRAIT_AI_ACCESS, HELD_ITEM_TRAIT) REMOVE_TRAIT(user, TRAIT_SILICON_ACCESS, HELD_ITEM_TRAIT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/machine_remote/Destroy(force) . = ..() if(controlling_machine_or_bot) diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm index eeeaa086b99..7470dd359fd 100644 --- a/code/game/objects/items/mail.dm +++ b/code/game/objects/items/mail.dm @@ -64,11 +64,8 @@ ACCOUNT_SRV = COLOR_PALE_GREEN_GRAY, ACCOUNT_CAR = COLOR_BEIGE, ACCOUNT_SEC = COLOR_PALE_RED_GRAY, -<<<<<<< HEAD ACCOUNT_CMD = COLOR_BLUE_GRAY, // SKYRAT EDIT ADDITION ACCOUNT_CCM = COLOR_DARK_MODERATE_LIME_GREEN, // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) // Icons diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm index 66f3f04d225..4430fc1f197 100644 --- a/code/game/objects/items/melee/baton.dm +++ b/code/game/objects/items/melee/baton.dm @@ -26,11 +26,7 @@ /// The length of the knockdown applied to the user on clumsy_check() var/clumsy_knockdown_time = 18 SECONDS /// How much stamina damage we deal on a successful hit against a living, non-cyborg mob. -<<<<<<< HEAD var/stamina_damage = 35 // SKYRAT EDIT - Less Stamina Damage (Original: 55) -======= - var/stamina_damage = 55 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Chance of causing force_say() when stunning a human mob var/force_say_chance = 33 /// Can we stun cyborgs? @@ -324,10 +320,7 @@ active = FALSE pickup_sound = 'sound/items/stun_baton_pick_up.ogg' drop_sound = 'sound/items/stun_baton_drop.ogg' -<<<<<<< HEAD -======= sound_vary = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The sound effecte played when our baton is extended. var/on_sound = 'sound/weapons/batonextend.ogg' @@ -401,11 +394,7 @@ force = 5 cooldown = 2.5 SECONDS force_say_chance = 80 //very high force say chance because it's funny -<<<<<<< HEAD stamina_damage = 115 // SKYRAT EDIT: Original 85 -======= - stamina_damage = 85 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 clumsy_knockdown_time = 24 SECONDS affect_cyborg = TRUE on_stun_sound = 'sound/effects/contractorbatonhit.ogg' @@ -437,11 +426,7 @@ armor_type = /datum/armor/baton_security throwforce = 7 force_say_chance = 50 -<<<<<<< HEAD stamina_damage = 35 // SKYRAT EDIT - 4 baton crit now (Original: 60) -======= - stamina_damage = 60 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 knockdown_time = 5 SECONDS clumsy_knockdown_time = 15 SECONDS cooldown = 2.5 SECONDS @@ -456,10 +441,7 @@ light_power = 0.5 pickup_sound = 'sound/items/stun_baton_pick_up.ogg' drop_sound = 'sound/items/stun_baton_drop.ogg' -<<<<<<< HEAD -======= sound_vary = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/throw_stun_chance = 35 @@ -647,11 +629,7 @@ */ /obj/item/melee/baton/security/additional_effects_non_cyborg(mob/living/target, mob/living/user) target.set_jitter_if_lower(40 SECONDS) -<<<<<<< HEAD // target.set_confusion_if_lower(10 SECONDS) // SKYRAT EDIT REMOVAL -======= - target.set_confusion_if_lower(10 SECONDS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.set_stutter_if_lower(16 SECONDS) SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK) diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index d250ebb6a59..cb9cbb5fd82 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -30,7 +30,6 @@ /// The heat given off when active. var/active_heat = 3500 -<<<<<<< HEAD // SKYRAT EDIT ADD START /// The sound played when the item is turned on @@ -41,8 +40,6 @@ // SKYRAT EDIT ADD END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/armor/melee_energy fire = 100 acid = 30 diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 01b186ede9a..c9f5932c266 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -164,17 +164,9 @@ user.death(FALSE) REMOVE_TRAIT(src, TRAIT_NODROP, SABRE_SUICIDE_TRAIT) -<<<<<<< HEAD /obj/item/melee/parsnip_sabre name = "parsnip sabre" desc = "A weird, yet elegant weapon. Suprisingly sharp for something made from a parsnip." - -======= - -/obj/item/melee/parsnip_sabre - name = "parsnip sabre" - desc = "A weird, yet elegant weapon. Suprisingly sharp for something made from a parsnip." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/obj/weapons/sword.dmi' icon_state = "parsnip_sabre" inhand_icon_state = "parsnip_sabre" diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index 40801a36d3e..014eafd6510 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -16,11 +16,7 @@ resistance_flags = FLAMMABLE var/mopcount = 0 ///Maximum volume of reagents it can hold. -<<<<<<< HEAD var/max_reagent_volume = 50 // SKYRAT EDIT - ORIGINAL: 15 -======= - var/max_reagent_volume = 15 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mopspeed = 1.5 SECONDS force_string = "robust... against germs" var/insertable = TRUE @@ -82,11 +78,7 @@ /obj/item/mop/advanced desc = "The most advanced tool in a custodian's arsenal, complete with a condenser for self-wetting! Just think of all the viscera you will clean up with this! Due to the self-wetting technology, it proves very inefficient for cleaning up spills." //SKYRAT EDIT name = "advanced mop" -<<<<<<< HEAD max_reagent_volume = 100 // SKYRAT EDIT - ORIGINAL: 10 -======= - max_reagent_volume = 10 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "advmop" inhand_icon_state = "advmop" lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi' diff --git a/code/game/objects/items/paint.dm b/code/game/objects/items/paint.dm index 895a7283686..66e0b15e99f 100644 --- a/code/game/objects/items/paint.dm +++ b/code/game/objects/items/paint.dm @@ -108,11 +108,7 @@ return FALSE if(!user.is_holding(src)) return FALSE -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index 66c986719a4..9bc5189313d 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -90,11 +90,7 @@ if(target.mob_size > max_occupant_weight) if(ishuman(target)) var/mob/living/carbon/human/H = target -<<<<<<< HEAD if(isfeline(H)) // SKYRAT EDIT - FELINE TRAITS. Was: isfelinid(H) -======= - if(isfelinid(H)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_warning("You'd need a lot of catnip and treats, plus maybe a laser pointer, for that to work.")) else to_chat(user, span_warning("Humans, generally, do not fit into pet carriers.")) diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index 91f88465fdc..526b5ca2e98 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -152,11 +152,7 @@ return if(isnull(names[pinpoint_target])) return -<<<<<<< HEAD - if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated()) -======= if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return target = names[pinpoint_target] toggle_on() diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 40c69dfac9a..93fd6cb947a 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -44,11 +44,7 @@ /obj/item/toy/plush/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, squeak_override) -<<<<<<< HEAD - AddElement(/datum/element/bed_tuckable, mapload, 6, 7, 90) -======= AddElement(/datum/element/bed_tuckable, mapload, 6, -5, 90) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AddElement(/datum/element/toy_talk) //have we decided if Pinocchio goes in the blue or pink aisle yet? diff --git a/code/game/objects/items/rcd/RCD.dm b/code/game/objects/items/rcd/RCD.dm index 407d713e5ae..5bd0b4c9d39 100644 --- a/code/game/objects/items/rcd/RCD.dm +++ b/code/game/objects/items/rcd/RCD.dm @@ -80,13 +80,6 @@ GLOB.rcd_list -= src . = ..() -<<<<<<< HEAD -/obj/item/construction/rcd/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) - . = ..() - playsound(src, SFX_TOOL_SWITCH, 20, TRUE) - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/construction/rcd/ui_action_click(mob/user, actiontype) if (!COOLDOWN_FINISHED(src, destructive_scan_cooldown)) to_chat(user, span_warning("[src] lets out a low buzz.")) @@ -351,10 +344,7 @@ return data /obj/item/construction/rcd/handle_ui_act(action, params, datum/tgui/ui, datum/ui_state/state) -<<<<<<< HEAD -======= playsound(src, SFX_TOOL_SWITCH, 20, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(action) if("root_category") diff --git a/code/game/objects/items/rcd/RHD.dm b/code/game/objects/items/rcd/RHD.dm index 156def8be08..a212274ce46 100644 --- a/code/game/objects/items/rcd/RHD.dm +++ b/code/game/objects/items/rcd/RHD.dm @@ -292,11 +292,7 @@ /obj/item/construction/proc/check_menu(mob/living/user, remote_anchor) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(remote_anchor && user.remote_control != remote_anchor) return FALSE diff --git a/code/game/objects/items/rcd/RLD.dm b/code/game/objects/items/rcd/RLD.dm index 363100c5fbc..2a99f535f42 100644 --- a/code/game/objects/items/rcd/RLD.dm +++ b/code/game/objects/items/rcd/RLD.dm @@ -166,11 +166,7 @@ return ITEM_INTERACT_BLOCKING activate() var/obj/machinery/light/L = new /obj/machinery/light(get_turf(winner)) -<<<<<<< HEAD - L.setDir(get_dir(interacting_with, winner)) -======= L.setDir(get_dir(winner, interacting_with)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 L.color = color_choice L.set_light_color(color_choice) return ITEM_INTERACT_SUCCESS diff --git a/code/game/objects/items/rcd/RPD.dm b/code/game/objects/items/rcd/RPD.dm index 91576e23683..9c3aa6cffc2 100644 --- a/code/game/objects/items/rcd/RPD.dm +++ b/code/game/objects/items/rcd/RPD.dm @@ -59,11 +59,8 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( new /datum/pipe_info/disposal("Sort Junction", /obj/structure/disposalpipe/sorting/mail, PIPE_TRIN_M), new /datum/pipe_info/disposal("Rotator", /obj/structure/disposalpipe/rotator, PIPE_ONEDIR_FLIPPABLE), new /datum/pipe_info/disposal("Trunk", /obj/structure/disposalpipe/trunk), -<<<<<<< HEAD -======= new /datum/pipe_info/disposal("Down Turn", /obj/structure/disposalpipe/trunk/multiz/down), new /datum/pipe_info/disposal("Up Turn", /obj/structure/disposalpipe/trunk/multiz), ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /datum/pipe_info/disposal("Bin", /obj/machinery/disposal/bin, PIPE_ONEDIR), new /datum/pipe_info/disposal("Outlet", /obj/structure/disposaloutlet), new /datum/pipe_info/disposal("Chute", /obj/machinery/disposal/delivery_chute), @@ -366,14 +363,6 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( data["init_directions"] = init_directions return data -<<<<<<< HEAD -/obj/item/pipe_dispenser/ui_act(action, params) - . = ..() - playsound(src, SFX_TOOL_SWITCH, 20, TRUE) - if(.) - return - -======= /obj/item/pipe_dispenser/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) @@ -381,7 +370,6 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( playsound(src, SFX_TOOL_SWITCH, 20, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/playeffect = TRUE switch(action) if("color") @@ -701,11 +689,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( if(multi_layer) balloon_alert(source_mob, "turn off multi layer!") return -<<<<<<< HEAD - if(source_mob.incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS)) -======= if(INCAPACITATED_IGNORING(source_mob, INCAPABLE_RESTRAINTS|INCAPABLE_STASIS)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(source_mob.get_active_held_item() != src) return diff --git a/code/game/objects/items/rcd/RPLD.dm b/code/game/objects/items/rcd/RPLD.dm index 35831737607..d8056551cf7 100644 --- a/code/game/objects/items/rcd/RPLD.dm +++ b/code/game/objects/items/rcd/RPLD.dm @@ -12,12 +12,9 @@ banned_upgrades = RCD_ALL_UPGRADES & ~RCD_UPGRADE_SILO_LINK matter = 200 max_matter = 200 -<<<<<<< HEAD -======= drop_sound = 'sound/items/handling/rcd_drop.ogg' pickup_sound = 'sound/items/handling/rcd_pickup.ogg' sound_vary = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///category of design selected var/selected_category @@ -69,7 +66,6 @@ /obj/machinery/plumbing/pill_press = 20, /obj/machinery/iv_drip/plumbing = 20 ), -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - static list so we have no choice but to skyrat edit these here //category 4 liquids @@ -77,8 +73,6 @@ /obj/structure/drain = 5, ), // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/construction/plumbing/Initialize(mapload) @@ -168,17 +162,9 @@ return data -<<<<<<< HEAD -/obj/item/construction/plumbing/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) - . = ..() - playsound(src, SFX_TOOL_SWITCH, 20, TRUE) - -/obj/item/construction/plumbing/handle_ui_act(action, params, datum/tgui/ui, datum/ui_state/state) -======= /obj/item/construction/plumbing/handle_ui_act(action, params, datum/tgui/ui, datum/ui_state/state) playsound(src, SFX_TOOL_SWITCH, 20, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(action) if("color") var/color = params["paint_color"] @@ -309,11 +295,7 @@ /obj/item/construction/plumbing/proc/mouse_wheeled(mob/source, atom/A, delta_x, delta_y, params) SIGNAL_HANDLER -<<<<<<< HEAD - if(source.incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS)) -======= if(INCAPACITATED_IGNORING(source, INCAPABLE_RESTRAINTS|INCAPABLE_STASIS)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(delta_y == 0) return @@ -364,7 +346,6 @@ /obj/machinery/plumbing/tank = 20, /obj/machinery/plumbing/acclimator = 10, ), -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - static list so we have no choice but to skyrat edit these here //category 4 liquids @@ -372,8 +353,6 @@ /obj/structure/drain = 5, ), // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/construction/plumbing/service/Initialize(mapload) diff --git a/code/game/objects/items/rcd/RTD.dm b/code/game/objects/items/rcd/RTD.dm index 372de22dd36..93e5147175e 100644 --- a/code/game/objects/items/rcd/RTD.dm +++ b/code/game/objects/items/rcd/RTD.dm @@ -24,12 +24,9 @@ item_flags = NO_MAT_REDEMPTION | NOBLUDGEON has_ammobar = TRUE banned_upgrades = RCD_ALL_UPGRADES & ~RCD_UPGRADE_SILO_LINK -<<<<<<< HEAD -======= drop_sound = 'sound/items/handling/rcd_drop.ogg' pickup_sound = 'sound/items/handling/rcd_pickup.ogg' sound_vary = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// main category for tile design var/root_category = "Conventional" @@ -201,10 +198,7 @@ return data /obj/item/construction/rtd/handle_ui_act(action, params, datum/tgui/ui, datum/ui_state/state) -<<<<<<< HEAD -======= playsound(src, SFX_TOOL_SWITCH, 20, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/floor_designs = GLOB.floor_designs switch(action) diff --git a/code/game/objects/items/rcd/RWD.dm b/code/game/objects/items/rcd/RWD.dm index ab9ca7f9f9c..bafbfdc5d8d 100644 --- a/code/game/objects/items/rcd/RWD.dm +++ b/code/game/objects/items/rcd/RWD.dm @@ -152,11 +152,7 @@ if(!ISADVANCEDTOOLUSER(user)) to_chat(user, span_warning("You don't have the dexterity to do this!")) return FALSE -<<<<<<< HEAD - if(user.incapacitated() || !user.Adjacent(src)) -======= if(user.incapacitated || !user.Adjacent(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 24c1a0fbfbf..63e1c19c64a 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -225,11 +225,7 @@ /obj/item/banner/command/Initialize(mapload) . = ..() -<<<<<<< HEAD job_loyalties = DEPARTMENT_BITFLAG_COMMAND | DEPARTMENT_BITFLAG_CENTRAL_COMMAND //SKYRAT EDIT ADDITION -======= - job_loyalties = DEPARTMENT_BITFLAG_COMMAND ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/banner/command/mundane inspiration_available = FALSE diff --git a/code/game/objects/items/robot/items/hypo.dm b/code/game/objects/items/robot/items/hypo.dm index 30346240f5e..a0795ac40a7 100644 --- a/code/game/objects/items/robot/items/hypo.dm +++ b/code/game/objects/items/robot/items/hypo.dm @@ -6,14 +6,9 @@ /datum/reagent/medicine/c2/libital,\ /datum/reagent/medicine/c2/multiver,\ /datum/reagent/medicine/salglu_solution,\ -<<<<<<< HEAD /datum/reagent/medicine/spaceacillin,\ /datum/reagent/medicine/lidocaine\ ) //SKYRAT EDIT line 10 added Lidocaine -======= - /datum/reagent/medicine/spaceacillin\ - ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define EXPANDED_MEDICAL_REAGENTS list(\ /datum/reagent/medicine/haloperidol,\ /datum/reagent/medicine/inacusiate,\ @@ -231,11 +226,7 @@ /obj/item/reagent_containers/borghypo/attack_self(mob/user) ui_interact(user) -<<<<<<< HEAD -/obj/item/reagent_containers/borghypo/ui_act(action, params) -======= /obj/item/reagent_containers/borghypo/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -257,18 +248,12 @@ . += "Currently loaded: [selected_reagent ? "[selected_reagent]. [selected_reagent.description]" : "nothing."]" . += span_notice("Alt+Click to change transfer amount. Currently set to [amount_per_transfer_from_this]u.") -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - SEE master_files/code/modules/reagents/reagent_containers.dm /obj/item/reagent_containers/borghypo/click_alt(mob/living/user) change_transfer_amount(user) return CLICK_ACTION_SUCCESS SKYRAT EDIT REMOVAL END */ -======= -/obj/item/reagent_containers/borghypo/click_alt(mob/living/user) - change_transfer_amount(user) - return CLICK_ACTION_SUCCESS ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Default Medborg Hypospray /obj/item/reagent_containers/borghypo/medical @@ -501,13 +486,8 @@ SKYRAT EDIT REMOVAL END */ /obj/item/reagent_containers/borghypo/borgshaker/hacked name = "cyborg shaker" desc = "Will mix drinks that knock them dead." -<<<<<<< HEAD - icon = 'icons/obj/drinks/mixed_drinks.dmi' - icon_state = "threemileislandglass" -======= icon_state = "threemileislandglass" icon = 'icons/obj/drinks/mixed_drinks.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tgui_theme = "syndicate" dispensed_temperature = WATER_MATTERSTATE_CHANGE_TEMP default_reagent_types = HACKED_SERVICE_REAGENTS diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 4bf9ff16aa3..7a8196799d8 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -409,11 +409,7 @@ data["lawsync"] = lawsync return data -<<<<<<< HEAD -/obj/item/robot_suit/ui_act(action, list/params) -======= /obj/item/robot_suit/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index d2fb5f51480..1df64ae1b59 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -587,16 +587,9 @@ to_chat(usr, span_warning("This unit already has an expand module installed!")) return FALSE -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - var/resize_amount = 1.25 - if(TRAIT_R_WIDE in borg.model.model_features) - resize_amount = 1.25 - if(TRAIT_R_TALL in borg.model.model_features) - resize_amount = 1.05 + var/resize_amount = 1.6 // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(borg, TRAIT_NO_TRANSFORM, REF(src)) var/prev_lockcharge = borg.lockcharge borg.SetLockdown(TRUE) @@ -613,11 +606,7 @@ borg.set_anchored(FALSE) REMOVE_TRAIT(borg, TRAIT_NO_TRANSFORM, REF(src)) borg.hasExpanded = TRUE -<<<<<<< HEAD borg.update_transform(resize_amount) // SKYRAT EDIT CHANGE - ORIGINAL: borg.update_transform(2) -======= - borg.update_transform(2) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/borg/upgrade/expand/deactivate(mob/living/silicon/robot/borg, mob/living/user = usr) . = ..() @@ -625,11 +614,7 @@ return . if (borg.hasExpanded) borg.hasExpanded = FALSE -<<<<<<< HEAD - borg.update_transform(0.8) // SKYRAT EDIT CHANGE - ORIGINAL: borg.update_transform(0.5) -======= - borg.update_transform(0.5) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + borg.update_transform(0.625) // SKYRAT EDIT CHANGE - ORIGINAL: borg.update_transform(0.5) /obj/item/borg/upgrade/rped name = "engineering cyborg RPED" diff --git a/code/game/objects/items/scrolls.dm b/code/game/objects/items/scrolls.dm index f2d6e924a7f..3fea8376eb3 100644 --- a/code/game/objects/items/scrolls.dm +++ b/code/game/objects/items/scrolls.dm @@ -55,11 +55,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/human_user = user -<<<<<<< HEAD - if(human_user.incapacitated() || !human_user.is_holding(src)) -======= if(human_user.incapacitated || !human_user.is_holding(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/datum/action/cooldown/spell/teleport/area_teleport/wizard/scroll/teleport = locate() in actions if(!teleport) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index aad53d55e4f..c38a6ebc308 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -251,12 +251,8 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ if(get_amount() < 2) user.balloon_alert(user, "not enough material!") return ITEM_INTERACT_BLOCKING -<<<<<<< HEAD var/skill_modifier = user.mind.get_skill_modifier(/datum/skill/construction, SKILL_SPEED_MODIFIER) //SKYRAT EDIT: Construction Skill if(!do_after(user, 4 SECONDS * skill_modifier, build_on)) -======= - if(!do_after(user, 4 SECONDS, build_on)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_BLOCKING if(build_on.is_blocked_turf()) user.balloon_alert(user, "something is blocking the tile!") @@ -265,10 +261,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ user.balloon_alert(user, "not enough material!") return ITEM_INTERACT_BLOCKING new/obj/structure/girder/displaced(build_on) -<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT: Construction Skill -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_SUCCESS /* @@ -359,11 +352,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ new/datum/stack_recipe("loom", /obj/structure/loom, 10, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_TOOLS), \ new/datum/stack_recipe("mortar", /obj/item/reagent_containers/cup/mortar, 3, crafting_flags = NONE, category = CAT_CHEMISTRY), \ new/datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 10 SECONDS, crafting_flags = NONE, category = CAT_TOOLS), \ -<<<<<<< HEAD new/datum/stack_recipe("bonfire", /obj/structure/bonfire/player_made, 10, time = 6 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_TOOLS), /* SKYRAT EDIT - Pollution - ORIGINAL: /obj/structure/bonfire */ \ -======= - new/datum/stack_recipe("bonfire", /obj/structure/bonfire, 10, time = 6 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_TOOLS), \ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new/datum/stack_recipe("easel", /obj/structure/easel, 5, time = 1 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_ENTERTAINMENT), \ new/datum/stack_recipe("noticeboard", /obj/item/wallframe/noticeboard, 1, time = 1 SECONDS, crafting_flags = NONE, category = CAT_FURNITURE), \ new/datum/stack_recipe("test tube rack", /obj/item/storage/test_tube_rack, 1, time = 1 SECONDS, crafting_flags = NONE, category = CAT_CHEMISTRY), \ @@ -463,11 +452,8 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \ grind_results = list(/datum/reagent/cellulose = 10) material_type = /datum/material/bamboo walltype = /turf/closed/wall/mineral/bamboo -<<<<<<< HEAD -======= drop_sound = null pickup_sound = null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/armor/mineral_bamboo fire = 50 @@ -848,10 +834,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ /datum/crafting_recipe/bonespear, /datum/crafting_recipe/bracers, /datum/crafting_recipe/skullhelm, -<<<<<<< HEAD /datum/crafting_recipe/ash_recipe/bone_greaves, /* SKYRAT EDIT ADDITION */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) AddElement( diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index d1b1551e26e..288b9d0aae1 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -302,11 +302,7 @@ data["recipes"] = recursively_build_recipes(recipes) return data -<<<<<<< HEAD -/obj/item/stack/ui_act(action, params) -======= /obj/item/stack/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -373,11 +369,7 @@ /obj/item/stack/proc/radial_check(mob/builder) if(QDELETED(builder) || QDELETED(src)) return FALSE -<<<<<<< HEAD - if(builder.incapacitated()) -======= if(builder.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(!builder.is_holding(src)) return FALSE @@ -408,12 +400,8 @@ adjusted_time = (recipe.time * recipe.trait_modifier) else adjusted_time = recipe.time -<<<<<<< HEAD var/skill_modifier = builder.mind.get_skill_modifier(/datum/skill/construction, SKILL_SPEED_MODIFIER) //SKYRAT EDIT: Construction Skill if(!do_after(builder, adjusted_time * skill_modifier, target = builder)) -======= - if(!do_after(builder, adjusted_time, target = builder)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 builder.balloon_alert(builder, "interrupted!") return if(!building_checks(builder, recipe, multiplier)) @@ -442,19 +430,12 @@ SEND_SIGNAL(created, COMSIG_ATOM_CONSTRUCTED, builder) on_item_crafted(builder, created) -<<<<<<< HEAD builder.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT: Construction Skill // Use up the material use(recipe.req_amount * multiplier) builder.investigate_log("crafted [recipe.title]", INVESTIGATE_CRAFTING) -======= - // Use up the material - use(recipe.req_amount * multiplier) - builder.investigate_log("crafted [recipe.title]", INVESTIGATE_CRAFTING) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Apply mat datums if((recipe.crafting_flags & CRAFT_APPLIES_MATS) && LAZYLEN(mats_per_unit)) if(isstack(created)) diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index d66a33cca6e..bf8d17822bd 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -84,10 +84,7 @@ parcel.base_icon_state = "deliverypackage5" parcel.update_icon() user.forceMove(parcel) -<<<<<<< HEAD parcel.contains_mobs = TRUE // SKYRAT EDIT - CARGO BORGS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 parcel.add_fingerprint(user) return OXYLOSS else @@ -118,13 +115,10 @@ return NONE if(interacting_with.anchored) return NONE -<<<<<<< HEAD // SKYRAT EDIT START - Cargo borgs if(!amount) return // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isitem(interacting_with)) var/obj/item/item = interacting_with @@ -168,15 +162,12 @@ closet.forceMove(parcel) parcel.add_fingerprint(user) closet.add_fingerprint(user) -<<<<<<< HEAD // SKYRAT EDIT START - CARGO BORGS for(var/item in closet.get_all_contents()) if(istype(item, /mob)) parcel.contains_mobs = TRUE break // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else balloon_alert(user, "not enough paper!") return ITEM_INTERACT_BLOCKING diff --git a/code/game/objects/items/stickers.dm b/code/game/objects/items/stickers.dm index d465d831fc5..447e2022473 100644 --- a/code/game/objects/items/stickers.dm +++ b/code/game/objects/items/stickers.dm @@ -30,15 +30,10 @@ /// `list` or `null`, contains possible alternate `icon_states`. var/list/icon_states -<<<<<<< HEAD - /// Whether sticker is legal and allowed to generate inside non-syndicate boxes. - var/contraband = FALSE -======= /// This sticker won't be generated inside random sticker packs. var/exclude_from_random = FALSE /// Text added to the atom's examine when stickered. var/examine_text ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/sticker/Initialize(mapload) . = ..() @@ -92,11 +87,7 @@ user.log_message("stuck [src] to [key_name(victim)]", LOG_ATTACK) victim.log_message("had [src] stuck to them by [key_name(user)]", LOG_ATTACK) -<<<<<<< HEAD - target.AddComponent(/datum/component/sticker, src, get_dir(target, src), px, py) -======= target.AddComponent(/datum/component/sticker, src, get_dir(target, src), px, py, null, null, examine_text) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE #undef MAX_STICKER_COUNT @@ -134,10 +125,7 @@ name = "blue R sticker" desc = "A sticker of FUCK THE SYSTEM, the galaxy's premiere hardcore punk band." icon_state = "revhead" -<<<<<<< HEAD -======= examine_text = "There is a sticker displaying FUCK THE SYSTEM, the galaxy's premiere hardcore punk band." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/sticker/pslime name = "slime plushie sticker" @@ -164,15 +152,12 @@ name = "toolbox sticker" icon_state = "soul" -<<<<<<< HEAD -======= /obj/item/sticker/chief_engineer name = "CE approved sticker" icon_state = "ce_approved" exclude_from_random = TRUE examine_text = "There is a sticker displaying the Chief Engineer's SEAL OF APPROVAL." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/sticker/clown name = "clown sticker" icon_state = "honkman" @@ -188,27 +173,17 @@ /obj/item/sticker/skub name = "skub sticker" icon_state = "skub" -<<<<<<< HEAD -======= examine_text = "There is a sticker displaying Skubtide, Stationwide!" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/sticker/anti_skub name = "anti-skub sticker" icon_state = "anti_skub" -<<<<<<< HEAD -======= examine_text = "There is an anti-skub sticker." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/sticker/syndicate name = "syndicate sticker" icon_state = "synd" -<<<<<<< HEAD - contraband = TRUE -======= exclude_from_random = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/sticker/syndicate/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index b8d0854a3aa..4199b544f81 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -384,11 +384,7 @@ /obj/item/storage/backpack/satchel/flat/Initialize(mapload) . = ..() -<<<<<<< HEAD AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE, INVISIBILITY_MAXIMUM, use_anchor = TRUE) // SKYRAT EDIT - Ghosts can't see smuggler's satchels -======= - AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE, INVISIBILITY_OBSERVER, use_anchor = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 atom_storage.max_total_storage = 15 atom_storage.set_holdable(cant_hold_list = /obj/item/storage/backpack/satchel/flat) //muh recursive backpacks ADD_TRAIT(src, TRAIT_CONTRABAND_BLOCKER, INNATE_TRAIT) @@ -648,7 +644,6 @@ // Faster unzipping. Utilizes the same noise as zipping up to fit the unzip duration. unzip_duration = 0.5 SECONDS unzip_sfx = 'sound/items/zip_up.ogg' -<<<<<<< HEAD //SKYRAT EDIT CHANGE START - It's just a black duffel. /obj/item/storage/backpack/duffelbag/syndie @@ -657,8 +652,6 @@ special_desc_requirement = EXAMINE_CHECK_SYNDICATE special_desc = "This duffel bag has the Syndicate logo stiched on the inside. It appears to be made from lighter yet sturdier materials, and features an oiled plastitanium zipper for maximum speed tactical zipping." //SKYRAT EDIT CHANGE END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/backpack/duffelbag/syndie/hitman desc = "A large duffel bag for holding extra things. There is a Nanotrasen logo on the back." diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index fe8b6c3ed4a..269a6699d3e 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -274,11 +274,8 @@ . += span_notice("Ctrl-click to activate seed extraction.") /obj/item/storage/bag/plants/portaseeder/item_ctrl_click(mob/user) -<<<<<<< HEAD -======= if(user.incapacitated) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/obj/item/plant in contents) seedify(plant, 1) return CLICK_ACTION_SUCCESS @@ -586,11 +583,7 @@ worn_icon_state = "rebar_quiver" inhand_icon_state = "rebar_quiver" desc = "A oxygen tank cut in half, used for holding sharpened rods for the rebar crossbow." -<<<<<<< HEAD - slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_SUITSTORE -======= slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_SUITSTORE|ITEM_SLOT_NECK ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 resistance_flags = FLAMMABLE /obj/item/storage/bag/rebar_quiver/Initialize(mapload) @@ -607,8 +600,6 @@ /obj/item/ammo_casing/rebar/paperball, )) -<<<<<<< HEAD -======= /obj/item/storage/bag/rebar_quiver/syndicate icon_state = "syndie_quiver_0" worn_icon_state = "syndie_quiver_0" @@ -664,5 +655,4 @@ var/obj/item/ammo_casing/rebar/ammo_to_load = contents[1] held_crossbow.attackby(ammo_to_load, user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef ORE_BAG_BALOON_COOLDOWN diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 136f72b3eda..15ad117f722 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -96,30 +96,18 @@ SSwardrobe.provide_type(/obj/item/multitool, src) SSwardrobe.provide_type(/obj/item/stack/cable_coil, src) SSwardrobe.provide_type(/obj/item/extinguisher/mini, src) -<<<<<<< HEAD SSwardrobe.provide_type(/obj/item/analyzer/ranged, src) //SKYRAT EDIT - Ranged Analyzer for CE - ORIGINAL: SSwardrobe.provide_type(/obj/item/analyzer, src) -======= - SSwardrobe.provide_type(/obj/item/analyzer, src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //much roomier now that we've managed to remove two tools /obj/item/storage/belt/utility/chief/full/get_types_to_preload() var/list/to_preload = list() //Yes this is a pain. Yes this is the point to_preload += /obj/item/screwdriver/power to_preload += /obj/item/crowbar/power -<<<<<<< HEAD to_preload += /obj/item/weldingtool/electric // SKYRAT EDIT - Electric welder to_preload += /obj/item/multitool to_preload += /obj/item/stack/cable_coil to_preload += /obj/item/extinguisher/mini to_preload += /obj/item/analyzer/ranged // SKYRAT EDIT - Ranged Analyzer for CE -======= - to_preload += /obj/item/weldingtool/experimental - to_preload += /obj/item/multitool - to_preload += /obj/item/stack/cable_coil - to_preload += /obj/item/extinguisher/mini - to_preload += /obj/item/analyzer ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return to_preload /obj/item/storage/belt/utility/full/PopulateContents() @@ -148,11 +136,7 @@ /obj/item/storage/belt/utility/full/powertools/PopulateContents() new /obj/item/screwdriver/power(src) new /obj/item/crowbar/power(src) -<<<<<<< HEAD new /obj/item/weldingtool/electric(src) // SKYRAT EDIT - original: new /obj/item/weldingtool/experimental(src) -======= - new /obj/item/weldingtool/experimental(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/multitool(src) new /obj/item/holosign_creator/atmos(src) new /obj/item/extinguisher/mini(src) @@ -262,10 +246,7 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/mask/muzzle, /obj/item/clothing/mask/surgical, -<<<<<<< HEAD /obj/item/clothing/suit/toggle/labcoat/hospitalgown, //SKYRAT EDIT ADDITION - adds surgery gowns to belts -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/head/utility/surgerycap, /obj/item/construction/plumbing, /obj/item/dnainjector, @@ -276,11 +257,8 @@ /obj/item/healthanalyzer, /obj/item/hemostat, /obj/item/holosign_creator/medical, -<<<<<<< HEAD /obj/item/hypospray/mkii, //SKYRAT EDIT ADDITION - HYPOSPRAYS /obj/item/storage/hypospraykit/, //SKYRAT EDIT ADDITION - HYPOSPRAYS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/implant, /obj/item/implantcase, /obj/item/implanter, @@ -293,10 +271,7 @@ /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/cup/bottle, -<<<<<<< HEAD /obj/item/reagent_containers/cup/vial, //SKYRAT EDIT ADDITION - HYPOSPRAYS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/tube, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/medigel, @@ -315,11 +290,8 @@ /obj/item/surgical_drapes, //for true paramedics /obj/item/surgicaldrill, /obj/item/tank/internals/emergency_oxygen, -<<<<<<< HEAD /obj/item/weaponcell/medical, //SKYRAT EDIT MEDIGUNS /obj/item/handheld_soulcatcher, // SKYRAT EDIT SOULCATCHERS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/wrench/medical, /obj/item/knife/ritual, )) @@ -417,10 +389,7 @@ /obj/item/flashlight/seclite, /obj/item/food/donut, /obj/item/grenade, -<<<<<<< HEAD /obj/item/gun, //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/holosign_creator/security, /obj/item/knife/combat, /obj/item/melee/baton, @@ -428,12 +397,8 @@ /obj/item/reagent_containers/spray/pepper, /obj/item/restraints/handcuffs, /obj/item/restraints/legcuffs/bola, -<<<<<<< HEAD /obj/item/stock_parts/power_store/cell/microfusion, //SKYRAT EDIT ADDITION )) -======= - )) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 atom_storage.open_sound = 'sound/items/holster.ogg' atom_storage.open_sound_vary = TRUE atom_storage.rustle_sound = FALSE @@ -762,18 +727,12 @@ /obj/item/key/janitor, /obj/item/lightreplacer, /obj/item/melee/flyswatter, -<<<<<<< HEAD /obj/item/mop, //SKYRAT EDIT - For when you're lazy to use soap /obj/item/mop/advanced, //SKYRAT EDIT For when you're lazy to use a bucket /obj/item/paint/paint_remover, /obj/item/plunger, /obj/item/pushbroom, /obj/item/reagent_containers/cup/bucket, //SKYRAT EDIT - Bucket -======= - /obj/item/paint/paint_remover, - /obj/item/plunger, - /obj/item/pushbroom, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/spray, /obj/item/soap, /obj/item/wirebrush, diff --git a/code/game/objects/items/storage/boxes/clothes_boxes.dm b/code/game/objects/items/storage/boxes/clothes_boxes.dm index fdb5bf64657..582b611186c 100644 --- a/code/game/objects/items/storage/boxes/clothes_boxes.dm +++ b/code/game/objects/items/storage/boxes/clothes_boxes.dm @@ -130,8 +130,6 @@ new /obj/item/clothing/under/ethereal_tunic/trailwarden(src) new /obj/item/storage/backpack/saddlepack(src) -<<<<<<< HEAD -======= /obj/item/storage/box/hero/journalist name = "Assassinated by CIA - 1984." // Literally desc = "Many courageous individuals risked their lives to report on events the government sought to keep hidden from the public, ensuring that the truth remained buried and unheard. These garments are replicas of the clothing worn by one such 'journalist,' a silent sentinel in the fight for truth." @@ -150,7 +148,6 @@ new /obj/item/camera(src) new /obj/item/wallframe/telescreen/entertainment(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/holy name = "Templar Kit" /// This item is used to generate a preview image for this set. diff --git a/code/game/objects/items/storage/boxes/engineering_boxes.dm b/code/game/objects/items/storage/boxes/engineering_boxes.dm index 4eb5482f5d4..09f641ec315 100644 --- a/code/game/objects/items/storage/boxes/engineering_boxes.dm +++ b/code/game/objects/items/storage/boxes/engineering_boxes.dm @@ -112,8 +112,6 @@ ..() for(var/i in 1 to 7) new /obj/item/tank/internals/emergency_oxygen/engi(src) //in case anyone ever wants to do anything with spawning them, apart from crafting the box -<<<<<<< HEAD -======= /obj/item/storage/box/stickers/chief_engineer name = "CE approved sticker pack" @@ -123,4 +121,3 @@ /obj/item/storage/box/stickers/chief_engineer/PopulateContents() for(var/i in 1 to 3) new /obj/item/sticker/chief_engineer(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/game/objects/items/storage/boxes/food_boxes.dm b/code/game/objects/items/storage/boxes/food_boxes.dm index 0941e9fd374..86d59123c72 100644 --- a/code/game/objects/items/storage/boxes/food_boxes.dm +++ b/code/game/objects/items/storage/boxes/food_boxes.dm @@ -126,11 +126,7 @@ /obj/item/storage/box/papersack/proc/check_menu(mob/user, obj/item/pen/P) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(contents.len) balloon_alert(user, "items inside!") diff --git a/code/game/objects/items/storage/boxes/job_boxes.dm b/code/game/objects/items/storage/boxes/job_boxes.dm index 40eaedc0094..2620cb58dc8 100644 --- a/code/game/objects/items/storage/boxes/job_boxes.dm +++ b/code/game/objects/items/storage/boxes/job_boxes.dm @@ -46,17 +46,13 @@ if(length(SSmapping.levels_by_trait(ZTRAIT_STATION)) > 1) new /obj/item/climbing_hook/emergency(src) -<<<<<<< HEAD new /obj/item/oxygen_candle(src) //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/survival/radio/PopulateContents() ..() // we want the survival stuff too. new /obj/item/radio/off(src) /obj/item/storage/box/survival/proc/wardrobe_removal() -<<<<<<< HEAD if(!isplasmaman(loc) && !isvox(loc)) //We need to specially fill the box with plasmaman gear, since it's intended for one //SKYRAT EDIT: && !isvox(loc) return var/obj/item/mask = locate(mask_type) in src @@ -67,13 +63,6 @@ else new /obj/item/tank/internals/nitrogen/belt/emergency(src) //SKYRAT EDIT ADDITION END - VOX INTERNALS -======= - if(!isplasmaman(loc)) //We need to specially fill the box with plasmaman gear, since it's intended for one - return - var/obj/item/mask = locate(mask_type) in src - var/obj/item/internals = locate(internal_type) in src - new /obj/item/tank/internals/plasmaman/belt(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qdel(mask) // Get rid of the items that shouldn't be qdel(internals) diff --git a/code/game/objects/items/storage/boxes/medical_boxes.dm b/code/game/objects/items/storage/boxes/medical_boxes.dm index 491032a33d7..c76f1ca0b37 100644 --- a/code/game/objects/items/storage/boxes/medical_boxes.dm +++ b/code/game/objects/items/storage/boxes/medical_boxes.dm @@ -133,10 +133,7 @@ /obj/item/storage/box/bandages name = "box of bandages" desc = "A box of DeForest brand gel bandages designed to treat blunt-force trauma." -<<<<<<< HEAD icon = 'icons/obj/storage/box.dmi' // SKYRAT EDIT CHANGE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "brutebox" base_icon_state = "brutebox" inhand_icon_state = "brutebox" diff --git a/code/game/objects/items/storage/boxes/science_boxes.dm b/code/game/objects/items/storage/boxes/science_boxes.dm index f9261b878af..63e1c1ee376 100644 --- a/code/game/objects/items/storage/boxes/science_boxes.dm +++ b/code/game/objects/items/storage/boxes/science_boxes.dm @@ -39,10 +39,7 @@ illustration = null /// Which type of cube are we spawning in this box? var/cube_type = /obj/item/food/monkeycube -<<<<<<< HEAD -======= custom_price = PAYCHECK_CREW * 2 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/monkeycubes/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/storage/boxes/service_boxes.dm b/code/game/objects/items/storage/boxes/service_boxes.dm index 935cac6e502..767f351635d 100644 --- a/code/game/objects/items/storage/boxes/service_boxes.dm +++ b/code/game/objects/items/storage/boxes/service_boxes.dm @@ -224,10 +224,6 @@ new /obj/item/toy/balloon/long(src) /obj/item/storage/box/stickers -<<<<<<< HEAD - name = "box of stickers" - desc = "A box full of random stickers. Do give to the clown." -======= name = "sticker pack" desc = "A pack of removable stickers. Removable? What a rip off!
On the back, DO NOT GIVE TO THE CLOWN! is printed in large lettering." icon = 'icons/obj/toys/stickers.dmi' @@ -251,17 +247,12 @@ if(isnull(illustration)) illustration = pick(pack_labels) update_appearance() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/stickers/proc/generate_non_contraband_stickers_list() var/list/allowed_stickers = list() for(var/obj/item/sticker/sticker_type as anything in subtypesof(/obj/item/sticker)) -<<<<<<< HEAD - if(!sticker_type::contraband) -======= if(!sticker_type::exclude_from_random) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 allowed_stickers += sticker_type return allowed_stickers @@ -277,14 +268,9 @@ new type(src) /obj/item/storage/box/stickers/googly -<<<<<<< HEAD - name = "box of googly eye stickers" - desc = "Turn anything and everything into something vaguely alive!" -======= name = "googly eye sticker pack" desc = "Turn anything and everything into something vaguely alive!" illustration = "googly-alt" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/stickers/googly/PopulateContents() for(var/i in 1 to 6) diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index 0bcf557d6cf..c6684f6ff1a 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -74,11 +74,7 @@ new /obj/item/clothing/shoes/laceup(src) /obj/item/storage/bag/garment/hos/PopulateContents() -<<<<<<< HEAD //new /obj/item/clothing/under/rank/security/head_of_security/skirt(src) SKYRAT EDIT REMOVAL - Blue Sec -======= - new /obj/item/clothing/under/rank/security/head_of_security/skirt(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/clothing/under/rank/security/head_of_security/alt(src) new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src) new /obj/item/clothing/under/rank/security/head_of_security/grey(src) @@ -98,7 +94,6 @@ /obj/item/storage/bag/garment/warden/PopulateContents() new /obj/item/clothing/suit/armor/vest/warden(src) -<<<<<<< HEAD //new /obj/item/clothing/head/hats/warden(src) SKYRAT EDIT REMOVAL //new /obj/item/clothing/head/hats/warden/drill(src) SKYRAT EDIT REMOVAL new /obj/item/clothing/head/beret/sec/navywarden(src) @@ -106,14 +101,6 @@ new /obj/item/clothing/under/rank/security/warden/formal(src) new /obj/item/clothing/suit/jacket/warden/blue(src) //SKYRAT ADDITION - FORMAL COAT //new /obj/item/clothing/under/rank/security/warden/skirt(src) SKYRAT EDIT REMOVAL -======= - new /obj/item/clothing/head/hats/warden(src) - new /obj/item/clothing/head/hats/warden/drill(src) - new /obj/item/clothing/head/beret/sec/navywarden(src) - new /obj/item/clothing/suit/armor/vest/warden/alt(src) - new /obj/item/clothing/under/rank/security/warden/formal(src) - new /obj/item/clothing/under/rank/security/warden/skirt(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/clothing/gloves/krav_maga/sec(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/clothing/mask/gas/sechailer(src) @@ -125,10 +112,7 @@ new /obj/item/clothing/under/rank/rnd/research_director/alt/skirt(src) new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src) new /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt(src) -<<<<<<< HEAD new /obj/item/clothing/suit/toggle/labcoat/skyrat/rd(src) //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/clothing/suit/hooded/wintercoat/science/rd(src) new /obj/item/clothing/head/beret/science/rd(src) new /obj/item/clothing/gloves/color/black(src) diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 53bde4f3c82..8cd1548d537 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -232,10 +232,6 @@ /obj/item/storage/lockbox/order name = "order lockbox" desc = "A box used to secure small cargo orders from being looted by those who didn't order it. Yeah, cargo tech, that means you." -<<<<<<< HEAD - icon = 'icons/obj/storage/case.dmi' -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "secure" icon_closed = "secure" icon_locked = "secure_locked" @@ -252,27 +248,21 @@ buyer_account = _buyer_account ADD_TRAIT(src, TRAIT_NO_MISSING_ITEM_ERROR, TRAIT_GENERIC) ADD_TRAIT(src, TRAIT_NO_MANIFEST_CONTENTS_ERROR, TRAIT_GENERIC) -<<<<<<< HEAD //SKYRAT EDIT START if(istype(buyer_account, /datum/bank_account/department)) department_purchase = TRUE department_account = buyer_account //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/lockbox/order/can_unlock(mob/living/user, obj/item/card/id/id_card) if(id_card.registered_account == buyer_account) return TRUE -<<<<<<< HEAD //SKYRAT EDIT ADDITION START - private department orders if(department_purchase && id_card.registered_account?.account_job?.paycheck_department == department_account.department_id) return TRUE //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balloon_alert(user, "incorrect bank account!") return FALSE diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index bb134dc6e3d..bbdadcfefb4 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -44,11 +44,7 @@ ))) if(KIT_RECON) new /obj/item/clothing/glasses/thermal/xray(src) // ~8 tc? -<<<<<<< HEAD // new /obj/item/storage/briefcase/launchpad(src) //6 tc // SKYRAT EDIT REMOVAL -======= - new /obj/item/storage/briefcase/launchpad(src) //6 tc ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/binoculars(src) // 2 tc? new /obj/item/encryptionkey/syndicate(src) // 2 tc new /obj/item/storage/box/syndie_kit/space(src) //4 tc @@ -350,10 +346,7 @@ /obj/item/storage/box/syndie_kit/rebarxbowsyndie/PopulateContents() new /obj/item/book/granter/crafting_recipe/dusting/rebarxbowsyndie_ammo(src) new /obj/item/gun/ballistic/rifle/rebarxbow/syndie(src) -<<<<<<< HEAD -======= new /obj/item/storage/bag/rebar_quiver/syndicate(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/syndie_kit/origami_bundle name = "origami kit" @@ -691,18 +684,7 @@ group.register(i) desc += " The implants are registered to the \"[group.name]\" group." -<<<<<<< HEAD -/obj/item/storage/box/syndie_kit/stickers - name = "sticker kit" - -/obj/item/storage/box/syndie_kit/stickers/Initialize(mapload) - . = ..() - atom_storage.max_slots = 8 - -/obj/item/storage/box/syndie_kit/stickers/PopulateContents() -======= /obj/item/storage/box/stickers/syndie_kit/PopulateContents() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/types = subtypesof(/obj/item/sticker/syndicate) for(var/i in 1 to atom_storage.max_slots) @@ -860,11 +842,7 @@ illustration = "writing_syndie" /obj/item/storage/box/syndicate/contractor_loadout/PopulateContents() -<<<<<<< HEAD new /obj/item/mod/control/pre_equipped/contractor(src) //SKYRAT EDIT: Was infiltrator variant -======= - new /obj/item/mod/control/pre_equipped/infiltrator(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/clothing/head/helmet/space/syndicate/contract(src) new /obj/item/clothing/suit/space/syndicate/contract(src) new /obj/item/clothing/under/chameleon(src) diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index ec962605bc2..ab2d8f35341 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -20,13 +20,10 @@ /obj/item/holochip, /obj/item/card, /obj/item/cigarette, -<<<<<<< HEAD // SKYRAT EDIT BEGIN /obj/item/condom_pack, /obj/item/gbp_punchcard, // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/accessory/dogtag, /obj/item/coin, /obj/item/coupon, diff --git a/code/game/objects/items/surgery_tray.dm b/code/game/objects/items/surgery_tray.dm index 10a98c24c08..1e8c9aa3295 100644 --- a/code/game/objects/items/surgery_tray.dm +++ b/code/game/objects/items/surgery_tray.dm @@ -1,32 +1,3 @@ -<<<<<<< HEAD -/datum/storage/surgery_tray - max_total_storage = 30 - max_specific_storage = WEIGHT_CLASS_NORMAL - max_slots = 14 - -/datum/storage/surgery_tray/New() - . = ..() - set_holdable(list( - /obj/item/autopsy_scanner, - /obj/item/blood_filter, - /obj/item/bonesetter, - /obj/item/cautery, - /obj/item/circular_saw, - /obj/item/clothing/mask/surgical, - /obj/item/clothing/suit/toggle/labcoat/hospitalgown, // SKYRAT EDIT ADDITION - /obj/item/hemostat, - /obj/item/razor, - /obj/item/reagent_containers/medigel, - /obj/item/retractor, - /obj/item/scalpel, - /obj/item/stack/medical/bone_gel, - /obj/item/stack/sticky_tape/surgical, - /obj/item/surgical_drapes, - /obj/item/surgicaldrill, - )) - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Surgery Trays * A storage object that displays tools in its contents based on tier, better tools are more visible. @@ -198,10 +169,7 @@ new /obj/item/cautery(src) new /obj/item/circular_saw(src) new /obj/item/clothing/mask/surgical(src) -<<<<<<< HEAD new /obj/item/clothing/suit/toggle/labcoat/hospitalgown(src) // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/hemostat(src) new /obj/item/razor/surgery(src) new /obj/item/retractor(src) @@ -223,10 +191,7 @@ new /obj/item/cautery/cruel(src) new /obj/item/circular_saw(src) new /obj/item/clothing/mask/surgical(src) -<<<<<<< HEAD new /obj/item/clothing/suit/toggle/labcoat/hospitalgown(src) // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/hemostat/cruel(src) new /obj/item/razor/surgery(src) new /obj/item/retractor/cruel(src) diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index 3e10a0f92d4..9c7138e00de 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -256,11 +256,7 @@ if(istype(carbon_user) && (carbon_user.external == src || carbon_user.internal == src)) .["connected"] = TRUE -<<<<<<< HEAD -/obj/item/tank/ui_act(action, params) -======= /obj/item/tank/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/items/tcg/tcg.dm b/code/game/objects/items/tcg/tcg.dm index e0a8991dea6..23204b4809f 100644 --- a/code/game/objects/items/tcg/tcg.dm +++ b/code/game/objects/items/tcg/tcg.dm @@ -151,11 +151,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) /obj/item/tcgcard/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated() || !user.Adjacent(src)) -======= if(user.incapacitated || !user.Adjacent(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -253,11 +249,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) /obj/item/tcgcard_deck/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated() || !user.Adjacent(src)) -======= if(user.incapacitated || !user.Adjacent(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/items/tcg/tcg_machines.dm b/code/game/objects/items/tcg/tcg_machines.dm index e0ca75f4bb1..77b6891e4c1 100644 --- a/code/game/objects/items/tcg/tcg_machines.dm +++ b/code/game/objects/items/tcg/tcg_machines.dm @@ -105,11 +105,7 @@ GLOBAL_LIST_EMPTY(tcgcard_machine_radial_choices) /obj/machinery/trading_card_holder/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated() || !user.Adjacent(src)) -======= if(user.incapacitated || !user.Adjacent(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -360,11 +356,7 @@ GLOBAL_LIST_EMPTY(tcgcard_mana_bar_radial_choices) /obj/machinery/trading_card_button/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated() || !user.Adjacent(src)) -======= if(user.incapacitated || !user.Adjacent(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index 7da69706bfe..8bd7a56d4d0 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -170,16 +170,12 @@ /obj/item/hand_tele/attack_self(mob/user) if (!can_teleport_notifies(user)) return -<<<<<<< HEAD //SKYRAT EDIT BEGIN var/turf/my_turf = get_turf(src) if(is_away_level(my_turf.z)) to_chat(user, "[src] cannot be used here!") return //SKYRAT EDIT END -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/locations = list() for(var/obj/machinery/computer/teleporter/computer as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/computer/teleporter)) var/atom/target = computer.target_ref?.resolve() @@ -199,11 +195,7 @@ var/teleport_location_key = tgui_input_list(user, "Teleporter to lock on", "Hand Teleporter", sort_list(locations)) if (isnull(teleport_location_key)) return -<<<<<<< HEAD - if(user.get_active_held_item() != src || user.incapacitated()) -======= if(user.get_active_held_item() != src || user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return // Not always a datum, but needed for IS_WEAKREF_OF to cast properly. diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 85e270682e5..bdbaacf83d9 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -30,13 +30,8 @@ heat = 3800 tool_behaviour = TOOL_WELDER toolspeed = 1 -<<<<<<< HEAD - //wound_bonus = 10 //SKYRAT EDIT REMOVAL - //bare_wound_bonus = 15 //SKYRAT EDIT REMOVAL -======= wound_bonus = 10 bare_wound_bonus = 15 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.7, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.3) /// Whether the welding tool is on or off. var/welding = FALSE @@ -164,11 +159,7 @@ user.visible_message(span_notice("[user] starts to fix some of the dents on [attacked_humanoid == user ? user.p_their() : "[attacked_humanoid]'s"] [affecting.name]."), span_notice("You start fixing some of the dents on [attacked_humanoid == user ? "your" : "[attacked_humanoid]'s"] [affecting.name].")) -<<<<<<< HEAD var/use_delay = 1 SECONDS // SKYRAT EDIT - original repeating ? 1 SECONDS : 0 -======= - var/use_delay = repeating ? 1 SECONDS : 0 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(user == attacked_humanoid) use_delay = 5 SECONDS diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 60f0de61238..82636c0ee85 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -85,13 +85,6 @@ desc = "In the Mothic Fleet every individual wrapper is carefully recycled and repurposed into fresh material. Over here they are more commonly dropped directly onto the floor." icon_state = "moth_ration" -<<<<<<< HEAD -/obj/item/trash/waffles - name = "waffles tray" - icon_state = "waffles" - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/trash/pistachios name = "pistachios pack" icon_state = "pistachios_pack" diff --git a/code/game/objects/items_reskin.dm b/code/game/objects/items_reskin.dm index 011bf60879d..f8bffa7bf5f 100644 --- a/code/game/objects/items_reskin.dm +++ b/code/game/objects/items_reskin.dm @@ -81,10 +81,6 @@ return FALSE if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index ab5cc16f04e..92ca803177e 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -117,9 +117,6 @@ AddComponent(/datum/component/acid, acidpwr, acid_volume, custom_acid_overlay || GLOB.acid_overlay) return TRUE - AddComponent(/datum/component/acid, acidpwr, acid_volume, custom_acid_overlay || GLOB.acid_overlay) - return TRUE - ///called when the obj is destroyed by acid. /obj/proc/acid_melt() deconstruct(FALSE) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 0e800e5cab4..ef436e24e8c 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -190,10 +190,6 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag) if(obj_flags & UNIQUE_RENAME) . += span_notice("Use a pen on it to rename it or change its description.") -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/analyzer_act(mob/living/user, obj/item/analyzer/tool) if(atmos_scan(user=user, target=src, silent=FALSE)) return TRUE diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 8473f1755c5..701c13bfcf7 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -32,11 +32,7 @@ QUEUE_SMOOTH_NEIGHBORS(src) return ..() -<<<<<<< HEAD -/obj/structure/ui_act(action, params) -======= /obj/structure/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 add_fingerprint(usr) return ..() diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index 5f1c8013d06..4a5ee234c77 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -61,10 +61,6 @@ /obj/structure/ai_core/Destroy() if(istype(remote_ai)) -<<<<<<< HEAD - remote_ai.break_core_link() -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 remote_ai = null QDEL_NULL(circuit) QDEL_NULL(core_mmi) @@ -75,11 +71,7 @@ . = ..() if(. > 0 && istype(remote_ai)) to_chat(remote_ai, span_danger("Your core is under attack!")) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/ai_core/deactivated icon_state = "ai-empty" diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm index b1b0de6e53a..75dbfba686d 100644 --- a/code/game/objects/structures/beds_chairs/alien_nest.dm +++ b/code/game/objects/structures/beds_chairs/alien_nest.dm @@ -24,7 +24,6 @@ /obj/structure/bed/nest/user_unbuckle_mob(mob/living/captive, mob/living/hero) if(!length(buckled_mobs)) -<<<<<<< HEAD return if(hero.get_organ_by_type(/obj/item/organ/internal/alien/plasmavessel)) @@ -39,45 +38,7 @@ unbuckle_mob(captive) add_fingerprint(hero) return - - captive.visible_message(span_warning("[captive.name] struggles to break free from the gelatinous resin!"), - span_notice("You struggle to break free from the gelatinous resin... (Stay still for about a minute and a half.)"), - span_hear("You hear squelching...")) - if(!do_after(captive, 100 SECONDS, target = src, hidden = TRUE)) - if(captive.buckled) - to_chat(captive, span_warning("You fail to unbuckle yourself!")) - return - - captive.visible_message(span_warning("[captive.name] breaks free from the gelatinous resin!"), - span_notice("You break free from the gelatinous resin!"), - span_hear("You hear squelching...")) - - unbuckle_mob(captive) - add_fingerprint(hero) - -/obj/structure/bed/nest/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE) - if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.incapacitated() || M.buckled ) - return - - if(M.get_organ_by_type(/obj/item/organ/internal/alien/plasmavessel)) - return -======= - return - - if(hero.get_organ_by_type(/obj/item/organ/internal/alien/plasmavessel)) - unbuckle_mob(captive) - add_fingerprint(hero) - return - - if(captive != hero) - captive.visible_message(span_notice("[hero.name] pulls [captive.name] free from the sticky nest!"), - span_notice("[hero.name] pulls you free from the gelatinous resin."), - span_hear("You hear squelching...")) - unbuckle_mob(captive) - add_fingerprint(hero) - return - captive.visible_message(span_warning("[captive.name] struggles to break free from the gelatinous resin!"), span_notice("You struggle to break free from the gelatinous resin... (Stay still for about a minute and a half.)"), span_hear("You hear squelching...")) @@ -100,7 +61,6 @@ if(M.get_organ_by_type(/obj/item/organ/internal/alien/plasmavessel)) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!user.get_organ_by_type(/obj/item/organ/internal/alien/plasmavessel)) return diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 8e439ef0577..a843c3e3e4b 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -38,11 +38,7 @@ LINEN BINS /obj/item/bedsheet/Initialize(mapload) . = ..() AddComponent(/datum/component/surgery_initiator) -<<<<<<< HEAD - AddElement(/datum/element/bed_tuckable, mapload, 0, 12, 0) -======= AddElement(/datum/element/bed_tuckable, mapload, 0, 0, 0) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(bedsheet_type == BEDSHEET_DOUBLE) stack_amount *= 2 dying_key = DYE_REGISTRY_DOUBLE_BEDSHEET diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index eaa1803603c..f407dcd82c0 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -914,11 +914,8 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets) /obj/structure/closet/mouse_drop_receive(atom/movable/O, mob/living/user, params) if(!istype(O) || O.anchored || istype(O, /atom/movable/screen)) -<<<<<<< HEAD -======= return if(!istype(user) || user.incapacitated || user.body_position == LYING_DOWN) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(user == O) //try to climb onto it return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 316d26dc0d9..2f555ed84de 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -32,11 +32,7 @@ var/move_delay = FALSE /obj/structure/closet/cardboard/relaymove(mob/living/user, direction) -<<<<<<< HEAD - if(opened || move_delay || user.incapacitated() || !isturf(loc) || !has_gravity(loc)) -======= if(opened || move_delay || user.incapacitated || !isturf(loc) || !has_gravity(loc)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return move_delay = TRUE var/oldloc = loc @@ -76,11 +72,7 @@ for(var/mob/living/alerted_mob as anything in alerted) if(alerted_mob.stat != CONSCIOUS || alerted_mob.is_blind()) continue -<<<<<<< HEAD - if(!alerted_mob.incapacitated(IGNORE_RESTRAINTS)) -======= if(!INCAPACITATED_IGNORING(alerted_mob, INCAPABLE_RESTRAINTS)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alerted_mob.face_atom(src) alerted_mob.do_alert_animation() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index 7ce3746b9b7..76c7ab82db4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -18,14 +18,12 @@ new /obj/item/etherealballdeployer(src) new /obj/item/roulette_wheel_beacon(src) -<<<<<<< HEAD + //SKYRAT EDIT ADDITION new /obj/item/storage/fancy/candle_box(src) new /obj/item/storage/fancy/candle_box(src) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/bar/all_access req_access = null diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 9bbcd3bf843..80a707ce231 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -18,25 +18,18 @@ new /obj/item/extinguisher/advanced(src) new /obj/item/storage/photo_album/ce(src) new /obj/item/storage/box/skillchips/engineering(src) -<<<<<<< HEAD new /obj/item/storage/box/gas_miner_beacons(src) // SKYRAT EDIT ADDITION new /obj/item/construction/plumbing/engineering(src) //SKYRAT EDIT ADDITION new /obj/item/circuitboard/machine/rodstopper(src) //SKYRAT EDIT ADDITION new /obj/item/card/id/departmental_budget/eng(src) //SKYRAT EDIT ADDITION -======= new /obj/item/storage/box/stickers/chief_engineer(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/engineering_chief/populate_contents_immediate() . = ..() // Traitor steal objective new /obj/item/blueprints(src) -<<<<<<< HEAD new /obj/item/pipe_dispenser/bluespace(src) // SKYRAT EDIT -- BLUESPACE RPD -- ORIGINAL: new /obj/item/pipe_dispenser(src) -======= - new /obj/item/pipe_dispenser(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/engineering_electrical name = "electrical supplies locker" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 1c321693475..e5eed4cb295 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -86,10 +86,7 @@ new /obj/item/defibrillator/compact/loaded(src) new /obj/item/healthanalyzer/advanced(src) new /obj/item/assembly/flash/handheld(src) -<<<<<<< HEAD new /obj/item/storage/briefcase/medicalgunset/cmo(src) //SKYRAT EDIT ADDITION MEDIGUNS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/autosurgeon/medical_hud(src) new /obj/item/door_remote/chief_medical_officer(src) new /obj/item/clothing/neck/petcollar(src) @@ -98,21 +95,14 @@ new /obj/item/circuitboard/machine/techfab/department/medical(src) new /obj/item/storage/photo_album/cmo(src) new /obj/item/storage/lockbox/medal/med(src) -<<<<<<< HEAD new /obj/item/card/id/departmental_budget/med(src) //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/chief_medical/populate_contents_immediate() . = ..() // Traitor steal objective -<<<<<<< HEAD //new /obj/item/reagent_containers/hypospray/cmo(src) - ORIGINAL new /obj/item/storage/hypospraykit/cmo/preloaded(src) //SKYRAT EDIT ADDITION - New Hyposprays -======= - new /obj/item/reagent_containers/hypospray/cmo(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/animal name = "animal control locker" @@ -137,11 +127,8 @@ new /obj/item/storage/box/pillbottles(src) new /obj/item/storage/box/medigels(src) new /obj/item/storage/box/medigels(src) -<<<<<<< HEAD new /obj/item/storage/box/hypospray(src) //SKYRAT EDIT ADDITION - HYPOSPRAYS new /obj/item/storage/box/hypospray(src) //SKYRAT EDIT ADDITION - HYPOSPRAYS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/ph_booklet(src) new /obj/item/reagent_containers/dropper(src) new /obj/item/reagent_containers/cup/bottle/acidic_buffer(src) //hopefully they get the hint diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index a5b5d346ebf..a48d551b768 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -18,10 +18,7 @@ new /obj/item/circuitboard/machine/techfab/department/science(src) new /obj/item/storage/photo_album/rd(src) new /obj/item/storage/box/skillchips/science(src) -<<<<<<< HEAD new /obj/item/card/id/departmental_budget/sci(src) //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/research_director/populate_contents_immediate() . = ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index c036af905d4..bf75441d1bf 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -50,10 +50,7 @@ new /obj/item/circuitboard/machine/techfab/department/service(src) new /obj/item/storage/photo_album/hop(src) new /obj/item/storage/lockbox/medal/hop(src) -<<<<<<< HEAD new /obj/item/card/id/departmental_budget/srv(src) //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/hop/populate_contents_immediate() new /obj/item/gun/energy/e_gun(src) @@ -128,11 +125,7 @@ new /obj/item/radio/headset/headset_sec/alt(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/flashlight/seclite(src) -<<<<<<< HEAD new /obj/item/clothing/gloves/tackler/security(src) // SKYRAT EDIT CHANGE - Gives Them The Blue Ones - ORIGINAL: new /obj/item/clothing/gloves/tackler(src) -======= - new /obj/item/clothing/gloves/tackler(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/secure_closet/security/sec @@ -302,10 +295,7 @@ /obj/structure/closet/secure_closet/armory1 name = "armory armor locker" -<<<<<<< HEAD -======= icon_state = "armory" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 req_access = list(ACCESS_ARMORY) /obj/structure/closet/secure_closet/armory1/PopulateContents() diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 12bbbfe2f6b..4d3c3d739f9 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -38,12 +38,8 @@ if (prob(40)) new /obj/item/storage/toolbox/emergency(src) -<<<<<<< HEAD //switch (pick_weight(list("small" = 35, "aid" = 30, "tank" = 20, "both" = 10, "nothing" = 4))) // ORIGINAL switch (pick_weight(list("small" = 35, "aid" = 30, "tank" = 20, "both" = 10))) // SKYRAT EDIT CHANGE -======= - switch (pick_weight(list("small" = 35, "aid" = 30, "tank" = 20, "both" = 10, "nothing" = 4))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if ("small") new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/tank/internals/emergency_oxygen(src) @@ -68,11 +64,8 @@ if ("nothing") // doot pass() -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* * Fire Closet @@ -84,39 +77,22 @@ /obj/structure/closet/firecloset/PopulateContents() ..() -<<<<<<< HEAD new /obj/item/clothing/suit/utility/fire/firefighter(src) new /obj/item/clothing/mask/gas/alt(src) //SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/clothing/mask/gas(src) -======= - - new /obj/item/clothing/suit/utility/fire/firefighter(src) - new /obj/item/clothing/mask/gas(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/tank/internals/oxygen/red(src) new /obj/item/extinguisher(src) new /obj/item/clothing/head/utility/hardhat/red(src) new /obj/item/crowbar/large/emergency(src) -<<<<<<< HEAD new /obj/item/storage/inflatable(src) //SKYRAT EDIT ADDITION - INFLATABLES /obj/structure/closet/firecloset/full/PopulateContents() new /obj/item/clothing/suit/utility/fire/firefighter(src) new /obj/item/clothing/mask/gas/alt(src) //SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/clothing/mask/gas(src) -======= - -/obj/structure/closet/firecloset/full/PopulateContents() - new /obj/item/clothing/suit/utility/fire/firefighter(src) - new /obj/item/clothing/mask/gas(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/item/flashlight(src) new /obj/item/tank/internals/oxygen/red(src) new /obj/item/extinguisher(src) new /obj/item/clothing/head/utility/hardhat/red(src) new /obj/item/crowbar/large/emergency(src) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* * Tool Closet diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index dc0e22abff5..7efa0d6a91e 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -1,11 +1,7 @@ /obj/structure/closet/crate name = "crate" desc = "A rectangular steel crate." -<<<<<<< HEAD - icon = 'icons/obj/storage/crates.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE -======= icon = 'icons/obj/storage/crates.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "crate" base_icon_state = "crate" req_access = null @@ -226,15 +222,12 @@ icon_state = "medicalcrate" base_icon_state = "medicalcrate" -<<<<<<< HEAD -======= /obj/structure/closet/crate/deforest name = "deforest medical crate" desc = "A DeFortest brand crate of medical supplies." icon_state = "deforest" base_icon_state = "deforest" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/crate/medical/department icon_state = "medical" base_icon_state = "medical" @@ -302,8 +295,6 @@ name = "food icebox" icon_state = "food" base_icon_state = "food" -<<<<<<< HEAD -======= /obj/structure/closet/crate/freezer/donk name = "donk co. fridge" @@ -322,7 +313,6 @@ desc = "Interdyne Pharmauceutics branded freezer. Only freshly harvested- I mean, freshly kept blood inside!" icon_state = "interdynefreezer" base_icon_state = "interdynefreezer" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/crate/radiation desc = "A crate with a radiation sign on it." @@ -346,15 +336,12 @@ icon_state = "cargo" base_icon_state = "cargo" -<<<<<<< HEAD -======= /obj/structure/closet/crate/robust name = "robust industries crate" desc = "Robust Inustries LLC. crate. Feels oddly nostalgic." icon_state = "robust" base_icon_state = "robust" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/crate/cargo/mining name = "mining crate" icon_state = "mining" @@ -364,15 +351,14 @@ name = "engineering crate" icon_state = "engi_crate" base_icon_state = "engi_crate" -<<<<<<< HEAD -======= + /obj/structure/closet/crate/nakamura name = "nakamura engineering crate" desc = "Crate from Nakamura Engineering, most likely containing engineering supplies or MODcores." icon_state = "nakamura" base_icon_state = "nakamura" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + /obj/structure/closet/crate/engineering/electrical icon_state = "engi_e_crate" diff --git a/code/game/objects/structures/crates_lockers/crates/large.dm b/code/game/objects/structures/crates_lockers/crates/large.dm index be0d4e8c24b..0a08d9c7949 100644 --- a/code/game/objects/structures/crates_lockers/crates/large.dm +++ b/code/game/objects/structures/crates_lockers/crates/large.dm @@ -34,12 +34,8 @@ if(W.tool_behaviour == TOOL_CROWBAR) if(manifest) tear_manifest(user) -<<<<<<< HEAD - -======= if(!open(user)) return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.visible_message(span_notice("[user] pries \the [src] open."), \ span_notice("You pry open \the [src]."), \ span_hear("You hear splitting wood.")) diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm index 24965b07f59..e93591f1d59 100644 --- a/code/game/objects/structures/crates_lockers/crates/secure.dm +++ b/code/game/objects/structures/crates_lockers/crates/secure.dm @@ -43,8 +43,6 @@ name = "weapons crate" icon_state = "weaponcrate" base_icon_state = "weaponcrate" -<<<<<<< HEAD -======= /obj/structure/closet/crate/secure/gorlex_weapons desc = "A secure weapons crate of Gorlex Marauders." @@ -56,7 +54,6 @@ desc = "A beaten up, jammed open weapon crate of Gorlex Marauders." name = "jammed weapons crate" locked = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/closet/crate/secure/plasma desc = "A secure plasma crate." diff --git a/code/game/objects/structures/deployable_turret.dm b/code/game/objects/structures/deployable_turret.dm index 032c698acec..908d2348db4 100644 --- a/code/game/objects/structures/deployable_turret.dm +++ b/code/game/objects/structures/deployable_turret.dm @@ -85,11 +85,7 @@ STOP_PROCESSING(SSfastprocess, src) /obj/machinery/deployable_turret/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE) -<<<<<<< HEAD - if(user.incapacitated() || !istype(user)) -======= if(user.incapacitated || !istype(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return M.forceMove(get_turf(src)) . = ..() @@ -133,11 +129,7 @@ calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(controller, target_turf, modifiers) /obj/machinery/deployable_turret/proc/direction_track(mob/user, atom/targeted) -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return setDir(get_dir(src,targeted)) user.setDir(dir) @@ -177,11 +169,7 @@ /obj/machinery/deployable_turret/proc/checkfire(atom/targeted_atom, mob/user) target = targeted_atom -<<<<<<< HEAD - if(target == user || user.incapacitated() || target == get_turf(src)) -======= if(target == user || user.incapacitated || target == get_turf(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(world.time < cooldown) if(!warned && world.time > (cooldown - cooldown_duration + rate_of_fire*number_of_shots)) // To capture the window where one is done firing @@ -199,11 +187,7 @@ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/deployable_turret/, fire_helper), user), i*rate_of_fire) /obj/machinery/deployable_turret/proc/fire_helper(mob/user) -<<<<<<< HEAD - if(user.incapacitated() || !(user in buckled_mobs)) -======= if(user.incapacitated || !(user in buckled_mobs)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return update_positioning() //REFRESH MOUSE TRACKING!! var/turf/targets_from = get_turf(src) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 7061d514a29..20ad3235b03 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -101,13 +101,8 @@ /obj/structure/displaycase/proc/trigger_alarm() if(!alert) return -<<<<<<< HEAD //var/area/alarmed = get_area(src) SKYRAT EDIT REMOVAL //alarmed.burglaralert(src) SKYRAT EDIT REMOVAL -======= - var/area/alarmed = get_area(src) - alarmed.burglaralert(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alarm_manager.send_alarm(ALARM_BURGLAR) addtimer(CALLBACK(alarm_manager, TYPE_PROC_REF(/datum/alarm_handler, clear_alarm), ALARM_BURGLAR), 1 MINUTES) @@ -416,11 +411,7 @@ data["showpiece_icon"] = icon2base64(getFlatIcon(showpiece, no_anim=TRUE)) return data -<<<<<<< HEAD -/obj/structure/displaycase/trophy/ui_act(action, params) -======= /obj/structure/displaycase/trophy/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -535,11 +526,7 @@ data["product_icon"] = showpiece ? icon2base64(getFlatIcon(showpiece, no_anim=TRUE)) : null return data -<<<<<<< HEAD -/obj/structure/displaycase/forsale/ui_act(action, params) -======= /obj/structure/displaycase/forsale/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index 13618546ebf..feb9cff2f00 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -34,11 +34,7 @@ to_chat(dressing_human, span_warning("You are not capable of wearing underwear.")) return -<<<<<<< HEAD var/choice = tgui_input_list(user, "Underwear, Bra, Undershirt, or Socks?", "Changing", list("Underwear", "Underwear Color", "Bra", "Bra Color", "Undershirt", "Undershirt Color", "Socks", "Socks Color")) //SKYRAT EDIT ADDITION - Colorable Undershirt/Socks/Bra -======= - var/choice = tgui_input_list(user, "Underwear, Undershirt, or Socks?", "Changing", list("Underwear","Underwear Color","Undershirt","Socks")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(choice)) return @@ -61,7 +57,6 @@ var/new_socks = tgui_input_list(user, "Select your socks", "Changing", SSaccessories.socks_list) if(new_socks) dressing_human.socks = new_socks -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - Colorable Undershirt/Socks/Bras if("Undershirt Color") var/new_undershirt_color = input(dressing_human, "Choose your undershirt color", "Undershirt Color", dressing_human.undershirt_color) as color|null @@ -84,8 +79,5 @@ //SKYRAT EDIT ADDITION END - Colorable Undershirt/Socks/Bras -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 add_fingerprint(dressing_human) dressing_human.update_body() diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 74646977069..2407fc748ac 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -16,11 +16,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/extinguisher_cabinet, 29) . = ..() if(building) opened = TRUE -<<<<<<< HEAD - //icon_state = "extinguisher_empty" ORIGINAL - icon_state = "extinguisher_empty_open" //SKYRAT EDIT CHANGE - AESTHETICS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else stored_extinguisher = new /obj/item/extinguisher(src) update_appearance(UPDATE_ICON) @@ -163,10 +158,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/extinguisher_cabinet, 29) icon_state += "_closed" return ..() -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + /obj/structure/extinguisher_cabinet/atom_break(damage_flag) . = ..() diff --git a/code/game/objects/structures/fireplace.dm b/code/game/objects/structures/fireplace.dm index 8958d4a62b2..150250c8278 100644 --- a/code/game/objects/structures/fireplace.dm +++ b/code/game/objects/structures/fireplace.dm @@ -95,17 +95,6 @@ return switch(burn_time_remaining()) -<<<<<<< HEAD - if(0 to 19999) //SKYRAT EDIT original: if(0 to 500) - . += "fireplace_fire0" - if(20000 to 39999) //SKYRAT EDIT original: if(500 to 1000) - . += "fireplace_fire1" - if(40000 to 59999) //SKYRAT EDIT original: if(1000 to 1500) - . += "fireplace_fire2" - if(60000 to 79999) //SKYRAT EDIT original: if(1500 to 2000) - . += "fireplace_fire3" - if(80000 to MAXIMUM_BURN_TIMER) //SKYRAT EDIT original: if(2000 to MAXIMUM_BURN_TIMER) -======= if(0 to 500) . += "fireplace_fire0" if(500 to 1000) @@ -115,7 +104,6 @@ if(1500 to 2000) . += "fireplace_fire3" if(2000 to MAXIMUM_BURN_TIMER) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . += "fireplace_fire4" . += "fireplace_glow" diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index bd8bad94406..c9804fab0f8 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -82,11 +82,7 @@ balloon_alert(user, "need [amount] rods!") return balloon_alert(user, "concealing entrance...") -<<<<<<< HEAD if(do_after(user, 2 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT -======= - if(do_after(user, 2 SECONDS, target = src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(rod.get_amount() < amount) return rod.use(amount) @@ -100,20 +96,13 @@ balloon_alert(user, "need [amount] rods!") return balloon_alert(user, "adding plating...") -<<<<<<< HEAD if(do_after(user, 4 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT -======= - if(do_after(user, 4 SECONDS, target = src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(rod.get_amount() < amount) return rod.use(amount) var/turf/T = get_turf(src) T.place_on_top(/turf/closed/wall/mineral/iron) -<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 transfer_fingerprints_to(T) qdel(src) return @@ -129,11 +118,7 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "concealing entrance...") -<<<<<<< HEAD if(do_after(user, 20 * platingmodifier * skill_modifier, target = src)) //SKYRAT EDIT -======= - if(do_after(user, 20*platingmodifier, target = src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) @@ -150,19 +135,12 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "adding plating...") -<<<<<<< HEAD if (do_after(user, 4 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT -======= - if (do_after(user, 4 SECONDS, target = src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) var/obj/structure/tram/alt/iron/tram_wall = new(loc) -<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 transfer_fingerprints_to(tram_wall) qdel(src) return @@ -171,20 +149,13 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "adding plating...") -<<<<<<< HEAD if (do_after(user, 40 * platingmodifier * skill_modifier, target = src)) //SKYRAT EDIT -======= - if (do_after(user, 40*platingmodifier, target = src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) var/turf/T = get_turf(src) T.place_on_top(/turf/closed/wall) -<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 transfer_fingerprints_to(T) qdel(src) return @@ -195,19 +166,12 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "adding panel...") -<<<<<<< HEAD if (do_after(user, 2 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT -======= - if (do_after(user, 2 SECONDS, target = src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) var/obj/structure/tram/tram_wall = new(loc) -<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 transfer_fingerprints_to(tram_wall) qdel(src) return @@ -219,11 +183,7 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "concealing entrance...") -<<<<<<< HEAD if(do_after(user, 2 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT -======= - if(do_after(user, 2 SECONDS, target = src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) @@ -237,20 +197,13 @@ if(sheets.get_amount() < amount) return balloon_alert(user, "adding plating...") -<<<<<<< HEAD if(do_after(user, 50 * platingmodifier * skill_modifier, target = src)) //SKYRAT EDIT -======= - if(do_after(user, 50*platingmodifier, target = src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) var/turf/T = get_turf(src) T.place_on_top(/turf/closed/wall/r_wall) -<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 transfer_fingerprints_to(T) qdel(src) return @@ -259,11 +212,7 @@ if(sheets.get_amount() < amount) return balloon_alert(user, "reinforcing frame...") -<<<<<<< HEAD if(do_after(user, 60 * platingmodifier * skill_modifier, target = src)) //SKYRAT EDIT -======= - if(do_after(user, 60*platingmodifier, target = src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) @@ -277,10 +226,6 @@ if(istype(src, /obj/structure/girder/reinforced)) balloon_alert(user, "need plasteel!") return -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/M = sheets.sheettype var/amount = construction_cost["exotic_material"] if(state == GIRDER_TRAM) @@ -292,19 +237,12 @@ balloon_alert(user, "need titanium glass or mineral!") return balloon_alert(user, "adding plating...") -<<<<<<< HEAD if (do_after(user, 4 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT -======= - if (do_after(user, 4 SECONDS, target = src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return var/obj/structure/tram/tram_wall tram_wall = new tram_wall_type(loc) -<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sheets.use(amount) transfer_fingerprints_to(tram_wall) qdel(src) @@ -315,19 +253,12 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "concealing entrance...") -<<<<<<< HEAD if(do_after(user, 2 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT -======= - if(do_after(user, 2 SECONDS, target = src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) var/obj/structure/falsewall/falsewall -<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(falsewall_type) falsewall = new falsewall_type (loc) else @@ -345,19 +276,12 @@ balloon_alert(user, "need [amount] sheets!") return balloon_alert(user, "adding plating...") -<<<<<<< HEAD if (do_after(user, 4 SECONDS * skill_modifier, target = src)) //SKYRAT EDIT -======= - if (do_after(user, 4 SECONDS, target = src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.get_amount() < amount) return sheets.use(amount) var/turf/T = get_turf(src) -<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sheets.walltype) T.place_on_top(sheets.walltype) else diff --git a/code/game/objects/structures/guncase.dm b/code/game/objects/structures/guncase.dm index 49a6c95604b..b297b670b0e 100644 --- a/code/game/objects/structures/guncase.dm +++ b/code/game/objects/structures/guncase.dm @@ -104,11 +104,7 @@ return FALSE if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/structures/janitor.dm b/code/game/objects/structures/janitor.dm index 1c981e56954..a8df82e02b2 100644 --- a/code/game/objects/structures/janitor.dm +++ b/code/game/objects/structures/janitor.dm @@ -337,11 +337,7 @@ * * user The mob interacting with a menu */ /obj/structure/mop_bucket/janitorialcart/proc/check_menu(mob/living/user) -<<<<<<< HEAD - return istype(user) && !user.incapacitated() -======= return istype(user) && !user.incapacitated ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/mop_bucket/janitorialcart/update_overlays() . = ..() diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index f739a67bb5d..a213d915c0f 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -12,8 +12,6 @@ /obj/structure/kitchenspike_frame/Initialize(mapload) . = ..() register_context() -<<<<<<< HEAD -======= /obj/structure/kitchenspike_frame/examine(mob/user) . = ..() @@ -65,7 +63,6 @@ qdel(src) return balloon_alert(user, "[MEATSPIKE_IRONROD_REQUIREMENT] rods needed!") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/kitchenspike_frame/examine(mob/user) . = ..() diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index b3ab6b62af4..ffe4ea44a00 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -182,11 +182,7 @@ INVOKE_ASYNC(src, PROC_REF(start_travelling), user, going_up) /obj/structure/ladder/proc/check_menu(mob/user, is_ghost) -<<<<<<< HEAD - if(user.incapacitated() || (!user.Adjacent(src))) -======= if(user.incapacitated || (!user.Adjacent(src))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/structures/maintenance.dm b/code/game/objects/structures/maintenance.dm index 8d6446b271f..9f88246966f 100644 --- a/code/game/objects/structures/maintenance.dm +++ b/code/game/objects/structures/maintenance.dm @@ -226,11 +226,7 @@ at the cost of risking a vicious bite.**/ /obj/structure/destructible/cult/pants_altar/proc/check_menu(mob/user) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated() || !user.Adjacent(src)) -======= if(user.incapacitated || !user.Adjacent(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/game/objects/structures/mannequin.dm b/code/game/objects/structures/mannequin.dm index 41e25d61034..dc213e762ed 100644 --- a/code/game/objects/structures/mannequin.dm +++ b/code/game/objects/structures/mannequin.dm @@ -98,26 +98,6 @@ var/datum/sprite_accessory/underwear/underwear = SSaccessories.underwear_list[underwear_name] if(underwear) if(body_type == FEMALE && underwear.gender == MALE) -<<<<<<< HEAD - . += wear_female_version(underwear.icon_state, underwear.icon, BODY_LAYER, FEMALE_UNIFORM_FULL) - else - . += mutable_appearance(underwear.icon, underwear.icon_state, -BODY_LAYER) - var/datum/sprite_accessory/undershirt/undershirt = SSaccessories.undershirt_list[undershirt_name] - if(undershirt) - if(body_type == FEMALE) - . += wear_female_version(undershirt.icon_state, undershirt.icon, BODY_LAYER) - else - . += mutable_appearance(undershirt.icon, undershirt.icon_state, -BODY_LAYER) - var/datum/sprite_accessory/socks/socks = SSaccessories.socks_list[socks_name] - if(socks) - . += mutable_appearance(socks.icon, socks.icon_state, -BODY_LAYER) - //SKYRAT EDIT ADDITION BEGIN - Underwear and Bra split - var/datum/sprite_accessory/bra/bra = SSaccessories.bra_list[bra_name] - if(bra) - . += mutable_appearance(bra.icon, bra.icon_state, -BODY_LAYER) - //SKYRAT EDIT END - -======= . += mutable_appearance(wear_female_version(underwear.icon_state, underwear.icon, FEMALE_UNIFORM_FULL), layer = -BODY_LAYER) else . += mutable_appearance(underwear.icon, underwear.icon_state, layer = -BODY_LAYER) @@ -130,7 +110,11 @@ var/datum/sprite_accessory/socks/socks = SSaccessories.socks_list[socks_name] if(socks) . += mutable_appearance(socks.icon, socks.icon_state, -BODY_LAYER) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + //SKYRAT EDIT ADDITION BEGIN - Underwear and Bra split + var/datum/sprite_accessory/bra/bra = SSaccessories.bra_list[bra_name] + if(bra) + . += mutable_appearance(bra.icon, bra.icon_state, -BODY_LAYER) + //SKYRAT EDIT END for(var/slot_flag in worn_items) var/obj/item/worn_item = worn_items[slot_flag] if(!worn_item) @@ -184,11 +168,7 @@ . = ..() if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) return -<<<<<<< HEAD var/choice = tgui_input_list(user, "Underwear, Bra, Undershirt, or Socks?", "Changing", list("Underwear", "Bra", "Undershirt","Socks")) //SKYRAT EDIT ADDITION - Underwear and Bra split -======= - var/choice = tgui_input_list(user, "Underwear, Undershirt, or Socks?", "Changing", list("Underwear","Undershirt","Socks")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!Adjacent(user)) return switch(choice) @@ -204,15 +184,12 @@ var/new_socks = tgui_input_list(user, "Select the mannequin's socks", "Changing", SSaccessories.socks_list) if(new_socks) socks_name = new_socks -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - Underwear and Bra split if("Bra") var/new_bra = tgui_input_list(user, "Select the mannequin's bra", "Changing", SSaccessories.bra_list) if(new_bra) bra_name = new_bra //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 update_appearance() /obj/structure/mannequin/wood diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index b682e8f45b3..5fae9be3e88 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -79,11 +79,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) /obj/structure/mirror/attack_hand(mob/living/carbon/human/user) . = ..() -<<<<<<< HEAD if(. || !ishuman(user) || broken || !istype(src, /obj/structure/mirror/magic)) // SKYRAT EDIT CHANGE - MUNDANE MIRRORS DON'T LET YOU CHANGE - ORIGINAL: if(. || !ishuman(user) || broken) -======= - if(. || !ishuman(user) || broken) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE if(!istype(src, /obj/structure/mirror/magic) && !user.can_perform_action(src, FORBID_TELEKINESIS_REACH)) @@ -358,10 +354,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) user.set_facial_haircolor(sanitize_hexcolor(new_face_color), update = FALSE) user.dna.update_ui_block(DNA_FACIAL_HAIR_COLOR_BLOCK) user.update_body_parts() -<<<<<<< HEAD user.update_mutant_bodyparts() /// SKYRAT EDIT ADDITION - Mirrors are no longer scared of colored ears -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/mirror/magic/attack_hand(mob/living/carbon/human/user) . = ..() diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index ddafc93e549..a56841ca659 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -31,11 +31,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants and other ghosties. /obj/structure/bodycontainer -<<<<<<< HEAD - icon = 'icons/obj/structures.dmi'//ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= icon = 'icons/obj/structures.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "morgue1" density = TRUE anchored = TRUE @@ -490,13 +486,10 @@ GLOBAL_LIST_EMPTY(crematoriums) qdel(M) for(var/obj/O in conts) //conts defined above, ignores crematorium and tray -<<<<<<< HEAD // SKYRAT EDIT ADDITION if(istype(O, /obj/item/goldeneye_key)) continue // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(istype(O, /obj/effect/dummy/phased_mob)) //they're not physical, don't burn em. continue qdel(O) diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 477b690c8af..8bae150e3ba 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -66,11 +66,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/noticeboard, 32) data["items"] += list(content_data) return data -<<<<<<< HEAD -/obj/structure/noticeboard/ui_act(action, params) -======= /obj/structure/noticeboard/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 65ffa10d1c1..a5ed048153c 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -2,11 +2,7 @@ name = "airtight plastic flaps" desc = "Heavy duty, airtight, plastic flaps. Definitely can't get past those. No way." gender = PLURAL -<<<<<<< HEAD - icon = 'icons/obj/structures.dmi'//ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= icon = 'icons/obj/structures.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "plasticflaps" armor_type = /datum/armor/structure_plasticflaps density = FALSE diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index 028b659d017..55ff2261d7d 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -24,26 +24,16 @@ laser = 50 energy = 100 bomb = 10 -<<<<<<< HEAD -======= /obj/structure/railing/unbreakable resistance_flags = INDESTRUCTIBLE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/railing/corner //aesthetic corner sharp edges hurt oof ouch icon_state = "railing_corner" density = FALSE climbable = FALSE -<<<<<<< HEAD -/obj/structure/railing/corner/end //end of a segment of railing without making a loop - icon_state = "railing_end" -/obj/structure/railing/corner/end/flip //same as above but flipped around - icon_state = "railing_end_flip" - -======= /obj/structure/railing/corner/unbreakable resistance_flags = INDESTRUCTIBLE @@ -59,7 +49,6 @@ /obj/structure/railing/corner/end/flip/unbreakable resistance_flags = INDESTRUCTIBLE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/railing/Initialize(mapload) . = ..() if(climbable) diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index 12b6cf134b8..5cd3f58df05 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -311,11 +311,7 @@ return data -<<<<<<< HEAD -/obj/structure/reflector/ui_act(action, params) -======= /obj/structure/reflector/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index b5a2527b6c9..14e3b53680d 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -129,11 +129,7 @@ FLOOR SAFES return data -<<<<<<< HEAD -/obj/structure/safe/ui_act(action, params) -======= /obj/structure/safe/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm index 6d18c5d58c3..2158a88a6b6 100644 --- a/code/game/objects/structures/showcase.dm +++ b/code/game/objects/structures/showcase.dm @@ -52,10 +52,6 @@ /obj/structure/showcase/machinery/oldpod/used/psyker name = "opened mental energizer" desc = "A mental energizer that has recently discharged its occupant. The pod appears non-functional." -<<<<<<< HEAD - icon = 'icons/obj/machines/sleeper.dmi' -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "psykerpod-open" /obj/structure/showcase/cyborg/old diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index b2889a29469..0ae4c1173d4 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -120,7 +120,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) return TRUE -<<<<<<< HEAD + //SKYRAT EDIT ADDITION /obj/machinery/shower/plunger_act(obj/item/plunger/P, mob/living/user, reinforced) if(do_after(user, 3 SECONDS, src)) @@ -128,8 +128,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) balloon_alert(user, "reservoir emptied") //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/shower/analyzer_act(mob/living/user, obj/item/tool) . = ..() @@ -197,13 +195,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) I.play_tool_sound(src) deconstruct() return TRUE -<<<<<<< HEAD - -/obj/machinery/shower/setDir(newdir) - . = ..() - update_appearance(UPDATE_OVERLAYS) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/shower/update_overlays() . = ..() @@ -212,16 +203,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) var/mutable_appearance/water_falling = mutable_appearance('icons/obj/watercloset.dmi', "water", ABOVE_MOB_LAYER) water_falling.color = mix_color_from_reagents(reagents.reagent_list) switch(dir) -<<<<<<< HEAD - - if(SOUTH) - water_falling.pixel_z -= 24 - if(EAST) - water_falling.pixel_w += 16 - if(WEST) - water_falling.pixel_w -= 16 - -======= if(NORTH) water_falling.pixel_y += pixel_shift if(SOUTH) @@ -230,7 +211,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) water_falling.pixel_x += pixel_shift if(WEST) water_falling.pixel_x -= pixel_shift ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . += water_falling /obj/machinery/shower/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 3a2b7324854..142d95c0bbf 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -480,11 +480,7 @@ check_break(M) /obj/structure/table/glass/proc/check_break(mob/living/M) -<<<<<<< HEAD - if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & MOVETYPES_NOT_TOUCHING_GROUND) && (!isteshari(M))) //SKYRAT EDIT ADDITION - Allows Teshari to climb on glassies safely. -======= - if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & MOVETYPES_NOT_TOUCHING_GROUND)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & MOVETYPES_NOT_TOUCHING_GROUND) && (!isteshari(M))) //SKYRAT EDIT ADDITION - Allows Teshari to climb on glassies safely. - This should be a component table_shatter(M) /obj/structure/table/glass/proc/table_shatter(mob/living/victim) @@ -798,16 +794,6 @@ pushed_mob.set_resting(TRUE, TRUE) visible_message(span_notice("[user] lays [pushed_mob] on [src].")) -<<<<<<< HEAD -/// Any mob that enters our tile will be marked as a potential patient. They will be turned into a patient if they lie down. -/obj/structure/table/optable/proc/mark_patient(datum/source, mob/living/carbon/potential_patient) - SIGNAL_HANDLER - if(!istype(potential_patient)) - return - RegisterSignal(potential_patient, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(recheck_patient)) - recheck_patient(potential_patient) // In case the mob is already lying down before they entered. - -======= ///Align the mob with the table when buckled. /obj/structure/table/optable/post_buckle_mob(mob/living/buckled) . = ..() @@ -826,7 +812,6 @@ RegisterSignal(potential_patient, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(recheck_patient)) recheck_patient(potential_patient) // In case the mob is already lying down before they entered. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Unmark the potential patient. /obj/structure/table/optable/proc/unmark_patient(datum/source, mob/living/carbon/potential_patient) SIGNAL_HANDLER @@ -846,17 +831,12 @@ if(potential_patient.body_position == LYING_DOWN && potential_patient.loc == loc) patient = potential_patient -<<<<<<< HEAD chill_out(patient) // SKYRAT EDIT - Operation Table Numbing return if(!isnull(patient)) // SKYRAT EDIT - Operation Table Numbing thaw_them(patient) // SKYRAT EDIT - Operation Table Numbing -======= - return - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Find another lying mob as a replacement. for (var/mob/living/carbon/replacement_patient in loc.contents) if(replacement_patient.body_position == LYING_DOWN) diff --git a/code/game/objects/structures/training_machine.dm b/code/game/objects/structures/training_machine.dm index e08e9a251d7..c1963ea38a3 100644 --- a/code/game/objects/structures/training_machine.dm +++ b/code/game/objects/structures/training_machine.dm @@ -79,11 +79,7 @@ * * Will not respond if moving and emagged, so once you set it to go it can't be stopped! */ -<<<<<<< HEAD -/obj/structure/training_machine/ui_act(action, params) -======= /obj/structure/training_machine/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index bbd5a0cd308..6522a2125fe 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -69,11 +69,7 @@ deconstruct(FALSE) /obj/structure/transit_tube_pod/container_resist_act(mob/living/user) -<<<<<<< HEAD - if(!user.incapacitated()) -======= if(!user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 empty_pod() return if(!moving) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 60bb9f3aec5..d9a669f7c42 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -108,11 +108,7 @@ /obj/structure/window/singularity_pull(S, current_size) ..() -<<<<<<< HEAD if(anchored && current_size >= STAGE_FIVE) //SKYRAT EDIT CHANGE -======= - if(anchored && current_size >= STAGE_TWO) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_anchored(FALSE) if(current_size >= STAGE_FIVE) deconstruct(FALSE) @@ -454,10 +450,7 @@ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, forceMove), loc), time_to_go + time_to_return) //we back boys addtimer(VARSET_CALLBACK(src, dramatically_disappearing, FALSE), time_to_go + time_to_return) //also set the var back addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), time_to_go + time_to_return) -<<<<<<< HEAD -======= addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), get_turf(src), 'sound/effects/glass_reverse.ogg', 70, TRUE), time_to_go + time_to_return) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/structure/grille/grill = take_grill ? (locate(/obj/structure/grille) in loc) : null if(grill) @@ -498,11 +491,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/unanchored/spawner, 0) //2022 BABYYYYY ~lewc //2023 ONE YEAR TO GO! -LT3 /datum/armor/window_reinforced -<<<<<<< HEAD - melee = 50 -======= melee = 80 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bomb = 25 fire = 80 acid = 100 @@ -696,11 +685,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw /obj/structure/window/fulltile name = "full tile window" desc = "A full tile window." -<<<<<<< HEAD icon = 'icons/obj/smooth_structures/window.dmi' //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= - icon = 'icons/obj/smooth_structures/window.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "window-0" base_icon_state = "window" max_integrity = 100 @@ -721,11 +706,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw anchored = FALSE /obj/structure/window/plasma/fulltile -<<<<<<< HEAD icon = 'icons/obj/smooth_structures/plasma_window.dmi' //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= - icon = 'icons/obj/smooth_structures/plasma_window.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "plasma_window-0" base_icon_state = "plasma_window" max_integrity = 400 @@ -741,11 +722,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw anchored = FALSE /obj/structure/window/reinforced/plasma/fulltile -<<<<<<< HEAD icon = 'icons/obj/smooth_structures/rplasma_window.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE -======= - icon = 'icons/obj/smooth_structures/rplasma_window.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "rplasma_window-0" base_icon_state = "rplasma_window" state = RWINDOW_SECURE @@ -765,11 +742,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw /obj/structure/window/reinforced/fulltile name = "full tile reinforced window" desc = "A full tile window that is reinforced with metal rods." -<<<<<<< HEAD icon = 'icons/obj/smooth_structures/reinforced_window.dmi' //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= - icon = 'icons/obj/smooth_structures/reinforced_window.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "reinforced_window-0" base_icon_state = "reinforced_window" max_integrity = 150 @@ -792,11 +765,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw state = WINDOW_OUT_OF_FRAME /obj/structure/window/reinforced/tinted/fulltile -<<<<<<< HEAD icon = 'icons/obj/smooth_structures/tinted_window.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE -======= - icon = 'icons/obj/smooth_structures/tinted_window.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "tinted_window-0" base_icon_state = "tinted_window" fulltile = TRUE diff --git a/code/game/sound.dm b/code/game/sound.dm index 01371ce1030..0061b8d469f 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -170,13 +170,8 @@ sound_to_use.environment = A.sound_environment if(use_reverb && sound_to_use.environment != SOUND_ENVIRONMENT_NONE) //We have reverb, reset our echo setting -<<<<<<< HEAD sound_to_use.echo[3] = -1300 //Room setting, 0 means normal reverb //SKYRAT EDIT CHANGE sound_to_use.echo[4] = -1300 //RoomHF setting, 0 means normal reverb. //SKYRAT EDIT CHANGE -======= - sound_to_use.echo[3] = 0 //Room setting, 0 means normal reverb - sound_to_use.echo[4] = 0 //RoomHF setting, 0 means normal reverb. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SOUND(src, sound_to_use) @@ -208,10 +203,7 @@ ///Used to convert a SFX define into a .ogg so we can add some variance to sounds. If soundin is already a .ogg, we simply return it /proc/get_sfx(soundin) -<<<<<<< HEAD soundin = get_sfx_skyrat(soundin) // SKYRAT EDIT ADDITION - This overrides the default sound effects too, so use it to modularly change a sound effect output. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!istext(soundin)) return soundin switch(soundin) @@ -504,8 +496,6 @@ 'sound/items/stones/stone_pick_up1.ogg', 'sound/items/stones/stone_pick_up2.ogg', ) -<<<<<<< HEAD -======= if(SFX_MUFFLED_SPEECH) soundin = pick( 'sound/effects/muffspeech/muffspeech1.ogg', @@ -527,5 +517,4 @@ 'sound/creatures/fish/fish_pickup1.ogg', 'sound/creatures/fish/fish_pickup2.ogg', ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return soundin diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm index 6433c15bbc0..1e50e505699 100644 --- a/code/game/turfs/change_turf.dm +++ b/code/game/turfs/change_turf.dm @@ -76,14 +76,11 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( var/old_lighting_corner_NW = lighting_corner_NW var/old_directional_opacity = directional_opacity var/old_dynamic_lumcount = dynamic_lumcount -<<<<<<< HEAD //SKYRAT EDIT CHANGE var/obj/effect/abstract/liquid_turf/old_liquids = liquids if(lgroup) lgroup.remove_from_group(src) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/old_rcd_memory = rcd_memory var/old_explosion_throw_details = explosion_throw_details var/old_opacity = opacity @@ -159,7 +156,6 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( directional_opacity = old_directional_opacity recalculate_directional_opacity() -<<<<<<< HEAD if(lighting_object && !lighting_object.needs_update) lighting_object.update() @@ -186,6 +182,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( else if(ispath(old_type, /turf/open/space)) for(var/turf/open/space/space_tile in RANGE_TURFS(1, src)) space_tile.enable_starlight() + //SKYRAT EDIT ADDITION if(old_liquids) if(!isnull(new_turf.liquids)) //isnull is faster @@ -214,38 +211,6 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( if(old_opacity != opacity && SSticker) GLOB.cameranet.bareMajorChunkChange(src) -======= - - if(lighting_object && !lighting_object.needs_update) - lighting_object.update() - - // If we're space, then we're either lit, or not, and impacting our neighbors, or not - if(isspaceturf(src)) - var/turf/open/space/lit_turf = src - // This also counts as a removal, so we need to do a full rebuild - if(!ispath(old_type, /turf/open/space)) - lit_turf.update_starlight() - for(var/turf/open/space/space_tile in RANGE_TURFS(1, src) - src) - space_tile.update_starlight() - else if(old_light_range) - lit_turf.enable_starlight() - - // If we're a cordon we count against a light, but also don't produce any ourselves - else if (istype(src, /turf/cordon)) - // This counts as removing a source of starlight, so we need to update the space tile to inform it - if(!ispath(old_type, /turf/open/space)) - for(var/turf/open/space/space_tile in RANGE_TURFS(1, src)) - space_tile.update_starlight() - - // If we're not either, but were formerly a space turf, then we want light - else if(ispath(old_type, /turf/open/space)) - for(var/turf/open/space/space_tile in RANGE_TURFS(1, src)) - space_tile.enable_starlight() - - if(old_opacity != opacity && SSticker) - GLOB.cameranet.bareMajorChunkChange(src) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // We will only run this logic if the tile is not on the prime z layer, since we use area overlays to cover that if(SSmapping.z_level_to_plane_offset[z]) var/area/our_area = new_turf.loc @@ -264,23 +229,17 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( var/datum/gas_mixture/stashed_air = new() stashed_air.copy_from(air) var/stashed_state = excited -<<<<<<< HEAD var/datum/pollution/stashed_pollution = pollution //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/excited_group/stashed_group = excited_group . = ..() //If path == type this will return us, don't bank on making a new type if (!.) // changeturf failed or didn't do anything return var/turf/open/new_turf = . -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(stashed_pollution) new_turf.pollution = stashed_pollution stashed_pollution.handle_overlay() //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new_turf.air.copy_from(stashed_air) new_turf.excited = stashed_state new_turf.excited_group = stashed_group @@ -292,13 +251,10 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( if(stashed_group.should_display || SSair.display_all_groups) stashed_group.display_turf(new_turf) else -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(pollution) qdel(pollution) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(excited || excited_group) SSair.remove_from_active(src) //Clean up wall excitement, and refresh excited groups if(ispath(path, /turf/closed) || ispath(path, /turf/cordon)) diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm index bc2bb5547c3..302826549c1 100644 --- a/code/game/turfs/closed/indestructible.dm +++ b/code/game/turfs/closed/indestructible.dm @@ -66,20 +66,12 @@ baseturfs = /turf/cordon icon = 'icons/blanks/blank_title.png' icon_state = "" -<<<<<<< HEAD pixel_x = 0 // SKYRAT EDIT - Re-centering the title screen - ORIGINAL: pixel_x = -64 -======= - pixel_x = -64 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 plane = SPLASHSCREEN_PLANE bullet_bounce_sound = null INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/closed/indestructible/splashscreen/Initialize(mapload) . = ..() SStitle.splash_turf = src @@ -95,13 +87,6 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) pixel_x = 0 else if(width == 608) // 608x480 is widescreen pixel_x = -64 -<<<<<<< HEAD - // SKYRAT EDIT START - Wider widescreen - else if(width == 672) // Skyrat's widescreen is slightly wider than /tg/'s, so we need to accomodate that too. - pixel_x = -96 - // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/closed/indestructible/splashscreen/vv_edit_var(var_name, var_value) . = ..() @@ -114,10 +99,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) /turf/closed/indestructible/splashscreen/examine() desc = pick(strings(SPLASH_FILE, "splashes")) return ..() -<<<<<<< HEAD SKYRAT EDIT REMOVAL END */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/closed/indestructible/reinforced name = "reinforced wall" diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index c678c52fa0b..11125a9de0c 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -4,11 +4,7 @@ /turf/closed/mineral //wall piece name = "rock" -<<<<<<< HEAD icon = MAP_SWITCH('modular_skyrat/modules/liquids/icons/turf/smoothrocks.dmi', 'icons/turf/mining.dmi') // SKYRAT EDIT CHANGE -======= - icon = MAP_SWITCH('icons/turf/smoothrocks.dmi', 'icons/turf/mining.dmi') ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "rock" smoothing_groups = SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_MINERAL_WALLS canSmoothWith = SMOOTH_GROUP_MINERAL_WALLS @@ -29,11 +25,8 @@ transform = MAP_SWITCH(TRANSLATE_MATRIX(-4, -4), matrix()) temperature = TCMB -<<<<<<< HEAD color = "#677" //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/turf/open/floor/plating/turf_type = /turf/open/misc/asteroid/airless /// The path of the ore stack we spawn when we're mined. var/obj/item/stack/ore/mineralType = null @@ -319,19 +312,13 @@ var/path = pick(spawn_chance_list) if(ispath(path, /turf)) var/stored_flags = 0 -<<<<<<< HEAD var/stored_color = color //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(turf_flags & NO_RUINS) stored_flags |= NO_RUINS var/turf/T = ChangeTurf(path,null,CHANGETURF_IGNORE_AIR) T.flags_1 |= stored_flags -<<<<<<< HEAD T.color = stored_color //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ismineralturf(T)) var/turf/closed/mineral/M = T M.turf_type = src.turf_type @@ -421,11 +408,7 @@ baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = TRUE -<<<<<<< HEAD proximity_based = FALSE //SKYRAT EDIT: Original TRUE -======= - proximity_based = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mineralChance = 5 /turf/closed/mineral/random/volcanic/mineral_chances() @@ -453,11 +436,7 @@ baseturfs = /turf/open/misc/asteroid/snow/icemoon initial_gas_mix = ICEMOON_DEFAULT_ATMOS weak_turf = TRUE -<<<<<<< HEAD proximity_based = FALSE //SKYRAT EDIT: Original TRUE -======= - proximity_based = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/closed/mineral/random/snow/Change_Ore(ore_type, random = 0) . = ..() diff --git a/code/game/turfs/closed/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm index 87299d4eacc..b09a0355b9f 100644 --- a/code/game/turfs/closed/wall/misc_walls.dm +++ b/code/game/turfs/closed/wall/misc_walls.dm @@ -50,8 +50,6 @@ /turf/closed/wall/rust/Initialize(mapload) . = ..() AddElement(/datum/element/rust) -<<<<<<< HEAD -======= /turf/closed/wall/heretic_rust color = MAP_SWITCH(null, COLOR_GREEN_GRAY) @@ -59,7 +57,6 @@ /turf/closed/wall/heretic_rust/Initialize(mapload) . = ..() AddElement(/datum/element/rust/heretic) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/closed/wall/r_wall/rust //SDMM supports colors, this is simply for easier mapping @@ -70,8 +67,6 @@ /turf/closed/wall/r_wall/rust/Initialize(mapload) . = ..() AddElement(/datum/element/rust) -<<<<<<< HEAD -======= /turf/closed/wall/r_wall/heretic_rust color = MAP_SWITCH(null, COLOR_GREEN_GRAY) @@ -79,7 +74,6 @@ /turf/closed/wall/r_wall/heretic_rust/Initialize(mapload) . = ..() AddElement(/datum/element/rust/heretic) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/closed/wall/mineral/bronze name = "clockwork wall" diff --git a/code/game/turfs/closed/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm index 2722bb39266..092af294771 100644 --- a/code/game/turfs/closed/wall/reinf_walls.dm +++ b/code/game/turfs/closed/wall/reinf_walls.dm @@ -1,11 +1,7 @@ /turf/closed/wall/r_wall name = "reinforced wall" desc = "A huge chunk of reinforced metal used to separate rooms." -<<<<<<< HEAD - icon = 'icons/turf/walls/reinforced_wall.dmi' //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= icon = 'icons/turf/walls/reinforced_wall.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "reinforced_wall-0" base_icon_state = "reinforced_wall" opacity = TRUE @@ -206,17 +202,10 @@ // We don't react to smoothing changing here because this else exists only to "revert" intact changes /turf/closed/wall/r_wall/update_icon_state() if(d_state != INTACT) -<<<<<<< HEAD icon = 'modular_skyrat/modules/aesthetics/walls/icons/reinforced_wall.dmi' // SKYRAT EDIT CHANGE - ORIGINAL: icon = 'icons/turf/walls/reinforced_states.dmi' icon_state = "[base_decon_state]-[d_state]" else icon = 'modular_skyrat/modules/aesthetics/walls/icons/reinforced_wall.dmi' // SKYRAT EDIT CHANGE - ORIGINAL: icon = 'icons/turf/walls/reinforced_wall.dmi' -======= - icon = 'icons/turf/walls/reinforced_states.dmi' - icon_state = "[base_decon_state]-[d_state]" - else - icon = 'icons/turf/walls/reinforced_wall.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "[base_icon_state]-[smoothing_junction]" return ..() diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index 886bd4c111d..a78579d713e 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -2,11 +2,7 @@ /turf/closed/wall name = "wall" -<<<<<<< HEAD - desc = "A huge chunk of iron used to separate rooms." //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= desc = "A huge chunk of iron used to separate rooms." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/turf/walls/wall.dmi' icon_state = "wall-0" base_icon_state = "wall" @@ -44,11 +40,7 @@ if(!iscarbon(dropping) && !iscyborg(dropping)) return var/mob/living/leaner = dropping -<<<<<<< HEAD - if(leaner.incapacitated(IGNORE_RESTRAINTS) || leaner.stat != CONSCIOUS || HAS_TRAIT(leaner, TRAIT_NO_TRANSFORM)) -======= if(INCAPACITATED_IGNORING(leaner, INCAPABLE_RESTRAINTS) || leaner.stat != CONSCIOUS || HAS_TRAIT(leaner, TRAIT_NO_TRANSFORM)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(!leaner.density || leaner.pulledby || leaner.buckled || !(leaner.mobility_flags & MOBILITY_STAND)) return diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index a61b493b88d..5ce308c2840 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -359,7 +359,6 @@ // Stops sliding slide_distance = 0 -<<<<<<< HEAD // SKYRAT EDIT START - Akula species if(HAS_TRAIT(slipper, TRAIT_SLIPPERY)) if(!(lube & SLIDE_ICE)) @@ -390,30 +389,6 @@ for(var/obj/item/item in slipper.held_items) slipper.accident(item) -======= - var/obj/buckled_obj - if(slipper.buckled) - if(!(lube & GALOSHES_DONT_HELP)) //can't slip while buckled unless it's lube. - return FALSE - buckled_obj = slipper.buckled - else - if(!(lube & SLIP_WHEN_CRAWLING) && (slipper.body_position == LYING_DOWN || !(slipper.status_flags & CANKNOCKDOWN))) // can't slip unbuckled mob if they're lying or can't fall. - return FALSE - if(slipper.move_intent == MOVE_INTENT_WALK && (lube & NO_SLIP_WHEN_WALKING)) - return FALSE - - if(!(lube & SLIDE_ICE)) - // Ice slides are intended to be combo'd so don't give the feedback - to_chat(slipper, span_notice("You slipped[ slippable ? " on the [slippable.name]" : ""]!")) - playsound(slipper.loc, 'sound/misc/slip.ogg', 50, TRUE, -3) - - SEND_SIGNAL(slipper, COMSIG_ON_CARBON_SLIP) - slipper.add_mood_event("slipped", /datum/mood_event/slipped) - if(force_drop) - for(var/obj/item/item in slipper.held_items) - slipper.accident(item) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/olddir = slipper.dir slipper.moving_diagonally = 0 //If this was part of diagonal move slipping will stop it. if(lube & SLIDE_ICE) @@ -451,11 +426,7 @@ /turf/open/proc/ClearWet()//Nuclear option of immediately removing slipperiness from the tile instead of the natural drying over time qdel(GetComponent(/datum/component/wet_floor)) -<<<<<<< HEAD -/// Builds with rods. This doesn't exist to be overriden, just to remove duplicate logic for turfs that want -======= /// Builds with rods. This doesn't exist to be overridden, just to remove duplicate logic for turfs that want ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// To support floor tile creation /// I'd make it a component, but one of these things is space. So no. /turf/open/proc/build_with_rods(obj/item/stack/rods/used_rods, mob/user) diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index aac926a8669..84b9ac26e9b 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -1,11 +1,7 @@ /// Anything above a lattice should go here. /turf/open/floor name = "floor" -<<<<<<< HEAD - icon = 'icons/turf/floors.dmi' //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= icon = 'icons/turf/floors.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 base_icon_state = "floor" baseturfs = /turf/open/floor/plating diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm index 9688d0504df..81c4578136b 100644 --- a/code/game/turfs/open/floor/misc_floor.dm +++ b/code/game/turfs/open/floor/misc_floor.dm @@ -257,8 +257,6 @@ AddElement(/datum/element/rust) color = null -<<<<<<< HEAD -======= /turf/open/floor/plating/heretic_rust color = COLOR_GREEN_GRAY @@ -267,7 +265,6 @@ AddElement(/datum/element/rust/heretic) color = null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/floor/plating/plasma initial_gas_mix = ATMOS_TANK_PLASMA diff --git a/code/game/turfs/open/ice.dm b/code/game/turfs/open/ice.dm index ddd78ac6389..dbfff2efc8f 100644 --- a/code/game/turfs/open/ice.dm +++ b/code/game/turfs/open/ice.dm @@ -15,8 +15,6 @@ clawfootstep = FOOTSTEP_HARD_CLAW heavyfootstep = FOOTSTEP_GENERIC_HEAVY rust_resistance = RUST_RESISTANCE_ORGANIC -<<<<<<< HEAD -======= var/can_make_hole = TRUE var/static/list/tool_screentips = list( TOOL_SHOVEL = list( @@ -26,16 +24,12 @@ SCREENTIP_CONTEXT_LMB = "Dig fishing hole", ), ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/ice/Initialize(mapload) . = ..() MakeSlippery(TURF_WET_PERMAFROST, INFINITY, 0, INFINITY, TRUE, FALSE) -<<<<<<< HEAD -======= if(can_make_hole) AddElement(/datum/element/contextual_screentip_tools, tool_screentips) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/ice/break_tile() return @@ -43,8 +37,6 @@ /turf/open/misc/ice/burn_tile() return -<<<<<<< HEAD -======= /turf/open/misc/ice/examine(mob/user) . = ..() if(can_make_hole) @@ -67,7 +59,6 @@ flags_1 &= ~HAS_CONTEXTUAL_SCREENTIPS_1 return ITEM_INTERACT_SUCCESS ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/ice/smooth icon_state = "ice_turf-255" base_icon_state = "ice_turf" @@ -82,19 +73,13 @@ /turf/open/misc/ice/icemoon/no_planet_atmos planetary_atmos = FALSE -<<<<<<< HEAD -======= can_make_hole = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/ice/temperate baseturfs = /turf/open/misc/ice/temperate desc = "Somehow, it is not melting under these conditions. Must be some very thick ice. Just as slippery too." initial_gas_mix = COLD_ATMOS //it works with /turf/open/misc/asteroid/snow/temperatre -<<<<<<< HEAD -======= can_make_hole = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //For when you want real, genuine ice in your kitchen's cold room. /turf/open/misc/ice/coldroom diff --git a/code/game/turfs/open/misc.dm b/code/game/turfs/open/misc.dm index ec8a85888a1..5c5987f656e 100644 --- a/code/game/turfs/open/misc.dm +++ b/code/game/turfs/open/misc.dm @@ -3,11 +3,7 @@ /// Please do not bloat this. Love you <3 /turf/open/misc name = "coder/mapper fucked up" -<<<<<<< HEAD - desc = "report on github please" -======= desc = "report on GitHub please" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 flags_1 = NO_SCREENTIPS_1 | CAN_BE_DIRTY_1 turf_flags = IS_SOLID | NO_RUST diff --git a/code/game/turfs/open/sand.dm b/code/game/turfs/open/sand.dm index 7baf1343e65..254c595fcbd 100644 --- a/code/game/turfs/open/sand.dm +++ b/code/game/turfs/open/sand.dm @@ -10,13 +10,10 @@ heavyfootstep = FOOTSTEP_GENERIC_HEAVY rust_resistance = RUST_RESISTANCE_ORGANIC -<<<<<<< HEAD -======= /turf/open/misc/beach/Initialize(mapload) . = ..() AddElement(/datum/element/lazy_fishing_spot, /datum/fish_source/sand) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/beach/ex_act(severity, target) return FALSE @@ -44,13 +41,10 @@ clawfootstep = FOOTSTEP_WATER heavyfootstep = FOOTSTEP_WATER -<<<<<<< HEAD -======= /turf/open/misc/beach/coast/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/misc/beach/coast/break_tile() . = ..() icon_state = "beach" diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm index 3e12312d18a..de895754d03 100644 --- a/code/game/turfs/open/water.dm +++ b/code/game/turfs/open/water.dm @@ -21,11 +21,7 @@ var/immerse_overlay_color = "#5AAA88" /// Fishing element for this specific water tile -<<<<<<< HEAD - var/datum/fish_source/fishing_datum = /datum/fish_source/portal -======= var/datum/fish_source/fishing_datum = /datum/fish_source/river ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/water/Initialize(mapload) . = ..() @@ -37,10 +33,7 @@ /turf/open/water/jungle /turf/open/water/beach -<<<<<<< HEAD -======= planetary_atmos = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gender = PLURAL desc = "Come on in, it's great!" icon = 'icons/turf/beach.dmi' @@ -50,13 +43,10 @@ immerse_overlay_color = "#7799AA" fishing_datum = /datum/fish_source/ocean/beach -<<<<<<< HEAD -======= /turf/open/water/beach/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/water/lavaland_atmos initial_gas_mix = LAVALAND_DEFAULT_ATMOS planetary_atmos = TRUE diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 343ddea5feb..8ffd83c8ec6 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -3,10 +3,7 @@ GLOBAL_LIST_EMPTY(station_turfs) /// Any floor or wall. What makes up the station and the rest of the map. /turf icon = 'icons/turf/floors.dmi' -<<<<<<< HEAD -======= datum_flags = DF_STATIC_OBJECT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 vis_flags = VIS_INHERIT_ID // Important for interaction with and visualization of openspace. luminosity = 1 light_height = LIGHTING_HEIGHT_FLOOR @@ -612,12 +609,8 @@ GLOBAL_LIST_EMPTY(station_turfs) . = ..() if((acidpwr <= 0) || (acid_volume <= 0)) return FALSE -<<<<<<< HEAD - if(QDELETED(src)) //skyrat edit: fix createanddestroy + if(QDELETED(src)) //skyrat edit: fix createanddestroy // SKYRAT TODO: Look into why this happens return FALSE -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AddComponent(/datum/component/acid, acidpwr, acid_volume, GLOB.acid_overlay) return . || TRUE diff --git a/code/game/world.dm b/code/game/world.dm index 68bb8fc019a..9b5713a2337 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -336,8 +336,6 @@ GLOBAL_VAR(tracy_log) return ..() log_world("World rebooted at [time_stamp()]") -<<<<<<< HEAD -======= shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss. auxcleanup() @@ -352,25 +350,6 @@ GLOBAL_VAR(tracy_log) if (debug_server) call_ext(debug_server, "auxtools_shutdown")() -/world/Del() - auxcleanup() - . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - - shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss. - auxcleanup() - - TgsReboot() // TGS can decide to kill us right here, so it's important to do it last - - ..() - #endif - -/world/proc/auxcleanup() - AUXTOOLS_FULL_SHUTDOWN(AUXLUA) - var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL") - if (debug_server) - call_ext(debug_server, "auxtools_shutdown")() - /world/Del() auxcleanup() . = ..() @@ -427,10 +406,7 @@ GLOBAL_VAR(tracy_log) new_status += "[SSmapping.config ? " | " : "
"]Next: [SSmapping.next_map_config.map_path == CUSTOM_MAP_PATH ? "Uncharted Territory" : SSmapping.next_map_config.map_name]" status = new_status -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /world/proc/update_hub_visibility(new_visibility) if(new_visibility == GLOB.hub_visibility) @@ -442,11 +418,7 @@ GLOBAL_VAR(tracy_log) hub_password = "SORRYNOPASSWORD" /** -<<<<<<< HEAD - * Handles incresing the world's maxx var and intializing the new turfs and assigning them to the global area. -======= * Handles increasing the world's maxx var and initializing the new turfs and assigning them to the global area. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * If map_load_z_cutoff is passed in, it will only load turfs up to that z level, inclusive. * This is because maploading will handle the turfs it loads itself. */ @@ -473,11 +445,7 @@ GLOBAL_VAR(tracy_log) maxy = new_maxy if(!map_load_z_cutoff) return -<<<<<<< HEAD - var/area/global_area = GLOB.areas_by_type[world.area] // We're guarenteed to be touching the global area, so we'll just do this -======= var/area/global_area = GLOB.areas_by_type[world.area] // We're guaranteed to be touching the global area, so we'll just do this ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LISTASSERTLEN(global_area.turfs_by_zlevel, map_load_z_cutoff, list()) for (var/zlevel in 1 to map_load_z_cutoff) var/list/to_add = block( @@ -512,10 +480,7 @@ GLOBAL_VAR(tracy_log) /world/proc/on_tickrate_change() SStimer?.reset_buckets() -<<<<<<< HEAD -======= DREAMLUAU_SET_EXECUTION_LIMIT_MILLIS(tick_lag * 100) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /world/proc/init_byond_tracy() var/library diff --git a/code/modules/NTNet/relays.dm b/code/modules/NTNet/relays.dm index 57ab2d8e2c6..f36a89e72e1 100644 --- a/code/modules/NTNet/relays.dm +++ b/code/modules/NTNet/relays.dm @@ -113,11 +113,7 @@ data["dos_crashed"] = dos_failure return data -<<<<<<< HEAD -/obj/machinery/ntnet_relay/ui_act(action, params) -======= /obj/machinery/ntnet_relay/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/actionspeed/_actionspeed_modifier.dm b/code/modules/actionspeed/_actionspeed_modifier.dm index 667ea61b580..59dec9f87ca 100644 --- a/code/modules/actionspeed/_actionspeed_modifier.dm +++ b/code/modules/actionspeed/_actionspeed_modifier.dm @@ -156,11 +156,7 @@ GLOBAL_LIST_EMPTY(actionspeed_modification_cache) var/amt = M.multiplicative_slowdown if(conflict) // Conflicting modifiers prioritize the larger slowdown or the larger speedup -<<<<<<< HEAD - // We purposefuly don't handle mixing speedups and slowdowns on the same id -======= // We purposefully don't handle mixing speedups and slowdowns on the same id ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(abs(conflict_tracker[conflict]) < abs(amt)) conflict_tracker[conflict] = amt else diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index f7b1c15570c..3eb5deb0c25 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -32,10 +32,7 @@ if(GLOB.admin_datums[ckey] || GLOB.deadmins[ckey]) admin = TRUE -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - We have the panic bunker on 24/7, this just makes our method unusable. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!real_bans_only && !admin && CONFIG_GET(flag/panic_bunker) && !CONFIG_GET(flag/panic_bunker_interview)) var/datum/db_query/query_client_in_db = SSdbcore.NewQuery( "SELECT 1 FROM [format_table_name("player")] WHERE ckey = :ckey", @@ -55,10 +52,7 @@ return list("reason"="panicbunker", "desc" = "Sorry but the server is currently not accepting connections from never before seen players") qdel(query_client_in_db) -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Whitelist if(!real_bans_only && !C && CONFIG_GET(flag/usewhitelist)) @@ -123,11 +117,7 @@ This ban (BanID #[i["id"]]) was applied by [i["admin_key"]] on [i["bantime"]] during round ID [i["round_id"]]. [global_ban] [expires]"} -<<<<<<< HEAD log_suspicious_login("Failed Login: [ckey] [computer_id] [address] - Banned (#[i["id"]]) [text2num(i["global_ban"]) ? "globally" : "locally"]") //SKYRAT EDIT CHANGE - MULTISERVER -======= - log_suspicious_login("Failed Login: [ckey] [computer_id] [address] - Banned (#[i["id"]])") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return list("reason"="Banned","desc"="[desc]") if (admin) if (GLOB.directory[ckey]) diff --git a/code/modules/admin/admin_fax_panel.dm b/code/modules/admin/admin_fax_panel.dm index 1e66592b43b..cc88f1949f2 100644 --- a/code/modules/admin/admin_fax_panel.dm +++ b/code/modules/admin/admin_fax_panel.dm @@ -20,11 +20,8 @@ ADMIN_VERB(fax_panel, R_ADMIN, "Fax Panel", "View and respond to faxes sent to C /datum/fax_panel_interface/New() //Get all faxes, and save them to our list. for(var/obj/machinery/fax/fax as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax)) -<<<<<<< HEAD -======= if(istype(fax, /obj/machinery/fax/admin)) continue ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 available_faxes += WEAKREF(fax) //Get all stamps diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 96e7bbc989f..68096367ef8 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -484,14 +484,6 @@ ADMIN_VERB(populate_world, R_DEBUG, "Populate World", "Populate the world with t testing("Spawned test mob at [get_area_name(tile, TRUE)] ([tile.x],[tile.y],[tile.z])") ADMIN_VERB(toggle_ai_interact, R_ADMIN, "Toggle Admin AI Interact", "Allows you to interact with most machines as an AI would as a ghost.", ADMIN_CATEGORY_GAME) -<<<<<<< HEAD - user.AI_Interact = !user.AI_Interact - if(user.mob && isAdminGhostAI(user.mob)) - user.mob.has_unlimited_silicon_privilege = user.AI_Interact - - log_admin("[key_name(user)] has [user.AI_Interact ? "activated" : "deactivated"] Admin AI Interact") - message_admins("[key_name_admin(user)] has [user.AI_Interact ? "activated" : "deactivated"] their AI interaction") -======= var/doesnt_have_silicon_access = !HAS_TRAIT_FROM(user, TRAIT_AI_ACCESS, ADMIN_TRAIT) if(doesnt_have_silicon_access) ADD_TRAIT(user, TRAIT_AI_ACCESS, ADMIN_TRAIT) @@ -500,7 +492,6 @@ ADMIN_VERB(toggle_ai_interact, R_ADMIN, "Toggle Admin AI Interact", "Allows you log_admin("[key_name(user)] has [doesnt_have_silicon_access ? "activated" : "deactivated"] Admin AI Interact") message_admins("[key_name_admin(user)] has [doesnt_have_silicon_access ? "activated" : "deactivated"] their AI interaction") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADMIN_VERB(debug_statpanel, R_DEBUG, "Debug Stat Panel", "Toggles local debug of the stat panel", ADMIN_CATEGORY_DEBUG) user.stat_panel.send_message("create_debug") diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index 05f473a6dfa..77d1546eeb7 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -28,13 +28,10 @@ human.dna.species.randomize_active_underwear_only(human) // Needs to be called towards the end to update all the UIs just set above human.dna.initialize_dna(newblood_type = random_blood_type(), create_mutation_blocks = randomize_mutations, randomize_features = TRUE) -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION human.dna.species.mutant_bodyparts = human.dna.mutant_bodyparts.Copy() human.dna.species.body_markings = human.dna.body_markings.Copy() // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Snowflake for Ethereals human.updatehealth() human.updateappearance(mutcolor_update = TRUE) diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm index 8d780570115..f619bd8aaba 100644 --- a/code/modules/admin/fun_balloon.dm +++ b/code/modules/admin/fun_balloon.dm @@ -64,11 +64,7 @@ return UI_INTERACTIVE return ..() -<<<<<<< HEAD -/obj/effect/fun_balloon/sentience/ui_act(action, list/params) -======= /obj/effect/fun_balloon/sentience/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -98,19 +94,6 @@ for(var/mob/living/possessable in range(effect_range, get_turf(src))) if (!possessable.ckey && possessable.stat == CONSCIOUS) // Only assign ghosts to living, non-occupied mobs! bodies += possessable -<<<<<<< HEAD - - var/list/candidates = SSpolling.poll_ghosts_for_targets( - question = "Would you like to be [span_notice(group_name)]?", - role = ROLE_SENTIENCE, - check_jobban = ROLE_SENTIENCE, - poll_time = 10 SECONDS, - checked_targets = bodies, - ignore_category = POLL_IGNORE_SHUTTLE_DENIZENS, - alert_pic = src, - role_name_text = "sentience fun balloon", - ) -======= var/list/candidates = SSpolling.poll_ghosts_for_targets( question = "Would you like to be [span_notice(group_name)]?", @@ -123,7 +106,6 @@ role_name_text = "sentience fun balloon", ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 while(LAZYLEN(candidates) && LAZYLEN(bodies)) var/mob/dead/observer/C = pick_n_take(candidates) var/mob/living/body = pick_n_take(bodies) diff --git a/code/modules/admin/greyscale_modify_menu.dm b/code/modules/admin/greyscale_modify_menu.dm index ecf264237b5..f84d3ea8aa8 100644 --- a/code/modules/admin/greyscale_modify_menu.dm +++ b/code/modules/admin/greyscale_modify_menu.dm @@ -120,11 +120,7 @@ data["sprites"] = sprite_data return data -<<<<<<< HEAD -/datum/greyscale_modify_menu/ui_act(action, params) -======= /datum/greyscale_modify_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -309,10 +305,7 @@ This is highly likely to cause massive amounts of lag as every object in the gam CHECK_TICK var/image/layer = image(step["step"]) var/image/result = image(step["result"]) -<<<<<<< HEAD // SKYRAT EDIT BEGIN - Bringing back the GAGS coloring menu -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 steps += list( list( "layer"=icon2html(layer, user, dir=sprite_dir, sourceonly=TRUE), @@ -320,10 +313,7 @@ This is highly likely to cause massive amounts of lag as every object in the gam "config_name"=step["config_name"] ) ) -<<<<<<< HEAD // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sprite_data["time_spent"] = TICK_DELTA_TO_MS(time_spent) sprite_data["finished"] = icon2html(finished, user, dir=sprite_dir, sourceonly=TRUE) diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index 6db027fae8a..6b5e95beb56 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -49,7 +49,6 @@ "player_ckey" = player_ckey, "must_apply_to_admins" = !!(GLOB.admin_datums[player_ckey] || GLOB.deadmins[player_ckey]), ) -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - MULTISERVER var/ssqlname = CONFIG_GET(string/serversqlname) var/server_check @@ -69,22 +68,7 @@ values["role"] = roles sql_roles = ":role" - var/datum/db_query/query_check_ban = SSdbcore.NewQuery(/* SKYRAT EDIT CHANGE - MULTISERVER */{" -======= - - var/sql_roles - if(islist(roles)) - var/list/sql_roles_list = list() - for (var/i in 1 to roles.len) - values["role[i]"] = roles[i] - sql_roles_list += ":role[i]" - sql_roles = sql_roles_list.Join(", ") - else - values["role"] = roles - sql_roles = ":role" - - var/datum/db_query/query_check_ban = SSdbcore.NewQuery({" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + var/datum/db_query/query_check_ban = SSdbcore.NewQuery(/* SKYRAT EDIT CHANGE - MULTISERVER - AND [server_check] */{" SELECT 1 FROM [format_table_name("ban")] WHERE @@ -92,10 +76,7 @@ role IN ([sql_roles]) AND unbanned_datetime IS NULL AND (expiration_time IS NULL OR expiration_time > NOW()) -<<<<<<< HEAD AND [server_check] -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AND (NOT :must_apply_to_admins OR applies_to_admins = 1) "}, values) @@ -195,7 +176,6 @@ var/is_admin = FALSE if(GLOB.admin_datums[ckey] || GLOB.deadmins[ckey]) is_admin = TRUE -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - MULTISERVER var/ssqlname = CONFIG_GET(string/serversqlname) var/server_check @@ -206,10 +186,6 @@ // SKYRAT EDIT ADDITION END - MULTISERVER var/datum/db_query/query_build_ban_cache = SSdbcore.NewQuery( "SELECT role, applies_to_admins FROM [format_table_name("ban")] WHERE ckey = :ckey AND unbanned_datetime IS NULL AND (expiration_time IS NULL OR expiration_time > NOW()) AND [server_check]", //skyrat edit -======= - var/datum/db_query/query_build_ban_cache = SSdbcore.NewQuery( - "SELECT role, applies_to_admins FROM [format_table_name("ban")] WHERE ckey = :ckey AND unbanned_datetime IS NULL AND (expiration_time IS NULL OR expiration_time > NOW())", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 list("ckey" = ckey) ) var/query_successful = query_build_ban_cache.warn_execute() @@ -230,19 +206,11 @@ player_client.ban_cache = ban_cache return ban_cache -<<<<<<< HEAD /datum/admins/proc/ban_panel(player_key, player_ip, player_cid, role, duration = 1440, applies_to_admins, reason, edit_id, page, admin_key, global_ban = TRUE) // SKYRAT EDIT CHANGE - MULTISERVER if (duration == BAN_PANEL_PERMANENT) duration = null -======= - -/datum/admins/proc/ban_panel(player_key, player_ip, player_cid, role, duration = 1440, applies_to_admins, reason, edit_id, page, admin_key) - if (duration == BAN_PANEL_PERMANENT) - duration = null - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/panel_height = 620 if(edit_id) panel_height = 240 @@ -463,10 +431,9 @@ ROLE_SYNDICATE, ROLE_TRAITOR, ROLE_WIZARD, -<<<<<<< HEAD + ROLE_VOIDWALKER, ROLE_BORER, // SKYRAT EDIT ADDITION ROLE_ASSAULT_OPERATIVE, // SKYRAT EDIT ADDITION - ROLE_VOIDWALKER, ), "Skyrat Ban Options" = list( BAN_PACIFICATION, @@ -480,10 +447,6 @@ BAN_OPFOR, BAN_LOOC, // SKYRAT EDIT ADDITION - LOOC muting again ), // SKYRAT EDIT ADDITION - EXTRA_BANS -======= - ROLE_VOIDWALKER, - ), ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) for(var/department in long_job_lists) output += "
" @@ -631,11 +594,7 @@ to_chat(usr, span_danger("Ban not [edit_id ? "edited" : "created"] because the following errors were present:\n[error_state.Join("\n")]"), confidential = TRUE) return if(edit_id) -<<<<<<< HEAD edit_ban(edit_id, player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, reason, global_ban, mirror_edit, old_key, old_ip, old_cid, old_applies, page, admin_key, changes, roles_to_ban[1] == "Server") // SKYRAT EDIT CHANGE - MULTISERVER -======= - edit_ban(edit_id, player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, reason, mirror_edit, old_key, old_ip, old_cid, old_applies, page, admin_key, changes, roles_to_ban[1] == "Server") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else create_ban(player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, severity, reason, global_ban, roles_to_ban) // SKYRAT EDIT CHANGE - MULTISERVER @@ -724,11 +683,7 @@ if(!SSdbcore.MassInsert(format_table_name("ban"), sql_ban, warn = TRUE, special_columns = special_columns)) return var/target = ban_target_string(player_key, player_ip, player_cid) -<<<<<<< HEAD var/msg = "has created a [global_ban ? "global" : "local"] [isnull(duration) ? "permanent" : "temporary [time_message]"] [applies_to_admins ? "admin " : ""][is_server_ban ? "server ban" : "role ban from [roles_to_ban.len] roles"] for [target]." // SKYRAT EDIT CHANGE - MULTISERVER -======= - var/msg = "has created a [isnull(duration) ? "permanent" : "temporary [time_message]"] [applies_to_admins ? "admin " : ""][is_server_ban ? "server ban" : "role ban from [roles_to_ban.len] roles"] for [target]." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_admin_private("[kn] [msg][is_server_ban ? "" : " Roles: [roles_to_ban.Join(", ")]"] Reason: [reason]") message_admins("[kna] [msg][is_server_ban ? "" : " Roles: [roles_to_ban.Join("\n")]"]\nReason: [reason]") if(applies_to_admins) @@ -741,7 +696,6 @@ notify_all_banned_players(player_ckey, player_ip, player_cid, player_ban_notification, other_ban_notification, is_server_ban, applies_to_admins) -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - EXTRA_BANS if(BAN_PACIFICATION in roles_to_ban) var/client/C = GLOB.directory[player_ckey] @@ -751,9 +705,6 @@ //var/datum/admin_help/linked_ahelp_ticket = admin_ticket_log(player_ckey, "[kna] [msg]") // SKYRAT EDIT ORIGINAL var/datum/admin_help/linked_ahelp_ticket = admin_ticket_log(player_ckey, "[kna] [msg]", FALSE) // SKYRAT EDIT -- Player ticket viewing -======= - var/datum/admin_help/linked_ahelp_ticket = admin_ticket_log(player_ckey, "[kna] [msg]") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(is_server_ban && linked_ahelp_ticket) linked_ahelp_ticket.Resolve() @@ -988,11 +939,7 @@ notify_all_banned_players(ckey(player_key), player_ip, player_cid, banned_player_message, banned_other_message, kick_banned_players, applies_to_admins) unban_panel(player_key, admin_key, player_ip, player_cid, page) -<<<<<<< HEAD /datum/admins/proc/edit_ban(ban_id, player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, reason, global_ban, mirror_edit, old_key, old_ip, old_cid, old_applies, admin_key, page, list/changes, is_server_ban) // SKYRAT EDIT CHANGE - MULTISERVER -======= -/datum/admins/proc/edit_ban(ban_id, player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, reason, mirror_edit, old_key, old_ip, old_cid, old_applies, admin_key, page, list/changes, is_server_ban) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!check_rights(R_BAN)) return if(!SSdbcore.Connect()) diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm index 8774bae4d19..cf03d1e6b28 100644 --- a/code/modules/admin/sql_message_system.dm +++ b/code/modules/admin/sql_message_system.dm @@ -79,10 +79,7 @@ "target_ckey" = target_ckey, "admin_ckey" = admin_ckey, "text" = text, -<<<<<<< HEAD "server_name" = CONFIG_GET(string/serversqlname), // SKYRAT EDIT ADDITION - MULTISERVER -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "server" = server, "internet_address" = world.internet_address || "0", "port" = "[world.port]", @@ -436,17 +433,12 @@ var/text = query_get_type_messages.item[5] var/timestamp = query_get_type_messages.item[6] var/server = query_get_type_messages.item[7] -<<<<<<< HEAD - var/editor_key = query_get_type_messages.item[9] // SKYRAT EDIT CHANGE BEGIN - MULTISERVER + // SKYRAT EDIT CHANGE BEGIN - MULTISERVER + var/editor_key = query_get_type_messages.item[9] var/expire_timestamp = query_get_type_messages.item[10] var/playtime = query_get_type_messages.item[11] - var/round_id = query_get_type_messages.item[12] // SKYRAT EDIT CHANGE END - MULTISERVER -======= - var/editor_key = query_get_type_messages.item[8] - var/expire_timestamp = query_get_type_messages.item[9] - var/playtime = query_get_type_messages.item[10] - var/round_id = query_get_type_messages.item[11] ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + var/round_id = query_get_type_messages.item[12] + // SKYRAT EDIT CHANGE END - MULTISERVER output += "" if(type == "watchlist entry") output += "[t_key] | " @@ -507,23 +499,15 @@ var/text = query_get_messages.item[5] var/timestamp = query_get_messages.item[6] var/server = query_get_messages.item[7] -<<<<<<< HEAD - var/editor_key = query_get_messages.item[9] // SKYRAT EDIT CHANGE BEGIN - MULTISERVER + // SKYRAT EDIT CHANGE BEGIN - MULTISERVER + var/editor_key = query_get_messages.item[9] var/age = text2num(query_get_messages.item[10]) target_key = query_get_messages.item[11] var/expire_timestamp = query_get_messages.item[12] var/severity = query_get_messages.item[13] var/playtime = query_get_messages.item[14] - var/round_id = query_get_messages.item[15] // SKYRAT EDIT CHANGE END - MULTISERVER -======= - var/editor_key = query_get_messages.item[8] - var/age = text2num(query_get_messages.item[9]) - target_key = query_get_messages.item[10] - var/expire_timestamp = query_get_messages.item[11] - var/severity = query_get_messages.item[12] - var/playtime = query_get_messages.item[13] - var/round_id = query_get_messages.item[14] ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + var/round_id = query_get_messages.item[15] + // SKYRAT EDIT CHANGE END - MULTISERVER var/alphatext = "" var/nsd = CONFIG_GET(number/note_stale_days) var/nfd = CONFIG_GET(number/note_fresh_days) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 4cbf4e23226..9dd2c67f892 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -48,7 +48,6 @@ return cmd_show_exp_panel(M.client) -<<<<<<< HEAD // SKYRAT EDIT BEGIN -- ONE CLICK ANTAG else if(href_list["makeAntag"]) @@ -84,8 +83,6 @@ else message_admins("[key_name_admin(usr)] FAILED to create '[href_list["makeAntag"]]' with a parameter of '[opt]'.") // SKYRAT EDIT END -- ONE CLICK ANTAG -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(href_list["editrightsbrowser"]) edit_admin_permissions(0) @@ -594,11 +591,8 @@ sparks.attach(M.loc) sparks.start() M.forceMove(pick(GLOB.prisonwarp)) -<<<<<<< HEAD /// SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(M, span_adminnotice("You have been sent to Prison!"), confidential = TRUE) log_admin("[key_name(usr)] has sent [key_name(M)] to Prison!") @@ -1770,20 +1764,14 @@ if(!paper_to_show) return paper_to_show.ui_interact(usr) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if (href_list["print_fax"]) if(!check_rights(R_ADMIN)) return -<<<<<<< HEAD - for(var/obj/machinery/fax/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax)) - if(!is_centcom_level(FAX.z)) + for(var/obj/machinery/fax/admin/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax/admin)) + if(FAX.fax_id != href_list["destination"]) continue - - FAX.receive(locate(href_list["print_fax"]), href_list["fax_name"]) + FAX.receive(locate(href_list["print_fax"]), href_list["sender_name"]) // SKYRAT EDIT ADDITION START else if(href_list["pass_opfor_candidate"]) if(!check_rights(R_ADMIN)) @@ -1793,14 +1781,6 @@ message_admins("An OPFOR candidate could not be selected.") // SKYRAT EDIT ADDITION END -======= - for(var/obj/machinery/fax/admin/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax/admin)) - if(FAX.fax_id != href_list["destination"]) - continue - FAX.receive(locate(href_list["print_fax"]), href_list["sender_name"]) - - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(href_list["play_internet"]) if(!check_rights(R_SOUND)) return diff --git a/code/modules/admin/verbs/admin.dm b/code/modules/admin/verbs/admin.dm index 94f5c16235a..3aaab5bae58 100644 --- a/code/modules/admin/verbs/admin.dm +++ b/code/modules/admin/verbs/admin.dm @@ -181,14 +181,11 @@ ADMIN_VERB(drop_everything, R_ADMIN, "Drop Everything", ADMIN_VERB_NO_DESCRIPTIO if(MUTE_DEADCHAT) mute_string = "deadchat and DSAY" feedback_string = "Deadchat" -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - LOOC muting again. if(MUTE_LOOC) mute_string = "LOOC" feedback_string = "LOOC" // SKYRAT EDIT ADDITION END - LOOC muting again. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(MUTE_INTERNET_REQUEST) mute_string = "internet sound requests" feedback_string = "Internet Sound Requests" diff --git a/code/modules/admin/verbs/admin_newscaster.dm b/code/modules/admin/verbs/admin_newscaster.dm index a3dcf2e3be7..4cb7b5c3344 100644 --- a/code/modules/admin/verbs/admin_newscaster.dm +++ b/code/modules/admin/verbs/admin_newscaster.dm @@ -134,11 +134,7 @@ ADMIN_VERB(access_news_network, R_ADMIN, "Access Newscaster Network", "Allows yo data["wanted"] = wanted_info return data -<<<<<<< HEAD -/datum/newspanel/ui_act(action, params) -======= /datum/newspanel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/admin/verbs/adminevents.dm b/code/modules/admin/verbs/adminevents.dm index 848cab19138..32da58b05c2 100644 --- a/code/modules/admin/verbs/adminevents.dm +++ b/code/modules/admin/verbs/adminevents.dm @@ -168,11 +168,7 @@ ADMIN_VERB(disable_shuttle, R_ADMIN, "Disable Shuttle", "Those fuckers aren't ge priority_announce( text = "Emergency Shuttle uplink failure, shuttle disabled until further notice.", title = "Uplink Failure", -<<<<<<< HEAD sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', -======= - sound = 'sound/misc/announce_dig.ogg', ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sender_override = "Emergency Shuttle Uplink Alert", color_override = "grey", ) @@ -198,11 +194,7 @@ ADMIN_VERB(enable_shuttle, R_ADMIN, "Enable Shuttle", "Those fuckers ARE getting priority_announce( text = "Emergency Shuttle uplink reestablished, shuttle enabled.", title = "Uplink Restored", -<<<<<<< HEAD sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', -======= - sound = 'sound/misc/announce_dig.ogg', ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sender_override = "Emergency Shuttle Uplink Alert", color_override = "green", ) @@ -226,11 +218,6 @@ ADMIN_VERB(hostile_environment, R_ADMIN, "Hostile Environment", "Disable the shu SSshuttle.hostile_environments.Cut() SSshuttle.checkHostileEnvironment() -<<<<<<< HEAD -ADMIN_VERB(toggle_nuke, R_DEBUG|R_ADMIN, "Toggle Nuke", "Arm or disarm a nuke.", ADMIN_CATEGORY_EVENTS, obj/machinery/nuclearbomb/nuke in world) - if(!nuke.timing) - var/newtime = input(user, "Set activation timer.", "Activate Nuke", "[nuke.timer_set]") as num|null -======= ADMIN_VERB(toggle_nuke, R_DEBUG|R_ADMIN, "Toggle Nuke", "Arm or disarm a nuke.", ADMIN_CATEGORY_EVENTS) var/list/nukes = list() for (var/obj/machinery/nuclearbomb/bomb in world) @@ -240,7 +227,6 @@ ADMIN_VERB(toggle_nuke, R_DEBUG|R_ADMIN, "Toggle Nuke", "Arm or disarm a nuke.", return if(!nuke.timing) var/newtime = tgui_input_number(user, "Set activation timer.", "Activate Nuke", nuke.timer_set) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!newtime) return nuke.timer_set = newtime diff --git a/code/modules/admin/verbs/adminfun.dm b/code/modules/admin/verbs/adminfun.dm index f3690df8c85..c7acd1cba46 100644 --- a/code/modules/admin/verbs/adminfun.dm +++ b/code/modules/admin/verbs/adminfun.dm @@ -154,11 +154,7 @@ ADMIN_VERB(polymorph_all, R_ADMIN, "Polymorph All", "Applies the effects of the message_admins("Mass polymorph started by [who_did_it] is complete.") ADMIN_VERB_AND_CONTEXT_MENU(admin_smite, R_ADMIN|R_FUN, "Smite", "Smite a player with divine power.", ADMIN_CATEGORY_FUN, mob/living/target in world) -<<<<<<< HEAD - var/punishment = input(user, "Choose a punishment", "DIVINE SMITING") as null|anything in GLOB.smites -======= var/punishment = tgui_input_list(user, "Choose a punishment", "DIVINE SMITING", GLOB.smites) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(target) || !punishment) return diff --git a/code/modules/admin/verbs/admingame.dm b/code/modules/admin/verbs/admingame.dm index 55a2c30aa79..d537b9ee898 100644 --- a/code/modules/admin/verbs/admingame.dm +++ b/code/modules/admin/verbs/admingame.dm @@ -26,7 +26,6 @@ ADMIN_VERB_ONLY_CONTEXT_MENU(show_player_panel, R_ADMIN, "Show Player Panel", mo if(player.client) body += "
\[First Seen: [player.client.player_join_date]\]\[Byond account registered on: [player.client.account_join_date]\]" -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Player Ranks var/list/player_ranks = list() @@ -41,8 +40,6 @@ ADMIN_VERB_ONLY_CONTEXT_MENU(show_player_panel, R_ADMIN, "Show Player Panel", mo body += "

Player Ranks: [length(player_ranks) ? player_ranks.Join(", ") : "None"]" // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 body += "

CentCom Galactic Ban DB: " if(CONFIG_GET(string/centcom_ban_db)) body += "Search" @@ -104,13 +101,10 @@ ADMIN_VERB_ONLY_CONTEXT_MENU(show_player_panel, R_ADMIN, "Show Player Panel", mo body += "OOC | " body += "PRAY | " body += "ADMINHELP | " -<<<<<<< HEAD //Skyrat Addition Begin - LOOC muting again. body += "DEADCHAT | " body += "LOOC\]" //Skyrat Addition End - LOOC muting again. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 body += "WEBREQ | " body += "DEADCHAT\]" body += "(toggle all)" @@ -301,11 +295,7 @@ ADMIN_VERB(respawn_character, R_ADMIN, "Respawn Character", "Respawn a player th if(!record_found && (new_character.mind.assigned_role.job_flags & JOB_CREW_MEMBER)) //Power to the user! if(tgui_alert(new_character,"Warning: No data core entry detected. Would you like to announce the arrival of this character by adding them to various databases, such as medical records?",,list("No","Yes")) == "Yes") -<<<<<<< HEAD GLOB.manifest.inject(new_character, src) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: GLOB.manifest.inject(new_character) -======= - GLOB.manifest.inject(new_character) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(tgui_alert(new_character,"Would you like an active AI to announce this character?",,list("No","Yes")) == "Yes") announce_arrival(new_character, new_character.mind.assigned_role.title) @@ -456,9 +446,6 @@ ADMIN_VERB(lag_switch_panel, R_ADMIN, "Show Lag Switches", "Display the controls dat += "Disable examine icons: [SSlag_switch.measures[DISABLE_USR_ICON2HTML] ? "On" : "Off"] - trait applies to examiner
" dat += "Disable parallax: [SSlag_switch.measures[DISABLE_PARALLAX] ? "On" : "Off"] - trait applies to character
" dat += "Disable footsteps: [SSlag_switch.measures[DISABLE_FOOTSTEPS] ? "On" : "Off"] - trait applies to character
" -<<<<<<< HEAD dat += "Disable character creator: [SSlag_switch.measures[DISABLE_CREATOR] ? "On" : "Off"] - trait applies to all
" // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dat += "" user << browse(dat.Join(), "window=lag_switch_panel;size=420x480") diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 0efa5b82047..589a393b0ea 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -103,25 +103,18 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/datum/admin_help/AH = I if(AH.initiator) var/obj/effect/statclick/updated = AH.statclick.update() -<<<<<<< HEAD L[++L.len] = list("[AH.handler ? "H-[AH.handler]" : ""]#[AH.id]. [AH.initiator_key_name]:", "[updated.name]", REF(AH)) //SKYRAT EDIT CHANGE - ADMIN -======= - L[++L.len] = list("#[AH.id]. [AH.initiator_key_name]:", "[updated.name]", REF(AH)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else ++num_disconnected if(num_disconnected) L[++L.len] = list("Disconnected:", "[astatclick.update("[num_disconnected]")]", null, REF(astatclick)) L[++L.len] = list("Closed Tickets:", "[cstatclick.update("[closed_tickets.len]")]", null, REF(cstatclick)) L[++L.len] = list("Resolved Tickets:", "[rstatclick.update("[resolved_tickets.len]")]", null, REF(rstatclick)) -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(LAZYLEN(SSopposing_force.submitted_applications)) for(var/datum/opposing_force/opposing_force as anything in SSopposing_force.submitted_applications) L[++L.len] = list("[opposing_force.handling_admin ? "H-[opposing_force.handling_admin]. " : ""]OPFOR:", "[opposing_force.stat_button.update(" [opposing_force.ckey] ")]", null, REF(opposing_force.stat_button)) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return L //Reassociate still open ticket if one exists @@ -221,11 +214,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) * * msg_raw - The first message of this admin_help: used for the initial title of the ticket * * is_bwoink - Boolean operator, TRUE if this ticket was started by an admin PM */ -<<<<<<< HEAD /datum/admin_help/New(msg_raw, client/C, is_bwoink, client/admin_C, urgent = FALSE) //SKYRAT EDIT CHANGE -======= -/datum/admin_help/New(msg_raw, client/C, is_bwoink, urgent = FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //clean the input msg var/msg = sanitize(copytext_char(msg_raw, 1, MAX_MESSAGE_LEN)) if(!msg || !C || !C.mob) @@ -734,32 +723,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) player_panel.open() -/datum/admin_help/proc/player_ticket_panel() - var/list/dat = list("Player Ticket") - dat += "State: " - switch(state) - if(AHELP_ACTIVE) - dat += "OPEN" - if(AHELP_RESOLVED) - dat += "RESOLVED" - if(AHELP_CLOSED) - dat += "CLOSED" - else - dat += "UNKNOWN" - dat += "\n[FOURSPACES]Refresh" - dat += "

Opened at: [gameTimestamp("hh:mm:ss", opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)" - if(closed_at) - dat += "
Closed at: [gameTimestamp("hh:mm:ss", closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)" - dat += "

" - dat += "
Log:

" - for (var/interaction in player_interactions) - dat += "[interaction]
" - - var/datum/browser/player_panel = new(usr, "ahelp[id]", 0, 620, 480) - player_panel.set_content(dat.Join()) - player_panel.open() - - // // TICKET STATCLICK // @@ -871,11 +834,7 @@ GLOBAL_DATUM_INIT(admin_help_ui_handler, /datum/admin_help_ui_handler, new) user_client.current_ticket.MessageNoRecipient(message, urgent) return -<<<<<<< HEAD new /datum/admin_help(message, user_client, FALSE, null, urgent) // SKYRAT EDIT - Handling tickets - ORIGINAL: new /datum/admin_help(message, user_client, FALSE, urgent) -======= - new /datum/admin_help(message, user_client, FALSE, urgent) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /client/verb/no_tgui_adminhelp(message as message) set name = "NoTguiAdminhelp" diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 98eeae524e7..4c984c42b71 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -378,11 +378,7 @@ ADMIN_VERB(cmd_admin_pm_panel, R_NONE, "Admin PM", "Show a list of clients to PM var/already_logged = FALSE // Full boinks will always be done to players, so we are not guarenteed that they won't have a ticket if(!recipient_ticket) -<<<<<<< HEAD new /datum/admin_help(send_message, recipient, TRUE, src) // SKYRAT EDIT - Handling tickets - ORIGINAL: new /datum/admin_help(send_message, recipient, TRUE) -======= - new /datum/admin_help(send_message, recipient, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 already_logged = TRUE // This action mutates our existing cached ticket information, so we recache ticket = current_ticket @@ -422,15 +418,12 @@ ADMIN_VERB(cmd_admin_pm_panel, R_NONE, "Admin PM", "Show a list of clients to PM SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg')) return TRUE -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - ADMIN // Basically, if we realized that we shouldn't've been handling the ticket, let's bail. Otherwise, we just change who's handling it. if(ticket && our_holder && !ticket.handle_issue()) return // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Ok if we're here, either this message is for an admin, or someone somehow figured out how to send a new message as a player // First case well, first if(!our_holder && !recipient_holder) //neither are admins diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index a723f209440..87410528ab3 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -18,10 +18,7 @@ ADMIN_VERB(cmd_admin_say, R_NONE, "ASay", "Send a message to other admins", ADMI user.mob.log_talk(message, LOG_ASAY) message = keywords_lookup(message) -<<<<<<< HEAD send_asay_to_other_server(user.ckey, message) //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/asay_color = user.prefs.read_preference(/datum/preference/color/asay_color) var/custom_asay_color = (CONFIG_GET(flag/allow_admin_asaycolor) && asay_color) ? "" : "" message = "[span_adminsay("[span_prefix("ADMIN:")] [key_name_admin(user)] [ADMIN_FLW(user.mob)]: [custom_asay_color][message]")][custom_asay_color ? "":null]" diff --git a/code/modules/admin/verbs/borgpanel.dm b/code/modules/admin/verbs/borgpanel.dm index 2081dcf69d6..97f690f2a5a 100644 --- a/code/modules/admin/verbs/borgpanel.dm +++ b/code/modules/admin/verbs/borgpanel.dm @@ -64,11 +64,7 @@ ADMIN_VERB(borg_panel, R_ADMIN, "Show Borg Panel", ADMIN_VERB_NO_DESCRIPTION, AD .["ais"] += list(list("name" = ai.name, "ref" = REF(ai), "connected" = (borg.connected_ai == ai))) -<<<<<<< HEAD -/datum/borgpanel/ui_act(action, params) -======= /datum/borgpanel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/admin/verbs/ert.dm b/code/modules/admin/verbs/ert.dm index 35147d23005..e116a9daf9a 100644 --- a/code/modules/admin/verbs/ert.dm +++ b/code/modules/admin/verbs/ert.dm @@ -89,10 +89,7 @@ "leader_experience" = list("desc" = "Pick an experienced leader", "type" = "boolean", "value" = "[(ertemplate.leader_experience ? "Yes" : "No")]"), "random_names" = list("desc" = "Randomize names", "type" = "boolean", "value" = "[(ertemplate.random_names ? "Yes" : "No")]"), "spawn_admin" = list("desc" = "Spawn yourself as briefing officer", "type" = "boolean", "value" = "[(ertemplate.spawn_admin ? "Yes" : "No")]"), -<<<<<<< HEAD "notify_players" = list("desc" = "Notify players that you have sent an ERT", "type" = "boolean", "value" = "[(ertemplate.notify_players ? "Yes" : "No")]"), //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "use_custom_shuttle" = list("desc" = "Use the ERT's custom shuttle (if it has one)", "type" = "boolean", "value" = "[(ertemplate.use_custom_shuttle ? "Yes" : "No")]"), "mob_type" = list("desc" = "Base Species", "callback" = CALLBACK(src, PROC_REF(makeERTTemplateModified)), "type" = "datum", "path" = "/mob/living/carbon/human", "subtypesonly" = TRUE, "value" = ertemplate.mob_type), ) @@ -121,10 +118,7 @@ ertemplate.leader_experience = prefs["leader_experience"]["value"] == "Yes" ertemplate.random_names = prefs["random_names"]["value"] == "Yes" ertemplate.spawn_admin = prefs["spawn_admin"]["value"] == "Yes" -<<<<<<< HEAD ertemplate.notify_players = prefs["notify_players"]["value"] == "Yes" //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ertemplate.use_custom_shuttle = prefs["use_custom_shuttle"]["value"] == "Yes" ertemplate.mob_type = prefs["mob_type"]["value"] @@ -265,7 +259,6 @@ if (teamSpawned) message_admins("[ertemplate.polldesc] has spawned with the mission: [ertemplate.mission]") -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(ertemplate.notify_players) priority_announce("Central command has responded to your request for a CODE [uppertext(ertemplate.code)] Emergency Response Team and have confirmed one to be enroute.", "ERT Request", ANNOUNCER_ERTYES) @@ -273,9 +266,6 @@ if(istype(ertemplate, /datum/ert/deathsquad)) SSsecurity_level.set_level(SEC_LEVEL_EPSILON) //SKYRAT EDIT END -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Open the Armory doors if(ertemplate.opendoors) for(var/obj/machinery/door/poddoor/ert/door as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/door/poddoor/ert)) diff --git a/code/modules/admin/verbs/fix_air.dm b/code/modules/admin/verbs/fix_air.dm index 0f4e1a48811..d9e81086c72 100644 --- a/code/modules/admin/verbs/fix_air.dm +++ b/code/modules/admin/verbs/fix_air.dm @@ -7,13 +7,10 @@ ADMIN_VERB_AND_CONTEXT_MENU(fix_air, R_ADMIN, "Fix Air", "Fixes air in a specifi if(valid_range_turf.blocks_air) //skip walls continue -<<<<<<< HEAD //SKYRAT EDIT ADDITION START if(valid_range_turf.pollution) qdel(valid_range_turf.pollution) //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/gas_mixture/GM = SSair.parse_gas_string(valid_range_turf.initial_gas_mix, /datum/gas_mixture/turf) valid_range_turf.copy_air(GM) valid_range_turf.temperature = initial(valid_range_turf.temperature) diff --git a/code/modules/admin/verbs/ghost_pool_protection.dm b/code/modules/admin/verbs/ghost_pool_protection.dm index 46e586d39f1..ed31d124a7d 100644 --- a/code/modules/admin/verbs/ghost_pool_protection.dm +++ b/code/modules/admin/verbs/ghost_pool_protection.dm @@ -50,11 +50,7 @@ ADMIN_VERB(ghost_pool_protection, R_ADMIN, "Ghost Pool Protection", "Choose whic data["minigames"] = (new_role_flags & GHOSTROLE_MINIGAME) return data -<<<<<<< HEAD -/datum/ghost_pool_menu/ui_act(action, params) -======= /datum/ghost_pool_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/admin/verbs/lua/README.md b/code/modules/admin/verbs/lua/README.md index 5058232dd51..9b9bfbe05f9 100644 --- a/code/modules/admin/verbs/lua/README.md +++ b/code/modules/admin/verbs/lua/README.md @@ -1,152 +1,3 @@ -<<<<<<< HEAD -# Auxlua - ---- - -## Datums - -DM datums are treated as lua userdata, and can be stored in fields. Due to fundamental limitations in lua, userdata is inherently truthy. Since datum userdata can correspond to a deleted datum, which would evaluate to `null` in DM, the function [`datum:is_null()`](#datumisnull) is provided to offer a truthiness test consistent with DM. - -Keep in mind that BYOND can't see that a datum is referenced in a lua field, and will garbage collect it if it is not referenced anywhere in DM. - -### datum:get_var(var) - -Equivalent to DM's `datum.var` - -### datum:set_var(var, value) - -Equivalent to DM's `datum.var = value` - -### datum:call_proc(procName, ...) - -Equivalent to DM's `datum.procName(...)` - -### datum:is_null() - -This function is used to evaluate the truthiness of a DM var. The lua statement `if datum:is_null() then` is equivalent to the DM statement `if(datum)`. - -### datum.vars - -Returns a userdatum that allows you to access and modifiy the vars of a DM datum by index. `datum.vars.foo` is equivalent to `datum:get_var("foo")`, while `datum.vars.foo = bar` is equivalent to `datum:set_var("foo", bar)` - ---- - -## Lists - -In order to allow lists to be modified in-place across the DM-to-lua language barrier, lists are treated as userdata. Whenever running code that expects a DM value, auxlua will attempt to convert tables into lists. - -List references are subject to the same limitations as datum userdata, but you are less likely to encounter these limitations for regular lists. - -Some lists (`vars`, `contents`, `overlays`, `underlays`, `vis_contents`, and `vis_locs`) are inherently attached to datums, and as such, their corresponding userdata contains a weak reference to the containing datum. Use [`list:is_null`](#listisnull) to validate these types of lists. - -### list.len - -Equivalent to DM's `list.len` - -### list:get(index) - -Equivalent to DM's `list[index]` - -### list:set(index, value) - -Equivalent to DM's `list[index] = value` - -### list:add(value) - -Equivalent to DM's `list.Add(value)` - -### list:remove(value) - -Equivalent to DM's `list.Remove(value)` - -### list:to_table() - -Converts a DM list into a lua table. - -### list:of_type(type_path) - -Will extract only values of type `type_path`. - -### list:is_null() - -A similar truthiness test to [`datum:is_null()`](#datumisnull). This function only has the possibility of returning `false` for lists that are inherently attached to a datum (`vars`, `contents`, `overlays`, `underlays`, `vis_contents`, and `vis_locs`). - -### list.entries - -Returns a userdatum that allows you to access and modifiy the entries of the list by index. `list.entries.foo` is equivalent to `list:get("foo")`, while `list.entries.foo = bar` is equivalent to `list:set("foo", bar)` - ---- - -## The dm table - -The `dm` table consists of the basic hooks into the DM language. - -### dm.state_id - -The address of the lua state in memory. This is a copy of the internal value used by auxlua to locate the lua state in a global hash map. `state_id` is a registry value that is indirectly obtained using the `dm` table's `__index` metamethod. - -### dm.global_proc(proc, ...) -Calls the global proc `/proc/[proc]` with `...` as its arguments. - -### dm.world -A reference to DM's `world`, in the form of datum userdata. This reference is always valid, since `world` always exists. - -Due to limitations inherent in the wrapper functions used on tgstation, `world:set_var` and `world:call_proc` will raise an error. - -### dm.global_vars -A reference to DM's `global`, in the form of datum userdata. Subject to the same limitations as `dm.world` - -### dm.usr -A weak reference to DM's `usr`. As a rule of thumb, this is a reference to the mob of the client who triggered the chain of procs leading to the execution of Lua code. The following is a list of what `usr` is for the most common ways of executing Lua code: -- For resumes and awakens, which are generally executed by the MC, `usr` is (most likely) null. -- `SS13.wait` queues a resume, which gets executed by the MC. Therefore, `usr` is null after `SS13.wait` finishes. -- For chunk loads, `usr` is generally the current mob of the admin that loaded that chunk. -- For function calls done from the Lua editor, `usr` is the current mob of the admin calling the function. -- `SS13.register_signal` creates a `/datum/callback` that gets executed by the `SEND_SIGNAL` macro for the corresponding signal. As such, `usr` is the mob that triggered the chain of procs leading to the invocation of `SEND_SIGNAL`. - ---- - -## Execution Limit - -In order to prevent freezing the server with infinite loops, auxlua enforces an execution limit, defaulting to 100ms. When a single lua state has been executing for longer than this limit, it will eventually stop and produce an error. - -To avoid exceeding the execution limit, call `sleep()` or `coroutine.yield()` before the execution limit is reached. - -### over_exec_usage(fraction = 0.95) - -This function returns whether the current run of the Lua VM has executed for longer than the specified fraction of the execution limit. You can use this function to branch to a call to `sleep()` or `coroutine.yield()` to maximize the amount of work done in a single run of the Lua VM. If nil, `fraction` will default to 0.95, otherwise, it will be clamped to the range \[0, 1\]. - ---- - -## Task management -The Lua Scripting subsystem manages the execution of tasks for each Lua state. A single fire of the subsystem behaves as follows: -- All tasks that slept since the last fire are resumed in the order they slept. -- For each queued resume, the corresponding task is resumed. - -### sleep() -Yields the current thread, scheduling it to be resumed during the next fire of SSlua. Use this function to prevent your Lua code from exceeding its allowed execution duration. Under the hood, `sleep` performs the following: - -- Sets the [`sleep_flag`](#sleep_flag) -- Calls `coroutine.yield()` -- Clears the sleep flag when determining whether the task slept or yielded -- Ignores the return values of `coroutine.yield()` once resumed - ---- - -## The SS13 package -The `SS13` package contains various helper functions that use code specific to tgstation. - -### SS13.state -A reference to the state datum (`/datum/lua_state`) handling this Lua state. - -### SS13.get_runner_ckey() -The ckey of the user who ran the lua script in the current context. Can be unreliable if accessed after sleeping. - -### SS13.get_runner_client() -Returns the client of the user who ran the lua script in the current context. Can be unreliable if accessed after sleeping. - -### SS13.global_proc -======= # Objects Datums, lists, typepaths, static appearances, and some other objects are represented in Luau as userdata. Certain operations can be performed on these types of objects. @@ -369,7 +220,6 @@ The ckey of the user who ran the lua script in the current context. Can be unrel Returns the client of the user who ran the lua script in the current context. Can be unreliable if accessed after sleeping. ## SS13.global_proc ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 A wrapper for the magic string used to tell `WrapAdminProcCall` to call a global proc. For instance, `/datum/callback` must be instantiated with `SS13.global_proc` as its first argument to specify that it will be invoking a global proc. The following example declares a callback which will execute the global proc `to_chat`: @@ -377,22 +227,6 @@ The following example declares a callback which will execute the global proc `to local callback = SS13.new("/datum/callback", SS13.global_proc, "to_chat", dm.world, "Hello World") ``` -<<<<<<< HEAD -### SS13.istype(thing, type) -Equivalent to the DM statement `istype(thing, text2path(type))`. - -### SS13.new(type, ...) -Instantiates a datum of type `type` with `...` as the arguments passed to `/proc/_new` -The following example spawns a singularity at the caller's current turf: -```lua -SS13.new("/obj/singularity", dm.global_proc("_get_step", dm.usr, 0)) -``` - -### SS13.new_untracked(type, ...) -Works exactly like SS13.new but it does not store the value to the lua state's `references` list variable. This means that the variable could end up deleted if nothing holds a reference to it. - -### SS13.is_valid(datum) -======= ## SS13.istype(thing, type) Equivalent to the DM statement `istype(thing, text2path(type))`. @@ -400,16 +234,11 @@ Equivalent to the DM statement `istype(thing, text2path(type))`. An alias for `dm.new` ## SS13.is_valid(datum) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Can be used to determine if the datum passed is not nil, not undefined and not qdel'd all in one. A helper function that allows you to check the validity from only one function. Example usage: ```lua local datum = SS13.new("/datum") -<<<<<<< HEAD -dm.global_proc("qdel", datum) -======= dm.global_procs.qdel(datum) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 print(SS13.is_valid(datum)) -- false local null = nil @@ -419,15 +248,6 @@ local datum = SS13.new("/datum") print(SS13.is_valid(datum)) -- true ``` -<<<<<<< HEAD -### SS13.type(string) -Converts a string into a type. Equivalent to doing `dm.global_proc("_text2path", "/path/to/type")` - -### SS13.qdel(datum) -Deletes a datum. You shouldn't try to reference it after calling this function. Equivalent to doing `dm.global_proc("qdel", datum)` - -### SS13.await(thing_to_call, proc_to_call, ...) -======= ## SS13.type(string) Converts a string into a typepath. Equivalent to doing `dm.global_proc("_text2path", "/path/to/type")` @@ -435,7 +255,6 @@ Converts a string into a typepath. Equivalent to doing `dm.global_proc("_text2pa Deletes a datum. You shouldn't try to reference it after calling this function. Equivalent to doing `dm.global_proc("qdel", datum)` ## SS13.await(thing_to_call, proc_to_call, ...) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Calls `proc_to_call` on `thing_to_call`, with `...` as its arguments, and sleeps until that proc returns. Returns two return values - the first is the return value of the proc, and the second is the message of any runtime exception thrown by the called proc. The following example calls and awaits the return of `poll_ghost_candidates`: @@ -443,104 +262,59 @@ The following example calls and awaits the return of `poll_ghost_candidates`: local ghosts, runtime = SS13.await(SS13.global_proc, "poll_ghost_candidates", "Would you like to be considered for something?") ``` -<<<<<<< HEAD -### SS13.wait(time, timer) -======= ## SS13.wait(time, timer) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Waits for a number of **seconds** specified with the `time` argument. You can optionally specify a timer subsystem using the `timer` argument. Internally, this function creates a timer that will resume the current task after `time` seconds, then yields the current task by calling `coroutine.yield` with no arguments and ignores the return values. If the task is prematurely resumed, the timer will be safely deleted. -<<<<<<< HEAD -### SS13.register_signal(datum, signal, func, make_easy_clear_function) -======= ## SS13.register_signal(datum, signal, func) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Registers the Lua function `func` as a handler for `signal` on `datum`. Like with signal handlers written in DM, Lua signal handlers should not sleep (either by calling `sleep` or `coroutine.yield`). -<<<<<<< HEAD -If `make_easy_clear_function` is truthy, a member function taking no arguments will be created in the `SS13` table to easily unregister the signal handler. - -This function returns the `/datum/callback` created to call `func` from DM. -======= This function returns whether the signal registration was successful. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 The following example defines a function which will register a signal that makes `target` make a honking sound any time it moves: ```lua function honk(target) SS13.register_signal(target, "movable_moved", function(source) -<<<<<<< HEAD - dm.global_proc("playsound", target, "sound/items/bikehorn.ogg", 100, true) -======= dm.global_procs.playsound(target, "sound/items/bikehorn.ogg", 100, true) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 end) end ``` -<<<<<<< HEAD -### SS13.unregister_signal(datum, signal, callback) -Unregister a signal previously registered using `SS13.register_signal`. `callback` should be a `datum/callback` previously returned by `SS13.register_signal`. If `callback` is not specified, **ALL** signal handlers registered on `datum` for `signal` will be unregistered. - -### SS13.set_timeout(time, func) -======= NOTE: if `func` is an anonymous function declared inside the call to `SS13.register_signal`, it cannot be referenced in order to unregister that signal with `SS13.unregister_signal` ## SS13.unregister_signal(datum, signal, func) Unregister a signal previously registered using `SS13.register_signal`. `func` must be a function for which a handler for the specified signal has already been registered. If `func` is `nil`, all handlers for that signal will be unregistered. ## SS13.set_timeout(time, func) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Creates a timer which will execute `func` after `time` **seconds**. `func` should not expect to be passed any arguments, as it will not be passed any. Unlike `SS13.wait`, `SS13.set_timeout` does not yield or sleep the current task, making it suitable for use in signal handlers for `SS13.register_signal` The following example will output a message to chat after 5 seconds: ```lua SS13.set_timeout(5, function() -<<<<<<< HEAD - dm.global_proc("to_chat", dm.world, "Hello World!") -end) -``` - -### SS13.start_loop(time, amount, func) -======= dm.global_procs.to_chat(dm.world, "Hello World!") end) ``` ## SS13.start_loop(time, amount, func) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Creates a timer which will execute `func` after `time` **seconds**. `func` should not expect to be passed any arguments, as it will not be passed any. Works exactly the same as `SS13.set_timeout` except it will loop the timer `amount` times. If `amount` is set to -1, it will loop indefinitely. Returns a number value, which represents the timer's id. Can be stopped with `SS13.end_loop` Returns a number, the timer id, which is needed to stop indefinite timers. The following example will output a message to chat every 5 seconds, repeating 10 times: ```lua SS13.start_loop(5, 10, function() -<<<<<<< HEAD - dm.global_proc("to_chat", dm.world, "Hello World!") -======= dm.global_procs.to_chat(dm.world, "Hello World!") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 end) ``` The following example will output a message to chat every 5 seconds, until `SS13.end_loop(timerid)` is called: ```lua local timerid = SS13.start_loop(5, -1, function() -<<<<<<< HEAD - dm.global_proc("to_chat", dm.world, "Hello World!") -end) -``` - -### SS13.end_loop(id) -======= dm.global_proc.to_chat(dm.world, "Hello World!") end) ``` ## SS13.end_loop(id) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Prematurely ends a loop that hasn't ended yet, created with `SS13.start_loop`. Silently fails if there is no started loop with the specified id. The following example will output a message to chat every 5 seconds and delete it after it has repeated 20 times: ```lua @@ -548,11 +322,7 @@ local repeated_amount = 0 -- timerid won't be in the looping function's scope if declared before the function is declared. local timerid timerid = SS13.start_loop(5, -1, function() -<<<<<<< HEAD - dm.global_proc("to_chat", dm.world, "Hello World!") -======= dm.global_procs.to_chat(dm.world, "Hello World!") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 repeated_amount += 1 if repeated_amount >= 20 then SS13.end_loop(timerid) @@ -560,41 +330,6 @@ timerid = SS13.start_loop(5, -1, function() end) ``` -<<<<<<< HEAD -### SS13.stop_all_loops() -Stops all current running loops that haven't ended yet. -Useful in case you accidentally left a indefinite loop running without storing the id anywhere. - -### SS13.stop_tracking(datum) -Stops tracking a datum that was created via `SS13.new` so that it can be garbage collected and deleted without having to qdel. Should be used for things like callbacks and other such datums where the reference to the variable is no longer needed. - ---- - -## Internal globals - -Auxlua defines several registry values for each state. Note that there is no way to access registry values from lua code. - -### sleep_flag - -This flag is used to designate that a yielding task should be put in the sleep queue instead of the yield table. Once auxlua determines that a task should sleep, `sleep_flag` is cleared. - -### sleep_queue - -A sequence of threads, each corresponding to a task that has slept. When calling `/proc/__lua_awaken`, auxlua will dequeue the first thread from the sequence and resume it. - -### yield_table - -A table of threads, each corresponding to a coroutine that has yielded. When calling `/proc/__lua_resume`, auxlua will look for a thread at the index specified in the `index` argument, and resume it with the arguments specified in the `arguments` argument. - -### task_info - -A table of key-value-pairs, where the keys are threads, and the values are tables consisting of the following fields: - -- name: A string containing the name of the task -- status: A string, either "sleep" or "yield" -- index: The task's index in `sleep_queue` or `yield_table` -======= ## SS13.stop_all_loops() Stops all current running loops that haven't ended yet. Useful in case you accidentally left a indefinite loop running without storing the id anywhere. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/admin/verbs/lua/_wrappers.dm b/code/modules/admin/verbs/lua/_wrappers.dm index db60447949e..d516f064f84 100644 --- a/code/modules/admin/verbs/lua/_wrappers.dm +++ b/code/modules/admin/verbs/lua/_wrappers.dm @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= /proc/wrap_lua_get_var(datum/thing, var_name) SHOULD_NOT_SLEEP(TRUE) if(thing == world) @@ -9,7 +7,6 @@ if(thing.can_vv_get(var_name)) return thing.vars[var_name] ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/wrap_lua_set_var(datum/thing_to_set, var_name, value) SHOULD_NOT_SLEEP(TRUE) thing_to_set.vv_edit_var(var_name, value) @@ -23,11 +20,6 @@ ret = WrapAdminProcCall(thing_to_call, proc_name, arguments) else ret = HandleUserlessProcCall("lua", thing_to_call, proc_name, arguments) -<<<<<<< HEAD - if(isdatum(ret)) - SSlua.gc_guard += ret -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ret /proc/wrap_lua_global_proc_call(proc_name, list/arguments) @@ -39,11 +31,6 @@ ret = WrapAdminProcCall(GLOBAL_PROC, proc_name, arguments) else ret = HandleUserlessProcCall("lua", GLOBAL_PROC, proc_name, arguments) -<<<<<<< HEAD - if(isdatum(ret)) - SSlua.gc_guard += ret -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ret /proc/wrap_lua_print(state_id, list/arguments) @@ -56,10 +43,6 @@ if(!target_state) return var/print_message = jointext(arguments, "\t") -<<<<<<< HEAD - var/result = list("status" = "print", "param" = print_message) -======= var/result = list("status" = "print", "message" = print_message) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 INVOKE_ASYNC(target_state, TYPE_PROC_REF(/datum/lua_state, log_result), result, TRUE) log_lua("[target_state]: [print_message]") diff --git a/code/modules/admin/verbs/lua/helpers.dm b/code/modules/admin/verbs/lua/helpers.dm index 422edd27b04..c3072f15e74 100644 --- a/code/modules/admin/verbs/lua/helpers.dm +++ b/code/modules/admin/verbs/lua/helpers.dm @@ -3,38 +3,20 @@ #define PROMISE_REJECTED 2 /** -<<<<<<< HEAD - * Auxtools hooks act as "set waitfor = 0" procs. This means that whenever - * a proc directly called from auxtools sleeps, the hook returns with whatever -======= * Byondapi hooks act as "set waitfor = 0" procs. This means that whenever * a proc directly called from an external library sleeps, the hook returns with whatever ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * the called proc had as its return value at the moment it slept. This may not * be desired behavior, so this datum exists to wrap these procs. * * Some procs that don't sleep could take longer than the execution limit would * allow for. We can wrap these in a promise as well. */ -<<<<<<< HEAD -/datum/auxtools_promise -======= /datum/promise ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/callback/callback var/return_value var/runtime_message var/status = PROMISE_PENDING -<<<<<<< HEAD -/datum/auxtools_promise/New(...) - callback = CALLBACK(arglist(args)) - perform() - -/datum/auxtools_promise/proc/perform() - set waitfor = 0 - sleep() //In case we have to call a super-expensive non-sleeping proc (like getFlatIcon) -======= /datum/promise/New(...) if(!usr) usr = GLOB.lua_usr @@ -42,7 +24,6 @@ INVOKE_ASYNC(src, PROC_REF(perform)) /datum/promise/proc/perform() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 try return_value = callback.Invoke() status = PROMISE_RESOLVED diff --git a/code/modules/admin/verbs/lua/lua_editor.dm b/code/modules/admin/verbs/lua/lua_editor.dm index c0146392c7f..93e8e50c1a6 100644 --- a/code/modules/admin/verbs/lua/lua_editor.dm +++ b/code/modules/admin/verbs/lua/lua_editor.dm @@ -16,15 +16,12 @@ /// If set, we will force the editor to look at this chunk var/force_view_chunk -<<<<<<< HEAD -======= /// If set, we will force the script input to be this var/force_input /// If set, the latest code execution performed from the editor raised an error, and this is the message from that error var/last_error ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/lua_editor/New(state, _quick_log_index) . = ..() if(state) @@ -46,32 +43,16 @@ /datum/lua_editor/ui_state(mob/user) return GLOB.debug_state -<<<<<<< HEAD -/datum/lua_editor/ui_static_data(mob/user) - var/list/data = list() - data["documentation"] = file2text('code/modules/admin/verbs/lua/README.md') - data["auxtools_enabled"] = CONFIG_GET(flag/auxtools_enabled) - data["ss_lua_init"] = SSlua.initialized - return data - -/datum/lua_editor/ui_data(mob/user) - var/list/data = list() - if(!CONFIG_GET(flag/auxtools_enabled) || !SSlua.initialized) -======= /datum/lua_editor/ui_data(mob/user) var/list/data = list() data["ss_lua_init"] = SSlua.initialized if(!SSlua.initialized) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data data["noStateYet"] = !current_state data["showGlobalTable"] = show_global_table if(current_state) if(current_state.log) -<<<<<<< HEAD - data["stateLog"] = kvpify_list(refify_list(current_state.log.Copy((page*50)+1, min((page+1)*50+1, current_state.log.len+1)))) -======= var/list/logs = current_state.log.Copy((page*50)+1, min((page+1)*50+1, current_state.log.len+1)) for(var/i in 1 to logs.len) var/list/log = logs[i] @@ -80,17 +61,11 @@ log["return_values"] = kvpify_list(prepare_lua_editor_list(deep_copy_without_cycles(log["return_values"]))) logs[i] = log data["stateLog"] = logs ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 data["page"] = page data["pageCount"] = CEILING(current_state.log.len/50, 1) data["tasks"] = current_state.get_tasks() if(show_global_table) current_state.get_globals() -<<<<<<< HEAD - data["globals"] = kvpify_list(refify_list(current_state.globals)) - data["states"] = SSlua.states - data["callArguments"] = kvpify_list(refify_list(arguments)) -======= var/list/values = current_state.globals["values"] values = deep_copy_without_cycles(values) values = prepare_lua_editor_list(values) @@ -105,19 +80,15 @@ for(var/datum/lua_state/state as anything in SSlua.states) data["states"] += state.display_name data["callArguments"] = kvpify_list(prepare_lua_editor_list(deep_copy_without_cycles(arguments))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(force_modal) data["forceModal"] = force_modal force_modal = null if(force_view_chunk) data["forceViewChunk"] = force_view_chunk force_view_chunk = null -<<<<<<< HEAD -======= if(force_input) data["force_input"] = force_input force_input = null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data /datum/lua_editor/proc/traverse_list(list/path, list/root, traversal_depth_offset = 0) @@ -149,16 +120,6 @@ else return root -<<<<<<< HEAD -/datum/lua_editor/ui_act(action, list/params) - . = ..() - if(.) - return - if(!check_rights_for(usr.client, R_DEBUG)) - return - if(action == "runCodeFile") - params["code"] = file2text(input(usr, "Input File") as null|file) -======= /datum/lua_editor/proc/run_code(code) var/ckey = usr.ckey current_state.ckey_last_runner = ckey @@ -177,7 +138,6 @@ return if(action == "runCodeFile") params["code"] = file2text(input(user, "Input File") as null|file) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(params["code"])) return action = "runCode" @@ -187,11 +147,8 @@ if(!length(state_name)) return TRUE var/datum/lua_state/new_state = new(state_name) -<<<<<<< HEAD -======= if(QDELETED(new_state)) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SSlua.states += new_state LAZYREMOVEASSOC(SSlua.editors, text_ref(current_state), src) current_state = new_state @@ -206,13 +163,6 @@ page = 0 return TRUE if("runCode") -<<<<<<< HEAD - var/code = params["code"] - current_state.ckey_last_runner = usr.ckey - var/result = current_state.load_script(code) - var/index_with_result = current_state.log_result(result) - message_admins("[key_name(usr)] executed [length(code)] bytes of lua code. [ADMIN_LUAVIEW_CHUNK(current_state, index_with_result)]") -======= run_code(params["code"]) return TRUE if("runFile") @@ -221,7 +171,6 @@ return TRUE var/code = file2text(code_file) run_code(code) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE if("moveArgUp") var/list/path = params["path"] @@ -245,15 +194,9 @@ var/list/path = params["path"] var/list/target_list = traverse_list(path, arguments) if(target_list != arguments) -<<<<<<< HEAD - usr?.client?.mod_list_add(target_list, null, "a lua editor", "arguments") - else - var/list/vv_val = usr?.client?.vv_get_value(restricted_classes = list(VV_RESTORE_DEFAULT)) -======= user?.client?.mod_list_add(target_list, null, "a lua editor", "arguments") else var/list/vv_val = user?.client?.vv_get_value(restricted_classes = list(VV_RESTORE_DEFAULT)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/class = vv_val["class"] if(!class) return @@ -261,43 +204,22 @@ return TRUE if("callFunction") var/list/recursive_indices = params["indices"] -<<<<<<< HEAD - var/list/current_list = kvpify_list(current_state.globals) -======= var/list/current_list = kvpify_list(current_state.globals["values"]) var/list/current_variants = current_state.globals["variants"] ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/function = list() while(LAZYLEN(recursive_indices)) var/index = popleft(recursive_indices) var/list/element = current_list[index] var/key = element["key"] var/value = element["value"] -<<<<<<< HEAD - if(!(istext(key) || isnum(key))) - to_chat(usr, span_warning("invalid key \[[key]] for function call (expected text or num)")) -======= var/list/variant_pair = current_variants[index] var/key_variant = variant_pair["key"] if(key_variant == "function" || key_variant == "thread" || key_variant == "userdata" || key_variant == "error_as_value") to_chat(user, span_warning("invalid table key \[[key]] for function call (expected text, num, path, list, or ref, got [key_variant])")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return function += key if(islist(value)) current_list = value -<<<<<<< HEAD - else - var/regex/function_regex = regex("^function: 0x\[0-9a-fA-F]+$") - if(function_regex.Find(value)) - break - to_chat(usr, span_warning("invalid path element \[[value]] for function call (expected list or text matching [function_regex])")) - return - var/result = current_state.call_function(arglist(list(function) + arguments)) - current_state.log_result(result) - arguments.Cut() - return TRUE -======= current_variants = variant_pair["value"] else if(variant_pair["value"] != "function") @@ -309,39 +231,19 @@ last_error = result["message"] arguments.Cut() return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("resumeTask") var/task_index = params["index"] SSlua.queue_resume(current_state, task_index, arguments) arguments.Cut() return TRUE if("killTask") -<<<<<<< HEAD - var/task_info = params["info"] - SSlua.kill_task(current_state, task_info) -======= var/is_sleep = params["is_sleep"] var/index = params["index"] SSlua.kill_task(current_state, is_sleep, index) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE if("vvReturnValue") var/log_entry_index = params["entryIndex"] var/list/log_entry = current_state.log[log_entry_index] -<<<<<<< HEAD - var/thing_to_debug = traverse_list(params["tableIndices"], log_entry["param"]) - if(isweakref(thing_to_debug)) - var/datum/weakref/ref = thing_to_debug - thing_to_debug = ref.resolve() - INVOKE_ASYNC(usr.client, TYPE_PROC_REF(/client, debug_variables), thing_to_debug) - return FALSE - if("vvGlobal") - var/thing_to_debug = traverse_list(params["indices"], current_state.globals) - if(isweakref(thing_to_debug)) - var/datum/weakref/ref = thing_to_debug - thing_to_debug = ref.resolve() - INVOKE_ASYNC(usr.client, TYPE_PROC_REF(/client, debug_variables), thing_to_debug) -======= var/thing_to_debug = traverse_list(params["indices"], log_entry["return_values"]) if(isweakref(thing_to_debug)) var/datum/weakref/ref = thing_to_debug @@ -354,7 +256,6 @@ var/datum/weakref/ref = thing_to_debug thing_to_debug = ref.resolve() INVOKE_ASYNC(user.client, TYPE_PROC_REF(/client, debug_variables), thing_to_debug) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if("clearArgs") arguments.Cut() @@ -362,24 +263,18 @@ if("toggleShowGlobalTable") show_global_table = !show_global_table return TRUE -<<<<<<< HEAD -======= if("toggleSupressRuntimes") current_state.supress_runtimes = !current_state.supress_runtimes return TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("nextPage") page = min(page+1, CEILING(current_state.log.len/50, 1)-1) return TRUE if("previousPage") page = max(page-1, 0) return TRUE -<<<<<<< HEAD -======= if("nukeLog") current_state.log.Cut() return TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/lua_editor/ui_close(mob/user) . = ..() diff --git a/code/modules/admin/verbs/lua/lua_state.dm b/code/modules/admin/verbs/lua/lua_state.dm index 7e1ccce16d4..30bc21c83b2 100644 --- a/code/modules/admin/verbs/lua/lua_state.dm +++ b/code/modules/admin/verbs/lua/lua_state.dm @@ -1,17 +1,5 @@ #define MAX_LOG_REPEAT_LOOKBACK 5 -<<<<<<< HEAD -GLOBAL_VAR_INIT(IsLuaCall, FALSE) -GLOBAL_PROTECT(IsLuaCall) - -GLOBAL_DATUM(lua_usr, /mob) -GLOBAL_PROTECT(lua_usr) - -/datum/lua_state - var/name - - /// The internal ID of the lua state stored in auxlua's global map -======= GLOBAL_DATUM(lua_usr, /mob) GLOBAL_PROTECT(lua_usr) @@ -22,7 +10,6 @@ GLOBAL_PROTECT(lua_state_stack) var/display_name /// The internal ID of the lua state stored in dreamluau's state list ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/internal_id /// A log of every return, yield, and error for each chunk execution and function call @@ -31,24 +18,15 @@ GLOBAL_PROTECT(lua_state_stack) /// A list of all the variables in the state's environment var/list/globals = list() -<<<<<<< HEAD - /// A list in which to store datums and lists instantiated in lua, ensuring that they don't get garbage collected - var/list/references = list() - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Ckey of the last user who ran a script on this lua state. var/ckey_last_runner = "" /// Whether the timer.lua script has been included into this lua context state. var/timer_enabled = FALSE -<<<<<<< HEAD -======= /// Whether to supress logging BYOND runtimes for this state. var/supress_runtimes = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Callbacks that need to be ran on next tick var/list/functions_to_execute = list() @@ -61,13 +39,6 @@ GLOBAL_PROTECT(lua_state_stack) if(SSlua.initialized != TRUE) qdel(src) return -<<<<<<< HEAD - name = _name - internal_id = __lua_new_state() - -/datum/lua_state/proc/check_if_slept(result) - if(result["status"] == "sleeping") -======= display_name = _name internal_id = DREAMLUAU_NEW_STATE() if(isnull(internal_id)) @@ -79,42 +50,21 @@ GLOBAL_PROTECT(lua_state_stack) /datum/lua_state/proc/check_if_slept(result) if(result["status"] == "sleep") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SSlua.sleeps += src /datum/lua_state/proc/log_result(result, verbose = TRUE) if(!islist(result)) return -<<<<<<< HEAD - if(!verbose && result["status"] != "errored" && result["status"] != "bad return" \ - && !(result["name"] == "input" && (result["status"] == "finished" || length(result["param"])))) -======= var/status = result["status"] if(!verbose && status != "error" && status != "panic" && status != "runtime" && !(result["name"] == "input" && (status == "finished" || length(result["return_values"])))) return if(status == "runtime" && supress_runtimes) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/append_to_log = TRUE var/index_of_log if(log.len) for(var/index in log.len to max(log.len - MAX_LOG_REPEAT_LOOKBACK, 1) step -1) var/list/entry = log[index] -<<<<<<< HEAD - if(entry["status"] == result["status"] \ - && entry["chunk"] == result["chunk"] \ - && entry["name"] == result["name"] \ - && ((entry["param"] == result["param"]) || deep_compare_list(entry["param"], result["param"]))) - if(!entry["repeats"]) - entry["repeats"] = 0 - index_of_log = index - entry["repeats"]++ - append_to_log = FALSE - break - if(append_to_log) - if(islist(result["param"])) - result["param"] = weakrefify_list(encode_text_and_nulls(result["param"])) -======= if(!compare_lua_logs(entry, result)) continue if(!entry["repeats"]) @@ -127,20 +77,11 @@ GLOBAL_PROTECT(lua_state_stack) if(islist(result["return_values"])) add_lua_return_value_variants(result["return_values"], result["variants"]) result["return_values"] = weakrefify_list(result["return_values"]) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log += list(result) index_of_log = log.len INVOKE_ASYNC(src, TYPE_PROC_REF(/datum/lua_state, update_editors)) return index_of_log -<<<<<<< HEAD -/datum/lua_state/proc/load_script(script) - GLOB.IsLuaCall = TRUE - var/tmp_usr = GLOB.lua_usr - GLOB.lua_usr = usr - var/result = __lua_load(internal_id, script) - GLOB.IsLuaCall = FALSE -======= /datum/lua_state/proc/parse_error(message, name) if(copytext(message, 1, 7) == "PANIC:") return list("status" = "panic", "message" = copytext(message, 7), "name" = name) @@ -155,20 +96,13 @@ GLOBAL_PROTECT(lua_state_stack) var/result = DREAMLUAU_LOAD(internal_id, script, "input") SSlua.needs_gc_cycle |= src pop(GLOB.lua_state_stack) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.lua_usr = tmp_usr // Internal errors unrelated to the code being executed are returned as text rather than lists if(isnull(result)) -<<<<<<< HEAD - result = list("status" = "errored", "param" = "__lua_load returned null (it may have runtimed - check the runtime logs)", "name" = "input") - if(istext(result)) - result = list("status" = "errored", "param" = result, "name" = "input") -======= result = list("status" = "error", "message" = "load returned null (it may have runtimed - check the runtime logs)", "name" = "input") if(istext(result)) result = parse_error(result, "input") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 result["chunk"] = script check_if_slept(result) @@ -190,22 +124,6 @@ GLOBAL_PROTECT(lua_state_stack) if(islist(function)) var/list/new_function_path = list() for(var/path_element in function) -<<<<<<< HEAD - new_function_path += path_element - function = new_function_path - - var/tmp_usr = GLOB.lua_usr - GLOB.lua_usr = usr - GLOB.IsLuaCall = TRUE - var/result = __lua_call(internal_id, function, call_args) - GLOB.IsLuaCall = FALSE - GLOB.lua_usr = tmp_usr - - if(isnull(result)) - result = list("status" = "errored", "param" = "__lua_call returned null (it may have runtimed - check the runtime logs)", "name" = islist(function) ? jointext(function, ".") : function) - if(istext(result)) - result = list("status" = "errored", "param" = result, "name" = islist(function) ? jointext(function, ".") : function) -======= if(isweakref(path_element)) var/datum/weakref/weak_ref = path_element var/resolved = weak_ref.hard_resolve() @@ -231,28 +149,10 @@ GLOBAL_PROTECT(lua_state_stack) result = list("status" = "error", "message" = "call_function returned null (it may have runtimed - check the runtime logs)", "name" = jointext(function, ".")) if(istext(result)) result = parse_error(result, jointext(function, ".")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 check_if_slept(result) return result /datum/lua_state/proc/call_function_return_first(function, ...) -<<<<<<< HEAD - var/list/result = call_function(arglist(args)) - log_result(result, verbose = FALSE) - if(length(result)) - if(islist(result["param"]) && length(result["param"])) - return result["param"][1] - -/datum/lua_state/proc/awaken() - GLOB.IsLuaCall = TRUE - var/result = __lua_awaken(internal_id) - GLOB.IsLuaCall = FALSE - - if(isnull(result)) - result = list("status" = "errored", "param" = "__lua_awaken returned null (it may have runtimed - check the runtime logs)", "name" = "An attempted awaken") - if(istext(result)) - result = list("status" = "errored", "param" = result, "name" = "An attempted awaken") -======= SHOULD_NOT_SLEEP(TRUE) // This function is meant to be used for signal handlers. var/list/result = call_function(arglist(args)) INVOKE_ASYNC(src, PROC_REF(log_result), deep_copy_list(result), /*verbose = */FALSE) @@ -275,26 +175,12 @@ GLOBAL_PROTECT(lua_state_stack) result = list("status" = "error", "message" = "awaken returned null (it may have runtimed - check the runtime logs)", "name" = "An attempted awaken") if(istext(result)) result = parse_error(result, "An attempted awaken") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 check_if_slept(result) return result /// Prefer calling SSlua.queue_resume over directly calling this /datum/lua_state/proc/resume(index, ...) var/call_args = length(args) > 1 ? args.Copy(2) : list() -<<<<<<< HEAD - var/msg = "[key_name(usr)] resumed a lua coroutine with arguments: [english_list(call_args)]" - log_lua(msg) - - GLOB.IsLuaCall = TRUE - var/result = __lua_resume(internal_id, index, call_args) - GLOB.IsLuaCall = FALSE - - if(isnull(result)) - result = list("status" = "errored", "param" = "__lua_resume returned null (it may have runtimed - check the runtime logs)", "name" = "An attempted resume") - if(istext(result)) - result = list("status" = "errored", "param" = result, "name" = "An attempted resume") -======= DREAMLUAU_SET_USR GLOB.lua_state_stack += WEAKREF(src) @@ -306,20 +192,10 @@ GLOBAL_PROTECT(lua_state_stack) result = list("status" = "error", "param" = "resume returned null (it may have runtimed - check the runtime logs)", "name" = "An attempted resume") if(istext(result)) result = parse_error(result, "An attempted resumt") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 check_if_slept(result) return result /datum/lua_state/proc/get_globals() -<<<<<<< HEAD - globals = weakrefify_list(encode_text_and_nulls(__lua_get_globals(internal_id))) - -/datum/lua_state/proc/get_tasks() - return __lua_get_tasks(internal_id) - -/datum/lua_state/proc/kill_task(task_info) - __lua_kill_task(internal_id, task_info) -======= var/result = DREAMLUAU_GET_GLOBALS(internal_id) if(isnull(result)) CRASH("get_globals returned null") @@ -348,7 +224,6 @@ GLOBAL_PROTECT(lua_state_stack) var/result = DREAMLUAU_COLLECT_GARBAGE(internal_id) if(!isnull(result)) CRASH(result) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/lua_state/proc/update_editors() var/list/editor_list = LAZYACCESS(SSlua.editors, text_ref(src)) @@ -356,21 +231,4 @@ GLOBAL_PROTECT(lua_state_stack) for(var/datum/lua_editor/editor as anything in editor_list) SStgui.update_uis(editor) -<<<<<<< HEAD -/// Called by lua scripts when they add an atom to var/list/references so that it gets cleared up on delete. -/datum/lua_state/proc/clear_on_delete(datum/to_clear) - RegisterSignal(to_clear, COMSIG_QDELETING, PROC_REF(on_delete)) - -/// Called by lua scripts when an atom they've added should soft delete and this state should stop tracking it. -/// Needs to unregister all signals. -/datum/lua_state/proc/let_soft_delete(datum/to_clear) - UnregisterSignal(to_clear, COMSIG_QDELETING, PROC_REF(on_delete)) - references -= to_clear - -/datum/lua_state/proc/on_delete(datum/to_clear) - SIGNAL_HANDLER - references -= to_clear - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef MAX_LOG_REPEAT_LOOKBACK diff --git a/code/modules/admin/verbs/machine_upgrade.dm b/code/modules/admin/verbs/machine_upgrade.dm index bb0d993ef0d..7495b383d0e 100644 --- a/code/modules/admin/verbs/machine_upgrade.dm +++ b/code/modules/admin/verbs/machine_upgrade.dm @@ -1,10 +1,5 @@ -<<<<<<< HEAD -ADMIN_VERB(machine_upgrade, R_DEBUG, "Tweak Component Ratings", ADMIN_VERB_NO_DESCRIPTION, ADMIN_CATEGORY_HIDDEN, obj/machinery/machine in world) - var/new_rating = input(user, "Enter new rating:","Num") as num|null -======= ADMIN_VERB_AND_CONTEXT_MENU(machine_upgrade, R_DEBUG, "Tweak Component Ratings", ADMIN_VERB_NO_DESCRIPTION, ADMIN_CATEGORY_HIDDEN, obj/machinery/machine in world) var/new_rating = tgui_input_number(user, "", "Enter new rating:") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(new_rating && machine.component_parts) for(var/obj/item/stock_parts/P in machine.component_parts) P.rating = new_rating diff --git a/code/modules/admin/verbs/manipulate_organs.dm b/code/modules/admin/verbs/manipulate_organs.dm index 9eedcd4184a..6c0a86126b6 100644 --- a/code/modules/admin/verbs/manipulate_organs.dm +++ b/code/modules/admin/verbs/manipulate_organs.dm @@ -18,14 +18,7 @@ ADMIN_VERB(manipulate_organs, R_DEBUG, "Manipulate Organs", "Manipulate the orga return organ_to_grant = organs[organ_to_grant] organ_to_grant = new organ_to_grant -<<<<<<< HEAD - if(!organ_to_grant.Insert(carbon_victim)) - to_chat(user, span_notice("[carbon_victim] is unable to carry this organ!")) - qdel(organ_to_grant) - return -======= organ_to_grant.Insert(carbon_victim) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_admin("[key_name(user)] has added organ [organ_to_grant.type] to [key_name(carbon_victim)]") message_admins("[key_name_admin(user)] has added organ [organ_to_grant.type] to [ADMIN_LOOKUPFLW(carbon_victim)]") diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 04f639edafb..c069bda812b 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -203,15 +203,9 @@ ADMIN_VERB(create_mapping_job_icons, R_DEBUG, "Generate job landmarks icons", "G var/datum/job/JB = new job switch(JB.title) if(JOB_AI) -<<<<<<< HEAD job_key_to_icon["AI"] = icon('icons/mob/silicon/ai.dmi', "ai", SOUTH, 1) // SKYRAT EDIT CHANGE - ORIGINAL: final.Insert(icon('icons/mob/silicon/ai.dmi', "ai", SOUTH, 1), "AI") if(JOB_CYBORG) job_key_to_icon["Cyborg"] = icon('icons/mob/silicon/robots.dmi', "robot", SOUTH, 1) // SKYRAT EDIT CHANGE - ORIGINAL: final.Insert(icon('icons/mob/silicon/robots.dmi', "robot", SOUTH, 1), "Cyborg") -======= - final.Insert(icon('icons/mob/silicon/ai.dmi', "ai", SOUTH, 1), "AI") - if(JOB_CYBORG) - final.Insert(icon('icons/mob/silicon/robots.dmi', "robot", SOUTH, 1), "Cyborg") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else for(var/obj/item/I in D) qdel(I) @@ -348,11 +342,7 @@ ADMIN_VERB(check_for_obstructed_atmospherics, R_DEBUG, "Check For Obstructed Atm var/list/results = list() -<<<<<<< HEAD - results += "

Anything that is considered to aesthetically obstruct an atmospherics machine (vent, scrubber, port) is listed below. Please re-arrange to accomodate for this.


" -======= results += "

Anything that is considered to aesthetically obstruct an atmospherics machine (vent, scrubber, port) is listed below. Please re-arrange to accommodate for this.


" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Ignore out stuff we see in normal and standard mapping that we don't care about (false alarms). Typically stuff that goes directionally off turfs or other undertile objects that we don't want to care about. var/list/ignore_list = list( diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index 42581e302bb..bcb89379ef4 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -41,11 +41,7 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w #define THUNDERDOME_TEMPLATE_FILE "admin_thunderdome.dmm" #define HIGHLANDER_DELAY_TEXT "40 seconds (crush the hope of a normal shift)" -<<<<<<< HEAD -/datum/secrets_menu/ui_act(action, params) -======= /datum/secrets_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -530,11 +526,7 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w var/forename = names.len > 1 ? names[2] : names[1] var/newname = "[forename]-[pick(honorifics["[H.gender]"])]" H.fully_replace_character_name(H.real_name,newname) -<<<<<<< HEAD - H.update_mutant_bodyparts() -======= H.update_body_parts() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(animetype == "Yes") var/seifuku = pick(typesof(/obj/item/clothing/under/costume/schoolgirl)) var/obj/item/clothing/under/costume/schoolgirl/I = new seifuku diff --git a/code/modules/admin/verbs/server.dm b/code/modules/admin/verbs/server.dm index f5f560dc721..ceb2c764a00 100644 --- a/code/modules/admin/verbs/server.dm +++ b/code/modules/admin/verbs/server.dm @@ -96,13 +96,8 @@ ADMIN_VERB(start_now, R_SERVER, "Start Now", "Start the round RIGHT NOW.", ADMIN if(SSticker.start_immediately) SSticker.start_immediately = FALSE -<<<<<<< HEAD - SSticker.SetTimeLeft(1800) - to_chat(world, span_infoplain(span_bold("The game will start in 180 seconds."))) -======= SSticker.SetTimeLeft(3 MINUTES) to_chat(world, span_big(span_notice("The game will start in 3 minutes."))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SOUND(world, sound('sound/ai/default/attention.ogg')) message_admins(span_adminnotice("[key_name_admin(user)] has cancelled immediate game start. Game will start in 3 minutes.")) log_admin("[key_name(user)] has cancelled immediate game start.") @@ -120,12 +115,8 @@ ADMIN_VERB(start_now, R_SERVER, "Start Now", "Start the round RIGHT NOW.", ADMIN message_admins("The server is still setting up, but the round will be started as soon as possible.") BLACKBOX_LOG_ADMIN_VERB("Start Now") -<<<<<<< HEAD // ADMIN_VERB(delay_round_end, R_SERVER, "Delay Round End", "Prevent the server from restarting.", ADMIN_CATEGORY_SERVER) ADMIN_VERB(delay_round_end, R_ADMIN, "Delay Round End", "Prevent the server from restarting.", ADMIN_CATEGORY_SERVER) // SKYRAT EDIT -- ORIGINAL ABOVE -======= -ADMIN_VERB(delay_round_end, R_SERVER, "Delay Round End", "Prevent the server from restarting.", ADMIN_CATEGORY_SERVER) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SSticker.delay_end) tgui_alert(user, "The round end is already delayed. The reason for the current delay is: \"[SSticker.admin_delay_notice]\"", "Alert", list("Ok")) return @@ -160,13 +151,8 @@ ADMIN_VERB(toggle_ai, R_SERVER, "Toggle AI", "Toggle the ability to choose AI jo if (alai) to_chat(world, span_bold("The AI job is no longer chooseable."), confidential = TRUE) else -<<<<<<< HEAD - to_chat(world, span_bold("The AI job is chooseable now."), confidential = TRUE) - log_admin("[key_name(usr)] toggled AI allowed.") -======= to_chat(world, "The AI job is chooseable now.", confidential = TRUE) log_admin("[key_name(user)] toggled AI allowed.") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 world.update_status() SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle AI", "[!alai ? "Disabled" : "Enabled"]")) // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! @@ -217,13 +203,8 @@ ADMIN_VERB(delay, R_SERVER, "Delay Pre-Game", "Delay the game start.", ADMIN_CAT SSticker.SetTimeLeft(newtime) SSticker.start_immediately = FALSE if(newtime < 0) -<<<<<<< HEAD - to_chat(world, span_infoplain(span_bold("The game start has been delayed.")), confidential = TRUE) - log_admin("[key_name(usr)] delayed the round start.") -======= to_chat(world, "The game start has been delayed.", confidential = TRUE) log_admin("[key_name(user)] delayed the round start.") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else to_chat(world, span_infoplain(span_bold("The game will start in [DisplayTimeText(newtime)].")), confidential = TRUE) SEND_SOUND(world, sound('sound/ai/default/attention.ogg')) @@ -257,13 +238,7 @@ ADMIN_VERB(toggle_guests, R_SERVER, "Toggle Guests", "Toggle the ability for gue if (new_guest_ban) to_chat(world, span_bold("Guests may no longer enter the game."), confidential = TRUE) else -<<<<<<< HEAD - to_chat(world, span_bold("Guests may now enter the game."), confidential = TRUE) - log_admin("[key_name(usr)] toggled guests game entering [!new_guest_ban ? "" : "dis"]allowed.") - message_admins(span_adminnotice("[key_name_admin(usr)] toggled guests game entering [!new_guest_ban ? "" : "dis"]allowed.")) -======= to_chat(world, "Guests may now enter the game.", confidential = TRUE) log_admin("[key_name(user)] toggled guests game entering [!new_guest_ban ? "" : "dis"]allowed.") message_admins(span_adminnotice("[key_name_admin(user)] toggled guests game entering [!new_guest_ban ? "" : "dis"]allowed.")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Guests", "[!new_guest_ban ? "Enabled" : "Disabled"]")) // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/shuttlepanel.dm b/code/modules/admin/verbs/shuttlepanel.dm index 4ca4ab96b5d..9090a5cd2f0 100644 --- a/code/modules/admin/verbs/shuttlepanel.dm +++ b/code/modules/admin/verbs/shuttlepanel.dm @@ -3,20 +3,15 @@ ADMIN_VERB(shuttle_panel, R_ADMIN, "Shuttle Manipulator", "Opens the shuttle man /obj/docking_port/mobile/proc/admin_fly_shuttle(mob/user) var/list/options = list() -<<<<<<< HEAD - options += "-----COMPATABLE DOCKS:" //SKYRAT EDIT ADDITION -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + options += "-----COMPATIBLE DOCKS:" //SKYRAT EDIT ADDITION for(var/port in SSshuttle.stationary_docking_ports) if (istype(port, /obj/docking_port/stationary/transit)) continue // please don't do this var/obj/docking_port/stationary/S = port if (canDock(S) == SHUTTLE_CAN_DOCK) options[S.name || S.shuttle_id] = S -<<<<<<< HEAD //SKYRAT EDIT ADDITION START - options += "-----INCOMPATABLE DOCKS:" //I WILL CRASH THIS SHIP WITH NO SURVIVORS! + options += "-----INCOMPATIBLE DOCKS:" //I WILL CRASH THIS SHIP WITH NO SURVIVORS! for(var/port in SSshuttle.stationary_docking_ports) if (istype(port, /obj/docking_port/stationary/transit)) continue // please don't do this @@ -24,8 +19,6 @@ ADMIN_VERB(shuttle_panel, R_ADMIN, "Shuttle Manipulator", "Opens the shuttle man if(!(canDock(S) == SHUTTLE_CAN_DOCK)) options[S.name || S.shuttle_id] = S //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 options += "--------" options += "Infinite Transit" diff --git a/code/modules/admin/view_variables/debug_variables.dm b/code/modules/admin/view_variables/debug_variables.dm index b4544a94848..835da1a0b39 100644 --- a/code/modules/admin/view_variables/debug_variables.dm +++ b/code/modules/admin/view_variables/debug_variables.dm @@ -29,11 +29,7 @@ return "[.][item]" -<<<<<<< HEAD -// This is split into a seperate proc mostly to make errors that happen not break things too much -======= // This is split into a separate proc mostly to make errors that happen not break things too much ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/_debug_variable_value(name, value, level, datum/owner, sanitize, display_flags) if(isappearance(value)) value = get_vv_appearance(value) @@ -68,19 +64,11 @@ var/datum/datum_value = value return datum_value.debug_variable_value(name, level, owner, sanitize, display_flags) -<<<<<<< HEAD - if(islist(value) || (name in GLOB.vv_special_lists)) // Some special lists arent detectable as a list through istype - var/list/list_value = value - var/list/items = list() - - // This is becuse some lists either dont count as lists or a locate on their ref will return null -======= if(islist(value) || (name in GLOB.vv_special_lists)) // Some special lists aren't detectable as a list through istype var/list/list_value = value var/list/items = list() // This is because some lists either don't count as lists or a locate on their ref will return null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/link_vars = "Vars=[REF(value)]" if(name in GLOB.vv_special_lists) link_vars = "Vars=[REF(owner)];special_varname=[name]" diff --git a/code/modules/admin/view_variables/filterrific.dm b/code/modules/admin/view_variables/filterrific.dm index f8e4f57c68b..a997d520477 100644 --- a/code/modules/admin/view_variables/filterrific.dm +++ b/code/modules/admin/view_variables/filterrific.dm @@ -24,11 +24,7 @@ data["target_filter_data"] = target.filter_data return data -<<<<<<< HEAD -/datum/filter_editor/ui_act(action, list/params) -======= /datum/filter_editor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm b/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm index 7661aced395..8eb2f1c72f0 100644 --- a/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm +++ b/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm @@ -42,11 +42,7 @@ data["pixelated"] = target.appearance_flags & PIXEL_SCALE return data -<<<<<<< HEAD -/datum/nobody_wants_to_learn_matrix_math/ui_act(action, list/params) -======= /datum/nobody_wants_to_learn_matrix_math/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -56,11 +52,7 @@ var/matrix_var_name = params["var_name"] var/matrix_var_value = params["var_value"] if(testing_matrix.vv_edit_var(matrix_var_name, matrix_var_value) == FALSE) -<<<<<<< HEAD - to_chat(src, "Your edit was rejected by the object. This is a bug with the matrix tester, not your fault, so report it on github.", confidential = TRUE) -======= to_chat(src, "Your edit was rejected by the object. This is a bug with the matrix tester, not your fault, so report it on GitHub.", confidential = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return set_transform() if("scale") diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 6ebd279969a..9e2de212cf5 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -128,11 +128,7 @@ GLOBAL_LIST_EMPTY(antagonists) ui = new(user, src, ui_name, name) ui.open() -<<<<<<< HEAD -/datum/antagonist/ui_act(action, params) -======= /datum/antagonist/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -349,10 +345,7 @@ GLOBAL_LIST_EMPTY(antagonists) /datum/antagonist/proc/greet() if(!silent) to_chat(owner.current, span_big("You are \the [src].")) -<<<<<<< HEAD to_chat(owner.current, span_infoplain(span_doyourjobidiot("Remember that being an antagonist does not exclude you from the server rules regarding RP standards."))) //SKYRAT EDIT - RP REMINDER -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 play_stinger() /// Plays the antag stinger sound, if we have one diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index 42e8973a757..5f7a7e579d3 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -45,11 +45,7 @@ get_asset_datum(/datum/asset/simple/contracts), ) -<<<<<<< HEAD -/obj/item/antag_spawner/contract/ui_act(action, list/params) -======= /obj/item/antag_spawner/contract/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(used || polling || !ishuman(usr)) return diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm index c82c1741c74..b6f8d8cc9c0 100644 --- a/code/modules/antagonists/abductor/abductor.dm +++ b/code/modules/antagonists/abductor/abductor.dm @@ -16,14 +16,6 @@ /// Type path for the associated job datum. var/role_job = /datum/job/abductor_agent -<<<<<<< HEAD -/datum/antagonist/abductor/New() - // lets get the loading started now, but don't block waiting for it - INVOKE_ASYNC(SSmapping, TYPE_PROC_REF(/datum/controller/subsystem/mapping, lazy_load_template), LAZY_TEMPLATE_KEY_ABDUCTOR_SHIPS) - return ..() - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/antagonist/abductor/get_preview_icon() var/mob/living/carbon/human/dummy/consistent/scientist = new var/mob/living/carbon/human/dummy/consistent/agent = new @@ -165,11 +157,7 @@ ..() team_number = team_count++ name = "Mothership [pick(GLOB.greek_letters)]" //TODO Ensure unique and actual alieny names -<<<<<<< HEAD //add_objective(new /datum/objective/experiment) //SKYRAT EDIT REMOVAL -======= - add_objective(new /datum/objective/experiment) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/team/abductor_team/roundend_report() var/list/result = list() diff --git a/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm b/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm index ecb56ddf70c..25bbea66577 100644 --- a/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm +++ b/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm @@ -384,11 +384,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} /obj/item/melee/baton/abductor/proc/SleepAttack(mob/living/target, mob/living/user) playsound(src, on_stun_sound, 50, TRUE, -1) -<<<<<<< HEAD - if(target.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB)) -======= if(INCAPACITATED_IGNORING(target, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(target.can_block_magic(MAGIC_RESISTANCE_MIND)) to_chat(user, span_warning("The specimen has some kind of mental protection that is interfering with the sleep inducement! It seems you've been foiled.")) target.visible_message(span_danger("[user] tried to induced sleep in [target] with [src], but is unsuccessful!"), \ @@ -693,11 +689,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} /obj/item/abductor/alien_omnitool/proc/check_menu(mob/user) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated() || !user.Adjacent(src)) -======= if(user.incapacitated || !user.Adjacent(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index 05ba5c7f531..f4fe0fb1875 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -84,11 +84,7 @@ active_mind_control = FALSE return TRUE -<<<<<<< HEAD -/obj/item/organ/internal/heart/gland/Remove(mob/living/carbon/gland_owner, special, movement_flags) -======= /obj/item/organ/internal/heart/gland/mob_remove(mob/living/carbon/gland_owner, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() active = FALSE if(initial(uses) == 1) @@ -97,15 +93,8 @@ hud.remove_atom_from_hud(gland_owner) clear_mind_control() -<<<<<<< HEAD -/obj/item/organ/internal/heart/gland/Insert(mob/living/carbon/gland_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) - . = ..() - if(!.) - return -======= /obj/item/organ/internal/heart/gland/mob_insert(mob/living/carbon/gland_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(special != 2 && uses) // Special 2 means abductor surgery Start() diff --git a/code/modules/antagonists/ashwalker/ashwalker.dm b/code/modules/antagonists/ashwalker/ashwalker.dm index 9d169c9315d..eeba85982cd 100644 --- a/code/modules/antagonists/ashwalker/ashwalker.dm +++ b/code/modules/antagonists/ashwalker/ashwalker.dm @@ -27,11 +27,7 @@ /datum/antagonist/ashwalker/on_gain() . = ..() RegisterSignal(owner.current, COMSIG_MOB_EXAMINATE, PROC_REF(on_examinate)) -<<<<<<< HEAD //owner.teach_crafting_recipe(/datum/crafting_recipe/skeleton_key) //SKYRAT EDIT REMOVAL - ASH RITUALS -======= - owner.teach_crafting_recipe(/datum/crafting_recipe/skeleton_key) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(FACTION_NEUTRAL in owner.current.faction) owner.current.faction.Remove(FACTION_NEUTRAL) // ashwalkers aren't neutral; they're ashwalker-aligned diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 219d440c3dd..a90fde57635 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -137,16 +137,11 @@ brother1.dna.features["ethcolor"] = GLOB.color_list_ethereal["Faint Red"] brother1.set_species(/datum/species/ethereal) -<<<<<<< HEAD + brother2.dna.features["mcolor"] = "#E5CD99" // SKYRAT EDIT ADDITION - Customization brother2.dna.mutant_bodyparts["moth_antennae"] = list(MUTANT_INDEX_NAME = "Plain", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) // SKYRAT EDIT - Customization - ORIGINAL: brother2.dna.features["moth_antennae"] = "Plain" brother2.dna.mutant_bodyparts["moth_markings"] = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) // SKYRAT EDIT - Customization - ORIGINAL: brother2.dna.features["moth_markings"] = "None" brother2.dna.mutant_bodyparts["wings"] = list(MUTANT_INDEX_NAME = "Moth (Plain)", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) // SKYRAT EDIT - Customization - ORIGINAL: brother2.dna.features["moth_wings"] = "Plain" -======= - brother2.dna.features["moth_antennae"] = "Plain" - brother2.dna.features["moth_markings"] = "None" - brother2.dna.features["moth_wings"] = "Plain" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 brother2.set_species(/datum/species/moth) var/icon/brother1_icon = render_preview_outfit(/datum/outfit/job/quartermaster, brother1) diff --git a/code/modules/antagonists/changeling/cellular_emporium.dm b/code/modules/antagonists/changeling/cellular_emporium.dm index 01f7e0daf9d..754d2343d5c 100644 --- a/code/modules/antagonists/changeling/cellular_emporium.dm +++ b/code/modules/antagonists/changeling/cellular_emporium.dm @@ -69,11 +69,7 @@ return data -<<<<<<< HEAD -/datum/cellular_emporium/ui_act(action, params) -======= /datum/cellular_emporium/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 95577433281..950238b9e86 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -30,11 +30,7 @@ /// The original profile of this changeling. var/datum/changeling_profile/first_profile = null /// How many DNA strands the changeling can store for transformation. -<<<<<<< HEAD var/dna_max = 8 // SKYRAT EDIT - ORIGINAL: 6 -======= - var/dna_max = 6 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The amount of DNA gained. Includes DNA sting. var/absorbed_count = 0 /// The amount of DMA gained using absorb, not DNA sting. Start with one (your original DNA) @@ -52,15 +48,9 @@ /// Changeling name, what other lings see over the hivemind when talking. var/changelingID = "Changeling" /// The number of genetics points (to buy powers) this ling currently has. -<<<<<<< HEAD var/genetic_points = 15 // SKYRAT EDIT - ORIGINAL: 10 /// The max number of genetics points (to buy powers) this ling can have.. var/total_genetic_points = 15 // SKYRAT EDIT - ORIGINAL: 10 -======= - var/genetic_points = 10 - /// The max number of genetics points (to buy powers) this ling can have.. - var/total_genetic_points = 10 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// List of all powers we start with. var/list/innate_powers = list() /// Associated list of all powers we have evolved / bought from the emporium. [path] = [instance of path] @@ -96,11 +86,7 @@ var/static/list/slot2type = list( "head" = /obj/item/clothing/head/changeling, "wear_mask" = /obj/item/clothing/mask/changeling, -<<<<<<< HEAD "wear_neck" = /obj/item/changeling, // SKYRAT EDIT -======= - "wear_neck" = /obj/item/changeling, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "back" = /obj/item/changeling, "wear_suit" = /obj/item/clothing/suit/changeling, "w_uniform" = /obj/item/clothing/under/changeling, @@ -116,7 +102,6 @@ /// A list of all memories we've stolen through absorbs. var/list/stolen_memories = list() -<<<<<<< HEAD var/true_form_death //SKYRAT EDIT ADDITION: The time that the horror form died. // SKYRAT EDIT START @@ -142,10 +127,6 @@ "Friendly", ) // SKYRAT EDIT END -======= - /// Keeps track of the currently selected profile. - var/datum/changeling_profile/current_profile ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/antagonist/changeling/New() . = ..() @@ -159,10 +140,7 @@ /datum/antagonist/changeling/Destroy() QDEL_NULL(emporium_action) QDEL_NULL(cellular_emporium) -<<<<<<< HEAD -======= current_profile = null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /datum/antagonist/changeling/on_gain() @@ -583,12 +561,11 @@ // Clothes, of course new_profile.underwear = target.underwear -<<<<<<< HEAD + new_profile.underwear_color = target.underwear_color new_profile.undershirt = target.undershirt new_profile.socks = target.socks // SKYRAT EDIT ADDITION START new_profile.bra = target.bra - new_profile.underwear_color = target.underwear_color new_profile.undershirt_color = target.undershirt_color new_profile.socks_color = target.socks_color new_profile.bra_color = target.bra_color @@ -600,11 +577,6 @@ new_profile.target_body_scaling = target.get_mob_height() new_profile.target_size = target.mob_size //SKYRAT EDIT ADDITION END -======= - new_profile.underwear_color = target.underwear_color - new_profile.undershirt = target.undershirt - new_profile.socks = target.socks ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Grab skillchips they have new_profile.skillchips = target.clone_skillchip_list(TRUE) @@ -624,11 +596,7 @@ // Grab the target's sechut icon. new_profile.id_icon = target.wear_id?.get_sechud_job_icon_state() -<<<<<<< HEAD - var/list/slots = list("head", "wear_mask", "wear_neck", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store") // SKYRAT EDIT -======= var/list/slots = list("head", "wear_mask", "wear_neck", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/slot in slots) if(!(slot in target.vars)) continue @@ -644,7 +612,6 @@ new_profile.worn_icon_list[slot] = clothing_item.worn_icon new_profile.worn_icon_state_list[slot] = clothing_item.worn_icon_state new_profile.exists_list[slot] = 1 -<<<<<<< HEAD // SKYRAT EDIT ADDITION START new_profile.worn_icon_digi_list[slot] = clothing_item.worn_icon_digi new_profile.worn_icon_monkey_list[slot] = clothing_item.worn_icon_monkey @@ -652,8 +619,6 @@ new_profile.worn_icon_vox_list[slot] = clothing_item.worn_icon_vox new_profile.supports_variations_flags_list[slot] = clothing_item.supports_variations_flags // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new_profile.voice = target.voice new_profile.voice_filter = target.voice_filter @@ -673,11 +638,7 @@ if(!first_profile) first_profile = new_profile -<<<<<<< HEAD - current_profile = first_profile // SKYRAT EDIT -======= current_profile = first_profile ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 stored_profiles += new_profile absorbed_count++ @@ -828,11 +789,7 @@ var/static/list/slot2slot = list( "head" = ITEM_SLOT_HEAD, "wear_mask" = ITEM_SLOT_MASK, -<<<<<<< HEAD - "wear_neck" = ITEM_SLOT_NECK, // SKYRAT EDIT -======= "wear_neck" = ITEM_SLOT_NECK, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "back" = ITEM_SLOT_BACK, "wear_suit" = ITEM_SLOT_OCLOTHING, "w_uniform" = ITEM_SLOT_ICLOTHING, @@ -848,20 +805,15 @@ var/datum/dna/chosen_dna = chosen_profile.dna user.real_name = chosen_profile.name user.underwear = chosen_profile.underwear -<<<<<<< HEAD -======= user.underwear_color = chosen_profile.underwear_color ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.undershirt = chosen_profile.undershirt user.socks = chosen_profile.socks user.age = chosen_profile.age user.physique = chosen_profile.physique user.mind?.set_level(/datum/skill/athletics, chosen_profile.athletics_level, silent = TRUE) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START user.bra = chosen_profile.bra - user.underwear_color = chosen_profile.underwear_color user.undershirt_color = chosen_profile.undershirt_color user.socks_color = chosen_profile.socks_color user.bra_color = chosen_profile.bra_color @@ -888,8 +840,6 @@ user.add_quirk(target_quirk.type) break // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.voice = chosen_profile.voice user.voice_filter = chosen_profile.voice_filter @@ -898,11 +848,7 @@ for(var/obj/item/bodypart/limb as anything in user.bodyparts) limb.update_limb(is_creating = TRUE) -<<<<<<< HEAD user.updateappearance(mutcolor_update = TRUE, eyeorgancolor_update = TRUE) // SKYRAT EDIT -======= - user.updateappearance(mutcolor_update = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.domutcheck() // Get rid of any scars from previous Changeling-ing @@ -975,7 +921,6 @@ new_flesh_item.worn_icon = chosen_profile.worn_icon_list[slot] new_flesh_item.worn_icon_state = chosen_profile.worn_icon_state_list[slot] -<<<<<<< HEAD // SKYRAT EDIT START new_flesh_item.worn_icon_digi = chosen_profile.worn_icon_digi_list[slot] new_flesh_item.worn_icon_monkey = chosen_profile.worn_icon_monkey_list[slot] @@ -984,8 +929,6 @@ new_flesh_item.supports_variations_flags = chosen_profile.supports_variations_flags_list[slot] // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(istype(new_flesh_item, /obj/item/changeling/id) && chosen_profile.id_icon) var/obj/item/changeling/id/flesh_id = new_flesh_item flesh_id.hud_icon = chosen_profile.id_icon @@ -1003,7 +946,6 @@ user.regenerate_icons() user.name = user.get_visible_name() current_profile = chosen_profile -<<<<<<< HEAD // SKYRAT EDIT START chosen_dna.transfer_identity(user, TRUE) user.updateappearance(mutcolor_update = TRUE, eyeorgancolor_update = TRUE) @@ -1014,8 +956,6 @@ //this has to be at the end of the proc or it breaks everything below it, womp womp user.set_mob_height(chosen_profile.target_body_scaling) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Changeling profile themselves. Store a data to store what every DNA instance looked like. /datum/changeling_profile @@ -1045,11 +985,8 @@ var/list/worn_icon_state_list = list() /// The underwear worn by the profile source var/underwear -<<<<<<< HEAD -======= /// The colour of the underwear worn by the profile source var/underwear_color ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The undershirt worn by the profile source var/undershirt /// The socks worn by the profile source @@ -1075,17 +1012,10 @@ /// The TTS filter of the profile filter var/voice_filter = "" -<<<<<<< HEAD - -/datum/changeling_profile/Destroy() - qdel(dna) - LAZYCLEARLIST(stored_scars) -======= /datum/changeling_profile/Destroy() qdel(dna) LAZYCLEARLIST(stored_scars) QDEL_LAZYLIST(quirks) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /* @@ -1105,10 +1035,7 @@ new_profile.righthand_file_list = righthand_file_list.Copy() new_profile.inhand_icon_state_list = inhand_icon_state_list.Copy() new_profile.underwear = underwear -<<<<<<< HEAD -======= new_profile.underwear_color = underwear_color ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new_profile.undershirt = undershirt new_profile.socks = socks new_profile.worn_icon_list = worn_icon_list.Copy() @@ -1123,9 +1050,7 @@ new_profile.quirks = quirks.Copy() new_profile.voice = voice new_profile.voice_filter = voice_filter -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - new_profile.underwear_color = underwear_color new_profile.undershirt_color = undershirt_color new_profile.socks_color = socks_color new_profile.bra = bra @@ -1142,13 +1067,10 @@ new_profile.scream_type = scream_type new_profile.laugh_type = laugh_type // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/antagonist/changeling/roundend_report() var/list/parts = list() -<<<<<<< HEAD // SKYRAT EDIT REMOVAL START /* var/changeling_win = TRUE @@ -1156,11 +1078,6 @@ changeling_win = FALSE */ // SKYRAT EDIT REMOVAL END -======= - var/changeling_win = TRUE - if(!owner.current) - changeling_win = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 parts += printplayer(owner) parts += "Genomes Extracted: [absorbed_count]
" @@ -1168,7 +1085,6 @@ if(objectives.len) var/count = 1 for(var/datum/objective/objective in objectives) -<<<<<<< HEAD // SKYRAT EDIT START - No greentext /* if(!objective.check_completion()) @@ -1181,22 +1097,12 @@ // SKYRAT EDIT REMOVAL START - No greentext /* -======= - if(!objective.check_completion()) - changeling_win = FALSE - parts += "Objective #[count]: [objective.explanation_text] [objective.get_roundend_success_suffix()]" - count++ - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(changeling_win) parts += span_greentext("The changeling was successful!") else parts += span_redtext("The changeling has failed.") -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END - No greentext -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return parts.Join("
") diff --git a/code/modules/antagonists/changeling/changeling_power.dm b/code/modules/antagonists/changeling/changeling_power.dm index fc8bad84eb5..d06d8fe9173 100644 --- a/code/modules/antagonists/changeling/changeling_power.dm +++ b/code/modules/antagonists/changeling/changeling_power.dm @@ -99,11 +99,7 @@ the same goes for Remove(). if you override Remove(), call parent or else your p if(req_stat < user.stat) user.balloon_alert(user, "incapacitated!") return FALSE -<<<<<<< HEAD - if((HAS_TRAIT(user, TRAIT_DEATHCOMA)) && (!ignores_fakedeath)) -======= if(HAS_TRAIT(user, TRAIT_DEATHCOMA) && !ignores_fakedeath) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.balloon_alert(user, "playing dead!") return FALSE return TRUE diff --git a/code/modules/antagonists/changeling/headslug_eggs.dm b/code/modules/antagonists/changeling/headslug_eggs.dm index 955c0be0fef..75c0881c551 100644 --- a/code/modules/antagonists/changeling/headslug_eggs.dm +++ b/code/modules/antagonists/changeling/headslug_eggs.dm @@ -11,19 +11,11 @@ /// When this egg last got removed from a body. If -1, the egg hasn't been removed from a body. var/removal_time = -1 -<<<<<<< HEAD -/obj/item/organ/internal/body_egg/changeling_egg/Insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) - . = ..() - hatch_time = world.time + (removal_time == -1 ? EGG_INCUBATION_TIME : (hatch_time - removal_time)) - -/obj/item/organ/internal/body_egg/changeling_egg/Remove(mob/living/carbon/egg_owner, special, movement_flags) -======= /obj/item/organ/internal/body_egg/changeling_egg/mob_insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() hatch_time = world.time + (removal_time == -1 ? EGG_INCUBATION_TIME : (hatch_time - removal_time)) /obj/item/organ/internal/body_egg/changeling_egg/mob_remove(mob/living/carbon/egg_owner, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() removal_time = world.time diff --git a/code/modules/antagonists/changeling/powers/panacea.dm b/code/modules/antagonists/changeling/powers/panacea.dm index 0cd8bfca14f..9fe7613cc4c 100644 --- a/code/modules/antagonists/changeling/powers/panacea.dm +++ b/code/modules/antagonists/changeling/powers/panacea.dm @@ -12,20 +12,14 @@ to_chat(user, span_notice("We cleanse impurities from our form.")) ..() var/list/bad_organs = list( -<<<<<<< HEAD user.get_organ_by_type(/obj/item/organ/internal/empowered_borer_egg), // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.get_organ_by_type(/obj/item/organ/internal/body_egg), user.get_organ_by_type(/obj/item/organ/internal/legion_tumour), user.get_organ_by_type(/obj/item/organ/internal/zombie_infection), ) -<<<<<<< HEAD try_to_mutant_cure(user) //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/o in bad_organs) var/obj/item/organ/O = o diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm index 988a10b934d..e3cbab0eddd 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -47,13 +47,10 @@ return if(!isturf(user.loc)) return -<<<<<<< HEAD var/mob/living/carbon/human/to_check = target // SKYRAT EDIT START - STINGS DO NOT AFFECT ROBOTIC ENTITIES if(to_check.mob_biotypes & MOB_ROBOTIC) to_chat(user, "Our sting would have no effect on robotic entities") return // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!length(get_path_to(user, target, max_distance = changeling.sting_range, simulated_only = FALSE))) return // no path within the sting's range is found. what a weird place to use the pathfinding system if(IS_CHANGELING(target)) diff --git a/code/modules/antagonists/changeling/powers/transform.dm b/code/modules/antagonists/changeling/powers/transform.dm index 482a36fabff..1e1ef9e65d8 100644 --- a/code/modules/antagonists/changeling/powers/transform.dm +++ b/code/modules/antagonists/changeling/powers/transform.dm @@ -170,10 +170,6 @@ return ..() changeling.transform(user, chosen_prof) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SIGNAL(user, COMSIG_CHANGELING_TRANSFORM) return TRUE diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 3de98b50593..48afcd15f4c 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -79,11 +79,7 @@ return qdel(nullify_spell) BS = possible_spells[entered_spell_name] -<<<<<<< HEAD - if(QDELETED(src) || owner.incapacitated() || !BS || (rune && !(locate(/obj/effect/rune/empower) in range(1, owner))) || (length(spells) >= limit)) -======= if(QDELETED(src) || owner.incapacitated || !BS || (rune && !(locate(/obj/effect/rune/empower) in range(1, owner))) || (length(spells) >= limit)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return to_chat(owner,span_warning("You begin to carve unnatural symbols into your flesh!")) SEND_SOUND(owner, sound('sound/weapons/slice.ogg',0,1,10)) @@ -141,11 +137,7 @@ ..() /datum/action/innate/cult/blood_spell/IsAvailable(feedback = FALSE) -<<<<<<< HEAD - if(!IS_CULTIST(owner) || owner.incapacitated() || (!charges && deletes_on_empty)) -======= if(!IS_CULTIST(owner) || owner.incapacitated || (!charges && deletes_on_empty)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return ..() @@ -441,15 +433,6 @@ /obj/item/melee/blood_magic/stun/cast_spell(mob/living/target, mob/living/carbon/user) if(!istype(target) || IS_CULTIST(target)) return -<<<<<<< HEAD - var/datum/antagonist/cult/cultist = IS_CULTIST(user) - var/datum/team/cult/cult_team = cultist.get_team() - var/effect_coef = 1 - if(cult_team.cult_ascendent) - effect_coef = 0.1 - else if(cult_team.cult_risen) - effect_coef = 0.4 -======= var/datum/antagonist/cult/cultist = GET_CULTIST(user) var/datum/team/cult/cult_team = cultist?.get_team() var/effect_coef = 1 @@ -459,7 +442,6 @@ effect_coef = 0.4 if(IS_CULTIST(user) && isnull(GET_CULTIST(user))) effect_coef = 0.2 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.visible_message( span_warning("[user] holds up [user.p_their()] hand, which explodes in a flash of red light!"), span_cult_italic("You attempt to stun [target] with the spell!"), @@ -484,7 +466,6 @@ to_chat(user, span_warning("An eldritch force intervenes as you touch [target], absorbing most of the effects!")) to_chat(target, span_warning("As [user] touches you with vile magicks, the Mansus absorbs most of the effects!")) target.balloon_alert_to_viewers("absorbed!") -<<<<<<< HEAD // SKYRAT EDIT ADDITION START else if(IS_CLOCK(target)) to_chat(user, span_warning("Some force greater than you intervenes! [target] is protected by the heretic Ratvar!")) @@ -493,8 +474,6 @@ target.color = rgb(190, 135, 0) animate(target, color = old_color, time = 1 SECONDS, easing = EASE_IN) // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(target.can_block_magic()) to_chat(user, span_warning("The spell had no effect!")) else @@ -544,11 +523,7 @@ to_chat(user, span_warning("You must pick a valid rune!")) return var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to? -<<<<<<< HEAD - if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated() || !actual_selected_rune) -======= if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated || !actual_selected_rune) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/turf/dest = get_turf(actual_selected_rune) if(dest.is_blocked_turf(TRUE)) @@ -734,11 +709,7 @@ /obj/item/melee/blood_magic/construction/proc/check_menu(mob/user) if(!istype(user)) CRASH("The cult construct selection radial menu was accessed by something other than a valid user.") -<<<<<<< HEAD - if(user.incapacitated() || !user.Adjacent(src)) -======= if(user.incapacitated || !user.Adjacent(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -1004,11 +975,7 @@ /obj/item/melee/blood_magic/manipulator/proc/check_menu(mob/living/user) if(!istype(user)) CRASH("The Blood Rites manipulator radial menu was accessed by something other than a valid user.") -<<<<<<< HEAD - if(user.incapacitated() || !user.Adjacent(src)) -======= if(user.incapacitated || !user.Adjacent(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index f34c972bc9d..3d567799650 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -120,11 +120,7 @@ if(!team_member.current) continue team_member.current.update_mob_action_buttons() -<<<<<<< HEAD - if(team_member.current.incapacitated()) -======= if(team_member.current.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue SEND_SOUND(team_member.current, 'sound/hallucinations/im_here1.ogg') to_chat(team_member.current, span_cult_large("Acolyte [nominee] has asserted that [nominee.p_theyre()] worthy of leading the cult. A vote will be called shortly.")) @@ -133,31 +129,19 @@ ///Polls all Cultists on whether the person putting themselves forward should be made the Cult Leader, if they can actually be such. /proc/poll_cultists_for_leader(mob/living/nominee, datum/team/cult/team) -<<<<<<< HEAD - if(QDELETED(nominee) || nominee.incapacitated()) -======= if(QDELETED(nominee) || nominee.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 team.cult_vote_called = FALSE for(var/datum/mind/team_member as anything in team.members) if(!team_member.current) continue team_member.current.update_mob_action_buttons() -<<<<<<< HEAD - if(team_member.current.incapacitated()) -======= if(team_member.current.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue to_chat(team_member.current,span_cult_large("[nominee] has died in the process of attempting to start a vote!")) return FALSE var/list/mob/living/asked_cultists = list() for(var/datum/mind/team_member as anything in team.members) -<<<<<<< HEAD - if(!team_member.current || team_member.current == nominee || team_member.current.incapacitated()) -======= if(!team_member.current || team_member.current == nominee || team_member.current.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue SEND_SOUND(team_member.current, 'sound/magic/exit_blood.ogg') asked_cultists += team_member.current @@ -177,21 +161,13 @@ chat_text_border_icon = mutable_appearance('icons/effects/effects.dmi', "cult_master_logo") ) ) -<<<<<<< HEAD - if(QDELETED(nominee) || nominee.incapacitated()) -======= if(QDELETED(nominee) || nominee.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 team.cult_vote_called = FALSE for(var/datum/mind/team_member as anything in team.members) if(!team_member.current) continue team_member.current.update_mob_action_buttons() -<<<<<<< HEAD - if(team_member.current.incapacitated()) -======= if(team_member.current.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue to_chat(team_member.current,span_cult_large("[nominee] has died in the process of attempting to win the cult's support!")) return FALSE @@ -201,11 +177,7 @@ if(!team_member.current) continue team_member.current.update_mob_action_buttons() -<<<<<<< HEAD - if(team_member.current.incapacitated()) -======= if(team_member.current.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue to_chat(team_member.current,span_cult_large("[nominee] has gone catatonic in the process of attempting to win the cult's support!")) return FALSE @@ -215,11 +187,7 @@ if(!team_member.current) continue team_member.current.update_mob_action_buttons() -<<<<<<< HEAD - if(team_member.current.incapacitated()) -======= if(team_member.current.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue to_chat(team_member.current, span_cult_large("[nominee] could not win the cult's support and shall continue to serve as an acolyte.")) return FALSE diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index b3ea1165532..078b25ee663 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -218,11 +218,7 @@ Striking a noncultist, however, will tear their flesh."} // Get the heretic's new body and antag datum. trapped_entity = trapped_mind?.current trapped_entity.key = trapped_mind?.key -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_holder = IS_HERETIC(trapped_entity) -======= var/datum/antagonist/heretic/heretic_holder = GET_HERETIC(trapped_entity) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!heretic_holder) stack_trace("[soul_to_bind] in but not a heretic on the heretic soul blade.") @@ -383,11 +379,7 @@ Striking a noncultist, however, will tear their flesh."} worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "cultrobes" body_parts_covered = CHEST|GROIN|LEGS|ARMS -<<<<<<< HEAD - allowed = list(/obj/item/tome, /obj/item/melee/cultblade) -======= allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/melee/sickly_blade/cursed) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 armor_type = /datum/armor/hooded_cultrobes flags_inv = HIDEJUMPSUIT cold_protection = CHEST|GROIN|LEGS|ARMS @@ -487,11 +479,7 @@ Striking a noncultist, however, will tear their flesh."} armor_type = /datum/armor/cultrobes_hardened hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/hardened clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL -<<<<<<< HEAD flags_inv = HIDEGLOVES | HIDEJUMPSUIT | HIDETAIL // SKYRAT EDIT ADDITION - HIDETAIL -======= - flags_inv = HIDEGLOVES | HIDEJUMPSUIT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT resistance_flags = NONE @@ -608,10 +596,6 @@ Striking a noncultist, however, will tear their flesh."} /obj/item/clothing/suit/hooded/cultrobes/berserker name = "flagellant's robes" desc = "Blood-soaked robes infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage. Provides an even greater speed boost if its hood is worn." -<<<<<<< HEAD - allowed = list(/obj/item/tome, /obj/item/melee/cultblade) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 armor_type = /datum/armor/cultrobes_berserker slowdown = -0.3 //the hood gives an additional -0.3 if you have it flipped up, for a total of -0.6 hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/berserkerhood @@ -927,11 +911,7 @@ Striking a noncultist, however, will tear their flesh."} cultists |= cult_mind.current var/mob/living/cultist_to_receive = tgui_input_list(user, "Who do you wish to call to [src]?", "Followers of the Geometer", (cultists - user)) -<<<<<<< HEAD - if(QDELETED(src) || loc != user || user.incapacitated()) -======= if(QDELETED(src) || loc != user || user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ITEM_INTERACT_BLOCKING if(isnull(cultist_to_receive)) to_chat(user, span_cult_italic("You require a destination!")) @@ -1299,10 +1279,6 @@ Striking a noncultist, however, will tear their flesh."} return FALSE /obj/item/shield/mirror/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) -<<<<<<< HEAD - var/turf/impact_turf = get_turf(hit_atom) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isliving(hit_atom)) var/mob/living/target = hit_atom @@ -1315,20 +1291,9 @@ Striking a noncultist, however, will tear their flesh."} return if(!..()) target.Paralyze(30) -<<<<<<< HEAD - var/mob/thrower = throwingdatum?.get_thrower() - if(thrower) - for(var/mob/living/Next in orange(2, impact_turf)) - if(!Next.density || IS_CULTIST(Next)) - continue - throw_at(Next, 3, 1, thrower) - return - throw_at(thrower, 7, 1, null) -======= new /obj/effect/temp_visual/cult/sparks(target) playsound(target, 'sound/effects/glassbr3.ogg', 100) qdel(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else ..() diff --git a/code/modules/antagonists/cult/cult_objectives.dm b/code/modules/antagonists/cult/cult_objectives.dm index 83add470461..8a4bf74dec8 100644 --- a/code/modules/antagonists/cult/cult_objectives.dm +++ b/code/modules/antagonists/cult/cult_objectives.dm @@ -20,25 +20,19 @@ var/datum/team/cult/cult = team var/list/target_candidates = list() for(var/mob/living/carbon/human/player in GLOB.player_list) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Players in the interlink can't be obsession targets if(SSticker.IsRoundInProgress() && istype(get_area(player), /area/centcom/interlink)) continue // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(player.mind && !player.mind.has_antag_datum(/datum/antagonist/cult) && !is_convertable_to_cult(player) && player.stat != DEAD) target_candidates += player.mind if(target_candidates.len == 0) message_admins("Cult Sacrifice: Could not find unconvertible target, checking for convertible target.") for(var/mob/living/carbon/human/player in GLOB.player_list) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Players in the interlink can't be obsession targets if(SSticker.IsRoundInProgress() && istype(get_area(player), /area/centcom/interlink)) continue // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(player.mind && !player.mind.has_antag_datum(/datum/antagonist/cult) && player.stat != DEAD) target_candidates += player.mind list_clear_nulls(target_candidates) diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index ba44cd290ea..773f890d25d 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -201,11 +201,7 @@ * Returns TRUE if the user is a living mob that is a cultist and is not incapacitated. */ /obj/structure/destructible/cult/item_dispenser/proc/check_menu(mob/user) -<<<<<<< HEAD - return isliving(user) && is_cultist_check(user) && !user.incapacitated() -======= return isliving(user) && is_cultist_check(user) && !user.incapacitated ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Spooky looking door used in gateways. Or something. /obj/effect/gateway diff --git a/code/modules/antagonists/cult/datums/cult_team.dm b/code/modules/antagonists/cult/datums/cult_team.dm index 29bb2dd35fe..5d060f4042c 100644 --- a/code/modules/antagonists/cult/datums/cult_team.dm +++ b/code/modules/antagonists/cult/datums/cult_team.dm @@ -65,11 +65,7 @@ for(var/datum/mind/mind as anything in members) if(mind.current) SEND_SOUND(mind.current, 'sound/ambience/antag/bloodcult/bloodcult_halos.ogg') -<<<<<<< HEAD - to_chat(mind.current, span_cult_large(span_warning("Your cult is ascendent and the red harvest approaches - you cannot hide your true nature for much longer!!"))) -======= to_chat(mind.current, span_cult_large(span_warning("Your cult is ascendant and the red harvest approaches - you cannot hide your true nature for much longer!!"))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mind.current.AddElement(/datum/element/cult_halo) cult_ascendent = TRUE log_game("The blood cult has ascended with [cultplayers] players.") @@ -138,10 +134,6 @@ return "
[parts.Join("
")]
" /datum/team/cult/proc/is_sacrifice_target(datum/mind/mind) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/objective/sacrifice/sac_objective in objectives) if(mind == sac_objective.target) return TRUE diff --git a/code/modules/antagonists/cult/datums/cultist.dm b/code/modules/antagonists/cult/datums/cultist.dm index a4c799e150c..f56d79a8f4b 100644 --- a/code/modules/antagonists/cult/datums/cultist.dm +++ b/code/modules/antagonists/cult/datums/cultist.dm @@ -281,7 +281,3 @@ ///Used to check if the owner is counted as a secondary invoker for runes. /datum/antagonist/cult/proc/check_invoke_validity() return TRUE -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 3c13378ba9e..d0e20c765bf 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -200,10 +200,7 @@ structure_check() searches for nearby cultist structures required for the invoca invocation = "Ra'sha yoka!" invoke_damage = 30 can_be_scribed = FALSE -<<<<<<< HEAD -======= var/randomized = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/rune/malformed/Initialize(mapload, set_keyword) . = ..() @@ -212,10 +209,6 @@ structure_check() searches for nearby cultist structures required for the invoca icon_state = "[rand(1,7)]" color = rgb(rand(0,255), rand(0,255), rand(0,255)) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/rune/malformed/invoke(list/invokers) ..() qdel(src) @@ -518,11 +511,7 @@ structure_check() searches for nearby cultist structures required for the invoca fail_invoke() return var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to? -<<<<<<< HEAD - if(!Adjacent(user) || QDELETED(src) || user.incapacitated() || !actual_selected_rune) -======= if(!Adjacent(user) || QDELETED(src) || user.incapacitated || !actual_selected_rune) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fail_invoke() return @@ -856,11 +845,7 @@ GLOBAL_VAR_INIT(narsie_summon_count, 0) return var/mob/living/cultist_to_summon = tgui_input_list(user, "Who do you wish to call to [src]?", "Followers of the Geometer", cultists) var/fail_logmsg = "Summon Cultist rune activated by [user] at [COORD(src)] failed - " -<<<<<<< HEAD - if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) -======= if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(isnull(cultist_to_summon)) to_chat(user, "You require a summoning target!") diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index 982520a0f13..bf9179a0e19 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -290,8 +290,6 @@ name = "Frontier Militia General" outfit = /datum/outfit/centcom/militia/general role = "General" -<<<<<<< HEAD -======= /datum/antagonist/ert/medical_commander role = "Chief EMT" @@ -302,4 +300,3 @@ role = "Emergency Medical Technician" outfit = /datum/outfit/centcom/ert/medical_technician plasmaman_outfit = /datum/outfit/plasmaman/medical_technician ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm index 5a74c958a63..c6e6916a9bf 100644 --- a/code/modules/antagonists/heretic/heretic_antag.dm +++ b/code/modules/antagonists/heretic/heretic_antag.dm @@ -34,11 +34,7 @@ /// The path our heretic has chosen. Mostly used for flavor. var/heretic_path = PATH_START /// A sum of how many knowledge points this heretic CURRENTLY has. Used to research. -<<<<<<< HEAD var/knowledge_points = 2 //SKYRAT EDIT - ORIGINAL 1 -======= - var/knowledge_points = 1 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The time between gaining influence passively. The heretic gain +1 knowledge points every this duration of time. var/passive_gain_timer = 20 MINUTES /// Assoc list of [typepath] = [knowledge instance]. A list of all knowledge this heretic's reserached. @@ -222,11 +218,7 @@ return data -<<<<<<< HEAD -/datum/antagonist/heretic/ui_act(action, params) -======= /datum/antagonist/heretic/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -656,11 +648,7 @@ /datum/antagonist/heretic/roundend_report() var/list/parts = list() -<<<<<<< HEAD //var/succeeded = TRUE // SKYRAT EDIT REMOVAL -======= - var/succeeded = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 parts += printplayer(owner) parts += "Sacrifices Made: [total_sacrifices]" @@ -668,7 +656,6 @@ if(length(objectives)) var/count = 1 for(var/datum/objective/objective as anything in objectives) -<<<<<<< HEAD // SKYRAT EDIT START - No greentext /* if(!objective.check_completion()) @@ -681,12 +668,6 @@ // SKYRAT EDIT START - No greentext /* -======= - if(!objective.check_completion()) - succeeded = FALSE - parts += "Objective #[count]: [objective.explanation_text] [objective.get_roundend_success_suffix()]" - count++ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(feast_of_owls) parts += span_greentext("Ascension Forsaken") if(ascended) @@ -697,11 +678,8 @@ parts += span_greentext("The heretic was successful, but did not ascend!") else parts += span_redtext("The heretic has failed.") -<<<<<<< HEAD */ // SKYRAT EDIT END - No greentext -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 parts += "Knowledge Researched: " diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm index 2b9ce6a09de..94ecc0f9d77 100644 --- a/code/modules/antagonists/heretic/heretic_knowledge.dm +++ b/code/modules/antagonists/heretic/heretic_knowledge.dm @@ -676,11 +676,7 @@ return !was_completed /datum/heretic_knowledge/knowledge_ritual/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) -<<<<<<< HEAD - var/datum/antagonist/heretic/our_heretic = IS_HERETIC(user) -======= var/datum/antagonist/heretic/our_heretic = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 our_heretic.knowledge_points += KNOWLEDGE_RITUAL_POINTS was_completed = TRUE @@ -726,11 +722,7 @@ return TRUE /datum/heretic_knowledge/ultimate/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!can_be_invoked(heretic_datum)) return FALSE @@ -751,11 +743,7 @@ return (sacrifice.stat == DEAD) && !ismonkey(sacrifice) /datum/heretic_knowledge/ultimate/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 heretic_datum.ascended = TRUE // Show the cool red gradiant in our UI diff --git a/code/modules/antagonists/heretic/heretic_living_heart.dm b/code/modules/antagonists/heretic/heretic_living_heart.dm index b8d188fbe53..3e8f39fef4f 100644 --- a/code/modules/antagonists/heretic/heretic_living_heart.dm +++ b/code/modules/antagonists/heretic/heretic_living_heart.dm @@ -104,11 +104,7 @@ return ..() /datum/action/cooldown/track_target/Activate(atom/target) -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(owner) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(owner) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/heretic_knowledge/sac_knowledge = heretic_datum.get_knowledge(/datum/heretic_knowledge/hunt_and_sacrifice) if(!LAZYLEN(heretic_datum.sac_targets)) owner.balloon_alert(owner, "no targets, visit a rune!") diff --git a/code/modules/antagonists/heretic/influences.dm b/code/modules/antagonists/heretic/influences.dm index f22ad766df0..05dd86ebaeb 100644 --- a/code/modules/antagonists/heretic/influences.dm +++ b/code/modules/antagonists/heretic/influences.dm @@ -62,14 +62,10 @@ tracked_heretics |= heretic // If our heretic's on station, generate some new influences -<<<<<<< HEAD //SKYRAT EDIT START var/area/heretic_area = get_area(heretic.current) if(ishuman(heretic.current) && (!(is_centcom_level(heretic.current.z)) || istype(heretic_area, /area/centcom/interlink)) || istype(heretic_area, /area/shuttle/arrival)) //SKYRAT EDIT END -======= - if(ishuman(heretic.current) && !is_centcom_level(heretic.current.z)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 generate_new_influences() /** @@ -237,11 +233,7 @@ // We don't need to set being_drained back since we delete after anyways loc.balloon_alert(user, "influence drained") -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 heretic_datum.knowledge_points += knowledge_to_gain // Aaand now we delete it diff --git a/code/modules/antagonists/heretic/items/forbidden_book.dm b/code/modules/antagonists/heretic/items/forbidden_book.dm index 22f8bde7547..2591a1fd752 100644 --- a/code/modules/antagonists/heretic/items/forbidden_book.dm +++ b/code/modules/antagonists/heretic/items/forbidden_book.dm @@ -47,11 +47,7 @@ update_weight_class(WEIGHT_CLASS_NORMAL) /obj/item/codex_cicatrix/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!heretic_datum) return NONE if(isopenturf(interacting_with)) diff --git a/code/modules/antagonists/heretic/items/heretic_blades.dm b/code/modules/antagonists/heretic/items/heretic_blades.dm index 2d90b4311fb..4d2636fa19e 100644 --- a/code/modules/antagonists/heretic/items/heretic_blades.dm +++ b/code/modules/antagonists/heretic/items/heretic_blades.dm @@ -10,10 +10,7 @@ inhand_x_dimension = 64 inhand_y_dimension = 64 obj_flags = CONDUCTS_ELECTRICITY -<<<<<<< HEAD -======= slot_flags = ITEM_SLOT_BELT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sharpness = SHARP_EDGED w_class = WEIGHT_CLASS_NORMAL force = 20 @@ -233,11 +230,7 @@ /obj/item/melee/sickly_blade/cursed/interact_with_atom(atom/target, mob/living/user, list/modifiers) . = ..() -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!heretic_datum) return NONE diff --git a/code/modules/antagonists/heretic/knowledge/ash_lore.dm b/code/modules/antagonists/heretic/knowledge/ash_lore.dm index cece495e9ef..315bb14b664 100644 --- a/code/modules/antagonists/heretic/knowledge/ash_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/ash_lore.dm @@ -30,11 +30,7 @@ name = "Nightwatcher's Secret" desc = "Opens up the Path of Ash to you. \ Allows you to transmute a match and a knife into an Ashen Blade. \ -<<<<<<< HEAD You can only create five at a time." //SKYRAT EDIT two to five -======= - You can only create two at a time." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gain_text = "The City Guard know their watch. If you ask them at night, they may tell you about the ashy lantern." next_knowledge = list(/datum/heretic_knowledge/ashen_grasp) required_atoms = list( diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm index 0d0484eb9a1..55db187ee73 100644 --- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm @@ -147,11 +147,7 @@ if(!riposte_ready) return -<<<<<<< HEAD - if(source.incapacitated(IGNORE_GRAB)) -======= if(INCAPACITATED_IGNORING(source, INCAPABLE_GRAB)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/mob/living/attacker = hitby.loc diff --git a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm index 7ac47946eb4..dfc8aa39bef 100644 --- a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm @@ -70,11 +70,7 @@ /datum/heretic_knowledge/spell/cosmic_runes name = "Cosmic Runes" -<<<<<<< HEAD - desc = "Grants you Cosmic Runes, a spell that creates two runes linked with eachother for easy teleportation. \ -======= desc = "Grants you Cosmic Runes, a spell that creates two runes linked with each other for easy teleportation. \ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Only the entity activating the rune will get transported, and it can be used by anyone without a star mark. \ However, people with a star mark will get transported along with another person using the rune." gain_text = "The distant stars crept into my dreams, roaring and screaming without reason. \ diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm index fc67481b3b4..ad9e1552708 100644 --- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm @@ -34,11 +34,7 @@ name = "Principle of Hunger" desc = "Opens up the Path of Flesh to you. \ Allows you to transmute a knife and a pool of blood into a Bloody Blade. \ -<<<<<<< HEAD - You can only create twenty at a time." //SKYRAT EDIT three to twenty -======= - You can only create three at a time." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + You can create upto twenty at a time." //SKYRAT EDIT three to twenty gain_text = "Hundreds of us starved, but not me... I found strength in my greed." next_knowledge = list(/datum/heretic_knowledge/limited_amount/flesh_grasp) required_atoms = list( @@ -46,7 +42,7 @@ /obj/effect/decal/cleanable/blood = 1, ) result_atoms = list(/obj/item/melee/sickly_blade/flesh) - limit = 3 // Bumped up so they can arm up their ghouls too. + limit = 20 // Bumped up so they can arm up their ghouls too. route = PATH_FLESH research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi' research_tree_icon_state = "flesh_blade" @@ -341,11 +337,7 @@ worm_spell.Grant(user) -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/heretic_knowledge/limited_amount/flesh_grasp/grasp_ghoul = heretic_datum.get_knowledge(/datum/heretic_knowledge/limited_amount/flesh_grasp) grasp_ghoul.limit *= 3 var/datum/heretic_knowledge/limited_amount/flesh_ghoul/ritual_ghoul = heretic_datum.get_knowledge(/datum/heretic_knowledge/limited_amount/flesh_ghoul) diff --git a/code/modules/antagonists/heretic/knowledge/general_side.dm b/code/modules/antagonists/heretic/knowledge/general_side.dm index fe7493651da..10ff108c5f8 100644 --- a/code/modules/antagonists/heretic/knowledge/general_side.dm +++ b/code/modules/antagonists/heretic/knowledge/general_side.dm @@ -18,11 +18,7 @@ /datum/heretic_knowledge/reroll_targets/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Check first if they have a Living Heart. If it's missing, we should // throw a fail to show the heretic that there's no point in rerolling // if you don't have a heart to track the targets in the first place. @@ -33,11 +29,7 @@ return TRUE /datum/heretic_knowledge/reroll_targets/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/mob/living/carbon/human/target as anything in heretic_datum.sac_targets) heretic_datum.remove_sacrifice_target(target) diff --git a/code/modules/antagonists/heretic/knowledge/lock_lore.dm b/code/modules/antagonists/heretic/knowledge/lock_lore.dm index a1d3ffcbd08..90e6282fbd1 100644 --- a/code/modules/antagonists/heretic/knowledge/lock_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/lock_lore.dm @@ -247,12 +247,7 @@ // buffs var/datum/action/cooldown/spell/shapeshift/eldritch/ascension/transform_spell = new(user.mind) transform_spell.Grant(user) - -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/heretic_knowledge/blade_upgrade/flesh/lock/blade_upgrade = heretic_datum.get_knowledge(/datum/heretic_knowledge/blade_upgrade/flesh/lock) blade_upgrade.chance += 30 new /obj/structure/lock_tear(loc, user.mind) diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm index 00c676939c9..8c5a4587928 100644 --- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm @@ -198,11 +198,7 @@ /datum/heretic_knowledge/spell/entropic_plume/on_gain(mob/user) . = ..() -<<<<<<< HEAD - var/datum/antagonist/heretic/our_heretic = IS_HERETIC(user) -======= var/datum/antagonist/heretic/our_heretic = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 our_heretic.increase_rust_strength(TRUE) /datum/heretic_knowledge/ultimate/rust_final diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm index 423b577250d..4b3525c93b0 100644 --- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm +++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm @@ -66,11 +66,7 @@ CRASH("Failed to lazy load heretic sacrifice template!") /datum/heretic_knowledge/hunt_and_sacrifice/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // First we have to check if the heretic has a Living Heart. // You may wonder why we don't straight up prevent them from invoking the ritual if they don't have one - // Hunt and sacrifice should always be invokable for clarity's sake, even if it'll fail immediately. @@ -79,11 +75,7 @@ return FALSE // We've got no targets set, let's try to set some. -<<<<<<< HEAD - // If we recently failed to aquire targets, we will be unable to aquire any. -======= // If we recently failed to acquire targets, we will be unable to acquire any. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!LAZYLEN(heretic_datum.sac_targets)) atoms += user return TRUE @@ -107,11 +99,7 @@ return FALSE /datum/heretic_knowledge/hunt_and_sacrifice/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Force it to work if the sacrifice is a cultist, even if there's no targets. var/mob/living/carbon/human/sac = selected_atoms[1] if(!LAZYLEN(heretic_datum.sac_targets) && !IS_CULTIST(sac)) @@ -201,19 +189,11 @@ * Arguments * * user - the mob doing the sacrifice (a heretic) * * selected_atoms - a list of all atoms chosen. Should be (at least) one human. -<<<<<<< HEAD - * * loc - the turf the sacrifice is occuring on - */ -/datum/heretic_knowledge/hunt_and_sacrifice/proc/sacrifice_process(mob/living/user, list/selected_atoms, turf/loc) - - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= * * loc - the turf the sacrifice is occurring on */ /datum/heretic_knowledge/hunt_and_sacrifice/proc/sacrifice_process(mob/living/user, list/selected_atoms, turf/loc) var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/carbon/human/sacrifice = locate() in selected_atoms if(!sacrifice) CRASH("[type] sacrifice_process didn't have a human in the atoms list. How'd it make it so far?") @@ -227,11 +207,7 @@ var/feedback = "Your patrons accept your offer" var/sac_job_flag = sacrifice.mind?.assigned_role?.job_flags | sacrifice.last_mind?.assigned_role?.job_flags -<<<<<<< HEAD - var/datum/antagonist/cult/cultist_datum = IS_CULTIST(sacrifice) -======= var/datum/antagonist/cult/cultist_datum = GET_CULTIST(sacrifice) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Heads give 3 points, cultists give 1 point (and a special reward), normal sacrifices give 2 points. heretic_datum.total_sacrifices++ if((sac_job_flag & JOB_HEAD_OF_STAFF)) @@ -284,11 +260,7 @@ sacrifice.dust(TRUE, TRUE) // Increase reward counter -<<<<<<< HEAD - var/datum/antagonist/heretic/antag = IS_HERETIC(user) -======= var/datum/antagonist/heretic/antag = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 antag.rewards_given++ // Cool effect for the rune as well as the item @@ -310,11 +282,7 @@ // Remove the outline, we don't need it anymore. rune?.remove_filter("reward_outline") playsound(loc, 'sound/magic/repulse.ogg', 75, TRUE) -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ASSERT(heretic_datum) // This list will be almost identical to unlocked_heretic_items, with the same keys, the difference being the values will be 1 to 5. var/list/rewards = heretic_datum.unlocked_heretic_items.Copy() @@ -450,22 +418,6 @@ usable_organs -= /obj/item/organ/internal/lungs/corrupt // Their lungs are already more cursed than anything I could give them var/total_implant = rand(2, 4) -<<<<<<< HEAD - var/gave_any = FALSE - - for (var/i in 1 to total_implant) - if (!length(usable_organs)) - break - var/organ_path = pick_n_take(usable_organs) - var/obj/item/organ/internal/to_give = new organ_path - if (!to_give.Insert(sac_target)) - qdel(to_give) - else - gave_any = TRUE - - if (!gave_any) - return -======= for (var/i in 1 to total_implant) if (!length(usable_organs)) @@ -473,7 +425,6 @@ var/organ_path = pick_n_take(usable_organs) var/obj/item/organ/internal/to_give = new organ_path to_give.Insert(sac_target) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new /obj/effect/gibspawner/human/bodypartless(get_turf(sac_target)) sac_target.visible_message(span_boldwarning("Several organs force themselves out of [sac_target]!")) diff --git a/code/modules/antagonists/heretic/knowledge/starting_lore.dm b/code/modules/antagonists/heretic/knowledge/starting_lore.dm index 94b496e2649..ad48bb8fee3 100644 --- a/code/modules/antagonists/heretic/knowledge/starting_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/starting_lore.dm @@ -107,11 +107,7 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge()) return TRUE /datum/heretic_knowledge/living_heart/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) -<<<<<<< HEAD - var/datum/antagonist/heretic/our_heretic = IS_HERETIC(user) -======= var/datum/antagonist/heretic/our_heretic = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/organ/our_living_heart = user.get_organ_slot(our_heretic.living_heart_organ_slot) // Obviously you need a heart in your chest to do a ritual on your... heart if(!our_living_heart) @@ -149,11 +145,7 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge()) return FALSE /datum/heretic_knowledge/living_heart/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) -<<<<<<< HEAD - var/datum/antagonist/heretic/our_heretic = IS_HERETIC(user) -======= var/datum/antagonist/heretic/our_heretic = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/organ/our_new_heart = user.get_organ_slot(our_heretic.living_heart_organ_slot) // Our heart is robotic or synthetic - we need to replace it, and we fortunately should have one by here @@ -327,11 +319,7 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge()) var/alert = tgui_alert(user,"Do you really want to forsake your ascension? This action cannot be reverted.", "Feast of Owls", list("Yes I'm sure", "No"), 30 SECONDS) if(alert != "Yes I'm sure" || QDELETED(user) || QDELETED(src) || get_dist(user, loc) > 2) return FALSE -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(heretic_datum) || heretic_datum.feast_of_owls) return FALSE diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm index f7bceebc32a..51f0146fca3 100644 --- a/code/modules/antagonists/heretic/knowledge/void_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm @@ -30,11 +30,7 @@ name = "Glimmer of Winter" desc = "Opens up the Path of Void to you. \ Allows you to transmute a knife in sub-zero temperatures into a Void Blade. \ -<<<<<<< HEAD You can only create five at a time." //SKYRAT EDIT two to five -======= - You can only create two at a time." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gain_text = "I feel a shimmer in the air, the air around me gets colder. \ I start to realize the emptiness of existence. Something's watching me." next_knowledge = list(/datum/heretic_knowledge/void_grasp) diff --git a/code/modules/antagonists/heretic/magic/shadow_cloak.dm b/code/modules/antagonists/heretic/magic/shadow_cloak.dm index 35dde09a828..ad942c71a32 100644 --- a/code/modules/antagonists/heretic/magic/shadow_cloak.dm +++ b/code/modules/antagonists/heretic/magic/shadow_cloak.dm @@ -28,14 +28,10 @@ return ..() /datum/action/cooldown/spell/shadow_cloak/is_valid_target(atom/cast_on) -<<<<<<< HEAD - return isliving(cast_on) && !HAS_TRAIT(cast_on, TRAIT_HULK) // Hulks are not stealthy. Need not apply -======= if(HAS_TRAIT(cast_on, TRAIT_HULK)) // Hulks are not stealthy. Need not apply cast_on.balloon_alert(cast_on, "cannot cast while hulk!") return FALSE return isliving(cast_on) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/shadow_cloak/before_cast(mob/living/cast_on) . = ..() diff --git a/code/modules/antagonists/heretic/status_effects/mark_effects.dm b/code/modules/antagonists/heretic/status_effects/mark_effects.dm index 5be5ece16be..b647ba6ca80 100644 --- a/code/modules/antagonists/heretic/status_effects/mark_effects.dm +++ b/code/modules/antagonists/heretic/status_effects/mark_effects.dm @@ -50,11 +50,7 @@ playsound(owner, 'sound/magic/repulse.ogg', 75, TRUE) qdel(src) //what happens when this is procced. -<<<<<<< HEAD -//Each mark has diffrent effects when it is destroyed that combine with the mansus grasp effect. -======= //Each mark has different effects when it is destroyed that combine with the mansus grasp effect. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // MARK OF FLESH @@ -288,9 +284,5 @@ . = ..() UnregisterSignal (owner, COMSIG_MOB_APPLY_DAMAGE) -<<<<<<< HEAD - // Incase the trait was not removed earlier -======= // In case the trait was not removed earlier ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 REMOVE_TRAIT(owner, TRAIT_PACIFISM, id) diff --git a/code/modules/antagonists/heretic/structures/lock_final.dm b/code/modules/antagonists/heretic/structures/lock_final.dm index d28ee4e948a..5512d6027ee 100644 --- a/code/modules/antagonists/heretic/structures/lock_final.dm +++ b/code/modules/antagonists/heretic/structures/lock_final.dm @@ -1,10 +1,6 @@ /obj/structure/lock_tear name = "???" -<<<<<<< HEAD - desc = "It stares back. Theres no reason to remain. Run." -======= desc = "It stares back. There's no reason to remain. Run." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 max_integrity = INFINITE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF icon = 'icons/obj/anomaly.dmi' diff --git a/code/modules/antagonists/heretic/transmutation_rune.dm b/code/modules/antagonists/heretic/transmutation_rune.dm index 5232b5a9ea9..f99caf71826 100644 --- a/code/modules/antagonists/heretic/transmutation_rune.dm +++ b/code/modules/antagonists/heretic/transmutation_rune.dm @@ -50,11 +50,7 @@ /obj/effect/heretic_rune/proc/try_rituals(mob/living/user) is_in_use = TRUE -<<<<<<< HEAD - var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) -======= var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/rituals = heretic_datum.get_rituals() if(!length(rituals)) loc.balloon_alert(user, "no rituals available!") @@ -236,12 +232,11 @@ . = ..() set_greyscale(colors = list(path_colour)) icon_state = animation_state -<<<<<<< HEAD -======= + var/image/silicon_image = image(icon = 'icons/effects/eldritch.dmi', icon_state = null, loc = src) silicon_image.override = TRUE add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "heretic_rune", silicon_image) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + /obj/effect/temp_visual/drawing_heretic_rune/fast duration = 12 SECONDS diff --git a/code/modules/antagonists/malf_ai/malf_ai.dm b/code/modules/antagonists/malf_ai/malf_ai.dm index c49383718f9..be9a63d86e7 100644 --- a/code/modules/antagonists/malf_ai/malf_ai.dm +++ b/code/modules/antagonists/malf_ai/malf_ai.dm @@ -35,17 +35,12 @@ owner.special_role = job_rank if(give_objectives) forge_ai_objectives() -<<<<<<< HEAD // SKYRAT EDIT START - Moving voice changing to Malf only #ifdef AI_VOX var/mob/living/silicon/ai/malf_ai = owner.current malf_ai.vox_voices += VOX_MIL #endif // SKYRAT EDIT END - - employer = pick(GLOB.ai_employers) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!employer) employer = pick(GLOB.ai_employers) @@ -66,15 +61,12 @@ var/mob/living/silicon/ai/malf_ai = owner.current malf_ai.set_zeroth_law("") malf_ai.remove_malf_abilities() -<<<<<<< HEAD // SKYRAT EDIT START - Moving voice changing to Malf only #ifdef AI_VOX malf_ai.vox_voices -= VOX_MIL malf_ai.vox_type = VOX_NORMAL #endif // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 QDEL_NULL(malf_ai.malf_picker) owner.special_role = null @@ -103,11 +95,7 @@ /// Generates a special objective and adds it to the objective list. /datum/antagonist/malf_ai/proc/forge_special_objective() -<<<<<<< HEAD var/special_pick = rand(3,4) // SKYRAT EDIT - REMOVING PURGE/BLOCK -======= - var/special_pick = rand(1,4) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(special_pick) if(1) var/datum/objective/block/block_objective = new @@ -231,11 +219,7 @@ return data -<<<<<<< HEAD -/datum/antagonist/malf_ai/ui_act(action, list/params) -======= /datum/antagonist/malf_ai/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -264,11 +248,7 @@ /datum/antagonist/malf_ai/roundend_report() var/list/result = list() -<<<<<<< HEAD - //var/malf_ai_won = TRUE // SKYRAT EDIT REMOVAL -======= var/malf_ai_won = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 result += printplayer(owner) @@ -276,29 +256,13 @@ if(objectives.len) //If the traitor had no objectives, don't need to process this. var/count = 1 for(var/datum/objective/objective in objectives) -<<<<<<< HEAD - // SKYRAT EDIT START - No greentext - /* if(!objective.check_completion()) malf_ai_won = FALSE objectives_text += "
Objective #[count]: [objective.explanation_text] [objective.get_roundend_success_suffix()]" - */ - objectives_text += "
Objective #[count]: [objective.explanation_text]" - // SKYRAT EDIT END - No greentext -======= - if(!objective.check_completion()) - malf_ai_won = FALSE - objectives_text += "
Objective #[count]: [objective.explanation_text] [objective.get_roundend_success_suffix()]" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 count++ result += objectives_text -<<<<<<< HEAD - // SKYRAT EDIT REMOVAL START - /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/special_role_text = LOWER_TEXT(name) if(malf_ai_won) @@ -306,10 +270,6 @@ else result += span_redtext("The [special_role_text] has failed!") SEND_SOUND(owner.current, 'sound/ambience/ambifailure.ogg') -<<<<<<< HEAD - */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return result.Join("
") diff --git a/code/modules/antagonists/malf_ai/malf_ai_module_picker.dm b/code/modules/antagonists/malf_ai/malf_ai_module_picker.dm index 092d1cc4fef..5e95e11c41b 100644 --- a/code/modules/antagonists/malf_ai/malf_ai_module_picker.dm +++ b/code/modules/antagonists/malf_ai/malf_ai_module_picker.dm @@ -62,11 +62,7 @@ return data -<<<<<<< HEAD -/datum/module_picker/ui_act(action, list/params) -======= /datum/module_picker/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/antagonists/malf_ai/malf_ai_modules.dm b/code/modules/antagonists/malf_ai/malf_ai_modules.dm index 2e756148bc9..c6f465fb040 100644 --- a/code/modules/antagonists/malf_ai/malf_ai_modules.dm +++ b/code/modules/antagonists/malf_ai/malf_ai_modules.dm @@ -446,11 +446,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) desc = "[desc] It has [uses] use\s remaining." /datum/action/innate/ai/ranged/override_machine/do_ability(mob/living/caller, atom/clicked_on) -<<<<<<< HEAD - if(caller.incapacitated()) -======= if(caller.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unset_ranged_ability(caller) return FALSE if(!ismachinery(clicked_on)) @@ -543,11 +539,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) qdel(to_explode) /datum/action/innate/ai/ranged/overload_machine/do_ability(mob/living/caller, atom/clicked_on) -<<<<<<< HEAD - if(caller.incapacitated()) -======= if(caller.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unset_ranged_ability(caller) return FALSE if(!ismachinery(clicked_on)) @@ -642,11 +634,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) /// Robotic Factory: Places a large machine that converts humans that go through it into cyborgs. Unlocking this ability removes shunting. /datum/ai_module/utility/place_cyborg_transformer name = "Robotic Factory (Removes Shunting)" -<<<<<<< HEAD - description = "Build a machine anywhere, using expensive nanomachines, that will slowly create loyal cyborgs for you." // Skyrat edit -======= - description = "Build a machine anywhere, using expensive nanomachines, that can convert a living human into a loyal cyborg slave when placed inside." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + description = "Build a machine anywhere, using expensive nanomachines, that will slowly create loyal cyborgs for you." // SKYRAT EDIT cost = 100 power_type = /datum/action/innate/ai/place_transformer unlock_text = span_notice("You make contact with Space Amazon and request a robotics factory for delivery.") @@ -654,11 +642,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) /datum/action/innate/ai/place_transformer name = "Place Robotics Factory" -<<<<<<< HEAD - desc = "Places a machine that creates cyborgs efficiently. Conveyor belts included!" // Skyrat edit -======= - desc = "Places a machine that converts humans into cyborgs. Conveyor belts included!" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + desc = "Places a machine that slowly creates cyborgs. Conveyor belts included!" // SKYRAT EDIT button_icon_state = "robotic_factory" uses = 1 auto_use_uses = FALSE //So we can attempt multiple times @@ -681,11 +665,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) active = FALSE return var/turf/T = get_turf(owner_AI.eyeobj) -<<<<<<< HEAD var/obj/machinery/transformer_rp/conveyor = new(T) //SKYRAT EDIT CHANGE - SILLICONQOL - ORIGINAL: var/obj/machinery/transformer/conveyor = new(T) -======= - var/obj/machinery/transformer/conveyor = new(T) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 conveyor.master_ai = owner playsound(T, 'sound/effects/phasein.ogg', 100, TRUE) if(owner_AI.can_shunt) //prevent repeated messages @@ -699,11 +679,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) C.images -= I /mob/living/silicon/ai/proc/can_place_transformer(datum/action/innate/ai/place_transformer/action) -<<<<<<< HEAD - if(!eyeobj || !isturf(loc) || incapacitated() || !action) -======= if(!eyeobj || !isturf(loc) || incapacitated || !action) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/turf/middle = get_turf(eyeobj) var/list/turfs = list(middle, locate(middle.x - 1, middle.y, middle.z), locate(middle.x + 1, middle.y, middle.z)) @@ -1019,11 +995,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) data["selected"] = say_span || owner.speech_span return data -<<<<<<< HEAD -/obj/machinery/ai_voicechanger/ui_act(action, params) -======= /obj/machinery/ai_voicechanger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(..()) return switch(action) @@ -1124,11 +1096,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) var/mob/living/silicon/ai/ai_caller = caller -<<<<<<< HEAD - if(ai_caller.incapacitated()) -======= if(ai_caller.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unset_ranged_ability(caller) return FALSE @@ -1218,11 +1186,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) return FALSE var/mob/living/silicon/ai/ai_caller = caller -<<<<<<< HEAD - if (ai_caller.incapacitated() || !isturf(ai_caller.loc)) -======= if (ai_caller.incapacitated || !isturf(ai_caller.loc)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE var/turf/target = get_turf(clicked_on) @@ -1250,11 +1214,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) COOLDOWN_START(src, time_til_next_tilt, roll_over_cooldown) /datum/action/innate/ai/ranged/core_tilt/proc/do_roll_over(mob/living/silicon/ai/ai_caller, picked_dir) -<<<<<<< HEAD - if (ai_caller.incapacitated() || !isturf(ai_caller.loc)) // prevents bugs where the ai is carded and rolls -======= if (ai_caller.incapacitated || !isturf(ai_caller.loc)) // prevents bugs where the ai is carded and rolls ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/turf/target = get_step(ai_caller, picked_dir) // in case we moved we pass the dir not the target turf @@ -1268,11 +1228,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) /// Used in our radial menu, state-checking proc after the radial menu sleeps /datum/action/innate/ai/ranged/core_tilt/proc/radial_check(mob/living/silicon/ai/caller) -<<<<<<< HEAD - if (QDELETED(caller) || caller.incapacitated() || caller.stat == DEAD) -======= if (QDELETED(caller) || caller.incapacitated || caller.stat == DEAD) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if (uses <= 0) @@ -1319,11 +1275,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) return FALSE var/mob/living/silicon/ai/ai_caller = caller -<<<<<<< HEAD - if(ai_caller.incapacitated()) -======= if(ai_caller.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 unset_ranged_ability(caller) return FALSE @@ -1379,11 +1331,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) /// Used in our radial menu, state-checking proc after the radial menu sleeps /datum/action/innate/ai/ranged/remote_vendor_tilt/proc/radial_check(mob/living/silicon/ai/caller, obj/machinery/vending/clicked_vendor) -<<<<<<< HEAD - if (QDELETED(caller) || caller.incapacitated() || caller.stat == DEAD) -======= if (QDELETED(caller) || caller.incapacitated || caller.stat == DEAD) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if (QDELETED(clicked_vendor)) diff --git a/code/modules/antagonists/nightmare/nightmare_organs.dm b/code/modules/antagonists/nightmare/nightmare_organs.dm index 84185ebd8fa..19328f20378 100644 --- a/code/modules/antagonists/nightmare/nightmare_organs.dm +++ b/code/modules/antagonists/nightmare/nightmare_organs.dm @@ -65,16 +65,10 @@ /obj/item/organ/internal/heart/nightmare name = "heart of darkness" desc = "An alien organ that twists and writhes when exposed to light." -<<<<<<< HEAD - icon_state = "demon_heart-on" - base_icon_state = "demon_heart" - visual = TRUE -======= visual = TRUE icon_state = "demon_heart-on" base_icon_state = "demon_heart" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 color = COLOR_CRAYON_BLACK decay_factor = 0 // No love is to be found in a heart so twisted. diff --git a/code/modules/antagonists/ninja/energy_katana.dm b/code/modules/antagonists/ninja/energy_katana.dm index a2058f96d00..61a9b81c364 100644 --- a/code/modules/antagonists/ninja/energy_katana.dm +++ b/code/modules/antagonists/ninja/energy_katana.dm @@ -68,11 +68,7 @@ /datum/action/innate/dash/ninja current_charges = 3 max_charges = 3 -<<<<<<< HEAD - charge_rate = 350 //SKYRAT EDIT CHANGE - ORIGINAL: 200 -======= charge_rate = 200 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 beam_length = 1 SECONDS recharge_sound = null diff --git a/code/modules/antagonists/ninja/ninjaDrainAct.dm b/code/modules/antagonists/ninja/ninjaDrainAct.dm index bf847a8c5d9..a189ba3223e 100644 --- a/code/modules/antagonists/ninja/ninjaDrainAct.dm +++ b/code/modules/antagonists/ninja/ninjaDrainAct.dm @@ -295,15 +295,12 @@ return COMPONENT_CANCEL_ATTACK_CHAIN /mob/living/silicon/robot/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) -<<<<<<< HEAD //SKYRAT EDIT: ADDITION START var/list/modelselected = list() modelselected["Assault"] = "/obj/item/robot_model/ninja" modelselected["Medical"] = "/obj/item/robot_model/ninja/ninja_medical" modelselected["Saboteur"] = "/obj/item/robot_model/ninja_saboteur" //SKYRAT EDIT: ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!do_after(ninja, 6 SECONDS, target = src, hidden = TRUE)) return spark_system.start() @@ -314,16 +311,12 @@ UnlinkSelf() ionpulse = TRUE laws = new /datum/ai_laws/ninja_override() -<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - Role Selection //model.transform_to(pick(/obj/item/robot_model/syndicate, /obj/item/robot_model/syndicate_medical, /obj/item/robot_model/saboteur)) - SKYRAT EDIT - ORIGINAL var/choice = input(src,"What role do you wish to become?","Select Role") in sort_list(modelselected) model.transform_to(modelselected[choice]) //SKYRAT EDIT CHANGE END -======= - model.transform_to(pick(/obj/item/robot_model/syndicate, /obj/item/robot_model/syndicate_medical, /obj/item/robot_model/saboteur)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja) if(!ninja_antag) diff --git a/code/modules/antagonists/ninja/outfit.dm b/code/modules/antagonists/ninja/outfit.dm index ed15b3e8c05..924943dce77 100644 --- a/code/modules/antagonists/ninja/outfit.dm +++ b/code/modules/antagonists/ninja/outfit.dm @@ -10,11 +10,7 @@ internals_slot = ITEM_SLOT_RPOCKET belt = /obj/item/energy_katana back = /obj/item/mod/control/pre_equipped/ninja -<<<<<<< HEAD - //implants = list(/obj/item/implant/explosive) SKYRAT EDIT REMOVAL -======= implants = list(/obj/item/implant/explosive) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/ninja/post_equip(mob/living/carbon/human/ninja) var/obj/item/grenade/c4/ninja/charge = ninja.l_store diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm index 3bfaa9d5b54..7e06dd0d6e0 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm @@ -26,11 +26,7 @@ /obj/item/disk/nuclear/Initialize(mapload) . = ..() -<<<<<<< HEAD - AddElement(/datum/element/bed_tuckable, mapload, 6, 6, 0) -======= AddElement(/datum/element/bed_tuckable, mapload, 6, -6, 0) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AddComponent(/datum/component/stationloving, !fake) if(!fake) diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm index 6f12d6131b1..42361860454 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm @@ -328,11 +328,7 @@ GLOBAL_VAR(station_nuke_source) return data -<<<<<<< HEAD -/obj/machinery/nuclearbomb/ui_act(action, params) -======= /obj/machinery/nuclearbomb/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -524,10 +520,7 @@ GLOBAL_VAR(station_nuke_source) safety = TRUE update_appearance() sound_to_playing_players('sound/machines/alarm.ogg') -<<<<<<< HEAD sound_to_playing_players('modular_skyrat/modules/alerts/sound/misc/delta_countdown.ogg') // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NUKE_DEVICE_DETONATING, src) diff --git a/code/modules/antagonists/pirate/pirate_gangs.dm b/code/modules/antagonists/pirate/pirate_gangs.dm index 445e571bfc4..bb7451e212a 100644 --- a/code/modules/antagonists/pirate/pirate_gangs.dm +++ b/code/modules/antagonists/pirate/pirate_gangs.dm @@ -162,10 +162,6 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE)) response_not_enough = "You trying to cheat us? That's fine, we'll take your station as collateral." announcement_color = "yellow" -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Agents from the space I.R.S. heavily armed to stea- I mean, collect the station's tax dues /datum/pirate_gang/irs name = "Space IRS Agents" diff --git a/code/modules/antagonists/pirate/pirate_outfits.dm b/code/modules/antagonists/pirate/pirate_outfits.dm index 8cb0d4efc52..14729908e65 100644 --- a/code/modules/antagonists/pirate/pirate_outfits.dm +++ b/code/modules/antagonists/pirate/pirate_outfits.dm @@ -55,11 +55,8 @@ head = /obj/item/clothing/head/helmet/space/pirate -<<<<<<< HEAD -======= id_trim = /datum/id_trim/pirate/captain ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/pirate/silverscale name = "Silver Scale Member" @@ -156,11 +153,8 @@ suit = /obj/item/clothing/suit/jacket/oversized head = /obj/item/clothing/head/costume/crown -<<<<<<< HEAD -======= id_trim = /datum/id_trim/pirate/captain ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/pirate/medieval name = "Medieval Warmonger" @@ -191,9 +185,6 @@ belt = /obj/item/gun/magic/hook l_pocket = /obj/item/tank/internals/emergency_oxygen r_pocket = /obj/item/flashlight/lantern -<<<<<<< HEAD -======= skillchips = list(/obj/item/skillchip/big_pointer) //they don't have an id, so this is needed ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm index eb2fed83ade..602fcbe8b07 100644 --- a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm +++ b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm @@ -264,11 +264,7 @@ data["status_report"] = status_report return data -<<<<<<< HEAD -/obj/machinery/computer/piratepad_control/ui_act(action, params) -======= /obj/machinery/computer/piratepad_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/antagonists/revenant/revenant_blight.dm b/code/modules/antagonists/revenant/revenant_blight.dm index 19b0c3d0bc4..13a1ff7e1d6 100644 --- a/code/modules/antagonists/revenant/revenant_blight.dm +++ b/code/modules/antagonists/revenant/revenant_blight.dm @@ -19,10 +19,6 @@ if(affected_mob) affected_mob.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#1d2953") if(affected_mob.dna && affected_mob.dna.species) -<<<<<<< HEAD - affected_mob.dna.species.handle_mutant_bodyparts(affected_mob) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 affected_mob.set_haircolor(null, override = TRUE) to_chat(affected_mob, span_notice("You feel better.")) ..() @@ -69,10 +65,6 @@ affected_mob.adjustStaminaLoss(22.5 * seconds_per_tick, updating_stamina = FALSE) new /obj/effect/temp_visual/revenant(affected_mob.loc) if(affected_mob.dna && affected_mob.dna.species) -<<<<<<< HEAD - affected_mob.dna.species.handle_mutant_bodyparts(affected_mob,"#1d2953") -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 affected_mob.set_haircolor("#1d2953", override = TRUE) affected_mob.visible_message(span_warning("[affected_mob] looks terrifyingly gaunt..."), span_revennotice("You suddenly feel like your skin is wrong...")) affected_mob.add_atom_colour("#1d2953", TEMPORARY_COLOUR_PRIORITY) diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 1fad6b6a2d7..d490944e1e3 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -314,11 +314,7 @@ owner.current.visible_message(span_deconversion_message("[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!"), null, null, null, owner.current) to_chat(owner, "You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you....") else if(issilicon(owner.current)) -<<<<<<< HEAD - owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it."), null, null, null, owner.current) -======= owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initializing it."), null, null, null, owner.current) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(owner, span_userdanger("The frame's firmware detects and deletes your neural reprogramming! You remember nothing but the name of the one who flashed you.")) /datum/antagonist/rev/head/farewell() @@ -331,11 +327,7 @@ else to_chat(owner, "The sweet release of death. You are no longer a Head Revolutionary.") else if(issilicon(owner.current)) -<<<<<<< HEAD - owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, suppressing the disloyal personality traits from the MMI before initalizing it."), null, null, null, owner.current) -======= owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, suppressing the disloyal personality traits from the MMI before initializing it."), null, null, null, owner.current) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(owner, span_userdanger("The frame's firmware detects and suppresses your unwanted personality traits! You feel more content with the leadership around these parts.")) /// Handles rev removal via IC methods such as borging, mindshielding, blunt force trauma to the head or revs losing. @@ -439,11 +431,7 @@ var/list/datum/mind/promotable = list() var/list/datum/mind/monkey_promotable = list() for(var/datum/mind/khrushchev in non_heads) -<<<<<<< HEAD - if(khrushchev.current && !khrushchev.current.incapacitated() && !HAS_TRAIT(khrushchev.current, TRAIT_RESTRAINED) && khrushchev.current.client) -======= if(khrushchev.current && !khrushchev.current.incapacitated && !HAS_TRAIT(khrushchev.current, TRAIT_RESTRAINED) && khrushchev.current.client) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if((ROLE_REV_HEAD in khrushchev.current.client.prefs.be_special) || (ROLE_PROVOCATEUR in khrushchev.current.client.prefs.be_special)) if(!ismonkey(khrushchev.current)) promotable += khrushchev diff --git a/code/modules/antagonists/space_dragon/space_dragon.dm b/code/modules/antagonists/space_dragon/space_dragon.dm index 3b5396edfa0..0d982dc492d 100644 --- a/code/modules/antagonists/space_dragon/space_dragon.dm +++ b/code/modules/antagonists/space_dragon/space_dragon.dm @@ -173,11 +173,7 @@ * Triggers when Space Dragon completes his objective. * Calls the shuttle with a coefficient of 3, making it impossible to recall. * Sets all of his rifts to allow for infinite sentient carp spawns -<<<<<<< HEAD - * Also plays appropiate sounds and CENTCOM messages. -======= * Also plays appropriate sounds and CENTCOM messages. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ /datum/antagonist/space_dragon/proc/victory() objective_complete = TRUE @@ -192,15 +188,9 @@ rift.time_charged = rift.max_charge /** -<<<<<<< HEAD - * Gives Space Dragon their the rift speed buff permanantly and fully heals the user. - * - * Gives Space Dragon the enraged speed buff from charging rifts permanantly. -======= * Gives Space Dragon their the rift speed buff permanently and fully heals the user. * * Gives Space Dragon the enraged speed buff from charging rifts permanently. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 * Only happens in circumstances where Space Dragon completes their objective. * Also gives them a full heal. */ diff --git a/code/modules/antagonists/space_ninja/space_ninja.dm b/code/modules/antagonists/space_ninja/space_ninja.dm index 141922e8874..ad8ef91a8af 100644 --- a/code/modules/antagonists/space_ninja/space_ninja.dm +++ b/code/modules/antagonists/space_ninja/space_ninja.dm @@ -73,7 +73,7 @@ doorobjective.doors_required = rand(15,40) doorobjective.explanation_text = "Use your gloves to doorjack [doorobjective.doors_required] airlocks on the station." objectives += doorobjective -<<<<<<< HEAD + //SKYRAT EDIT START if(length(get_crewmember_minds()) >= BOMB_POP_REQUIREMENT) //Explosive plant, the bomb will register its completion on priming @@ -88,37 +88,15 @@ bombobjective.explanation_text = "Detonate your starter bomb in [bombobjective.detonation_location]. Note that the bomb will not work anywhere else!" objectives += bombobjective //SKYRAT EDIT END -======= - - //Explosive plant, the bomb will register its completion on priming - var/datum/objective/plant_explosive/bombobjective = new /datum/objective/plant_explosive() - for(var/sanity in 1 to 100) // 100 checks at most. - var/area/selected_area = pick(GLOB.areas) - if(!is_station_level(selected_area.z) || !(selected_area.area_flags & VALID_TERRITORY)) - continue - bombobjective.detonation_location = selected_area - break - if(bombobjective.detonation_location) - bombobjective.explanation_text = "Detonate your starter bomb in [bombobjective.detonation_location]. Note that the bomb will not work anywhere else!" - objectives += bombobjective ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Security Scramble, set to complete upon using your gloves on a security console var/datum/objective/securityobjective = new /datum/objective/security_scramble() objectives += securityobjective -<<<<<<< HEAD - /* SKYRAT EDIT REMOVAL - //Message of Terror, set to complete upon using your gloves a communication console - var/datum/objective/communicationobjective = new /datum/objective/terror_message() - objectives += communicationobjective - */ -======= //Message of Terror, set to complete upon using your gloves a communication console var/datum/objective/communicationobjective = new /datum/objective/terror_message() objectives += communicationobjective ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Survival until end var/datum/objective/survival = new /datum/objective/survive() survival.owner = owner diff --git a/code/modules/antagonists/spy/spy_bounty.dm b/code/modules/antagonists/spy/spy_bounty.dm index 5d572c4391e..42ab0203e5c 100644 --- a/code/modules/antagonists/spy/spy_bounty.dm +++ b/code/modules/antagonists/spy/spy_bounty.dm @@ -529,11 +529,7 @@ return TRUE if(IS_WEAKREF_OF(stealing, target_ref)) var/mob/living/carbon/human/target = stealing -<<<<<<< HEAD - if(!target.incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS)) -======= if(!INCAPACITATED_IGNORING(target, INCAPABLE_RESTRAINTS|INCAPABLE_STASIS)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(find_desired_thing(target)) return TRUE diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 243ffee858d..661007d3163 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -1,10 +1,6 @@ ///all the employers that are syndicate #define FLAVOR_FACTION_SYNDICATE "syndicate" -<<<<<<< HEAD -///all the employers that are nanotrasen -======= ///all the employers that are Nanotrasen ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define FLAVOR_FACTION_NANOTRASEN "nanotrasen" /datum/antagonist/traitor diff --git a/code/modules/antagonists/voidwalker/voidwalker_abilities.dm b/code/modules/antagonists/voidwalker/voidwalker_abilities.dm index 47eda6bf51e..3bf4e1b76c3 100644 --- a/code/modules/antagonists/voidwalker/voidwalker_abilities.dm +++ b/code/modules/antagonists/voidwalker/voidwalker_abilities.dm @@ -12,11 +12,7 @@ deactive_msg = "You refocus your eyes..." /// how long we need to stare at someone to unsettle them (woooooh) var/stare_time = 8 SECONDS -<<<<<<< HEAD - /// how long we stun someone on succesful cast -======= /// how long we stun someone on successful cast ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/stun_time = 2 SECONDS /// stamina damage we doooo var/stamina_damage = 80 diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index 6d008b3a466..0776a36aa35 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -188,14 +188,11 @@ if(HAS_TRAIT(M, TRAIT_NO_SOUL)) to_chat(user, span_warning("This body does not possess a soul to capture.")) return -<<<<<<< HEAD // SKYRAT EDIT START if(!do_after(user, 5 SECONDS, M)) to_chat(user, span_warning("You must stand still to capture their soul!")) return // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_combat(user, M, "captured [M.name]'s soul", src) capture_soul(M, user) @@ -298,25 +295,15 @@ /// Procs for moving soul in and out off stone /// Transfer the mind of a carbon mob (which is then dusted) into a shade mob inside src. -<<<<<<< HEAD -/// If forced, sacrifical and stat checks are skipped. -/obj/item/soulstone/proc/capture_soul(mob/living/carbon/victim, mob/user, forced = FALSE) - if(!iscarbon(victim)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul -======= /// If forced, sacrificial and stat checks are skipped. /obj/item/soulstone/proc/capture_soul(mob/living/carbon/victim, mob/user, forced = FALSE) if(!iscarbon(victim)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesn't mean you don't have a soul ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(contents.len) return FALSE if(!forced) -<<<<<<< HEAD - var/datum/antagonist/cult/cultist = IS_CULTIST(user) -======= var/datum/antagonist/cult/cultist = GET_CULTIST(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(cultist) var/datum/team/cult/cult_team = cultist.get_team() if(victim.mind && cult_team.is_sacrifice_target(victim.mind)) @@ -390,11 +377,7 @@ /obj/item/soulstone/proc/check_menu(mob/user, obj/structure/constructshell/shell) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated() || !user.is_holding(src) || !user.CanReach(shell, src)) -======= if(user.incapacitated || !user.is_holding(src) || !user.CanReach(shell, src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -466,11 +449,7 @@ /// Called when a ghost is chosen to become a shade. /obj/item/soulstone/proc/on_poll_concluded(mob/living/master, mob/living/victim, mob/dead/observer/ghost) -<<<<<<< HEAD - if(isnull(victim) || master.incapacitated() || !master.is_holding(src) || !master.CanReach(victim, src)) -======= if(isnull(victim) || master.incapacitated || !master.is_holding(src) || !master.CanReach(victim, src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(isnull(ghost?.client)) to_chat(master, span_danger("There were no spirits willing to become a shade.")) diff --git a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm index 04d3d002867..18374e9bcff 100644 --- a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm @@ -172,11 +172,7 @@ data["full_random_bonus"] = initial(uses) + full_random_bonus return data -<<<<<<< HEAD -/obj/item/spellbook/ui_act(action, params) -======= /obj/item/spellbook/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 58371fff23b..335c934a320 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -28,14 +28,6 @@ GLOBAL_LIST_EMPTY(wizard_spellbook_purchases_by_key) /// Perks that wizard learn var/list/perks = list() -<<<<<<< HEAD -/datum/antagonist/wizard/New() - if(move_to_lair) // kick off loading of your lair, if you want to be moved to it - INVOKE_ASYNC(SSmapping, TYPE_PROC_REF(/datum/controller/subsystem/mapping, lazy_load_template), LAZY_TEMPLATE_KEY_WIZARDDEN) - return ..() - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/antagonist/wizard_minion name = "Wizard Minion" antagpanel_category = ANTAG_GROUP_WIZARDS diff --git a/code/modules/art/paintings.dm b/code/modules/art/paintings.dm index a6853e307d2..2e330d31185 100644 --- a/code/modules/art/paintings.dm +++ b/code/modules/art/paintings.dm @@ -159,11 +159,7 @@ . = ..() ui_interact(user) -<<<<<<< HEAD -/obj/item/canvas/ui_act(action, params) -======= /obj/item/canvas/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm index 17dcf7e9d64..1f918888610 100644 --- a/code/modules/assembly/health.dm +++ b/code/modules/assembly/health.dm @@ -100,11 +100,7 @@ data["target"] = health_target return data -<<<<<<< HEAD -/obj/item/assembly/health/ui_act(action, params) -======= /obj/item/assembly/health/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return . diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index cd22358252d..addbad2704e 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -291,11 +291,7 @@ data["visible"] = visible return data -<<<<<<< HEAD -/obj/item/assembly/infra/ui_act(action, params) -======= /obj/item/assembly/infra/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return . diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index e2f1cbb262d..61153738ee7 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -154,11 +154,7 @@ data["sensitivity"] = sensitivity return data -<<<<<<< HEAD -/obj/item/assembly/prox_sensor/ui_act(action, params) -======= /obj/item/assembly/prox_sensor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 08c25fb11ed..fad912d4222 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -110,11 +110,7 @@ data["loop"] = loop return data -<<<<<<< HEAD -/obj/item/assembly/timer/ui_act(action, params) -======= /obj/item/assembly/timer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm index e486683595f..bc302a188d8 100644 --- a/code/modules/asset_cache/asset_list.dm +++ b/code/modules/asset_cache/asset_list.dm @@ -486,23 +486,6 @@ GLOBAL_LIST_EMPTY(asset_datums) #undef SPRSZ_ICON #undef SPRSZ_STRIPPED -/datum/asset/changelog_item - _abstract = /datum/asset/changelog_item - var/item_filename - -/datum/asset/changelog_item/New(date) - item_filename = SANITIZE_FILENAME("[date].yml") - SSassets.transport.register_asset(item_filename, file("html/changelogs/archive/" + item_filename)) - -/datum/asset/changelog_item/send(client) - if (!item_filename) - return - . = SSassets.transport.send_assets(client, item_filename) - -/datum/asset/changelog_item/get_url_mappings() - if (!item_filename) - return - . = list("[item_filename]" = SSassets.transport.get_asset_url(item_filename)) /datum/asset/changelog_item _abstract = /datum/asset/changelog_item diff --git a/code/modules/asset_cache/assets/paper.dm b/code/modules/asset_cache/assets/paper.dm index 0392961bb5c..9842e21ec21 100644 --- a/code/modules/asset_cache/assets/paper.dm +++ b/code/modules/asset_cache/assets/paper.dm @@ -1,7 +1,6 @@ /datum/asset/spritesheet/simple/paper name = "paper" assets = list( -<<<<<<< HEAD // SKYRAT EDIT ADDITION: START - Donator stamp icons "stamp-cat_blue" = 'modular_skyrat/master_files/icons/stamp_icons/cat_blue.png', @@ -16,8 +15,6 @@ "stamp-nri" = 'modular_skyrat/master_files/icons/stamp_icons/large_stamp-nri.png', "stamp-solfed" = 'modular_skyrat/master_files/icons/stamp_icons/large_stamp-solfed.png', // SKYRAT EDIT ADDITION: END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "stamp-clown" = 'icons/stamp_icons/large_stamp-clown.png', "stamp-deny" = 'icons/stamp_icons/large_stamp-deny.png', "stamp-ok" = 'icons/stamp_icons/large_stamp-ok.png', diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm index 98363944dfa..0556d085adf 100644 --- a/code/modules/atmospherics/environmental/LINDA_system.dm +++ b/code/modules/atmospherics/environmental/LINDA_system.dm @@ -134,11 +134,8 @@ src.atmos_adjacent_turfs = atmos_adjacent_turfs SEND_SIGNAL(src, COMSIG_TURF_CALCULATED_ADJACENT_ATMOS) -<<<<<<< HEAD update_adjacent_pollutants() //SKYRAT EDIT ADDITION //Atmos adjacency could unlock/block adjacent pollutants, this is dirty flags anyway so its fine having it here -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * returns a list of adjacent turfs that can share air with this one. * alldir includes adjacent diagonal tiles that can share @@ -202,10 +199,7 @@ SSair.remove_from_active(src) else SSair.add_to_active(src) -<<<<<<< HEAD liquid_update_turf() //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/proc/move_update_air(turf/target_turf) if(isturf(target_turf)) diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm index d8ad235550c..e7c5f5d35c7 100644 --- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm +++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm @@ -623,11 +623,7 @@ Then we space some of our heat, and think about if we should stop conducting. continue var/turf/neighbor = get_step(src, direction) -<<<<<<< HEAD - if(!neighbor?.thermal_conductivity) -======= if(!neighbor.thermal_conductivity) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue if(neighbor.archived_cycle < SSair.times_fired) diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index d1629cd81b0..49254d077de 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -793,10 +793,6 @@ cached_gases[/datum/gas/tritium][MOLES] -= 5 * nob_formed * reduction_factor cached_gases[/datum/gas/nitrogen][MOLES] -= 10 * nob_formed cached_gases[/datum/gas/hypernoblium][MOLES] += nob_formed // I'm not going to nitpick, but N20H10 feels like it should be an explosive more than anything. -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SET_REACTION_RESULTS(nob_formed) var/energy_released = nob_formed * (NOBLIUM_FORMATION_ENERGY / (max(cached_gases[/datum/gas/bz][MOLES], 1))) var/new_heat_capacity = air.heat_capacity() diff --git a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm index 0d1331558af..737018b24ad 100644 --- a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm +++ b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm @@ -342,26 +342,15 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) return data -<<<<<<< HEAD -/obj/machinery/airalarm/ui_act(action, params) -======= /obj/machinery/airalarm/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(. || buildstage != AIR_ALARM_BUILD_COMPLETE) return -<<<<<<< HEAD - if((locked && !HAS_SILICON_ACCESS(usr)) || (HAS_SILICON_ACCESS(usr) && aidisabled)) - return - - var/mob/user = usr -======= var/mob/user = ui.user if((locked && !HAS_SILICON_ACCESS(user)) || (HAS_SILICON_ACCESS(user) && aidisabled)) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/area/area = connected_sensor ? get_area(connected_sensor) : get_area(src) ASSERT(!isnull(area)) @@ -476,11 +465,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) var/threshold_type = params["threshold_type"] var/value = params["value"] tlv.set_value(threshold_type, value) -<<<<<<< HEAD - investigate_log("threshold value for [threshold]:[threshold_type] was set to [value] by [key_name(usr)]", INVESTIGATE_ATMOS) -======= investigate_log("threshold value for [threshold]:[threshold_type] was set to [value] by [key_name(user)]", INVESTIGATE_ATMOS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 check_enviroment() @@ -491,11 +476,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) return var/threshold_type = params["threshold_type"] tlv.reset_value(threshold_type) -<<<<<<< HEAD - investigate_log("threshold value for [threshold]:[threshold_type] was reset by [key_name(usr)]", INVESTIGATE_ATMOS) -======= investigate_log("threshold value for [threshold]:[threshold_type] was reset by [key_name(user)]", INVESTIGATE_ATMOS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 check_enviroment() @@ -512,11 +493,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) disconnect_sensor() if ("lock") -<<<<<<< HEAD - togglelock(usr) -======= togglelock(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE update_appearance() diff --git a/code/modules/atmospherics/machinery/bluespace_vendor.dm b/code/modules/atmospherics/machinery/bluespace_vendor.dm index 2f4186da557..5eca214cee0 100644 --- a/code/modules/atmospherics/machinery/bluespace_vendor.dm +++ b/code/modules/atmospherics/machinery/bluespace_vendor.dm @@ -244,11 +244,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/bluespace_vendor, 30) data["tank_full"] = total_tank_pressure return data -<<<<<<< HEAD -/obj/machinery/bluespace_vendor/ui_act(action, params) -======= /obj/machinery/bluespace_vendor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm index 1a096bca312..2fb89f6356d 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm @@ -177,9 +177,7 @@ Skyrat removal START, moved to modular file ..() pixel_x = 0 pixel_y = 0 -<<<<<<< HEAD + Skyrat removal END */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm index 7f31911da05..567cfcc6a84 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -84,11 +84,7 @@ Passive gate is similar to the regular pump except: data["max_pressure"] = round(MAX_OUTPUT_PRESSURE) return data -<<<<<<< HEAD -/obj/machinery/atmospherics/components/binary/passive_gate/ui_act(action, params) -======= /obj/machinery/atmospherics/components/binary/passive_gate/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm index 8e884a07537..b1e03743b5d 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm @@ -84,11 +84,7 @@ data["max_pressure"] = round(ONE_ATMOSPHERE*100) return data -<<<<<<< HEAD -/obj/machinery/atmospherics/components/binary/pressure_valve/ui_act(action, params) -======= /obj/machinery/atmospherics/components/binary/pressure_valve/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index 40adb3a9e23..848a41735c7 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -81,11 +81,7 @@ data["max_pressure"] = round(MAX_OUTPUT_PRESSURE) return data -<<<<<<< HEAD -/obj/machinery/atmospherics/components/binary/pump/ui_act(action, params) -======= /obj/machinery/atmospherics/components/binary/pump/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm index bad32676911..0b6195f7b84 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm @@ -107,11 +107,7 @@ data["max_temperature"] = round(max_temperature) return data -<<<<<<< HEAD -/obj/machinery/atmospherics/components/binary/temperature_gate/ui_act(action, params) -======= /obj/machinery/atmospherics/components/binary/temperature_gate/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm index 024ee73f02f..88ec2265c69 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm @@ -88,11 +88,7 @@ data["max_heat_transfer_rate"] = round(max_heat_transfer_rate) return data -<<<<<<< HEAD -/obj/machinery/atmospherics/components/binary/temperature_pump/ui_act(action, params) -======= /obj/machinery/atmospherics/components/binary/temperature_pump/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index 58bf2e12e21..477ea401376 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -122,11 +122,7 @@ data["max_rate"] = round(MAX_TRANSFER_RATE) return data -<<<<<<< HEAD -/obj/machinery/atmospherics/components/binary/volume_pump/ui_act(action, params) -======= /obj/machinery/atmospherics/components/binary/volume_pump/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm index c16e3fe828f..96272858a96 100644 --- a/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm +++ b/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm @@ -79,11 +79,7 @@ /obj/machinery/atmospherics/components/unary/hypertorus/fuel_input name = "HFR fuel input port" -<<<<<<< HEAD - desc = "Input port for the Hypertorus Fusion Reactor, designed to take in only Hydrogen and Tritium in gas forms." -======= desc = "Input port for the Hypertorus Fusion Reactor, designed to take in fuels with the optimal fuel mix being a 50/50 split." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "fuel_input_off" icon_state_open = "fuel_input_open" icon_state_off = "fuel_input_off" @@ -317,11 +313,7 @@ return data -<<<<<<< HEAD -/obj/machinery/hypertorus/interface/ui_act(action, params) -======= /obj/machinery/hypertorus/interface/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/gas_recipe_machines/atmos_machines_recipes.dm b/code/modules/atmospherics/machinery/components/gas_recipe_machines/atmos_machines_recipes.dm index e9dbfd7df9b..13c872199dc 100644 --- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/atmos_machines_recipes.dm +++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/atmos_machines_recipes.dm @@ -124,11 +124,7 @@ GLOBAL_LIST_INIT(gas_recipe_meta, gas_recipes_list()) min_temp = 10 max_temp = 20 energy_release = 3500000 -<<<<<<< HEAD - requirements = list(/datum/gas/plasma = 450, /datum/gas/bz = 15) //SKYRAT EDIT CHANGE, ORIGINAL: requirements = list(/datum/gas/plasma = 450) -======= requirements = list(/datum/gas/plasma = 450) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 products = list(/obj/item/stack/sheet/mineral/plasma = 1) /datum/gas_recipe/crystallizer/crystal_cell diff --git a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm index d14637b99ab..565ada80b93 100644 --- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm +++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm @@ -300,11 +300,7 @@ data["gas_input"] = gas_input return data -<<<<<<< HEAD -/obj/machinery/atmospherics/components/binary/crystallizer/ui_act(action, params) -======= /obj/machinery/atmospherics/components/binary/crystallizer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index cec9192ee89..593832ec798 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -141,11 +141,7 @@ return data -<<<<<<< HEAD -/obj/machinery/atmospherics/components/trinary/filter/ui_act(action, params) -======= /obj/machinery/atmospherics/components/trinary/filter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index 5c4273f8b8a..8f7aa4a2d57 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -150,11 +150,7 @@ data["node2_concentration"] = round(node2_concentration*100, 1) return data -<<<<<<< HEAD -/obj/machinery/atmospherics/components/trinary/mixer/ui_act(action, params) -======= /obj/machinery/atmospherics/components/trinary/mixer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm b/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm index 7236352a2db..04306fbbdb3 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm @@ -198,11 +198,7 @@ GLOBAL_LIST_EMPTY_TYPED(bluespace_senders, /obj/machinery/atmospherics/component data["credits"] = credits_gained return data -<<<<<<< HEAD -/obj/machinery/atmospherics/components/unary/bluespace_sender/ui_act(action, params) -======= /obj/machinery/atmospherics/components/unary/bluespace_sender/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index fa6bf5a916c..874a04f4a2c 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -71,10 +71,7 @@ density = TRUE max_integrity = 350 armor_type = /datum/armor/unary_cryo_cell -<<<<<<< HEAD layer = MOB_LAYER - 0.2 //SKYRAT EDIT - Fixing the opacity of cryo cells - ORIGINAL: layer = MOB_LAYER -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 circuit = /obj/item/circuitboard/machine/cryo_tube occupant_typecache = list(/mob/living/carbon, /mob/living/simple_animal) processing_flags = NONE @@ -664,11 +661,7 @@ if(isliving(target)) var/mob/living/living_mob = target -<<<<<<< HEAD - if(living_mob.incapacitated()) -======= if(living_mob.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 close_machine(target) return diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index 684250de464..c0b584d9029 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -122,11 +122,7 @@ data["max_rate"] = round(MAX_TRANSFER_RATE) return data -<<<<<<< HEAD -/obj/machinery/atmospherics/components/unary/outlet_injector/ui_act(action, params) -======= /obj/machinery/atmospherics/components/unary/outlet_injector/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 6aa98c07682..cb49e572fd1 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -283,11 +283,7 @@ data["pressure"] = port.return_pressure() return data -<<<<<<< HEAD -/obj/machinery/atmospherics/components/unary/thermomachine/ui_act(action, params) -======= /obj/machinery/atmospherics/components/unary/thermomachine/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index abc22d44d01..4da90396052 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -255,15 +255,12 @@ env_gases[gas][MOLES] -= transferred_moles environment.garbage_collect() -<<<<<<< HEAD // SKYRAT EDIT ADDITION if(isopenturf(tile)) var/turf/open/floor_turf = tile floor_turf.pollution?.scrub_amount(1) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Remix the resulting gases air_contents.merge(filtered_out) diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm index 08cfe894fc8..ad8df3cbc82 100644 --- a/code/modules/atmospherics/machinery/datum_pipeline.dm +++ b/code/modules/atmospherics/machinery/datum_pipeline.dm @@ -49,21 +49,13 @@ reconcile_air() //Only react if the mix has changed, and don't keep updating if it hasn't update = air.react(src) -<<<<<<< HEAD - //CalculateGasmixColor(air) // SKYRAT EDIT REMOVAL - Pipe gas visuals removed -======= - CalculateGasmixColor(air) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + //CalculateGasmixColor(air) // SKYRAT EDIT REMOVAL - Pipe gas visuals removed // SKYRAT TODO - Look into this /datum/pipeline/proc/set_air(datum/gas_mixture/new_air) if(new_air == air) return air = new_air -<<<<<<< HEAD //CalculateGasmixColor(air) // SKYRAT EDIT REMOVAL - Pipe gas visuals removed -======= - CalculateGasmixColor(air) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Preps a pipeline for rebuilding, insterts it into the rebuild queue /datum/pipeline/proc/build_pipeline(obj/machinery/atmospherics/base) @@ -104,11 +96,7 @@ while(possible_expansions.len) for(var/obj/machinery/atmospherics/borderline in possible_expansions) var/list/result = borderline.pipeline_expansion(src) -<<<<<<< HEAD - if(!(result && result.len)) -======= if(!result?.len) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 possible_expansions -= borderline continue for(var/obj/machinery/atmospherics/considered_device in result) @@ -229,7 +217,6 @@ var/turf_temperature = target.GetTemperature() var/turf_heat_capacity = target.GetHeatCapacity() -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(target.liquids?.liquid_state >= LIQUID_STATE_FOR_HEAT_EXCHANGERS) turf_temperature = target.liquids.temp @@ -257,20 +244,6 @@ if(target.blocks_air) target.temperature_expose(air, target.temperature) update = TRUE -======= - if(turf_heat_capacity <= 0 || partial_heat_capacity <= 0) - return TRUE - - var/delta_temperature = turf_temperature - air.temperature - - var/heat = thermal_conductivity * CALCULATE_CONDUCTION_ENERGY(delta_temperature, partial_heat_capacity, turf_heat_capacity) - air.temperature += heat / total_heat_capacity - target.TakeTemperature(-1 * heat / turf_heat_capacity) - - if(target.blocks_air) - target.temperature_expose(air, target.temperature) - update = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/pipeline/proc/return_air() . = other_airs + air diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm index 9784ef71746..39b65fda7af 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm @@ -28,13 +28,10 @@ if(istype(local_turf)) if(islava(local_turf)) environment_temperature = 5000 //Yuck -<<<<<<< HEAD //SKYRAT EDIT ADDITION else if (local_turf.liquids && local_turf.liquids.liquid_state >= LIQUID_STATE_FOR_HEAT_EXCHANGERS) environment_temperature = local_turf.liquids.temp //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(local_turf.blocks_air) environment_temperature = local_turf.temperature else diff --git a/code/modules/atmospherics/machinery/pipes/smart.dm b/code/modules/atmospherics/machinery/pipes/smart.dm index 94ee28aea8a..ce4dc0e36a5 100644 --- a/code/modules/atmospherics/machinery/pipes/smart.dm +++ b/code/modules/atmospherics/machinery/pipes/smart.dm @@ -14,25 +14,6 @@ GLOBAL_LIST_INIT(atmos_components, typecacheof(list(/obj/machinery/atmospherics) ///Current active connections var/connections = NONE -<<<<<<< HEAD - ///Was this pipe created during map load - var/map_loaded_pipe = FALSE - -/obj/machinery/atmospherics/pipe/smart/Initialize(mapload) - map_loaded_pipe = mapload - return ..() - -///helper function to append all directions into an single bit flag -/obj/machinery/atmospherics/pipe/smart/proc/append_directions(list/spanning_directions) - var/bit_flag = NONE - for(var/i in 1 to length(spanning_directions)) - var/spanning_direction = spanning_directions[i] - if(!spanning_direction) - continue - bit_flag |= spanning_direction - return bit_flag -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/atmospherics/pipe/smart/update_pipe_icon() icon = 'icons/obj/pipes_n_cables/!pipes_bitmask.dmi' diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 303104c462e..a5a03c3ba12 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -560,15 +560,6 @@ ) else .["holdingTank"] = null -<<<<<<< HEAD - - . += list( - "shielding" = shielding_powered, - "cellCharge" = internal_cell ? internal_cell.percent() : 0 - ) - -/obj/machinery/portable_atmospherics/canister/ui_act(action, params) -======= . += list( "shielding" = shielding_powered, @@ -576,7 +567,6 @@ ) /obj/machinery/portable_atmospherics/canister/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm b/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm index 22aa2d0e785..434f243d6a3 100644 --- a/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm @@ -129,11 +129,7 @@ data["pressureLimitTank"] = internal_tank.pressure_limit return data -<<<<<<< HEAD -/obj/machinery/portable_atmospherics/pipe_scrubber/ui_act(action, params) -======= /obj/machinery/portable_atmospherics/pipe_scrubber/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 4c0b6144f96..3efc87e00ac 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -109,11 +109,7 @@ data["holding"] = null return data -<<<<<<< HEAD -/obj/machinery/portable_atmospherics/pump/ui_act(action, params) -======= /obj/machinery/portable_atmospherics/pump/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index 05710d4646d..aeb64583c9b 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -69,14 +69,11 @@ scrub(epicentre.return_air()) for(var/turf/open/openturf as anything in epicentre.get_atmos_adjacent_turfs(alldir = TRUE)) scrub(openturf.return_air()) -<<<<<<< HEAD //SKYRAT EDIT ADDITION for(var/turf/open/open_turf in view(3, src)) if(open_turf.pollution) open_turf.pollution.scrub_amount(POLLUTION_HEIGHT_DIVISOR) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /** @@ -169,11 +166,7 @@ else if(on && holding) user.investigate_log("started a transfer into [holding].", INVESTIGATE_ATMOS) -<<<<<<< HEAD -/obj/machinery/portable_atmospherics/scrubber/ui_act(action, params) -======= /obj/machinery/portable_atmospherics/scrubber/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index eb5c81826f1..6497bcc4199 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -139,7 +139,6 @@ GLOBAL_LIST_EMPTY(gateway_destinations) invisibility = INVISIBILITY_ABSTRACT /obj/effect/gateway_portal_bumper/Bumped(atom/movable/AM) -<<<<<<< HEAD //SKYRAT EDIT ADDITION var/list/type_blacklist = list( /obj/item/mmi, @@ -153,8 +152,6 @@ GLOBAL_LIST_EMPTY(gateway_destinations) to_chat(AM, span_warning("[content_item] seems to be blocking you from entering the gateway!")) return //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(get_dir(src,AM) == gateway?.dir) playsound(src, 'sound/effects/gateway_travel.ogg', 70, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) gateway.Transfer(AM) @@ -197,7 +194,6 @@ GLOBAL_LIST_EMPTY(gateway_destinations) var/teleportion_possible = FALSE var/transport_active = FALSE -<<<<<<< HEAD //SKYRAT EDIT ADDITION var/requires_key = FALSE var/key_used = FALSE @@ -211,8 +207,6 @@ GLOBAL_LIST_EMPTY(gateway_destinations) return //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/gateway/Initialize(mapload) generate_destination() update_appearance() diff --git a/code/modules/bitrunning/components/avatar_connection.dm b/code/modules/bitrunning/components/avatar_connection.dm index 2c987e226c9..6254427af39 100644 --- a/code/modules/bitrunning/components/avatar_connection.dm +++ b/code/modules/bitrunning/components/avatar_connection.dm @@ -150,11 +150,7 @@ if(isnull(old_body) || damage_type == STAMINA || damage_type == OXYLOSS) return -<<<<<<< HEAD if(damage >= (old_body.health + (ishuman(old_body) ? HUMAN_MAXHEALTH : MAX_LIVING_HEALTH))) // SKYRAT EDIT CHANGE - ORIGINAL: if(damage >= (old_body.health + MAX_LIVING_HEALTH)) -======= - if(damage >= (old_body.health + MAX_LIVING_HEALTH)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 full_avatar_disconnect(cause_damage = TRUE) return diff --git a/code/modules/bitrunning/event.dm b/code/modules/bitrunning/event.dm index 7167eb15493..370957e2ebb 100644 --- a/code/modules/bitrunning/event.dm +++ b/code/modules/bitrunning/event.dm @@ -61,11 +61,7 @@ var/total = 0 for(var/datum/weakref/server_ref in cyber_control.active_servers) var/obj/machinery/quantum_server/server = server_ref?.resolve() -<<<<<<< HEAD - if(isnull(server)) -======= if(isnull(server) || QDELETED(server)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue total += length(server.mutation_candidate_refs) diff --git a/code/modules/bitrunning/netpod/ui.dm b/code/modules/bitrunning/netpod/ui.dm index 7e526fc24b6..919ba1e174b 100644 --- a/code/modules/bitrunning/netpod/ui.dm +++ b/code/modules/bitrunning/netpod/ui.dm @@ -27,11 +27,7 @@ return data -<<<<<<< HEAD -/obj/machinery/netpod/ui_act(action, params) -======= /obj/machinery/netpod/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return TRUE diff --git a/code/modules/bitrunning/objects/landmarks.dm b/code/modules/bitrunning/objects/landmarks.dm index 939007c598b..ea55b96979e 100644 --- a/code/modules/bitrunning/objects/landmarks.dm +++ b/code/modules/bitrunning/objects/landmarks.dm @@ -72,19 +72,11 @@ encrypted_crate.abstract_move(selected_crate.loc) selected_crate.abstract_move(original_location) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// A location for mobs to spawn. /obj/effect/landmark/bitrunning/mob_segment name = "Bitrunning modular mob segment" icon_state = "mob_segment" -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Bitrunning safehouses. Typically 7x6 rooms with a single entrance. /obj/modular_map_root/safehouse config_file = "strings/modular_maps/safehouse.toml" diff --git a/code/modules/bitrunning/objects/vendor.dm b/code/modules/bitrunning/objects/vendor.dm index d40c5578d7c..d44630bc3be 100644 --- a/code/modules/bitrunning/objects/vendor.dm +++ b/code/modules/bitrunning/objects/vendor.dm @@ -62,11 +62,7 @@ /obj/machinery/computer/order_console/bitrunning/retrieve_points(obj/item/card/id/id_card) return round(id_card.registered_account.bitrunning_points) -<<<<<<< HEAD -/obj/machinery/computer/order_console/bitrunning/ui_act(action, params) -======= /obj/machinery/computer/order_console/bitrunning/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(!.) flick("vendor_off", src) diff --git a/code/modules/bitrunning/orders/tech.dm b/code/modules/bitrunning/orders/tech.dm index 51524d8e33e..9dd1db17c79 100644 --- a/code/modules/bitrunning/orders/tech.dm +++ b/code/modules/bitrunning/orders/tech.dm @@ -2,67 +2,38 @@ category_index = CATEGORY_BITRUNNING_TECH /datum/orderable_item/bitrunning_tech/item_tier1 -<<<<<<< HEAD - cost_per_order = 1000 -======= cost_per_order = 750 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_path = /obj/item/bitrunning_disk/item/tier1 desc = "This disk contains a program that lets you equip a medical beamgun, a C4 explosive, or a box of infinite pizza." /datum/orderable_item/bitrunning_tech/item_tier2 -<<<<<<< HEAD - cost_per_order = 1500 -======= cost_per_order = 1250 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_path = /obj/item/bitrunning_disk/item/tier2 desc = "This disk contains a program that lets you equip a luxury medipen, a pistol, or an armour vest." /datum/orderable_item/bitrunning_tech/item_tier3 -<<<<<<< HEAD - cost_per_order = 2500 -======= cost_per_order = 2000 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_path = /obj/item/bitrunning_disk/item/tier3 desc = "This disk contains a program that lets you equip an advanced energy gun, a dual bladed energy sword, or a minibomb." /datum/orderable_item/bitrunning_tech/ability_tier1 -<<<<<<< HEAD - cost_per_order = 1000 -======= cost_per_order = 750 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_path = /obj/item/bitrunning_disk/ability/tier1 desc = "This disk contains a program that lets you cast Summon Cheese or Lesser Heal." /datum/orderable_item/bitrunning_tech/ability_tier2 -<<<<<<< HEAD - cost_per_order = 1800 -======= cost_per_order = 1500 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_path = /obj/item/bitrunning_disk/ability/tier2 desc = "This disk contains a program that lets you cast Fireball, Lightning Bolt, or Forcewall." /datum/orderable_item/bitrunning_tech/ability_tier3 -<<<<<<< HEAD - cost_per_order = 3200 -======= cost_per_order = 2500 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_path = /obj/item/bitrunning_disk/ability/tier3 desc = "This disk contains a program that lets you shapeshift into a lesser ashdrake, or a polar bear." /datum/orderable_item/bitrunning_tech/flip_skillchip -<<<<<<< HEAD - item_path = /obj/item/skillchip/matrix_flip - cost_per_order = 2000 -======= item_path = /obj/item/skillchip/matrix_taunt cost_per_order = 1500 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/orderable_item/bitrunning_tech/pka_mod item_path = /obj/item/bitrunning_disk/item/pka_mods @@ -71,11 +42,7 @@ /datum/orderable_item/bitrunning_tech/pka_mod/premium item_path = /obj/item/bitrunning_disk/item/pka_mods/premium -<<<<<<< HEAD - cost_per_order = 1800 -======= cost_per_order = 1600 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "This disk contains a program that lets you equip stronger modkits for the proto-kinetic accelerator. Proto-kinetic accelerator not included." /datum/orderable_item/bitrunning_tech/pkc_mod @@ -85,9 +52,5 @@ /datum/orderable_item/bitrunning_tech/pkc_mod/premium item_path = /obj/item/bitrunning_disk/item/pkc_mods/premium -<<<<<<< HEAD - cost_per_order = 1800 -======= cost_per_order = 1600 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "This disk contains a program that lets you equip stronger trophies for the proto-kinetic crusher. Proto-kinetic crusher not included." diff --git a/code/modules/bitrunning/server/obj_generation.dm b/code/modules/bitrunning/server/obj_generation.dm index d76821b9de2..39aae3ecbaf 100644 --- a/code/modules/bitrunning/server/obj_generation.dm +++ b/code/modules/bitrunning/server/obj_generation.dm @@ -116,19 +116,12 @@ path = pick(generated_domain.mob_modules) var/datum/modular_mob_segment/segment = new path() -<<<<<<< HEAD - segment.spawn_mobs(get_turf(landmark)) - mutation_candidate_refs += segment.spawned_mob_refs - qdel(landmark) -======= - var/list/mob_spawns = landmark.spawn_mobs(get_turf(landmark), segment) if(length(mob_spawns)) mutation_candidate_refs += mob_spawns qdel(landmark) qdel(segment) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE diff --git a/code/modules/bitrunning/server/threats.dm b/code/modules/bitrunning/server/threats.dm index 04d68e212dc..6b9a334d925 100644 --- a/code/modules/bitrunning/server/threats.dm +++ b/code/modules/bitrunning/server/threats.dm @@ -176,11 +176,7 @@ /// Removes any invalid candidates from the list /obj/machinery/quantum_server/proc/validate_mutation_candidates() for(var/datum/weakref/creature_ref as anything in mutation_candidate_refs) -<<<<<<< HEAD - var/mob/living/creature = creature_ref.resolve() -======= var/mob/living/creature = creature_ref?.resolve() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(creature) || creature.mind) mutation_candidate_refs.Remove(creature_ref) diff --git a/code/modules/bitrunning/turfs.dm b/code/modules/bitrunning/turfs.dm index 03d6617c0dd..763388b6e08 100644 --- a/code/modules/bitrunning/turfs.dm +++ b/code/modules/bitrunning/turfs.dm @@ -1,9 +1,5 @@ /turf/open/indestructible/bitrunning_transport name = "circuit floor" -<<<<<<< HEAD - icon = 'icons/turf/floors.dmi' -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "Looks complex. You can see the circuits running through the floor." icon_state = "bitrunning" diff --git a/code/modules/bitrunning/virtual_domain/modular_mob_segment.dm b/code/modules/bitrunning/virtual_domain/modular_mob_segment.dm index 52a3379351c..94d2f9ce7c5 100644 --- a/code/modules/bitrunning/virtual_domain/modular_mob_segment.dm +++ b/code/modules/bitrunning/virtual_domain/modular_mob_segment.dm @@ -3,20 +3,6 @@ #define SPAWN_UNLIKELY 35 #define SPAWN_RARE 10 -<<<<<<< HEAD -/datum/modular_mob_segment - /// Spawn no more than this amount - var/max = 4 - /// Set this to false if you want explicitly what's in the list to spawn - var/exact = FALSE - /// The list of mobs to spawn - var/list/mob/living/mobs = list() - /// The mobs spawned from this segment - var/list/spawned_mob_refs = list() - /// Chance this will spawn (1 - 100) - var/probability = SPAWN_LIKELY - -======= /// Handles spawning mobs for this landmark. Sends a signal when done. /obj/effect/landmark/bitrunning/mob_segment/proc/spawn_mobs(turf/origin, datum/modular_mob_segment/segment) @@ -50,26 +36,17 @@ var/probability = SPAWN_LIKELY ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Spawns mobs in a circle around the location /datum/modular_mob_segment/proc/spawn_mobs(turf/origin) if(!prob(probability)) return -<<<<<<< HEAD - var/total_amount = exact ? rand(1, max) : length(mobs) - - shuffle_inplace(mobs) - - -======= var/list/mob/living/spawned_mobs = list() var/total_amount = exact ? length(mobs) : rand(1, max) shuffle_inplace(mobs) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/turf/nearby = list() for(var/turf/tile as anything in RANGE_TURFS(2, origin)) if(!tile.is_blocked_turf()) @@ -91,14 +68,10 @@ var/mob/living/mob = new path(destination) nearby -= destination -<<<<<<< HEAD - spawned_mob_refs.Add(WEAKREF(mob)) -======= spawned_mobs += mob return spawned_mobs ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Some generic mob segments. If you want to add generic ones for any map, add them here @@ -107,69 +80,41 @@ /mob/living/basic/pet/gondola, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/corgis max = 2 mobs = list( /mob/living/basic/pet/dog/corgi, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/monkeys mobs = list( /mob/living/carbon/human/species/monkey, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/syndicate_team mobs = list( /mob/living/basic/trooper/syndicate/ranged, /mob/living/basic/trooper/syndicate/melee, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/abductor_agents mobs = list( /mob/living/basic/trooper/abductor/melee, /mob/living/basic/trooper/abductor/ranged, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/syndicate_elite mobs = list( /mob/living/basic/trooper/syndicate/melee/sword/space/stormtrooper, /mob/living/basic/trooper/syndicate/ranged/space/stormtrooper, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/bears max = 2 mobs = list( /mob/living/basic/bear, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/bees exact = TRUE mobs = list( @@ -180,57 +125,33 @@ /mob/living/basic/bee/queen, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/bees_toxic mobs = list( /mob/living/basic/bee/toxin, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/blob_spores mobs = list( /mob/living/basic/blob_minion, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/carps mobs = list( /mob/living/basic/carp, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/hivebots mobs = list( /mob/living/basic/hivebot, /mob/living/basic/hivebot/range, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/hivebots_strong mobs = list( /mob/living/basic/hivebot/strong, /mob/living/basic/hivebot/range, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/lavaland_assorted mobs = list( /mob/living/basic/mining/basilisk, @@ -239,10 +160,6 @@ /mob/living/basic/mining/lobstrosity, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/spiders mobs = list( /mob/living/basic/spider/giant/ambush, @@ -252,19 +169,11 @@ /mob/living/basic/spider/giant/midwife, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/venus_trap mobs = list( /mob/living/basic/venus_human_trap, ) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/modular_mob_segment/xenos mobs = list( /mob/living/basic/alien, @@ -272,8 +181,6 @@ /mob/living/basic/alien/drone, ) -<<<<<<< HEAD -======= /datum/modular_mob_segment/deer max = 1 @@ -288,7 +195,6 @@ ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef SPAWN_ALWAYS #undef SPAWN_LIKELY #undef SPAWN_UNLIKELY diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm index 960c8a63035..2b378773517 100644 --- a/code/modules/buildmode/buttons.dm +++ b/code/modules/buildmode/buttons.dm @@ -28,10 +28,7 @@ return 1 /atom/movable/screen/buildmode/mode/update_icon_state() -<<<<<<< HEAD icon = bd.mode.button_icon // SKYRAT EDIT ADDITION - remove buildmode duplicate icons, divine tg and skyrat -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = bd.mode.get_button_iconstate() return ..() diff --git a/code/modules/capture_the_flag/ctf_classes.dm b/code/modules/capture_the_flag/ctf_classes.dm index 9cc9f2c5de4..8f6a03ba7df 100644 --- a/code/modules/capture_the_flag/ctf_classes.dm +++ b/code/modules/capture_the_flag/ctf_classes.dm @@ -55,11 +55,7 @@ var/obj/item/radio/headset = human_to_equip.ears headset.set_frequency(team_radio_freq) headset.freqlock = RADIO_FREQENCY_LOCKED -<<<<<<< HEAD - headset.independent = TRUE -======= headset.special_channels |= RADIO_SPECIAL_CENTCOM ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 human_to_equip.dna.species.stunmod = 0 /datum/outfit/ctf/instagib diff --git a/code/modules/cards/cardhand.dm b/code/modules/cards/cardhand.dm index 30eacdf5f11..8fc9b4d0dc7 100644 --- a/code/modules/cards/cardhand.dm +++ b/code/modules/cards/cardhand.dm @@ -67,11 +67,7 @@ qdel(src) // cardhand is empty now so delete it /obj/item/toy/cards/cardhand/proc/check_menu(mob/living/user) -<<<<<<< HEAD - return isliving(user) && !user.incapacitated() -======= return isliving(user) && !user.incapacitated ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/toy/cards/cardhand/attackby(obj/item/weapon, mob/living/user, params, flip_card = FALSE) var/obj/item/toy/singlecard/card diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm index ccb806644ff..96293208acd 100644 --- a/code/modules/cargo/bounties/mining.dm +++ b/code/modules/cargo/bounties/mining.dm @@ -25,11 +25,8 @@ description = "Station 12 has had their fire axes stolen by marauding clowns. Ship them a bone axe as a replacement." reward = CARGO_CRATE_VALUE * 15 wanted_types = list(/obj/item/fireaxe/boneaxe = TRUE) -<<<<<<< HEAD */ //END SKYRAT EDIT REMOVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bounty/item/mining/bone_armor name = "Bone Armor" @@ -49,11 +46,6 @@ reward = CARGO_CRATE_VALUE * 15 required_count = 3 wanted_types = list(/obj/item/clothing/accessory/talisman = TRUE) -<<<<<<< HEAD - -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bounty/item/mining/watcher_wreath name = "Watcher Wreaths" description = "Station 14's Research Director thinks they're onto a break-through on the cultural icons of some pagan beliefs. Ship them a few watcher wreaths for analysis." @@ -61,8 +53,6 @@ reward = CARGO_CRATE_VALUE * 15 required_count = 3 wanted_types = list(/obj/item/clothing/neck/wreath = TRUE) -<<<<<<< HEAD -======= /datum/bounty/item/mining/icewing_wreath name = "Icewing Wreath" @@ -70,15 +60,7 @@ reward = CARGO_CRATE_VALUE * 30 required_count = 1 wanted_types = list(/obj/item/clothing/neck/wreath/icewing = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 -/datum/bounty/item/mining/icewing_wreath - name = "Icewing Wreath" - description = "We're getting some....weird messages from Station 14's Research Director. And most of what they said was incoherent. But they apparently want an icewing wreath. Could you send them one?" - reward = CARGO_CRATE_VALUE * 30 - required_count = 1 - wanted_types = list(/obj/item/clothing/neck/wreath/icewing = TRUE) - //SKYRAT EDIT REMOVAL /* /datum/bounty/item/mining/bone_dagger @@ -87,11 +69,8 @@ reward = CARGO_CRATE_VALUE * 10 required_count = 3 wanted_types = list(/obj/item/knife/combat/bone = TRUE) -<<<<<<< HEAD */ //END SKYRAT EDIT REMOVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bounty/item/mining/polypore_mushroom name = "Mushroom Bowl" diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index 40874a70285..cd867615876 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -191,11 +191,7 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a data["soundVolume"] = temp_pod.soundVolume //Admin sound to play when the pod leaves return data -<<<<<<< HEAD -/datum/centcom_podlauncher/ui_act(action, params) -======= /datum/centcom_podlauncher/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/cargo/exports/sheets.dm b/code/modules/cargo/exports/sheets.dm index 0072ee00461..c3cb16eec6d 100644 --- a/code/modules/cargo/exports/sheets.dm +++ b/code/modules/cargo/exports/sheets.dm @@ -127,10 +127,6 @@ unit_name = "of meat" export_types = list(/obj/item/stack/sheet/meat) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Weird Stuff /datum/export/stack/abductor diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm index 0996ef5774d..0a2dcfec4b0 100644 --- a/code/modules/cargo/expressconsole.dm +++ b/code/modules/cargo/expressconsole.dm @@ -128,10 +128,7 @@ if(.) return -<<<<<<< HEAD -======= var/mob/user = ui.user ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(action) if("LZCargo") usingBeacon = FALSE @@ -168,13 +165,8 @@ var/mob/living/carbon/human/H = user name = H.get_authentification_name() rank = H.get_assignment(hand_first = TRUE) -<<<<<<< HEAD - else if(HAS_SILICON_ACCESS(usr)) - name = usr.real_name -======= else if(HAS_SILICON_ACCESS(user)) name = user.real_name ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rank = "Silicon" var/reason = "" var/list/empty_turfs diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm index d894a45742a..f7ce106d580 100644 --- a/code/modules/cargo/goodies.dm +++ b/code/modules/cargo/goodies.dm @@ -237,15 +237,12 @@ cost = PAYCHECK_CREW contains = list(/obj/item/storage/box/fishing_lines) -<<<<<<< HEAD -======= /datum/supply_pack/goody/fishing_lure_set name = "Fishing Lures Set" desc = "A set of bite-resistant fishing lures to fish all (most) sort of fish. Beat randomness to a curb today!" cost = PAYCHECK_CREW * 8 contains = list(/obj/item/storage/box/fishing_lures) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/goody/fishing_hook_rescue name = "Rescue Fishing Hook Single-Pack" desc = "For when your fellow miner has inevitably fallen into a chasm, and it's up to you to save them." @@ -261,11 +258,7 @@ /datum/supply_pack/goody/fish_feed name = "Can of Fish Food Single-Pack" desc = "For keeping your little friends fed and alive." -<<<<<<< HEAD - cost = PAYCHECK_CREW * 1 -======= cost = PAYCHECK_CREW ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 contains = list(/obj/item/fish_feed) /datum/supply_pack/goody/naturalbait diff --git a/code/modules/cargo/markets/market_uplink.dm b/code/modules/cargo/markets/market_uplink.dm index 5186c2fc9f8..17cad320426 100644 --- a/code/modules/cargo/markets/market_uplink.dm +++ b/code/modules/cargo/markets/market_uplink.dm @@ -98,11 +98,7 @@ )) return data -<<<<<<< HEAD -/obj/item/market_uplink/ui_act(action, params) -======= /obj/item/market_uplink/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm index fb907d4e529..ceb266db7f7 100644 --- a/code/modules/cargo/order.dm +++ b/code/modules/cargo/order.dm @@ -15,12 +15,10 @@ var/order_id = 0 var/errors = 0 -<<<<<<< HEAD -======= /obj/item/paper/requisition can_become_message_in_bottle = FALSE //A lot of these are spawned each round, they'd only dilute the pool and make it boring. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + /obj/item/paper/fluff/jobs/cargo/manifest/Initialize(mapload, id, cost, manifest_can_fail = TRUE) . = ..() order_id = id @@ -106,11 +104,7 @@ return round(cost) /datum/supply_order/proc/generateRequisition(turf/T) -<<<<<<< HEAD - var/obj/item/paper/requisition_paper = new(T) -======= var/obj/item/paper/requisition/requisition_paper = new(T) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 requisition_paper.name = "requisition form - #[id] ([pack.name])" var/requisition_text = "

[station_name()] Supply Requisition

" diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm index 149fb77cd2b..b28be360cd6 100644 --- a/code/modules/cargo/orderconsole.dm +++ b/code/modules/cargo/orderconsole.dm @@ -268,10 +268,7 @@ reason = reason, paying_account = account, coupon = applied_coupon, -<<<<<<< HEAD charge_on_purchase = TRUE, // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) working_list += order @@ -333,11 +330,7 @@ else //create the paper from the SSshuttle.shopping_list if(length(SSshuttle.shopping_list)) -<<<<<<< HEAD - var/obj/item/paper/requisition_paper = new(get_turf(src)) -======= var/obj/item/paper/requisition/requisition_paper = new(get_turf(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 requisition_paper.name = "requisition form - [station_time_timestamp()]" var/requisition_text = "

[station_name()] Supply Requisition

" requisition_text += "
" diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm index 0d2a829e1de..e8255a58e64 100644 --- a/code/modules/cargo/packs/engineering.dm +++ b/code/modules/cargo/packs/engineering.dm @@ -76,11 +76,7 @@ cost = CARGO_CRATE_VALUE * 4 contains = list(/obj/item/inducer/orderable = 2) crate_name = "inducer crate" -<<<<<<< HEAD - crate_type = /obj/structure/closet/crate/engineering/electrical -======= crate_type = /obj/structure/closet/crate/nakamura ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/engineering/pacman name = "P.A.C.M.A.N Generator Crate" @@ -90,11 +86,7 @@ access_view = ACCESS_ENGINEERING contains = list(/obj/machinery/power/port_gen/pacman) crate_name = "\improper PACMAN generator crate" -<<<<<<< HEAD - crate_type = /obj/structure/closet/crate/engineering/electrical -======= crate_type = /obj/structure/closet/crate/nakamura ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/engineering/power name = "Power Cell Crate" diff --git a/code/modules/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm index a3cf68403dd..24290ad612f 100644 --- a/code/modules/cargo/packs/imports.dm +++ b/code/modules/cargo/packs/imports.dm @@ -17,10 +17,7 @@ cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/gun/ballistic/shotgun/toy = 8) crate_name = "foam force crate" -<<<<<<< HEAD -======= crate_type = /obj/structure/closet/crate/freezer/donk ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 discountable = SUPPLY_PACK_STD_DISCOUNTABLE /datum/supply_pack/imports/foamforce/bonus @@ -34,10 +31,7 @@ /obj/item/ammo_box/magazine/toy/pistol = 2, ) crate_name = "foam force crate" -<<<<<<< HEAD -======= crate_type = /obj/structure/closet/crate/freezer/donk ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/imports/meatmeatmeatmeat // MEAT MEAT MEAT MEAT name = "MEAT MEAT MEAT MEAT MEAT" @@ -149,10 +143,7 @@ /obj/item/gun/ballistic/automatic/wt550 = 2, /obj/item/ammo_box/magazine/wt550m9 = 2, ) -<<<<<<< HEAD -======= crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/imports/wt550ammo name = "Smuggled WT-550 Ammo Crate" @@ -165,11 +156,7 @@ /obj/item/ammo_box/magazine/wt550m9/wtic = 2, ) crate_name = "emergency crate" -<<<<<<< HEAD - crate_type = /obj/structure/closet/crate/internals -======= crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/imports/shocktrooper name = "Shocktrooper Crate" @@ -185,10 +172,7 @@ /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet, ) -<<<<<<< HEAD -======= crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/imports/specialops name = "Special Ops Crate" @@ -204,14 +188,9 @@ /obj/item/switchblade, /obj/item/grenade/mirage = 5, ) -<<<<<<< HEAD // SKYRAT EDIT REMOVAL BEGIN - REPLACED BY LORE BEFITTING CRATE AT: modular_skyrat/modules/cargo/code/packs.dm /* -======= - crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/imports/russian name = "Russian Surplus Military Gear Crate" desc = "Hello <;~insert appropriate greeting here: 'Comrade'|'Imperalist Scum'|'Quartermaster of Reputable Station'~;>, \ @@ -243,11 +222,8 @@ for(var/items in 1 to 10) var/item = pick(contains) new item(our_crate) -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/imports/moistnuggets name = "Refurbished Sakhno Precision Rifle Crate" diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm index 5443e0fba5a..a112ada0e55 100644 --- a/code/modules/cargo/packs/medical.dm +++ b/code/modules/cargo/packs/medical.dm @@ -29,11 +29,7 @@ /obj/item/reagent_containers/hypospray/medipen/ekit = 3, /obj/item/reagent_containers/hypospray/medipen/blood_loss = 3) crate_name = "medipen crate" -<<<<<<< HEAD - crate_type = /obj/structure/closet/crate/medical -======= crate_type = /obj/structure/closet/crate/deforest ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/medical/coroner_crate name = "Autopsy Kit" @@ -142,10 +138,7 @@ /obj/item/emergency_bed, ) crate_name = "surgical supplies crate" -<<<<<<< HEAD -======= crate_type = /obj/structure/closet/crate/deforest ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/medical/salglucanister name = "Heavy-Duty Saline Canister" diff --git a/code/modules/cargo/packs/science.dm b/code/modules/cargo/packs/science.dm index cb416879bdc..6b4f38b95a0 100644 --- a/code/modules/cargo/packs/science.dm +++ b/code/modules/cargo/packs/science.dm @@ -189,8 +189,4 @@ access_view = ACCESS_ROBOTICS contains = list(/obj/item/mod/core/standard = 3) crate_name = "\improper MOD core crate" -<<<<<<< HEAD - crate_type = /obj/structure/closet/crate/secure/science/robo -======= crate_type = /obj/structure/closet/crate/nakamura ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm index a03ee476393..1823ef5174f 100644 --- a/code/modules/cargo/packs/security.dm +++ b/code/modules/cargo/packs/security.dm @@ -36,11 +36,7 @@ /datum/supply_pack/security/forensics name = "Forensics Crate" desc = "Stay hot on the criminal's heels with Nanotrasen's Detective Essentials™. \ -<<<<<<< HEAD - Contains a forensics scanner, six evidence bags, camera, tape recorder, stick of chalk, \ -======= Contains a forensics scanner, six evidence bags, camera, special board for evidences, tape recorder, stick of chalk, \ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 and of course, a fedora." cost = CARGO_CRATE_VALUE * 2.5 access_view = ACCESS_MORGUE @@ -50,10 +46,7 @@ /obj/item/taperecorder, /obj/item/toy/crayon/white, /obj/item/clothing/head/fedora/det_hat, -<<<<<<< HEAD -======= /obj/item/wallframe/detectiveboard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) crate_name = "forensics crate" diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm index 5b6bfb3746e..26af45f960a 100644 --- a/code/modules/cargo/packs/service.dm +++ b/code/modules/cargo/packs/service.dm @@ -245,11 +245,7 @@ /obj/item/food/ready_donk/donkhiladas, ) crate_name = "\improper Ready-Donk crate" -<<<<<<< HEAD - crate_type = /obj/structure/closet/crate/freezer/food -======= crate_type = /obj/structure/closet/crate/freezer/donk ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 discountable = SUPPLY_PACK_UNCOMMON_DISCOUNTABLE /datum/supply_pack/service/randomized/ready_donk/fill(obj/structure/closet/crate/C) @@ -273,10 +269,7 @@ /obj/item/reagent_containers/cup/bottle/syrup_bottle/caramel, //one extra syrup as a treat ) crate_name = "coffee equipment crate" -<<<<<<< HEAD -======= crate_type = /obj/structure/closet/crate/robust ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 discountable = SUPPLY_PACK_UNCOMMON_DISCOUNTABLE /datum/supply_pack/service/coffeemaker @@ -317,11 +310,7 @@ desc = "A fairly outdated copy of 'Whittle Me This: Fletching for the Modern Spacer', along with some useful materials. \ For those looking to get into bow-making, or give their LARPing a little more edge, you can't go wrong. Also has \ instructions for making violins." -<<<<<<< HEAD - cost = CARGO_CRATE_VALUE * 1.5 -======= cost = CARGO_CRATE_VALUE * 5 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 contains = list( /obj/item/book/granter/crafting_recipe/fletching = 1, /obj/item/stack/sheet/mineral/wood = 10, diff --git a/code/modules/cargo/packs/vending_restock.dm b/code/modules/cargo/packs/vending_restock.dm index b760eae81d6..e5ae6f25c93 100644 --- a/code/modules/cargo/packs/vending_restock.dm +++ b/code/modules/cargo/packs/vending_restock.dm @@ -17,9 +17,6 @@ cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/vending_refill/cigarette) crate_name = "cigarette supply crate" -<<<<<<< HEAD - crate_type = /obj/structure/closet/crate -======= crate_type = /obj/structure/closet/crate/robust /datum/supply_pack/vending/science/cytopro @@ -28,7 +25,6 @@ cost = CARGO_CRATE_VALUE * 3 contains = list(/obj/item/vending_refill/cytopro) crate_name = "cytopro supply crate" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/vending/dinnerware name = "Dinnerware Supply Crate" @@ -117,10 +113,7 @@ cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/vending_refill/snack) crate_name = "snacks supply crate" -<<<<<<< HEAD -======= crate_type = /obj/structure/closet/crate/robust ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/supply_pack/vending/cola name = "Softdrinks Supply Crate" diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 9cffee81323..f5915eaed37 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -321,14 +321,11 @@ var/mob/living/carbon/carbon_target_mob = target_living for(var/obj/item/organ/organ_to_yeet as anything in carbon_target_mob.organs) var/destination = get_edge_target_turf(turf_underneath, pick(GLOB.alldirs)) //Pick a random direction to toss them in -<<<<<<< HEAD // SKYRAT EDIT START - Non-spillable organs if(!organ_to_yeet.drop_when_organ_spilling) qdel(organ_to_yeet) continue // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 organ_to_yeet.Remove(carbon_target_mob) //Note that this isn't the same proc as for lists organ_to_yeet.forceMove(turf_underneath) //Move the organ outta the body organ_to_yeet.throw_at(destination, 2, 3) //Thow the organ at a random tile 3 spots away diff --git a/code/modules/cargo/universal_scanner.dm b/code/modules/cargo/universal_scanner.dm index 1919dcdcd15..9ce1771421e 100644 --- a/code/modules/cargo/universal_scanner.dm +++ b/code/modules/cargo/universal_scanner.dm @@ -257,11 +257,7 @@ /obj/item/universal_scanner/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index f03fbd74b85..c8e9e9a64c2 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -45,11 +45,6 @@ var/datum/click_intercept = null ///Time when the click was intercepted var/click_intercept_time = 0 -<<<<<<< HEAD - ///Used for admin AI interaction - var/AI_Interact = FALSE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Used to cache this client's bans to save on DB queries var/ban_cache = null diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 270501b8b5b..0f910df5c28 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -357,14 +357,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( else if(GLOB.deadmins[ckey]) add_verb(src, /client/proc/readmin) connecting_admin = TRUE -<<<<<<< HEAD //SKYRAT EDIT ADDITION //We will check the population here, because we need to know if the client is an admin or not. if(!check_population(connecting_admin)) qdel(src) return // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(CONFIG_GET(flag/autoadmin)) if(!GLOB.admin_datums[ckey]) var/list/autoadmin_ranks = ranks_from_rank_name(CONFIG_GET(string/autoadmin_rank)) @@ -663,11 +660,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(!query_client_in_db.Execute()) qdel(query_client_in_db) return -<<<<<<< HEAD -/* -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/* SKYRAT EDIT - ORIGINAL: var/client_is_in_db = query_client_in_db.NextRow() // If we aren't an admin, and the flag is set (the panic bunker is enabled). if(CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey]) @@ -699,7 +692,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( qdel(query_client_in_db) qdel(src) return -<<<<<<< HEAD */ var/client_is_in_db = query_client_in_db.NextRow() @@ -720,10 +712,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( qdel(src) return //SKYRAT EDIT END -======= - - if(!client_is_in_db) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new_player = 1 account_join_date = findJoinDate() var/datum/db_query/query_add_player = SSdbcore.NewQuery({" diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 792b90a9fff..c6cd7d3d129 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -9,11 +9,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) /// Ensures that we always load the last used save, QOL var/default_slot = 1 /// The maximum number of slots we're allowed to contain -<<<<<<< HEAD var/max_save_slots = 30 //SKYRAT EDIT - ORIGINAL 3 -======= - var/max_save_slots = 3 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Bitflags for communications that are muted var/muted = NONE @@ -96,13 +92,10 @@ GLOBAL_LIST_EMPTY(preferences_datums) QDEL_NULL(character_preview_view) QDEL_LIST(middleware) value_cache = null -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(pref_species) QDEL_NULL(pref_species) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /datum/preferences/New(client/parent) @@ -117,14 +110,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(load_and_save && !fexists(path)) try_savefile_type_migration() unlock_content = !!parent.IsByondMember() -<<<<<<< HEAD donator_status = !!GLOB.donator_list[parent.ckey] //SKYRAT EDIT ADD - DONATOR CHECK if(unlock_content || donator_status) //SKYRAT EDIT - ADD DONATOR CHECK max_save_slots = 50 //SKYRAT EDIT - ORIGINAL 8 -======= - if(unlock_content) - max_save_slots = 8 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else CRASH("attempted to create a preferences datum without a client or mock!") load_savefile() @@ -187,7 +175,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) data["character_profiles"] = create_character_profiles() tainted_character_profiles = FALSE -<<<<<<< HEAD //SKYRAT EDIT BEGIN data["preview_selection"] = preview_pref @@ -304,89 +291,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) if (isnull(requested_preference)) return FALSE -======= - data["character_preferences"] = compile_character_preferences(user) - - data["active_slot"] = default_slot - - for (var/datum/preference_middleware/preference_middleware as anything in middleware) - data += preference_middleware.get_ui_data(user) - - return data - -/datum/preferences/ui_static_data(mob/user) - var/list/data = list() - - data["character_profiles"] = create_character_profiles() - - data["character_preview_view"] = character_preview_view.assigned_map - data["overflow_role"] = SSjob.GetJobType(SSjob.overflow_role).title - data["window"] = current_window - - data["content_unlocked"] = unlock_content - - for (var/datum/preference_middleware/preference_middleware as anything in middleware) - data += preference_middleware.get_ui_static_data(user) - - return data - -/datum/preferences/ui_assets(mob/user) - var/list/assets = list( - get_asset_datum(/datum/asset/spritesheet/preferences), - get_asset_datum(/datum/asset/json/preferences), - ) - - for (var/datum/preference_middleware/preference_middleware as anything in middleware) - assets += preference_middleware.get_ui_assets() - - return assets - -/datum/preferences/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) - . = ..() - if (.) - return - - switch (action) - if ("change_slot") - // Save existing character - save_character() - // SAFETY: `switch_to_slot` performs sanitization on the slot number - switch_to_slot(params["slot"]) - return TRUE - if ("remove_current_slot") - remove_current_slot() - return TRUE - if ("rotate") - character_preview_view.setDir(turn(character_preview_view.dir, -90)) - return TRUE - if ("set_preference") - var/requested_preference_key = params["preference"] - var/value = params["value"] - - for (var/datum/preference_middleware/preference_middleware as anything in middleware) - if (preference_middleware.pre_set_preference(usr, requested_preference_key, value)) - return TRUE - - var/datum/preference/requested_preference = GLOB.preference_entries_by_key[requested_preference_key] - if (isnull(requested_preference)) - return FALSE - - // SAFETY: `update_preference` performs validation checks - if (!update_preference(requested_preference, value)) - return FALSE - - if (istype(requested_preference, /datum/preference/name)) - tainted_character_profiles = TRUE - - return TRUE - if ("set_color_preference") - var/requested_preference_key = params["preference"] - - var/datum/preference/requested_preference = GLOB.preference_entries_by_key[requested_preference_key] - if (isnull(requested_preference)) - return FALSE - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!istype(requested_preference, /datum/preference/color)) return FALSE @@ -407,7 +311,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) return FALSE return TRUE -<<<<<<< HEAD //SKYRAT EDIT ADDITION if("update_preview") preview_pref = params["updated_preview"] @@ -457,8 +360,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) return TRUE //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for (var/datum/preference_middleware/preference_middleware as anything in middleware) var/delegation = preference_middleware.action_delegations[action] @@ -685,28 +586,19 @@ GLOBAL_LIST_EMPTY(preferences_datums) apply_prefs_to(character, icon_updates) /// Applies the given preferences to a human mob. -<<<<<<< HEAD /datum/preferences/proc/apply_prefs_to(mob/living/carbon/human/character, icon_updates = TRUE, visuals_only = FALSE) // SKYRAT EDIT - Customization - ORIGINAL: /datum/preferences/proc/apply_prefs_to(mob/living/carbon/human/character, icon_updates = TRUE) character.dna.features = MANDATORY_FEATURE_LIST //SKYRAT EDIT CHANGE - We need to instansiate the list with the basic features. -======= -/datum/preferences/proc/apply_prefs_to(mob/living/carbon/human/character, icon_updates = TRUE) - character.dna.features = list() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for (var/datum/preference/preference as anything in get_preferences_in_priority_order()) if (preference.savefile_identifier != PREFERENCE_CHARACTER) continue -<<<<<<< HEAD - preference.apply_to_human(character, read_preference(preference.type), src) + preference.apply_to_human(character, read_preference(preference.type), src) // SKYRAT EDIT - src // SKYRAT EDIT ADDITION START - middleware apply human prefs for (var/datum/preference_middleware/preference_middleware as anything in middleware) preference_middleware.apply_to_human(character, src, visuals_only = visuals_only) // SKYRAT EDIT ADDITION END -======= - preference.apply_to_human(character, read_preference(preference.type)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 character.dna.real_name = character.real_name diff --git a/code/modules/client/preferences/_preference.dm b/code/modules/client/preferences/_preference.dm index 9cee4dae28f..cf3809ca42a 100644 --- a/code/modules/client/preferences/_preference.dm +++ b/code/modules/client/preferences/_preference.dm @@ -111,13 +111,6 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key()) /// DOES have random body on, will this already be randomized? var/randomize_by_default = TRUE -<<<<<<< HEAD - /// If the selected species has this in its /datum/species/mutant_bodyparts, - /// will show the feature as selectable. - var/relevant_mutant_bodypart = null - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// If the selected species has this in its /datum/species/body_markings, /// will show the feature as selectable. var/relevant_body_markings = null @@ -224,11 +217,7 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key()) /// Apply this preference onto the given human. /// Must be overriden by subtypes. /// Called when the savefile_identifier == PREFERENCE_CHARACTER. -<<<<<<< HEAD /datum/preference/proc/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences) //SKYRAT EDIT CHANGE -======= -/datum/preference/proc/apply_to_human(mob/living/carbon/human/target, value) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SHOULD_NOT_SLEEP(TRUE) SHOULD_CALL_PARENT(FALSE) CRASH("`apply_to_human()` was not implemented for [type]!") @@ -297,12 +286,9 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key()) /// This will, for instance, update the character preference view. /// Performs sanity checks. /datum/preferences/proc/update_preference(datum/preference/preference, preference_value) -<<<<<<< HEAD -======= if (!preference.is_accessible(src)) return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/new_value = preference.deserialize(preference_value, src) var/success = preference.write(null, new_value) @@ -346,12 +332,7 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key()) SHOULD_NOT_SLEEP(TRUE) if ( \ -<<<<<<< HEAD - !isnull(relevant_mutant_bodypart) \ - || !isnull(relevant_inherent_trait) \ -======= !isnull(relevant_inherent_trait) \ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 || !isnull(relevant_external_organ) \ || !isnull(relevant_head_flag) \ || !isnull(relevant_body_markings) \ diff --git a/code/modules/client/preferences/body_type.dm b/code/modules/client/preferences/body_type.dm index ec0191d6649..6b27e0f0f0d 100644 --- a/code/modules/client/preferences/body_type.dm +++ b/code/modules/client/preferences/body_type.dm @@ -27,7 +27,3 @@ return initial(species.sexes) #undef USE_GENDER -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/clothing.dm b/code/modules/client/preferences/clothing.dm index a8fca84732c..e19be484925 100644 --- a/code/modules/client/preferences/clothing.dm +++ b/code/modules/client/preferences/clothing.dm @@ -1,25 +1,13 @@ -<<<<<<< HEAD /proc/generate_underwear_icon(datum/sprite_accessory/accessory, icon/base_icon, color, icon_offset = 0) //SKYRAT EDIT CHANGE : adds icon_offset - Colorable Undershirt/Socks var/icon/final_icon = new(base_icon) if (!isnull(accessory)) var/icon/accessory_icon = icon(accessory.icon, accessory.icon_state) // SKYRAT EDIT CHANGE: ORIGINAL - var/icon/accessory_icon = icon('icons/mob/clothing/underwear.dmi', accessory.icon_state) -======= -/proc/generate_underwear_icon(datum/sprite_accessory/accessory, icon/base_icon, color) - var/icon/final_icon = new(base_icon) - - if (!isnull(accessory)) - var/icon/accessory_icon = icon('icons/mob/clothing/underwear.dmi', accessory.icon_state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (color && !accessory.use_static) accessory_icon.Blend(color, ICON_MULTIPLY) final_icon.Blend(accessory_icon, ICON_OVERLAY) -<<<<<<< HEAD final_icon.Crop(10, 1+icon_offset, 22, 13+icon_offset) //SKYRAT EDIT CHANGE : adds icon_offset - Colorable Undershirt/Socks -======= - final_icon.Crop(10, 1, 22, 13) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 final_icon.Scale(32, 32) return final_icon @@ -105,18 +93,6 @@ /datum/preference/choiced/jumpsuit/apply_to_human(mob/living/carbon/human/target, value) target.jumpsuit_style = value -<<<<<<< HEAD -/datum/preference/choiced/jumpsuit/create_informed_default_value(datum/preferences/preferences) - switch(preferences.read_preference(/datum/preference/choiced/gender)) - if(MALE) - return PREF_SUIT - if(FEMALE) - return PREF_SKIRT - - return ..() - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Socks preference /datum/preference/choiced/socks savefile_key = "socks" @@ -161,10 +137,7 @@ /datum/preference/choiced/undershirt/create_default_value() return /datum/sprite_accessory/undershirt/nude::name -<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL - sports bra doesn't exist as an undershirt. so just let this default to naked and we'll add underwear elsewhere -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/undershirt/create_informed_default_value(datum/preferences/preferences) switch(preferences.read_preference(/datum/preference/choiced/gender)) if(MALE) @@ -173,10 +146,7 @@ return /datum/sprite_accessory/undershirt/sports_bra::name return ..() -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/undershirt/icon_for(value) var/static/icon/body @@ -193,15 +163,9 @@ if (value != "Nude") var/datum/sprite_accessory/accessory = SSaccessories.undershirt_list[value] -<<<<<<< HEAD icon_with_undershirt.Blend(icon(accessory.icon, accessory.icon_state), ICON_OVERLAY)// SKYRAT EDIT CHANGE: ORIGINAL - icon_with_undershirt.Blend(icon('icons/mob/clothing/underwear.dmi', accessory.icon_state), ICON_OVERLAY) icon_with_undershirt.Crop(10, 11, 22, 23) // SKYRAT EDIT CHANGE : ORIGINAL - icon_with_undershirt.Crop(9, 9, 23, 23) -======= - icon_with_undershirt.Blend(icon('icons/mob/clothing/underwear.dmi', accessory.icon_state), ICON_OVERLAY) - - icon_with_undershirt.Crop(9, 9, 23, 23) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_with_undershirt.Scale(32, 32) return icon_with_undershirt @@ -232,11 +196,7 @@ lower_half.Blend(icon('icons/mob/human/bodyparts_greyscale.dmi', "human_r_leg"), ICON_OVERLAY) lower_half.Blend(icon('icons/mob/human/bodyparts_greyscale.dmi', "human_l_leg"), ICON_OVERLAY) -<<<<<<< HEAD return generate_underwear_icon(SSaccessories.underwear_list[value], lower_half, COLOR_ALMOST_BLACK, icon_offset = 5) // SKYRAT EDIT CHANGE : ICON_OFFSET // SKYRAT EDIT CHANGE - ORIGINAL: return generate_underwear_icon(SSaccessories.underwear_list[value], lower_half, COLOR_ALMOST_BLACK) -======= - return generate_underwear_icon(SSaccessories.underwear_list[value], lower_half, COLOR_ALMOST_BLACK) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/underwear/apply_to_human(mob/living/carbon/human/target, value) target.underwear = value diff --git a/code/modules/client/preferences/gender.dm b/code/modules/client/preferences/gender.dm index 3cb72351bbf..4861fae7e1a 100644 --- a/code/modules/client/preferences/gender.dm +++ b/code/modules/client/preferences/gender.dm @@ -8,15 +8,10 @@ return list(MALE, FEMALE, PLURAL, NEUTER) /datum/preference/choiced/gender/apply_to_human(mob/living/carbon/human/target, value) -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - Did you just assume my gender??? if(!target.dna.species.sexes) value = PLURAL //disregard gender preferences on this species */ // SKYRAT EDIT REMOVAL END -======= - if(!target.dna.species.sexes) - value = PLURAL //disregard gender preferences on this species ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.gender = value /datum/preference/choiced/gender/create_informed_default_value(datum/preferences/preferences) diff --git a/code/modules/client/preferences/language.dm b/code/modules/client/preferences/language.dm index 4b40ba9735f..dbe4c700a31 100644 --- a/code/modules/client/preferences/language.dm +++ b/code/modules/client/preferences/language.dm @@ -23,10 +23,7 @@ //we add uncommon as it's foreigner-only. var/datum/language/uncommon/uncommon_language = /datum/language/uncommon values += initial(uncommon_language.name) -<<<<<<< HEAD values += /datum/language/common::name // SKYRAT EDIT ADDITION START - Let's you select common -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/language/language_type as anything in GLOB.uncommon_roundstart_languages) if(initial(language_type.name) in values) diff --git a/code/modules/client/preferences/middleware/_middleware.dm b/code/modules/client/preferences/middleware/_middleware.dm index c13a2f0cb86..6c666544883 100644 --- a/code/modules/client/preferences/middleware/_middleware.dm +++ b/code/modules/client/preferences/middleware/_middleware.dm @@ -43,18 +43,13 @@ /datum/preference_middleware/proc/get_character_preferences(mob/user) return null -<<<<<<< HEAD -/// Called before every update_preference, returns TRUE if this handled it. -======= /// Called every set_preference, returns TRUE if this handled it. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference_middleware/proc/pre_set_preference(mob/user, preference, value) return FALSE /// Called when a character is changed. /datum/preference_middleware/proc/on_new_character(mob/user) return -<<<<<<< HEAD // SKYRAT EDIT /// Called after every update_preference, returns TRUE if this handled it. @@ -67,5 +62,3 @@ SHOULD_CALL_PARENT(FALSE) return //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/middleware/jobs.dm b/code/modules/client/preferences/middleware/jobs.dm index 05b924b3b54..39dfee71b9f 100644 --- a/code/modules/client/preferences/middleware/jobs.dm +++ b/code/modules/client/preferences/middleware/jobs.dm @@ -1,12 +1,9 @@ /datum/preference_middleware/jobs action_delegations = list( "set_job_preference" = PROC_REF(set_job_preference), -<<<<<<< HEAD // SKYRAT EDIT "set_job_title" = PROC_REF(set_job_title), // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /datum/preference_middleware/jobs/proc/set_job_preference(list/params, mob/user) @@ -31,7 +28,6 @@ return TRUE -<<<<<<< HEAD // SKYRAT EDIT /datum/preference_middleware/jobs/proc/set_job_title(list/params, mob/user) var/job_title = params["job"] @@ -50,8 +46,6 @@ return TRUE // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference_middleware/jobs/get_constant_data() var/list/data = list() @@ -81,11 +75,8 @@ jobs[job.title] = list( "description" = job.description, "department" = department_name, -<<<<<<< HEAD "veteran" = job.veteran_only, // SKYRAT EDIT "alt_titles" = job.alt_titles, // SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) data["departments"] = departments @@ -95,7 +86,6 @@ /datum/preference_middleware/jobs/get_ui_data(mob/user) var/list/data = list() -<<<<<<< HEAD // SKYRAT EDIT if(isnull(preferences.alt_job_titles)) preferences.alt_job_titles = list() @@ -105,23 +95,17 @@ data["job_alt_titles"] = preferences.alt_job_titles data["species_restricted_jobs"] = get_unavailable_jobs_for_species() // SKYRAT EDIT END -======= - - data["job_preferences"] = preferences.job_preferences ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data /datum/preference_middleware/jobs/get_ui_static_data(mob/user) var/list/data = list() -<<<<<<< HEAD + // SKYRAT EDIT if(CONFIG_GET(flag/bypass_veteran_system) || SSplayer_ranks.is_veteran(user.client)) data["is_veteran"] = TRUE // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/required_job_playtime = get_required_job_playtime(user) if (!isnull(required_job_playtime)) data += required_job_playtime @@ -129,10 +113,7 @@ var/list/job_bans = get_job_bans(user) if (job_bans.len) data["job_bans"] = job_bans -<<<<<<< HEAD -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data.len > 0 ? data : null /datum/preference_middleware/jobs/proc/get_required_job_playtime(mob/user) @@ -172,8 +153,6 @@ data += job.title return data -<<<<<<< HEAD - //SKYRAT EDIT ADDITION BEGIN - CHECKING FOR INCOMPATIBLE SPECIES //This returns a list of jobs that are unavailable for the player's current species /datum/preference_middleware/jobs/proc/get_unavailable_jobs_for_species() @@ -186,5 +165,4 @@ return data //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + diff --git a/code/modules/client/preferences/middleware/keybindings.dm b/code/modules/client/preferences/middleware/keybindings.dm index 2b964fff933..07ec54d3cbc 100644 --- a/code/modules/client/preferences/middleware/keybindings.dm +++ b/code/modules/client/preferences/middleware/keybindings.dm @@ -27,10 +27,7 @@ preferences.key_bindings = deep_copy_list(GLOB.default_hotkeys) preferences.key_bindings_by_key = preferences.get_key_bindings_by_key(preferences.key_bindings) preferences.update_static_data(user) -<<<<<<< HEAD -======= user.client.update_special_keybinds() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE @@ -45,18 +42,11 @@ preferences.key_bindings_by_key = preferences.get_key_bindings_by_key(preferences.key_bindings) preferences.update_static_data(user) -<<<<<<< HEAD - - return TRUE - -/datum/preference_middleware/keybindings/proc/set_keybindings(list/params) -======= user.client.update_special_keybinds() return TRUE /datum/preference_middleware/keybindings/proc/set_keybindings(list/params, mob/user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/keybind_name = params["keybind_name"] if (isnull(GLOB.keybindings_by_name[keybind_name])) @@ -85,11 +75,8 @@ preferences.key_bindings[keybind_name] = hotkeys preferences.key_bindings_by_key = preferences.get_key_bindings_by_key(preferences.key_bindings) -<<<<<<< HEAD -======= user.client.update_special_keybinds() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /datum/asset/json/keybindings diff --git a/code/modules/client/preferences/middleware/quirks.dm b/code/modules/client/preferences/middleware/quirks.dm index d35120f5ee3..dce491c6c15 100644 --- a/code/modules/client/preferences/middleware/quirks.dm +++ b/code/modules/client/preferences/middleware/quirks.dm @@ -48,10 +48,7 @@ "value" = initial(quirk.value), "customizable" = constant_data?.is_customizable(), "customization_options" = customization_options, -<<<<<<< HEAD "veteran_only" = initial(quirk.veteran_only), // SKYRAT EDIT - Veteran quirks -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) return list( @@ -67,7 +64,6 @@ /datum/preference_middleware/quirks/proc/give_quirk(list/params, mob/user) var/quirk_name = params["quirk"] -<<<<<<< HEAD //SKYRAT EDIT ADDITION var/list/quirks = SSquirks.get_quirks() var/datum/quirk/quirk = quirks[quirk_name] @@ -77,10 +73,6 @@ var/list/new_quirks = preferences.all_quirks | quirk_name if (SSquirks.filter_invalid_quirks(new_quirks, preferences.augments) != new_quirks)// SKYRAT EDIT - AUGMENTS+ -======= - var/list/new_quirks = preferences.all_quirks | quirk_name - if (SSquirks.filter_invalid_quirks(new_quirks) != new_quirks) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // If the client is sending an invalid give_quirk, that means that // something went wrong with the client prediction, so we should // catch it back up to speed. @@ -96,14 +88,10 @@ var/quirk_name = params["quirk"] var/list/new_quirks = preferences.all_quirks - quirk_name -<<<<<<< HEAD - if (!(quirk_name in preferences.all_quirks) || SSquirks.filter_invalid_quirks(new_quirks, preferences.augments) != new_quirks)// SKYRAT EDIT - AUGMENTS+ -======= if ( \ !(quirk_name in preferences.all_quirks) \ - || SSquirks.filter_invalid_quirks(new_quirks) != new_quirks \ - ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + || SSquirks.filter_invalid_quirks(new_quirks, preferences.augments) != new_quirks \ + )// SKYRAT EDIT - AUGMENTS+ // If the client is sending an invalid remove_quirk, that means that // something went wrong with the client prediction, so we should // catch it back up to speed. @@ -119,7 +107,6 @@ var/list/selected_quirks = list() for (var/quirk in preferences.all_quirks) -<<<<<<< HEAD //SKYRAT EDIT ADDITION var/list/quirks = SSquirks.get_quirks() var/datum/quirk/quirk_datum = quirks[quirk] @@ -127,8 +114,6 @@ preferences.all_quirks -= quirk continue //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 selected_quirks += sanitize_css_class_name(quirk) return selected_quirks diff --git a/code/modules/client/preferences/middleware/species.dm b/code/modules/client/preferences/middleware/species.dm index 8a74f5a3ce3..b8c5e000680 100644 --- a/code/modules/client/preferences/middleware/species.dm +++ b/code/modules/client/preferences/middleware/species.dm @@ -13,11 +13,7 @@ /datum/asset/spritesheet/species/create_spritesheets() var/list/to_insert = list() -<<<<<<< HEAD for (var/species_id in get_selectable_species() | get_customizable_races()) // SKYRAT EDIT CHANGE - ORIGINAL: for (var/species_id in get_selectable_species()) -======= - for (var/species_id in get_selectable_species()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/species/species_type = GLOB.species_list[species_id] var/mob/living/carbon/human/dummy/consistent/dummy = new diff --git a/code/modules/client/preferences/names.dm b/code/modules/client/preferences/names.dm index fdda0b0e14a..f7c77f10fd2 100644 --- a/code/modules/client/preferences/names.dm +++ b/code/modules/client/preferences/names.dm @@ -12,11 +12,7 @@ var/group /// Whether or not to allow numbers in the person's name -<<<<<<< HEAD - var/allow_numbers = TRUE //SKYRAT EDIT CHANGE -======= - var/allow_numbers = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + var/allow_numbers = TRUE //SKYRAT EDIT CHANGE Caligra be damned if not /// If the highest priority job matches this, will prioritize this name in the UI var/relevant_job diff --git a/code/modules/client/preferences/species.dm b/code/modules/client/preferences/species.dm index 48f52a9e1a4..998fad31ca3 100644 --- a/code/modules/client/preferences/species.dm +++ b/code/modules/client/preferences/species.dm @@ -24,7 +24,6 @@ for (var/species_id in get_selectable_species()) values += GLOB.species_list[species_id] -<<<<<<< HEAD //SKYRAT EDIT ADDITION for (var/species_id in get_customizable_races()) values += GLOB.species_list[species_id] @@ -44,21 +43,11 @@ gent.aroused = prefs.arousal_preview gent.update_sprite_suffix() //SKYRAT EDIT END -======= - return values - -/datum/preference/choiced/species/apply_to_human(mob/living/carbon/human/target, value) - target.set_species(value, icon_update = FALSE, pref_load = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/species/compile_constant_data() var/list/data = list() -<<<<<<< HEAD for (var/species_id in (get_selectable_species() + get_customizable_races())) //SKYRAT EDIT CHANGE -======= - for (var/species_id in get_selectable_species()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/species_type = GLOB.species_list[species_id] var/datum/species/species = GLOB.species_prototypes[species_type] @@ -72,9 +61,6 @@ data[species_id]["enabled_features"] = species.get_features() data[species_id]["perks"] = species.get_species_perks() data[species_id]["diet"] = species.get_species_diet() -<<<<<<< HEAD data[species_id]["veteran_only"] = species.veteran_only // SKYRAT EDIT ADDITION - Veteran races -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data diff --git a/code/modules/client/preferences/species_features/felinid.dm b/code/modules/client/preferences/species_features/felinid.dm index b6783a528ae..8bf49fac227 100644 --- a/code/modules/client/preferences/species_features/felinid.dm +++ b/code/modules/client/preferences/species_features/felinid.dm @@ -1,7 +1,4 @@ -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/tail_human savefile_key = "feature_human_tail" savefile_identifier = PREFERENCE_CHARACTER @@ -24,11 +21,7 @@ savefile_identifier = PREFERENCE_CHARACTER category = PREFERENCE_CATEGORY_SECONDARY_FEATURES can_randomize = FALSE -<<<<<<< HEAD relevant_mutant_bodypart = "ears" -======= - relevant_external_organ = /obj/item/organ/internal/ears/cat ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/ears/init_possible_values() return assoc_to_keys_features(SSaccessories.ears_list) @@ -37,11 +30,7 @@ target.dna.features["ears"] = value /datum/preference/choiced/ears/create_default_value() -<<<<<<< HEAD var/datum/sprite_accessory/ears/cat/ears = /datum/sprite_accessory/ears/cat return initial(ears.name) return /datum/sprite_accessory/ears/cat::name */ -======= - return /datum/sprite_accessory/ears/cat::name ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/species_features/lizard.dm b/code/modules/client/preferences/species_features/lizard.dm index b2e10d2db26..2292e3f3e83 100644 --- a/code/modules/client/preferences/species_features/lizard.dm +++ b/code/modules/client/preferences/species_features/lizard.dm @@ -1,7 +1,4 @@ -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/generate_lizard_side_shot(datum/sprite_accessory/sprite_accessory, key, include_snout = TRUE) var/static/icon/lizard var/static/icon/lizard_with_snout @@ -97,15 +94,6 @@ savefile_key = "feature_lizard_legs" savefile_identifier = PREFERENCE_CHARACTER category = PREFERENCE_CATEGORY_SECONDARY_FEATURES -<<<<<<< HEAD - relevant_mutant_bodypart = "legs" - -/datum/preference/choiced/lizard_legs/init_possible_values() - return assoc_to_keys_features(SSaccessories.legs_list) - -/datum/preference/choiced/lizard_legs/apply_to_human(mob/living/carbon/human/target, value) - target.dna.features["legs"] = value -======= /datum/preference/choiced/lizard_legs/init_possible_values() return list(NORMAL_LEGS, DIGITIGRADE_LEGS) @@ -151,7 +139,6 @@ var/datum/species/species_type = preferences.read_preference(/datum/preference/choiced/species) return initial(species_type.digitigrade_customization) & DIGITIGRADE_OPTIONAL ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/lizard_snout savefile_key = "feature_lizard_snout" @@ -173,11 +160,7 @@ savefile_key = "feature_lizard_spines" savefile_identifier = PREFERENCE_CHARACTER category = PREFERENCE_CATEGORY_SECONDARY_FEATURES -<<<<<<< HEAD - relevant_mutant_bodypart = "spines" -======= relevant_external_organ = /obj/item/organ/external/spines ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/lizard_spines/init_possible_values() return assoc_to_keys_features(SSaccessories.spines_list) @@ -198,11 +181,6 @@ target.dna.features["tail_lizard"] = value /datum/preference/choiced/lizard_tail/create_default_value() -<<<<<<< HEAD - var/datum/sprite_accessory/tails/lizard/smooth/tail = /datum/sprite_accessory/tails/lizard/smooth - return initial(tail.name) return /datum/sprite_accessory/tails/lizard/smooth::name + */ -======= - return /datum/sprite_accessory/tails/lizard/smooth::name ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/species_features/monkey.dm b/code/modules/client/preferences/species_features/monkey.dm index 0b2821620da..07448ea7fc2 100644 --- a/code/modules/client/preferences/species_features/monkey.dm +++ b/code/modules/client/preferences/species_features/monkey.dm @@ -1,7 +1,4 @@ -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/monkey_tail savefile_key = "feature_monkey_tail" savefile_identifier = PREFERENCE_CHARACTER @@ -16,11 +13,7 @@ target.dna.features["tail_monkey"] = value /datum/preference/choiced/monkey_tail/create_default_value() -<<<<<<< HEAD var/datum/sprite_accessory/tails/monkey/default/tail = /datum/sprite_accessory/tails/monkey/default return initial(tail.name) return /datum/sprite_accessory/tails/monkey/default::name */ -======= - return /datum/sprite_accessory/tails/monkey/default::name ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/species_features/moth.dm b/code/modules/client/preferences/species_features/moth.dm index 8535ab5bc8f..b306c052d71 100644 --- a/code/modules/client/preferences/species_features/moth.dm +++ b/code/modules/client/preferences/species_features/moth.dm @@ -1,7 +1,4 @@ -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/moth_antennae savefile_key = "feature_moth_antennae" savefile_identifier = PREFERENCE_CHARACTER @@ -102,8 +99,5 @@ /datum/preference/choiced/moth_wings/apply_to_human(mob/living/carbon/human/target, value) target.dna.features["moth_wings"] = value -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/species_features/mushperson.dm b/code/modules/client/preferences/species_features/mushperson.dm index a50029d0201..42ff286e7d1 100644 --- a/code/modules/client/preferences/species_features/mushperson.dm +++ b/code/modules/client/preferences/species_features/mushperson.dm @@ -1,21 +1,8 @@ -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/mushroom_cap savefile_key = "feature_mushperson_cap" savefile_identifier = PREFERENCE_CHARACTER category = PREFERENCE_CATEGORY_SECONDARY_FEATURES -<<<<<<< HEAD - relevant_mutant_bodypart = "cap" - -/datum/preference/choiced/mushroom_cap/init_possible_values() - return assoc_to_keys_features(GLOB.caps_list) - -/datum/preference/choiced/mushroom_cap/apply_to_human(mob/living/carbon/human/target, value) - target.dna.features["caps"] = value -*/ -======= relevant_external_organ = /obj/item/organ/external/mushroom_cap /datum/preference/choiced/mushroom_cap/init_possible_values() @@ -23,4 +10,4 @@ /datum/preference/choiced/mushroom_cap/apply_to_human(mob/living/carbon/human/target, value) target.dna.features["caps"] = value ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +*/ diff --git a/code/modules/client/preferences/species_features/mutants.dm b/code/modules/client/preferences/species_features/mutants.dm index 0a26e49c7a9..12ae93d2d2d 100644 --- a/code/modules/client/preferences/species_features/mutants.dm +++ b/code/modules/client/preferences/species_features/mutants.dm @@ -1,7 +1,4 @@ -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/color/mutant_color savefile_key = "feature_mcolor" savefile_identifier = PREFERENCE_CHARACTER @@ -30,7 +27,4 @@ return FALSE return TRUE -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences/species_features/pod.dm b/code/modules/client/preferences/species_features/pod.dm index e4049757a52..22092f0cba9 100644 --- a/code/modules/client/preferences/species_features/pod.dm +++ b/code/modules/client/preferences/species_features/pod.dm @@ -1,8 +1,5 @@ -<<<<<<< HEAD // SKYRAT EDIT: REPLACED BY /datum/preference/choiced/mutant_choice/pod_hair IN mutant_parts.dm /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/preference/choiced/pod_hair savefile_key = "feature_pod_hair" savefile_identifier = PREFERENCE_CHARACTER @@ -33,7 +30,4 @@ /datum/preference/choiced/pod_hair/apply_to_human(mob/living/carbon/human/target, value) target.dna.features["pod_hair"] = value -<<<<<<< HEAD */ // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 74d9df697c3..65aa5642b8b 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -99,12 +99,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car migrate_character_to_tgui_prefs_menu() if (current_version < 42) -<<<<<<< HEAD // migrate_body_types(save_data) // SKYRAT EDIT - This'll fuck up savefiles migrate_mentor() // SKYRAT EDIT - Make mentors alive again -======= - migrate_body_types(save_data) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (current_version < 43) migrate_legacy_sound_toggles(savefile) @@ -312,10 +308,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car //Quirks all_quirks = save_data?["all_quirks"] -<<<<<<< HEAD load_character_skyrat(save_data) // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //try to fix any outdated data if necessary //preference updating will handle saving the updated data for us. @@ -332,20 +325,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(job_preferences[j] != JP_LOW && job_preferences[j] != JP_MEDIUM && job_preferences[j] != JP_HIGH) job_preferences -= j -<<<<<<< HEAD all_quirks = SSquirks.filter_invalid_quirks(SANITIZE_LIST(all_quirks), augments)// SKYRAT EDIT - AUGMENTS+ -======= - all_quirks = SSquirks.filter_invalid_quirks(SANITIZE_LIST(all_quirks)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 validate_quirks() return TRUE -<<<<<<< HEAD /datum/preferences/proc/save_character(update) // Skyrat edit - Choose when to update (This is stupid) -======= -/datum/preferences/proc/save_character() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SHOULD_NOT_SLEEP(TRUE) if(!path) return FALSE @@ -382,10 +367,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car //Quirks save_data["all_quirks"] = all_quirks -<<<<<<< HEAD save_character_skyrat(save_data, update) // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 00c6e7bfb98..67a93f65097 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -78,23 +78,16 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") mob.log_talk(raw_msg, LOG_OOC) var/keyname = key -<<<<<<< HEAD if(CONFIG_GET(flag/enable_cross_server_ooc)) //SKYRAT EDIT ADDITION send_ooc_to_other_server(ckey, msg) //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(prefs.unlock_content) if(prefs.toggles & MEMBER_PUBLIC) keyname = "[icon2html('icons/ui/chat/member_content.dmi', world, "blag")][keyname]" if(prefs.hearted) var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat) keyname = "[sheet.icon_tag("emoji-heart")][keyname]" -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //The linkify span classes and linkify=TRUE below make ooc text get clickable chat href links if you pass in something resembling a url for(var/client/receiver as anything in GLOB.clients) if(!receiver.prefs) // Client being created or deleted. Despite all, this can be null. @@ -109,21 +102,12 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") if(check_rights_for(src, R_ADMIN)) var/ooc_color = prefs.read_preference(/datum/preference/color/ooc_color) to_chat(receiver, span_adminooc("[CONFIG_GET(flag/allow_admin_ooccolor) && ooc_color ? "" :"" ][span_prefix("OOC:")] [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]"), avoid_highlighting = avoid_highlight) -<<<<<<< HEAD else to_chat(receiver, span_adminobserverooc(span_prefix("OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]")), avoid_highlighting = avoid_highlight) else if(GLOB.OOC_COLOR) to_chat(receiver, "[span_prefix("OOC:")] [holder.fakekey ? holder.fakekey : key]: [msg]", avoid_highlighting = avoid_highlight) else -======= - else - to_chat(receiver, span_adminobserverooc(span_prefix("OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]")), avoid_highlighting = avoid_highlight) - else - if(GLOB.OOC_COLOR) - to_chat(receiver, "[span_prefix("OOC:")] [holder.fakekey ? holder.fakekey : key]: [msg]", avoid_highlighting = avoid_highlight) - else ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(receiver, span_ooc(span_prefix("OOC: [holder.fakekey ? holder.fakekey : key]: [msg]")), avoid_highlighting = avoid_highlight) else if(!(key in receiver.prefs.ignoring)) diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm index 880d4c42314..ad75e7c883f 100644 --- a/code/modules/client/verbs/suicide.dm +++ b/code/modules/client/verbs/suicide.dm @@ -48,7 +48,6 @@ /// Checks if we are in a valid state to suicide (not already suiciding, capable of actually killing ourselves, area checks, etc.) Returns TRUE if we can suicide, FALSE if we can not. /mob/living/proc/can_suicide() -<<<<<<< HEAD // SKYRAT EDIT ADDITION if(CONFIG_GET(flag/disable_suicide)) to_chat(src, span_warning("Suicide is disabled on this server.")) @@ -64,17 +63,6 @@ to_chat(src, span_warning("You can't commit suicide here! You can ghost if you'd like.")) return FALSE -======= - if(HAS_TRAIT_FROM_ONLY(src, TRAIT_SUICIDED, REF(src))) - to_chat(src, span_warning("You are already commiting suicide!")) - return FALSE - - var/area/checkable = get_area(src) - if(checkable.area_flags & BLOCK_SUICIDE) - to_chat(src, span_warning("You can't commit suicide here! You can ghost if you'd like.")) - return FALSE - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(stat) if(CONSCIOUS) return TRUE diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 37a36818c6f..6777afbb6f6 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -354,11 +354,7 @@ . += how_cool_are_your_threads.Join() if(get_armor().has_any_armor() || (flags_cover & (HEADCOVERSMOUTH|PEPPERPROOF)) || (clothing_flags & STOPSPRESSUREDAMAGE) || (visor_flags & STOPSPRESSUREDAMAGE)) -<<<<<<< HEAD . += span_notice("OOC: Click here to see its protection classes.") // SKYRAT EDIT ORIGINAL: ("It has a tag listing its protection classes.") -======= - . += span_notice("It has a tag listing its protection classes.") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/Topic(href, href_list) . = ..() @@ -532,11 +528,7 @@ BLIND // can't see anything update_appearance() //most of the time the sprite changes /obj/item/clothing/proc/can_use(mob/user) -<<<<<<< HEAD - return istype(user) && !user.incapacitated() -======= return istype(user) && !user.incapacitated ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/proc/spawn_shreds() new /obj/effect/decal/cleanable/shreds(get_turf(src), name) diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 5a58d43d66a..a0204efc2dd 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -38,11 +38,7 @@ /obj/item/clothing/glasses/visor_toggling() . = ..() -<<<<<<< HEAD alternate_worn_layer = up ? ABOVE_BODY_FRONT_HEAD_LAYER : initial(alternate_worn_layer) // SKYRAT EDIT CHANGE - ORIGINAL : alternate_worn_layer = up ? ABOVE_BODY_FRONT_HEAD_LAYER : null -======= - alternate_worn_layer = up ? ABOVE_BODY_FRONT_HEAD_LAYER : null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(visor_vars_to_toggle & VISOR_VISIONFLAGS) vision_flags ^= initial(vision_flags) if(visor_vars_to_toggle & VISOR_INVISVIEW) @@ -532,11 +528,8 @@ name = "chameleon thermals" desc = "A pair of thermal optic goggles with an onboard chameleon generator." actions_types = list(/datum/action/item_action/chameleon/change/glasses/no_preset) -<<<<<<< HEAD special_desc_requirement = EXAMINE_CHECK_SYNDICATE // SKYRAT EDIT ADDITION special_desc = "Chameleon thermal goggles employed by the Syndicate in infiltration operations." //SKYRAT EDIT ADDITION, I don't think the regular description persists through chameleon changes. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/glasses/thermal/monocle name = "thermoncle" @@ -564,13 +557,6 @@ . = ..() icon_state = (icon_state == base_icon_state) ? "[base_icon_state]_flipped" : base_icon_state user.update_worn_glasses() -<<<<<<< HEAD - -/datum/armor/glasses_science - fire = 80 - acid = 100 -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/glasses/cold name = "cold goggles" diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index a1e5d744352..932ec2fb51e 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -9,8 +9,6 @@ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE cut_type = /obj/item/clothing/gloves/fingerless -<<<<<<< HEAD - clothing_traits = list(TRAIT_FAST_CUFFING) // SKYRAT EDIT ADDITION START uses_advanced_reskins = TRUE unique_reskin = list( @@ -28,8 +26,6 @@ ) ) // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/gloves/color/black/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/gloves/special.dm b/code/modules/clothing/gloves/special.dm index e23181bc32f..1366a29ac4a 100644 --- a/code/modules/clothing/gloves/special.dm +++ b/code/modules/clothing/gloves/special.dm @@ -155,8 +155,6 @@ siemens_coefficient = 0.3 clothing_traits = list(TRAIT_QUICKER_CARRY, TRAIT_CHUNKYFINGERS) clothing_flags = THICKMATERIAL -<<<<<<< HEAD -======= ///A pair of gloves that both allow the user to fish without the need of a held fishing rod and provides athletics experience. /obj/item/clothing/gloves/fishing @@ -249,4 +247,3 @@ var/body_zone = pick(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM) user.apply_damage(damage, BRUTE, body_zone, user.run_armor_check(body_zone, MELEE)) playsound(src,'sound/weapons/bite.ogg', damage * 2, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/head/fedora.dm b/code/modules/clothing/head/fedora.dm index 59eb424b8a0..cf0d23ac37f 100644 --- a/code/modules/clothing/head/fedora.dm +++ b/code/modules/clothing/head/fedora.dm @@ -35,12 +35,9 @@ name = "carpskin fedora" icon_state = "fedora_carpskin" inhand_icon_state = null -<<<<<<< HEAD -======= /obj/item/clothing/head/fedora/beige/press name = "press fedora" desc = "An beige fedora with a piece of paper saying \"PRESS\" stuck in its rim." icon_state = "fedora_press" inhand_icon_state = null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index e98db57242f..b35b51891bb 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -151,11 +151,7 @@ return if(!up) -<<<<<<< HEAD . += mutable_appearance(visor_sprite_path, visor_state) //SKYRAT EDIT CHANGE - WELDING MUZZLES - ORIGINAL: . += mutable_appearance('icons/mob/clothing/head/utility.dmi', visor_state) -======= - . += mutable_appearance('icons/mob/clothing/head/utility.dmi', visor_state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/head/utility/hardhat/welding/update_overlays() . = ..() @@ -195,10 +191,6 @@ up = FALSE visor_toggling() -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/head/utility/hardhat/welding/dblue icon_state = "hardhat0_dblue" inhand_icon_state = null diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm index 8bf1bec4f4d..7b7329088c8 100644 --- a/code/modules/clothing/head/hat.dm +++ b/code/modules/clothing/head/hat.dm @@ -287,10 +287,7 @@ flags_inv = 0 armor_type = /datum/armor/hats_centcom_cap strip_delay = (8 SECONDS) -<<<<<<< HEAD supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON //SKYRAT EDIT lets anthros wear the hat -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/armor/hats_centcom_cap melee = 30 @@ -312,11 +309,7 @@ desc = "Perfect for winter in Siberia, da?" icon_state = "ushankadown" inhand_icon_state = null -<<<<<<< HEAD flags_inv = HIDEEARS //SKYRAT EDIT (Original: HIDEEARS|HIDEHAIR) -======= - flags_inv = HIDEEARS|HIDEHAIR ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT dog_fashion = /datum/dog_fashion/head/ushanka diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index bb8f0e78d6e..2874a27b72b 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -75,8 +75,6 @@ update_appearance() return CLICK_ACTION_SUCCESS -<<<<<<< HEAD -======= /obj/item/clothing/head/helmet/press name = "press helmet" desc = "A blue helmet used to distinguish non-combatant \"PRESS\" members, like if anyone cares." @@ -87,7 +85,6 @@ if(!isinhands) . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/head/helmet/alt name = "bulletproof helmet" desc = "A bulletproof combat helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent." diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index ac3cb59a6ef..5d5fc87d409 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -54,11 +54,7 @@ /obj/item/clothing/head/utility/chefhat/proc/on_mouse_emote(mob/living/source, key, emote_message, type_override) SIGNAL_HANDLER var/mob/living/carbon/wearer = loc -<<<<<<< HEAD - if(!wearer || wearer.incapacitated(IGNORE_RESTRAINTS)) -======= if(!wearer || INCAPACITATED_IGNORING(wearer, INCAPABLE_RESTRAINTS)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if (!prob(mouse_control_probability)) return COMPONENT_CANT_EMOTE @@ -72,11 +68,7 @@ return COMPONENT_MOVABLE_BLOCK_PRE_MOVE // Didn't roll well enough or on cooldown var/mob/living/carbon/wearer = loc -<<<<<<< HEAD - if(!wearer || wearer.incapacitated(IGNORE_RESTRAINTS)) -======= if(!wearer || INCAPACITATED_IGNORING(wearer, INCAPABLE_RESTRAINTS)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return COMPONENT_MOVABLE_BLOCK_PRE_MOVE // Not worn or can't move var/move_direction = get_dir(wearer, moved_to) diff --git a/code/modules/clothing/head/mind_monkey_helmet.dm b/code/modules/clothing/head/mind_monkey_helmet.dm index 6ebc8639bf2..b78dc5e11fa 100644 --- a/code/modules/clothing/head/mind_monkey_helmet.dm +++ b/code/modules/clothing/head/mind_monkey_helmet.dm @@ -1,10 +1,6 @@ //monkey sentience caps -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/head/helmet/monkey_sentience name = "monkey mind magnification helmet" desc = "A fragile, circuitry embedded helmet for boosting the intelligence of a monkey to a higher level. You see several warning labels..." @@ -111,7 +107,4 @@ if(magnification) visible_message(span_warning("[src] falls off of [magnification]'s head as it changes shape!")) magnification.dropItemToGround(src) -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/head/moth.dm b/code/modules/clothing/head/moth.dm index f97853f75eb..961de9e3a75 100644 --- a/code/modules/clothing/head/moth.dm +++ b/code/modules/clothing/head/moth.dm @@ -7,11 +7,7 @@ cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT flags_cover = HEADCOVERSEYES -<<<<<<< HEAD flags_inv = HIDEHAIR|SHOWSPRITEEARS // SKYRAT EDIT CHANGE -======= - flags_inv = HIDEHAIR ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/head/mothcap/original desc = "An authentic, padded leather cap with magnifying goggles, standard issue aboard the moth fleet. Keeps your head warm and debris away from those big eyes." diff --git a/code/modules/clothing/masks/bandana.dm b/code/modules/clothing/masks/bandana.dm index d726a954f15..c80ad733543 100644 --- a/code/modules/clothing/masks/bandana.dm +++ b/code/modules/clothing/masks/bandana.dm @@ -38,15 +38,12 @@ if(slot_flags & ITEM_SLOT_NECK) to_chat(user, span_warning("You must undo [src] in order to push it into a hat!")) return FALSE -<<<<<<< HEAD //SKYRAT EDIT ADDITION START: BANDANA HATS FOR MUTANTS if(slot_flags & ITEM_SLOT_HEAD) supports_variations_flags = NONE if(slot_flags & ITEM_SLOT_MASK) supports_variations_flags = initial(supports_variations_flags) //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /obj/item/clothing/mask/bandana/visor_toggling() diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 18631fc7ea5..3675243b370 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -298,11 +298,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list( "The Madman" = image(icon = src.icon, icon_state = "joker"), "The Rainbow Color" = image(icon = src.icon, icon_state = "rainbow") ) -<<<<<<< HEAD - //AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0) //SKYRAT EDIT REMOVAL -======= AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/mask/gas/clown_hat/ui_action_click(mob/user) if(!istype(user) || user.incapacitated) @@ -312,11 +308,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list( if(!choice) return FALSE -<<<<<<< HEAD - if(src && choice && !user.incapacitated() && in_range(user,src)) -======= if(src && choice && !user.incapacitated && in_range(user,src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/options = GLOB.clown_mask_options icon_state = options[choice] user.update_worn_mask() @@ -376,8 +368,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list( if(!choice) return FALSE -<<<<<<< HEAD - if(src && choice && !user.incapacitated() && in_range(user,src)) + if(src && choice && !user.incapacitated && in_range(user,src)) // SKYRAT EDIT ADDITION START - More mask variations var/mob/living/carbon/human/human_user = user if(human_user.dna.species.mutant_bodyparts["snout"]) @@ -393,10 +384,6 @@ GLOBAL_LIST_INIT(clown_mask_options, list( /* SKYRAT EDIT ADDITION END icon_state = options[choice] */ -======= - if(src && choice && !user.incapacitated && in_range(user,src)) - icon_state = options[choice] ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.update_worn_mask() update_item_action_buttons() to_chat(user, span_notice("Your Mime Mask has now morphed into [choice]!")) diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index d8789657e80..b14573a087c 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -103,11 +103,8 @@ r_hand = /obj/item/gun/energy/e_gun l_pocket = /obj/item/healthanalyzer/advanced additional_radio = /obj/item/encryptionkey/heads/cmo -<<<<<<< HEAD -======= skillchips = list(/obj/item/skillchip/entrails_reader) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/centcom/ert/medic/alert name = "ERT Medic - High Alert" @@ -137,12 +134,9 @@ glasses = /obj/item/clothing/glasses/meson/engine l_pocket = /obj/item/rcd_ammo/large additional_radio = /obj/item/encryptionkey/heads/ce -<<<<<<< HEAD -======= skillchips = list(/obj/item/skillchip/job/engineer) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/centcom/ert/engineer/alert name = "ERT Engineer - High Alert" @@ -531,12 +525,9 @@ glasses = /obj/item/clothing/glasses/hud/health/sunglasses additional_radio = /obj/item/encryptionkey/heads/cmo -<<<<<<< HEAD -======= skillchips = list(/obj/item/skillchip/entrails_reader) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/centcom/ert/marine/engineer name = "Marine Engineer" @@ -550,11 +541,8 @@ glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses additional_radio = /obj/item/encryptionkey/heads/ce -<<<<<<< HEAD -======= skillchips = list(/obj/item/skillchip/job/engineer) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/centcom/militia name = "Militia Man" @@ -585,8 +573,6 @@ head = /obj/item/clothing/head/beret/militia l_hand = /obj/item/megaphone suit_store = /obj/item/gun/energy/laser/musket/prime -<<<<<<< HEAD -======= /datum/outfit/centcom/ert/medical_commander name = "Chief EMT" @@ -656,4 +642,3 @@ ///Identical to medical MODsuit, but uses the alternate skin by default. /datum/mod_theme/medical/corpsman default_skin = "corpsman" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm index 7890b48fcd3..a0e927c6319 100644 --- a/code/modules/clothing/outfits/plasmaman.dm +++ b/code/modules/clothing/outfits/plasmaman.dm @@ -302,8 +302,6 @@ uniform = /obj/item/clothing/under/plasmaman //same gloves = /obj/item/clothing/gloves/color/plasmaman/black head = /obj/item/clothing/head/helmet/space/plasmaman -<<<<<<< HEAD -======= /datum/outfit/plasmaman/medical_commander name = "Chief EMT Plasmaman" @@ -316,4 +314,3 @@ uniform = /obj/item/clothing/under/plasmaman/medical gloves = /obj/item/clothing/gloves/color/plasmaman/white head = /obj/item/clothing/head/helmet/space/plasmaman/medical ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index b6f7ea3f81b..28bd5e8b85c 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -47,11 +47,8 @@ playsound(user, 'sound/weapons/genhit2.ogg', 50, TRUE) return BRUTELOSS -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN -DIGI_BLOODSOLE - (Moved to modular_skyrat/modules/digi_shoeblood/code/modules/clothing/shoes/_shoes.dm) /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/shoes/worn_overlays(mutable_appearance/standing, isinhands = FALSE) . = ..() if(isinhands) @@ -172,17 +169,12 @@ to_chat(user, span_warning("You're already interacting with [src]!")) return user.visible_message(span_notice("[user] begins [tied ? "unknotting" : "tying"] the laces of [user.p_their()] [src.name]."), span_notice("You begin [tied ? "unknotting" : "tying"] the laces of your [src.name]...")) -<<<<<<< HEAD // SKYRAT EDIT START var/tie_time = lace_time if(HAS_TRAIT(user, TRAIT_STICKY_FINGERS)) tie_time *= 0.5 if(do_after(user, tie_time, target = our_guy, extra_checks = CALLBACK(src, PROC_REF(still_shoed), our_guy))) // SKYRAT EDIT END -======= - - if(do_after(user, lace_time, target = our_guy, extra_checks = CALLBACK(src, PROC_REF(still_shoed), our_guy))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_notice("You [tied ? "unknot" : "tie"] the laces of your [src.name].")) if(tied == SHOES_UNTIED) adjust_laces(SHOES_TIED, user) @@ -204,14 +196,10 @@ to_chat(user, span_notice("You quietly set to work [tied ? "untying" : "knotting"] [loc]'s [src.name]...")) if(HAS_TRAIT(user, TRAIT_CLUMSY)) // based clowns trained their whole lives for this mod_time *= 0.75 -<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(HAS_TRAIT(user, TRAIT_STICKY_FINGERS)) // Clowns with thieving gloves will be a menace mod_time *= 0.5 // SKYRAT EDIT ADDITION END -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(do_after(user, mod_time, target = our_guy, extra_checks = CALLBACK(src, PROC_REF(still_shoed), our_guy), hidden = TRUE)) to_chat(user, span_notice("You [tied ? "untie" : "knot"] the laces on [loc]'s [src.name].")) if(tied == SHOES_UNTIED) @@ -297,17 +285,12 @@ return to_chat(user, span_notice("You begin [tied ? "untying" : "tying"] the laces on [src]...")) -<<<<<<< HEAD // SKYRAT EDIT STARTr var/tie_time = lace_time if(HAS_TRAIT(user, TRAIT_STICKY_FINGERS)) tie_time *= 0.5 if(do_after(user, lace_time, target = src,extra_checks = CALLBACK(src, PROC_REF(still_shoed), user))) // SKYRAT EDIT END -======= - - if(do_after(user, lace_time, target = src,extra_checks = CALLBACK(src, PROC_REF(still_shoed), user))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_notice("You [tied ? "untie" : "tie"] the laces on [src].")) adjust_laces(tied ? SHOES_UNTIED : SHOES_TIED, user) diff --git a/code/modules/clothing/shoes/clown.dm b/code/modules/clothing/shoes/clown.dm index 8db37aad220..ee16103b734 100644 --- a/code/modules/clothing/shoes/clown.dm +++ b/code/modules/clothing/shoes/clown.dm @@ -14,11 +14,7 @@ create_storage(storage_type = /datum/storage/pockets/shoes/clown) LoadComponent(/datum/component/squeak, squeak_sound, 50, falloff_exponent = 20) //die off quick please -<<<<<<< HEAD //AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0) // SKYRAT EDIT - REMOVAL - NO CLOWN CYTOLOGY -======= - AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/shoes/clown_shoes/equipped(mob/living/user, slot) . = ..() diff --git a/code/modules/clothing/shoes/cult.dm b/code/modules/clothing/shoes/cult.dm index ac577f34cd2..f1a856b4268 100644 --- a/code/modules/clothing/shoes/cult.dm +++ b/code/modules/clothing/shoes/cult.dm @@ -1,9 +1,5 @@ /obj/item/clothing/shoes/cult -<<<<<<< HEAD - name = "\improper Nar'Sien invoker boots" -======= name = "\improper Nar'Sian boots" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "A pair of boots worn by the followers of Nar'Sie." icon_state = "cult" inhand_icon_state = null @@ -14,11 +10,7 @@ lace_time = 10 SECONDS /obj/item/clothing/shoes/cult/alt -<<<<<<< HEAD - name = "cultist boots" -======= name = "\improper Nar'Sian invoker boots" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "cultalt" /obj/item/clothing/shoes/cult/alt/ghost diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm index b272d4dcd80..81f5006f9e8 100644 --- a/code/modules/clothing/shoes/sneakers.dm +++ b/code/modules/clothing/shoes/sneakers.dm @@ -10,10 +10,7 @@ greyscale_config_inhand_left = /datum/greyscale_config/sneakers/inhand_left greyscale_config_inhand_right = /datum/greyscale_config/sneakers/inhand_right flags_1 = IS_PLAYER_COLORABLE_1 -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/sneakers/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 interaction_flags_mouse_drop = NEED_HANDS /obj/item/clothing/shoes/sneakers/random/Initialize(mapload) @@ -95,10 +92,7 @@ greyscale_config_inhand_right = /datum/greyscale_config/sneakers_orange/inhand_right flags_1 = NONE var/obj/item/restraints/handcuffs/attached_cuffs -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/sneakers_orange/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/shoes/sneakers/orange/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index c3c27148bc8..4b8fe43bd96 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -50,11 +50,7 @@ ) slowdown = 0.5 armor_type = /datum/armor/suit_space -<<<<<<< HEAD flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDESEXTOY|HIDETAIL|HIDETAUR //SKYRAT EDIT CHANGE - ADDED HIDETAIL, HIDETAUR. ADDED HIDESEXTOY TO PREVENT VISUAL BUGS. -======= - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT_OFF heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm index d24b6991815..cc08f7373c9 100644 --- a/code/modules/clothing/suits/_suits.dm +++ b/code/modules/clothing/suits/_suits.dm @@ -17,17 +17,12 @@ var/blood_overlay_type = "suit" limb_integrity = 0 // disabled for most exo-suits -<<<<<<< HEAD /obj/item/clothing/suit/worn_overlays(mutable_appearance/standing, isinhands = FALSE, file2use = null, mutant_styles = NONE) // SKYRAT EDIT CHANGE - TAURS AND TESHIS - ORIGINAL: /obj/item/clothing/suit/worn_overlays(mutable_appearance/standing, isinhands = FALSE) -======= -/obj/item/clothing/suit/worn_overlays(mutable_appearance/standing, isinhands = FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(isinhands) return if(damaged_clothes) -<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN //. += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]") //ORIGINAL var/damagefile2use = (mutant_styles & STYLE_TAUR_ALL) ? 'modular_skyrat/master_files/icons/mob/64x32_item_damage.dmi' : 'icons/effects/item_damage.dmi' @@ -39,11 +34,6 @@ var/bloodfile2use = (mutant_styles & STYLE_TAUR_ALL) ? 'modular_skyrat/master_files/icons/mob/64x32_blood.dmi' : 'icons/effects/blood.dmi' . += mutable_appearance(bloodfile2use, "[blood_overlay_type]blood") //SKYRAT EDIT CHANGE END -======= - . += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]") - if(GET_ATOM_BLOOD_DNA_LENGTH(src)) - . += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/carbon/human/wearer = loc if(!ishuman(wearer) || !wearer.w_uniform) @@ -54,11 +44,7 @@ var/obj/item/clothing/accessory/displayed = undershirt.attached_accessories[1] if(displayed.above_suit) -<<<<<<< HEAD . += undershirt.modify_accessory_overlay() // SKYRAT EDIT CHANGE - ORIGINAL: . += undershirt.accessory_overlay -======= - . += undershirt.accessory_overlay ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/suit/update_clothes_damaged_state(damaged_state = CLOTHING_DAMAGED) ..() diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 5c0813a3c0c..a419c219af3 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -59,8 +59,6 @@ /obj/item/clothing/suit/armor/vest/alt/sec icon_state = "armor_sec" -<<<<<<< HEAD -======= /obj/item/clothing/suit/armor/vest/press name = "press armor vest" desc = "A blue armor vest used to distinguish non-combatant \"PRESS\" members, like if anyone cares." @@ -71,7 +69,6 @@ if(!isinhands) . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/suit/armor/vest/marine name = "tactical armor vest" desc = "A set of the finest mass produced, stamped plasteel armor plates, containing an environmental protection unit for all-condition door kicking." diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index ded5efee4bd..c3654fe48f1 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -1,11 +1,8 @@ //Biosuit complete with shoes (in the item sprite) /obj/item/clothing/head/bio_hood name = "bio hood" -<<<<<<< HEAD icon_state = "bio" inhand_icon_state = "bio_hood" -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "A hood that protects the head and face from biological contaminants." icon = 'icons/obj/clothing/head/bio.dmi' worn_icon = 'icons/mob/clothing/head/bio.dmi' @@ -40,11 +37,7 @@ slowdown = 0.5 allowed = list(/obj/item/tank/internals, /obj/item/reagent_containers/dropper, /obj/item/flashlight/pen, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/cup/beaker, /obj/item/gun/syringe) armor_type = /datum/armor/suit_bio_suit -<<<<<<< HEAD - flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL // SKYRAT EDIT ADDITION - HIDETAIL -======= flags_inv = HIDEGLOVES|HIDEJUMPSUIT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 strip_delay = 70 equip_delay_other = 70 resistance_flags = ACID_PROOF diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm index d6bdc4861f0..24ba4295134 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -44,10 +44,7 @@ armor_type = /datum/armor/pirate_armored strip_delay = 40 equip_delay_other = 20 -<<<<<<< HEAD -======= species_exception = null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/suit/costume/pirate/captain name = "pirate captain coat" @@ -59,10 +56,7 @@ armor_type = /datum/armor/pirate_armored strip_delay = 40 equip_delay_other = 20 -<<<<<<< HEAD -======= species_exception = null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/suit/costume/cyborg_suit name = "cyborg suit" @@ -110,11 +104,7 @@ desc = "A plastic replica of the Syndicate space suit. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!" w_class = WEIGHT_CLASS_NORMAL allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy) -<<<<<<< HEAD flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL // SYKRAT EDIT ADDITION - HIDETAIL -======= - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 resistance_flags = NONE /obj/item/clothing/suit/costume/hastur @@ -301,11 +291,7 @@ inhand_icon_state = "space_suit_syndicate" armor_type = /datum/armor/carp_costume_spaceproof allowed = list(/obj/item/tank/internals, /obj/item/gun/ballistic/rifle/boltaction/harpoon) //I'm giving you a hint here -<<<<<<< HEAD flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL // SKYRAT EDIT ADDITION - HIDETAIL -======= - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS @@ -542,8 +528,6 @@ name = "bronze suit" desc = "A big and clanky suit made of bronze that offers no protection and looks very unfashionable. Nice." icon_state = "clockwork_cuirass_old" -<<<<<<< HEAD -======= allowed = list( /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, @@ -552,7 +536,6 @@ //new /obj/item/toy/clockwork_watch, ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 armor_type = /datum/armor/costume_bronze /obj/item/clothing/suit/hooded/mysticrobe diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index fe2a0a3e086..7e6bdde01cd 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -190,14 +190,11 @@ . = ..() if(!isinhands) . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha) -<<<<<<< HEAD -======= /obj/item/clothing/suit/hazardvest/press // Variant used by the Curator name = "press hazard vest" desc = "A blue high-visibility vest used to distinguish non-combatant \"PRESS\" members, like if anyone cares." icon_state = "hazard_press" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Lawyer /obj/item/clothing/suit/toggle/lawyer diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 032cd0fee7f..cf2158177f7 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -47,11 +47,8 @@ . = ..() allowed += list( /obj/item/melee/baton/telescopic, -<<<<<<< HEAD /obj/item/gun/energy/cell_loaded/medigun, //SKYRAT EDIT ADDITION - MEDIGUNS /obj/item/storage/medkit, //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/clothing/suit/toggle/labcoat/paramedic @@ -59,7 +56,6 @@ desc = "A dark blue jacket for paramedics with reflective stripes." icon_state = "labcoat_paramedic" inhand_icon_state = null -<<<<<<< HEAD //START SKYRAT EDIT ADDITION /obj/item/clothing/suit/toggle/labcoat/paramedic/Initialize(mapload) @@ -68,8 +64,6 @@ /obj/item/storage/medkit, ) //END SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/suit/toggle/labcoat/mad name = "\proper The Mad's labcoat" diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 9b1b70e2db5..16c30949e54 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -29,11 +29,7 @@ ) slowdown = 1 armor_type = /datum/armor/utility_fire -<<<<<<< HEAD flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETAUR // SKYRAT EDIT ADDITION - HIDETAIL, HIDETAUR -======= - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT @@ -82,11 +78,7 @@ heat_protection = CHEST|GROIN|LEGS|FEET|ARMS cold_protection = CHEST|GROIN|LEGS|FEET|ARMS body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS -<<<<<<< HEAD - flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETAUR|HIDETAIL // NOVA EDIT ADDITION - HIDETAUR, HIDETAIL -======= - flags_inv = HIDESHOES|HIDEJUMPSUIT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETAUR|HIDETAIL // SKYRAT EDIT ADDITION - HIDETAUR, HIDETAIL /* * Bomb protection @@ -132,11 +124,7 @@ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS slowdown = 2 armor_type = /datum/armor/utility_bomb_suit -<<<<<<< HEAD flags_inv = HIDEJUMPSUIT|HIDETAIL|HIDETAUR // SKYRAT EDIT ADDITION - HIDETAIL, HIDETAUR -======= - flags_inv = HIDEJUMPSUIT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm index 01e6130c7a0..4bdd9198c74 100644 --- a/code/modules/clothing/suits/wintercoats.dm +++ b/code/modules/clothing/suits/wintercoats.dm @@ -349,10 +349,7 @@ . = ..() allowed += list( /obj/item/melee/baton/telescopic, -<<<<<<< HEAD /obj/item/gun/energy/cell_loaded/medigun, //SKYRAT EDIT MEDIGUNS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/clothing/head/hooded/winterhood/medical/cmo @@ -691,7 +688,3 @@ desc = "A heavy jacket hood made from 'synthetic' animal furs, with custom colors." greyscale_config = /datum/greyscale_config/winter_hoods greyscale_config_worn = /datum/greyscale_config/winter_hoods/worn -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index 9418c081983..37776943774 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -8,11 +8,8 @@ slot_flags = ITEM_SLOT_ICLOTHING interaction_flags_click = NEED_DEXTERITY armor_type = /datum/armor/clothing_under -<<<<<<< HEAD -======= supports_variations_flags = CLOTHING_DIGITIGRADE_MASK digitigrade_greyscale_config_worn = /datum/greyscale_config/jumpsuit/worn_digi ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 equip_sound = 'sound/items/equip/jumpsuit_equip.ogg' drop_sound = 'sound/items/handling/cloth_drop.ogg' pickup_sound = 'sound/items/handling/cloth_pickup.ogg' @@ -97,11 +94,7 @@ return changed ? CONTEXTUAL_SCREENTIP_SET : . -<<<<<<< HEAD -/obj/item/clothing/under/worn_overlays(mutable_appearance/standing, isinhands = FALSE, file2use = null, mutant_styles = NONE) -======= -/obj/item/clothing/under/worn_overlays(mutable_appearance/standing, isinhands = FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/item/clothing/under/worn_overlays(mutable_appearance/standing, isinhands = FALSE, file2use = null, mutant_styles = NONE) // SKYRAT EDIT - customisation . = ..() if(isinhands) return @@ -111,11 +104,7 @@ if(GET_ATOM_BLOOD_DNA_LENGTH(src)) . += mutable_appearance('icons/effects/blood.dmi', "uniformblood") if(accessory_overlay) -<<<<<<< HEAD . += modify_accessory_overlay() // SKYRAT EDIT CHANGE - ORIGINAL: . += accessory_overlay -======= - . += accessory_overlay ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/under/attackby(obj/item/attacking_item, mob/user, params) if(has_sensor == BROKEN_SENSORS && istype(attacking_item, /obj/item/stack/cable_coil)) @@ -175,19 +164,13 @@ if(adjusted == ALT_STYLE) adjust_to_normal() -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - This breaks jumpsuit adjustment. Plus, we don't support it. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if((supports_variations_flags & CLOTHING_DIGITIGRADE_VARIATION) && ishuman(user)) var/mob/living/carbon/human/wearer = user if(wearer.bodyshape & BODYSHAPE_DIGITIGRADE) adjusted = DIGITIGRADE_STYLE update_appearance() -<<<<<<< HEAD */ // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/under/equipped(mob/living/user, slot) ..() diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 500be1b97c3..cc66e9d406a 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -241,8 +241,6 @@ if (ishuman(user)) var/mob/living/carbon/human/human_wearer = user human_wearer.sec_hud_set_security_status() -<<<<<<< HEAD -======= /obj/item/clothing/accessory/press_badge name = "press badge" @@ -286,4 +284,3 @@ examine(interacting_living) to_chat(interacting_living, span_boldwarning("[user] shows the [src] to you.")) user.visible_message(span_notice("[user] shows a [src] to [interacting_living].")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 1ad63d236a0..3b7a9005283 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -7,10 +7,7 @@ greyscale_config_worn = /datum/greyscale_config/jumpsuit/worn greyscale_config_inhand_left = /datum/greyscale_config/jumpsuit/inhand_left greyscale_config_inhand_right = /datum/greyscale_config/jumpsuit/inhand_right -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/jumpsuit/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/obj/clothing/under/color.dmi' icon_state = "jumpsuit" inhand_icon_state = "jumpsuit" @@ -24,10 +21,7 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY icon_state = "jumpskirt" supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -<<<<<<< HEAD greyscale_config_worn_digi = null //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Returns a random, acceptable jumpsuit typepath /proc/get_random_jumpsuit() @@ -45,11 +39,7 @@ /obj/item/clothing/under/color/random/Initialize(mapload) ..() -<<<<<<< HEAD var/obj/item/clothing/under/color/C = get_random_variant() // SKYRAT EDIT CHANGE - use local proc that handles prefs -======= - var/obj/item/clothing/under/color/C = get_random_jumpsuit() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ishuman(loc)) var/mob/living/carbon/human/H = loc H.equip_to_slot_or_del(new C(H), ITEM_SLOT_ICLOTHING, initial=TRUE) //or else you end up with naked assistants running around everywhere... @@ -236,10 +226,7 @@ greyscale_config_inhand_left = null greyscale_config_inhand_right = null greyscale_config_worn = null -<<<<<<< HEAD -======= digitigrade_greyscale_colors = "#3f3f3f" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 can_adjust = FALSE flags_1 = NONE diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index 2705fef8f56..ba30233d2b7 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -314,10 +314,7 @@ icon_state = "buttondown_slacks" greyscale_config = /datum/greyscale_config/buttondown_slacks greyscale_config_worn = /datum/greyscale_config/buttondown_slacks/worn -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/buttondown_slacks/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#EEEEEE#EE8E2E#222227#D8D39C" flags_1 = IS_PLAYER_COLORABLE_1 @@ -330,10 +327,7 @@ icon_state = "buttondown_shorts" greyscale_config = /datum/greyscale_config/buttondown_shorts greyscale_config_worn = /datum/greyscale_config/buttondown_shorts/worn -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/buttondown_shorts/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#EEEEEE#EE8E2E#222227#D8D39C" flags_1 = IS_PLAYER_COLORABLE_1 @@ -371,10 +365,7 @@ can_adjust = FALSE greyscale_config = /datum/greyscale_config/football_suit greyscale_config_worn = /datum/greyscale_config/football_suit/worn -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/football_suit/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#D74722" flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/code/modules/clothing/under/jobs/civilian/clown_mime.dm b/code/modules/clothing/under/jobs/civilian/clown_mime.dm index b5caecdbdce..55f0da88918 100644 --- a/code/modules/clothing/under/jobs/civilian/clown_mime.dm +++ b/code/modules/clothing/under/jobs/civilian/clown_mime.dm @@ -31,23 +31,12 @@ inhand_icon_state = "clown" female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY can_adjust = FALSE -<<<<<<< HEAD - -//SKYRAT EDIT REMOVAL BEGIN -/* -======= supports_variations_flags = CLOTHING_NO_VARIATION ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/under/rank/civilian/clown/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50, falloff_exponent = 20) //die off quick please AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0) -<<<<<<< HEAD -*/ -//SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/under/rank/civilian/clown/blue name = "blue clown suit" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index dc08b7cbba0..63bf1c65847 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -239,10 +239,7 @@ greyscale_config_worn = /datum/greyscale_config/jumpsuit/prison/worn greyscale_config_inhand_left = /datum/greyscale_config/jumpsuit/prison/inhand_left greyscale_config_inhand_right = /datum/greyscale_config/jumpsuit/prison/inhand_right -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/jumpsuit/prison/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 has_sensor = LOCKED_SENSORS sensor_mode = SENSOR_COORDS random_sensor = FALSE @@ -263,10 +260,7 @@ greyscale_config_worn = /datum/greyscale_config/jumpsuit/prison/worn greyscale_config_inhand_left = /datum/greyscale_config/jumpsuit/prison/inhand_left greyscale_config_inhand_right = /datum/greyscale_config/jumpsuit/prison/inhand_right -<<<<<<< HEAD greyscale_config_worn_digi = null //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 331ca8615ba..66830455b2e 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -14,10 +14,7 @@ icon_state = "slacks" greyscale_config = /datum/greyscale_config/slacks greyscale_config_worn = /datum/greyscale_config/slacks/worn -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/slacks/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#575757#3E3E3E#75634F" flags_1 = IS_PLAYER_COLORABLE_1 @@ -27,10 +24,7 @@ icon_state = "jeans" greyscale_config = /datum/greyscale_config/jeans greyscale_config_worn = /datum/greyscale_config/jeans/worn -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/jeans/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#787878#723E0E#4D7EAC" flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 88b3dc2531d..2fd8a113682 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -4,10 +4,7 @@ icon_state = "shorts" greyscale_config = /datum/greyscale_config/shorts greyscale_config_worn = /datum/greyscale_config/shorts/worn -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/shorts/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#575757#3E3E3E#75634F" gender = PLURAL body_parts_covered = GROIN @@ -23,10 +20,7 @@ icon_state = "jeanshorts" greyscale_config = /datum/greyscale_config/jeanshorts greyscale_config_worn = /datum/greyscale_config/jeanshorts/worn -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/jeanshorts/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#787878#723E0E#4D7EAC" /obj/item/clothing/under/shorts/red diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm index b97b03e081f..11ed224e9cf 100644 --- a/code/modules/clothing/under/skirt_dress.dm +++ b/code/modules/clothing/under/skirt_dress.dm @@ -70,10 +70,7 @@ greyscale_colors = "#CC2102" greyscale_config = /datum/greyscale_config/plaidskirt greyscale_config_worn = /datum/greyscale_config/plaidskirt/worn -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/plaidskirt/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/under/dress/skirt/turtleskirt diff --git a/code/modules/clothing/under/trek.dm b/code/modules/clothing/under/trek.dm index dee93338449..046e6b5e6ef 100644 --- a/code/modules/clothing/under/trek.dm +++ b/code/modules/clothing/under/trek.dm @@ -15,10 +15,7 @@ inhand_icon_state = "y_suit" greyscale_config = /datum/greyscale_config/trek greyscale_config_worn = /datum/greyscale_config/trek/worn -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#fab342" /obj/item/clothing/under/trek/engsec @@ -28,10 +25,7 @@ inhand_icon_state = "r_suit" greyscale_config = /datum/greyscale_config/trek greyscale_config_worn = /datum/greyscale_config/trek/worn -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#B72B2F" /obj/item/clothing/under/trek/medsci @@ -41,10 +35,7 @@ inhand_icon_state = "b_suit" greyscale_config = /datum/greyscale_config/trek greyscale_config_worn = /datum/greyscale_config/trek/worn -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 greyscale_colors = "#5FA4CC" /* diff --git a/code/modules/deathmatch/deathmatch_loadouts.dm b/code/modules/deathmatch/deathmatch_loadouts.dm index 730ddf28976..d89fdd383c8 100644 --- a/code/modules/deathmatch/deathmatch_loadouts.dm +++ b/code/modules/deathmatch/deathmatch_loadouts.dm @@ -8,13 +8,9 @@ /// If defined, using this outfit sets the targets species to it var/datum/species/species_override /// This outfit will grant these spells if applied -<<<<<<< HEAD - var/list/granted_spells = list() -======= var/list/spells_to_add = list() /// This outfit will grant these mutations if applied var/list/mutations_to_add = list() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/deathmatch_loadout/pre_equip(mob/living/carbon/human/user, visualsOnly = FALSE) . = ..() @@ -23,17 +19,6 @@ if(!isnull(species_override)) user.set_species(species_override) -<<<<<<< HEAD - else if (!isnull(user.dna.species.outfit_important_for_life)) //plasmamen get lit on fire and die - user.set_species(/datum/species/human) - for(var/datum/action/act as anything in granted_spells) - var/datum/action/new_ability = new act(user) - if(istype(new_ability, /datum/action/cooldown/spell)) - var/datum/action/cooldown/spell/new_spell = new_ability - new_spell.spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC - new_ability.Grant(user) - -======= else if (!isnull(user.dna.species.outfit_important_for_life)) //plasmamen get lit on fire and die user.set_species(/datum/species/human) @@ -48,7 +33,6 @@ for(var/mutation in mutations_to_add) user.dna.add_mutation(mutation) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/deathmatch_loadout/naked name = "Deathmatch: Naked" display_name = "Unarmed, Butt-naked" @@ -372,11 +356,7 @@ suit = /obj/item/clothing/suit/hooded/explorer shoes = /obj/item/clothing/shoes/workboots/mining mask = /obj/item/clothing/mask/gas/explorer -<<<<<<< HEAD - granted_spells = list( -======= spells_to_add = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/mob_cooldown/dash, ) @@ -419,17 +399,10 @@ suit = /datum/outfit/wizard::suit head = /datum/outfit/wizard::head shoes = /datum/outfit/wizard::shoes -<<<<<<< HEAD - granted_spells = list( - /datum/action/cooldown/spell/aoe/magic_missile, - /datum/action/cooldown/spell/forcewall, - /datum/action/cooldown/spell/jaunt/ethereal_jaunt, -======= spells_to_add = list( /datum/action/cooldown/spell/aoe/magic_missile, /datum/action/cooldown/spell/forcewall, /datum/action/cooldown/spell/pointed/projectile/fireball, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /datum/outfit/deathmatch_loadout/wizard/pyro @@ -440,11 +413,7 @@ suit = /obj/item/clothing/suit/wizrobe/red head = /obj/item/clothing/head/wizard/red mask = /obj/item/cigarette -<<<<<<< HEAD - granted_spells = list( -======= spells_to_add = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/pointed/projectile/fireball, /datum/action/cooldown/spell/smoke, ) @@ -456,11 +425,7 @@ suit = /obj/item/clothing/suit/wizrobe/magusred head = /obj/item/clothing/head/wizard/magus -<<<<<<< HEAD - granted_spells = list( -======= spells_to_add = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/pointed/projectile/lightningbolt, /datum/action/cooldown/spell/charged/beam/tesla, ) @@ -473,11 +438,7 @@ species_override = /datum/species/skeleton suit = /obj/item/clothing/suit/wizrobe/black head = /obj/item/clothing/head/wizard/black -<<<<<<< HEAD - granted_spells = list( -======= spells_to_add = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/touch/scream_for_me, /datum/action/cooldown/spell/teleport/radius_turf/blink, ) @@ -491,11 +452,7 @@ suit = /obj/item/clothing/suit/wizrobe/fake head = /obj/item/clothing/head/wizard/fake shoes = /obj/item/clothing/shoes/sandal -<<<<<<< HEAD - granted_spells = list( -======= spells_to_add = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/conjure_item/spellpacket, /datum/action/cooldown/spell/aoe/repulse/wizard, ) @@ -509,11 +466,7 @@ suit = /obj/item/clothing/suit/wizrobe/marisa head = /obj/item/clothing/head/wizard/marisa shoes = /obj/item/clothing/shoes/sneakers/marisa -<<<<<<< HEAD - granted_spells = list( -======= spells_to_add = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/chuuni_invocations, /datum/action/cooldown/spell/pointed/projectile/spell_cards, ) @@ -526,11 +479,7 @@ l_hand = /obj/item/mjollnir suit = /obj/item/clothing/suit/wizrobe/magusblue head = /obj/item/clothing/head/wizard/magus -<<<<<<< HEAD - granted_spells = list( -======= spells_to_add = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/summonitem, ) @@ -540,11 +489,7 @@ desc = "You feel severely under-leveled for this encounter..." l_hand = null -<<<<<<< HEAD - granted_spells = list( -======= spells_to_add = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/charge, ) @@ -557,11 +502,7 @@ suit = /obj/item/clothing/suit/wizrobe/tape head = /obj/item/clothing/head/wizard/tape shoes = /obj/item/clothing/shoes/jackboots -<<<<<<< HEAD - granted_spells = list( -======= spells_to_add = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/conjure_item/infinite_guns/gun, /datum/action/cooldown/spell/aoe/knock, ) @@ -576,11 +517,7 @@ suit = /obj/item/clothing/suit/costume/hawaiian head = /obj/item/clothing/head/wizard/red shoes = /obj/item/clothing/shoes/sneakers/marisa -<<<<<<< HEAD - granted_spells = list( -======= spells_to_add = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/rod_form, /datum/action/cooldown/spell/conjure/the_traps, ) @@ -597,11 +534,7 @@ mask = /obj/item/clothing/mask/gas/clown_hat back = /obj/item/storage/backpack/clown shoes = /obj/item/clothing/shoes/clown_shoes -<<<<<<< HEAD - granted_spells = null -======= spells_to_add = null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/deathmatch_loadout/wizard/monkey name = "Deathmatch: Monkey" @@ -614,11 +547,7 @@ suit = null head = /obj/item/clothing/head/wizard shoes = null -<<<<<<< HEAD - granted_spells = list( -======= spells_to_add = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/conjure/simian, ) @@ -794,11 +723,7 @@ /obj/item/food/croissant/throwing = 2, ) -<<<<<<< HEAD - granted_spells = list( -======= spells_to_add = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/spell/vow_of_silence, /datum/action/cooldown/spell/conjure_item/invisible_box, /datum/action/cooldown/spell/conjure/invisible_chair, @@ -826,8 +751,6 @@ /obj/item/knife/butcher, /obj/item/sharpener, ) -<<<<<<< HEAD -======= //species @@ -1239,4 +1162,3 @@ shoes = /obj/item/clothing/shoes/bronze l_pocket = /obj/item/reagent_containers/cup/beaker/synthflesh // they used to turn their dmg into tox with a spell. close enough r_pocket = /obj/item/reagent_containers/cup/beaker/synthflesh ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/deathmatch/deathmatch_mapping.dm b/code/modules/deathmatch/deathmatch_mapping.dm index 0fb8ade921d..b83419490be 100644 --- a/code/modules/deathmatch/deathmatch_mapping.dm +++ b/code/modules/deathmatch/deathmatch_mapping.dm @@ -11,12 +11,6 @@ /obj/effect/landmark/deathmatch_player_spawn name = "Deathmatch Player Spawner" -<<<<<<< HEAD -/area/deathmatch/teleport //Prevent access to cross-z teleportation in the map itself (no wands of safety/teleportation scrolls). Cordons should prevent same-z teleportations outside of the arena. - area_flags = /area/deathmatch::area_flags & ~NOTELEPORT - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // for the illusion of a moving train /turf/open/chasm/true/no_smooth/fake_motion_sand name = "air" @@ -28,8 +22,6 @@ /turf/open/chasm/true/no_smooth/fake_motion_sand/fast icon_state = "sandmovingfast" base_icon_state = "sandmovingfast" -<<<<<<< HEAD -======= // fakeout @@ -39,4 +31,3 @@ icon_state = /turf/open/floor/wood::icon_state base_icon_state = /turf/open/floor/wood::base_icon_state icon = /turf/open/floor/wood::icon ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/deathmatch/deathmatch_maps.dm b/code/modules/deathmatch/deathmatch_maps.dm index 7fd7d043b86..da08ae0b311 100644 --- a/code/modules/deathmatch/deathmatch_maps.dm +++ b/code/modules/deathmatch/deathmatch_maps.dm @@ -17,10 +17,6 @@ /// whether we are currently being loaded by a lobby var/template_in_use = FALSE -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/lazy_template/deathmatch/ragecage name = "Ragecage" desc = "Fun for the whole family, the classic ragecage." @@ -208,8 +204,6 @@ map_name = "finaldestination" key = "finaldestination" -<<<<<<< HEAD -======= /datum/lazy_template/deathmatch/species_warfare name = "Species Warfare" desc = "Choose your favorite species and prove its superiority against all the other, lamer species. And also anyone else of your own." @@ -250,6 +244,5 @@ map_name = "ragnarok" key = "ragnarok" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/turf_reservation/indestructible_plating turf_type = /turf/open/indestructible/plating //a little hacky but i guess it has to be done diff --git a/code/modules/deathmatch/deathmatch_modifier.dm b/code/modules/deathmatch/deathmatch_modifier.dm index 5c8ac8f5d83..9faafa91a48 100644 --- a/code/modules/deathmatch/deathmatch_modifier.dm +++ b/code/modules/deathmatch/deathmatch_modifier.dm @@ -232,11 +232,7 @@ projectile.ricochets_max += 2 projectile.min_ricochets += 2 projectile.ricochet_incidence_leeway = 0 -<<<<<<< HEAD - ADD_TRAIT(projectile, TRAIT_ALWAYS_HIT_ZONE, DEATHMATCH_TRAIT) -======= projectile.accuracy_falloff = 0 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/deathmatch_modifier/stormtrooper name = "Stormtrooper Aim" diff --git a/code/modules/escape_menu/escape_menu.dm b/code/modules/escape_menu/escape_menu.dm index a97dd4f0fb2..dca5ad63cae 100644 --- a/code/modules/escape_menu/escape_menu.dm +++ b/code/modules/escape_menu/escape_menu.dm @@ -80,13 +80,8 @@ GLOBAL_LIST_EMPTY(escape_menus) switch (menu_page) if (PAGE_HOME) show_home_page() -<<<<<<< HEAD //if (PAGE_LEAVE_BODY) //SKYRAT EDIT REMOVAL //show_leave_body_page() //SKYRAT EDIT REMOVAL -======= - if (PAGE_LEAVE_BODY) - show_leave_body_page() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else CRASH("Unknown escape menu page: [menu_page]") diff --git a/code/modules/escape_menu/home_page.dm b/code/modules/escape_menu/home_page.dm index 0895b7af33a..933f905cc80 100644 --- a/code/modules/escape_menu/home_page.dm +++ b/code/modules/escape_menu/home_page.dm @@ -41,12 +41,8 @@ /* offset = */ 4, ) ) -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN /* -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 page_holder.give_screen_object( new /atom/movable/screen/escape_menu/home_button/leave_body( null, @@ -57,11 +53,8 @@ CALLBACK(src, PROC_REF(open_leave_body)), ) ) -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/escape_menu/proc/home_resume() qdel(src) diff --git a/code/modules/escape_menu/leave_body.dm b/code/modules/escape_menu/leave_body.dm index a3166dc21f1..14de01749bf 100644 --- a/code/modules/escape_menu/leave_body.dm +++ b/code/modules/escape_menu/leave_body.dm @@ -13,11 +13,7 @@ "Suicide", "Perform a dramatic suicide in game", /* pixel_offset = */ -105, -<<<<<<< HEAD // CALLBACK(src, PROC_REF(leave_suicide)), // SKYRAT EDIT REMOVAL -======= - CALLBACK(src, PROC_REF(leave_suicide)), ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* button_overlay = */ dead_clown, )) @@ -68,22 +64,16 @@ var/mob/living/living_user = client?.mob living_user?.ghost() -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/escape_menu/proc/leave_suicide() PRIVATE_PROC(TRUE) // Not guaranteed to be human. Everything defines verb/suicide separately. Fuck you, still. var/mob/living/carbon/human/human_user = client?.mob human_user?.suicide() -<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/screen/escape_menu/leave_body_button icon = 'icons/hud/escape_menu_leave_body.dmi' diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 8b5aa0b80b7..06f5a50101c 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -1,8 +1,4 @@ -<<<<<<< HEAD #define RANDOM_EVENT_ADMIN_INTERVENTION_TIME (3 MINUTES) // SKYRAT EDIT CHANGE - ORIGINAL: #define RANDOM_EVENT_ADMIN_INTERVENTION_TIME (10 SECONDS) -======= -#define RANDOM_EVENT_ADMIN_INTERVENTION_TIME (10 SECONDS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //this singleton datum is used by the events controller to dictate how it selects events /datum/round_event_control @@ -102,20 +98,6 @@ if (SEND_GLOBAL_SIGNAL(COMSIG_GLOB_PRE_RANDOM_EVENT, src) & CANCEL_PRE_RANDOM_EVENT) return EVENT_INTERRUPTED -<<<<<<< HEAD -======= - - triggering = TRUE - - // We sleep HERE, in pre-event setup (because there's no sense doing it in run_event() since the event is already running!) for the given amount of time to make an admin has enough time to cancel an event un-fitting of the present round or at least reroll it. - message_admins("Random Event triggering in [DisplayTimeText(RANDOM_EVENT_ADMIN_INTERVENTION_TIME)]: [name]. (CANCEL) (SOMETHING ELSE)") - sleep(RANDOM_EVENT_ADMIN_INTERVENTION_TIME) - var/players_amt = get_active_player_count(alive_check = TRUE, afk_check = TRUE, human_check = TRUE) - if(!can_spawn_event(players_amt)) - message_admins("Second pre-condition check for [name] failed, rerolling...") - SSevents.spawnEvent(excluded_event = src) - return EVENT_INTERRUPTED ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 triggering = TRUE @@ -192,7 +174,6 @@ Runs the event round_event.current_players = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1) occurrences++ -<<<<<<< HEAD SSevents.previously_run += src //SKYRAT EDIT ADDITION if(announce_chance_override != null) @@ -201,14 +182,6 @@ Runs the event testing("[time2text(world.time, "hh:mm:ss")] [round_event.type]") triggering = TRUE -======= - if(announce_chance_override != null) - round_event.announce_chance = announce_chance_override - - testing("[time2text(world.time, "hh:mm:ss")] [round_event.type]") - triggering = TRUE - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!triggering) RegisterSignal(SSdcs, COMSIG_GLOB_RANDOM_EVENT, PROC_REF(stop_random_event)) round_event.cancel_event = TRUE diff --git a/code/modules/events/anomaly/_anomaly.dm b/code/modules/events/anomaly/_anomaly.dm index 1a3b20a4e13..40ae2b840e1 100644 --- a/code/modules/events/anomaly/_anomaly.dm +++ b/code/modules/events/anomaly/_anomaly.dm @@ -28,11 +28,7 @@ /datum/round_event/anomaly/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() -<<<<<<< HEAD priority_announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert") -======= - priority_announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/round_event/anomaly/start() var/turf/anomaly_turf diff --git a/code/modules/events/anomaly/anomaly_bioscrambler.dm b/code/modules/events/anomaly/anomaly_bioscrambler.dm index 611b33cc29e..87d8a19c39a 100644 --- a/code/modules/events/anomaly/anomaly_bioscrambler.dm +++ b/code/modules/events/anomaly/anomaly_bioscrambler.dm @@ -17,8 +17,4 @@ /datum/round_event/anomaly/anomaly_bioscrambler/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() -<<<<<<< HEAD priority_announce("Biologic limb swapping agent detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name]. Wear biosuits or other protective gear to counter the effects. Calculated half-life of %9£$T$%F3 years.", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Biologic limb swapping agent detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name]. Wear biosuits or other protective gear to counter the effects. Calculated half-life of %9£$T$%F3 years.", "Anomaly Alert") -======= - priority_announce("Biologic limb swapping agent detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name]. Wear biosuits or other protective gear to counter the effects. Calculated half-life of %9£$T$%F3 years.", "Anomaly Alert") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/anomaly/anomaly_bluespace.dm b/code/modules/events/anomaly/anomaly_bluespace.dm index 534606916b8..e8a6f4aa160 100644 --- a/code/modules/events/anomaly/anomaly_bluespace.dm +++ b/code/modules/events/anomaly/anomaly_bluespace.dm @@ -16,8 +16,4 @@ /datum/round_event/anomaly/anomaly_bluespace/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() -<<<<<<< HEAD priority_announce("Bluespace instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_MASSIVEBSPACEANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Bluespace instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") -======= - priority_announce("Bluespace instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/anomaly/anomaly_dimensional.dm b/code/modules/events/anomaly/anomaly_dimensional.dm index c9724d7ca3c..885b4fef8c1 100644 --- a/code/modules/events/anomaly/anomaly_dimensional.dm +++ b/code/modules/events/anomaly/anomaly_dimensional.dm @@ -25,11 +25,7 @@ /datum/round_event/anomaly/anomaly_dimensional/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() -<<<<<<< HEAD priority_announce("Dimensional instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Dimensional instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") -======= - priority_announce("Dimensional instability detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/event_admin_setup/listed_options/anomaly_dimensional input_text = "Select a dimensional anomaly theme?" diff --git a/code/modules/events/anomaly/anomaly_ectoplasm.dm b/code/modules/events/anomaly/anomaly_ectoplasm.dm index ea8378f7968..b693d221d38 100644 --- a/code/modules/events/anomaly/anomaly_ectoplasm.dm +++ b/code/modules/events/anomaly/anomaly_ectoplasm.dm @@ -41,11 +41,7 @@ /datum/round_event/anomaly/anomaly_ectoplasm/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() -<<<<<<< HEAD priority_announce("Paranormal ectoplasmic outburst detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Paranormal ectoplasmic outburst detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert") -======= - priority_announce("Paranormal ectoplasmic outburst detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/event_admin_setup/anomaly_ectoplasm ///The admin-selected intensity diff --git a/code/modules/events/anomaly/anomaly_flux.dm b/code/modules/events/anomaly/anomaly_flux.dm index c02cc56265b..231d3d825ba 100644 --- a/code/modules/events/anomaly/anomaly_flux.dm +++ b/code/modules/events/anomaly/anomaly_flux.dm @@ -17,8 +17,4 @@ /datum/round_event/anomaly/anomaly_flux/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() -<<<<<<< HEAD priority_announce("Hyper-energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_FLUXANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Hyper-energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert") -======= - priority_announce("Hyper-energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/anomaly/anomaly_grav.dm b/code/modules/events/anomaly/anomaly_grav.dm index cfc1c732b41..400feb2900e 100644 --- a/code/modules/events/anomaly/anomaly_grav.dm +++ b/code/modules/events/anomaly/anomaly_grav.dm @@ -29,8 +29,4 @@ /datum/round_event/anomaly/anomaly_grav/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() -<<<<<<< HEAD priority_announce("Gravitational anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert" , ANNOUNCER_GRAVANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Gravitational anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert" , ANNOUNCER_GRANOMALIES) -======= - priority_announce("Gravitational anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert" , ANNOUNCER_GRANOMALIES) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/anomaly/anomaly_hallucination.dm b/code/modules/events/anomaly/anomaly_hallucination.dm index 3e7952dc238..93803a321a8 100644 --- a/code/modules/events/anomaly/anomaly_hallucination.dm +++ b/code/modules/events/anomaly/anomaly_hallucination.dm @@ -17,8 +17,4 @@ /datum/round_event/anomaly/anomaly_hallucination/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() -<<<<<<< HEAD priority_announce("Hallucinatory event detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_ANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Hallucinatory event detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") -======= - priority_announce("Hallucinatory event detected on [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Anomaly Alert") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/anomaly/anomaly_pyro.dm b/code/modules/events/anomaly/anomaly_pyro.dm index f4bec69399f..c8cbfde644c 100644 --- a/code/modules/events/anomaly/anomaly_pyro.dm +++ b/code/modules/events/anomaly/anomaly_pyro.dm @@ -16,8 +16,4 @@ /datum/round_event/anomaly/anomaly_pyro/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() -<<<<<<< HEAD priority_announce("Pyroclastic anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert", ANNOUNCER_PYROANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Pyroclastic anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert") -======= - priority_announce("Pyroclastic anomaly detected on [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Anomaly Alert") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/anomaly/anomaly_vortex.dm b/code/modules/events/anomaly/anomaly_vortex.dm index b6a16d16378..3c762d52239 100644 --- a/code/modules/events/anomaly/anomaly_vortex.dm +++ b/code/modules/events/anomaly/anomaly_vortex.dm @@ -17,8 +17,4 @@ /datum/round_event/anomaly/anomaly_vortex/announce(fake) if(isnull(impact_area)) impact_area = placer.findValidArea() -<<<<<<< HEAD priority_announce("Localized high-intensity vortex anomaly detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name]", "Anomaly Alert", ANNOUNCER_VORTEXANOMALIES) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Localized high-intensity vortex anomaly detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name]", "Anomaly Alert") -======= - priority_announce("Localized high-intensity vortex anomaly detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name]", "Anomaly Alert") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm index 8977121d548..e063c89e152 100644 --- a/code/modules/events/brain_trauma.dm +++ b/code/modules/events/brain_trauma.dm @@ -18,7 +18,6 @@ if(H.stat == DEAD) // What are you doing in this list continue if(!H.get_organ_by_type(/obj/item/organ/internal/brain)) // If only I had a brain -<<<<<<< HEAD continue if(!(H.mind.assigned_role.job_flags & JOB_CREW_MEMBER)) //please stop giving my centcom admin gimmicks full body paralysis continue @@ -26,11 +25,6 @@ if(engaged_role_play_check(H, station = TRUE, dorms = TRUE)) continue // SKYRAT EDIT ADD END -======= - continue - if(!(H.mind.assigned_role.job_flags & JOB_CREW_MEMBER)) //please stop giving my centcom admin gimmicks full body paralysis - continue ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 traumatize(H) announce_to_ghosts(H) break diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index 708f38c90cc..cfab77009d4 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -52,11 +52,7 @@ if(fake) var/obj/machinery/vending/prototype = pick(subtypesof(/obj/machinery/vending)) machine_name = initial(prototype.name) -<<<<<<< HEAD priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please inspect any [machine_name] brand vendors for aggressive marketing tactics, and reboot them if necessary.", "Machine Learning Alert", ANNOUNCER_BRANDINTELLIGENCE) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please inspect any [machine_name] brand vendors for aggressive marketing tactics, and reboot them if necessary.", "Machine Learning Alert") -======= - priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please inspect any [machine_name] brand vendors for aggressive marketing tactics, and reboot them if necessary.", "Machine Learning Alert") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/round_event/brand_intelligence/start() origin_machine.shut_up = FALSE diff --git a/code/modules/events/bureaucratic_error.dm b/code/modules/events/bureaucratic_error.dm index d0e88710406..0e44ac391c1 100644 --- a/code/modules/events/bureaucratic_error.dm +++ b/code/modules/events/bureaucratic_error.dm @@ -14,10 +14,7 @@ /datum/round_event/bureaucratic_error/start() var/list/jobs = SSjob.get_valid_overflow_jobs() -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(prob(33)) // Only allows latejoining as a single role. var/datum/job/overflow = pick_n_take(jobs) overflow.spawn_positions = -1 @@ -26,13 +23,7 @@ var/datum/job/current = job current.total_positions = 0 return -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL - no more locking off jobs // Adds/removes a random amount of job slots from all jobs. for(var/datum/job/current as anything in jobs) current.total_positions = max(current.total_positions + rand(-2,4), 1) // SKYRAT EDIT CHANGE - No more locking off jobs - ORIGINAL: current.total_positions = max(current.total_positions + rand(-2,4), 0) -======= - // Adds/removes a random amount of job slots from all jobs. - for(var/datum/job/current as anything in jobs) - current.total_positions = max(current.total_positions + rand(-2,4), 0) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index 9c1f5f9cfc4..1002bdcdbd1 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -23,11 +23,7 @@ to_chat(A, "
[span_warning("[alert]")]
") if(prob(30) || fake) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. -<<<<<<< HEAD priority_announce(alert, "Anomaly Alert", sound = ANNOUNCER_COMMSBLACKOUT) //SKYRAT EDIT CHANGE - ORIGINAL: priority_announce(alert, "Anomaly Alert") -======= - priority_announce(alert, "Anomaly Alert") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/round_event/communications_blackout/start() diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 9dd2492fe7d..bf7dbe23862 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -63,13 +63,10 @@ continue if(!is_station_level(candidate.z) && !is_mining_level(candidate.z)) //Diseases can't really spread if the vector is in deep space. continue -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Station/area event candidate filtering. if(engaged_role_play_check(candidate, station = TRUE, dorms = TRUE)) continue // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 disease_candidates += candidate ///Handles checking and alerting admins about the number of valid candidates diff --git a/code/modules/events/fake_virus.dm b/code/modules/events/fake_virus.dm index 85ace75c611..bfa40083149 100644 --- a/code/modules/events/fake_virus.dm +++ b/code/modules/events/fake_virus.dm @@ -12,13 +12,10 @@ continue if(!(victim.mind?.assigned_role.job_flags & JOB_CREW_MEMBER)) continue -<<<<<<< HEAD // SKYRAT EDIT ADD START - Station/area event candidate filtering if(engaged_role_play_check(fake_virus_victims, station = TRUE, dorms = TRUE)) continue // SKYRAT EDIT ADD END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fake_virus_victims += victim //first we do hard status effect victims diff --git a/code/modules/events/ghost_role/space_ninja.dm b/code/modules/events/ghost_role/space_ninja.dm index a3b3be7e79e..5daea71b4af 100644 --- a/code/modules/events/ghost_role/space_ninja.dm +++ b/code/modules/events/ghost_role/space_ninja.dm @@ -27,7 +27,6 @@ ninja.key = chosen_one.key ninja.mind.add_antag_datum(/datum/antagonist/ninja) spawned_mobs += ninja -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN: Preference Ninjas var/loadme = tgui_input_list(ninja, "Do you wish to load your character slot?", "Load Character?", list("Yes!", "No, I want to be random!"), default = "No, I want to be random!", timeout = 60 SECONDS) var/codename @@ -43,8 +42,6 @@ ninja.dna.update_dna_identity() // SKYRAT EDIT ADDITION END: Preference Ninjas -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 message_admins("[ADMIN_LOOKUPFLW(ninja)] has been made into a space ninja by an event.") ninja.log_message("was spawned as a ninja by an event.", LOG_GAME) @@ -55,17 +52,9 @@ /proc/create_space_ninja(spawn_loc) var/mob/living/carbon/human/new_ninja = new(spawn_loc) -<<<<<<< HEAD // new_ninja.randomize_human_appearance(~(RANDOMIZE_NAME|RANDOMIZE_SPECIES)) //SKYRAT EDIT: Player Prefs Ninjas var/new_name = "[pick(GLOB.ninja_titles)] [pick(GLOB.ninja_names)]" new_ninja.name = new_name new_ninja.real_name = new_name // new_ninja.dna.update_dna_identity() //SKYRAT EDIT: Player Prefs Ninjas -======= - new_ninja.randomize_human_appearance(~(RANDOMIZE_NAME|RANDOMIZE_SPECIES)) - var/new_name = "[pick(GLOB.ninja_titles)] [pick(GLOB.ninja_names)]" - new_ninja.name = new_name - new_ninja.real_name = new_name - new_ninja.dna.update_dna_identity() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return new_ninja diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm index 0d2c8cef5d0..c65a6358ef4 100644 --- a/code/modules/events/heart_attack.dm +++ b/code/modules/events/heart_attack.dm @@ -34,13 +34,10 @@ continue if(!(candidate.mind.assigned_role.job_flags & JOB_CREW_MEMBER))//only crewmembers can get one, a bit unfair for some ghost roles and it wastes the event continue -<<<<<<< HEAD // SKYRAT EDIT ADD START - Station/area event candidate filtering if(engaged_role_play_check(candidate, station = TRUE, dorms = TRUE)) continue // SKYRAT EDIT ADD END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(candidate.satiety <= -60 && !candidate.has_status_effect(/datum/status_effect/exercised)) //Multiple junk food items recently //No foodmaxxing for the achievement heart_attack_candidates[candidate] = 3 else diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index cb7c583302a..9c9d81d01d7 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -34,11 +34,7 @@ //AI laws for(var/mob/living/silicon/ai/M in GLOB.alive_mob_list) M.laws_sanity_check() -<<<<<<< HEAD - if(M.stat != DEAD && !M.incapacitated()) -======= if(M.stat != DEAD && !M.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(prob(replaceLawsetChance)) var/datum/ai_laws/ion_lawset = pick_weighted_lawset() // pick_weighted_lawset gives us a typepath, diff --git a/code/modules/events/market_crash.dm b/code/modules/events/market_crash.dm index d4f06b182d3..1b18fe774f6 100644 --- a/code/modules/events/market_crash.dm +++ b/code/modules/events/market_crash.dm @@ -23,11 +23,7 @@ var/list/poss_reasons = list("the alignment of the moon and the sun",\ "some risky housing market outcomes",\ "the B.E.P.I.S. team's untimely downfall",\ -<<<<<<< HEAD "speculative SolFed grants backfiring", /*SKYRAT EDIT CHANGE; original was "speculative Terragov grants backfiring"*/\ -======= - "speculative Terragov grants backfiring",\ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "greatly exaggerated reports of Nanotrasen accountancy personnel being \"laid off\"",\ "a \"great investment\" into \"non-fungible tokens\" by a \"moron\"",\ "a number of raids from Tiger Cooperative agents",\ diff --git a/code/modules/events/space_vines/vine_mutations.dm b/code/modules/events/space_vines/vine_mutations.dm index 229cd4c5ad7..ccc88d50c02 100644 --- a/code/modules/events/space_vines/vine_mutations.dm +++ b/code/modules/events/space_vines/vine_mutations.dm @@ -72,19 +72,11 @@ return if(prob(TOXICITY_MUTATION_PROB) && istype(crosser) && !isvineimmune(crosser)) to_chat(crosser, span_alert("You accidentally touch the vine and feel a strange sensation.")) -<<<<<<< HEAD - crosser.adjustToxLoss(5) // SKYRAT EDIT CHANGE - Original: 20 + crosser.adjustToxLoss(10) // SKYRAT EDIT CHANGE - Original: 20 /datum/spacevine_mutation/toxicity/on_eat(obj/structure/spacevine/holder, mob/living/eater) if(!isvineimmune(eater)) - eater.adjustToxLoss(5) // SKYRAT EDIT CHANGE - Original: 20 -======= - crosser.adjustToxLoss(20) - -/datum/spacevine_mutation/toxicity/on_eat(obj/structure/spacevine/holder, mob/living/eater) - if(!isvineimmune(eater)) - eater.adjustToxLoss(20) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + eater.adjustToxLoss(10) // SKYRAT EDIT CHANGE - Original: 20 /datum/spacevine_mutation/explosive // JC IT'S A BOMB name = "Explosive" @@ -298,11 +290,7 @@ if(prob(THORN_MUTATION_CUT_PROB) && istype(crosser) && !isvineimmune(crosser)) var/mob/living/victim = crosser -<<<<<<< HEAD - victim.adjustBruteLoss(5) // SKYRAT EDIT CHANGE - Original: 15 -======= - victim.adjustBruteLoss(15) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + victim.adjustBruteLoss(7) // SKYRAT EDIT CHANGE - Original: 15 to_chat(victim, span_danger("You cut yourself on the thorny vines.")) /datum/spacevine_mutation/thorns/on_hit(obj/structure/spacevine/holder, mob/living/hitter, obj/item/item, expected_damage) @@ -317,11 +305,7 @@ if(prob(THORN_MUTATION_CUT_PROB) && istype(hitter) && !isvineimmune(hitter)) var/mob/living/victim = hitter -<<<<<<< HEAD - victim.adjustBruteLoss(5) // SKYRAT EDIT CHANGE - Original: 15 -======= - victim.adjustBruteLoss(15) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + victim.adjustBruteLoss(7) // SKYRAT EDIT CHANGE - Original: 15 to_chat(victim, span_danger("You cut yourself on the thorny vines.")) return expected_damage diff --git a/code/modules/events/space_vines/vine_structure.dm b/code/modules/events/space_vines/vine_structure.dm index 6352085b423..094a37371d7 100644 --- a/code/modules/events/space_vines/vine_structure.dm +++ b/code/modules/events/space_vines/vine_structure.dm @@ -67,13 +67,10 @@ for(var/datum/spacevine_mutation/mutation in mutations) override += mutation.on_chem(src, chem) if(!override && prob(75) && istype(chem, /datum/reagent/toxin/plantbgone)) -<<<<<<< HEAD // SKYRAT EDIT ADD START if(plantbgone_resist && prob(50)) return // SKYRAT EDIT ADD END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qdel(src) /obj/structure/spacevine/proc/eat(mob/eater) diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm index 2ddf3225244..cb236e02f12 100644 --- a/code/modules/events/wizard/curseditems.dm +++ b/code/modules/events/wizard/curseditems.dm @@ -27,11 +27,7 @@ var/item_set = pick( BIG_FAT_DOOBIE, BOXING, -<<<<<<< HEAD // CATGIRLS_2015, // SKYRAT EDIT REMOVAL -======= - CATGIRLS_2015, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 CURSED_SWORDS, VOICE_MODULATORS, WIZARD_MIMICRY, diff --git a/code/modules/events/wizard/rpgtitles.dm b/code/modules/events/wizard/rpgtitles.dm index 2583e16fecb..9bb69a90f2c 100644 --- a/code/modules/events/wizard/rpgtitles.dm +++ b/code/modules/events/wizard/rpgtitles.dm @@ -4,11 +4,7 @@ typepath = /datum/round_event/wizard/rpgtitles max_occurrences = 1 earliest_start = 0 MINUTES -<<<<<<< HEAD - description = "Everyone gains an RPG title hovering above them." -======= description = "Everyone gains an RPG title hovering below them." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 min_wizard_trigger_potency = 4 max_wizard_trigger_potency = 7 diff --git a/code/modules/experisci/experiment/experiments.dm b/code/modules/experisci/experiment/experiments.dm index 930fe7f590a..c9f4f1b3d1b 100644 --- a/code/modules/experisci/experiment/experiments.dm +++ b/code/modules/experisci/experiment/experiments.dm @@ -142,17 +142,6 @@ experiment_proper = TRUE required_gas = /datum/gas/hypernoblium -<<<<<<< HEAD -/datum/experiment/ordnance/gaseous/halon - name = "Halon Gas Shells" - description = "The delivery of Halon gas into an area of operation might prove useful. Perform research and publish papers on this field." - gain = list(10,30,60) - target_amount = list(15,55,250) - experiment_proper = TRUE - required_gas = /datum/gas/halon - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/experiment/scanning/random/material/meat name = "Biological Material Scanning Experiment" description = "They told us we couldn't make chairs out of every material in the world. You're here to prove those nay-sayers wrong." @@ -398,11 +387,7 @@ if (organ.type == target_species.get_mutant_organ_type_for_slot(organ.slot)) continue else -<<<<<<< HEAD - if ((organ.type in target_species.mutant_organs) || (organ.type in target_species.external_organs)) -======= if ((organ.type in target_species.mutant_organs)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue return TRUE return FALSE diff --git a/code/modules/experisci/experiment/handlers/experiment_handler.dm b/code/modules/experisci/experiment/handlers/experiment_handler.dm index db681ef0afb..00082c25389 100644 --- a/code/modules/experisci/experiment/handlers/experiment_handler.dm +++ b/code/modules/experisci/experiment/handlers/experiment_handler.dm @@ -124,20 +124,13 @@ if(!(config_flags & EXPERIMENT_CONFIG_SILENT_FAIL)) to_chat(user, span_notice("You do not have an experiment selected!")) return -<<<<<<< HEAD var/skill_modifier = user.mind.get_skill_modifier(/datum/skill/research, SKILL_SPEED_MODIFIER) //SKYRAT EDIT: Research Skill (simple research) if(!(config_flags & EXPERIMENT_CONFIG_IMMEDIATE_ACTION) && !do_after(user, 1 SECONDS * skill_modifier, target = target)) //SKYRAT EDIT: Research Skill (simple research) -======= - if(!(config_flags & EXPERIMENT_CONFIG_IMMEDIATE_ACTION) && !do_after(user, 1 SECONDS, target = target)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(action_experiment(source, target)) playsound(user, 'sound/machines/ping.ogg', 25) to_chat(user, span_notice("You scan [target].")) -<<<<<<< HEAD user.mind.adjust_experience(/datum/skill/research, 5) //SKYRAT EDIT: Research Skill (simple research) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(!(config_flags & EXPERIMENT_CONFIG_SILENT_FAIL)) playsound(user, 'sound/machines/buzz-sigh.ogg', 25) to_chat(user, span_notice("[target] is not related to your currently selected experiment.")) @@ -364,11 +357,7 @@ ) .["experiments"] += list(data) -<<<<<<< HEAD -/datum/component/experiment_handler/ui_act(action, params) -======= /datum/component/experiment_handler/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/explorer_drone/control_console.dm b/code/modules/explorer_drone/control_console.dm index fe953037e25..78451dd71a1 100644 --- a/code/modules/explorer_drone/control_console.dm +++ b/code/modules/explorer_drone/control_console.dm @@ -97,11 +97,7 @@ icon_screen = initial(icon_screen) . = ..() -<<<<<<< HEAD -/obj/machinery/computer/exodrone_control_console/ui_act(action, list/params) -======= /obj/machinery/computer/exodrone_control_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/explorer_drone/exodrone.dm b/code/modules/explorer_drone/exodrone.dm index e0435dc539b..8ba0f64b4a6 100644 --- a/code/modules/explorer_drone/exodrone.dm +++ b/code/modules/explorer_drone/exodrone.dm @@ -63,14 +63,6 @@ GLOBAL_LIST_EMPTY(exodrone_launchers) /obj/item/exodrone/Initialize(mapload) . = ..() -<<<<<<< HEAD - name = pick(strings(EXODRONE_FILE,"probe_names")) - if(name_counter[name]) - name_counter[name]++ - name = "[name] \Roman[name_counter[name]]" - else - name_counter[name] = 1 -======= if(name == /obj/item/exodrone::name) name = pick(strings(EXODRONE_FILE,"probe_names")) if(name_counter[name]) @@ -80,7 +72,6 @@ GLOBAL_LIST_EMPTY(exodrone_launchers) name_counter[name] = 1 else name = name ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.exodrones += src // Cargo storage create_storage(max_slots = EXODRONE_CARGO_SLOTS, canthold = GLOB.blacklisted_cargo_types) diff --git a/code/modules/explorer_drone/exploration_events/resource.dm b/code/modules/explorer_drone/exploration_events/resource.dm index e4465b77133..3d4fc926517 100644 --- a/code/modules/explorer_drone/exploration_events/resource.dm +++ b/code/modules/explorer_drone/exploration_events/resource.dm @@ -282,11 +282,7 @@ has_tool_description = "Your drill will allow you to extract the deposit!" action_text = "Mine" delay_message = "Mining..." -<<<<<<< HEAD var/static/list/possible_materials = list(/datum/material/silver,/datum/material/bananium) //only add materials with sheet type here //SKYRAT EDIT - REMOVED /datum/material/pizza -======= - var/static/list/possible_materials = list(/datum/material/silver,/datum/material/bananium,/datum/material/pizza) //only add materials with sheet type here ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/loot_amount = 30 var/chosen_material_type diff --git a/code/modules/explorer_drone/exploration_events/trader.dm b/code/modules/explorer_drone/exploration_events/trader.dm index 300db896a0b..b686a53582d 100644 --- a/code/modules/explorer_drone/exploration_events/trader.dm +++ b/code/modules/explorer_drone/exploration_events/trader.dm @@ -22,11 +22,7 @@ return "You encountered [name] but could not understand what they want without a translator." var/obj/want = required_path var/obj/gives = traded_path -<<<<<<< HEAD - return "Encountered [name] willing to trade [initial(want.name)] for [initial(gives.name)]" -======= return "Encountered [name] willing to trade [initial(gives.name)] for [initial(want.name)]" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/exploration_event/simple/trader/get_description(obj/item/exodrone/drone) if(requires_translator && !drone.has_tool(EXODRONE_TOOL_TRANSLATOR)) diff --git a/code/modules/explorer_drone/scanner_array.dm b/code/modules/explorer_drone/scanner_array.dm index 9ced0bb76d4..0cbeb684a8c 100644 --- a/code/modules/explorer_drone/scanner_array.dm +++ b/code/modules/explorer_drone/scanner_array.dm @@ -121,11 +121,7 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions()) . = ..() .["all_bands"] = GLOB.exoscanner_bands -<<<<<<< HEAD -/obj/machinery/computer/exoscanner_control/ui_act(action, list/params) -======= /obj/machinery/computer/exoscanner_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/fishing/admin.dm b/code/modules/fishing/admin.dm index 9bb75f7c2f3..f4643201a77 100644 --- a/code/modules/fishing/admin.dm +++ b/code/modules/fishing/admin.dm @@ -51,11 +51,7 @@ ADMIN_VERB(fishing_calculator, R_DEBUG, "Fishing Calculator", "A calculator... f temporary_rod.set_slot(new line_type(temporary_rod), ROD_SLOT_LINE) var/result_table = list() -<<<<<<< HEAD - var/modified_table = spot.get_modified_fish_table(temporary_rod,user) -======= var/modified_table = spot.get_modified_fish_table(temporary_rod, user, null) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/result_type in spot.fish_table) // through this not modified to display 0 chance ones too var/list/info = list() info["result"] = result_type diff --git a/code/modules/fishing/aquarium/aquarium.dm b/code/modules/fishing/aquarium/aquarium.dm index bd5a8b1cb08..0d2cd462128 100644 --- a/code/modules/fishing/aquarium/aquarium.dm +++ b/code/modules/fishing/aquarium/aquarium.dm @@ -307,16 +307,6 @@ /obj/structure/aquarium/ui_data(mob/user) . = ..() -<<<<<<< HEAD - .["fluid_type"] = fluid_type - .["temperature"] = fluid_temp - .["allow_breeding"] = allow_breeding - .["feeding_interval"] = feeding_interval / (1 MINUTES) - var/list/content_data = list() - for(var/atom/movable/fish in contents) - content_data += list(list("name"=fish.name,"ref"=ref(fish))) - .["contents"] = content_data -======= .["fluidType"] = fluid_type .["temperature"] = fluid_temp .["allowBreeding"] = allow_breeding @@ -341,7 +331,6 @@ "prop_icon" = item::icon, "prop_icon_state" = item::icon_state, )) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/aquarium/ui_static_data(mob/user) . = ..() @@ -349,14 +338,9 @@ .["minTemperature"] = min_fluid_temp .["maxTemperature"] = max_fluid_temp .["fluidTypes"] = fluid_types -<<<<<<< HEAD - -/obj/structure/aquarium/ui_act(action, params) -======= .["heartIcon"] = 'icons/effects/effects.dmi' /obj/structure/aquarium/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -378,16 +362,6 @@ if("feeding_interval") feeding_interval = params["feeding_interval"] MINUTES . = TRUE -<<<<<<< HEAD - if("remove") - var/atom/movable/inside = locate(params["ref"]) in contents - if(inside) - if(isitem(inside)) - user.put_in_hands(inside) - else - inside.forceMove(get_turf(src)) - to_chat(user,span_notice("You take out [inside] from [src].")) -======= if("pet_fish") var/obj/item/fish/fish = locate(params["fish_reference"]) in contents fish?.pet_fish(user) @@ -401,7 +375,6 @@ return var/atom/movable/fish = locate(params["fish_reference"]) in contents fish.name = new_name ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/aquarium/ui_interact(mob/user, datum/tgui/ui) . = ..() @@ -448,11 +421,6 @@ new /obj/item/aquarium_prop/sand(src) new /obj/item/aquarium_prop/seaweed(src) -<<<<<<< HEAD - new /obj/item/fish/goldfish/gill(src) - - reagents.add_reagent(/datum/reagent/consumable/nutriment, 2) -======= if(prob(85)) new /obj/item/fish/goldfish/gill(src) reagents.add_reagent(/datum/reagent/consumable/nutriment, 2) @@ -460,7 +428,6 @@ new /obj/item/fish/goldfish/three_eyes/gill(src) reagents.add_reagent(/datum/reagent/toxin/mutagen, 2) //three eyes goldfish feed on mutagen. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/aquarium/prefilled anchored = TRUE diff --git a/code/modules/fishing/aquarium/aquarium_kit.dm b/code/modules/fishing/aquarium/aquarium_kit.dm index f2c3bbc7165..3257760f6a4 100644 --- a/code/modules/fishing/aquarium/aquarium_kit.dm +++ b/code/modules/fishing/aquarium/aquarium_kit.dm @@ -58,11 +58,7 @@ name = "ominous fish case" /obj/item/storage/fish_case/syndicate/get_fish_type() -<<<<<<< HEAD - return pick(/obj/item/fish/donkfish, /obj/item/fish/emulsijack, /obj/item/fish/jumpercable) -======= return pick(/obj/item/fish/donkfish, /obj/item/fish/emulsijack, /obj/item/fish/jumpercable, /obj/item/fish/chainsawfish) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/fish_case/tiziran name = "imported fish case" diff --git a/code/modules/fishing/bait.dm b/code/modules/fishing/bait.dm index 84175c12d1e..8fb66ad4c3d 100644 --- a/code/modules/fishing/bait.dm +++ b/code/modules/fishing/bait.dm @@ -61,8 +61,6 @@ bait_type = /obj/item/food/bait/doughball/synthetic/super uses_left = 12 -<<<<<<< HEAD -======= /obj/item/fishing_lure name = "artificial minnow" desc = "A fishing lure meant to attract smaller omnivore fish." @@ -299,4 +297,3 @@ if(init_fluid_type == AQUARIUM_FLUID_SALTWATER || init_fluid_type == AQUARIUM_FLUID_ANADROMOUS || init_fluid_type == AQUARIUM_FLUID_ANY_WATER) return TRUE return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm index 74d6ef84266..08d09188e6b 100644 --- a/code/modules/fishing/fish/_fish.dm +++ b/code/modules/fishing/fish/_fish.dm @@ -1,50 +1,14 @@ -<<<<<<< HEAD -======= #define FISH_SAD 0 #define FISH_NEUTRAL 1 #define FISH_SATISFIED 2 #define FISH_HAPPY 3 #define FISH_VERY_HAPPY 4 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Fish path used for autogenerated fish /obj/item/fish name = "generic looking aquarium fish" desc = "very bland" icon = 'icons/obj/aquarium/fish.dmi' -<<<<<<< HEAD - icon_state = "bugfish" - lefthand_file = 'icons/mob/inhands/fish_lefthand.dmi' - righthand_file = 'icons/mob/inhands/fish_righthand.dmi' - inhand_icon_state = "fish_normal" - force = 6 - attack_verb_continuous = list("slaps", "whacks") - attack_verb_simple = list("slap", "whack") - hitsound = 'sound/weapons/slap.ogg' - ///The grind results of the fish. They scale with the weight of the fish. - grind_results = list(/datum/reagent/blood = 5, /datum/reagent/consumable/liquidgibs = 5) - obj_flags = UNIQUE_RENAME - - /// Resulting width of aquarium visual icon - default size of "fish_greyscale" state - var/sprite_width = 3 - /// Resulting height of aquarium visual icon - default size of "fish_greyscale" state - var/sprite_height = 3 - - /// Original width of aquarium visual icon - used to calculate scaledown factor - var/source_width = 32 - /// Original height of aquarium visual icon - used to calculate scaledown factor - var/source_height = 32 - - /** - * If present and it also has a dedicated icon state, this icon file will - * be used for in-aquarium visual for the fish instead of its icon - */ - var/dedicated_in_aquarium_icon - /// If present this icon will be used for in-aquarium visual for the fish instead of icon_state - var/dedicated_in_aquarium_icon_state - - /// If present aquarium visual will be this color -======= lefthand_file = 'icons/mob/inhands/fish_lefthand.dmi' righthand_file = 'icons/mob/inhands/fish_righthand.dmi' force = 6 @@ -75,7 +39,6 @@ var/dedicated_in_aquarium_icon_state /// If present aquarium visual will be of this color ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/aquarium_vc_color /// Required fluid type for this fish to live. @@ -133,13 +96,8 @@ */ var/list/fish_traits = list() -<<<<<<< HEAD - /// Fishing behaviour - var/fish_ai_type = FISH_AI_DUMB -======= /// path to datums that dictate how the fish moves during the fishing minigame var/fish_movement_type = /datum/fish_movement ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Base additive modifier to fishing difficulty var/fishing_difficulty_modifier = 0 @@ -166,12 +124,9 @@ /// Average weight for this fish type in grams var/average_weight = 1000 -<<<<<<< HEAD -======= ///The general deviation from the average weight and size this fish has in the wild var/weight_size_deviation = 0.2 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// When outside of an aquarium, these gases that are checked (as well as pressure and temp) to assert if the environment is safe or not. var/list/safe_air_limits = list( /datum/gas/oxygen = list(12, 100), @@ -192,11 +147,8 @@ /// The beauty this fish provides to the aquarium it's inserted in. var/beauty = FISH_BEAUTY_GENERIC -<<<<<<< HEAD -======= ///have we recently pet this fish var/recently_petted = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fish/Initialize(mapload, apply_qualities = TRUE) . = ..() @@ -256,17 +208,11 @@ if(HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISH)) . += span_notice("It's [size] cm long.") . += span_notice("It weighs [weight] g.") -<<<<<<< HEAD - -///Randomizes weight and size. -/obj/item/fish/proc/randomize_size_and_weight(base_size = average_size, base_weight = average_weight, deviation = 0.2) -======= if(HAS_TRAIT(src, TRAIT_FISHING_BAIT)) . += span_smallnoticeital("It can be used as a fishing bait.") ///Randomizes weight and size. /obj/item/fish/proc/randomize_size_and_weight(base_size = average_size, base_weight = average_weight, deviation = weight_size_deviation) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/size_deviation = 0.2 * base_size var/new_size = round(clamp(gaussian(base_size, size_deviation), average_size * 1/MAX_FISH_DEVIATION_COEFF, average_size * MAX_FISH_DEVIATION_COEFF)) @@ -277,27 +223,6 @@ ///Updates weight and size, along with weight class, number of fillets you can get and grind results. /obj/item/fish/proc/update_size_and_weight(new_size = average_size, new_weight = average_weight) -<<<<<<< HEAD - if(size && fillet_type) - RemoveElement(/datum/element/processable, TOOL_KNIFE, fillet_type, num_fillets, 0.5 SECONDS, screentip_verb = "Cut") - size = new_size - switch(size) - if(0 to FISH_SIZE_TINY_MAX) - update_weight_class(WEIGHT_CLASS_TINY) - inhand_icon_state = "fish_small" - if(FISH_SIZE_TINY_MAX to FISH_SIZE_SMALL_MAX) - inhand_icon_state = "fish_small" - update_weight_class(WEIGHT_CLASS_SMALL) - if(FISH_SIZE_SMALL_MAX to FISH_SIZE_NORMAL_MAX) - inhand_icon_state = "fish_normal" - update_weight_class(WEIGHT_CLASS_NORMAL) - if(FISH_SIZE_NORMAL_MAX to FISH_SIZE_BULKY_MAX) - inhand_icon_state = "fish_bulky" - update_weight_class(WEIGHT_CLASS_BULKY) - if(FISH_SIZE_BULKY_MAX to INFINITY) - inhand_icon_state = "fish_huge" - update_weight_class(WEIGHT_CLASS_HUGE) -======= SEND_SIGNAL(src, COMSIG_FISH_UPDATE_SIZE_AND_WEIGHT, new_size, new_weight) if(size) if(fillet_type) @@ -336,26 +261,16 @@ inhand_icon_state = "[inhand_icon_state]_wielded" AddComponent(/datum/component/two_handed, require_twohands = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(fillet_type) var/init_fillets = initial(num_fillets) var/amount = max(round(init_fillets * size / FISH_FILLET_NUMBER_SIZE_DIVISOR, 1), 1) num_fillets = amount -<<<<<<< HEAD - AddElement(/datum/element/processable, TOOL_KNIFE, fillet_type, num_fillets, 0.5 SECONDS, screentip_verb = "Cut") -======= AddElement(/datum/element/processable, TOOL_KNIFE, fillet_type, num_fillets, 0.5 SECONDS * num_fillets, screentip_verb = "Cut") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(weight) for(var/reagent_type in grind_results) grind_results[reagent_type] /= FLOOR(weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR, 0.1) weight = new_weight -<<<<<<< HEAD - for(var/reagent_type in grind_results) - grind_results[reagent_type] *= FLOOR(weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR, 0.1) - -======= if(weight >= FISH_WEIGHT_SLOWDOWN) slowdown = round(((weight/FISH_WEIGHT_SLOWDOWN_DIVISOR)**FISH_WEIGHT_SLOWDOWN_EXPONENT)-1.3, 0.1) @@ -441,7 +356,6 @@ attack_speed += 0.4 SECONDS demolition_mod += 0.4 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * This proc has fish_traits list populated with fish_traits paths from three different lists: * traits from x_traits and y_traits are compared, and inserted if conditions are met; @@ -566,11 +480,7 @@ SEND_SIGNAL(src, COMSIG_FISH_LIFE, seconds_per_tick) -<<<<<<< HEAD -/obj/item/fish/proc/set_status(new_status) -======= /obj/item/fish/proc/set_status(new_status, silent = FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(status == new_status) return switch(new_status) @@ -584,14 +494,6 @@ status = FISH_DEAD STOP_PROCESSING(SSobj, src) stop_flopping() -<<<<<<< HEAD - var/message = span_notice(replacetext(death_text, "%SRC", "[src]")) - if(isaquarium(loc)) - loc.visible_message(message) - else - visible_message(message) - update_appearance() -======= if(!silent) var/message = span_notice(replacetext(death_text, "%SRC", "[src]")) if(isaquarium(loc)) @@ -600,7 +502,6 @@ visible_message(message) update_appearance() update_fish_force() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SIGNAL(src, COMSIG_FISH_STATUS_CHANGED) /obj/item/fish/expose_reagents(list/reagents, datum/reagents/source, methods = TOUCH, volume_modifier = 1, show_message = TRUE) @@ -687,11 +588,7 @@ return FALSE if(!being_targeted && length(aquarium.get_fishes()) >= AQUARIUM_MAX_BREEDING_POPULATION) return FALSE -<<<<<<< HEAD - return aquarium.allow_breeding && health >= initial(health) * 0.8 && stable_population > 1 && world.time >= breeding_wait -======= return aquarium.allow_breeding && health >= initial(health) * 0.8 && stable_population >= 1 && world.time >= breeding_wait ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fish/proc/try_to_reproduce() var/obj/structure/aquarium/aquarium = loc @@ -726,38 +623,6 @@ second_fish = other_fish break -<<<<<<< HEAD - if(!second_fish && !HAS_TRAIT(src, TRAIT_FISH_SELF_REPRODUCE)) - return FALSE - - var/chosen_type - var/datum/fish_evolution/chosen_evolution - if(PERFORM_ALL_TESTS(fish_breeding) && second_fish && !length(evolution_types)) - chosen_type = second_fish.type - else - var/list/possible_evolutions = list() - for(var/evolution_type in evolution_types) - var/datum/fish_evolution/evolution = GLOB.fish_evolutions[evolution_type] - if(evolution.check_conditions(src, second_fish, aquarium)) - possible_evolutions += evolution - if(second_fish?.evolution_types) - var/secondary_evolutions = (second_fish.evolution_types - evolution_types) - for(var/evolution_type in secondary_evolutions) - var/datum/fish_evolution/evolution = GLOB.fish_evolutions[evolution_type] - if(evolution.check_conditions(second_fish, src, aquarium)) - possible_evolutions += evolution - - if(length(possible_evolutions)) - chosen_evolution = pick(possible_evolutions) - chosen_type = chosen_evolution.new_fish_type - else if(second_fish) - if(length(aquarium.tracked_fish_by_type[type]) >= stable_population) - chosen_type = second_fish.type - else - chosen_type = pick(second_fish.type, type) - else - chosen_type = type -======= if(!second_fish) if(!HAS_TRAIT(src, TRAIT_FISH_SELF_REPRODUCE)) return FALSE @@ -800,7 +665,6 @@ chosen_type = pick(second_fish.type, type) else chosen_type = type ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return create_offspring(chosen_type, second_fish, chosen_evolution) @@ -904,8 +768,6 @@ if(HAS_TRAIT(src, TRAIT_FISH_FROM_CASE)) //Avoid printing money by simply ordering fish and sending it back. calculated_price *= 0.05 return round(calculated_price) -<<<<<<< HEAD -======= /obj/item/fish/proc/get_happiness_value() var/happiness_value = 0 if(recently_petted) @@ -931,7 +793,6 @@ SEND_SIGNAL(src, COMSIG_FISH_PETTED) to_chat(user, span_notice("[src] dances around!")) addtimer(VARSET_CALLBACK(src, recently_petted, FALSE), 30 SECONDS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Returns random fish, using random_case_rarity probabilities. /proc/random_fish_type(required_fluid) diff --git a/code/modules/fishing/fish/chasm_detritus.dm b/code/modules/fishing/fish/chasm_detritus.dm index 27f89a1f4d9..9595c552e18 100644 --- a/code/modules/fishing/fish/chasm_detritus.dm +++ b/code/modules/fishing/fish/chasm_detritus.dm @@ -96,11 +96,7 @@ GLOBAL_LIST_INIT_TYPED(chasm_detritus_types, /datum/chasm_detritus, init_chasm_d /// This also includes all mobs fallen into chasms, regardless of distance /datum/chasm_detritus/restricted/bodies/get_chasm_contents(turf/fishing_spot) . = ..() -<<<<<<< HEAD - . |= GLOB.chasm_fallen_mobs -======= . |= GLOB.chasm_fallen_mobs[get_chasm_category(fishing_spot)] ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Body detritus is selected in favor of bodies belonging to sentient mobs /// The first sentient body found in the list of contents is returned, otherwise diff --git a/code/modules/fishing/fish/fish_evolution.dm b/code/modules/fishing/fish/fish_evolution.dm index 72c6dcb3ff3..688b0c201c7 100644 --- a/code/modules/fishing/fish/fish_evolution.dm +++ b/code/modules/fishing/fish/fish_evolution.dm @@ -78,10 +78,7 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio /datum/fish_evolution/purple_sludgefish probability = 5 new_fish_type = /obj/item/fish/sludgefish/purple -<<<<<<< HEAD -======= new_traits = list(/datum/fish_trait/recessive) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 removed_traits = list(/datum/fish_trait/no_mating) /datum/fish_evolution/mastodon @@ -89,11 +86,7 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio probability = 40 new_fish_type = /obj/item/fish/mastodon new_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/amphibious, /datum/fish_trait/predator, /datum/fish_trait/aggressive) -<<<<<<< HEAD - conditions_note = "The fish (and its mate) need to be unusually big both in size and weight." -======= conditions_note = "The fish (and its mate) needs to be unusually big both in size and weight." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_evolution/mastodon/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium) if((source.size < 120 || source.weight < 3000) || (mate && (mate.size < 120 || mate.weight < 3000))) @@ -111,8 +104,6 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio new_fish_type = /obj/item/fish/chasm_crab/ice required_temperature_min = MIN_AQUARIUM_TEMP+9 required_temperature_max = MIN_AQUARIUM_TEMP+10 -<<<<<<< HEAD -======= /datum/fish_evolution/three_eyes name = "Three-eyed Goldfish" @@ -133,4 +124,3 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio if(source.size >= double_avg_size && source.weight >= double_avg_weight && (/datum/fish_trait/aggressive in source.fish_traits)) return ..() return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/fishing/fish/fish_traits.dm b/code/modules/fishing/fish/fish_traits.dm index 56bc58807b7..e51b810d16b 100644 --- a/code/modules/fishing/fish/fish_traits.dm +++ b/code/modules/fishing/fish/fish_traits.dm @@ -37,11 +37,8 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) var/list/fish_whitelist /// Depending on the value, fish with trait will be reported as more or less difficult in the catalog. var/added_difficulty = 0 -<<<<<<< HEAD -======= /// Reagents added to the fish when gained var/list/reagents_to_add ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Difficulty modifier from this mod, needs to return a list with two values /datum/fish_trait/proc/difficulty_mod(obj/item/fishing_rod/rod, mob/fisherman) @@ -49,11 +46,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) return list(ADDITIVE_FISHING_MOD = 0, MULTIPLICATIVE_FISHING_MOD = 1) /// Catch weight table modifier from this mod, needs to return a list with two values -<<<<<<< HEAD -/datum/fish_trait/proc/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman) -======= /datum/fish_trait/proc/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SHOULD_CALL_PARENT(TRUE) return list(ADDITIVE_FISHING_MOD = 0, MULTIPLICATIVE_FISHING_MOD = 1) @@ -63,15 +56,11 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) /// Applies some special qualities to the fish that has been spawned /datum/fish_trait/proc/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD - return -======= SHOULD_CALL_PARENT(TRUE) if(reagents_to_add) for(var/reagent in reagents_to_add) add_to_reagents(fish, reagent, reagents_to_add[reagent]) RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(process_reagents)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Applies some special qualities to basic mobs generated by fish (i.e. chasm chrab --> young lobstrosity --> lobstrosity). /datum/fish_trait/proc/apply_to_mob(mob/living/basic/mob) @@ -96,8 +85,6 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) fish.grind_results.Insert(1, reagent_type) fish.grind_results[reagent_type] = amount -<<<<<<< HEAD -======= /// Proc that handles adding reagents from the trait to the fillets from butchered fish. /datum/fish_trait/proc/process_reagents(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results) SIGNAL_HANDLER @@ -129,7 +116,6 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) source.RemoveElement(/datum/element/venomous, venom_path, is_dead ? live_amount : dead_amount, thrown_effect = TRUE) source.AddElement(/datum/element/venomous, venom_path, is_dead ? dead_amount : live_amount, thrown_effect = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/wary name = "Wary" catalog_description = "This fish will avoid visible fish lines, cloaked line recommended." @@ -152,58 +138,35 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) /datum/fish_trait/picky_eater name = "Picky Eater" -<<<<<<< HEAD - catalog_description = "This fish is very picky and will ignore low quality bait." - -/datum/fish_trait/picky_eater/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman) -======= catalog_description = "This fish is very picky and will ignore low quality bait (unless it's amongst its favorites)." /datum/fish_trait/picky_eater/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(!rod.bait) .[MULTIPLICATIVE_FISHING_MOD] = 0 return if(HAS_TRAIT(rod.bait, TRAIT_OMNI_BAIT)) return -<<<<<<< HEAD - if(HAS_TRAIT(rod.bait, TRAIT_GOOD_QUALITY_BAIT) || HAS_TRAIT(rod.bait, TRAIT_GREAT_QUALITY_BAIT)) - .[MULTIPLICATIVE_FISHING_MOD] = 0 - - -======= if(is_matching_bait(rod.bait, SSfishing.fish_properties[fish_type][FISH_PROPERTIES_FAV_BAIT])) //we like this bait anyway return if(!HAS_TRAIT(rod.bait, TRAIT_GOOD_QUALITY_BAIT) && !HAS_TRAIT(rod.bait, TRAIT_GREAT_QUALITY_BAIT)) .[MULTIPLICATIVE_FISHING_MOD] = 0 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/nocturnal name = "Nocturnal" catalog_description = "This fish avoids bright lights, fishing and storing in darkness recommended." -<<<<<<< HEAD -/datum/fish_trait/nocturnal/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman) - . = ..() - var/turf/turf = get_turf(fisherman) - var/light_amount = turf.get_lumcount() -======= /datum/fish_trait/nocturnal/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type) . = ..() if(rod.bait && HAS_TRAIT(rod.bait, TRAIT_BAIT_IGNORE_ENVIRONMENT)) return var/turf/turf = get_turf(location) var/light_amount = turf?.get_lumcount() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(light_amount > SHADOW_SPECIES_LIGHT_THRESHOLD) .[MULTIPLICATIVE_FISHING_MOD] = 0 /datum/fish_trait/nocturnal/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(check_light)) /datum/fish_trait/nocturnal/proc/check_light(obj/item/fish/source, seconds_per_tick) @@ -235,11 +198,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) mob.apply_status_effect(/datum/status_effect/shadow_regeneration) /datum/fish_trait/heavy -<<<<<<< HEAD - name = "Heavy" -======= name = "Demersal" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 catalog_description = "This fish tends to stay near the waterbed." /datum/fish_trait/heavy/apply_to_mob(mob/living/basic/mob) @@ -252,20 +211,13 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) mob.obj_damage *= 1.3 /datum/fish_trait/heavy/minigame_mod(obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/minigame) -<<<<<<< HEAD - minigame.fish_idle_velocity -= 10 -======= minigame.mover.fish_idle_velocity -= 10 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/carnivore name = "Carnivore" catalog_description = "This fish can only be baited with meat." incompatible_traits = list(/datum/fish_trait/vegan) -<<<<<<< HEAD -/datum/fish_trait/carnivore/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman) -======= /datum/fish_trait/carnivore/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type) . = ..() if(!rod.bait) @@ -288,7 +240,6 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) incompatible_traits = list(/datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/necrophage) /datum/fish_trait/vegan/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(!rod.bait) .[MULTIPLICATIVE_FISHING_MOD] = 0 @@ -298,30 +249,10 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) if(!istype(rod.bait, /obj/item/food)) .[MULTIPLICATIVE_FISHING_MOD] = 0 return -<<<<<<< HEAD - var/obj/item/food/food_bait = rod.bait - if(!(food_bait.foodtypes & MEAT)) - .[MULTIPLICATIVE_FISHING_MOD] = 0 - -/datum/fish_trait/vegan - name = "Herbivore" - catalog_description = "This fish can only be baited with fresh produce." - incompatible_traits = list(/datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/necrophage) - -/datum/fish_trait/vegan/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman) - . = ..() - if(!rod.bait) - .[MULTIPLICATIVE_FISHING_MOD] = 0 - return - if(HAS_TRAIT(rod.bait, TRAIT_OMNI_BAIT)) - return - if(!istype(rod.bait, /obj/item/food/grown)) -======= if(istype(rod.bait, /obj/item/food/grown)) return var/obj/item/food/food_bait = rod.bait if(food_bait.foodtypes & (MEAT|SEAFOOD|GORE|BUGS|DAIRY) || !(food_bait.foodtypes & (VEGETABLES|FRUIT))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 .[MULTIPLICATIVE_FISHING_MOD] = 0 /datum/fish_trait/emulsijack @@ -329,10 +260,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) catalog_description = "This fish emits an invisible toxin that emulsifies other fish for it to feed on." /datum/fish_trait/emulsijack/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(emulsify)) ADD_TRAIT(fish, TRAIT_RESIST_EMULSIFY, FISH_TRAIT_DATUM) @@ -372,10 +300,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) incompatible_traits = list(/datum/fish_trait/vegan) /datum/fish_trait/necrophage/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(eat_dead_fishes)) /datum/fish_trait/necrophage/proc/eat_dead_fishes(obj/item/fish/source, seconds_per_tick) @@ -395,10 +320,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) diff_traits_inheritability = 25 /datum/fish_trait/parthenogenesis/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(fish, TRAIT_FISH_SELF_REPRODUCE, FISH_TRAIT_DATUM) /** @@ -412,10 +334,6 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) incompatible_traits = list(/datum/fish_trait/crossbreeder) /datum/fish_trait/no_mating/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD - ADD_TRAIT(fish, TRAIT_FISH_NO_MATING, FISH_TRAIT_DATUM) - -======= . = ..() ADD_TRAIT(fish, TRAIT_FISH_NO_MATING, FISH_TRAIT_DATUM) @@ -429,7 +347,6 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) . = ..() ADD_TRAIT(fish, TRAIT_FISH_RECESSIVE, FISH_TRAIT_DATUM) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/revival diff_traits_inheritability = 15 name = "Self-Revival" @@ -437,10 +354,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) spontaneous_manifest_types = list(/obj/item/fish/boned = 100, /obj/item/fish/mastodon = 100) /datum/fish_trait/revival/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_STATUS_CHANGED, PROC_REF(check_status)) /datum/fish_trait/revival/proc/check_status(obj/item/fish/source) @@ -468,9 +382,6 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) catalog_description = "It's a predatory fish. It'll hunt down and eat live fishes of smaller size when hungry." incompatible_traits = list(/datum/fish_trait/vegan) -<<<<<<< HEAD -/datum/fish_trait/predator/apply_to_fish(obj/item/fish/fish) -======= /datum/fish_trait/predator/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type) . = ..() if(isfish(rod.bait)) @@ -478,7 +389,6 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) /datum/fish_trait/predator/apply_to_fish(obj/item/fish/fish) . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(eat_fishes)) /datum/fish_trait/predator/proc/eat_fishes(obj/item/fish/source, seconds_per_tick) @@ -487,11 +397,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) return var/obj/structure/aquarium/aquarium = source.loc for(var/obj/item/fish/victim in aquarium.get_fishes(TRUE, source)) -<<<<<<< HEAD - if(victim.size < source.size * 0.75) // It's a big fish eat small fish world -======= if(victim.size < source.size * 0.7) // It's a big fish eat small fish world ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue if(victim.status != FISH_ALIVE || victim == source || HAS_TRAIT(victim, TRAIT_YUCKY_FISH) || SPT_PROB(80, seconds_per_tick)) continue @@ -501,33 +407,6 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) /datum/fish_trait/yucky name = "Yucky" catalog_description = "This fish tastes so repulsive, other fishes won't try to eat it." -<<<<<<< HEAD - -/datum/fish_trait/yucky/apply_to_fish(obj/item/fish/fish) - RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(add_yuck)) - ADD_TRAIT(fish, TRAIT_YUCKY_FISH, FISH_TRAIT_DATUM) - add_to_reagents(fish, /datum/reagent/yuck, 3) - -/datum/fish_trait/yucky/proc/add_yuck(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results) - var/amount = source.grind_results[/datum/reagent/yuck] / length(results) - for(var/atom/result as anything in results) - result.reagents?.add_reagent(/datum/reagent/yuck, amount) - -/datum/fish_trait/toxic - name = "Toxic" - catalog_description = "This fish contains toxins in its liver. Feeding it to predatory fishes or people is not reccomended." - diff_traits_inheritability = 25 - -/datum/fish_trait/toxic/apply_to_fish(obj/item/fish/fish) - RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(add_toxin)) - RegisterSignal(fish, COMSIG_FISH_EATEN_BY_OTHER_FISH, PROC_REF(on_eaten)) - add_to_reagents(fish, /datum/reagent/toxin/tetrodotoxin, 2.5) - -/datum/fish_trait/toxic/proc/add_toxin(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results) - var/amount = source.grind_results[ /datum/reagent/toxin/tetrodotoxin] / length(results) - for(var/atom/result as anything in results) - result.reagents?.add_reagent(/datum/reagent/toxin/tetrodotoxin, amount) -======= reagents_to_add = list(/datum/reagent/yuck = 3) /datum/fish_trait/yucky/apply_to_fish(obj/item/fish/fish) @@ -557,7 +436,6 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) if(!HAS_TRAIT(source, TRAIT_FISH_STINGER)) return change_venom_on_death(source, /datum/reagent/toxin/tetrodotoxin, 0.25, 0.1) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/toxic/proc/on_eaten(obj/item/fish/source, obj/item/fish/predator) if(HAS_TRAIT(predator, TRAIT_FISH_TOXIN_IMMUNE)) @@ -584,10 +462,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) diff_traits_inheritability = 40 /datum/fish_trait/toxin_immunity/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(fish, TRAIT_FISH_TOXIN_IMMUNE, FISH_TRAIT_DATUM) /datum/fish_trait/crossbreeder @@ -598,10 +473,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) incompatible_traits = list(/datum/fish_trait/no_mating) /datum/fish_trait/crossbreeder/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(fish, TRAIT_FISH_CROSSBREEDER, FISH_TRAIT_DATUM) /datum/fish_trait/aggressive @@ -611,10 +483,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) catalog_description = "This fish is aggressively territorial, and may attack fish that come close to it." /datum/fish_trait/aggressive/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(try_attack_fish)) /datum/fish_trait/aggressive/proc/try_attack_fish(obj/item/fish/source, seconds_per_tick) @@ -639,10 +508,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) added_difficulty = 5 /datum/fish_trait/lubed/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fish.AddComponent(/datum/component/slippery, 8 SECONDS, SLIDE|GALOSHES_DONT_HELP) /datum/fish_trait/lubed/apply_to_mob(mob/living/basic/mob) @@ -660,10 +526,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) catalog_description = "This fish has developed a primitive adaptation to life on both land and water." /datum/fish_trait/amphibious/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(fish, TRAIT_FISH_AMPHIBIOUS, FISH_TRAIT_DATUM) if(fish.required_fluid_type == AQUARIUM_FLUID_AIR) fish.required_fluid_type = AQUARIUM_FLUID_FRESHWATER @@ -676,10 +539,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) incompatible_traits = list(/datum/fish_trait/predator, /datum/fish_trait/necrophage) /datum/fish_trait/mixotroph/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(fish, TRAIT_FISH_NO_HUNGER, FISH_TRAIT_DATUM) /datum/fish_trait/antigrav @@ -687,20 +547,13 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) inheritability = 75 diff_traits_inheritability = 25 catalog_description = "This fish will invert the gravity of the bait at random. May fall upward outside after being caught." -<<<<<<< HEAD - added_difficulty = 15 -======= added_difficulty = 20 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/antigrav/minigame_mod(obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/minigame) minigame.special_effects |= FISHING_MINIGAME_RULE_ANTIGRAV /datum/fish_trait/antigrav/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fish.AddElement(/datum/element/forced_gravity, NEGATIVE_GRAVITY) /datum/fish_trait/antigrav/apply_to_mob(mob/living/basic/mob) @@ -717,10 +570,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) catalog_description = "This fish tends to die of stress when forced to be around too many other fish." /datum/fish_trait/anxiety/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(on_fish_life)) ///signal sent when the anxiety fish is fed, killing it if sharing contents with too many fish. @@ -743,16 +593,6 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) catalog_description = "This fish is electroreceptive, and will generate electric fields. Can be harnessed inside a bioelectric generator." /datum/fish_trait/electrogenesis/apply_to_fish(obj/item/fish/fish) -<<<<<<< HEAD - ADD_TRAIT(fish, TRAIT_FISH_ELECTROGENESIS, FISH_TRAIT_DATUM) - RegisterSignal(fish, COMSIG_ITEM_ATTACK, PROC_REF(on_item_attack)) - -/datum/fish_trait/electrogenesis/proc/on_item_attack(obj/item/fish/fish, mob/living/target, mob/living/user) - SIGNAL_HANDLER - - if(fish.status == FISH_ALIVE) - fish.force = 16 -======= . = ..() ADD_TRAIT(fish, TRAIT_FISH_ELECTROGENESIS, FISH_TRAIT_DATUM) RegisterSignal(fish, COMSIG_FISH_FORCE_UPDATED, PROC_REF(on_force_updated)) @@ -761,20 +601,10 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) SIGNAL_HANDLER if(fish.status == FISH_ALIVE) fish.force += 10 - fish.w_class ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fish.damtype = BURN fish.attack_verb_continuous = list("shocks", "zaps") fish.attack_verb_simple = list("shock", "zap") fish.hitsound = 'sound/effects/sparks4.ogg' -<<<<<<< HEAD - else - fish.force = fish::force - fish.damtype = fish::damtype - fish.attack_verb_continuous = fish::attack_verb_continuous - fish.attack_verb_simple = fish::attack_verb_simple - fish.hitsound = fish::hitsound -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/electrogenesis/apply_to_mob(mob/living/basic/mob) . = ..() @@ -792,8 +622,6 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) /datum/fish_trait/stunted/apply_to_mob(mob/living/basic/mob) . = ..() qdel(mob.GetComponent(/datum/component/growth_and_differentiation)) -<<<<<<< HEAD -======= /datum/fish_trait/stinger name = "Stinger" @@ -892,4 +720,3 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) var/init_alpha = initial(source.alpha) if(init_alpha != source.alpha) animate(source.alpha, alpha = init_alpha, time = 1.2 SECONDS, easing = CIRCULAR_EASING|EASE_OUT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/fishing/fish_catalog.dm b/code/modules/fishing/fish_catalog.dm index 59b9e0426bc..f0880804f8e 100644 --- a/code/modules/fishing/fish_catalog.dm +++ b/code/modules/fishing/fish_catalog.dm @@ -90,11 +90,7 @@ if(source.catalog_description && (fish_type in source.fish_table)) spot_descriptions += source.catalog_description .["spots"] = english_list(spot_descriptions, nothing_text = "Unknown") -<<<<<<< HEAD - var/list/fish_list_properties = collect_fish_properties() -======= var/list/fish_list_properties = SSfishing.fish_properties ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/fav_bait = fish_list_properties[fishy][NAMEOF(fishy, favorite_bait)] var/list/disliked_bait = fish_list_properties[fishy][NAMEOF(fishy, disliked_bait)] var/list/bait_list = list() diff --git a/code/modules/fishing/fishing_equipment.dm b/code/modules/fishing/fishing_equipment.dm index 8a09a38a8bc..645ebed875d 100644 --- a/code/modules/fishing/fishing_equipment.dm +++ b/code/modules/fishing/fishing_equipment.dm @@ -52,11 +52,7 @@ */ /obj/item/fishing_line/auto_reel name = "fishing line auto-reel" -<<<<<<< HEAD - desc = "A fishing line that automatically starts reeling in fish the moment they bite. Also good for hurling things at yourself." -======= desc = "A fishing line that automatically spins lures and begins reeling in fish the moment it bites. Also good for hurling things towards you." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "reel_auto" fishing_line_traits = FISHING_LINE_AUTOREEL line_color = "#F88414" @@ -167,8 +163,6 @@ rod_overlay_icon_state = "hook_treasure_overlay" chasm_detritus_type = /datum/chasm_detritus/restricted/objects -<<<<<<< HEAD -======= /obj/item/fishing_hook/magnet/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_FISHING_EQUIPMENT_SLOTTED, PROC_REF(hook_equipped)) @@ -183,7 +177,6 @@ SIGNAL_HANDLER REMOVE_TRAIT(old_loc, TRAIT_ROD_REMOVE_FISHING_DUD, type) UnregisterSignal(src, COMSIG_MOVABLE_MOVED) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fishing_hook/magnet/get_hook_bonus_multiplicative(fish_type, datum/fish_source/source) if(fish_type == FISHING_DUD || ispath(fish_type, /obj/item/fish)) @@ -192,10 +185,6 @@ // We multiply the odds by five for everything that's not a fish nor a dud return MAGNET_HOOK_BONUS_MULTIPLIER -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fishing_hook/shiny name = "shiny lure hook" icon_state = "gold_shiny" @@ -388,8 +377,6 @@ new /obj/item/storage/fish_case(src) new /obj/item/storage/fish_case(src) -<<<<<<< HEAD -======= /obj/item/storage/box/fishing_lures name = "fishing lures set" desc = "A small tackle box containing all the fishing lures you will ever need to curb randomness." @@ -427,6 +414,5 @@ Do not spin while the light is still red.

\ That's all, best of luck to your angling journey.

" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef MAGNET_HOOK_BONUS_MULTIPLIER #undef RESCUE_HOOK_FISH_MULTIPLIER diff --git a/code/modules/fishing/fishing_minigame.dm b/code/modules/fishing/fishing_minigame.dm index fc34ddde4d4..fc30d2aa697 100644 --- a/code/modules/fishing/fishing_minigame.dm +++ b/code/modules/fishing/fishing_minigame.dm @@ -1,27 +1,10 @@ -<<<<<<< HEAD -// Lure bobbing -======= // float bobbing ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define WAIT_PHASE 1 // Click now to start tgui part #define BITING_PHASE 2 // UI minigame phase #define MINIGAME_PHASE 3 -<<<<<<< HEAD -/// The height of the minigame slider. Not in pixels, but minigame units. -#define FISHING_MINIGAME_AREA 1000 -/// Any lower than this, and the target position of the fish is considered null -#define FISH_TARGET_MIN_DISTANCE 6 -/// The friction applied to fish jumps, so that it decelerates over time -#define FISH_FRICTION_MULT 0.9 -/// Used to decide whether the fish can jump in a certain direction -#define FISH_SHORT_JUMP_MIN_DISTANCE 100 -/// The maximum distance for a short jump -#define FISH_SHORT_JUMP_MAX_DISTANCE 200 -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Acceleration mod when bait is over fish #define FISH_ON_BAIT_ACCELERATION_MULT 0.6 /// The minimum velocity required for the bait to bounce @@ -54,11 +37,6 @@ var/start_time /// Is it finished (either by win/lose or window closing) var/completed = FALSE -<<<<<<< HEAD - /// Fish AI type to use - var/fish_ai = FISH_AI_DUMB -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Rule modifiers (eg weighted bait) var/special_effects = NONE /// A list of possible active minigame effects. If not empty, one will be picked from time to time. @@ -75,30 +53,18 @@ var/phase = WAIT_PHASE // Timer for the next phase var/next_phase_timer -<<<<<<< HEAD -======= // The last time we clicked during the baiting phase var/last_baiting_click ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Fishing mob var/mob/user /// Rod that is used for the challenge var/obj/item/fishing_rod/used_rod -<<<<<<< HEAD - /// Lure visual - var/obj/effect/fishing_lure/lure - /// Background icon state from fishing_hud.dmi - var/background = "background_default" - /// Fish icon state from fishing_hud.dmi - var/fish_icon = "fish" -======= /// float visual var/obj/effect/fishing_float/float /// Background icon state from fishing_hud.dmi var/background = "background_default" /// Fish icon state from fishing_hud.dmi var/fish_icon = FISH_ICON_DEF ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Fishing line visual var/datum/beam/fishing_line @@ -117,11 +83,6 @@ var/fish_position = 0 /// The position of the bait on the minigame slider var/bait_position = 0 -<<<<<<< HEAD - /// The current speed the fish is moving at - var/fish_velocity = 0 -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The current speed the bait is moving at var/bait_velocity = 0 @@ -132,26 +93,7 @@ /// How much completion is gained per second when the bait area is intersecting with the fish's var/completion_gain = 5 -<<<<<<< HEAD - /// How likely the fish is to perform a standard jump, then multiplied by difficulty - var/short_jump_chance = 2.25 - /// How likely the fish is to perform a long jump, then multiplied by difficulty - var/long_jump_chance = 0.0625 - /// The speed limit for the short jump - var/short_jump_velocity_limit = 400 - /// The speed limit for the long jump - var/long_jump_velocity_limit = 200 - /// The current speed limit used - var/current_velocity_limit = 200 - /// The base velocity of the fish, which may affect jump distances and falling speed. - var/fish_idle_velocity = 0 - /// A position on the slider the fish wants to get to - var/target_position - /// If true, the fish can jump while a target position is set, thus overriding it - var/can_interrupt_move = TRUE -======= var/datum/fish_movement/mover ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Whether the bait is idle or reeling up or down (left and right click) var/reeling_state = REELING_STATE_IDLE @@ -170,32 +112,12 @@ src.reward_path = reward_path src.used_rod = rod var/atom/spot = comp.parent -<<<<<<< HEAD - lure = new(get_turf(spot), spot) -======= float = new(get_turf(spot), spot) float.spin_frequency = rod.spin_frequency ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(spot, COMSIG_QDELETING, PROC_REF(on_spot_gone)) RegisterSignal(comp.fish_source, COMSIG_FISHING_SOURCE_INTERRUPT_CHALLENGE, PROC_REF(interrupt_challenge)) comp.fish_source.RegisterSignal(src, COMSIG_FISHING_CHALLENGE_COMPLETED, TYPE_PROC_REF(/datum/fish_source, on_challenge_completed)) background = comp.fish_source.background -<<<<<<< HEAD - /// Fish minigame properties - if(ispath(reward_path,/obj/item/fish)) - var/obj/item/fish/fish = reward_path - fish_ai = initial(fish.fish_ai_type) - switch(fish_ai) - if(FISH_AI_ZIPPY) // Keeps on jumping - short_jump_chance *= 3 - if(FISH_AI_SLOW) // Only does long jump, and doesn't change direction until it gets there - short_jump_chance = 0 - long_jump_chance = 1.5 - long_jump_velocity_limit = 150 - long_jump_velocity_limit = FALSE - // Apply fish trait modifiers - var/list/fish_list_properties = collect_fish_properties() -======= /// Fish minigame properties if(ispath(reward_path,/obj/item/fish)) @@ -204,17 +126,13 @@ mover = new movement_path(src) // Apply fish trait modifiers var/list/fish_list_properties = SSfishing.fish_properties ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/fish_traits = fish_list_properties[fish][NAMEOF(fish, fish_traits)] for(var/fish_trait in fish_traits) var/datum/fish_trait/trait = GLOB.fish_traits[fish_trait] trait.minigame_mod(rod, user, src) -<<<<<<< HEAD -======= else mover = new /datum/fish_movement(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Enable special parameters if(rod.line) completion_gain += 1 // Any fishing line will provide a small boost by default @@ -249,30 +167,9 @@ completion -= MAX_FISH_COMPLETION_MALUS * (difficulty * 0.01) if(HAS_MIND_TRAIT(user, TRAIT_REVEAL_FISH)) -<<<<<<< HEAD - fish_icon = GLOB.specific_fish_icons[reward_path] || "fish" - - /** - * If the chances are higher than 1% (100% at maximum difficulty), they'll scale - * less than proportionally (exponent less than 1) instead. - * This way we ensure fish with high jump chances won't get TOO jumpy until - * they near the maximum difficulty, at which they hit 100% - */ - var/square_angle_rad = TORADIANS(90) - var/zero_one_difficulty = difficulty/100 - if(short_jump_chance > 1) - short_jump_chance = (zero_one_difficulty**(square_angle_rad-TORADIANS(arctan(short_jump_chance * 1/square_angle_rad))))*100 - else - short_jump_chance *= difficulty - if(long_jump_chance > 1) - long_jump_chance = (zero_one_difficulty**(square_angle_rad-TORADIANS(arctan(long_jump_chance * 1/square_angle_rad))))*100 - else - long_jump_chance *= difficulty -======= fish_icon = GLOB.specific_fish_icons[reward_path] || FISH_ICON_DEF mover.adjust_to_difficulty() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bait_height -= round(difficulty * BAIT_HEIGHT_DIFFICULTY_MALUS) bait_pixel_height = round(MINIGAME_BAIT_HEIGHT * (bait_height/initial(bait_height)), 1) @@ -284,18 +181,6 @@ //Stops the line snapped message from appearing everytime the minigame is over. UnregisterSignal(fishing_line, COMSIG_QDELETING) QDEL_NULL(fishing_line) -<<<<<<< HEAD - if(lure) - QDEL_NULL(lure) - SStgui.close_uis(src) - user = null - used_rod = null - return ..() - -/datum/fishing_challenge/proc/send_alert(message) - var/turf/lure_turf = get_turf(lure) - lure_turf?.balloon_alert(user, message) -======= QDEL_NULL(float) SStgui.close_uis(src) user = null @@ -306,7 +191,6 @@ /datum/fishing_challenge/proc/send_alert(message) var/turf/float_turf = get_turf(float) float_turf?.balloon_alert(user, message) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fishing_challenge/proc/on_spot_gone(datum/source) SIGNAL_HANDLER @@ -314,27 +198,13 @@ interrupt() /datum/fishing_challenge/proc/interrupt_challenge(datum/source, reason) -<<<<<<< HEAD -======= SIGNAL_HANDLER ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(reason) send_alert(reason) interrupt() /datum/fishing_challenge/proc/start(mob/living/user) /// Create fishing line visuals -<<<<<<< HEAD - if(used_rod.display_fishing_line) - fishing_line = used_rod.create_fishing_line(lure, target_py = 5) - RegisterSignal(fishing_line, COMSIG_QDELETING, PROC_REF(on_line_deleted)) - else //if the rod doesnt have a fishing line, then it ends when they move away - RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_user_move)) - active_effects = bitfield_to_list(special_effects & FISHING_MINIGAME_ACTIVE_EFFECTS) - // If fishing line breaks los / rod gets dropped / deleted - RegisterSignal(used_rod, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) - ADD_TRAIT(user, TRAIT_GONE_FISHING, REF(src)) -======= if(!used_rod.internal) fishing_line = used_rod.create_fishing_line(float, user, target_py = 5) if(isnull(fishing_line)) //couldn't create a fishing line, probably because we don't have a good line of sight. @@ -350,14 +220,10 @@ // If fishing line breaks los / rod gets dropped / deleted RegisterSignal(used_rod, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) ADD_TRAIT(user, TRAIT_GONE_FISHING, WEAKREF(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.add_mood_event("fishing", /datum/mood_event/fishing) RegisterSignal(user, COMSIG_MOB_CLICKON, PROC_REF(handle_click)) start_baiting_phase() to_chat(user, span_notice("You start fishing...")) -<<<<<<< HEAD - playsound(lure, 'sound/effects/splash.ogg', 100) -======= playsound(float, 'sound/effects/splash.ogg', 100) ///Set the timers for lure that need to be spun at intervals. @@ -389,21 +255,10 @@ return send_alert("miss!") start_baiting_phase(TRUE) //Add in another 3 to 5 seconds for not spinning the lure. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fishing_challenge/proc/on_line_deleted(datum/source) SIGNAL_HANDLER fishing_line = null -<<<<<<< HEAD - ///The lure may be out of sight if the user has moed around a corner, so the message should be displayed over him instead. - user.balloon_alert(user, user.is_holding(used_rod) ? "line snapped" : "rod dropped") - interrupt() - -/datum/fishing_challenge/proc/on_user_move(datum/source) - SIGNAL_HANDLER - - user.balloon_alert(user, "too far!") -======= ///The float may be out of sight if the user has moed around a corner, so the message should be displayed over him instead. user.balloon_alert(user, user.is_holding(used_rod) ? "line snapped" : "rod dropped") interrupt() @@ -425,21 +280,10 @@ /datum/fishing_challenge/proc/no_longer_fishing(datum/source) SIGNAL_HANDLER user.balloon_alert(user, "interrupted!") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 interrupt() /datum/fishing_challenge/proc/handle_click(mob/source, atom/target, modifiers) SIGNAL_HANDLER -<<<<<<< HEAD - //You need to be holding the rod to use it. - if(LAZYACCESS(modifiers, SHIFT_CLICK) || LAZYACCESS(modifiers, CTRL_CLICK) || LAZYACCESS(modifiers, ALT_CLICK)) - return - if(!HAS_TRAIT(source, TRAIT_PROFOUND_FISHER) && source.get_active_held_item() != used_rod) - return - if(phase == WAIT_PHASE) - send_alert("miss!") - start_baiting_phase(TRUE) //Add in another 3 to 5 seconds for that blunder. -======= if(HAS_TRAIT(source, TRAIT_HANDS_BLOCKED)) //blocked, can't do stuff return //Doing other stuff @@ -463,7 +307,6 @@ else send_alert("miss!") start_baiting_phase(TRUE) //Add in another 3 to 5 seconds for that blunder. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(phase == BITING_PHASE) start_minigame_phase() return COMSIG_MOB_CANCEL_CLICKON @@ -491,14 +334,9 @@ completed = TRUE if(phase == MINIGAME_PHASE) remove_minigame_hud() -<<<<<<< HEAD - if(user) - REMOVE_TRAIT(user, TRAIT_GONE_FISHING, REF(src)) -======= if(!QDELETED(user)) UnregisterSignal(user, SIGNAL_REMOVETRAIT(TRAIT_GONE_FISHING)) user.remove_traits(list(TRAIT_GONE_FISHING, TRAIT_ACTIVELY_FISHING), WEAKREF(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(start_time) var/seconds_spent = (world.time - start_time) * 0.1 if(!(special_effects & FISHING_MINIGAME_RULE_NO_EXP)) @@ -507,54 +345,33 @@ user.client?.give_award(/datum/award/achievement/skill/legendary_fisher, user) if(win) if(reward_path != FISHING_DUD) -<<<<<<< HEAD - playsound(lure, 'sound/effects/bigsplash.ogg', 100) -======= playsound(float, 'sound/effects/bigsplash.ogg', 100) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SIGNAL(src, COMSIG_FISHING_CHALLENGE_COMPLETED, user, win) if(!QDELETED(src)) qdel(src) /datum/fishing_challenge/proc/start_baiting_phase(penalty = FALSE) var/wait_time -<<<<<<< HEAD - if(penalty) - wait_time = min(timeleft(next_phase_timer) + rand(3 SECONDS, 5 SECONDS), 30 SECONDS) - else - wait_time = rand(3 SECONDS, 25 SECONDS) -======= last_baiting_click = world.time if(penalty) wait_time = min(timeleft(next_phase_timer) + rand(3 SECONDS, 5 SECONDS), 30 SECONDS) else wait_time = float.spin_frequency ? rand(11 SECONDS, 17 SECONDS) : rand(3 SECONDS, 25 SECONDS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(special_effects & FISHING_MINIGAME_AUTOREEL && wait_time >= 15 SECONDS) wait_time = max(wait_time - 7.5 SECONDS, 15 SECONDS) deltimer(next_phase_timer) phase = WAIT_PHASE //Bobbing animation -<<<<<<< HEAD - animate(lure, pixel_y = 1, time = 1 SECONDS, loop = -1, flags = ANIMATION_RELATIVE) - animate(pixel_y = -1, time = 1 SECONDS, flags = ANIMATION_RELATIVE) - next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_biting_phase)), wait_time, TIMER_STOPPABLE) -======= animate(float, pixel_y = 1, time = 1 SECONDS, loop = -1, flags = ANIMATION_RELATIVE) animate(pixel_y = -1, time = 1 SECONDS, flags = ANIMATION_RELATIVE) next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_biting_phase)), wait_time, TIMER_STOPPABLE|TIMER_DELETE_ME) if(float.spin_frequency) set_lure_timers() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fishing_challenge/proc/start_biting_phase() phase = BITING_PHASE // Trashing animation -<<<<<<< HEAD - playsound(lure, 'sound/effects/fish_splash.ogg', 100) -======= playsound(float, 'sound/effects/fish_splash.ogg', 100) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HAS_MIND_TRAIT(user, TRAIT_REVEAL_FISH)) switch(fish_icon) if(FISH_ICON_DEF) @@ -577,17 +394,6 @@ send_alert("crustacean!!!") if(FISH_ICON_BONE) send_alert("bones!!!") -<<<<<<< HEAD - else - send_alert("!!!") - animate(lure, pixel_y = 3, time = 5, loop = -1, flags = ANIMATION_RELATIVE) - animate(pixel_y = -3, time = 5, flags = ANIMATION_RELATIVE) - if(special_effects & FISHING_MINIGAME_AUTOREEL) - start_minigame_phase(auto_reel = TRUE) - return - // Setup next phase - next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_baiting_phase)), BITING_TIME_WINDOW, TIMER_STOPPABLE) -======= if(FISH_ICON_ELECTRIC) send_alert("zappy!!!") if(FISH_ICON_WEAPON) @@ -613,7 +419,6 @@ /datum/fishing_challenge/proc/automatically_start_minigame() if(phase == BITING_PHASE) start_minigame_phase(auto_reel = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The damage dealt per second to the fish when FISHING_MINIGAME_RULE_KILL is active. #define FISH_DAMAGE_PER_SECOND 2 @@ -649,10 +454,6 @@ completion *= 1.2 if(BITING_TIME_WINDOW - 0.5 SECONDS to BITING_TIME_WINDOW) completion *= 1.4 -<<<<<<< HEAD - if(!prepare_minigame_hud()) - return -======= //randomize the position of the fish a little fish_position = rand(0, (FISHING_MINIGAME_AREA - fish_height) * 0.8) var/diff_dist = 100 + difficulty @@ -662,18 +463,11 @@ qdel(src) return ADD_TRAIT(user, TRAIT_ACTIVELY_FISHING, WEAKREF(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 phase = MINIGAME_PHASE deltimer(next_phase_timer) if((FISHING_MINIGAME_RULE_KILL in special_effects) && ispath(reward_path,/obj/item/fish)) var/obj/item/fish/fish = reward_path var/wait_time = (initial(fish.health) / FISH_DAMAGE_PER_SECOND) SECONDS -<<<<<<< HEAD - addtimer(CALLBACK(src, PROC_REF(win_anyway)), wait_time) - start_time = world.time - experience_multiplier += difficulty * FISHING_SKILL_DIFFIULTY_EXP_MULT - -======= addtimer(CALLBACK(src, PROC_REF(win_anyway)), wait_time, TIMER_DELETE_ME) start_time = world.time experience_multiplier += difficulty * FISHING_SKILL_DIFFIULTY_EXP_MULT @@ -694,16 +488,11 @@ text += "." stack_trace(text) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef FISH_DAMAGE_PER_SECOND ///Initialize the minigame hud and register some signals to make it work. /datum/fishing_challenge/proc/prepare_minigame_hud() -<<<<<<< HEAD - if(!user.client || user.incapacitated()) -======= if(!user.client || user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE . = TRUE fishing_hud = new @@ -740,11 +529,7 @@ /datum/fishing_challenge/process(seconds_per_tick) if(length(active_effects) && COOLDOWN_FINISHED(src, active_effect_cd)) select_active_effect() -<<<<<<< HEAD - move_fish(seconds_per_tick) -======= mover.move_fish(seconds_per_tick) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 move_bait(seconds_per_tick) if(!QDELETED(fishing_hud)) update_visuals() @@ -764,14 +549,11 @@ fishing_hud.transform = fishing_hud.transform.Scale(1, -1) SEND_SOUND(user, sound('sound/effects/boing.ogg')) COOLDOWN_START(src, active_effect_cd, rand(5, 6) SECONDS) -<<<<<<< HEAD -======= if(FISHING_MINIGAME_RULE_CAMO) fishing_hud.icon_state = "background_camo" SEND_SOUND(user, sound('sound/effects/nightmare_poof.ogg', volume = 15)) COOLDOWN_START(src, active_effect_cd, rand(6, 8) SECONDS) animate(fishing_hud.hud_fish, alpha = 7, time = 2 SECONDS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ///go back to normal @@ -784,72 +566,14 @@ if(FISHING_MINIGAME_RULE_FLIP) fishing_hud.transform = fishing_hud.transform.Scale(1, -1) COOLDOWN_START(src, active_effect_cd, rand(8, 12) SECONDS) -<<<<<<< HEAD -======= if(FISHING_MINIGAME_RULE_CAMO) COOLDOWN_START(src, active_effect_cd, rand(9, 16) SECONDS) SEND_SOUND(user, sound('sound/effects/nightmare_reappear.ogg', volume = 15)) animate(fishing_hud.hud_fish, alpha = 255, time = 1.2 SECONDS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fishing_hud.icon_state = background current_active_effect = null -<<<<<<< HEAD -///The proc that moves the fish around, just like in the old TGUI, mostly. -/datum/fishing_challenge/proc/move_fish(seconds_per_tick) - var/long_chance = long_jump_chance * seconds_per_tick * 10 - var/short_chance = short_jump_chance * seconds_per_tick * 10 - - // If we have the target but we're close enough, mark as target reached - if(abs(target_position - fish_position) < FISH_TARGET_MIN_DISTANCE) - target_position = null - - // Switching to new long jump target can interrupt any other - if((can_interrupt_move || isnull(target_position)) && prob(long_chance)) - /** - * Move at least 0.75 to full of the availible bar in given direction, - * and more likely to move in the direction where there's more space - */ - var/distance_from_top = FISHING_MINIGAME_AREA - fish_position - fish_height - var/distance_from_bottom = fish_position - var/top_chance - if(distance_from_top < FISH_SHORT_JUMP_MIN_DISTANCE) - top_chance = 0 - else - top_chance = (distance_from_top/max(distance_from_bottom, 1)) * 100 - var/new_target = fish_position - if(prob(top_chance)) - new_target += distance_from_top * rand(75, 100)/100 - else - new_target -= distance_from_bottom * rand(75, 100)/100 - target_position = round(new_target) - current_velocity_limit = long_jump_velocity_limit - - // Move towards target - if(!isnull(target_position)) - var/distance = target_position - fish_position - // about 5 at diff 15 , 10 at diff 30, 30 at diff 100 - var/acceleration_mult = 0.3 * difficulty + 0.5 - var/target_acceleration = distance * acceleration_mult * seconds_per_tick - - fish_velocity = fish_velocity * FISH_FRICTION_MULT + target_acceleration - else if(prob(short_chance)) - var/distance_from_top = FISHING_MINIGAME_AREA - fish_position - fish_height - var/distance_from_bottom = fish_position - var/jump_length - if(distance_from_top >= FISH_SHORT_JUMP_MIN_DISTANCE) - jump_length = rand(FISH_SHORT_JUMP_MIN_DISTANCE, FISH_SHORT_JUMP_MAX_DISTANCE) - if(distance_from_bottom >= FISH_SHORT_JUMP_MIN_DISTANCE && (!jump_length || prob(50))) - jump_length = -rand(FISH_SHORT_JUMP_MIN_DISTANCE, FISH_SHORT_JUMP_MAX_DISTANCE) - target_position = clamp(fish_position + jump_length, 0, FISHING_MINIGAME_AREA - fish_height) - current_velocity_limit = short_jump_velocity_limit - - fish_velocity = clamp(fish_velocity + fish_idle_velocity, -current_velocity_limit, current_velocity_limit) - fish_position = clamp(fish_position + fish_velocity * seconds_per_tick, 0, FISHING_MINIGAME_AREA - fish_height) - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The proc that moves the bait around, just like in the old TGUI, mostly. /datum/fishing_challenge/proc/move_bait(seconds_per_tick) var/should_bounce = abs(bait_velocity) > BAIT_MIN_VELOCITY_BOUNCE @@ -910,13 +634,7 @@ bait_velocity += velocity_change //check that the fish area is still intersecting the bait now that it has moved -<<<<<<< HEAD - fish_on_bait = (fish_position + fish_height >= bait_position) && (bait_position + bait_height >= fish_position) - - if(fish_on_bait) -======= if(is_fish_on_bait()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 completion += completion_gain * seconds_per_tick if(completion >= 100) complete(TRUE) @@ -928,13 +646,10 @@ completion = clamp(completion, 0, 100) -<<<<<<< HEAD -======= ///Returns TRUE if the fish and the bait are intersecting /datum/fishing_challenge/proc/is_fish_on_bait() return (fish_position + fish_height >= bait_position) && (bait_position + bait_height >= fish_position) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///update the vertical pixel position of both fish and bait, and the icon state of the completion bar /datum/fishing_challenge/proc/update_visuals() var/bait_offset_mult = bait_position/FISHING_MINIGAME_AREA @@ -1015,18 +730,6 @@ icon_state = "completion_[FLOOR(challenge.completion, 5)]" /// The visual that appears over the fishing spot -<<<<<<< HEAD -/obj/effect/fishing_lure - icon = 'icons/obj/fishing.dmi' - icon_state = "lure_idle" - -/obj/effect/fishing_lure/Initialize(mapload, atom/spot) - . = ..() - if(ismovable(spot)) // we want the lure and therefore the fishing line to stay connected with the fishing spot. - RegisterSignal(spot, COMSIG_MOVABLE_MOVED, PROC_REF(follow_movable)) - -/obj/effect/fishing_lure/proc/follow_movable(atom/movable/source) -======= /obj/effect/fishing_float name = "float" icon = 'icons/obj/fishing.dmi' @@ -1046,14 +749,11 @@ RegisterSignal(spot, COMSIG_MOVABLE_MOVED, PROC_REF(follow_movable)) /obj/effect/fishing_float/proc/follow_movable(atom/movable/source) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER set_glide_size(source.glide_size) forceMove(source.loc) -<<<<<<< HEAD -======= /obj/effect/fishing_float/update_overlays() . = ..() if(!spin_frequency) @@ -1063,23 +763,10 @@ . += overlay . += emissive_appearance(icon, "lure_light_emissive", src, alpha = src.alpha) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef WAIT_PHASE #undef BITING_PHASE #undef MINIGAME_PHASE -<<<<<<< HEAD -#undef FISHING_MINIGAME_AREA -#undef FISH_TARGET_MIN_DISTANCE -#undef FISH_FRICTION_MULT -#undef FISH_SHORT_JUMP_MIN_DISTANCE -#undef FISH_SHORT_JUMP_MAX_DISTANCE -#undef FISH_ON_BAIT_ACCELERATION_MULT -#undef BAIT_MIN_VELOCITY_BOUNCE -#undef BAIT_DECELERATION_MULT - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef MINIGAME_SLIDER_HEIGHT #undef MINIGAME_BAIT_HEIGHT #undef MINIGAME_FISH_HEIGHT @@ -1090,12 +777,9 @@ #undef REELING_STATE_UP #undef REELING_STATE_DOWN -<<<<<<< HEAD -======= #undef FISH_ON_BAIT_ACCELERATION_MULT #undef BAIT_MIN_VELOCITY_BOUNCE #undef BAIT_DECELERATION_MULT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef MAX_FISH_COMPLETION_MALUS #undef BITING_TIME_WINDOW diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index 21dfc878a1b..28ae51d4236 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -36,26 +36,18 @@ /// The default color for the reel overlay if no line is equipped. var/default_line_color = "gray" -<<<<<<< HEAD - ///should there be a fishing line? - var/display_fishing_line = TRUE -======= ///Is this currently being used by the profound fisher component? var/internal = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The name of the icon state of the reel overlay var/reel_overlay = "reel_overlay" -<<<<<<< HEAD -======= /** * A list with two keys delimiting the spinning interval in which a mouse click has to be pressed while fishing. * Inherited from baits, passed down to the minigame lure. */ var/list/spin_frequency ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Prevents spamming the line casting, without affecting the player's click cooldown. COOLDOWN_DECLARE(casting_cd) @@ -83,17 +75,11 @@ /obj/item/fishing_rod/add_item_context(obj/item/source, list/context, atom/target, mob/living/user) . = ..() -<<<<<<< HEAD - if(currently_hooked) - context[SCREENTIP_CONTEXT_LMB] = "Reel in" - context[SCREENTIP_CONTEXT_RMB] = "Unhook" -======= var/gone_fishing = HAS_TRAIT(user, TRAIT_GONE_FISHING) if(currently_hooked || gone_fishing) context[SCREENTIP_CONTEXT_LMB] = (gone_fishing && spin_frequency) ? "Spin" : "Reel in" if(!gone_fishing) context[SCREENTIP_CONTEXT_RMB] = "Unhook" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return CONTEXTUAL_SCREENTIP_SET return NONE @@ -129,10 +115,6 @@ var/mob/living/caught_mob = reward if(caught_mob.stat == DEAD) return -<<<<<<< HEAD - else if(!isfish(reward)) - return -======= else if(!isfish(reward)) return @@ -146,7 +128,6 @@ if(kill_fish) fish.set_status(FISH_DEAD, silent = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 QDEL_NULL(bait) update_icon() @@ -165,16 +146,10 @@ return //Try to move it 'till it's under the user's feet, then try to pick it up if(isitem(currently_hooked)) -<<<<<<< HEAD - step_towards(currently_hooked, get_turf(src)) - if(currently_hooked.loc == user.loc) - user.put_in_inactive_hand(currently_hooked) -======= var/obj/item/item = currently_hooked step_towards(item, get_turf(src)) if(item.loc == user.loc && (item.interaction_flags_item & INTERACT_ITEM_ATTACK_HAND_PICKUP)) user.put_in_inactive_hand(item) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 QDEL_NULL(fishing_line) //Not an item, so just delete the line if it's adjacent to the user. else if(get_dist(currently_hooked,get_turf(src)) > 1) @@ -192,28 +167,12 @@ ui_interact(user) /// Generates the fishing line visual from the current user to the target and updates inhands -<<<<<<< HEAD -/obj/item/fishing_rod/proc/create_fishing_line(atom/movable/target, target_py = null) - if(!display_fishing_line) - return null - var/mob/user = loc - if(!istype(user)) -======= /obj/item/fishing_rod/proc/create_fishing_line(atom/movable/target, mob/living/firer, target_py = null) if(internal) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return null if(fishing_line) QDEL_NULL(fishing_line) var/beam_color = line?.line_color || default_line_color -<<<<<<< HEAD - fishing_line = new(user, target, icon_state = "fishing_line", beam_color = beam_color, emissive = FALSE, override_target_pixel_y = target_py) - fishing_line.lefthand = user.get_held_index_of_item(src) % 2 == 1 - RegisterSignal(fishing_line, COMSIG_BEAM_BEFORE_DRAW, PROC_REF(check_los)) - RegisterSignal(fishing_line, COMSIG_QDELETING, PROC_REF(clear_line)) - INVOKE_ASYNC(fishing_line, TYPE_PROC_REF(/datum/beam/, Start)) - user.update_held_items() -======= fishing_line = new(firer, target, icon_state = "fishing_line", beam_color = beam_color, emissive = FALSE, override_target_pixel_y = target_py) fishing_line.lefthand = firer.get_held_index_of_item(src) % 2 == 1 RegisterSignal(fishing_line, COMSIG_BEAM_BEFORE_DRAW, PROC_REF(check_los)) @@ -222,7 +181,6 @@ if(QDELETED(fishing_line)) return null firer.update_held_items() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return fishing_line /obj/item/fishing_rod/proc/clear_line(datum/source) @@ -244,11 +202,7 @@ if(!hook.can_be_hooked(target_atom)) return currently_hooked = target_atom -<<<<<<< HEAD - create_fishing_line(target_atom) -======= create_fishing_line(target_atom, user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hook.hook_attached(target_atom, src) SEND_SIGNAL(src, COMSIG_FISHING_ROD_HOOKED_ITEM, target_atom, user) @@ -262,12 +216,9 @@ return BEAM_CANCEL_DRAW /obj/item/fishing_rod/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) -<<<<<<< HEAD -======= //this prevent trying to use telekinesis to fish (which would be broken anyway) if(!user.contains(src)) return ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ranged_interact_with_atom(interacting_with, user, modifiers) /obj/item/fishing_rod/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) @@ -316,14 +267,8 @@ COOLDOWN_START(src, casting_cd, 1 SECONDS) /// Called by hook projectile when hitting things -<<<<<<< HEAD -/obj/item/fishing_rod/proc/hook_hit(atom/atom_hit_by_hook_projectile) - var/mob/user = loc - if(!hook || !istype(user)) -======= /obj/item/fishing_rod/proc/hook_hit(atom/atom_hit_by_hook_projectile, mob/user) if(!hook) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(SEND_SIGNAL(atom_hit_by_hook_projectile, COMSIG_FISHING_ROD_CAST, src, user) & FISHING_ROD_CAST_HANDLED) return @@ -337,15 +282,12 @@ ui.set_autoupdate(FALSE) ui.open() -<<<<<<< HEAD -======= /obj/item/fishing_rod/ui_state() if(internal) return GLOB.deep_inventory_state else return GLOB.default_state ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fishing_rod/update_overlays() . = ..() . += get_fishing_overlays() @@ -450,11 +392,7 @@ return FALSE return TRUE -<<<<<<< HEAD -/obj/item/fishing_rod/ui_act(action, list/params) -======= /obj/item/fishing_rod/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return . @@ -468,11 +406,8 @@ /// Ideally this will be replaced with generic slotted storage datum + display /obj/item/fishing_rod/proc/use_slot(slot, mob/user, obj/item/new_item) -<<<<<<< HEAD -======= if(fishing_line || HAS_TRAIT(user, TRAIT_GONE_FISHING)) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/current_item switch(slot) if(ROD_SLOT_BAIT) @@ -494,31 +429,13 @@ if(user.transferItemToLoc(new_item,src)) set_slot(new_item, slot) balloon_alert(user, "[slot] installed") -<<<<<<< HEAD -======= else balloon_alert(user, "stuck to your hands!") return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Trying to swap item else if(new_item && current_item) if(!slot_check(new_item,slot)) return -<<<<<<< HEAD - if(user.transferItemToLoc(new_item,src)) - switch(slot) - if(ROD_SLOT_BAIT) - bait = new_item - if(ROD_SLOT_HOOK) - hook = new_item - if(ROD_SLOT_LINE) - line = new_item - user.put_in_hands(current_item) - balloon_alert(user, "[slot] swapped") - - if(new_item) - SEND_SIGNAL(new_item, COMSIG_FISHING_EQUIPMENT_SLOTTED, src) -======= if(user.transferItemToLoc(new_item, src)) user.put_in_hands(current_item) set_slot(new_item, slot) @@ -526,7 +443,6 @@ else balloon_alert(user, "stuck to your hands!") return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 update_icon() playsound(src, 'sound/items/click.ogg', 50, TRUE) @@ -536,32 +452,23 @@ switch(slot) if(ROD_SLOT_BAIT) bait = equipment -<<<<<<< HEAD -======= if(!HAS_TRAIT(bait, TRAIT_BAIT_ALLOW_FISHING_DUD)) ADD_TRAIT(src, TRAIT_ROD_REMOVE_FISHING_DUD, INNATE_TRAIT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ROD_SLOT_HOOK) hook = equipment if(ROD_SLOT_LINE) line = equipment cast_range += FISHING_ROD_REEL_CAST_RANGE -<<<<<<< HEAD -======= else CRASH("set_slot called with an undefined slot: [slot]") SEND_SIGNAL(equipment, COMSIG_FISHING_EQUIPMENT_SLOTTED, src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fishing_rod/Exited(atom/movable/gone, direction) . = ..() if(gone == bait) bait = null -<<<<<<< HEAD -======= REMOVE_TRAIT(src, TRAIT_ROD_REMOVE_FISHING_DUD, INNATE_TRAIT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(gone == line) cast_range -= FISHING_ROD_REEL_CAST_RANGE line = null @@ -711,21 +618,13 @@ transform = transform.Scale(1, -1) . = ..() if(!QDELETED(src)) -<<<<<<< HEAD - our_line = owner.create_fishing_line(src) -======= our_line = owner.create_fishing_line(src, firer) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/projectile/fishing_cast/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() if(blocked < 100) QDEL_NULL(our_line) //we need to delete the old beam datum, otherwise it won't let you fish. -<<<<<<< HEAD - owner.hook_hit(target) -======= owner.hook_hit(target, firer) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/projectile/fishing_cast/Destroy() QDEL_NULL(our_line) diff --git a/code/modules/fishing/sources/_fish_source.dm b/code/modules/fishing/sources/_fish_source.dm index 88af29ff757..a63c087fcc6 100644 --- a/code/modules/fishing/sources/_fish_source.dm +++ b/code/modules/fishing/sources/_fish_source.dm @@ -8,32 +8,6 @@ GLOBAL_LIST_INIT(preset_fish_sources, init_subtypes_w_path_keys(/datum/fish_sour * A lot of the icons here may be a tad inaccurate, but since we're limited to the free font awesome icons we * have access to, we got to make do. */ -<<<<<<< HEAD -GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list( - /mob/living/basic/carp = FISH_ICON_DEF, - /mob/living/basic/mining = FISH_ICON_HOSTILE, - /obj/effect/decal/remains = FISH_ICON_BONE, - /obj/effect/mob_spawn/corpse = FISH_ICON_BONE, - /obj/item/coin = FISH_ICON_COIN, - /obj/item/fish = FISH_ICON_DEF, - /obj/item/fish/armorfish = FISH_ICON_CRAB, - /obj/item/fish/boned = FISH_ICON_BONE, - /obj/item/fish/chasm_crab = FISH_ICON_CRAB, - /obj/item/fish/gunner_jellyfish = FISH_ICON_JELLYFISH, - /obj/item/fish/holo/crab = FISH_ICON_CRAB, - /obj/item/fish/holo/puffer = FISH_ICON_CHUNKY, - /obj/item/fish/mastodon = FISH_ICON_BONE, - /obj/item/fish/pufferfish = FISH_ICON_CHUNKY, - /obj/item/fish/slimefish = FISH_ICON_SLIME, - /obj/item/fish/sludgefish = FISH_ICON_SLIME, - /obj/item/fish/starfish = FISH_ICON_STAR, - /obj/item/storage/wallet = FISH_ICON_COIN, - /obj/item/stack/sheet/bone = FISH_ICON_BONE, - /obj/item/stack/sheet/mineral = FISH_ICON_GEM, - /obj/item/stack/ore = FISH_ICON_GEM, - /obj/structure/closet/crate = FISH_ICON_COIN, -))) -======= GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons()) /proc/generate_specific_fish_icons() @@ -79,7 +53,6 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons()) return_list[FISHING_RANDOM_SEED] = FISH_ICON_SEED return return_list ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Where the fish actually come from - every fishing spot has one assigned but multiple fishing holes @@ -93,13 +66,10 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons()) var/list/fish_table = list() /// If a key from fish_table is present here, that fish is availible in limited quantity and is reduced by one on successful fishing var/list/fish_counts = list() -<<<<<<< HEAD -======= /// Any limited quantity stuff in this list will be readded to the counts after a while var/list/fish_count_regen /// A list of stuff that's currently waiting to be readded to fish_counts var/list/currently_on_regen ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Text shown as baloon alert when you roll a dud in the table var/duds = list("it was nothing", "the hook is empty") /// Baseline difficulty for fishing in this spot @@ -130,18 +100,12 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons()) return ..() ///Called when src is set as the fish source of a fishing spot component -<<<<<<< HEAD -/datum/fish_source/proc/on_fishing_spot_init(/datum/component/fishing_spot/spot) - return - -======= /datum/fish_source/proc/on_fishing_spot_init(datum/component/fishing_spot/spot) return ///Called whenever a fishing spot with this fish source attached is deleted /datum/fish_source/proc/on_fishing_spot_del(datum/component/fishing_spot/spot) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Can we fish in this spot at all. Returns DENIAL_REASON or null if we're good to go /datum/fish_source/proc/reason_we_cant_fish(obj/item/fishing_rod/rod, mob/fisherman, atom/parent) return rod.reason_we_cant_fish(src) @@ -176,13 +140,8 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons()) // In the future non-fish rewards can have variable difficulty calculated here return -<<<<<<< HEAD - var/list/fish_list_properties = collect_fish_properties() - var/obj/item/fish/caught_fish = result -======= var/obj/item/fish/caught_fish = result var/list/fish_properties = SSfishing.fish_properties[caught_fish] ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Baseline fish difficulty . += initial(caught_fish.fishing_difficulty_modifier) @@ -190,30 +149,18 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons()) if(rod.bait) var/obj/item/bait = rod.bait //Fav bait makes it easier -<<<<<<< HEAD - var/list/fav_bait = fish_list_properties[caught_fish][NAMEOF(caught_fish, favorite_bait)] -======= var/list/fav_bait = fish_properties[FISH_PROPERTIES_FAV_BAIT] ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/bait_identifer in fav_bait) if(is_matching_bait(bait, bait_identifer)) . += FAV_BAIT_DIFFICULTY_MOD //Disliked bait makes it harder -<<<<<<< HEAD - var/list/disliked_bait = fish_list_properties[caught_fish][NAMEOF(caught_fish, disliked_bait)] -======= var/list/disliked_bait = fish_properties[FISH_PROPERTIES_BAD_BAIT] ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/bait_identifer in disliked_bait) if(is_matching_bait(bait, bait_identifer)) . += DISLIKED_BAIT_DIFFICULTY_MOD // Matching/not matching fish traits and equipment -<<<<<<< HEAD - var/list/fish_traits = fish_list_properties[caught_fish][NAMEOF(caught_fish, fish_traits)] -======= var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS] ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/additive_mod = 0 var/multiplicative_mod = 1 @@ -227,13 +174,8 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons()) . *= multiplicative_mod /// In case you want more complex rules for specific spots -<<<<<<< HEAD -/datum/fish_source/proc/roll_reward(obj/item/fishing_rod/rod, mob/fisherman) - return pick_weight(get_modified_fish_table(rod,fisherman)) -======= /datum/fish_source/proc/roll_reward(obj/item/fishing_rod/rod, mob/fisherman, atom/location) return pick_weight(get_modified_fish_table(rod, fisherman, location)) || FISHING_DUD ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Used to register signals or add traits and the such right after conditions have been cleared @@ -257,11 +199,7 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons()) return var/obj/item/fish/caught = source.reward_path user.add_mob_memory(/datum/memory/caught_fish, protagonist = user, deuteragonist = initial(caught.name)) -<<<<<<< HEAD - var/turf/fishing_spot = get_turf(source.lure) -======= var/turf/fishing_spot = get_turf(source.float) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/atom/movable/reward = dispense_reward(source.reward_path, user, fishing_spot) if(source.used_rod) SEND_SIGNAL(source.used_rod, COMSIG_FISHING_ROD_CAUGHT_FISH, reward, user) @@ -288,13 +226,6 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons()) /datum/fish_source/proc/simple_dispense_reward(reward_path, atom/spawn_location, turf/fishing_spot) if(isnull(reward_path)) return null -<<<<<<< HEAD - if((reward_path in fish_counts)) // This is limited count result - fish_counts[reward_path] -= 1 - if(!fish_counts[reward_path]) - fish_counts -= reward_path //Ran out of these since rolling (multiple fishermen on same source most likely) - fish_table -= reward_path -======= if(reward_path in fish_counts) // This is limited count result fish_counts[reward_path] -= 1 var/regen_time = fish_count_regen?[reward_path] @@ -302,14 +233,11 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons()) LAZYADDASSOC(currently_on_regen, reward_path, 1) if(currently_on_regen[reward_path] == 1) addtimer(CALLBACK(src, PROC_REF(regen_count), reward_path), regen_time) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/atom/movable/reward = spawn_reward(reward_path, spawn_location, fishing_spot) SEND_SIGNAL(src, COMSIG_FISH_SOURCE_REWARD_DISPENSED, reward) return reward -<<<<<<< HEAD -======= /datum/fish_source/proc/regen_count(reward_path, regen_time) fish_counts[reward_path] += 1 currently_on_regen[reward_path] -= 1 @@ -318,7 +246,6 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons()) else addtimer(CALLBACK(src, PROC_REF(regen_count), reward_path), regen_time) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Spawns a reward from a atom path right where the fisherman is. Part of the dispense_reward() logic. /datum/fish_source/proc/spawn_reward(reward_path, atom/spawn_location, turf/fishing_spot) if(reward_path == FISHING_DUD) @@ -333,44 +260,6 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons()) caught_fish.randomize_size_and_weight() return reward -<<<<<<< HEAD -/// Cached fish list properties so we don't have to initalize fish every time, init deffered -GLOBAL_LIST(fishing_property_cache) - -/// Awful workaround around initial(x.list_variable) not being a thing while trying to keep some semblance of being structured -/proc/collect_fish_properties() - if(GLOB.fishing_property_cache == null) - var/list/fish_property_table = list() - for(var/fish_type in subtypesof(/obj/item/fish)) - var/obj/item/fish/fish = new fish_type(null, FALSE) - fish_property_table[fish_type] = list() - fish_property_table[fish_type][NAMEOF(fish, favorite_bait)] = fish.favorite_bait.Copy() - fish_property_table[fish_type][NAMEOF(fish, disliked_bait)] = fish.disliked_bait.Copy() - fish_property_table[fish_type][NAMEOF(fish, fish_traits)] = fish.fish_traits.Copy() - QDEL_NULL(fish) - GLOB.fishing_property_cache = fish_property_table - return GLOB.fishing_property_cache - -/// Checks if bait matches identifier from fav/disliked bait list -/datum/fish_source/proc/is_matching_bait(obj/item/bait, identifier) - if(ispath(identifier)) //Just a path - return istype(bait, identifier) - if(islist(identifier)) - var/list/special_identifier = identifier - switch(special_identifier["Type"]) - if("Foodtype") - var/obj/item/food/food_bait = bait - return istype(food_bait) && food_bait.foodtypes & special_identifier["Value"] - if("Reagent") - return bait.reagents?.has_reagent(special_identifier["Value"], special_identifier["Amount"], check_subtypes = TRUE) - else - CRASH("Unknown bait identifier in fish favourite/disliked list") - else - return HAS_TRAIT(bait, identifier) - -/// Builds a fish weights table modified by bait/rod/user properties -/datum/fish_source/proc/get_modified_fish_table(obj/item/fishing_rod/rod, mob/fisherman) -======= /// Returns the fish table, with with the unavailable items from fish_counts removed. /datum/fish_source/proc/get_fish_table() var/list/table = fish_table.Copy() @@ -381,7 +270,6 @@ GLOBAL_LIST(fishing_property_cache) /// Builds a fish weights table modified by bait/rod/user properties /datum/fish_source/proc/get_modified_fish_table(obj/item/fishing_rod/rod, mob/fisherman, atom/location) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/bait = rod.bait ///An exponent used to level out the difference in probabilities between fishes/mobs on the table depending on bait quality. var/leveling_exponent = 0 @@ -401,15 +289,9 @@ GLOBAL_LIST(fishing_property_cache) else if(HAS_TRAIT(bait, TRAIT_BASIC_QUALITY_BAIT)) result_multiplier = 2 leveling_exponent = 0.1 -<<<<<<< HEAD - final_table -= FISHING_DUD - - var/list/fish_list_properties = collect_fish_properties() -======= if(HAS_TRAIT(rod, TRAIT_ROD_REMOVE_FISHING_DUD)) final_table -= FISHING_DUD ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HAS_TRAIT(fisherman, TRAIT_PROFOUND_FISHER) && !fisherman.client) @@ -419,50 +301,17 @@ GLOBAL_LIST(fishing_property_cache) final_table[result] += rod.hook?.get_hook_bonus_additive(result)//Decide on order here so it can be multiplicative if(ispath(result, /obj/item/fish)) -<<<<<<< HEAD - //Modify fish roll chance - var/obj/item/fish/caught_fish = result - - if(bait) - final_table[result] = round(final_table[result] * result_multiplier, 1) - if(!HAS_TRAIT(bait, TRAIT_OMNI_BAIT)) - //Bait matching likes doubles the chance - var/list/fav_bait = fish_list_properties[result][NAMEOF(caught_fish, favorite_bait)] - for(var/bait_identifer in fav_bait) - if(is_matching_bait(bait, bait_identifer)) - final_table[result] *= 2 - //Bait matching dislikes - var/list/disliked_bait = fish_list_properties[result][NAMEOF(caught_fish, disliked_bait)] - for(var/bait_identifer in disliked_bait) - if(is_matching_bait(bait, bait_identifer)) - final_table[result] = round(final_table[result] * 0.5, 1) -======= if(bait) final_table[result] = round(final_table[result] * result_multiplier, 1) var/mult = bait.check_bait(result) final_table[result] = round(final_table[result] * mult, 1) if(mult > 1 && HAS_TRAIT(bait, TRAIT_BAIT_ALLOW_FISHING_DUD)) final_table -= FISHING_DUD ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else final_table[result] = round(final_table[result] * 0.15, 1) //Fishing without bait is not going to be easy // Apply fish trait modifiers -<<<<<<< HEAD - var/list/fish_traits = fish_list_properties[caught_fish][NAMEOF(caught_fish, fish_traits)] - var/additive_mod = 0 - var/multiplicative_mod = 1 - for(var/fish_trait in fish_traits) - var/datum/fish_trait/trait = GLOB.fish_traits[fish_trait] - var/list/mod = trait.catch_weight_mod(rod, fisherman) - additive_mod += mod[ADDITIVE_FISHING_MOD] - multiplicative_mod *= mod[MULTIPLICATIVE_FISHING_MOD] - - final_table[result] += additive_mod - final_table[result] = round(final_table[result] * multiplicative_mod, 1) -======= final_table[result] = get_fish_trait_catch_mods(final_table[result], result, rod, fisherman, location) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(final_table[result] <= 0) final_table -= result @@ -486,8 +335,6 @@ GLOBAL_LIST(fishing_property_cache) return final_table -<<<<<<< HEAD -======= /datum/fish_source/proc/get_fish_trait_catch_mods(weight, obj/item/fish/fish, obj/item/fishing_rod/rod, mob/user, atom/location) if(!ispath(fish, /obj/item/fish)) return weight @@ -545,7 +392,6 @@ GLOBAL_LIST(fishing_property_cache) info = span_tooltip("boldened are the fish you're more likely to catch with your current setup. The opposite is true for smaller names", info) examine_text += span_info("[info]: [english_list(known_fishes)].") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_source/proc/spawn_reward_from_explosion(atom/location, severity) if(!explosive_malus) explosive_spawn(location, severity) @@ -563,29 +409,17 @@ GLOBAL_LIST(fishing_property_cache) explosive_spawn(turf, exploded_turfs[turf], multiplier) exploded_turfs = null -<<<<<<< HEAD -/datum/fish_source/proc/explosive_spawn(location, severity, multiplier = 1) - for(var/i in 1 to (severity + 2)) - if(!prob((100 + 100 * severity)/i * multiplier)) - continue - var/reward_loot = pick_weight(fish_table) -======= /datum/fish_source/proc/explosive_spawn(atom/location, severity, multiplier = 1) for(var/i in 1 to (severity + 2)) if(!prob((100 + 100 * severity)/i * multiplier)) continue var/reward_loot = pick_weight(get_fish_table()) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/atom/movable/reward = simple_dispense_reward(reward_loot, location, location) if(isnull(reward)) continue if(isfish(reward)) var/obj/item/fish/fish = reward -<<<<<<< HEAD - fish.set_status(FISH_DEAD) -======= fish.set_status(FISH_DEAD, silent = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isitem(reward)) reward.pixel_x = rand(-9, 9) reward.pixel_y = rand(-9, 9) diff --git a/code/modules/fishing/sources/source_types.dm b/code/modules/fishing/sources/source_types.dm index e2118c37d6d..6aea78b9943 100644 --- a/code/modules/fishing/sources/source_types.dm +++ b/code/modules/fishing/sources/source_types.dm @@ -1,22 +1,5 @@ /datum/fish_source/ocean fish_table = list( -<<<<<<< HEAD - FISHING_DUD = 15, - /obj/item/coin/gold = 5, - /obj/item/fish/clownfish = 15, - /obj/item/fish/pufferfish = 15, - /obj/item/fish/cardinal = 15, - /obj/item/fish/greenchromis = 15, - /obj/item/fish/lanternfish = 5, - /obj/item/fish/zipzap = 5, - /obj/item/fish/clownfish/lube = 3, - /obj/structure/mystery_box/fishing = 1, - ) - fish_counts = list( - /obj/item/fish/clownfish/lube = 2, - /obj/structure/mystery_box/fishing = 1, - ) -======= FISHING_DUD = 10, /obj/effect/spawner/message_in_a_bottle = 4, /obj/item/coin/gold = 6, @@ -45,15 +28,12 @@ /obj/item/fish/clownfish/lube = 3 MINUTES, /obj/item/fish/swordfish = 5 MINUTES, ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 5 explosive_malus = TRUE /datum/fish_source/ocean/beach catalog_description = "Beach shore water" -<<<<<<< HEAD -======= /datum/fish_source/ice_fishing catalog_description = "Ice-covered water" fish_table = list( @@ -113,18 +93,14 @@ ) fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 25 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_source/portal fish_table = list( FISHING_DUD = 7, /obj/item/fish/goldfish = 10, /obj/item/fish/guppy = 10, /obj/item/fish/angelfish = 10, -<<<<<<< HEAD -======= /obj/item/fish/perch = 5, /obj/item/fish/goldfish/three_eyes = 3, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) catalog_description = "Aquarium dimension (Fishing portal generator)" ///The name of this option shown in the radial menu on the fishing portal generator @@ -136,36 +112,26 @@ /datum/fish_source/portal/beach fish_table = list( -<<<<<<< HEAD - FISHING_DUD = 10, -======= FISHING_DUD = 7, /obj/effect/spawner/message_in_a_bottle = 3, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fish/clownfish = 10, /obj/item/fish/pufferfish = 10, /obj/item/fish/cardinal = 10, /obj/item/fish/greenchromis = 10, -<<<<<<< HEAD -======= /obj/item/fish/squid = 8, /obj/item/fish/plaice = 8, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) catalog_description = "Beach dimension (Fishing portal generator)" radial_name = "Beach" radial_state = "palm_beach" overlay_state = "portal_beach" -<<<<<<< HEAD -======= /datum/fish_source/portal/beach/on_fishing_spot_init(datum/component/fishing_spot/spot) ADD_TRAIT(spot.parent, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT) /datum/fish_source/portal/beach/on_fishing_spot_del(datum/component/fishing_spot/spot) REMOVE_TRAIT(spot.parent, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_source/portal/chasm background = "background_lavaland" fish_table = list( @@ -182,12 +148,8 @@ /datum/fish_source/portal/ocean fish_table = list( -<<<<<<< HEAD - FISHING_DUD = 5, -======= FISHING_DUD = 3, /obj/effect/spawner/message_in_a_bottle = 2, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/fish/lanternfish = 5, /obj/item/fish/firefish = 5, /obj/item/fish/dwarf_moonfish = 5, @@ -195,8 +157,6 @@ /obj/item/fish/needlefish = 5, /obj/item/fish/armorfish = 5, /obj/item/fish/zipzap = 5, -<<<<<<< HEAD -======= /obj/item/fish/stingray = 4, /obj/item/fish/monkfish = 4, /obj/item/fish/swordfish = 3, @@ -206,7 +166,6 @@ ) fish_count_regen = list( /obj/item/fish/swordfish = 5 MINUTES, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) catalog_description = "Ocean dimension (Fishing portal generator)" fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 10 @@ -214,15 +173,12 @@ overlay_state = "portal_ocean" radial_state = "seaboat" -<<<<<<< HEAD -======= /datum/fish_source/portal/ocean/on_fishing_spot_init(datum/component/fishing_spot/spot) ADD_TRAIT(spot.parent, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT) /datum/fish_source/portal/ocean/on_fishing_spot_del(datum/component/fishing_spot/spot) REMOVE_TRAIT(spot.parent, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_source/portal/hyperspace fish_table = list( FISHING_DUD = 5, @@ -247,8 +203,6 @@ /obj/item/fish/donkfish = 5, /obj/item/fish/emulsijack = 5, /obj/item/fish/jumpercable = 5, -<<<<<<< HEAD -======= /obj/item/fish/chainsawfish = 2, /obj/item/fish/pike/armored = 2, ) @@ -259,7 +213,6 @@ fish_count_regen = list( /obj/item/fish/chainsawfish = 7 MINUTES, /obj/item/fish/pike/armored = 7 MINUTES, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) catalog_description = "Syndicate dimension (Fishing portal generator)" radial_name = "Syndicate" @@ -311,13 +264,8 @@ challenge.bait_bounce_mult = clamp(challenge.bait_bounce_mult + (rand(-3, 3) * 0.1), 0.1, 1) challenge.completion_loss = max(challenge.completion_loss + rand(-2, 2), 0) challenge.completion_gain = max(challenge.completion_gain + rand(-1, 1), 2) -<<<<<<< HEAD - challenge.short_jump_velocity_limit += rand(-100, 100) - challenge.long_jump_velocity_limit += rand(-100, 100) -======= challenge.mover.short_jump_velocity_limit += rand(-100, 100) challenge.mover.long_jump_velocity_limit += rand(-100, 100) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/static/list/active_effects = bitfield_to_list(FISHING_MINIGAME_ACTIVE_EFFECTS) for(var/effect in active_effects) if(prob(30)) @@ -479,22 +427,12 @@ /obj/item/clothing/gloves/bracer = 2, /obj/effect/decal/remains/human = 2, /obj/item/fish/mastodon = 1, -<<<<<<< HEAD -======= /obj/item/fishing_rod/telescopic/master = 1, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) fish_counts = list( /obj/item/clothing/gloves/bracer = 1, /obj/effect/decal/remains/human = 1, /obj/item/fish/mastodon = 1, -<<<<<<< HEAD - ) - fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 15 - -#define RANDOM_SEED "Random seed" - -======= /obj/item/fishing_rod/telescopic/master = 1, ) fish_count_regen = list( @@ -502,7 +440,6 @@ ) fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 15 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_source/hydro_tray catalog_description = "Hydroponics trays" fish_table = list( @@ -546,11 +483,7 @@ return ..() /datum/fish_source/hydro_tray/spawn_reward(reward_path, mob/fisherman, turf/fishing_spot) -<<<<<<< HEAD - if(reward_path != RANDOM_SEED) -======= if(reward_path != FISHING_RANDOM_SEED) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/created_reward = ..() if(istype(created_reward)) created_reward.name = "small [created_reward.name]" @@ -571,8 +504,3 @@ var/picked_path = pick(seeds_to_draw_from) return new picked_path(get_turf(fishing_spot)) -<<<<<<< HEAD - -#undef RANDOM_SEED -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/food_and_drinks/machinery/coffeemaker.dm b/code/modules/food_and_drinks/machinery/coffeemaker.dm index 0b0b6bd4edd..a559d707af9 100644 --- a/code/modules/food_and_drinks/machinery/coffeemaker.dm +++ b/code/modules/food_and_drinks/machinery/coffeemaker.dm @@ -731,11 +731,6 @@ coffeepot.reagents.add_reagent_list(reagent_delta) qdel(reference_bean) -<<<<<<< HEAD - -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // remove the coffee beans from the machine coffee.Cut(1,2) coffee_amount-- diff --git a/code/modules/food_and_drinks/machinery/deep_fryer.dm b/code/modules/food_and_drinks/machinery/deep_fryer.dm index 3977ecf4ec2..f698ebe39e0 100644 --- a/code/modules/food_and_drinks/machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/machinery/deep_fryer.dm @@ -15,11 +15,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( /obj/item/reagent_containers/hypospray/medipen, //letting medipens become edible opens them to being injected/drained with IV drip & saltshakers ))) -<<<<<<< HEAD /obj/machinery/deepfryer//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE -======= -/obj/machinery/deepfryer ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "deep fryer" desc = "Deep fried everything." icon = 'icons/obj/machines/kitchen.dmi' diff --git a/code/modules/food_and_drinks/machinery/gibber.dm b/code/modules/food_and_drinks/machinery/gibber.dm index da8cb97a1ce..b6af0cf143d 100644 --- a/code/modules/food_and_drinks/machinery/gibber.dm +++ b/code/modules/food_and_drinks/machinery/gibber.dm @@ -1,8 +1,4 @@ -<<<<<<< HEAD /obj/machinery/gibber//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE -======= -/obj/machinery/gibber ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "gibber" desc = "The name isn't descriptive enough?" icon = 'icons/obj/machines/kitchen.dmi' diff --git a/code/modules/food_and_drinks/machinery/grill.dm b/code/modules/food_and_drinks/machinery/grill.dm index ebcdebe870b..8d0aa921a7b 100644 --- a/code/modules/food_and_drinks/machinery/grill.dm +++ b/code/modules/food_and_drinks/machinery/grill.dm @@ -3,11 +3,7 @@ ///The fuel amount used to actually grill the item #define GRILL_FUELUSAGE_ACTIVE 5 -<<<<<<< HEAD /obj/machinery/grill //SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE -======= -/obj/machinery/grill ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Barbeque grill" desc = "Just like the old days. Smokes items over a light heat" icon = 'icons/obj/machines/kitchen.dmi' diff --git a/code/modules/food_and_drinks/machinery/icecream_vat.dm b/code/modules/food_and_drinks/machinery/icecream_vat.dm index 9c77da57ff4..b58af21331e 100644 --- a/code/modules/food_and_drinks/machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/machinery/icecream_vat.dm @@ -1,9 +1,5 @@ ///How many units of a reagent is needed to make a cone. -<<<<<<< HEAD -#define CONE_REAGENET_NEEDED 1 -======= #define CONE_REAGENT_NEEDED 1 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The vat is set to dispense ice cream. #define VAT_MODE_ICECREAM "ice cream" @@ -246,11 +242,7 @@ ///Makes an ice cream cone of the make_type, using ingredients list as reagents used to make it. Puts in user's hand if possible. /obj/machinery/icecream_vat/proc/make_cone(mob/user, make_type, list/ingredients) for(var/reagents_needed in ingredients) -<<<<<<< HEAD - if(!reagents.has_reagent(reagents_needed, CONE_REAGENET_NEEDED)) -======= if(!reagents.has_reagent(reagents_needed, CONE_REAGENT_NEEDED)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balloon_alert(user, "not enough ingredients!") return var/cone_type = cone_prototypes[make_type].type @@ -259,11 +251,7 @@ var/obj/item/food/icecream/cone = new cone_type(src) for(var/reagents_used in ingredients) -<<<<<<< HEAD - reagents.remove_reagent(reagents_used, CONE_REAGENET_NEEDED) -======= reagents.remove_reagent(reagents_used, CONE_REAGENT_NEEDED) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balloon_alert_to_viewers("cooks up [cone.name]", "cooks up [cone.name]") try_put_in_hand(cone, user) @@ -274,22 +262,14 @@ CRASH("[user] was making ice cream of [selected_flavour] but had no flavor datum for it!") for(var/reagents_needed in flavor.ingredients) -<<<<<<< HEAD - if(!reagents.has_reagent(reagents_needed, CONE_REAGENET_NEEDED)) -======= if(!reagents.has_reagent(reagents_needed, CONE_REAGENT_NEEDED)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balloon_alert(user, "not enough ingredients!") return var/should_use_custom_ingredients = (flavor.takes_custom_ingredients && custom_ice_cream_beaker && custom_ice_cream_beaker.reagents.total_volume) if(flavor.add_flavour(source, should_use_custom_ingredients ? custom_ice_cream_beaker.reagents : null)) for(var/reagents_used in flavor.ingredients) -<<<<<<< HEAD - reagents.remove_reagent(reagents_used, CONE_REAGENET_NEEDED) -======= reagents.remove_reagent(reagents_used, CONE_REAGENT_NEEDED) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balloon_alert_to_viewers("scoops [selected_flavour]", "scoops [selected_flavour]") if(istype(cone)) @@ -317,8 +297,4 @@ #undef VAT_MODE_ICECREAM #undef VAT_MODE_CONES -<<<<<<< HEAD -#undef CONE_REAGENET_NEEDED -======= #undef CONE_REAGENT_NEEDED ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/food_and_drinks/machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/machinery/monkeyrecycler.dm index 762bbd0dbf0..960bb01dc30 100644 --- a/code/modules/food_and_drinks/machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/machinery/monkeyrecycler.dm @@ -31,15 +31,9 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) . = ..() cube_production = 0 for(var/datum/stock_part/servo/servo in component_parts) -<<<<<<< HEAD - cube_production += servo.tier * 0.2 // SKYRAT EDIT CHANGE - buffs to allow 1.2 cubes per monkey at T4 - ORIGINAL: cube_production += manipulator.tier * 0.1 + cube_production += servo.tier * 0.125 // SKYRAT EDIT CHANGE - buffs to allow 1 cubes per monkey at T4 - ORIGINAL: cube_production += manipulator.tier * 0.1 for(var/datum/stock_part/matter_bin/matter_bin in component_parts) - cube_production += matter_bin.tier * 0.2 // SKYRAT EDIT CHANGE - buffs to allow 1.2 cubes per monkey at T4 - ORIGINAL: cube_production += matter_bin.tier * 0.1 -======= - cube_production += servo.tier * 0.1 - for(var/datum/stock_part/matter_bin/matter_bin in component_parts) - cube_production += matter_bin.tier * 0.1 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + cube_production += matter_bin.tier * 0.125 // SKYRAT EDIT CHANGE - buffs to allow 1 cubes per monkey at T4 - ORIGINAL: cube_production += matter_bin.tier * 0.1 /obj/machinery/monkey_recycler/examine(mob/user) . = ..() diff --git a/code/modules/food_and_drinks/machinery/processor.dm b/code/modules/food_and_drinks/machinery/processor.dm index d2e03c9d183..9ddec8165ac 100644 --- a/code/modules/food_and_drinks/machinery/processor.dm +++ b/code/modules/food_and_drinks/machinery/processor.dm @@ -1,10 +1,6 @@ #define PROCESSOR_SELECT_RECIPE(movable_input) LAZYACCESS(processor_inputs[type], movable_input.type) -<<<<<<< HEAD /obj/machinery/processor //SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE -======= -/obj/machinery/processor ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "food processor" desc = "An industrial grinder used to process meat and other foods. Keep hands clear of intake area while operating." icon = 'icons/obj/machines/kitchen.dmi' diff --git a/code/modules/food_and_drinks/machinery/smartfridge.dm b/code/modules/food_and_drinks/machinery/smartfridge.dm index c078be84703..98f05eb9164 100644 --- a/code/modules/food_and_drinks/machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/machinery/smartfridge.dm @@ -343,11 +343,7 @@ if(ismob(weapon.loc)) var/mob/owner = weapon.loc if(!owner.transferItemToLoc(weapon, src)) -<<<<<<< HEAD - to_chat(usr, span_warning("\the [weapon] is stuck to your hand, you cannot put it in \the [src]!")) -======= to_chat(owner, span_warning("\the [weapon] is stuck to your hand, you cannot put it in \the [src]!")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE else @@ -480,26 +476,16 @@ .["isdryer"] = TRUE .["drying"] = drying -<<<<<<< HEAD -/obj/machinery/smartfridge/drying/ui_act(action, params) -======= /obj/machinery/smartfridge/drying/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) update_appearance() // This is to handle a case where the last item is taken out manually instead of through drying pop-out return -<<<<<<< HEAD - switch(action) - if("Dry") - toggle_drying(FALSE, usr) -======= var/mob/user = ui.user switch(action) if("Dry") toggle_drying(FALSE, user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /obj/machinery/smartfridge/drying/powered() @@ -775,10 +761,7 @@ /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/spray, /obj/item/reagent_containers/medigel, -<<<<<<< HEAD /obj/item/reagent_containers/cup/vial, //SKYRAT EDIT ADDITION - HYPOSPRAYS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/chem_pack )) return is_type_in_typecache(weapon, chemfridge_typecache) diff --git a/code/modules/food_and_drinks/recipes/drinks/drinks_non-alcoholic.dm b/code/modules/food_and_drinks/recipes/drinks/drinks_non-alcoholic.dm index 2c33ce399bd..b3db43009a0 100644 --- a/code/modules/food_and_drinks/recipes/drinks/drinks_non-alcoholic.dm +++ b/code/modules/food_and_drinks/recipes/drinks/drinks_non-alcoholic.dm @@ -105,18 +105,12 @@ /datum/chemical_reaction/drink/coffee results = list(/datum/reagent/consumable/coffee = 5) required_reagents = list(/datum/reagent/toxin/coffeepowder = 1, /datum/reagent/water = 5) -<<<<<<< HEAD pollutant_type = /datum/pollutant/food/coffee //SKYRAT EDIT ADDITION - Pollution -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/chemical_reaction/drink/tea results = list(/datum/reagent/consumable/tea = 5) required_reagents = list(/datum/reagent/toxin/teapowder = 1, /datum/reagent/water = 5) -<<<<<<< HEAD pollutant_type = /datum/pollutant/food/tea //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/chemical_reaction/drink/cream_soda results = list(/datum/reagent/consumable/cream_soda = 4) diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index 8f78e2e1b9d..e9a9405264a 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -132,16 +132,12 @@ results = list(/datum/reagent/consumable/hot_ramen = 3) required_reagents = list(/datum/reagent/water = 1, /datum/reagent/consumable/dry_ramen = 3) -<<<<<<< HEAD pollutant_type = /datum/pollutant/food/spicy_noodles //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/chemical_reaction/food/hell_ramen results = list(/datum/reagent/consumable/hell_ramen = 6) required_reagents = list(/datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/hot_ramen = 6) -<<<<<<< HEAD pollutant_type = /datum/pollutant/food/spicy_noodles //SKYRAT EDIT ADDITION /datum/chemical_reaction/food/imitationcarpmeat @@ -150,14 +146,6 @@ mix_message = "The mixture becomes similar to carp meat." reaction_flags = REACTION_INSTANT -======= -/datum/chemical_reaction/food/imitationcarpmeat - required_reagents = list(/datum/reagent/toxin/carpotoxin = 5) - required_container = /obj/item/food/tofu - mix_message = "The mixture becomes similar to carp meat." - reaction_flags = REACTION_INSTANT - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/chemical_reaction/food/imitationcarpmeat/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) var/location = get_turf(holder.my_atom) new /obj/item/food/fishmeat/carp/imitation(location) diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm index 41d1f1a4385..14f93b45cd8 100644 --- a/code/modules/food_and_drinks/recipes/processor_recipes.dm +++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm @@ -139,10 +139,7 @@ output = /obj/item/popsicle_stick food_multiplier = 3 preserve_materials = FALSE -<<<<<<< HEAD -======= /datum/food_processor_process/canned_ink input = /obj/item/food/ink_sac output = /obj/item/food/canned/squid_ink ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm index aa3147ad6a6..446782d00cb 100644 --- a/code/modules/food_and_drinks/recipes/soup_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/soup_mixtures.dm @@ -710,11 +710,7 @@ /datum/chemical_reaction/food/soup/bloodsoup required_reagents = list( -<<<<<<< HEAD - /datum/reagent/water/salt = 10, // SKYRAT EDIT CHANGE - ORIGINAL: /datum/reagent/water = 10, -======= /datum/reagent/water = 10, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/blood = 10, ) required_ingredients = list( diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index b630591895f..cc27a6f078b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -282,11 +282,7 @@ category = CAT_MISCFOOD /datum/crafting_recipe/food/pacoca -<<<<<<< HEAD - name = "Pacoca" -======= name = "Paçoca" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 reqs = list( /obj/item/food/grown/peanut = 2, /datum/reagent/consumable/sugar = 5, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm index 73df0deab24..0bd29c51054 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm @@ -67,10 +67,6 @@ /obj/item/food/grown/apple = 2, /obj/item/food/grown/grapes = 2, /obj/item/food/grown/banana = 2, -<<<<<<< HEAD - /obj/item/food/watermelonslice = 2 -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) result = /obj/item/food/salad/jungle diff --git a/code/modules/food_and_drinks/restaurant/_venue.dm b/code/modules/food_and_drinks/restaurant/_venue.dm index 51273306243..b37128a0087 100644 --- a/code/modules/food_and_drinks/restaurant/_venue.dm +++ b/code/modules/food_and_drinks/restaurant/_venue.dm @@ -237,13 +237,8 @@ if(linked_venue && linked_venue.restaurant_portal) //We're already linked, unlink us. if(linked_venue.open) linked_venue.close() -<<<<<<< HEAD - linked_venue.restaurant_portal.linked_venue = null - linked_venue.restaurant_portal = null -======= linked_venue.restaurant_portal = null linked_venue = null ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 linked_venue = chosen_venue linked_venue.restaurant_portal = src diff --git a/code/modules/food_and_drinks/restaurant/customers/_customer.dm b/code/modules/food_and_drinks/restaurant/customers/_customer.dm index d68ed01b267..c9011ad8c8a 100644 --- a/code/modules/food_and_drinks/restaurant/customers/_customer.dm +++ b/code/modules/food_and_drinks/restaurant/customers/_customer.dm @@ -310,11 +310,7 @@ /datum/customer_data/moth/proc/get_wings(mob/living/basic/robot_customer/customer) var/customer_ref = WEAKREF(customer) if (!LAZYACCESS(wings_chosen, customer_ref)) -<<<<<<< HEAD LAZYSET(wings_chosen, customer_ref, pick(SSaccessories.sprite_accessories["wings"])) // SKYRAT EDIT CHANGE - ORIGINAL: LAZYSET(wings_chosen, customer_ref, SSaccessories.moth_wings_list[pick(SSaccessories.moth_wings_list)]) -======= - LAZYSET(wings_chosen, customer_ref, SSaccessories.moth_wings_list[pick(SSaccessories.moth_wings_list)]) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return wings_chosen[customer_ref] /datum/customer_data/moth/get_underlays(mob/living/basic/robot_customer/customer) diff --git a/code/modules/hallucination/inhand_fake_item.dm b/code/modules/hallucination/inhand_fake_item.dm index b3ad8b9a33a..ba791f3a56c 100644 --- a/code/modules/hallucination/inhand_fake_item.dm +++ b/code/modules/hallucination/inhand_fake_item.dm @@ -16,11 +16,7 @@ // These slots are human only, + they have to have a uniform var/mob/living/carbon/human/human_hallucinator = hallucinator -<<<<<<< HEAD - if(istype(hallucinator) && human_hallucinator.w_uniform) -======= if(istype(human_hallucinator) && human_hallucinator.w_uniform) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if((valid_slots & ITEM_SLOT_BELT) && !human_hallucinator.belt) slots_free[ui_belt] = ITEM_SLOT_BELT if((valid_slots & ITEM_SLOT_LPOCKET) && !human_hallucinator.l_store) diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index 38358cfe7c7..1107c8c2579 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -146,17 +146,10 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf data["emagged"] = TRUE data["emag_programs"] = emag_programs data["program"] = program -<<<<<<< HEAD - data["can_toggle_safety"] = issilicon(user) || isAdminGhostAI(user) - return data - -/obj/machinery/computer/holodeck/ui_act(action, params) -======= data["can_toggle_safety"] = HAS_SILICON_ACCESS(user) return data /obj/machinery/computer/holodeck/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 540f38f3641..3549b3e965f 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -526,11 +526,7 @@ return data -<<<<<<< HEAD -/obj/machinery/biogenerator/ui_act(action, list/params) -======= /obj/machinery/biogenerator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index 142b9e0735e..6309ae8475b 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -20,11 +20,7 @@ /obj/item/seeds/cannabis/white, /obj/item/seeds/cannabis/ultimate, ) -<<<<<<< HEAD reagents_add = list(/datum/reagent/drug/thc = 0.15) //SKYRAT EDIT - MORENARCOTICS - axed lipolicide, replaced space drugs with thc -======= - reagents_add = list(/datum/reagent/drug/cannabis = 0.15) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/seeds/cannabis/rainbow @@ -48,11 +44,7 @@ plantname = "Deathweed" product = /obj/item/food/grown/cannabis/death mutatelist = null -<<<<<<< HEAD reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/thc = 0.15) //SKYRAT EDIT - MORENARCOTICS -======= - reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/cannabis = 0.15) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rarity = 40 /obj/item/seeds/cannabis/white @@ -65,11 +57,7 @@ instability = 30 product = /obj/item/food/grown/cannabis/white mutatelist = null -<<<<<<< HEAD reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/thc = 0.15) //SKYRAT EDIT - MORENARCOTICS -======= - reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/cannabis = 0.15) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 rarity = 40 @@ -84,11 +72,7 @@ product = /obj/item/food/grown/cannabis/ultimate genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/green, /datum/plant_gene/trait/modified_volume/omega_weed) mutatelist = null -<<<<<<< HEAD reagents_add = list(/datum/reagent/drug/thc = 0.3, //SKYRAT EDIT CHANGE - MORE NARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/drug/cannabis = 0.3, -======= - reagents_add = list(/datum/reagent/drug/cannabis = 0.3, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/toxin/mindbreaker = 0.3, /datum/reagent/mercury = 0.15, /datum/reagent/lithium = 0.15, @@ -96,11 +80,7 @@ /datum/reagent/drug/methamphetamine = 0.15, /datum/reagent/drug/bath_salts = 0.15, /datum/reagent/drug/krokodil = 0.15, -<<<<<<< HEAD // /datum/reagent/toxin/lipolicide = 0.15, // SKYRAT EDIT REMOVAL - MORE NARCOTICS -======= - /datum/reagent/toxin/lipolicide = 0.15, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/drug/nicotine = 0.1, ) rarity = 69 diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index 5f2b195eac1..47047f2e48c 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -196,15 +196,10 @@ podman.faction |= factions if(!features["mcolor"]) features["mcolor"] = "#59CE00" -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START if(!features["pod_hair"]) features["pod_hair"] = pick(SSaccessories.pod_hair_list) */ //SKYRAT EDIT REMOVAL END - Tricolor Pod Hair -======= - if(!features["pod_hair"]) - features["pod_hair"] = pick(SSaccessories.pod_hair_list) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/V in quirks) new V(podman) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 8a9ded9c007..041ff97b73c 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -987,15 +987,9 @@ to_chat(user, span_notice("The tray is empty.")) return if(myseed.apply_graft(snip)) -<<<<<<< HEAD - to_chat(user, "You carefully integrate the grafted plant limb onto [myseed.plantname], granting it [snip.stored_trait.get_name()].") - else - to_chat(user, "You integrate the grafted plant limb onto [myseed.plantname], but it does not accept the [snip.stored_trait.get_name()] trait from the [snip].") -======= to_chat(user, span_notice("You carefully integrate the grafted plant limb onto [myseed.plantname], granting it [snip.stored_trait.get_name()].")) else to_chat(user, span_notice("You integrate the grafted plant limb onto [myseed.plantname], but it does not accept the [snip.stored_trait.get_name()] trait from the [snip].")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qdel(snip) return diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 708649fe866..aa63f5d41f1 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -202,11 +202,7 @@ return RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(squash_plant)) -<<<<<<< HEAD - RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, PROC_REF(squash_plant)) -======= RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, PROC_REF(squash_plant_if_not_caught)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, PROC_REF(squash_plant)) /* @@ -243,13 +239,10 @@ qdel(our_plant) -<<<<<<< HEAD -======= /datum/plant_gene/trait/squash/proc/squash_plant_if_not_caught(datum/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught) if(!caught) squash_plant(source, hit_atom) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* * Makes plant slippery, unless it has a grown-type trash. Then the trash gets slippery. * Applies other trait effects (teleporting, etc) to the target by signal. @@ -652,11 +645,7 @@ if(living_target.reagents && living_target.can_inject()) var/injecting_amount = max(1, our_seed.potency * 0.2) // Minimum of 1, max of 20 our_plant.reagents.trans_to(living_target, injecting_amount, methods = INJECT) -<<<<<<< HEAD - to_chat(target, "You are pricked by [our_plant]!") -======= to_chat(target, span_danger("You are pricked by [our_plant]!")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_combat(our_plant, living_target, "pricked and attempted to inject reagents from [our_plant] to [living_target]. Last touched by: [our_plant.fingerprintslast].") our_plant.investigate_log("pricked and injected [key_name(living_target)] and injected [injecting_amount] reagents at [AREACOORD(living_target)]. Last touched by: [our_plant.fingerprintslast].", INVESTIGATE_BOTANY) diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 7ea93fe25fc..93d9cc0aea7 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -260,25 +260,6 @@ seeds += list(seed_data) . = list() .["seeds"] = seeds -<<<<<<< HEAD - -/obj/machinery/seed_extractor/ui_static_data(mob/user) - var/list/data = list() - data["cycle_seconds"] = HYDROTRAY_CYCLE_DELAY / 10 - data["trait_db"] = list() - for(var/trait_path in subtypesof(/datum/plant_gene/trait)) - var/datum/plant_gene/trait/trait = new trait_path - var/trait_data = list(list( - "path" = trait.type, - "name" = trait.name, - "icon" = trait.icon, - "description" = trait.description - )) - data["trait_db"] += trait_data - return data - -/obj/machinery/seed_extractor/ui_act(action, params) -======= /obj/machinery/seed_extractor/ui_static_data(mob/user) var/list/data = list() @@ -296,7 +277,6 @@ return data /obj/machinery/seed_extractor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 60ecd1e0005..18197c006b5 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -585,74 +585,6 @@ genes += new_trait.Copy() else . = FALSE -<<<<<<< HEAD - - // Adjust stats based on graft stats - set_lifespan(round(max(lifespan, (lifespan + (2/3)*(snip.lifespan - lifespan))))) - set_endurance(round(max(endurance, (endurance + (2/3)*(snip.endurance - endurance))))) - set_production(round(max(production, (production + (2/3)*(snip.production - production))))) - set_weed_rate(round(max(weed_rate, (weed_rate + (2/3)*(snip.weed_rate - weed_rate))))) - set_weed_chance(round(max(weed_chance, (weed_chance+ (2/3)*(snip.weed_chance - weed_chance))))) - set_yield(round(max(yield, (yield + (2/3)*(snip.yield - yield))))) - - // Add in any reagents, too. - reagents_from_genes() - - return - -/* - * Both `/item/food/grown` and `/item/grown` implement a seed variable which tracks - * plant statistics, genes, traits, etc. This proc gets the seed for either grown food or - * grown inedibles and returns it, or returns null if it's not a plant. - * - * Returns an `/obj/item/seeds` ref for grown foods or grown inedibles. - * - returned seed CAN be null in weird cases but in all applications it SHOULD NOT be. - * Returns null if it is not a plant. - */ -/obj/item/proc/get_plant_seed() - return null - -/obj/item/food/grown/get_plant_seed() - return seed - -/obj/item/grown/get_plant_seed() - return seed - - - - - - -/obj/item/seeds/proc/perform_reagent_pollination(obj/item/seeds/donor) - var/list/datum/plant_gene/reagent/valid_reagents = list() - for(var/datum/plant_gene/reagent/donor_reagent in donor.genes) - var/repeated = FALSE - for(var/datum/plant_gene/reagent/receptor_reagent in genes) - if(donor_reagent.reagent_id == receptor_reagent.reagent_id) - if(receptor_reagent.rate < donor_reagent.rate) - receptor_reagent.rate = donor_reagent.rate - // sucessful pollination/upgrade, we stop here. - reagents_from_genes() - return - else - repeated = TRUE - break - - if(!repeated) - valid_reagents += donor_reagent - - if(length(valid_reagents)) - // pick a valid reagent that our receptor seed don't have and add the gene to it - var/datum/plant_gene/reagent/selected_reagent = pick(valid_reagents) - - genes += selected_reagent.Copy() - reagents_from_genes() - - - - - -======= // Adjust stats based on graft stats set_lifespan(round(max(lifespan, (lifespan + (2/3)*(snip.lifespan - lifespan))))) @@ -708,4 +640,3 @@ var/datum/plant_gene/reagent/selected_reagent = pick(valid_reagents) genes += selected_reagent.Copy() reagents_from_genes() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index 2a133fe8914..f0176e64530 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -27,11 +27,7 @@ if(!ismob(music_player)) return STOP_PLAYING var/mob/user = music_player -<<<<<<< HEAD - if(user.incapacitated() || !((loc == user) || (isturf(loc) && Adjacent(user)))) // sorry, no more TK playing. -======= if(user.incapacitated || !((loc == user) || (isturf(loc) && Adjacent(user)))) // sorry, no more TK playing. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return STOP_PLAYING /obj/item/instrument/suicide_act(mob/living/user) diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index d8e0ab8ba37..334487fa75b 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -114,14 +114,11 @@ /// String. If set to a non-empty one, it will be the key for the policy text value to show this role on spawn. var/policy_index = "" -<<<<<<< HEAD //SKYRAT ADDITION START /// Job title to use for spawning. Allows a job to spawn without needing map edits. var/job_spawn_title //SKYRAT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// RPG job names, for the memes var/rpg_title @@ -144,13 +141,10 @@ /datum/job/New() . = ..() -<<<<<<< HEAD // SKYRAT EDIT START if(!job_spawn_title) job_spawn_title = title // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/new_spawn_positions = CHECK_MAP_JOB_CHANGE(title, "spawn_positions") if(isnum(new_spawn_positions)) spawn_positions = new_spawn_positions @@ -193,15 +187,9 @@ /// Announce that this job as joined the round to all crew members. /// Note the joining mob has no client at this point. -<<<<<<< HEAD /datum/job/proc/announce_job(mob/living/joining_mob, job_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: /datum/job/proc/announce_job(mob/living/joining_mob) if(head_announce) announce_head(joining_mob, head_announce, job_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: announce_head(joining_mob, head_announce) -======= -/datum/job/proc/announce_job(mob/living/joining_mob) - if(head_announce) - announce_head(joining_mob, head_announce) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Used for a special check of whether to allow a client to latejoin as this job. @@ -230,7 +218,6 @@ ) if(EMERGENCY_PAST_POINT_OF_NO_RETURN && prob(VERY_LATE_ARRIVAL_TOAST_PROB)) -<<<<<<< HEAD //equipping.equip_to_slot_or_del(new /obj/item/food/griddle_toast(equipping), ITEM_SLOT_MASK) // SKYRAT EDIT REMOVAL - See below // SKYRAT EDIT ADDITION - Lizards if(islizard(equipping)) @@ -238,9 +225,6 @@ else equip_to_slot_or_del(new /obj/item/food/griddle_toast(equipping), ITEM_SLOT_MASK) // SKYRAT EDIT ADDITION END - Lizards -======= - equip_to_slot_or_del(new /obj/item/food/griddle_toast(src), ITEM_SLOT_MASK) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef VERY_LATE_ARRIVAL_TOAST_PROB @@ -249,7 +233,6 @@ /mob/living/carbon/human/dress_up_as_job(datum/job/equipping, visual_only = FALSE, client/player_client, consistent = FALSE) dna.species.pre_equip_species_outfit(equipping, src, visual_only) -<<<<<<< HEAD equip_outfit_and_loadout(equipping.get_outfit(consistent), player_client?.prefs, visual_only, equipping) // SKYRAT EDIT CHANGE - Add equipping param // Original: /datum/job/proc/announce_head(mob/living/carbon/human/H, channels) //tells the given channel that the given mob is the new department head. See communications.dm for valid channels. @@ -257,14 +240,6 @@ if(H && GLOB.announcement_systems.len) //timer because these should come after the captain announcement SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), CALLBACK(pick(GLOB.announcement_systems), TYPE_PROC_REF(/obj/machinery/announcement_system, announce), "NEWHEAD", H.real_name, job_title, channels), 1)) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), CALLBACK(pick(GLOB.announcement_systems), TYPE_PROC_REF(/obj/machinery/announcement_system, announce), "NEWHEAD", H.real_name, H.job, channels), 1)) -======= - equip_outfit_and_loadout(equipping.get_outfit(consistent), player_client?.prefs, visual_only) - -/datum/job/proc/announce_head(mob/living/carbon/human/H, channels) //tells the given channel that the given mob is the new department head. See communications.dm for valid channels. - if(H && GLOB.announcement_systems.len) - //timer because these should come after the captain announcement - SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), CALLBACK(pick(GLOB.announcement_systems), TYPE_PROC_REF(/obj/machinery/announcement_system, announce), "NEWHEAD", H.real_name, H.job, channels), 1)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1 /datum/job/proc/player_old_enough(client/player) @@ -327,7 +302,6 @@ return TRUE /// Gets the message that shows up when spawning as this job -<<<<<<< HEAD /datum/job/proc/get_spawn_message(alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: /datum/job/proc/get_spawn_message() SHOULD_NOT_OVERRIDE(TRUE) return examine_block(span_infoplain(jointext(get_spawn_message_information(alt_title), "\n• "))) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLED - ORIGINAL: return examine_block(span_infoplain(jointext(get_spawn_message_information(), "\n• "))) @@ -337,27 +311,12 @@ SHOULD_CALL_PARENT(TRUE) var/list/info = list() info += "You are the [alt_title].\n" // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: info += "You are the [title].\n" -======= -/datum/job/proc/get_spawn_message() - SHOULD_NOT_OVERRIDE(TRUE) - return examine_block(span_infoplain(jointext(get_spawn_message_information(), "\n• "))) - -/// Returns a list of strings that correspond to chat messages sent to this mob when they join the round. -/datum/job/proc/get_spawn_message_information() - SHOULD_CALL_PARENT(TRUE) - var/list/info = list() - info += "You are the [title].\n" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/related_policy = get_policy(title) var/radio_info = get_radio_information() if(related_policy) info += related_policy if(supervisors) -<<<<<<< HEAD info += "As the [alt_title == title ? alt_title : "[alt_title] ([title])"] you answer directly to [supervisors]. Special circumstances may change this." // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: info += "As the [title] you answer directly to [supervisors]. Special circumstances may change this." -======= - info += "As the [title] you answer directly to [supervisors]. Special circumstances may change this." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(radio_info) info += radio_info if(req_admin_notify) @@ -367,14 +326,11 @@ info += span_boldnotice("As this station was initially staffed with a \ [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] \ have been added to your ID card.") -<<<<<<< HEAD //SKYRAT EDIT ADDITION START - ALTERNATIVE_JOB_TITLES if(alt_title != title) info += span_warning("Remember that alternate titles are purely for flavor and roleplay.") info += span_doyourjobidiot("Do not use your \"[alt_title]\" alt title as an excuse to forego your duties as a [title].") //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return info @@ -420,11 +376,8 @@ back = /obj/item/storage/backpack/messenger //Grey messenger bag if(DSATCHEL) back = satchel //Department satchel -<<<<<<< HEAD if(DMESSENGER) back = messenger //SKYRAT EDIT - Messenger Bags -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(DDUFFELBAG) back = duffelbag //Department duffel bag if(DMESSENGER) @@ -536,17 +489,10 @@ hangover_landmark.used = TRUE break return hangover_spawn_point || get_latejoin_spawn_point() -<<<<<<< HEAD - /* if(length(GLOB.jobspawn_overrides[title])) - return pick(GLOB.jobspawn_overrides[title]) */ // ORIGINAL CODE // SKYRAT EDIT START - Alt job titles if(length(GLOB.jobspawn_overrides[job_spawn_title])) return pick(GLOB.jobspawn_overrides[job_spawn_title]) // SKYRAT EDIT END -======= - if(length(GLOB.jobspawn_overrides[title])) - return pick(GLOB.jobspawn_overrides[title]) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/effect/landmark/start/spawn_point = get_default_roundstart_spawn_point() if(!spawn_point) //if there isn't a spawnpoint send them to latejoin, if there's no latejoin go yell at your mapper return get_latejoin_spawn_point() @@ -556,11 +502,7 @@ /// Handles finding and picking a valid roundstart effect landmark spawn point, in case no uncommon different spawning events occur. /datum/job/proc/get_default_roundstart_spawn_point() for(var/obj/effect/landmark/start/spawn_point as anything in GLOB.start_landmarks_list) -<<<<<<< HEAD if(spawn_point.name != job_spawn_title) // SKYRAT EDIT - Alt job titles - ORIGINAL: if(spawn_point.name != title) -======= - if(spawn_point.name != title) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue . = spawn_point if(spawn_point.used) //so we can revert to spawning them on top of eachother if something goes wrong @@ -572,25 +514,14 @@ /// Finds a valid latejoin spawn point, checking for events and special conditions. /datum/job/proc/get_latejoin_spawn_point() -<<<<<<< HEAD - /* if(length(GLOB.jobspawn_overrides[title])) - return pick(GLOB.jobspawn_overrides[title]) */ // ORIGINAL CODE // SKYRAT EDIT START - Alt job titles if(length(GLOB.jobspawn_overrides[job_spawn_title])) //We're doing something special today. return pick(GLOB.jobspawn_overrides[job_spawn_title]) // SKYRAT EDIT END -======= - if(length(GLOB.jobspawn_overrides[title])) //We're doing something special today. - return pick(GLOB.jobspawn_overrides[title]) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(length(SSjob.latejoin_trackers)) return pick(SSjob.latejoin_trackers) return SSjob.get_last_resort_spawn_points() -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Spawns the mob to be played as, taking into account preferences and the desired spawn point. /datum/job/proc/get_spawn_mob(client/player_client, atom/spawn_point) var/mob/living/spawn_instance diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm index 4f39f014c1a..b8c0e00bdad 100644 --- a/code/modules/jobs/job_types/ai.dm +++ b/code/modules/jobs/job_types/ai.dm @@ -25,16 +25,12 @@ /datum/job/ai/after_spawn(mob/living/spawned, client/player_client) . = ..() -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //we may have been created after our borg if(SSticker.current_state == GAME_STATE_SETTING_UP) for(var/mob/living/silicon/robot/R in GLOB.silicon_mobs) if(!R.connected_ai) R.TryConnectToAI() -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END var/mob/living/silicon/ai/ai_spawn = spawned ai_spawn.log_current_laws() @@ -60,10 +56,6 @@ sync_target.lawupdate = TRUE sync_target.show_laws() // SKYRAT EDIT ADDITION END -======= - var/mob/living/silicon/ai/ai_spawn = spawned - ai_spawn.log_current_laws() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/job/ai/get_roundstart_spawn_point() diff --git a/code/modules/jobs/job_types/assistant/assistant.dm b/code/modules/jobs/job_types/assistant/assistant.dm index 5dfcfd54255..12e029f943f 100644 --- a/code/modules/jobs/job_types/assistant/assistant.dm +++ b/code/modules/jobs/job_types/assistant/assistant.dm @@ -76,14 +76,11 @@ Assistant var/index = (jumpsuit_number % GLOB.colored_assistant.jumpsuits.len) + 1 -<<<<<<< HEAD // SKYRAT EDIT - Loadouts (we don't want jumpsuits to override the person's loadout item) if(modified_outfit_slots & ITEM_SLOT_ICLOTHING) return // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //We don't cache these, because they can delete on init //Too fragile, better to just eat the cost if (target.jumpsuit_style == PREF_SUIT) diff --git a/code/modules/jobs/job_types/assistant/gimmick_assistants.dm b/code/modules/jobs/job_types/assistant/gimmick_assistants.dm index 2d13d7429da..23fd9616ee3 100644 --- a/code/modules/jobs/job_types/assistant/gimmick_assistants.dm +++ b/code/modules/jobs/job_types/assistant/gimmick_assistants.dm @@ -129,11 +129,7 @@ mask = /obj/item/clothing/mask/whistle uniform = /obj/item/clothing/under/color/red -<<<<<<< HEAD - //neck = /obj/item/camera SKYRAT EDIT REMOVAL -======= neck = /obj/item/camera ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 outfit_weight = 2 diff --git a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm index 32e015a9019..dd7208d1706 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm @@ -705,8 +705,6 @@ hitsound = 'sound/weapons/bladeslice.ogg' menu_description = "A pointy spear which penetrates armor a little. Can be worn only on the belt." -<<<<<<< HEAD -======= // Unholy version of above, since the gamemode is dead in the water /obj/item/brass_spear @@ -729,7 +727,6 @@ attack_verb_simple = list("stab", "poke", "slash", "clock") hitsound = 'sound/weapons/bladeslice.ogg' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Nullblade - For when you really want to feel like rolling dice during combat /obj/item/nullrod/nullblade diff --git a/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm b/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm index 9287d0bd4cf..4b07baaa058 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm @@ -10,11 +10,7 @@ If the scythe isn't empowered when you sheath it, you take a heap of damage and desc = "This shard seems to be directly linked to some sinister entity. It might be your god! It also gives you a really horrible rash when you hold onto it for too long." items_to_create = list(/obj/item/vorpalscythe) -<<<<<<< HEAD -/obj/item/organ/internal/cyberimp/arm/shard/scythe/Insert(mob/living/carbon/receiver, special, movement_flags) -======= /obj/item/organ/internal/cyberimp/arm/shard/scythe/mob_insert(mob/living/carbon/receiver, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(receiver.mind) ADD_TRAIT(receiver.mind, TRAIT_MORBID, ORGAN_TRAIT) diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index 3407ab79efb..fc131f9cbb4 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -22,8 +22,6 @@ departments_list = list( /datum/job_department/service, ) -<<<<<<< HEAD -======= mail_goodies = list( /obj/item/food/grown/banana = 100, @@ -39,26 +37,7 @@ job_flags = STATION_JOB_FLAGS job_tone = "honk" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - mail_goodies = list( - /obj/item/food/grown/banana = 100, - /obj/item/food/pie/cream = 50, - /obj/item/spess_knife = 20, // As a joke for clumsy clown from engineering department - /obj/item/clothing/shoes/clown_shoes/combat = 10, - /obj/item/reagent_containers/spray/waterflower/lube = 20, // lube - /obj/item/reagent_containers/spray/waterflower/superlube = 1 // Superlube, good lord. - ) - -<<<<<<< HEAD - family_heirlooms = list(/obj/item/bikehorn/golden) - rpg_title = "Jester" - job_flags = STATION_JOB_FLAGS - - job_tone = "honk" - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/job/clown/after_spawn(mob/living/spawned, client/player_client) . = ..() if(!ishuman(spawned)) diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index 75d0422fa99..96fc6177a15 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -45,16 +45,10 @@ backpack_contents = list( /obj/item/barcodescanner = 1, /obj/item/choice_beacon/hero = 1, -<<<<<<< HEAD /obj/item/glassblowing/magnifying_glass, //SKYRAT EDIT: Magnifying Glass ) belt = /obj/item/modular_computer/pda/curator - ears = /obj/item/radio/headset/headset_srv -======= - ) - belt = /obj/item/modular_computer/pda/curator ears = /obj/item/radio/headset/headset_srvent ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 shoes = /obj/item/clothing/shoes/laceup l_pocket = /obj/item/laser_pointer/green r_pocket = /obj/item/key/displaycase @@ -62,8 +56,6 @@ accessory = /obj/item/clothing/accessory/pocketprotector/full -<<<<<<< HEAD -======= /datum/outfit/job/curator/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(visualsOnly) return ..() @@ -76,7 +68,6 @@ return ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/job/curator/post_equip(mob/living/carbon/human/translator, visualsOnly = FALSE) ..() diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm index 841d02836a7..92094073033 100644 --- a/code/modules/jobs/job_types/cyborg.dm +++ b/code/modules/jobs/job_types/cyborg.dm @@ -3,11 +3,7 @@ description = "Assist the crew, follow your laws, obey your AI." auto_deadmin_role_flags = DEADMIN_POSITION_SILICON faction = FACTION_STATION -<<<<<<< HEAD total_positions = 3 // SKYRAT EDIT: Original value (0) -======= - total_positions = 0 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 spawn_positions = 3 supervisors = "your laws and the AI" //Nodrak spawn_type = /mob/living/silicon/robot @@ -33,7 +29,6 @@ spawned.gender = NEUTER var/mob/living/silicon/robot/robot_spawn = spawned robot_spawn.notify_ai(AI_NOTIFICATION_NEW_BORG) -<<<<<<< HEAD //SKYRAT EDIT START var/list/malf_ais = list() var/list/regular_ais = list() @@ -60,8 +55,6 @@ robot_spawn.lawupdate = TRUE robot_spawn.show_laws() //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!robot_spawn.connected_ai) // Only log if there's no Master AI robot_spawn.log_current_laws() diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index efb96548e9b..5e34e78eeeb 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -57,22 +57,14 @@ /obj/item/melee/baton = 1, /obj/item/storage/box/evidence = 1, ) -<<<<<<< HEAD belt = /obj/item/storage/belt/holster/detective/full // SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/modular_computer/pda/detective -======= - belt = /obj/item/modular_computer/pda/detective ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ears = /obj/item/radio/headset/headset_sec/alt gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/fedora/det_hat mask = /obj/item/cigarette neck = /obj/item/clothing/neck/tie/detective shoes = /obj/item/clothing/shoes/sneakers/brown -<<<<<<< HEAD l_pocket = /obj/item/modular_computer/pda/detective // SKYRAT EDIT CHANGE - ORIGINAL: /obj/item/toy/crayon/white -======= - l_pocket = /obj/item/toy/crayon/white ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 r_pocket = /obj/item/lighter chameleon_extras = list( diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index f5bf4df63e2..17dcf4d0b50 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -55,10 +55,7 @@ suit_store = /obj/item/gun/energy/e_gun backpack_contents = list( /obj/item/evidencebag = 1, -<<<<<<< HEAD /obj/item/choice_beacon/security_pistol = 1, //Skyrat Addition -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) belt = /obj/item/modular_computer/pda/heads/hos ears = /obj/item/radio/headset/heads/hos/alt diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index 3d9e6e6ebe1..46090cdbe30 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -131,11 +131,7 @@ return FALSE if(!user.is_holding(src)) return FALSE -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(!user.mind) return FALSE diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index 9e488c2c04c..53d220da80a 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -3,11 +3,7 @@ description = "Keep yourself occupied in permabrig." department_head = list("The Security Team") faction = FACTION_STATION -<<<<<<< HEAD total_positions = 12 // SKYRAT EDIT: Original value (0) -======= - total_positions = 0 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 spawn_positions = 2 supervisors = "the security team" exp_granted_type = EXP_TYPE_CREW @@ -18,11 +14,7 @@ plasmaman_outfit = /datum/outfit/plasmaman/prisoner display_order = JOB_DISPLAY_ORDER_PRISONER -<<<<<<< HEAD department_for_prefs = /datum/job_department/assistant // SKYRAT EDIT - ORIGINAL: /datum/job_department/security -======= - department_for_prefs = /datum/job_department/security ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 exclusive_mail_goodies = TRUE mail_goodies = list ( diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index 4d6bc37b50d..7370af5d9ec 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -49,13 +49,10 @@ belt = /obj/item/storage/belt/utility/full ears = /obj/item/radio/headset/headset_sci l_pocket = /obj/item/modular_computer/pda/roboticist -<<<<<<< HEAD -======= backpack = /obj/item/storage/backpack/science satchel = /obj/item/storage/backpack/satchel/science duffelbag = /obj/item/storage/backpack/duffelbag/science ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pda_slot = ITEM_SLOT_LPOCKET skillchips = list(/obj/item/skillchip/job/roboticist) diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index f2ec6d4c5f5..d0c340156c3 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -5,13 +5,8 @@ auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY department_head = list(JOB_HEAD_OF_SECURITY) faction = FACTION_STATION -<<<<<<< HEAD total_positions = 8 //Handled in /datum/controller/occupations/proc/setup_officer_positions() //SKYRAT EDIT: SET TO 8, WAS 5 spawn_positions = 8 //Handled in /datum/controller/occupations/proc/setup_officer_positions() //SKYRAT EDIT: SEE ABOVE -======= - total_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions() - spawn_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 supervisors = "the Head of Security, and the head of your assigned department (if applicable)" minimal_player_age = 7 exp_requirements = 300 @@ -33,11 +28,7 @@ /datum/job_department/security, ) -<<<<<<< HEAD family_heirlooms = list(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec/peacekeeper) //SKYRAT EDIT ADD - /peacekeeper -======= - family_heirlooms = list(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mail_goodies = list( /obj/item/food/donut/caramel = 10, @@ -69,35 +60,24 @@ GLOBAL_LIST_EMPTY(security_officer_distribution) /datum/job/security_officer/after_roundstart_spawn(mob/living/spawning, client/player_client) . = ..() -<<<<<<< HEAD //SKYRAT EDIT REMOVAL /* if(ishuman(spawning)) setup_department(spawning, player_client) */ //SKYRAT EDIT END -======= - if(ishuman(spawning)) - setup_department(spawning, player_client) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/job/security_officer/after_latejoin_spawn(mob/living/spawning) . = ..() -<<<<<<< HEAD //SKYRAT EDIT REMOVAL /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ishuman(spawning)) var/department = setup_department(spawning, spawning.client) if(department) announce_latejoin(spawning, department, GLOB.security_officer_distribution) -<<<<<<< HEAD */ //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Returns the department this mob was assigned to, if any. @@ -243,22 +223,14 @@ GLOBAL_LIST_EMPTY(security_officer_distribution) suit_store = /obj/item/gun/energy/disabler backpack_contents = list( /obj/item/evidencebag = 1, -<<<<<<< HEAD /obj/item/choice_beacon/security_pistol = 1, //SKYRAT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) belt = /obj/item/modular_computer/pda/security ears = /obj/item/radio/headset/headset_sec/alt gloves = /obj/item/clothing/gloves/color/black/security -<<<<<<< HEAD head = /obj/item/clothing/head/security_garrison //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/head/helmet/sec shoes = /obj/item/clothing/shoes/jackboots/sec glasses = /obj/item/clothing/glasses/hud/security //SKYRAT EDIT - ADDITION -======= - head = /obj/item/clothing/head/helmet/sec - shoes = /obj/item/clothing/shoes/jackboots/sec ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 l_pocket = /obj/item/restraints/handcuffs r_pocket = /obj/item/assembly/flash/handheld diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index c4d7490937d..232af2e89f9 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -40,10 +40,7 @@ /obj/item/flashlight/seclite = 1, /obj/item/knife/combat/survival = 1, /obj/item/mining_voucher = 1, -<<<<<<< HEAD /obj/item/suit_voucher = 1, //SKYRAT EDIT: Suit_Voucher is an addition -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/stack/marker_beacon/ten = 1, /obj/item/t_scanner/adv_mining_scanner/lesser = 1, ) diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 2da00196358..da28b30b22f 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -36,12 +36,8 @@ /obj/item/storage/box/handcuffs = 10, /obj/item/storage/box/teargas = 10, /obj/item/storage/box/flashbangs = 10, -<<<<<<< HEAD - /obj/item/storage/box/rubbershot = 10 -======= /obj/item/storage/box/rubbershot = 10, /obj/item/storage/box/lethalshot = 5 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) rpg_title = "Jailor" job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT @@ -52,11 +48,7 @@ id_trim = /datum/id_trim/job/warden uniform = /obj/item/clothing/under/rank/security/warden -<<<<<<< HEAD suit = /obj/item/clothing/suit/armor/vest/warden //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/suit/armor/vest/warden/alt -======= - suit = /obj/item/clothing/suit/armor/vest/warden/alt ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 suit_store = /obj/item/gun/energy/disabler backpack_contents = list( /obj/item/evidencebag = 1, @@ -65,11 +57,7 @@ ears = /obj/item/radio/headset/headset_sec/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses gloves = /obj/item/clothing/gloves/color/black/security -<<<<<<< HEAD head = /obj/item/clothing/head/hats/warden //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/head/hats/warden/red -======= - head = /obj/item/clothing/head/hats/warden/red ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 shoes = /obj/item/clothing/shoes/jackboots/sec l_pocket = /obj/item/restraints/handcuffs r_pocket = /obj/item/assembly/flash/handheld diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index c7f5b381e47..255210f2481 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -25,7 +25,6 @@ GLOBAL_LIST_INIT(exp_specialmap, list( ROLE_SYNDICATE_DRONE, ROLE_VENUSHUMANTRAP, ROLE_GHOST_ROLE, -<<<<<<< HEAD //Skyrat Edit Start - Custom Ghost roles ROLE_BLACK_MARKET_DEALER, ROLE_DS2, @@ -33,8 +32,6 @@ GLOBAL_LIST_INIT(exp_specialmap, list( ROLE_GHOST_CAFE, ROLE_PORT_TARKON, //Skyrat Edit Start - End Custom Ghost roles -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ), // Ghost roles EXP_TYPE_GHOST = list() // dead people, observers )) diff --git a/code/modules/language/_language_menu.dm b/code/modules/language/_language_menu.dm index cde1dcea441..905be8169e2 100644 --- a/code/modules/language/_language_menu.dm +++ b/code/modules/language/_language_menu.dm @@ -56,11 +56,7 @@ return data -<<<<<<< HEAD -/datum/language_menu/ui_act(action, params) -======= /datum/language_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/language/nekomimetic.dm b/code/modules/language/nekomimetic.dm index ff07b3ea45f..4be943f8441 100644 --- a/code/modules/language/nekomimetic.dm +++ b/code/modules/language/nekomimetic.dm @@ -6,11 +6,7 @@ syllables = list( "neko", "nyan", "mimi", "moe", "mofu", "fuwa", "kyaa", "kawaii", "poka", "munya", "puni", "munyu", "ufufu", "uhuhu", "icha", "doki", "kyun", "kusu", "nya", "nyaa", -<<<<<<< HEAD - "desu", "kis", "ama", "chuu", "baka", "hewo", "boop", "gatto", "kit", "sune", "yori", //SKYRAT EDIT gatto -======= "desu", "kis", "ama", "chuu", "baka", "hewo", "boop", "gato", "kit", "sune", "yori", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sou", "baka", "chan", "san", "kun", "mahou", "yatta", "suki", "usagi", "domo", "ori", "uwa", "zaazaa", "shiku", "puru", "ira", "heto", "etto" ) diff --git a/code/modules/library/bibles.dm b/code/modules/library/bibles.dm index e8f099d3531..0c6a1aad71d 100644 --- a/code/modules/library/bibles.dm +++ b/code/modules/library/bibles.dm @@ -186,11 +186,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list( return FALSE if(!istype(user) || !user.is_holding(src)) return FALSE -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(user.mind?.holy_role != HOLY_ROLE_HIGHPRIEST) return FALSE diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 1f0bbcab208..35def980eb9 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -80,11 +80,7 @@ GLOBAL_VAR_INIT(library_table_modified, 0) data["params_changed"] = params_changed return data -<<<<<<< HEAD -/obj/machinery/computer/libraryconsole/ui_act(action, params) -======= /obj/machinery/computer/libraryconsole/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -428,11 +424,7 @@ GLOBAL_VAR_INIT(library_table_modified, 0) scanner = WEAKREF(foundya) return foundya -<<<<<<< HEAD -/obj/machinery/computer/libraryconsole/bookmanagement/ui_act(action, params) -======= /obj/machinery/computer/libraryconsole/bookmanagement/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //The parent call takes care of stuff like searching, don't forget about that yeah? . = ..() if(.) diff --git a/code/modules/library/skill_learning/generic_skillchips/matrix_flip.dm b/code/modules/library/skill_learning/generic_skillchips/matrix_flip.dm deleted file mode 100644 index a836442eca0..00000000000 --- a/code/modules/library/skill_learning/generic_skillchips/matrix_flip.dm +++ /dev/null @@ -1,40 +0,0 @@ -#define FLIP_STAMINA_COST 19 - -/obj/item/skillchip/matrix_flip - name = "BULLET_DODGER skillchip" - skill_name = "Flip 2 Dodge" - skill_description = "At the cost of stamina, your flips can also be used to dodge incoming projectiles." - skill_icon = FA_ICON_SPINNER - activate_message = span_notice("You feel the urge to flip scenically as if you are the 'Chosen One'.") - deactivate_message = span_notice("The urge to flip goes away.") - -/obj/item/skillchip/matrix_flip/on_activate(mob/living/carbon/user, silent = FALSE) - . = ..() - ADD_TRAIT(user, TRAIT_SLOW_FLIP, SKILLCHIP_TRAIT) - RegisterSignal(user, COMSIG_MOB_EMOTED("flip"), PROC_REF(on_flip)) - RegisterSignal(user, COMSIG_MOB_PRE_EMOTED, PROC_REF(check_if_we_can_flip)) - -/obj/item/skillchip/matrix_flip/on_deactivate(mob/living/carbon/user, silent=FALSE) - REMOVE_TRAIT(user, TRAIT_SLOW_FLIP, SKILLCHIP_TRAIT) - UnregisterSignal(user, list(COMSIG_MOB_EMOTED("flip"), COMSIG_MOB_PRE_EMOTED)) - return ..() - -///Prevent players from stamcritting from INTENTIONAL flips. 1.4s of bullet immunity isn't worth several secs of stun. -/obj/item/skillchip/matrix_flip/proc/check_if_we_can_flip(mob/living/source, key, params, type_override, intentional, datum/emote/emote) - SIGNAL_HANDLER - if(key != "flip" || !intentional) - return - if((source.maxHealth - (source.getStaminaLoss() + FLIP_STAMINA_COST)) <= source.crit_threshold) - source.balloon_alert(source, "too tired!") - return COMPONENT_CANT_EMOTE - -/obj/item/skillchip/matrix_flip/proc/on_flip(mob/living/source) - SIGNAL_HANDLER - if(HAS_TRAIT_FROM(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT)) - return - playsound(source, 'sound/weapons/fwoosh.ogg', 90, FALSE, frequency = 0.7) - ADD_TRAIT(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT) - source.adjustStaminaLoss(FLIP_STAMINA_COST) - addtimer(TRAIT_CALLBACK_REMOVE(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT), FLIP_EMOTE_DURATION * 2) - -#undef FLIP_STAMINA_COST diff --git a/code/modules/library/skill_learning/skill_station.dm b/code/modules/library/skill_learning/skill_station.dm index 046042280d1..2dec45a6abf 100644 --- a/code/modules/library/skill_learning/skill_station.dm +++ b/code/modules/library/skill_learning/skill_station.dm @@ -252,11 +252,7 @@ current_skills += list(skill_chip.get_chip_data()) .["current"] = current_skills -<<<<<<< HEAD -/obj/machinery/skill_station/ui_act(action, list/params) -======= /obj/machinery/skill_station/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index 8bcaef0553f..03e53ff6f8a 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -93,12 +93,8 @@ return FALSE LAZYADD(new_atom_host.light_sources, src) -<<<<<<< HEAD - if(ismovable(new_atom_host) && new_atom_host == source_atom) -======= //yes, we register the signal to the top atom too, this is intentional and ensures contained lighting updates properly if(ismovable(new_atom_host)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(new_atom_host, COMSIG_MOVABLE_MOVED, PROC_REF(update_host_lights)) RegisterSignal(new_atom_host, COMSIG_TURF_NO_LONGER_BLOCK_LIGHT, PROC_REF(force_update)) return TRUE @@ -109,11 +105,7 @@ return FALSE LAZYREMOVE(old_atom_host.light_sources, src) -<<<<<<< HEAD - if(ismovable(old_atom_host) && old_atom_host == source_atom) -======= if(ismovable(old_atom_host)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UnregisterSignal(old_atom_host, COMSIG_MOVABLE_MOVED) UnregisterSignal(old_atom_host, COMSIG_TURF_NO_LONGER_BLOCK_LIGHT) return TRUE diff --git a/code/modules/loadout/categories/accessories.dm b/code/modules/loadout/categories/accessories.dm index 15e6daf8db4..4a180bc3745 100644 --- a/code/modules/loadout/categories/accessories.dm +++ b/code/modules/loadout/categories/accessories.dm @@ -52,17 +52,11 @@ manager.preferences.update_preference(GLOB.preference_entries[/datum/preference/loadout], loadout) return TRUE // Update UI -<<<<<<< HEAD /datum/loadout_item/accessory/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE, loadout_placement_preference) // SKYRAT EDIT CHANGE - Added loadout_placement_preference // SKYRAT EDIT CHANGE if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.accessory) LAZYADD(outfit.backpack_contents, outfit.accessory) // SKYRAT EDIT END -======= -/datum/loadout_item/accessory/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE) - if(outfit.accessory) - LAZYADD(outfit.backpack_contents, outfit.accessory) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 outfit.accessory = item_path /datum/loadout_item/accessory/on_equip_item( diff --git a/code/modules/loadout/categories/glasses.dm b/code/modules/loadout/categories/glasses.dm index 41cdacfc518..75c16e74d45 100644 --- a/code/modules/loadout/categories/glasses.dm +++ b/code/modules/loadout/categories/glasses.dm @@ -8,17 +8,11 @@ /datum/loadout_item/glasses abstract_type = /datum/loadout_item/glasses -<<<<<<< HEAD /datum/loadout_item/glasses/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE, loadout_placement_preference) // SKYRAT EDIT CHANGE - Added loadout_placement // SKYRAT EDIT CHANGE if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.glasses) LAZYADD(outfit.backpack_contents, outfit.glasses) // SKYRAT EDIT END -======= -/datum/loadout_item/glasses/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE) - if(outfit.glasses) - LAZYADD(outfit.backpack_contents, outfit.glasses) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 outfit.glasses = item_path /datum/loadout_item/glasses/prescription_glasses diff --git a/code/modules/loadout/categories/heads.dm b/code/modules/loadout/categories/heads.dm index d542ad940f9..5d491cc63c5 100644 --- a/code/modules/loadout/categories/heads.dm +++ b/code/modules/loadout/categories/heads.dm @@ -8,23 +8,16 @@ /datum/loadout_item/head abstract_type = /datum/loadout_item/head -<<<<<<< HEAD /datum/loadout_item/head/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE, loadout_placement_preference) // SKYRAT EDIT CHANGE - Added loadout_placement_preference -======= -/datum/loadout_item/head/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(equipper.dna?.species?.outfit_important_for_life) if(!visuals_only) to_chat(equipper, "Your loadout helmet was not equipped directly due to your species outfit.") LAZYADD(outfit.backpack_contents, item_path) else -<<<<<<< HEAD // SKYRAT EDIT ADDITION if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.head) LAZYADD(outfit.backpack_contents, outfit.head) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 outfit.head = item_path /datum/loadout_item/head/beanie diff --git a/code/modules/loadout/categories/neck.dm b/code/modules/loadout/categories/neck.dm index 986cb9ba0c2..04a42a19da1 100644 --- a/code/modules/loadout/categories/neck.dm +++ b/code/modules/loadout/categories/neck.dm @@ -8,17 +8,12 @@ /datum/loadout_item/neck abstract_type = /datum/loadout_item/neck -<<<<<<< HEAD /datum/loadout_item/neck/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE, loadout_placement_preference) // SKYRAT EDIT CHANGE if(loadout_placement_preference != LOADOUT_OVERRIDE_JOB && outfit.neck) LAZYADD(outfit.backpack_contents, outfit.neck) outfit.neck = item_path // SKYRAT EDIT END -======= -/datum/loadout_item/neck/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE) - outfit.neck = item_path ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/loadout_item/neck/scarf_greyscale name = "Scarf (Colorable)" diff --git a/code/modules/loadout/categories/pocket.dm b/code/modules/loadout/categories/pocket.dm index b8a4a812747..2689c2b726e 100644 --- a/code/modules/loadout/categories/pocket.dm +++ b/code/modules/loadout/categories/pocket.dm @@ -79,11 +79,7 @@ name = "Lipstick (White)" item_path = /obj/item/lipstick/white additional_displayed_text = list("White") -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/loadout_item/pocket_items/plush abstract_type = /datum/loadout_item/pocket_items/plush can_be_named = TRUE @@ -197,7 +193,4 @@ /datum/loadout_item/pocket_items/d00 name = "D00" item_path = /obj/item/dice/d00 -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/loadout/loadout_categories.dm b/code/modules/loadout/loadout_categories.dm index 3991103902a..c64a564b2ec 100644 --- a/code/modules/loadout/loadout_categories.dm +++ b/code/modules/loadout/loadout_categories.dm @@ -40,12 +40,9 @@ if(found_type == initial(found_type.abstract_type)) continue -<<<<<<< HEAD if(!initial(found_type.item_path)) // SKYRAT EDIT ADDITION continue -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!ispath(initial(found_type.item_path), /obj/item)) stack_trace("Loadout get_items(): Attempted to instantiate a loadout item ([found_type]) with an invalid or null typepath! (got path: [initial(found_type.item_path)])") continue diff --git a/code/modules/loadout/loadout_helpers.dm b/code/modules/loadout/loadout_helpers.dm index fafb6c1e8f9..b5bd890c874 100644 --- a/code/modules/loadout/loadout_helpers.dm +++ b/code/modules/loadout/loadout_helpers.dm @@ -15,12 +15,8 @@ datum/outfit/outfit = /datum/outfit, datum/preferences/preference_source, visuals_only = FALSE, -<<<<<<< HEAD datum/job/equipping, ) // SKYRAT EDIT CHANGE - Added equipping param -======= -) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(preference_source)) return equipOutfit(outfit, visuals_only) @@ -34,12 +30,11 @@ var/list/preference_list = preference_source.read_preference(/datum/preference/loadout) var/list/loadout_datums = loadout_list_to_datums(preference_list) -<<<<<<< HEAD - var/obj/item/storage/briefcase/empty/travel_suitcase // SKYRAT EDIT ADDITIONi + // SKYRAT EDIT ADDITION BEGIN + var/obj/item/storage/briefcase/empty/travel_suitcase var/loadout_placement_preference = preference_source.read_preference(/datum/preference/choiced/loadout_override_preference) // Slap our things into the outfit given for(var/datum/loadout_item/item as anything in loadout_datums) - // SKYRAT EDIT ADDITION if(item.restricted_roles && equipping && !(equipping.title in item.restricted_roles)) if(preference_source.parent) to_chat(preference_source.parent, span_warning("You were unable to get a loadout item([initial(item.item_path.name)]) due to job restrictions!")) @@ -76,15 +71,6 @@ // SKYRAT EDIT END // Handle any snowflake on_equips. -======= - // Slap our things into the outfit given - for(var/datum/loadout_item/item as anything in loadout_datums) - item.insert_path_into_outfit(equipped_outfit, src, visuals_only) - // Equip the outfit loadout items included - if(!equipped_outfit.equip(src, visuals_only)) - return FALSE - // Handle any snowflake on_equips ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/new_contents = get_all_gear() var/update = NONE for(var/datum/loadout_item/item as anything in loadout_datums) @@ -127,7 +113,6 @@ datums += actual_datum return datums -<<<<<<< HEAD // SKYRAT EDIT ADDITION /* @@ -155,5 +140,3 @@ /obj/item/storage/briefcase/empty/PopulateContents() return // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/loadout/loadout_items.dm b/code/modules/loadout/loadout_items.dm index 370eb735775..2855d0cbf4a 100644 --- a/code/modules/loadout/loadout_items.dm +++ b/code/modules/loadout/loadout_items.dm @@ -42,11 +42,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) var/can_be_greyscale = FALSE /// Whether this item can be renamed. /// I recommend you apply this sparingly becuase it certainly can go wrong (or get reset / overridden easily) -<<<<<<< HEAD var/can_be_named = TRUE // SKYRAT EDIT -======= - var/can_be_named = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Whether this item can be reskinned. /// Only works if the item has a "unique reskin" list set. var/can_be_reskinned = FALSE @@ -65,7 +61,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) /// Reskin options of this item if it can be reskinned. VAR_FINAL/list/cached_reskin_options -<<<<<<< HEAD //SKYRAT EDIT ADDITION /// If set, it's a list containing ckeys which only can get the item var/list/ckeywhitelist @@ -83,8 +78,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) var/erp_item = FALSE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/loadout_item/New(category) src.category = category @@ -109,7 +102,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) cached_reskin_options = dummy_item.unique_reskin.Copy() qdel(dummy_item) -<<<<<<< HEAD // SKYRAT EDIT ADDITION // Let's sanitize in case somebody inserted the player's byond name instead of ckey in canonical form if(ckeywhitelist) @@ -117,8 +109,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) ckeywhitelist[i] = ckey(ckeywhitelist[i]) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/loadout_item/Destroy(force, ...) if(force) stack_trace("QDEL called on loadout item [type]. This shouldn't ever happen. (Use FORCE if necessary.)") @@ -144,7 +134,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) if("set_name") if(can_be_named) -<<<<<<< HEAD // SKYRAT EDIT BEGIN - Description return set_name(manager, user, INFO_NAMED) @@ -152,9 +141,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) if(can_be_named) return set_name(manager, user, INFO_DESCRIBED) // SKYRAT EDIT END -======= - return set_name(manager, user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("set_skin") return set_skin(manager, user, params) @@ -209,7 +195,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) return TRUE // update UI /// Sets the name of the item. -<<<<<<< HEAD // SKYRAT EDIT BEGIN - Adds descriptions with minimal copypaste // Generally, if this conflicts, name_slot is to be put anywhere where INFO_NAMED appears in tgcode /datum/loadout_item/proc/set_name(datum/preference_middleware/loadout/manager, mob/user, name_slot = INFO_NAMED) @@ -221,16 +206,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) title = "[name] [isname ? "name" : "description"]", default = loadout?[item_path]?[name_slot], // plop in existing name (if any) max_length = isname ? MAX_NAME_LEN : MAX_DESC_LEN, -======= -/datum/loadout_item/proc/set_name(datum/preference_middleware/loadout/manager, mob/user) - var/list/loadout = manager.preferences.read_preference(/datum/preference/loadout) - var/input_name = tgui_input_text( - user = user, - message = "What name do you want to give the [name]? Leave blank to clear.", - title = "[name] name", - default = loadout?[item_path]?[INFO_NAMED], // plop in existing name (if any) - max_length = MAX_NAME_LEN, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) if(QDELETED(src) || QDELETED(user) || QDELETED(manager) || QDELETED(manager.preferences)) return FALSE @@ -240,7 +215,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) return FALSE if(input_name) -<<<<<<< HEAD loadout[item_path][name_slot] = input_name else if(input_name == "") loadout[item_path] -= name_slot @@ -248,14 +222,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) manager.preferences.update_preference(GLOB.preference_entries[/datum/preference/loadout], loadout) return FALSE // no update needed // SKYRAT EDIT END -======= - loadout[item_path][INFO_NAMED] = input_name - else if(input_name == "") - loadout[item_path] -= INFO_NAMED - - manager.preferences.update_preference(GLOB.preference_entries[/datum/preference/loadout], loadout) - return FALSE // no update needed ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Used for reskinning an item to an alt skin. /datum/loadout_item/proc/set_skin(datum/preference_middleware/loadout/manager, mob/user, params) @@ -284,11 +250,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) * * equipper - If we're equipping out outfit onto a mob at the time, this is the mob it is equipped on. Can be null. * * visual - If TRUE, then our outfit is only for visual use (for example, a preview). */ -<<<<<<< HEAD /datum/loadout_item/proc/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE, loadout_placement_preference) // SKYRAT EDIT CHANGE - Added loadout_placement_preference -======= -/datum/loadout_item/proc/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!visuals_only) LAZYADD(outfit.backpack_contents, item_path) @@ -324,7 +286,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) equipped_item.set_greyscale(item_details[INFO_GREYSCALE]) update_flag |= equipped_item.slot_flags -<<<<<<< HEAD // SKYRAT EDIT BEGIN - DESCRIPTIONS~ if(can_be_named && !visuals_only) var/renamed = 0 @@ -337,11 +298,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) if(renamed) ADD_TRAIT(equipped_item, TRAIT_WAS_RENAMED, "Loadout") // SKYRAT EDIT END -======= - if(can_be_named && item_details?[INFO_NAMED] && !visuals_only) - equipped_item.name = trim(item_details[INFO_NAMED], PREVENT_CHARACTER_TRIM_LOSS(MAX_NAME_LEN)) - ADD_TRAIT(equipped_item, TRAIT_WAS_RENAMED, "Loadout") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(can_be_reskinned && item_details?[INFO_RESKIN]) var/skin_chosen = item_details[INFO_RESKIN] @@ -378,7 +334,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) formatted_item["reskins"] = get_reskin_options() formatted_item["icon"] = ui_icon formatted_item["icon_state"] = ui_icon_state -<<<<<<< HEAD // SKYRAT EDIT BEGIN - Extra loadout stuff formatted_item["ckey_whitelist"] = ckeywhitelist @@ -387,8 +342,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) formatted_item["blacklisted_roles"] = restricted_roles // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return formatted_item /** @@ -412,7 +365,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) if(can_be_reskinned) displayed_text += "Reskinnable" -<<<<<<< HEAD // SKYRAT EDIT ADDITION if(donator_only) displayed_text += "Donator only" @@ -426,8 +378,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) if(restricted_species) displayed_text += "Species restricted" // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return displayed_text /** @@ -463,7 +413,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) "button_icon" = FA_ICON_PEN, "active_key" = INFO_NAMED, )) -<<<<<<< HEAD // SKYRAT EDIT BEGIN - Descriptions UNTYPED_LIST_ADD(button_list, list( "label" = "Change description", @@ -472,9 +421,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) "active_key" = INFO_NAMED, )) // SKYRAT EDIT END -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return button_list /** @@ -494,7 +440,3 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) )) return reskins -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/loadout/loadout_menu.dm b/code/modules/loadout/loadout_menu.dm index 51bae16e8ba..0fdbe81ee81 100644 --- a/code/modules/loadout/loadout_menu.dm +++ b/code/modules/loadout/loadout_menu.dm @@ -73,7 +73,6 @@ continue if(!item.category.handle_duplicate_entires(src, item, selected_item, loadout_datums)) return -<<<<<<< HEAD // SKYRAT EDIT ADDITION if(!isnull(selected_item.ckeywhitelist) && !(preferences?.parent?.ckey in selected_item.ckeywhitelist)) to_chat(preferences.parent, span_warning("You cannot select this item!")) @@ -83,8 +82,6 @@ to_chat(preferences.parent, span_warning("This item is for donators only.")) return // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LAZYSET(loadout, selected_item.item_path, list()) preferences.update_preference(GLOB.preference_entries[/datum/preference/loadout], loadout) @@ -114,14 +111,11 @@ /datum/preference_middleware/loadout/get_ui_static_data(mob/user) var/list/data = list() data["loadout_preview_view"] = preferences.character_preview_view.assigned_map -<<<<<<< HEAD // SKYRAT EDIT START - EXPANDED LOADOUT data["ckey"] = user.ckey if(SSplayer_ranks.is_donator(user.client)) data["is_donator"] = TRUE // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return data /datum/preference_middleware/loadout/get_constant_data() diff --git a/code/modules/loadout/loadout_preference.dm b/code/modules/loadout/loadout_preference.dm index 7d4b41632ab..739226f5da7 100644 --- a/code/modules/loadout/loadout_preference.dm +++ b/code/modules/loadout/loadout_preference.dm @@ -16,11 +16,7 @@ // Sanitize on load to ensure no invalid paths from older saves get in /datum/preference/loadout/deserialize(input, datum/preferences/preferences) -<<<<<<< HEAD return sanitize_loadout_list(input, preferences.parent?.mob, preferences.parent) // SKYRAT EDIT CHANGE parent -======= - return sanitize_loadout_list(input, preferences.parent?.mob) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Default value is null - the loadout list is a lazylist /datum/preference/loadout/create_default_value(datum/preferences/preferences) @@ -35,11 +31,7 @@ * * Returns a list, or null if empty */ -<<<<<<< HEAD /datum/preference/loadout/proc/sanitize_loadout_list(list/passed_list, mob/optional_loadout_owner, client/owner_client) as /list // SKYRAT EDIT CHANGE - client/owner_client -======= -/datum/preference/loadout/proc/sanitize_loadout_list(list/passed_list, mob/optional_loadout_owner) as /list ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/sanitized_list for(var/path in passed_list) // Loading from json has each path in the list as a string that we need to convert back to typepath @@ -60,7 +52,6 @@ You may want to check your loadout settings.")) continue -<<<<<<< HEAD // SKYRAT EDIT ADDITION else if(owner_client) var/datum/loadout_item/loadout_item = GLOB.all_loadout_datums[real_path] @@ -70,8 +61,6 @@ continue // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Set into sanitize list using converted path key var/list/data = passed_list[path] LAZYSET(sanitized_list, real_path, LAZYLISTDUPLICATE(data)) diff --git a/code/modules/logging/log_holder.dm b/code/modules/logging/log_holder.dm index c727344a80b..85a436076c8 100644 --- a/code/modules/logging/log_holder.dm +++ b/code/modules/logging/log_holder.dm @@ -337,11 +337,7 @@ ADMIN_VERB(log_viewer_new, R_ADMIN|R_DEBUG, "View Round Logs", "View the rounds var/datum/data = data_list[key] if(isnull(data)) -<<<<<<< HEAD - // do nothing - nulls are allowed -======= pass() // nulls are allowed ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(islist(data)) data = recursive_jsonify(data, semvers) diff --git a/code/modules/lootpanel/_lootpanel.dm b/code/modules/lootpanel/_lootpanel.dm index 23133b4f720..ab13a7c2116 100644 --- a/code/modules/lootpanel/_lootpanel.dm +++ b/code/modules/lootpanel/_lootpanel.dm @@ -56,21 +56,13 @@ /datum/lootpanel/ui_status(mob/user, datum/ui_state/state) -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return UI_DISABLED return UI_INTERACTIVE -<<<<<<< HEAD -/datum/lootpanel/ui_act(action, list/params) -======= /datum/lootpanel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mapfluff/ruins/icemoonruin_code/hotsprings.dm b/code/modules/mapfluff/ruins/icemoonruin_code/hotsprings.dm index 0af10ad49ae..f0368ba8c74 100644 --- a/code/modules/mapfluff/ruins/icemoonruin_code/hotsprings.dm +++ b/code/modules/mapfluff/ruins/icemoonruin_code/hotsprings.dm @@ -14,12 +14,7 @@ baseturfs = /turf/open/water/cursed_spring planetary_atmos = TRUE initial_gas_mix = ICEMOON_DEFAULT_ATMOS -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL -======= - fishing_datum = /datum/fish_source/cursed_spring - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /turf/open/water/cursed_spring/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if(!isliving(arrived)) @@ -44,7 +39,4 @@ var/turf/return_turf = find_safe_turf(extended_safety_checks = TRUE, dense_atoms = FALSE) transformed_mob.forceMove(return_turf) to_chat(transformed_mob, span_notice("You blink and find yourself in [get_area_name(return_turf)].")) -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm index a6025f8a9c4..646de6a2186 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm @@ -161,11 +161,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) /obj/structure/necropolis_gate/legion_gate/attack_hand(mob/user, list/modifiers) if(!open && !changing_openness) var/safety = tgui_alert(user, "You think this might be a bad idea...", "Knock on the door?", list("Proceed", "Abort")) -<<<<<<< HEAD - if(safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated()) -======= if(safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return user.visible_message(span_warning("[user] knocks on [src]..."), span_boldannounce("You tentatively knock on [src]...")) playsound(user.loc, 'sound/effects/shieldbash.ogg', 100, TRUE) diff --git a/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm b/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm index 1085caeeaa9..8be91920719 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm @@ -140,11 +140,7 @@ ui = new(user, src, "VaultController", name) ui.open() -<<<<<<< HEAD -/obj/machinery/computer/vaultcontroller/ui_act(action, params) -======= /obj/machinery/computer/vaultcontroller/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm index 123a9f8527f..1181dcb93a1 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm @@ -8,7 +8,6 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) icon_state = "hilbertshotel" w_class = WEIGHT_CLASS_SMALL resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF -<<<<<<< HEAD //SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE + EXTRA STUFF var/list/static/hotel_maps = list("Generic", "Apartment", "Beach Condo", "Station Side", "Library") //standart - hilber's hotel room @@ -21,8 +20,6 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) var/datum/map_template/ghost_cafe_rooms/library/ghost_cafe_rooms_library //Skyrat EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/map_template/hilbertshotel/hotelRoomTemp var/datum/map_template/hilbertshotel/empty/hotelRoomTempEmpty var/datum/map_template/hilbertshotel/lore/hotelRoomTempLore @@ -41,7 +38,6 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) hotelRoomTemp = new() hotelRoomTempEmpty = new() hotelRoomTempLore = new() -<<<<<<< HEAD //SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE ghost_cafe_rooms_apartment = new() ghost_cafe_rooms_beach_condo = new() @@ -49,8 +45,6 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) ghost_cafe_rooms_library = new() //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/area/currentArea = get_area(src) if(currentArea.type == /area/ruin/space/has_grav/powered/hilbertresearchfacility/secretroom) ruinSpawned = TRUE @@ -97,20 +91,12 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) to_chat(target, span_warning("You too far away from \the [src] to enter it!")) // If the target is incapacitated after selecting a room, they're not allowed to teleport. -<<<<<<< HEAD - if(target.incapacitated()) + if(target.incapacitated) to_chat(target, span_warning("You aren't able to activate \the [src] anymore!")) // Has the user thrown it away or otherwise disposed of it such that it's no longer in their hands or in some storage connected to them? // if(!(get_atom_on_turf(src, /mob) == user)) SKYRAT EDIT ORIGINAL if(!Adjacent(user)) // SKYRAT EDIT -- Ghost Cafe Static Hilbertspawner -======= - if(target.incapacitated) - to_chat(target, span_warning("You aren't able to activate \the [src] anymore!")) - - // Has the user thrown it away or otherwise disposed of it such that it's no longer in their hands or in some storage connected to them? - if(!(get_atom_on_turf(src, /mob) == user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(user == target) to_chat(user, span_warning("\The [src] is no longer in your possession!")) else @@ -128,14 +114,11 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) else if(!user.dropItemToGround(src)) to_chat(user, span_warning("You can't seem to drop \the [src]! It must be stuck to your hand somehow! Prepare for unforeseen consequences...")) -<<<<<<< HEAD //SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE var/chosen_room = "Nothing" if(istype(src, /obj/item/hilbertshotel/ghostdojo)) //to don't add another one var chosen_room = tgui_input_list(user, "Choose desired room:", "Time to choose", hotel_maps) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!storageTurf) //Blame subsystems for not allowing this to be in Initialize if(!GLOB.hhStorageTurf) var/datum/map_template/hilbertshotelstorage/storageTemp = new() @@ -149,11 +132,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) return if(tryStoredRoom(chosenRoomNumber, target)) return -<<<<<<< HEAD sendToNewRoom(chosenRoomNumber, target, chosen_room) //SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE. Was sendToNewRoom(chosenRoomNumber, target) -======= - sendToNewRoom(chosenRoomNumber, target) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/hilbertshotel/proc/tryActiveRoom(roomNumber, mob/user) if(activeRooms["[roomNumber]"]) @@ -199,24 +178,14 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) return TRUE return FALSE -<<<<<<< HEAD /obj/item/hilbertshotel/proc/sendToNewRoom(roomNumber, mob/user, chosen_room) //SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE. Was sendToNewRoom(roomNumber, mob/user) -======= -/obj/item/hilbertshotel/proc/sendToNewRoom(roomNumber, mob/user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/turf_reservation/roomReservation = SSmapping.request_turf_block_reservation(hotelRoomTemp.width, hotelRoomTemp.height, 1) var/turf/bottom_left = roomReservation.bottom_left_turfs[1] var/datum/map_template/load_from = hotelRoomTemp if(ruinSpawned && roomNumber == GLOB.hhMysteryRoomNumber) load_from = hotelRoomTempLore -<<<<<<< HEAD //SKYRAT EDIT ADDITION START - GHOST HOTEL UPDATE - //else if(chosen_room == "Apartment") - // load_from = ghost_cafe_rooms_apartment - //SKYRAT EDIT ADDITION END - - //BUBBER EDIT ADDITION START - GHOST HOTEL UPDATE else if(chosen_room == "Apartment") load_from = ghost_cafe_rooms_apartment @@ -227,9 +196,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) load_from = ghost_cafe_rooms_stationside else if(chosen_room == "Library") load_from = ghost_cafe_rooms_library - //BUBBER EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + //SKYRAT EDIT ADDITION END load_from.load(bottom_left) activeRooms["[roomNumber]"] = roomReservation @@ -465,13 +432,9 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) has_gravity = TRUE area_flags = NOTELEPORT | HIDDEN_AREA static_lighting = TRUE -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - GHOST HOTEL UPDATE ambientsounds = list('sound/ambience/servicebell.ogg') SKYRAT EDIT END */ -======= - ambientsounds = list('sound/ambience/servicebell.ogg') ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/roomnumber = 0 var/obj/item/hilbertshotel/parentSphere var/datum/turf_reservation/reservation diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm index 0f559193fca..950f3e2809e 100644 --- a/code/modules/mapping/map_template.dm +++ b/code/modules/mapping/map_template.dm @@ -167,10 +167,6 @@ // Cache for sonic speed var/list/to_rebuild = SSair.adjacent_rebuild -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // iterate over turfs in the border and clear them from active atmos processing for(var/turf/border_turf as anything in CORNER_BLOCK_OFFSET(T, width + 2, height + 2, -1, -1)) SSair.remove_from_active(border_turf) diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 72033371a11..82cdaffa714 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -133,11 +133,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) return FALSE return TRUE -<<<<<<< HEAD -/obj/machinery/computer/auxiliary_base/ui_act(action, params) -======= /obj/machinery/computer/auxiliary_base/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mining/boulder_processing/boulder.dm b/code/modules/mining/boulder_processing/boulder.dm index 5e637fd94e6..342afe8abe5 100644 --- a/code/modules/mining/boulder_processing/boulder.dm +++ b/code/modules/mining/boulder_processing/boulder.dm @@ -107,10 +107,7 @@ * @param override_speed_multiplier The speed multiplier to use if weapon is null. The do_after will take 2 * this value seconds to complete. * @param continued Whether or not this is a continued process, or the first one. If true, we don't play the "You swing at the boulder" message. */ -<<<<<<< HEAD /* SKYRAT EDIT OVERRIDE! Check the module:mining boulder.dm! -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/boulder/proc/manual_process(obj/item/weapon, mob/living/user, override_speed_multiplier, continued = FALSE) var/process_speed = 0 //Handle weapon conditions. @@ -153,11 +150,7 @@ var/msg = (durability == 1 ? "is crumbling!" : "looks weaker!") to_chat(user, span_notice("\The [src] [msg]")) manual_process(weapon, user, override_speed_multiplier, continued = TRUE) -<<<<<<< HEAD */ -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * This function is called while breaking boulders manually, and drops ore based on the boulder's mineral content. * Quantity of ore spawned here is 1 less than if the boulder was processed by a machine, but clamped at 10 maximum, 1 minimum. diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index adcb68d36e7..62f4924aa65 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -1,7 +1,4 @@ -<<<<<<< HEAD /* SKYRAT EDIT START - OVERRIDEN IN modular_skyrat/master_files/code/modules/mining/equipment/kinetic_crusher.dm -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Kinetic Crusher * @@ -232,11 +229,8 @@ new /obj/effect/temp_visual/kinetic_blast(hit_mineral) hit_mineral.gets_drilled(firer) return ..() -<<<<<<< HEAD */ //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //trophies /obj/item/crusher_trophy diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 627a3df64fa..0685dda148d 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -285,11 +285,7 @@ /obj/item/trench_tool/proc/check_menu(mob/user) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated() || !user.Adjacent(src)) -======= if(user.incapacitated || !user.Adjacent(src)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/mining/equipment/monster_organs/monster_organ.dm b/code/modules/mining/equipment/monster_organs/monster_organ.dm index 8484ec62a93..3dda7380aef 100644 --- a/code/modules/mining/equipment/monster_organs/monster_organ.dm +++ b/code/modules/mining/equipment/monster_organs/monster_organ.dm @@ -36,11 +36,6 @@ icon = 'icons/obj/medical/organs/mining_organs.dmi' icon_state = "hivelord_core" actions_types = list(/datum/action/cooldown/monster_core_action) -<<<<<<< HEAD - visual = FALSE -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_flags = NOBLUDGEON slot = ORGAN_SLOT_MONSTER_CORE organ_flags = ORGAN_ORGANIC @@ -70,16 +65,9 @@ deltimer(decay_timer) return ..() -<<<<<<< HEAD -/obj/item/organ/internal/monster_core/Insert(mob/living/carbon/target_carbon, special = FALSE, movement_flags) - . = ..() - if(!.) - return -======= /obj/item/organ/internal/monster_core/mob_insert(mob/living/carbon/target_carbon, special = FALSE, movement_flags) . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (inert) to_chat(target_carbon, span_notice("[src] breaks down as you try to insert it.")) qdel(src) @@ -90,11 +78,7 @@ target_carbon.visible_message(span_notice("[src] stabilizes as it's inserted.")) return TRUE -<<<<<<< HEAD -/obj/item/organ/internal/monster_core/Remove(mob/living/carbon/target_carbon, special, movement_flags) -======= /obj/item/organ/internal/monster_core/mob_remove(mob/living/carbon/target_carbon, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!inert && !special) owner.visible_message(span_notice("[src] rapidly decays as it's removed.")) go_inert() diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 8a06247f800..ee700e3d977 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -68,11 +68,7 @@ data["can_go_home"] = can_go_home return data -<<<<<<< HEAD -/obj/machinery/mineral/labor_claim_console/ui_act(action, params) -======= /obj/machinery/mineral/labor_claim_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index c4f62df1b17..768427f530a 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -197,12 +197,9 @@ pixel_y = base_pixel_y + rand(-4, 4) /obj/item/food/grown/ash_flora/shavings //So we can't craft bowls from everything. -<<<<<<< HEAD special_desc_requirement = EXAMINE_CHECK_JOB //SKYRAT EDIT special_desc_jobs = list("Botanist") //SKYRAT EDIT special_desc = "You feel this flora would be unwise to consume while already full." //SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 grind_results = list(/datum/reagent/toxin/mushroom_powder = 5) /obj/item/food/grown/ash_flora/mushroom_leaf @@ -423,19 +420,3 @@ if(!reagents.total_volume) icon_state = "mushroom_bowl" return ..() -<<<<<<< HEAD - -/obj/item/reagent_containers/cup/bowl/wood_bowl - name = "wooden bowl" - desc = "A bowl made out of wood. Primitive, but effective." - icon = 'icons/obj/mining_zones/ash_flora.dmi' - icon_state = "wood_bowl" - fill_icon_state = "fullbowl" - fill_icon = 'icons/obj/mining_zones/ash_flora.dmi' - -/obj/item/reagent_containers/cup/bowl/mushroom_bowl/update_icon_state() - if(!reagents.total_volume) - icon_state = "wood_bowl" - return ..() -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm index bb72cce8565..2c0f7c85bf7 100644 --- a/code/modules/mining/lavaland/megafauna_loot.dm +++ b/code/modules/mining/lavaland/megafauna_loot.dm @@ -274,10 +274,7 @@ greyscale_colors = "#4d4d4d#808080" greyscale_config = /datum/greyscale_config/heck_suit greyscale_config_worn = /datum/greyscale_config/heck_suit/worn -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/heck_suit/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 flags_1 = IS_PLAYER_COLORABLE_1 /datum/armor/hooded_hostile_environment @@ -326,10 +323,7 @@ greyscale_colors = "#4d4d4d#808080#ff3300" greyscale_config = /datum/greyscale_config/heck_helmet greyscale_config_worn = /datum/greyscale_config/heck_helmet/worn -<<<<<<< HEAD greyscale_config_worn_digi = /datum/greyscale_config/heck_helmet/worn/snouted //SKYRAT EDIT ADDITION - MuzzledGreyscale (Why does this use worn_digi) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/head/hooded/hostile_environment/Initialize(mapload) @@ -752,11 +746,7 @@ return var/mob/living/carbon/human/consumer = user -<<<<<<< HEAD var/random = rand(2,4) //SKYRAT EDIT - Commenting out #1 because it makes people invisible. -======= - var/random = rand(1,4) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(random) if(1) diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index 3748a9b09d7..8aeceaf6916 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -557,10 +557,6 @@ var/obj/item/organ/external/wings/functional/wings = get_wing_choice(exposed_human, chest) wings = new wings() wings.Insert(exposed_human) -<<<<<<< HEAD - exposed_human.dna.species.handle_mutant_bodyparts(exposed_human) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 playsound(exposed_human.loc, 'sound/items/poster_ripped.ogg', 50, TRUE, -1) exposed_human.apply_damage(20, def_zone = BODY_ZONE_CHEST, forced = TRUE, wound_bonus = CANT_WOUND) exposed_human.emote("scream") @@ -573,11 +569,7 @@ var/list/name2type = list() for(var/obj/item/organ/external/wings/functional/possible_type as anything in wing_types) var/datum/sprite_accessory/accessory = initial(possible_type.sprite_accessory_override) //get the type -<<<<<<< HEAD accessory = SSaccessories.sprite_accessories[initial(accessory.key)][initial(accessory.name)] //SKYRAT EDIT CHANGE - ORIGINAL: accessory = SSaccessories.wings_list[initial(accessory.name)] //get the singleton instance -======= - accessory = SSaccessories.wings_list[initial(accessory.name)] //get the singleton instance ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/image/img = image(icon = accessory.icon, icon_state = "m_wingsopen_[accessory.icon_state]_BEHIND") //Process the HUD elements img.transform *= 0.5 img.pixel_x = -32 @@ -602,17 +594,10 @@ var/turf/T = get_turf(src) var/ladder_x = T.x var/ladder_y = T.y -<<<<<<< HEAD - to_chat(user, span_notice("You unfold the ladder. It does some unknowable, eldritch twisting and turning in a dance of form, seeming to invert and fold into itself - before a satisfying click rings out.")) //Skyrat Edit - Attempts to explain why it sometimes just 'dissapears' on some z-levels. - var/last_ladder = null - for(var/i in 1 to world.maxz) - if(is_centcom_level(i) || is_reserved_level(i) || is_away_level(i) || is_spaceruins_level(i)) //Skyrat Edit: Stops Jacob's ladder from piercing problematic space ruins. -======= to_chat(user, span_notice("You unfold the ladder. It extends much farther than you were expecting.")) var/last_ladder = null for(var/i in 1 to world.maxz) if(is_centcom_level(i) || is_reserved_level(i) || is_away_level(i)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue var/turf/T2 = locate(ladder_x, ladder_y, i) last_ladder = new /obj/structure/ladder/unbreakable/jacob(T2, null, last_ladder) @@ -685,10 +670,7 @@ icon_state = "berserker" icon = 'icons/obj/clothing/suits/armor.dmi' worn_icon = 'icons/mob/clothing/suits/armor.dmi' -<<<<<<< HEAD worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi' -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hoodtype = /obj/item/clothing/head/hooded/berserker armor_type = /datum/armor/hooded_berserker cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 9e64f192aba..d0c63bd3b7a 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -94,11 +94,7 @@ /obj/machinery/mineral/processing_unit_console/ui_data(mob/user) return processing_machine.ui_data() -<<<<<<< HEAD -/obj/machinery/mineral/processing_unit_console/ui_act(action, list/params) -======= /obj/machinery/mineral/processing_unit_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index af76de7020d..312acb66720 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -297,11 +297,7 @@ return data -<<<<<<< HEAD -/obj/machinery/mineral/ore_redemption/ui_act(action, params) -======= /obj/machinery/mineral/ore_redemption/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm index 26299d0f36f..7fe2e9468f1 100644 --- a/code/modules/mining/machine_silo.dm +++ b/code/modules/mining/machine_silo.dm @@ -143,11 +143,7 @@ return data -<<<<<<< HEAD -/obj/machinery/ore_silo/ui_act(action, list/params) -======= /obj/machinery/ore_silo/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 68ee9be3699..1c250b57866 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -62,11 +62,7 @@ )) return data -<<<<<<< HEAD -/obj/machinery/mineral/stacking_unit_console/ui_act(action, list/params) -======= /obj/machinery/mineral/stacking_unit_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 21ad7a1d25f..53fd78cf94d 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -94,11 +94,7 @@ desc = "Used to call and send the mining shuttle." circuit = /obj/item/circuitboard/computer/mining_shuttle shuttleId = "mining" -<<<<<<< HEAD - possible_destinations = "mining_home;mining_away;landing_zone_dock" -======= possible_destinations = "mining_home;mining_away;landing_zone_dock;mining_public" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 no_destination_swap = TRUE //ATTACK HAND IGNORING PARENT RETURN VALUE diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 80f999c9437..7ad08083df3 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -517,11 +517,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ playsound(user.loc, 'sound/items/coinflip.ogg', 50, TRUE) var/oldloc = loc sleep(1.5 SECONDS) -<<<<<<< HEAD - if(loc == oldloc && user && !user.incapacitated()) -======= if(loc == oldloc && user && !user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.visible_message(span_notice("[user] flips [src]. It lands on [coinflip]."), \ span_notice("You flip [src]. It lands on [coinflip]."), \ span_hear("You hear the clattering of loose change.")) @@ -603,11 +599,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ playsound(user.loc, 'sound/items/coinflip.ogg', 50, TRUE) var/oldloc = loc sleep(1.5 SECONDS) -<<<<<<< HEAD - if(loc == oldloc && user && !user.incapacitated()) -======= if(loc == oldloc && user && !user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 user.visible_message(span_notice("[user] flips [src]. It lands on [coinflip]."), \ span_notice("You flip [src]. It lands on [coinflip]."), \ span_hear("You hear the clattering of loose change.")) diff --git a/code/modules/mining/satchel_ore_box.dm b/code/modules/mining/satchel_ore_box.dm index 6554955dd8a..94be35108d0 100644 --- a/code/modules/mining/satchel_ore_box.dm +++ b/code/modules/mining/satchel_ore_box.dm @@ -95,11 +95,7 @@ return list("materials" = materials) -<<<<<<< HEAD -/obj/structure/ore_box/ui_act(action, params) -======= /obj/structure/ore_box/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mob/dead/new_player/latejoin_menu.dm b/code/modules/mob/dead/new_player/latejoin_menu.dm index 6cd1e76fa41..b01e45c4d33 100644 --- a/code/modules/mob/dead/new_player/latejoin_menu.dm +++ b/code/modules/mob/dead/new_player/latejoin_menu.dm @@ -35,11 +35,7 @@ GLOBAL_DATUM_INIT(latejoin_menu, /datum/latejoin_menu, new) ui.open() /datum/latejoin_menu/proc/scream_at_player(mob/dead/new_player/player) -<<<<<<< HEAD - if(istype(player) && !player.jobs_menu_mounted) -======= if(!player.jobs_menu_mounted) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(player, span_notice("If the late join menu isn't showing, hold CTRL while clicking the join button!")) /datum/latejoin_menu/ui_data(mob/user) @@ -157,7 +153,6 @@ GLOBAL_DATUM_INIT(latejoin_menu, /datum/latejoin_menu, new) tgui_alert(owner, "There is an administrative lock on entering the game for non-observers!", "Oh No!") return TRUE -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Flavourtext requirement if(CONFIG_GET(flag/min_flavor_text)) if(length_char(owner.client.prefs.read_preference(/datum/preference/text/flavor_text)) < CONFIG_GET(number/flavor_text_character_requirement)) @@ -165,8 +160,6 @@ GLOBAL_DATUM_INIT(latejoin_menu, /datum/latejoin_menu, new) return // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Determines Relevent Population Cap var/relevant_cap var/hard_popcap = CONFIG_GET(number/hard_popcap) @@ -197,10 +190,6 @@ GLOBAL_DATUM_INIT(latejoin_menu, /datum/latejoin_menu, new) return TRUE owner.vote_on_poll_handler(poll, params) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /// Gives the user a random job that they can join as, and prompts them if they'd actually like to keep it, rerolling if not. Cancellable by the user. diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm index 9b5f112cc00..91aa6b932e9 100644 --- a/code/modules/mob/dead/new_player/login.dm +++ b/code/modules/mob/dead/new_player/login.dm @@ -31,15 +31,12 @@ if(GLOB.admin_notice) to_chat(src, span_notice("Admin Notice:\n \t [GLOB.admin_notice]")) -<<<<<<< HEAD //SKYRAT EDIT ADDITION var/soft_player_cap = CONFIG_GET(number/player_soft_cap) if(soft_player_cap >= TGS_CLIENT_COUNT) INVOKE_ASYNC(src, PROC_REF(connect_to_second_server)) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/spc = CONFIG_GET(number/soft_popcap) if(spc && living_player_count() >= spc) @@ -65,7 +62,3 @@ var/tl = SSticker.GetTimeLeft() to_chat(src, "Please set up your character and select \"Ready\". The game will start [tl > 0 ? "in about [DisplayTimeText(tl)]" : "soon"].") -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 4e06b5ab883..04b74605e21 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -5,11 +5,7 @@ invisibility = INVISIBILITY_ABSTRACT density = FALSE stat = DEAD -<<<<<<< HEAD //hud_type = /datum/hud/new_player SKYRAT EDIT REMOVAL -======= - hud_type = /datum/hud/new_player ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hud_possible = list() var/ready = FALSE @@ -78,16 +74,10 @@ if(SSlag_switch.measures[DISABLE_DEAD_KEYLOOP]) less_input_message = " - Notice: Observer freelook is currently disabled." // Don't convert this to tgui please, it's way too important -<<<<<<< HEAD var/this_is_like_playing_right = alert(usr, "Are you sure you wish to observe?[less_input_message]", "Observe", "Yes", "No") //SKYRAT EDIT CHANGE if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes") ready = PLAYER_NOT_READY show_title_screen() // SKYRAT EDIT ADDITION -======= - var/this_is_like_playing_right = alert(usr, "Are you sure you wish to observe? You will not be able to play this round![less_input_message]", "Observe", "Yes", "No") - if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes") - ready = PLAYER_NOT_READY ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE hide_title_screen() // SKYRAT EDIT ADDITION - Skyrat Titlescreen @@ -131,7 +121,6 @@ return "Your account is not old enough for [jobtitle]." if(JOB_UNAVAILABLE_SLOTFULL) return "[jobtitle] is already filled to capacity." -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(JOB_NOT_VETERAN) return "You need to be veteran to join as [jobtitle]." @@ -146,8 +135,6 @@ if(JOB_UNAVAILABLE_AUGMENT) return "[jobtitle] is restricted due to your selected body augments." //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(JOB_UNAVAILABLE_ANTAG_INCOMPAT) return "[jobtitle] is not compatible with some antagonist role assigned to you." if(JOB_UNAVAILABLE_AGE) @@ -218,10 +205,7 @@ tgui_alert(usr, "There was an unexpected error putting you into your requested job. If you cannot join with any job, you should contact an admin.") return FALSE -<<<<<<< HEAD hide_title_screen()// SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mind.late_joiner = TRUE var/atom/destination = mind.assigned_role.get_latejoin_spawn_point() if(!destination) @@ -242,11 +226,7 @@ // If we already have a captain, are they a "Captain" rank and are we allowing multiple of them to be assigned? if(is_captain_job(job)) is_captain = IS_FULL_CAPTAIN -<<<<<<< HEAD captain_sound = ANNOUNCER_DEPARTMENTAL // SKYRAT EDIT CHANGE - Announcer Sounds -======= - captain_sound = 'sound/misc/announce.ogg' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // If we don't have an assigned cap yet, check if this person qualifies for some from of captaincy. else if(!SSjob.assigned_captain && ishuman(character) && SSjob.chain_of_command[rank] && !is_banned_from(character.ckey, list(JOB_CAPTAIN))) is_captain = IS_ACTING_CAPTAIN @@ -264,28 +244,20 @@ humanc = character //Let's retypecast the var to be human, if(humanc) //These procs all expect humans -<<<<<<< HEAD // BEGIN SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES var/chosen_rank = humanc.client?.prefs.alt_job_titles[rank] || rank -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SSshuttle.arrivals) SSshuttle.arrivals.QueueAnnounce(humanc, chosen_rank) else -<<<<<<< HEAD announce_arrival(humanc, chosen_rank) // END SKYRAT EDIT CHANGE - customization -======= - announce_arrival(humanc, rank) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AddEmploymentContract(humanc) humanc.increment_scar_slot() humanc.load_persistent_scars() -<<<<<<< HEAD + SSpersistence.load_modular_persistence(humanc.get_organ_slot(ORGAN_SLOT_BRAIN)) // SKYRAT EDIT ADDITION - MODULAR_PERSISTENCE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + if(GLOB.curse_of_madness_triggered) give_madness(humanc, GLOB.curse_of_madness_triggered) @@ -305,11 +277,8 @@ SSquirks.AssignQuirks(humanc, humanc.client) if(humanc) // Quirks may change manifest datapoints, so inject only after assigning quirks -<<<<<<< HEAD GLOB.manifest.inject(humanc, humanc.client) // SKYRAT EDIT - Added humanc.client - ALTERNATIVE_JOB_TITLES -======= - GLOB.manifest.inject(humanc) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + var/area/station/arrivals = GLOB.areas_by_type[/area/station/hallway/secondary/entry] if(humanc && arrivals && !arrivals.power_environ) //arrivals depowered @@ -327,7 +296,6 @@ /mob/dead/new_player/proc/create_character(atom/destination) spawning = TRUE -<<<<<<< HEAD hide_title_screen() // SKYRAT EDIT ADDITION - titlescreen mind.active = FALSE //we wish to transfer the key manually @@ -344,19 +312,6 @@ preserved_mind.transfer_to(spawning_mob) //won't transfer key since the mind is not active preserved_mind.set_original_character(spawning_mob) -======= - mind.active = FALSE //we wish to transfer the key manually - var/mob/living/spawning_mob = mind.assigned_role.get_spawn_mob(client, destination) - if(QDELETED(src) || !client) - return // Disconnected while checking for the appearance ban. - if(!isAI(spawning_mob)) // Unfortunately there's still snowflake AI code out there. - // transfer_to sets mind to null - var/datum/mind/preserved_mind = mind - preserved_mind.original_character_slot_index = client.prefs.default_slot - preserved_mind.transfer_to(spawning_mob) //won't transfer key since the mind is not active - preserved_mind.set_original_character(spawning_mob) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LAZYADD(client.player_details.joined_as_slots, "[client.prefs.default_slot]") client.init_verbs() . = spawning_mob diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm index cba0858b165..e4c701d0fab 100644 --- a/code/modules/mob/dead/new_player/preferences_setup.dm +++ b/code/modules/mob/dead/new_player/preferences_setup.dm @@ -31,10 +31,6 @@ var/obj/item/bodypart/chest/chest = character.get_bodypart(BODY_ZONE_CHEST) chest.add_bodypart_overlay(new /datum/bodypart_overlay/simple/sixpack() ) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Goes through all quirks that can be used in hardcore mode and select some based on a random budget. * Returns the new value to be gained with this setup, plus the previously earned score. @@ -96,17 +92,10 @@ highest_pref = job_preferences[job] return preview_job -<<<<<<< HEAD /* SKYRAT EDIT REMOVE - MOVED TO MASTER FILES /datum/preferences/proc/render_new_preview_appearance(mob/living/carbon/human/dummy/mannequin) var/datum/job/preview_job = get_highest_priority_job() mannequin.dna.mutant_bodyparts = list() -======= - -/datum/preferences/proc/render_new_preview_appearance(mob/living/carbon/human/dummy/mannequin, show_job_clothes = TRUE) - var/datum/job/no_job = SSjob.GetJobType(/datum/job/unassigned) - var/datum/job/preview_job = get_highest_priority_job() || no_job ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(preview_job) // Silicons only need a very basic preview since there is no customization for them. @@ -138,7 +127,4 @@ mannequin.add_quirk(quirk_type, parent) return mannequin.appearance -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/dead/observer/login.dm b/code/modules/mob/dead/observer/login.dm index 5b9f3461793..cf5863163c8 100644 --- a/code/modules/mob/dead/observer/login.dm +++ b/code/modules/mob/dead/observer/login.dm @@ -7,12 +7,6 @@ ghost_others = client.prefs.read_preference(/datum/preference/choiced/ghost_others) var/preferred_form = null -<<<<<<< HEAD - if(isAdminGhostAI(src)) - has_unlimited_silicon_privilege = TRUE - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(client.prefs.unlock_content) preferred_form = client.prefs.read_preference(/datum/preference/choiced/ghost_form) ghost_orbit = client.prefs.read_preference(/datum/preference/choiced/ghost_orbit) diff --git a/code/modules/mob/dead/observer/notificationprefs.dm b/code/modules/mob/dead/observer/notificationprefs.dm index dcdd5264371..5e14f1e5ce9 100644 --- a/code/modules/mob/dead/observer/notificationprefs.dm +++ b/code/modules/mob/dead/observer/notificationprefs.dm @@ -38,11 +38,7 @@ "desc" = GLOB.poll_ignore_desc[key] )) -<<<<<<< HEAD -/datum/notificationpanel/ui_act(action, params) -======= /datum/notificationpanel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index efef8e7e51f..90efa29213b 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -317,16 +317,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!HAS_TRAIT(src, TRAIT_CORPSELOCKED)) //corpse-locked have to confirm with the alert below ghostize(TRUE) return TRUE -<<<<<<< HEAD // SKYRAT EDIT ADDITION -- Free Ghost Cafe Ghosting if(HAS_TRAIT(src, TRAIT_FREE_GHOST)) ghostize(TRUE) // Can return with TRUE return TRUE // SKYRAT EDIT ADDITION END - var/response = tgui_alert(usr, "Are you sure you want to ghost? If you ghost whilst still alive you cannot re-enter your body!", "Confirm Ghost Observe", list("Ghost", "Stay in Body")) -======= var/response = tgui_alert(usr, "Are you sure you want to ghost? You won't be able to re-enter your body!", "Confirm Ghost Observe", list("Ghost", "Stay in Body")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(response != "Ghost") return FALSE//didn't want to ghost after-all ghostize(FALSE) // FALSE parameter is so we can never re-enter our body. U ded. @@ -385,11 +381,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!mind || QDELETED(mind.current)) to_chat(src, span_warning("You have no body.")) return -<<<<<<< HEAD if(!can_reenter_corpse && !mind.has_antag_datum(/datum/antagonist/changeling)) //SKYRAT EDIT -======= - if(!can_reenter_corpse) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(src, span_warning("You cannot re-enter your body.")) return if(mind.current.key && mind.current.key[1] != "@") //makes sure we don't accidentally kick any clients @@ -422,7 +414,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp // Update med huds current_mob.med_hud_set_status() current_mob.log_message("had their player ([key_name(src)]) do-not-resuscitate / DNR", LOG_GAME, color = COLOR_GREEN, log_globally = FALSE) -<<<<<<< HEAD //SKYRAT EDIT ADDITION - DNR TRAIT (Technically this is just to fix ghost-DNR'ing not actually DNR'ing, but it pairs with the trait so) if(!current_mob.has_quirk(/datum/quirk/dnr)) current_mob.add_quirk(/datum/quirk/dnr) @@ -430,8 +421,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(job_to_free) job_to_free.current_positions = max(0, job_to_free.current_positions - 1) //SKYRAT EDIT ADDITION END - DNR TRAIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 log_message("has opted to do-not-resuscitate / DNR from their body ([current_mob])", LOG_GAME, color = COLOR_GREEN) // Disassociates observer mind from the body mind @@ -449,15 +438,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/atom/movable/screen/alert/A = throw_alert("[REF(source)]_revival", /atom/movable/screen/alert/revival) if(A) var/ui_style = client?.prefs?.read_preference(/datum/preference/choiced/ui_style) -<<<<<<< HEAD var/erp_ui_style = client?.prefs?.read_preference(/datum/preference/choiced/ui_style) //SKYRAT EDIT - ADDITION - ERP ICONS FIX if(ui_style) A.icon = ui_style2icon(ui_style) A.icon = erp_ui_style2icon(erp_ui_style) //SKYRAT EDIT - ADDITION - ERP ICONS FIX -======= - if(ui_style) - A.icon = ui_style2icon(ui_style) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 A.desc = message var/old_layer = source.layer var/old_plane = source.plane diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 118d63371fd..dbdc1390add 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -40,10 +40,7 @@ SEND_SIGNAL(src, COMSIG_MOB_EMOTE, emote, act, m_type, message, intentional) SEND_SIGNAL(src, COMSIG_MOB_EMOTED(emote.key)) return TRUE -<<<<<<< HEAD src.nextsoundemote = world.time // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(intentional && !silenced && !force_silence) to_chat(src, span_notice("Unusable emote '[act]'. Say *help for a list.")) return FALSE @@ -87,19 +84,10 @@ /datum/emote/flip/run_emote(mob/user, params , type_override, intentional) . = ..() -<<<<<<< HEAD - user.SpinAnimation(HAS_TRAIT(user, TRAIT_SLOW_FLIP) ? FLIP_EMOTE_DURATION * 2 : FLIP_EMOTE_DURATION, 1) -======= user.SpinAnimation(FLIP_EMOTE_DURATION, 1) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/emote/flip/check_cooldown(mob/user, intentional) - var/slow_flipper = HAS_TRAIT(user, TRAIT_SLOW_FLIP) - if(slow_flipper) - cooldown *= 2 . = ..() - if(slow_flipper) - cooldown *= 0.5 if(.) return if(!can_run_emote(user, intentional=intentional)) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 52a3392814e..09796da366b 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -481,11 +481,7 @@ * * returns 0 if it cannot, 1 if successful */ -<<<<<<< HEAD /mob/proc/equip_to_appropriate_slot(obj/item/W, qdel_on_fail = FALSE, indirect_action = FALSE, blacklist, initial) // SKYRAT EDIT CHANGE - ORIGINAL: /mob/proc/equip_to_appropriate_slot(obj/item/W, qdel_on_fail = FALSE, indirect_action = FALSE) -======= -/mob/proc/equip_to_appropriate_slot(obj/item/W, qdel_on_fail = FALSE, indirect_action = FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!istype(W)) return FALSE var/slot_priority = W.slot_equipment_priority @@ -502,18 +498,13 @@ ITEM_SLOT_DEX_STORAGE\ ) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - CUSTOMIZATION if (blacklist) slot_priority -= blacklist // SKYRAT EDIT ADDITION END for(var/slot in slot_priority) - if(equip_to_slot_if_possible(W, slot, disable_warning = TRUE, redraw_mob = TRUE, initial = initial, indirect_action = indirect_action)) // SKYRAT EDIT CHANGE - ORIGINAL: if(equip_to_slot_if_possible(W, slot, disable_warning = TRUE, redraw_mob = TRUE, indirect_action = indirect_action)) -======= - for(var/slot in slot_priority) - if(equip_to_slot_if_possible(W, slot, disable_warning = TRUE, redraw_mob = TRUE, indirect_action = indirect_action)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + if(equip_to_slot_if_possible(W, slot, disable_warning = TRUE, redraw_mob = TRUE, indirect_action = indirect_action, initial = initial)) // SKYRAT EDIT CHANGE - ORIGINAL: if(equip_to_slot_if_possible(W, slot, disable_warning = TRUE, redraw_mob = TRUE, indirect_action = indirect_action)) return TRUE if(qdel_on_fail) diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm index 280c340f0f3..9501c4e21d3 100644 --- a/code/modules/mob/living/basic/basic.dm +++ b/code/modules/mob/living/basic/basic.dm @@ -266,11 +266,7 @@ REMOVE_TRAIT(src, TRAIT_NO_GLIDE, SPEED_TRAIT) /mob/living/basic/relaymove(mob/living/user, direction) -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return return relaydrive(user, direction) diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm index 256cee5a4ae..cc6ac85c6cb 100644 --- a/code/modules/mob/living/basic/bots/_bots.dm +++ b/code/modules/mob/living/basic/bots/_bots.dm @@ -26,10 +26,6 @@ GLOBAL_LIST_INIT(command_strings, list( maximum_survivable_temperature = INFINITY minimum_survivable_temperature = 0 -<<<<<<< HEAD - has_unlimited_silicon_privilege = TRUE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sentience_type = SENTIENCE_ARTIFICIAL status_flags = NONE //no default canpush @@ -62,10 +58,7 @@ GLOBAL_LIST_INIT(command_strings, list( ///All initial access this bot started with. var/list/initial_access = list() ///Bot-related mode flags on the Bot indicating how they will act. BOT_MODE_ON | BOT_MODE_AUTOPATROL | BOT_MODE_REMOTE_ENABLED | BOT_MODE_CAN_BE_SAPIENT | BOT_MODE_ROUNDSTART_POSSESSION -<<<<<<< HEAD -======= /// DO NOT MODIFY MANUALLY, USE set_bot_mode_flags. If you don't shit breaks BAD ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/bot_mode_flags = BOT_MODE_ON | BOT_MODE_REMOTE_ENABLED | BOT_MODE_CAN_BE_SAPIENT | BOT_MODE_ROUNDSTART_POSSESSION ///Bot-related cover flags on the Bot to deal with what has been done to their cover, including emagging. BOT_COVER_MAINTS_OPEN | BOT_COVER_LOCKED | BOT_COVER_EMAGGED | BOT_COVER_HACKED var/bot_access_flags = BOT_COVER_LOCKED @@ -116,10 +109,7 @@ GLOBAL_LIST_INIT(command_strings, list( /mob/living/basic/bot/Initialize(mapload) . = ..() -<<<<<<< HEAD -======= add_traits(list(TRAIT_SILICON_ACCESS, TRAIT_REAGENT_SCANNER, TRAIT_UNOBSERVANT), INNATE_TRAIT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AddElement(/datum/element/ai_retaliate) RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(handle_loop_movement)) RegisterSignal(src, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(after_attacked)) @@ -162,14 +152,11 @@ GLOBAL_LIST_INIT(command_strings, list( ai_controller.set_blackboard_key(BB_RADIO_CHANNEL, radio_channel) update_appearance() -<<<<<<< HEAD -======= /mob/living/basic/bot/proc/set_mode_flags(mode_flags) SHOULD_CALL_PARENT(TRUE) bot_mode_flags = mode_flags SEND_SIGNAL(src, COMSIG_BOT_MODE_FLAGS_SET, mode_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/basic/bot/proc/get_mode() if(client) //Player bots do not have modes, thus the override. Also an easy way for PDA users/AI to know when a bot is a player. return span_bold("[paicard ? "pAI Controlled" : "Autonomous"]") @@ -200,11 +187,7 @@ GLOBAL_LIST_INIT(command_strings, list( /mob/living/basic/bot/proc/turn_on() if(stat == DEAD) return FALSE -<<<<<<< HEAD - bot_mode_flags |= BOT_MODE_ON -======= set_mode_flags(bot_mode_flags | BOT_MODE_ON) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 remove_traits(list(TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED), POWER_LACK_TRAIT) set_light_on(bot_mode_flags & BOT_MODE_ON ? TRUE : FALSE) update_appearance() @@ -213,11 +196,7 @@ GLOBAL_LIST_INIT(command_strings, list( return TRUE /mob/living/basic/bot/proc/turn_off() -<<<<<<< HEAD - bot_mode_flags &= ~BOT_MODE_ON -======= set_mode_flags(bot_mode_flags & ~BOT_MODE_ON) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 add_traits(on_toggle_traits, POWER_LACK_TRAIT) set_light_on(bot_mode_flags & BOT_MODE_ON ? TRUE : FALSE) bot_reset() //Resets an AI's call, should it exist. @@ -335,11 +314,7 @@ GLOBAL_LIST_INIT(command_strings, list( return FALSE bot_access_flags |= BOT_COVER_EMAGGED bot_access_flags |= BOT_COVER_LOCKED -<<<<<<< HEAD - bot_mode_flags &= ~BOT_MODE_REMOTE_ENABLED //Manually emagging the bot also locks the AI from controlling it. -======= set_mode_flags(bot_mode_flags & ~BOT_MODE_REMOTE_ENABLED) //Manually emagging the bot also locks the AI from controlling it. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bot_reset() turn_on() //The bot automatically turns on when emagged, unless recently hit with EMP. to_chat(src, span_userdanger("(#$*#$^^( OVERRIDE DETECTED")) @@ -584,15 +559,9 @@ GLOBAL_LIST_INIT(command_strings, list( switch(command) if("patroloff") bot_reset() //HOLD IT!! //OBJECTION!! -<<<<<<< HEAD - bot_mode_flags &= ~BOT_MODE_AUTOPATROL - if("patrolon") - bot_mode_flags |= BOT_MODE_AUTOPATROL -======= set_mode_flags(bot_mode_flags & ~BOT_MODE_AUTOPATROL) if("patrolon") set_mode_flags(bot_mode_flags | BOT_MODE_AUTOPATROL) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("summon") summon_bot(user, user_access = user_access) if("ejectpai") @@ -644,17 +613,10 @@ GLOBAL_LIST_INIT(command_strings, list( if("maintenance") bot_access_flags ^= BOT_COVER_MAINTS_OPEN if("patrol") -<<<<<<< HEAD - bot_mode_flags ^= BOT_MODE_AUTOPATROL - bot_reset() - if("airplane") - bot_mode_flags ^= BOT_MODE_REMOTE_ENABLED -======= set_mode_flags(bot_mode_flags ^ BOT_MODE_AUTOPATROL) bot_reset() if("airplane") set_mode_flags(bot_mode_flags ^ BOT_MODE_REMOTE_ENABLED) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("hack") if(!HAS_SILICON_ACCESS(the_user)) return diff --git a/code/modules/mob/living/basic/bots/bot_ai.dm b/code/modules/mob/living/basic/bots/bot_ai.dm index b096ef212a3..a0abbbfd48b 100644 --- a/code/modules/mob/living/basic/bots/bot_ai.dm +++ b/code/modules/mob/living/basic/bots/bot_ai.dm @@ -55,9 +55,6 @@ var/mob/living/basic/bot/bot_pawn = pawn bot_pawn.bot_reset() -<<<<<<< HEAD -/datum/ai_controller/basic_controller/bot/able_to_run() -======= /datum/ai_controller/basic_controller/bot/setup_able_to_run() . = ..() RegisterSignal(pawn, COMSIG_BOT_MODE_FLAGS_SET, PROC_REF(update_able_to_run)) @@ -67,7 +64,6 @@ return ..() /datum/ai_controller/basic_controller/bot/get_able_to_run() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/living/basic/bot/bot_pawn = pawn if(!(bot_pawn.bot_mode_flags & BOT_MODE_ON)) return FALSE diff --git a/code/modules/mob/living/basic/bots/bot_hud.dm b/code/modules/mob/living/basic/bots/bot_hud.dm index 6e5a3fc27d2..ba0d82a7234 100644 --- a/code/modules/mob/living/basic/bots/bot_hud.dm +++ b/code/modules/mob/living/basic/bots/bot_hud.dm @@ -47,14 +47,6 @@ if(isnull(ai_controller)) return -<<<<<<< HEAD - clear_path_hud() - - var/list/path_images = active_hud_list[DIAG_PATH_HUD] - LAZYCLEARLIST(path_images) - - var/list/path_huds_watching_me = list(GLOB.huds[DATA_HUD_DIAGNOSTIC], GLOB.huds[DATA_HUD_BOT_PATH]) -======= //Removes path images and handles removing hud client images clear_path_hud() @@ -63,7 +55,6 @@ var/list/path_images = active_hud_list[DIAG_PATH_HUD] LAZYCLEARLIST(path_images) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/atom/move_target = ai_controller.current_movement_target if(move_target != ai_controller.blackboard[BB_BEACON_TARGET]) @@ -73,12 +64,6 @@ if(!length(our_path)) return -<<<<<<< HEAD - for(var/datum/atom_hud/hud as anything in path_huds_watching_me) - hud.remove_atom_from_hud(src) - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/index in 1 to our_path.len) if(index == 1 || index == our_path.len) continue @@ -132,11 +117,8 @@ animate(our_image, alpha = 0, time = 0.3 SECONDS) current_pathed_turfs -= index -<<<<<<< HEAD -======= // Call hud remove handlers to ensure viewing user client images are removed var/list/path_huds_watching_me = list(GLOB.huds[DATA_HUD_DIAGNOSTIC], GLOB.huds[DATA_HUD_BOT_PATH]) for(var/datum/atom_hud/hud as anything in path_huds_watching_me) hud.remove_atom_from_hud(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm b/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm index d6853c4a4ab..1e2bfdb732b 100644 --- a/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm +++ b/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm @@ -239,12 +239,8 @@ // Actions received from TGUI /mob/living/basic/bot/cleanbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() -<<<<<<< HEAD - if(. || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(ui.user)) -======= var/mob/user = ui.user if(. || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return switch(action) diff --git a/code/modules/mob/living/basic/bots/firebot/firebot.dm b/code/modules/mob/living/basic/bots/firebot/firebot.dm index 52d47e47c2b..921909aa8a5 100644 --- a/code/modules/mob/living/basic/bots/firebot/firebot.dm +++ b/code/modules/mob/living/basic/bots/firebot/firebot.dm @@ -112,16 +112,10 @@ return data // Actions received from TGUI -<<<<<<< HEAD -/mob/living/basic/bot/firebot/ui_act(action, params) - . = ..() - if(. || (bot_access_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr))) -======= /mob/living/basic/bot/firebot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() var/mob/user = ui.user if(. || (bot_access_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return switch(action) diff --git a/code/modules/mob/living/basic/bots/honkbots/honkbot.dm b/code/modules/mob/living/basic/bots/honkbots/honkbot.dm index 27b1ba93755..38884bec503 100644 --- a/code/modules/mob/living/basic/bots/honkbots/honkbot.dm +++ b/code/modules/mob/living/basic/bots/honkbots/honkbot.dm @@ -88,11 +88,7 @@ /mob/living/basic/bot/honkbot/ui_data(mob/user) var/list/data = ..() -<<<<<<< HEAD - if(!(bot_access_flags & BOT_COVER_LOCKED) || issilicon(user) || isAdminGhostAI(user)) -======= if(!(bot_access_flags & BOT_COVER_LOCKED) || HAS_SILICON_ACCESS(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 data["custom_controls"]["slip_people"] = honkbot_flags & HONKBOT_MODE_SLIP data["custom_controls"]["fake_cuff"] = honkbot_flags & HONKBOT_HANDCUFF_TARGET data["custom_controls"]["check_ids"] = honkbot_flags & HONKBOT_CHECK_IDS @@ -101,12 +97,8 @@ /mob/living/basic/bot/honkbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() -<<<<<<< HEAD - if(. || !isliving(ui.user) || (bot_access_flags & BOT_COVER_LOCKED) && !(ui.user.has_unlimited_silicon_privilege)) -======= var/mob/user = ui.user if(. || !isliving(user) || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return switch(action) if("slip_people") diff --git a/code/modules/mob/living/basic/bots/medbot/medbot.dm b/code/modules/mob/living/basic/bots/medbot/medbot.dm index 9e93f35abc6..39d5504d841 100644 --- a/code/modules/mob/living/basic/bots/medbot/medbot.dm +++ b/code/modules/mob/living/basic/bots/medbot/medbot.dm @@ -210,15 +210,9 @@ // Actions received from TGUI /mob/living/basic/bot/medbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() -<<<<<<< HEAD - if(. || !isliving(ui.user) || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(ui.user)) - return - var/mob/living/our_user = ui.user -======= var/mob/user = ui.user if(. || !isliving(ui.user) || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(user)) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(action) if("heal_threshold") var/adjust_num = round(text2num(params["threshold"])) @@ -235,11 +229,7 @@ medical_mode_flags ^= MEDBOT_STATIONARY_MODE if("sync_tech") if(!linked_techweb) -<<<<<<< HEAD - to_chat(our_user, span_notice("No research techweb connected.")) -======= to_chat(user, span_notice("No research techweb connected.")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/oldheal_amount = heal_amount var/tech_boosters @@ -327,15 +317,12 @@ return if(!iscarbon(target)) return -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Skip trying to heal synths if(ishuman(target)) var/mob/living/carbon/human/human_target = target if(human_target.mob_biotypes & MOB_ROBOTIC) return // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 INVOKE_ASYNC(src, PROC_REF(medicate_patient), target) return COMPONENT_HOSTILE_NO_ATTACK @@ -349,11 +336,7 @@ update_bot_mode(new_mode = BOT_HEALING, update_hud = FALSE) patient.visible_message("[src] is trying to tend the wounds of [patient]", span_userdanger("[src] is trying to tend your wounds!")) -<<<<<<< HEAD - if(!do_after(src, delay = 10 SECONDS, target = patient, interaction_key = TEND_DAMAGE_INTERACTION)) //SKYRAT EDIT CHANGE : Increased time as tradeoff for automated healing. ORIGINAL: if(!do_after(src, delay = 0.5 SECONDS, target = patient, interaction_key = TEND_DAMAGE_INTERACTION)) -======= if(!do_after(src, delay = 2 SECONDS, target = patient, interaction_key = TEND_DAMAGE_INTERACTION)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 update_bot_mode(new_mode = BOT_IDLE) return var/modified_heal_amount = heal_amount diff --git a/code/modules/mob/living/basic/drone/_drone.dm b/code/modules/mob/living/basic/drone/_drone.dm index 22fa7f68c3b..3ec426caa9f 100644 --- a/code/modules/mob/living/basic/drone/_drone.dm +++ b/code/modules/mob/living/basic/drone/_drone.dm @@ -37,10 +37,6 @@ bubble_icon = "machine" initial_language_holder = /datum/language_holder/drone mob_size = MOB_SIZE_SMALL -<<<<<<< HEAD - has_unlimited_silicon_privilege = TRUE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, STAMINA = 0, OXY = 0) hud_possible = list(DIAG_STAT_HUD, DIAG_HUD, ANTAG_HUD) unique_name = TRUE @@ -205,9 +201,6 @@ for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) diag_hud.add_atom_to_hud(src) -<<<<<<< HEAD - add_traits(list(TRAIT_VENTCRAWLER_ALWAYS, TRAIT_NEGATES_GRAVITY, TRAIT_LITERATE, TRAIT_KNOW_ENGI_WIRES, TRAIT_ADVANCEDTOOLUSER), INNATE_TRAIT) -======= add_traits(list( TRAIT_VENTCRAWLER_ALWAYS, TRAIT_NEGATES_GRAVITY, @@ -218,7 +211,6 @@ TRAIT_REAGENT_SCANNER, TRAIT_UNOBSERVANT, ), INNATE_TRAIT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 listener = new(list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER), list(z)) RegisterSignal(listener, COMSIG_ALARM_LISTENER_TRIGGERED, PROC_REF(alarm_triggered)) @@ -238,11 +230,7 @@ holder.pixel_y = hud_icon.Height() - world.icon_size if(stat == DEAD) holder.icon_state = "huddead2" -<<<<<<< HEAD - else if(incapacitated()) -======= else if(incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 holder.icon_state = "hudoffline" else holder.icon_state = "hudstat" @@ -288,11 +276,7 @@ return icon('icons/mob/butts.dmi', BUTT_SPRITE_DRONE) /mob/living/basic/drone/examine(mob/user) -<<<<<<< HEAD . = list("This is [icon2html(src, user)] \a [src]!", EXAMINE_SECTION_BREAK) //SKYRAT EDIT CHANGE -======= - . = list("This is [icon2html(src, user)] \a [src]!") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Hands for(var/obj/item/held_thing in held_items) diff --git a/code/modules/mob/living/basic/drone/visuals_icons.dm b/code/modules/mob/living/basic/drone/visuals_icons.dm index 779be475ccf..32ff97da305 100644 --- a/code/modules/mob/living/basic/drone/visuals_icons.dm +++ b/code/modules/mob/living/basic/drone/visuals_icons.dm @@ -108,11 +108,7 @@ /mob/living/basic/drone/proc/check_menu() if(!istype(src)) return FALSE -<<<<<<< HEAD - if(incapacitated()) -======= if(incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/mob/living/basic/guardian/guardian_creator.dm b/code/modules/mob/living/basic/guardian/guardian_creator.dm index bf84b32f423..08a28041cc8 100644 --- a/code/modules/mob/living/basic/guardian/guardian_creator.dm +++ b/code/modules/mob/living/basic/guardian/guardian_creator.dm @@ -129,11 +129,7 @@ GLOBAL_LIST_INIT(guardian_radial_images, setup_guardian_radial()) /obj/item/guardian_creator/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated() || !user.is_holding(src) || used) -======= if(user.incapacitated || !user.is_holding(src) || used) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm b/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm index a3308af9198..0556affe761 100644 --- a/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm +++ b/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm @@ -8,11 +8,7 @@ var/static/list/comic_phrases = list("BOOM", "BANG", "KABLOW", "KAPOW", "OUCH", "BAM", "KAPOW", "WHAM", "POW", "KABOOM") /obj/item/crusher_trophy/brimdemon_fang/effect_desc() -<<<<<<< HEAD - return "mark detonation creates visual and audiosensory effects on the target" -======= return "mark detonation to create visual and audiosensory effects at the target" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/crusher_trophy/brimdemon_fang/on_mark_detonation(mob/living/target, mob/living/user) target.balloon_alert_to_viewers("[pick(comic_phrases)]!") diff --git a/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm b/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm index b9b105cc56c..59f7ffb249d 100644 --- a/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm +++ b/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm @@ -52,10 +52,6 @@ /datum/action/cooldown/mob_cooldown/burrow = BB_BURROW_ABILITY, ) grant_actions_by_list(innate_actions) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AddElement(/datum/element/ore_collecting) AddElement(/datum/element/wall_tearer, allow_reinforced = FALSE) AddComponent(/datum/component/ai_listen_to_weather) diff --git a/code/modules/mob/living/basic/lavaland/goliath/goliath_trophy.dm b/code/modules/mob/living/basic/lavaland/goliath/goliath_trophy.dm index 46c2a03234a..1eff38de7f2 100644 --- a/code/modules/mob/living/basic/lavaland/goliath/goliath_trophy.dm +++ b/code/modules/mob/living/basic/lavaland/goliath/goliath_trophy.dm @@ -22,7 +22,6 @@ missing_health *= missing_health_ratio //bonus is active at all times, even if you're above 90 health missing_health *= bonus_value //multiply the remaining amount by bonus_value if(missing_health > 0) -<<<<<<< HEAD //SKYRAT EDIT START /* @@ -30,6 +29,3 @@ */ target.adjustBruteLoss(missing_health, FALSE) //and do that much damage //SKYRAT EDIT END -======= - target.adjustBruteLoss(missing_health) //and do that much damage ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/basic/pets/parrot/parrot_ai/_parrot_controller.dm b/code/modules/mob/living/basic/pets/parrot/parrot_ai/_parrot_controller.dm index ee1712e0c53..8a0fe5e157d 100644 --- a/code/modules/mob/living/basic/pets/parrot/parrot_ai/_parrot_controller.dm +++ b/code/modules/mob/living/basic/pets/parrot/parrot_ai/_parrot_controller.dm @@ -18,11 +18,7 @@ /datum/idle_behavior/idle_random_walk/parrot ///chance of us moving while perched -<<<<<<< HEAD var/walk_chance_when_perched = 1 // SKYRAT EDIT CHANGE - More obedient poly ORIGINAL : var/walk_chance_when_perched = 5 -======= - var/walk_chance_when_perched = 5 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/idle_behavior/idle_random_walk/parrot/perform_idle_behavior(seconds_per_tick, datum/ai_controller/controller) var/mob/living/living_pawn = controller.pawn diff --git a/code/modules/mob/living/basic/space_fauna/netherworld/creature.dm b/code/modules/mob/living/basic/space_fauna/netherworld/creature.dm index 9301475ce5b..15dfcdc29c0 100644 --- a/code/modules/mob/living/basic/space_fauna/netherworld/creature.dm +++ b/code/modules/mob/living/basic/space_fauna/netherworld/creature.dm @@ -55,11 +55,7 @@ // This loop will, at most, loop twice. for(var/atom/check in check_list) for(var/mob/living/mob_target in oview(src, 7)) // They probably cannot see us if we cannot see them... can they? -<<<<<<< HEAD - if(mob_target.client && !mob_target.is_blind() && !mob_target.has_unlimited_silicon_privilege) -======= if(mob_target.client && !mob_target.is_blind() && !HAS_TRAIT(mob_target, TRAIT_UNOBSERVANT)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return mob_target for(var/obj/vehicle/sealed/mecha/mecha_mob_target in oview(src, 7)) for(var/mob/mechamob_target as anything in mecha_mob_target.occupants) diff --git a/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm b/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm index a07ef94243a..11e00be288b 100644 --- a/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm +++ b/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm @@ -1,10 +1,6 @@ /mob/living/basic/migo name = "mi-go" -<<<<<<< HEAD - desc = "A pinkish, fungoid crustacean-like creature with numerous pairs of clawed appendages and a head covered with waving antennae." -======= desc = "A pinkish, fungoid crustacean-like creature with clawed appendages and a head covered with waving antennae." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "mi-go" icon_living = "mi-go" icon_dead = "mi-go-dead" diff --git a/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm b/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm index bcf2d59973c..7dd7f13f5ee 100644 --- a/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm +++ b/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm @@ -257,12 +257,8 @@ if(iscarbon(mob)) if(ishuman(mob)) var/mob/living/carbon/human/H = mob -<<<<<<< HEAD if(H.dna && H.dna.species && !HAS_TRAIT(H, TRAIT_VIRUSIMMUNE)) // SKYRAT EDIT - No more funny purple hair H.set_haircolor("#1d2953", override = TRUE) //will be reset when blight is cured -======= - H.set_haircolor("#1d2953", override = TRUE) //will be reset when blight is cured ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/blightfound = FALSE for(var/datum/disease/revblight/blight in H.diseases) blightfound = TRUE diff --git a/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm b/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm index 132a12307b4..f293f1dcbaa 100644 --- a/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm +++ b/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm @@ -110,13 +110,6 @@ . = ..() AddElement(/datum/element/web_walker, /datum/movespeed_modifier/fast_web) -<<<<<<< HEAD -/mob/living/basic/spider/giant/hunter/mold //skyrat edit: exists to make molds not spam the world with simple mobs - basic_mob_flags = DEL_ON_DEATH - habitable_atmos = null - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Used in the caves away mission. /mob/living/basic/spider/giant/hunter/away_caves minimum_survivable_temperature = 0 diff --git a/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/wrap.dm b/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/wrap.dm index aee2c291758..088905a5ae2 100644 --- a/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/wrap.dm +++ b/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/wrap.dm @@ -26,11 +26,7 @@ /datum/action/cooldown/mob_cooldown/wrap/IsAvailable(feedback = FALSE) . = ..() -<<<<<<< HEAD - if(!. || owner.incapacitated()) -======= if(!. || owner.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(DOING_INTERACTION(owner, DOAFTER_SOURCE_SPIDER)) if (feedback) diff --git a/code/modules/mob/living/basic/vermin/frog.dm b/code/modules/mob/living/basic/vermin/frog.dm index a97633cd353..cce415b960f 100644 --- a/code/modules/mob/living/basic/vermin/frog.dm +++ b/code/modules/mob/living/basic/vermin/frog.dm @@ -26,11 +26,7 @@ response_harm_simple = "splat" density = FALSE faction = list(FACTION_HOSTILE, FACTION_MAINT_CREATURES) -<<<<<<< HEAD attack_sound = null // SKYRAT EDIT - No more frog ear-rape - ORIGINAL: attack_sound = 'sound/effects/reee.ogg' -======= - attack_sound = 'sound/effects/reee.ogg' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 butcher_results = list(/obj/item/food/nugget = 1) pass_flags = PASSTABLE | PASSGRILLE | PASSMOB mob_size = MOB_SIZE_TINY @@ -44,11 +40,7 @@ ai_controller = /datum/ai_controller/basic_controller/frog -<<<<<<< HEAD var/stepped_sound = null // SKYRAT EDIT - No more frog ear-rape - ORIGINA: var/stepped_sound = 'sound/effects/huuu.ogg' -======= - var/stepped_sound = 'sound/effects/huuu.ogg' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///How much of a reagent the mob injects on attack var/poison_per_bite = 3 ///What reagent the mob injects targets with diff --git a/code/modules/mob/living/carbon/alien/adult/adult.dm b/code/modules/mob/living/carbon/alien/adult/adult.dm index 95c6da425be..663419ce22c 100644 --- a/code/modules/mob/living/carbon/alien/adult/adult.dm +++ b/code/modules/mob/living/carbon/alien/adult/adult.dm @@ -78,10 +78,7 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list( SEND_SIGNAL(src, COMSIG_MOVABLE_SET_GRAB_STATE, newstate) . = grab_state grab_state = newstate -<<<<<<< HEAD -======= update_incapacitated() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(grab_state) // Current state. if(GRAB_PASSIVE) REMOVE_TRAIT(pulling, TRAIT_IMMOBILIZED, CHOKEHOLD_TRAIT) @@ -105,11 +102,7 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list( /mob/living/carbon/alien/adult/proc/can_consume(atom/movable/poor_soul) if(!isliving(poor_soul) || pulling != poor_soul) return FALSE -<<<<<<< HEAD - if(incapacitated() || grab_state < GRAB_AGGRESSIVE || stat != CONSCIOUS) -======= if(incapacitated || grab_state < GRAB_AGGRESSIVE || stat != CONSCIOUS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(get_dir(src, poor_soul) != dir) // Gotta face em 4head return FALSE diff --git a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm index 6ec0e8b3703..c50a8c056ae 100644 --- a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm @@ -15,10 +15,6 @@ Doesn't work on other aliens/AI.*/ button_icon_state = "spell_default" check_flags = AB_CHECK_IMMOBILE | AB_CHECK_CONSCIOUS | AB_CHECK_INCAPACITATED melee_cooldown_time = 0 SECONDS -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// How much plasma this action uses. var/plasma_cost = 0 @@ -344,15 +340,11 @@ Doesn't work on other aliens/AI.*/ span_notice("[owner] vomits up a thick purple substance and begins to shape it."), span_notice("You shape a [choice] out of resin."), ) -<<<<<<< HEAD //SKYRAT EDIT START - Roundstart xenohybrid organs if(build_duration && !do_after(owner, build_duration)) owner.balloon_alert(owner, "interrupted!") return //SKYRAT EDIT END -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new choice_path(owner.loc) return TRUE @@ -414,7 +406,3 @@ Doesn't work on other aliens/AI.*/ /mob/living/carbon/alien/adjustPlasma(amount) . = ..() updatePlasmaDisplay() -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 5e549f0e477..f587b9d0016 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -111,15 +111,12 @@ Des: Removes all infected images from the alien. if(num_hands < 2) return FALSE return TRUE -<<<<<<< HEAD -======= /mob/living/carbon/alien/get_visible_suicide_message() return "[src] is thrashing wildly! It looks like [p_theyre()] trying to commit suicide." /mob/living/carbon/alien/get_blind_suicide_message() return "You hear thrashing." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/alien/proc/alien_evolve(mob/living/carbon/alien/new_xeno) visible_message( diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index 542c39fad23..7aeb94d448f 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -48,11 +48,8 @@ return TRUE -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - SKYRAT_XENO_REDO - Moved to: modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\larva.dm /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/cooldown/alien/larva_evolve/Activate(atom/target) var/mob/living/carbon/alien/larva/larva = owner var/static/list/caste_options @@ -106,8 +103,5 @@ larva.alien_evolve(new_xeno) return TRUE -<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index 0b8e4beda0d..3c063aec7e7 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -1,9 +1,5 @@ /obj/item/organ/internal/alien icon_state = "acid" -<<<<<<< HEAD - visual = FALSE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/acid = 10) /obj/item/organ/internal/alien/plasmavessel @@ -225,19 +221,11 @@ stomach_contents -= source UnregisterSignal(source, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_DEATH, COMSIG_QDELETING)) -<<<<<<< HEAD -/obj/item/organ/internal/stomach/alien/Insert(mob/living/carbon/stomach_owner, special, movement_flags) - RegisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE, PROC_REF(something_moved)) - return ..() - -/obj/item/organ/internal/stomach/alien/Remove(mob/living/carbon/stomach_owner, special, movement_flags) -======= /obj/item/organ/internal/stomach/alien/mob_insert(mob/living/carbon/stomach_owner, special, movement_flags) RegisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE, PROC_REF(something_moved)) return ..() /obj/item/organ/internal/stomach/alien/mob_remove(mob/living/carbon/stomach_owner, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UnregisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE) return ..() diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index 6f3e2fdd590..9aeb31a4f55 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -136,7 +136,6 @@ if(gib_on_success) new_xeno.visible_message(span_danger("[new_xeno] bursts out of [owner] in a shower of gore!"), span_userdanger("You exit [owner], your previous host."), span_hear("You hear organic matter ripping and tearing!")) -<<<<<<< HEAD //owner.investigate_log("has been gibbed by an alien larva.", INVESTIGATE_DEATHS) // SKYRAT EDIT REMOVAL - ALIEN QOL - don't ever gib host. //owner.gib(DROP_ORGANS|DROP_BODYPARTS) // SKYRAT EDIT ADDITION BEGIN - ALIEN QOL - You aren't getting gibbed but you aren't going to be having fun @@ -145,10 +144,6 @@ owner.cut_overlay(overlay) owner.investigate_log("has been chestbursted.", INVESTIGATE_DEATHS) // SKYRAT EDIT ADDITION END - ALIEN QOL -======= - owner.investigate_log("has been gibbed by an alien larva.", INVESTIGATE_DEATHS) - owner.gib(DROP_ORGANS|DROP_BODYPARTS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else new_xeno.visible_message(span_danger("[new_xeno] wriggles out of [owner]!"), span_userdanger("You exit [owner], your previous host.")) owner.log_message("had an alien larva within them escape (without being gibbed).", LOG_ATTACK, log_globally = FALSE) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 91b6ade9ecd..98faada528f 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -24,14 +24,11 @@ layer = MOB_LAYER max_integrity = 100 item_flags = XENOMORPH_HOLDABLE -<<<<<<< HEAD // SKYRAT EDIT ADDITION START special_desc_requirement = EXAMINE_CHECK_JOB special_desc_jobs = list("Scientist, Research Director") special_desc = "This alien is an extremely dangerous life form capable of creating a xenomorph. You would know well not to approach without full body biological protection." // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 slowdown = 2 var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case @@ -303,16 +300,13 @@ /obj/item/clothing/mask/facehugger/lamarr name = "Lamarr" desc = "The Research Director's pet, a domesticated and debeaked xenomorph facehugger. Friendly, but may still try to couple with your head." -<<<<<<< HEAD + sterile = TRUE + slowdown = 1.5 //lamarr is too fat after being fed in captivity to effectively slow people down or something // SKYRAT EDIT ADDITION START: job-restricted examine text special_desc_requirement = EXAMINE_CHECK_ROLE special_desc_roles = list("ROLE_ALIEN") special_desc = "This young one has been cruelly mutilated. It lacks the capability to fill a host with our sisters." // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - sterile = TRUE - slowdown = 1.5 //lamarr is too fat after being fed in captivity to effectively slow people down or something /obj/item/clothing/mask/facehugger/dead icon_state = "facehugger_dead" diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 9b209848a46..065569bd01e 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -172,15 +172,12 @@ power_throw-- if(HAS_TRAIT(thrown_thing, TRAIT_DWARF)) power_throw++ -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(HAS_TRAIT(src, TRAIT_OVERSIZED)) power_throw++ if(HAS_TRAIT(thrown_thing, TRAIT_OVERSIZED)) power_throw-- //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(neckgrab_throw) power_throw++ if(HAS_TRAIT(src, TRAIT_TOSS_GUN_HARD) && isgun(thrown_thing)) @@ -955,7 +952,6 @@ /mob/living/carbon/can_be_revived() if(!get_organ_by_type(/obj/item/organ/internal/brain) && (!IS_CHANGELING(src)) || HAS_TRAIT(src, TRAIT_HUSK)) return FALSE -<<<<<<< HEAD //SKYRAT EDIT ADDITION - DNR TRAIT if(HAS_TRAIT(src, TRAIT_DNR)) return FALSE @@ -968,11 +964,6 @@ if(HAS_TRAIT(src, TRAIT_DNR)) //This is also added when a ghost DNR's! return DEFIB_FAIL_DNR //SKYRAT EDIT ADDITION END - DNR TRAIT -======= - return ..() - -/mob/living/carbon/proc/can_defib() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (HAS_TRAIT(src, TRAIT_SUICIDED)) return DEFIB_FAIL_SUICIDE @@ -1012,11 +1003,7 @@ return DEFIB_POSSIBLE /mob/living/carbon/proc/can_defib_client() -<<<<<<< HEAD return (client || get_ghost(FALSE, FALSE)) && (can_defib() & DEFIB_REVIVABLE_STATES) // SKYRAT EDIT - ORIGINAL: return (client || get_ghost(FALSE, TRUE)) && (can_defib() & DEFIB_REVIVABLE_STATES) -======= - return (client || get_ghost(FALSE, TRUE)) && (can_defib() & DEFIB_REVIVABLE_STATES) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/harvest(mob/living/user) if(QDELETED(src)) @@ -1393,7 +1380,6 @@ /// Special carbon interaction on lying down, to transform its sprite by a rotation. /mob/living/carbon/proc/lying_angle_on_lying_down(new_lying_angle) if(!new_lying_angle) -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(dir == WEST) set_lying_angle(270) @@ -1402,8 +1388,6 @@ set_lying_angle(90) return //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_lying_angle(pick(90, 270)) else set_lying_angle(new_lying_angle) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index e7c3548a8cf..babbf2c464a 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -93,7 +93,6 @@ var/message_verb_continuous = length(I.attack_verb_continuous) ? "[pick(I.attack_verb_continuous)]" : "attacks" var/message_verb_simple = length(I.attack_verb_simple) ? "[pick(I.attack_verb_simple)]" : "attack" -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(I.force && !user.combat_mode && !length(I.attack_verb_simple) && !length(I.attack_verb_continuous)) var/random = rand(1,2) @@ -105,8 +104,6 @@ message_verb_continuous = "maims" message_verb_simple = "maim" //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/extra_wound_details = "" @@ -279,11 +276,7 @@ var/immediately_stun = should_stun && !(flags & SHOCK_DELAY_STUN) if (immediately_stun) if (paralyze) -<<<<<<< HEAD StaminaKnockdown(stun_duration / 4) // SKYRAT EDIT CHANGE - ORIGINAL: Paralyze(40) -======= - Paralyze(stun_duration) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else Knockdown(stun_duration) //Jitter and other fluff. @@ -297,19 +290,12 @@ ///Called slightly after electrocute act to apply a secondary stun. /mob/living/carbon/proc/secondary_shock(paralyze, stun_duration) if (paralyze) -<<<<<<< HEAD StaminaKnockdown(stun_duration / 6) // SKYRAT EDIT CHANGE - ORIGINAL: Paralyze(60) -======= - Paralyze(stun_duration) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else Knockdown(stun_duration) /mob/living/carbon/proc/help_shake_act(mob/living/carbon/helper, force_friendly) -<<<<<<< HEAD - var/nosound = FALSE //SKYRATEDIT ADDITION - EMOTES -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + var/nosound = FALSE //SKYRAT EDIT ADDITION - EMOTES if(on_fire) to_chat(helper, span_warning("You can't put [p_them()] out with just your bare hands!")) return @@ -329,11 +315,10 @@ null, span_hear("You hear the rustling of clothes."), DEFAULT_MESSAGE_RANGE, list(helper, src)) to_chat(helper, span_notice("You shake [src] trying to pick [p_them()] up!")) to_chat(src, span_notice("[helper] shakes you to get you up!")) -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - EMOTES -- SENSITIVE SNOUT TRAIT ADDITION else if(helper.zone_selected == BODY_ZONE_PRECISE_MOUTH) nosound = TRUE - if(HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && !src.incapacitated(IGNORE_RESTRAINTS)) + if(HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && !INCAPACITATED_IGNORING(src, INCAPABLE_RESTRAINTS)) visible_message(span_warning("[helper] tries to boop [src] on the nose, but [p_they()] move[p_s()] out of the way.")) return else @@ -349,13 +334,11 @@ if(HAS_TRAIT(src, TRAIT_OVERSIZED) && !HAS_TRAIT(helper, TRAIT_OVERSIZED)) visible_message(span_warning("[helper] tries to pat [src] on the head, but can't reach!")) return - else if(HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && !src.incapacitated(IGNORE_RESTRAINTS)) + else if(HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && !INCAPACITATED_IGNORING(src, INCAPABLE_RESTRAINTS)) visible_message(span_warning("[helper] tries to pat [src] on the head, but [p_they()] move[p_s()] out of the way.")) return //SKYRAT EDIT ADDITION END -======= - else if(check_zone(helper.zone_selected) == BODY_ZONE_HEAD && get_bodypart(BODY_ZONE_HEAD)) //Headpats! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + else if(check_zone(helper.zone_selected) == BODY_ZONE_HEAD && get_bodypart(BODY_ZONE_HEAD)) //Headpats! //SKYRAT EDIT helper.visible_message(span_notice("[helper] gives [src] a pat on the head to make [p_them()] feel better!"), \ null, span_hear("You hear a soft patter."), DEFAULT_MESSAGE_RANGE, list(helper, src)) to_chat(helper, span_notice("You give [src] a pat on the head to make [p_them()] feel better!")) @@ -363,15 +346,12 @@ if(HAS_TRAIT(src, TRAIT_BADTOUCH)) to_chat(helper, span_warning("[src] looks visibly upset as you pat [p_them()] on the head.")) -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - EMOTES if(HAS_TRAIT(src, TRAIT_EXCITABLE)) var/obj/item/organ/external/tail/src_tail = get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) if(src_tail && !(src_tail.wag_flags & WAG_WAGGING)) emote("wag") //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if ((helper.zone_selected == BODY_ZONE_PRECISE_GROIN) && !isnull(src.get_organ_by_type(/obj/item/organ/external/tail))) helper.visible_message(span_notice("[helper] pulls on [src]'s tail!"), \ @@ -401,14 +381,11 @@ to_chat(helper, span_notice("You wrap [src] into a tight bear hug!")) to_chat(src, span_notice("[helper] squeezes you super tightly in a firm bear hug!")) else -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - if (HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && !src.incapacitated(IGNORE_RESTRAINTS)) + if (HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && !INCAPACITATED_IGNORING(src, INCAPABLE_RESTRAINTS)) visible_message(span_warning("[helper] tries to hug [src], but [p_they()] move[p_s()] out of the way.")) return // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 helper.visible_message(span_notice("[helper] hugs [src] to make [p_them()] feel better!"), \ null, span_hear("You hear the rustling of clothes."), DEFAULT_MESSAGE_RANGE, list(helper, src)) to_chat(helper, span_notice("You hug [src] to make [p_them()] feel better!")) @@ -464,16 +441,6 @@ if(!nosound) // SKYRAT EDIT ADDITION - EMOTES playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) // SKYRAT EDIT CHANGE - EMOTES - Original was unindented but otherwise the same - // Shake animation - if (incapacitated()) - shake_up_animation() - -/mob/proc/shake_up_animation() - var/direction = prob(50) ? -1 : 1 - animate(src, pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_OUT, flags = ANIMATION_PARALLEL) - animate(pixel_x = pixel_x - (SHAKE_ANIMATION_OFFSET * 2 * direction), time = 1) - animate(pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_IN) - // Shake animation if (incapacitated) shake_up_animation() @@ -641,19 +608,11 @@ if (!IS_ORGANIC_LIMB(limb)) . += (limb.brute_dam * limb.body_damage_coeff) + (limb.burn_dam * limb.body_damage_coeff) -<<<<<<< HEAD /mob/living/carbon/grabbedby(mob/living/user, supress_message = FALSE, grabbed_part) // SKYRAT EDIT CHANGE - ORIGINAL: /mob/living/carbon/grabbedby(mob/living/user, supress_message = FALSE) if(user != src) return ..() var/obj/item/bodypart/grasped_part = grabbed_part ? grabbed_part : get_bodypart(zone_selected) // SKYRAT EDIT CHANGE - ORIGINAL: var/obj/item/bodypart/grasped_part = get_bodypart(zone_selected) -======= -/mob/living/carbon/grabbedby(mob/living/user, supress_message = FALSE) - if(user != src) - return ..() - - var/obj/item/bodypart/grasped_part = get_bodypart(zone_selected) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!grasped_part?.can_be_grasped()) return var/starting_hand_index = active_hand_index diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 974305847e0..612d5e15a54 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -2,11 +2,7 @@ blood_volume = BLOOD_VOLUME_NORMAL gender = MALE pressure_resistance = 15 -<<<<<<< HEAD hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD,GLAND_HUD, DNR_HUD) // SKYRAT EDIT ADDITION - DNR ICON -======= - hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD,GLAND_HUD) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 has_limbs = TRUE held_items = list(null, null) num_legs = 0 //Populated on init through list/bodyparts @@ -129,9 +125,5 @@ var/bodyshape = BODYSHAPE_HUMANOID COOLDOWN_DECLARE(bleeding_message_cd) -<<<<<<< HEAD - var/next_smell = 0 //SKYRAT EDIT ADDITION /// Cooldown for the next smell -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index 977aea72fc5..e7a5b097592 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -53,18 +53,8 @@ overlays_standing[cache_index] = null SEND_SIGNAL(src, COMSIG_CARBON_REMOVE_OVERLAY, cache_index, I) -<<<<<<< HEAD -//used when putting/removing clothes that hide certain mutant body parts to just update those and not update the whole body. -/mob/living/carbon/human/proc/update_mutant_bodyparts() - dna?.species.handle_mutant_bodyparts(src) - update_body_parts() - -/mob/living/carbon/update_body(is_creating = FALSE) - dna?.species.handle_body(src) //This calls `handle_mutant_bodyparts` which calls `update_mutant_bodyparts()`. Don't double call! -======= /mob/living/carbon/update_body(is_creating = FALSE) dna?.species.handle_body(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 update_body_parts(is_creating) /mob/living/carbon/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) @@ -338,11 +328,8 @@ overlays_standing[WOUND_LAYER] = wound_overlay apply_overlay(WOUND_LAYER) -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular) /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/update_worn_mask(update_obscured = TRUE) remove_overlay(FACEMASK_LAYER) @@ -380,11 +367,8 @@ */ //SKYRAT EDIT REMOVAL END -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - TESHARI CLOTHES (moved to modular) /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/update_worn_back(update_obscured = TRUE) remove_overlay(BACK_LAYER) @@ -412,12 +396,9 @@ apply_overlay(LEGCUFF_LAYER) throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed) -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular) /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/update_worn_head(update_obscured = TRUE) remove_overlay(HEAD_LAYER) @@ -442,11 +423,7 @@ /mob/living/carbon/update_worn_handcuffs(update_obscured = TRUE) remove_overlay(HANDCUFF_LAYER) -<<<<<<< HEAD - if(handcuffed && !(handcuffed.item_flags & ABSTRACT)) //SKYRAT EDIT ADDED !(handcuffed.item_flags & ABSTRACT) -======= - if(handcuffed) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + if(handcuffed && !(handcuffed.item_flags & ABSTRACT)) //SKYRAT EDIT - ADDED !(handcuffed.item_flags & ABSTRACT) if(update_obscured) update_obscured_slots(handcuffed.flags_inv) var/mutable_appearance/handcuff_overlay = mutable_appearance('icons/mob/simple/mob.dmi', "handcuff1", -HANDCUFF_LAYER) @@ -486,14 +463,10 @@ //Overlays for the worn overlay so you can overlay while you overlay //eg: ammo counters, primed grenade flashing, etc. //"icon_file" is used automatically for inhands etc. to make sure it gets the right inhand file -<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN - CUSTOMIZATION // obj/item/proc/worn_overlays(mutable_appearance/standing, isinhands = FALSE, icon_file) - original /obj/item/proc/worn_overlays(mutable_appearance/standing, isinhands = FALSE, icon_file, mutant_styles = NONE) // SKYRAT EDIT CHANGE END -======= -/obj/item/proc/worn_overlays(mutable_appearance/standing, isinhands = FALSE, icon_file) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SHOULD_CALL_PARENT(TRUE) RETURN_TYPE(/list) @@ -509,13 +482,10 @@ var/list/needs_update = list() var/limb_count_update = FALSE for(var/obj/item/bodypart/limb as anything in bodyparts) -<<<<<<< HEAD // SKYRAT EDIT BEGIN - Don't handle abstract limbs (Taurs, etc.) if(!limb.show_icon) continue // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 limb.update_limb(is_creating = update_limb_data) //Update limb actually doesn't do much, get_limb_icon is the cpu eater. var/old_key = icon_render_keys?[limb.body_zone] //Checks the mob's icon render key list for the bodypart diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm index bfcaad078a8..b3c9f822749 100644 --- a/code/modules/mob/living/carbon/emote.dm +++ b/code/modules/mob/living/carbon/emote.dm @@ -28,11 +28,6 @@ vary = TRUE /datum/emote/living/carbon/clap/get_sound(mob/living/user) -<<<<<<< HEAD - if(!ishuman(user)) - return -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!user.get_bodypart(BODY_ZONE_L_ARM) || !user.get_bodypart(BODY_ZONE_R_ARM)) return return pick( @@ -41,11 +36,8 @@ 'sound/misc/clap3.ogg', 'sound/misc/clap4.ogg', ) -<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/emote/living/carbon/crack key = "crack" diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index fa40b42f23c..c71962eb034 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -6,11 +6,7 @@ var/t_has = p_have() var/t_is = p_are() -<<<<<<< HEAD . = list("This is [icon2html(src, user)] \a [src]!", EXAMINE_SECTION_BREAK) // SKYRAT EDIT CHANGE - HR padding -======= - . = list("This is [icon2html(src, user)] \a [src]!") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obscured = check_obscured_slots() if (handcuffed) @@ -29,12 +25,9 @@ if (back) . += "[t_He] [t_has] [back.get_examine_string(user)] on [t_his] back." -<<<<<<< HEAD . += EXAMINE_SECTION_BREAK // SKYRAT EDIT ADDITION - hr sections -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/appears_dead = FALSE if (stat == DEAD) appears_dead = TRUE diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index 1ed54616ba3..c345696cd05 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -56,18 +56,10 @@ GLOBAL_LIST_EMPTY(features_by_species) var/skinned_type ///flags for inventory slots the race can't equip stuff to. Golems cannot wear jumpsuits, for example. var/no_equip_flags -<<<<<<< HEAD - /// Allows the species to equip items that normally require a jumpsuit without having one equipped. Used by golems. - var/nojumpsuit = FALSE - ///Affects the speech message, for example: Motharula flutters, "My speech message is flutters!" - var/say_mod = "says" -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// What languages this species can understand and say. /// Use a [language holder datum][/datum/language_holder] typepath in this var. /// Should never be null. var/datum/language_holder/species_language_holder = /datum/language_holder/human_basic -<<<<<<< HEAD /** * Visible CURRENT bodyparts that are unique to a species. * DO NOT USE THIS AS A LIST OF ALL POSSIBLE BODYPARTS AS IT WILL FUCK @@ -79,8 +71,6 @@ GLOBAL_LIST_EMPTY(features_by_species) */ //var/list/mutant_bodyparts = list() //ORIGINAL var/list/list/mutant_bodyparts = list() //SKYRAT EDIT CHANGE - CUSTOMIZATION (typed list) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///The bodyparts this species uses. assoc of bodypart string - bodypart type. Make sure all the fucking entries are in or I'll skin you alive. var/list/bodypart_overrides = list( BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left, @@ -90,15 +80,8 @@ GLOBAL_LIST_EMPTY(features_by_species) BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right, BODY_ZONE_CHEST = /obj/item/bodypart/chest, ) -<<<<<<< HEAD - ///Internal organs that are unique to this race, like a tail. list(typepath of organ 1, typepath of organ 2) - var/list/mutant_organs = list() - ///List of external organs to generate like horns, frills, wings, etc. list(typepath of organ = "Round Beautiful BDSM Snout"). Still WIP - var/list/external_organs = list() -======= ///Internal organs that are unique to this race, like a tail or other cosmetic organs. list(typepath of organ 1, typepath of organ 2 = "Round"). var/list/mutant_organs = list() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Replaces default brain with a different organ var/obj/item/organ/internal/brain/mutantbrain = /obj/item/organ/internal/brain ///Replaces default heart with a different organ @@ -119,11 +102,7 @@ GLOBAL_LIST_EMPTY(features_by_species) var/obj/item/organ/internal/appendix/mutantappendix = /obj/item/organ/internal/appendix /// Store body marking defines. See mobs.dm for bitflags -<<<<<<< HEAD //var/list/body_markings = list() // SKYRAT EDIT REMOVAL - We already have this defined as an assoc list -======= - var/list/body_markings = list() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Flat modifier on all damage taken via [apply_damage][/mob/living/proc/apply_damage] (so being punched, shot, etc.) /// IE: 10 = 10% less damage taken. @@ -303,14 +282,10 @@ GLOBAL_LIST_EMPTY(features_by_species) if(ORGAN_SLOT_STOMACH) return mutantstomach else -<<<<<<< HEAD - CRASH("Invalid organ slot [slot]") -======= // Non-standard organs we might have for(var/obj/item/organ/extra_organ as anything in mutant_organs) if(initial(extra_organ.slot) == slot) return extra_organ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Corrects organs in a carbon, removing ones it doesn't need and adding ones it does. @@ -326,43 +301,6 @@ GLOBAL_LIST_EMPTY(features_by_species) * * visual_only - boolean, only load organs that change how the species looks. Do not use for normal gameplay stuff */ /datum/species/proc/regenerate_organs(mob/living/carbon/organ_holder, datum/species/old_species, replace_current = TRUE, list/excluded_zones, visual_only = FALSE) -<<<<<<< HEAD - //what should be put in if there is no mutantorgan (brains handled separately) - var/list/organ_slots = list( - ORGAN_SLOT_BRAIN, - ORGAN_SLOT_HEART, - ORGAN_SLOT_LUNGS, - ORGAN_SLOT_APPENDIX, - ORGAN_SLOT_EYES, - ORGAN_SLOT_EARS, - ORGAN_SLOT_TONGUE, - ORGAN_SLOT_LIVER, - ORGAN_SLOT_STOMACH, - ) - - for(var/slot in organ_slots) - var/obj/item/organ/existing_organ = organ_holder.get_organ_slot(slot) - var/obj/item/organ/new_organ = get_mutant_organ_type_for_slot(slot) - - if(isnull(new_organ)) // if they aren't suppose to have an organ here, remove it - if(existing_organ) - existing_organ.Remove(organ_holder, special = TRUE) - qdel(existing_organ) - continue - - // we don't want to remove organs that are not the default for this species - if(!isnull(existing_organ) && !remove_features) // SKYRAT EDIT - Fixes certain species lacking a tongue (Looks at abductor) - if(!isnull(old_species) && existing_organ.type != old_species.get_mutant_organ_type_for_slot(slot)) - continue - else if(!replace_current && existing_organ.type != get_mutant_organ_type_for_slot(slot)) - continue - - // at this point we already know new_organ is not null - if(existing_organ?.type == new_organ) - continue // we don't want to remove organs that are the same as the new one - - if(visual_only && !initial(new_organ.visual)) -======= for(var/slot in get_all_slots()) var/obj/item/organ/existing_organ = organ_holder.get_organ_slot(slot) var/obj/item/organ/new_organ = get_mutant_organ_type_for_slot(slot) @@ -377,7 +315,7 @@ GLOBAL_LIST_EMPTY(features_by_species) if(existing_organ) // we dont want to remove organs that were not from the old species (such as from freak surgery or prosthetics) - if(existing_organ.type != old_organ_type && !replace_current) + if(existing_organ.type != old_organ_type && !replace_current && !remove_features) // SKYRAT EDIT - Fixes certain species lacking a tongue (Looks at abductor) continue // we don't want to remove organs that are the same as the new one @@ -385,16 +323,11 @@ GLOBAL_LIST_EMPTY(features_by_species) continue if(visual_only && (!initial(new_organ.bodypart_overlay) && !initial(new_organ.visual))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue var/used_neworgan = FALSE new_organ = SSwardrobe.provide_type(new_organ) -<<<<<<< HEAD - var/should_have = new_organ.get_availability(src, organ_holder) -======= var/should_have = new_organ.get_availability(src, organ_holder) && should_visual_organ_apply_to(new_organ, organ_holder) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Check for an existing organ, and if there is one check to see if we should remove it var/health_pct = 1 @@ -418,49 +351,6 @@ GLOBAL_LIST_EMPTY(features_by_species) if(!used_neworgan) QDEL_NULL(new_organ) -<<<<<<< HEAD - if(!isnull(old_species)) - for(var/mutant_organ in old_species.mutant_organs) - if(mutant_organ in mutant_organs) - continue // need this mutant organ, but we already have it! - - var/obj/item/organ/current_organ = organ_holder.get_organ_by_type(mutant_organ) - if(current_organ) - current_organ.Remove(organ_holder) - QDEL_NULL(current_organ) - - for(var/obj/item/organ/external/external_organ in organ_holder.organs) - // External organ checking. We need to check the external organs owned by the carbon itself, - // because we want to also remove ones not shared by its species. - // This should be done even if species was not changed. - if(external_organ in external_organs) - continue // Don't remove external organs this species is supposed to have. - - external_organ.Remove(organ_holder) - QDEL_NULL(external_organ) - - var/list/species_organs = mutant_organs + external_organs - for(var/organ_path in species_organs) - var/obj/item/organ/current_organ = organ_holder.get_organ_by_type(organ_path) - if(ispath(organ_path, /obj/item/organ/external) && !should_external_organ_apply_to(organ_path, organ_holder)) - if(!isnull(current_organ) && replace_current) - // if we have an organ here and we're replacing organs, remove it - current_organ.Remove(organ_holder) - QDEL_NULL(current_organ) - continue - - if(!current_organ || replace_current) - var/obj/item/organ/replacement = SSwardrobe.provide_type(organ_path) - // If there's an existing mutant organ, we're technically replacing it. - // Let's abuse the snowflake proc that skillchips added. Basically retains - // feature parity with every other organ too. - if(current_organ) - current_organ.before_organ_replacement(replacement) - // organ.Insert will qdel any current organs in that slot, so we don't need to. - replacement.Insert(organ_holder, special=TRUE, movement_flags = DELETE_IF_REPLACED) - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/species/proc/worn_items_fit_body_check(mob/living/carbon/wearer) for(var/obj/item/equipped_item in wearer.get_equipped_items(INCLUDE_POCKETS)) var/equipped_item_slot = wearer.get_slot_by_item(equipped_item) @@ -502,11 +392,7 @@ GLOBAL_LIST_EMPTY(features_by_species) if(old_species.type != type) replace_body(human_who_gained_species, src) -<<<<<<< HEAD - regenerate_organs(human_who_gained_species, old_species, visual_only = human_who_gained_species.visual_only_organs) -======= regenerate_organs(human_who_gained_species, old_species, replace_current = FALSE, visual_only = human_who_gained_species.visual_only_organs) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Drop the items the new species can't wear INVOKE_ASYNC(src, PROC_REF(worn_items_fit_body_check), human_who_gained_species, TRUE) @@ -522,21 +408,7 @@ GLOBAL_LIST_EMPTY(features_by_species) //Resets blood if it is excessively high so they don't gib normalize_blood(human_who_gained_species) -<<<<<<< HEAD - if(ishuman(human_who_gained_species)) - var/mob/living/carbon/human/human = human_who_gained_species - for(var/obj/item/organ/external/organ_path as anything in external_organs) - if(!should_external_organ_apply_to(organ_path, human)) - continue - - //Load a persons preferences from DNA - var/obj/item/organ/external/new_organ = SSwardrobe.provide_type(organ_path) - new_organ.Insert(human, special=TRUE, movement_flags = DELETE_IF_REPLACED) - //add_body_markings(human_who_gained_species) // SKYRAT EDIT REMOVAL - We do this differently -======= - add_body_markings(human_who_gained_species) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(length(inherent_traits)) human_who_gained_species.add_traits(inherent_traits, SPECIES_TRAIT) @@ -576,13 +448,6 @@ GLOBAL_LIST_EMPTY(features_by_species) for(var/X in inherent_traits) REMOVE_TRAIT(C, X, SPECIES_TRAIT) -<<<<<<< HEAD - for(var/obj/item/organ/external/organ in C.organs) - organ.Remove(C) - qdel(organ) - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //If their inert mutation is not the same, swap it out if((inert_mutation != new_species.inert_mutation) && LAZYLEN(C.dna.mutation_index) && (inert_mutation in C.dna.mutation_index)) C.dna.remove_mutation(inert_mutation) @@ -612,65 +477,19 @@ GLOBAL_LIST_EMPTY(features_by_species) SEND_SIGNAL(C, COMSIG_SPECIES_LOSS, src) -/** -<<<<<<< HEAD - * Proc called when mail goodies need to be updated for this species. - * - * Updates the mail goodies if that is required. e.g. for the blood deficiency quirk, which sends bloodbags to quirk holders, update the sent bloodpack to match the species' exotic blood. - * This is currently only used for the blood deficiency quirk but more can be added as needed. - * Arguments: - * * mob/living/carbon/human/recipient - the mob receiving the mail goodies - */ -/datum/species/proc/update_mail_goodies(mob/living/carbon/human/recipient) - update_quirk_mail_goodies(recipient, recipient.get_quirk(/datum/quirk/blooddeficiency)) - -/** - * Updates the mail goodies of a specific quirk. - * - * Updates the mail goodies belonging to a specific quirk. - * Add implementation as needed for each individual species. The base species proc should give the species the 'default' version of whatever mail goodies are required. - * Arguments: - * * mob/living/carbon/human/recipient - the mob receiving the mail goodies - * * datum/quirk/quirk - the quirk to update the mail goodies of. Use get_quirk(datum/quirk/some_quirk) to get the actual mob's quirk to pass. - * * list/mail_goodies - a list of mail goodies. Generally speaking you should not be using this argument on the initial function call. You should instead add to the species' implementation of this proc. - */ -/datum/species/proc/update_quirk_mail_goodies(mob/living/carbon/human/recipient, datum/quirk/quirk, list/mail_goodies) - if(isnull(quirk)) - return - if(length(mail_goodies)) - quirk.mail_goodies = mail_goodies - return - if(istype(quirk, /datum/quirk/blooddeficiency)) - if(HAS_TRAIT(recipient, TRAIT_NOBLOOD) && isnull(recipient.dna.species.exotic_blood)) // TRAIT_NOBLOOD and no exotic blood (yes we have to check for both, jellypeople exist) - quirk.mail_goodies = list() // means no blood pack gets sent to them. - return - /** * Handles the body of a human * * Handles lipstick, having no eyes, eye color, undergarnments like underwear, undershirts, and socks, and body layers. - * Calls [handle_mutant_bodyparts][/datum/species/proc/handle_mutant_bodyparts] * Arguments: * * species_human - Human, whoever we're handling the body for */ //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular) /* -/datum/species/proc/handle_body(mob/living/carbon/human/species_human) - species_human.remove_overlay(BODY_LAYER) - if(HAS_TRAIT(species_human, TRAIT_INVISIBLE_MAN)) - return handle_mutant_bodyparts(species_human) -======= - * Handles the body of a human - * - * Handles lipstick, having no eyes, eye color, undergarnments like underwear, undershirts, and socks, and body layers. - * Arguments: - * * species_human - Human, whoever we're handling the body for - */ /datum/species/proc/handle_body(mob/living/carbon/human/species_human) species_human.remove_overlay(BODY_LAYER) if(HAS_TRAIT(species_human, TRAIT_INVISIBLE_MAN)) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/standing = list() if(!HAS_TRAIT(species_human, TRAIT_HUSK)) @@ -689,11 +508,7 @@ GLOBAL_LIST_EMPTY(features_by_species) var/mutable_appearance/underwear_overlay if(underwear) if(species_human.dna.species.sexes && species_human.physique == FEMALE && (underwear.gender == MALE)) -<<<<<<< HEAD - underwear_overlay = wear_female_version(underwear.icon_state, underwear.icon, BODY_LAYER, FEMALE_UNIFORM_FULL) -======= underwear_overlay = mutable_appearance(wear_female_version(underwear.icon_state, underwear.icon, FEMALE_UNIFORM_FULL), layer = -BODY_LAYER) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else underwear_overlay = mutable_appearance(underwear.icon, underwear.icon_state, -BODY_LAYER) if(!underwear.use_static) @@ -705,15 +520,9 @@ GLOBAL_LIST_EMPTY(features_by_species) if(undershirt) var/mutable_appearance/working_shirt if(species_human.dna.species.sexes && species_human.physique == FEMALE) -<<<<<<< HEAD - working_shirt = wear_female_version(undershirt.icon_state, undershirt.icon, BODY_LAYER) - else - working_shirt = mutable_appearance(undershirt.icon, undershirt.icon_state, -BODY_LAYER) -======= working_shirt = mutable_appearance(wear_female_version(undershirt.icon_state, undershirt.icon), layer = -BODY_LAYER) else working_shirt = mutable_appearance(undershirt.icon, undershirt.icon_state, layer = -BODY_LAYER) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 standing += working_shirt if(species_human.socks && species_human.num_legs >= 2 && !(species_human.bodyshape & BODYSHAPE_DIGITIGRADE)) @@ -725,114 +534,9 @@ GLOBAL_LIST_EMPTY(features_by_species) species_human.overlays_standing[BODY_LAYER] = standing species_human.apply_overlay(BODY_LAYER) -<<<<<<< HEAD - handle_mutant_bodyparts(species_human) - -*/ -//SKYRAT EDIT REMOVAL END - -/** - * Handles the mutant bodyparts of a human - * - * Handles the adding and displaying of, layers, colors, and overlays of mutant bodyparts and accessories. - * Handles digitigrade leg displaying and squishing. - * Arguments: - * * H - Human, whoever we're handling the body for - * * forced_colour - The forced color of an accessory. Leave null to use mutant color. - */ -//SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular) -/* -/datum/species/proc/handle_mutant_bodyparts(mob/living/carbon/human/source, forced_colour) - var/list/bodyparts_to_add = mutant_bodyparts.Copy() - var/list/relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER) - var/list/standing = list() - - source.remove_overlay(BODY_BEHIND_LAYER) - source.remove_overlay(BODY_ADJ_LAYER) - source.remove_overlay(BODY_FRONT_LAYER) - - if(!mutant_bodyparts || HAS_TRAIT(source, TRAIT_INVISIBLE_MAN)) - return - - var/obj/item/bodypart/head/noggin = source.get_bodypart(BODY_ZONE_HEAD) - - - if(mutant_bodyparts["ears"]) - if(!source.dna.features["ears"] || source.dna.features["ears"] == "None" || source.head && (source.head.flags_inv & HIDEHAIR) || (source.wear_mask && (source.wear_mask.flags_inv & HIDEHAIR)) || !noggin || IS_ROBOTIC_LIMB(noggin)) - bodyparts_to_add -= "ears" - - if(!bodyparts_to_add) - return - - var/g = (source.physique == FEMALE) ? "f" : "m" - - for(var/layer in relevent_layers) - var/layertext = mutant_bodyparts_layertext(layer) - - for(var/bodypart in bodyparts_to_add) - var/datum/sprite_accessory/accessory - switch(bodypart) - if("ears") - accessory = SSaccessories.ears_list[source.dna.features["ears"]] - if("legs") - accessory = SSaccessories.legs_list[source.dna.features["legs"]] - - if(!accessory || accessory.icon_state == "none") - continue - - var/mutable_appearance/accessory_overlay = mutable_appearance(accessory.icon, layer = -layer) - - if(accessory.gender_specific) - accessory_overlay.icon_state = "[g]_[bodypart]_[accessory.icon_state]_[layertext]" - else - accessory_overlay.icon_state = "m_[bodypart]_[accessory.icon_state]_[layertext]" - - if(accessory.em_block) - accessory_overlay.overlays += emissive_blocker(accessory_overlay.icon, accessory_overlay.icon_state, source, accessory_overlay.alpha) - - if(accessory.center) - accessory_overlay = center_image(accessory_overlay, accessory.dimension_x, accessory.dimension_y) - - if(!(HAS_TRAIT(source, TRAIT_HUSK))) - if(!forced_colour) - switch(accessory.color_src) - if(MUTANT_COLOR) - accessory_overlay.color = fixed_mut_color || source.dna.features["mcolor"] - if(HAIR_COLOR) - accessory_overlay.color = get_fixed_hair_color(source) || source.hair_color - if(FACIAL_HAIR_COLOR) - accessory_overlay.color = get_fixed_hair_color(source) || source.facial_hair_color - if(EYE_COLOR) - accessory_overlay.color = source.eye_color_left - else - accessory_overlay.color = forced_colour - standing += accessory_overlay - - if(accessory.hasinner) - var/mutable_appearance/inner_accessory_overlay = mutable_appearance(accessory.icon, layer = -layer) - if(accessory.gender_specific) - inner_accessory_overlay.icon_state = "[g]_[bodypart]inner_[accessory.icon_state]_[layertext]" - else - inner_accessory_overlay.icon_state = "m_[bodypart]inner_[accessory.icon_state]_[layertext]" - - if(accessory.center) - inner_accessory_overlay = center_image(inner_accessory_overlay, accessory.dimension_x, accessory.dimension_y) - - standing += inner_accessory_overlay - - source.overlays_standing[layer] = standing.Copy() - standing = list() - - source.apply_overlay(BODY_BEHIND_LAYER) - source.apply_overlay(BODY_ADJ_LAYER) - source.apply_overlay(BODY_FRONT_LAYER) - - update_body_markings(source) -*/ -//SKYRAT EDIT REMOVAL END -======= update_body_markings(species_human) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +*/ +//SKYRAT EDIT REMOVAL END //This exists so sprite accessories can still be per-layer without having to include that layer's //number in their sprite name, which causes issues when those numbers change. @@ -844,15 +548,12 @@ GLOBAL_LIST_EMPTY(features_by_species) return "ADJ" if(BODY_FRONT_LAYER) return "FRONT" -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(BODY_FRONT_UNDER_CLOTHES) return "FRONT_UNDER" if(ABOVE_BODY_FRONT_HEAD_LAYER) return "FRONT_OVER" //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Proc that will randomise the hair, or primary appearance element (i.e. for moths wings) of a species' associated mob /datum/species/proc/randomize_main_appearance_element(mob/living/carbon/human/human_mob) @@ -864,10 +565,7 @@ GLOBAL_LIST_EMPTY(features_by_species) human_mob.undershirt = random_undershirt(human_mob.gender) human_mob.underwear = random_underwear(human_mob.gender) human_mob.socks = random_socks(human_mob.gender) -<<<<<<< HEAD human_mob.bra = random_bra(human_mob.gender) //SKYRAT EDIT ADDITION - Underwear and Bra split -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Proc that will randomise the underwear (i.e. top, pants and socks) of a species' associated mob /datum/species/proc/randomize_active_underwear(mob/living/carbon/human/human_mob) @@ -888,13 +586,9 @@ GLOBAL_LIST_EMPTY(features_by_species) var/list/new_features = list() var/static/list/organs_to_randomize = list() -<<<<<<< HEAD - for(var/obj/item/organ/external/organ_path as anything in external_organs) -======= for(var/obj/item/organ/organ_path as anything in mutant_organs) if(!organ_path.bodypart_overlay) continue ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/overlay_path = initial(organ_path.bodypart_overlay) var/datum/bodypart_overlay/mutant/sample_overlay = organs_to_randomize[overlay_path] if(isnull(sample_overlay)) @@ -913,11 +607,7 @@ GLOBAL_LIST_EMPTY(features_by_species) H.adjustBruteLoss(0.5 * seconds_per_tick) /datum/species/proc/can_equip(obj/item/I, slot, disable_warning, mob/living/carbon/human/H, bypass_equip_delay_self = FALSE, ignore_equipped = FALSE, indirect_action = FALSE) -<<<<<<< HEAD if(no_equip_flags & slot && !(I.is_mod_shell_component() && (modsuit_slot_exceptions & slot))) // SKYRAT EDIT ADDITION - ORIGINAL: if(no_equip_flags & slot) -======= - if(no_equip_flags & slot) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!I.species_exception || !is_type_in_list(src, I.species_exception)) return FALSE @@ -933,11 +623,7 @@ GLOBAL_LIST_EMPTY(features_by_species) // Anything that's small or smaller can fit into a pocket by default if((slot & (ITEM_SLOT_RPOCKET|ITEM_SLOT_LPOCKET)) && I.w_class <= POCKET_WEIGHT_CLASS) excused = TRUE -<<<<<<< HEAD - else if(slot & (ITEM_SLOT_SUITSTORE|ITEM_SLOT_BACKPACK|ITEM_SLOT_HANDS)) -======= else if(slot & (ITEM_SLOT_SUITSTORE|ITEM_SLOT_BACKPACK|ITEM_SLOT_BELTPACK|ITEM_SLOT_HANDS)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 excused = TRUE if(!excused) return FALSE @@ -964,21 +650,13 @@ GLOBAL_LIST_EMPTY(features_by_species) if(ITEM_SLOT_FEET) if(H.num_legs < 2) return FALSE -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - if((H.bodyshape & BODYSHAPE_DIGITIGRADE) && !(I.item_flags & IGNORE_DIGITIGRADE)) - if(!(I.supports_variations_flags & (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON))) - if(!disable_warning) - to_chat(H, span_warning("The footwear around here isn't compatible with your feet!")) - return FALSE - */ -======= if((H.bodyshape & BODYSHAPE_DIGITIGRADE) && !(I.item_flags & IGNORE_DIGITIGRADE)) if(!(I.supports_variations_flags & DIGITIGRADE_VARIATIONS)) if(!disable_warning) to_chat(H, span_warning("The footwear around here isn't compatible with your feet!")) return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + */ return equip_delay_self_check(I, H, bypass_equip_delay_self) if(ITEM_SLOT_BELT) var/obj/item/bodypart/O = H.get_bodypart(BODY_ZONE_CHEST) @@ -988,13 +666,10 @@ GLOBAL_LIST_EMPTY(features_by_species) to_chat(H, span_warning("You need a jumpsuit before you can attach this [I.name]!")) return FALSE return equip_delay_self_check(I, H, bypass_equip_delay_self) -<<<<<<< HEAD -======= if(ITEM_SLOT_BELTPACK) if(H.belt && H.belt.atom_storage?.can_insert(I, H, messages = TRUE, force = indirect_action ? STORAGE_SOFT_LOCKED : STORAGE_NOT_LOCKED)) return TRUE return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ITEM_SLOT_EYES) if(!H.get_bodypart(BODY_ZONE_HEAD)) return FALSE @@ -1079,10 +754,6 @@ GLOBAL_LIST_EMPTY(features_by_species) if(H.back && H.back.atom_storage?.can_insert(I, H, messages = TRUE, force = indirect_action ? STORAGE_SOFT_LOCKED : STORAGE_NOT_LOCKED)) return TRUE return FALSE -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE //Unsupported slot /datum/species/proc/equip_delay_self_check(obj/item/I, mob/living/carbon/human/H, bypass_equip_delay_self) @@ -1287,21 +958,14 @@ GLOBAL_LIST_EMPTY(features_by_species) var/attack_direction = get_dir(user, target) var/attack_type = attacking_bodypart.attack_type -<<<<<<< HEAD var/unarmed_sharpness = attacking_bodypart.unarmed_sharpness //SKYRAT EDIT ADDITION - If unarmed damage sharpness needs to be taken into account. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(atk_effect == ATTACK_EFFECT_KICK || grappled) //kicks and punches when grappling bypass armor slightly. if(damage >= 9) target.force_say() log_combat(user, target, grappled ? "grapple punched" : "kicked") target.apply_damage(damage, attack_type, affecting, armor_block - limb_accuracy, attack_direction = attack_direction) else // Normal attacks do not gain the benefit of armor penetration. -<<<<<<< HEAD target.apply_damage(damage, attack_type, affecting, armor_block, attack_direction = attack_direction, sharpness = unarmed_sharpness) //SKYRAT EDIT - Applies sharpness if it does - ORIGINAL: target.apply_damage(damage, attack_type, affecting, armor_block, attack_direction = attack_direction) -======= - target.apply_damage(damage, attack_type, affecting, armor_block, attack_direction = attack_direction) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(damage >= 9) target.force_say() log_combat(user, target, "punched") @@ -1478,7 +1142,6 @@ GLOBAL_LIST_EMPTY(features_by_species) // Get the temperature of the environment for area var/area_temp = humi.get_temperature(environment) -<<<<<<< HEAD //SKYRAT EDIT ADDITION //Special handling for getting liquids temperature if(isturf(humi.loc)) @@ -1487,8 +1150,6 @@ GLOBAL_LIST_EMPTY(features_by_species) var/submergment_percent = SUBMERGEMENT_PERCENT(humi, T.liquids) area_temp = (area_temp*(1-submergment_percent)) + (T.liquids.temp * submergment_percent) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Get the insulation value based on the area's temp var/thermal_protection = humi.get_insulation_protection(area_temp) @@ -1767,11 +1428,8 @@ GLOBAL_LIST_EMPTY(features_by_species) former_tail_owner.clear_mood_event("tail_balance_lost") former_tail_owner.clear_mood_event("tail_regained") -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - MOVED TO MODULAR -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Returns a list of strings representing features this species has. /// Used by the preferences UI to know what buttons to show. /datum/species/proc/get_features() @@ -1785,24 +1443,14 @@ GLOBAL_LIST_EMPTY(features_by_species) var/datum/preference/preference = GLOB.preference_entries[preference_type] if ( \ -<<<<<<< HEAD - (preference.relevant_mutant_bodypart in mutant_bodyparts) \ - || (preference.relevant_inherent_trait in inherent_traits) \ - || (preference.relevant_external_organ in external_organs) \ -======= (preference.relevant_inherent_trait in inherent_traits) \ || (preference.relevant_external_organ in mutant_organs) \ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 || (preference.relevant_head_flag && check_head_flags(preference.relevant_head_flag)) \ || (preference.relevant_body_markings in body_markings) \ ) features += preference.savefile_key -<<<<<<< HEAD - for (var/obj/item/organ/external/organ_type as anything in external_organs) -======= for (var/obj/item/organ/organ_type as anything in mutant_organs) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/preference = initial(organ_type.preference) if (!isnull(preference)) features += preference @@ -1810,10 +1458,7 @@ GLOBAL_LIST_EMPTY(features_by_species) GLOB.features_by_species[type] = features return features -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Given a human, will adjust it before taking a picture for the preferences UI. /// This should create a CONSISTENT result, so the icons don't randomly change. @@ -1851,11 +1496,7 @@ GLOBAL_LIST_EMPTY(features_by_species) /datum/species/proc/get_types_to_preload() var/list/to_store = list() to_store += mutant_organs -<<<<<<< HEAD - for(var/obj/item/organ/external/horny as anything in external_organs) -======= for(var/obj/item/organ/horny as anything in mutant_organs) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_store += horny //Haha get it? //Don't preload brains, cause reuse becomes a horrible headache @@ -1902,11 +1543,7 @@ GLOBAL_LIST_EMPTY(features_by_species) /datum/species/proc/get_species_description() SHOULD_CALL_PARENT(FALSE) -<<<<<<< HEAD - //stack_trace("Species [name] ([type]) did not have a description set, and is a selectable roundstart race! Override get_species_description.") -======= - stack_trace("Species [name] ([type]) did not have a description set, and is a selectable roundstart race! Override get_species_description.") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + //stack_trace("Species [name] ([type]) did not have a description set, and is a selectable roundstart race! Override get_species_description.") // SKYRAT EDIT REMOVAL return "No species description set, file a bug report!" /** @@ -1920,11 +1557,7 @@ GLOBAL_LIST_EMPTY(features_by_species) SHOULD_CALL_PARENT(FALSE) RETURN_TYPE(/list) -<<<<<<< HEAD - //stack_trace("Species [name] ([type]) did not have lore set, and is a selectable roundstart race! Override get_species_lore.") -======= - stack_trace("Species [name] ([type]) did not have lore set, and is a selectable roundstart race! Override get_species_lore.") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + //stack_trace("Species [name] ([type]) did not have lore set, and is a selectable roundstart race! Override get_species_lore.") // SKYRAT EDIT REMOVAL return list("No species lore set, file a bug report!") /** @@ -2341,15 +1974,11 @@ GLOBAL_LIST_EMPTY(features_by_species) SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, SPECIES_PERK_ICON = "comment", SPECIES_PERK_NAME = "Native Speaker", -<<<<<<< HEAD /* SKYRAT EDIT - Digitigrade customization - ORIGINAL: SPECIES_PERK_DESC = "Alongside [initial(common_language.name)], [plural_form] gain the ability to speak [english_list(bonus_languages)].", */ // ORIGINAL END - SKYRAT EDIT START: SPECIES_PERK_DESC = "Alongside [initial(common_language.name)], [plural_form] commonly speak [english_list(bonus_languages)].", // SKYRAT EDIT END -======= - SPECIES_PERK_DESC = "Alongside [initial(common_language.name)], [plural_form] gain the ability to speak [english_list(bonus_languages)].", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) else @@ -2367,7 +1996,6 @@ GLOBAL_LIST_EMPTY(features_by_species) new_species ||= target.dna.species //If no new species is provided, assume its src. //Note for future: Potentionally add a new C.dna.species() to build a template species for more accurate limb replacement -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Synth digitigrade sanitization var/ignore_digi = FALSE // You can jack into this var with other checks, if you want. if(issynthetic(target)) @@ -2394,12 +2022,6 @@ GLOBAL_LIST_EMPTY(features_by_species) if(l_leg) final_bodypart_overrides[BODY_ZONE_L_LEG] = initial(l_leg.digitigrade_type) // SKYRAT EDIT END -======= - var/list/final_bodypart_overrides = new_species.bodypart_overrides.Copy() - if((new_species.digitigrade_customization == DIGITIGRADE_OPTIONAL && target.dna.features["legs"] == DIGITIGRADE_LEGS) || new_species.digitigrade_customization == DIGITIGRADE_FORCED) - final_bodypart_overrides[BODY_ZONE_R_LEG] = /obj/item/bodypart/leg/right/digitigrade - final_bodypart_overrides[BODY_ZONE_L_LEG] = /obj/item/bodypart/leg/left/digitigrade ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/obj/item/bodypart/old_part as anything in target.bodyparts) if((old_part.change_exempt_flags & BP_BLOCK_CHANGE_SPECIES) || (old_part.bodypart_flags & BODYPART_IMPLANTED)) @@ -2486,13 +2108,10 @@ GLOBAL_LIST_EMPTY(features_by_species) /// Update the overlays if necessary /datum/species/proc/update_body_markings(mob/living/carbon/human/hooman) -<<<<<<< HEAD -======= if(HAS_TRAIT(hooman, TRAIT_INVISIBLE_MAN)) remove_body_markings(hooman) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/needs_update = FALSE for(var/datum/bodypart_overlay/simple/body_marking/marking as anything in body_markings) if(initial(marking.dna_feature_key) == body_markings[marking]) // dna is same as our species (sort of mini-cache), so no update needed diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 28c8cda518c..f63e692a118 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -66,10 +66,7 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift) //SKYRAT EDIT REMOVAL START /* ADD_TRAIT(src, TRAIT_BADDNA, CHANGELING_DRAIN) -<<<<<<< HEAD */ //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 blood_volume = 0 return TRUE diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index d142cf7a456..b3951731a8f 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -18,11 +18,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) /mob/living/carbon/human/dummy/attach_rot(mapload) return -<<<<<<< HEAD /mob/living/carbon/human/dummy/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE, list/override_features, list/override_mutantparts, list/override_markings, retain_features = FALSE, retain_mutantparts = FALSE) // SKYRAT EDIT - Customization -======= -/mob/living/carbon/human/dummy/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 harvest_organs() return ..() @@ -107,10 +103,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) /proc/create_consistent_human_dna(mob/living/carbon/human/target) target.dna.features["mcolor"] = COLOR_VIBRANT_LIME target.dna.features["ethcolor"] = COLOR_WHITE -<<<<<<< HEAD /* SKYRAT EDIT START REMOVAL START - Customization -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.dna.features["lizard_markings"] = get_consistent_feature_entry(SSaccessories.lizard_markings_list) target.dna.features["ears"] = get_consistent_feature_entry(SSaccessories.ears_list) target.dna.features["frills"] = get_consistent_feature_entry(SSaccessories.frills_list) @@ -124,10 +117,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) target.dna.features["tail_lizard"] = get_consistent_feature_entry(SSaccessories.tails_list_lizard) target.dna.features["tail_monkey"] = get_consistent_feature_entry(SSaccessories.tails_list_monkey) target.dna.features["pod_hair"] = get_consistent_feature_entry(SSaccessories.pod_hair_list) -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target.dna.initialize_dna(create_mutation_blocks = FALSE, randomize_features = FALSE) // UF and UI are nondeterministic, even though the features are the same some blocks will randomize slightly // In practice this doesn't matter, but this is for the sake of 100%(ish) consistency @@ -190,12 +180,9 @@ GLOBAL_LIST_EMPTY(dummy_mob_list) if(ishuman(target)) var/mob/living/carbon/human/human_target = target human_target.copy_clothing_prefs(copycat) -<<<<<<< HEAD // SKYRAT EDIT target?.client?.prefs?.apply_prefs_to(copycat, TRUE) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 copycat.updateappearance(icon_update=TRUE, mutcolor_update=TRUE, mutations_overlay_update=TRUE) else diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index cf52fc0e459..f6f0dc00ec8 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -8,14 +8,11 @@ var/t_is = p_are() var/obscure_name var/obscure_examine -<<<<<<< HEAD // SKYRAT EDIT START var/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isliving(user)) var/mob/living/L = user @@ -24,7 +21,6 @@ if(HAS_TRAIT(src, TRAIT_UNKNOWN)) obscure_name = TRUE obscure_examine = TRUE -<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - CUSTOMIZATION var/species_visible @@ -57,8 +53,6 @@ if(dna?.species && !skipface) apparent_species = ", \an [dna.species.name]" . = list("*---------*\nThis is [!obscure_name ? name : "Unknown"][apparent_species]!") -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = list("This is [!obscure_name ? name : "Unknown"]!") @@ -66,11 +60,8 @@ return list("You're struggling to make out any details...") var/obscured = check_obscured_slots() -<<<<<<< HEAD var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) */ //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //uniform if(w_uniform && !(obscured & ITEM_SLOT_ICLOTHING) && !(w_uniform.item_flags & EXAMINE_SKIP)) @@ -150,11 +141,8 @@ . += wear_id.get_id_examine_strings(user) -<<<<<<< HEAD . += EXAMINE_SECTION_BREAK // SKYRAT EDIT ADDITION - hr sections -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Status effects var/list/status_examines = get_status_effect_examinations() if (length(status_examines)) @@ -378,11 +366,7 @@ if(!key) msg += "[span_deadsay("[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.")]\n" else if(!client) -<<<<<<< HEAD msg += "[span_deadsay("[t_He] [t_has] a blank, absent-minded stare and [t_has] been completely unresponsive to anything for [round(((world.time - lastclienttime) / (1 MINUTES)),1)] minutes. [t_He] may snap out of it soon.")]\n" // SKYRAT EDIT CHANGE - SSD_INDICATOR - ORIGINAL: msg += "[span_deadsay("[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.")]\n" -======= - msg += "[span_deadsay("[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.")]\n" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/scar_severity = 0 for(var/i in all_scars) @@ -440,13 +424,10 @@ if(target_record) . += "\[Medical evaluation\]
" . += "\[See quirks\]" -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - EXAMINE RECORDS if(target_record && length(target_record.past_medical_records) > RECORDS_INVISIBLE_THRESHOLD) . += "\[View medical records\]" //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HAS_TRAIT(user, TRAIT_SECURITY_HUD)) if((user.stat == CONSCIOUS || isobserver(user)) && user != src) @@ -469,7 +450,6 @@ . += jointext(list("\[Add citation\]", "\[Add crime\]", "\[Add note\]"), "") -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - EXAMINE RECORDS if(target_record && length(target_record.past_security_records) > RECORDS_INVISIBLE_THRESHOLD) . += "\[View past security records\]" @@ -542,20 +522,6 @@ /mob/living/proc/get_status_effect_examinations() var/list/examine_list = list() -======= - if(isobserver(user)) - . += span_info("\nQuirks: [get_quirk_string(FALSE, CAT_QUIRK_ALL)]") - . += "" - - SEND_SIGNAL(src, COMSIG_ATOM_EXAMINE, user, .) - -/** - * Shows any and all examine text related to any status effects the user has. - */ -/mob/living/proc/get_status_effect_examinations() - var/list/examine_list = list() - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/status_effect/effect as anything in status_effects) var/effect_text = effect.get_examine_text() if(!effect_text) @@ -574,15 +540,10 @@ return var/age_text switch(age) -<<<<<<< HEAD if(-INFINITY to 17) // SKYRAT EDIT ADD START -- AGE EXAMINE age_text = "too young to be here" if(18 to 25) age_text = "a young adult" // SKYRAT EDIT END -======= - if(-INFINITY to 25) - age_text = "very young" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(26 to 35) age_text = "of adult age" if(36 to 55) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 1e0896450b9..e8308e2c755 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -18,49 +18,9 @@ set_species(dna.species.type) prepare_huds() //Prevents a nasty runtime on human init -<<<<<<< HEAD . = ..() - RegisterSignal(src, COMSIG_COMPONENT_CLEAN_FACE_ACT, PROC_REF(clean_face)) - AddComponent(/datum/component/personal_crafting) - AddElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 0.6, -6) //SKYRAT EDIT CHANGE - AESTHETICS - AddComponent(/datum/component/bloodysoles/feet, FOOTPRINT_SPRITE_SHOES) - AddElement(/datum/element/ridable, /datum/component/riding/creature/human) - AddElement(/datum/element/strippable, GLOB.strippable_human_items, TYPE_PROC_REF(/mob/living/carbon/human/, should_strip)) - var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = PROC_REF(on_entered), - COMSIG_LIVING_DISARM_PRESHOVE = PROC_REF(disarm_precollide), - COMSIG_LIVING_DISARM_COLLIDE = PROC_REF(disarm_collision), - ) - AddElement(/datum/element/connect_loc, loc_connections) - GLOB.human_list += src - SSopposing_force.give_opfor_button(src) //SKYRAT EDIT - OPFOR SYSTEM - -/mob/living/carbon/human/proc/setup_physiology() - physiology = new() -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - -/mob/living/carbon/human/proc/setup_mood() - if (CONFIG_GET(flag/disable_human_mood)) - return - mob_mood = new /datum/mood(src) - -<<<<<<< HEAD -/mob/living/carbon/human/dummy/setup_mood() - return - -/// This proc is for holding effects applied when a mob is missing certain organs -/// It is called very, very early in human init because all humans innately spawn with no organs and gain them during init -/// Gaining said organs removes these effects -/mob/living/carbon/human/proc/setup_organless_effects() - // All start without eyes, and get them via set species - become_blind(NO_EYES) - // Mobs cannot taste anything without a tongue; the tongue organ removes this on Insert - ADD_TRAIT(src, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) - -======= RegisterSignal(src, COMSIG_COMPONENT_CLEAN_FACE_ACT, PROC_REF(clean_face)) AddComponent(/datum/component/personal_crafting) AddElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 1, -6) @@ -95,7 +55,6 @@ // Mobs cannot taste anything without a tongue; the tongue organ removes this on Insert ADD_TRAIT(src, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/proc/setup_human_dna() randomize_human_normie(src, randomize_mutations = TRUE) @@ -234,7 +193,6 @@ if(quirkstring) to_chat(human_user, "Detected physiological traits:\n[quirkstring]") else -<<<<<<< HEAD to_chat(usr, "No physiological traits found.") //SKYRAT EDIT ADDITION BEGIN - EXAMINE RECORDS if(href_list["medrecords"]) @@ -242,9 +200,6 @@ if(href_list["genrecords"]) to_chat(usr, "General Record: [target_record.past_general_records]") //SKYRAT EDIT END -======= - to_chat(human_user, "No physiological traits found.") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return //Medical HUD ends here. if(href_list["hud"] == "s") @@ -310,7 +265,6 @@ if(!crime.valid) sec_record_message += span_notice("\n-- REDACTED --") continue -<<<<<<< HEAD sec_record_message += "\nCrime: [crime.name]" sec_record_message += "\nDetails: [crime.details]" @@ -356,53 +310,6 @@ return var/datum/crime/new_crime = new(name = crime_name, author = allowed_access) -======= - - sec_record_message += "\nCrime: [crime.name]" - sec_record_message += "\nDetails: [crime.details]" - sec_record_message += "\nAdded by [crime.author] at [crime.time]" - to_chat(human_or_ghost_user, examine_block(sec_record_message)) - return - if(ishuman(human_or_ghost_user)) - var/mob/living/carbon/human/human_user = human_or_ghost_user - if(href_list["add_citation"]) - var/max_fine = CONFIG_GET(number/maxfine) - var/citation_name = tgui_input_text(human_user, "Citation crime", "Security HUD") - var/fine = tgui_input_number(human_user, "Citation fine", "Security HUD", 50, max_fine, 5) - if(!fine || !target_record || !citation_name || !allowed_access || !isnum(fine) || fine > max_fine || fine <= 0 || !human_user.canUseHUD() || !HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) - return - - var/datum/crime/citation/new_citation = new(name = citation_name, author = allowed_access, fine = fine) - - target_record.citations += new_citation - new_citation.alert_owner(usr, src, target_record.name, "You have been fined [fine] credits for '[citation_name]'. Fines may be paid at security.") - investigate_log("New Citation: [citation_name] Fine: [fine] | Added to [target_record.name] by [key_name(human_user)]", INVESTIGATE_RECORDS) - SSblackbox.ReportCitation(REF(new_citation), human_user.ckey, human_user.real_name, target_record.name, citation_name, fine) - - return - - if(href_list["add_crime"]) - var/crime_name = tgui_input_text(human_user, "Crime name", "Security HUD") - if(!target_record || !crime_name || !allowed_access || !human_user.canUseHUD() || !HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) - return - - var/datum/crime/new_crime = new(name = crime_name, author = allowed_access) - - target_record.crimes += new_crime - investigate_log("New Crime: [crime_name] | Added to [target_record.name] by [key_name(human_user)]", INVESTIGATE_RECORDS) - to_chat(human_user, span_notice("Successfully added a crime.")) - - return - - if(href_list["add_note"]) - var/new_note = tgui_input_text(human_user, "Security note", "Security Records", multiline = TRUE) - if(!target_record || !new_note || !allowed_access || !human_user.canUseHUD() || !HAS_TRAIT(human_user, TRAIT_SECURITY_HUD)) - return - - target_record.security_note = new_note - - return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target_record.crimes += new_crime investigate_log("New Crime: [crime_name] | Added to [target_record.name] by [key_name(human_user)]", INVESTIGATE_RECORDS) @@ -932,13 +839,10 @@ var/datum/quirk/quirk_type = type if(initial(quirk_type.abstract_parent_type) == type) continue -<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(initial(quirk_type.erp_quirk) && CONFIG_GET(flag/disable_erp_preferences)) continue // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/qname = initial(quirk_type.name) options[has_quirk(quirk_type) ? "[qname] (Remove)" : "[qname] (Add)"] = quirk_type var/result = input(usr, "Choose quirk to add/remove","Quirk Mod") as null|anything in sort_list(options) @@ -1050,11 +954,7 @@ return ishuman(target) && target.body_position == LYING_DOWN /mob/living/carbon/human/proc/fireman_carry(mob/living/carbon/target) -<<<<<<< HEAD - if(!can_be_firemanned(target) || incapacitated(IGNORE_GRAB)) -======= if(!can_be_firemanned(target) || INCAPACITATED_IGNORING(src, INCAPABLE_GRAB)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(src, span_warning("You can't fireman carry [target] while [target.p_they()] [target.p_are()] standing!")) return @@ -1077,15 +977,11 @@ skills_space = " very quickly" else if(carrydelay <= 4 SECONDS) skills_space = " quickly" -<<<<<<< HEAD //SKYRAT EDIT ADDITION else if(HAS_TRAIT(target, TRAIT_OVERSIZED) && !HAS_TRAIT(src, TRAIT_OVERSIZED)) visible_message(span_warning("[src] tries to carry [target], but they are too heavy!")) return //SKYRAT EDIT END -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 visible_message(span_notice("[src] starts[skills_space] lifting [target] onto [p_their()] back..."), span_notice("You[skills_space] start to lift [target] onto your back...")) if(!do_after(src, carrydelay, target)) @@ -1093,11 +989,7 @@ return //Second check to make sure they're still valid to be carried -<<<<<<< HEAD - if(!can_be_firemanned(target) || incapacitated(IGNORE_GRAB) || target.buckled) -======= if(!can_be_firemanned(target) || INCAPACITATED_IGNORING(src, INCAPABLE_GRAB) || target.buckled) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 visible_message(span_warning("[src] fails to fireman carry [target]!")) return @@ -1113,8 +1005,8 @@ visible_message(span_warning("[target] fails to climb onto [src]!")) return -<<<<<<< HEAD - if(target.incapacitated(IGNORE_GRAB) || incapacitated(IGNORE_GRAB)) + + if(INCAPACITATED_IGNORING(target, INCAPABLE_GRAB) || INCAPACITATED_IGNORING(src, INCAPABLE_GRAB)) target.visible_message(span_warning("[target] can't hang onto [src]!")) return //SKYRAT EDIT START @@ -1140,11 +1032,6 @@ target.throw_at(get_turf(src), 1, 1, spin=FALSE, quickstart=FALSE) return //SKYRAT EDIT END -======= - if(INCAPACITATED_IGNORING(target, INCAPABLE_GRAB) || INCAPACITATED_IGNORING(src, INCAPABLE_GRAB)) - target.visible_message(span_warning("[target] can't hang onto [src]!")) - return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return buckle_mob(target, TRUE, TRUE, RIDER_NEEDS_ARMS) @@ -1202,11 +1089,8 @@ if (!isnull(race)) dna.species = new race -<<<<<<< HEAD /mob/living/carbon/human/species/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE, list/override_features, list/override_mutantparts, list/override_markings, retain_features = FALSE, retain_mutantparts = FALSE) // SKYRAT EDIT - Customization -======= -/mob/living/carbon/human/species/set_species(datum/species/mrace, icon_update, pref_load) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + . = ..() if(use_random_name) fully_replace_character_name(real_name, generate_random_mob_name()) diff --git a/code/modules/mob/living/carbon/human/human_context.dm b/code/modules/mob/living/carbon/human/human_context.dm index 1cba6b1fce6..f0fd30f6d49 100644 --- a/code/modules/mob/living/carbon/human/human_context.dm +++ b/code/modules/mob/living/carbon/human/human_context.dm @@ -17,7 +17,6 @@ context[SCREENTIP_CONTEXT_CTRL_LMB] = "Strangle" else return . -<<<<<<< HEAD // SKYRAT EDIT START - screentips for grab interactions (slams/suplexes/dislocations) if(user.combat_mode && user.grab_state > GRAB_PASSIVE) switch(deprecise_zone(user.zone_selected)) @@ -29,8 +28,6 @@ else context[SCREENTIP_CONTEXT_ALT_LMB] = "Dislocate" // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else context[SCREENTIP_CONTEXT_CTRL_LMB] = "Pull" diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 9723679134b..41c129dc4ab 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -201,11 +201,8 @@ apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, MELEE)) return TRUE -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - SKYRAT_XENO_REDO - Moved to: modular_skyrat\modules\xenos_skyrat_redo\code\human_defense.dm /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/attack_alien(mob/living/carbon/alien/adult/user, list/modifiers) . = ..() if(!.) @@ -257,17 +254,10 @@ if(!dismembering_strike(user, user.zone_selected)) //Dismemberment successful return TRUE apply_damage(damage, BRUTE, affecting, armor_block) -<<<<<<< HEAD */ //SKYRAT EDIT REMOVAL END -======= - - - - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L, list/modifiers) . = ..() if(!.) @@ -591,14 +581,11 @@ continue body_part.check_for_injuries(src, combined_msg) -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - MEDICAL if(body_part.current_gauze) combined_msg += "\t [span_notice("Your [body_part.name] is [body_part.current_gauze.get_gauze_usage_prefix()] with [body_part.current_gauze.get_gauze_description()].")]" //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/t in missing) combined_msg += span_boldannounce("Your [parse_zone(t)] is missing!") diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index fa5b5875946..d29f8eadf9c 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -5,11 +5,7 @@ icon = 'icons/mob/human/human.dmi' icon_state = "human_basic" appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE -<<<<<<< HEAD hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPSEC_FIRST_HUD,IMPSEC_SECOND_HUD,ANTAG_HUD,GLAND_HUD,SENTIENT_DISEASE_HUD,FAN_HUD,PERMIT_HUD, DNR_HUD) //SKYRAT EDIT ADDITION - PERMIT_HUD, DNR_HUD -======= - hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPSEC_FIRST_HUD,IMPSEC_SECOND_HUD,ANTAG_HUD,GLAND_HUD,SENTIENT_DISEASE_HUD,FAN_HUD) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hud_type = /datum/hud/human pressure_resistance = 25 can_buckle = TRUE @@ -20,12 +16,9 @@ flags_1 = PREVENT_CONTENTS_EXPLOSION_1 max_grab = GRAB_KILL -<<<<<<< HEAD maxHealth = HUMAN_MAXHEALTH //SKYRAT EDIT ADDITION health = HUMAN_MAXHEALTH //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Hair colour and style var/hair_color = COLOR_BLACK var/hairstyle = "Bald" @@ -57,10 +50,7 @@ var/lip_color = COLOR_WHITE var/age = 30 //Player's age -<<<<<<< HEAD var/chrono_age = 30 // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Which body type to use var/physique = MALE @@ -72,12 +62,9 @@ var/socks = "Nude" //Which socks the player wants var/backpack = DBACKPACK //Which backpack type the player has chosen. var/jumpsuit_style = PREF_SUIT //suit/skirt -<<<<<<< HEAD - var/datum/scream_type/selected_scream //SKRYAT EDIT ADDITION + var/datum/scream_type/selected_scream //SKYRAT EDIT ADDITION var/datum/laugh_type/selected_laugh //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Equipment slots var/obj/item/clothing/wear_suit = null diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 073ce0a3cd2..e74b0dda690 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -267,10 +267,6 @@ destination.socks = socks destination.jumpsuit_style = jumpsuit_style -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Fully randomizes everything according to the given flags. /mob/living/carbon/human/proc/randomize_human_appearance(randomize_flags = ALL) var/datum/preferences/preferences = new(new /datum/client_interface) diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm index 79f2f221e15..48011902581 100644 --- a/code/modules/mob/living/carbon/human/human_say.dm +++ b/code/modules/mob/living/carbon/human/human_say.dm @@ -43,10 +43,6 @@ return real_name else return real_name -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(mind) var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling) if(changeling?.mimicing) @@ -76,11 +72,7 @@ var/area/our_area = get_area(src) if(our_area.area_flags & BINARY_JAMMING) return FALSE -<<<<<<< HEAD - return dongle.translate_binary -======= return (dongle.special_channels & RADIO_SPECIAL_BINARY) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/radio(message, list/message_mods = list(), list/spans, language) //Poly has a copy of this, lazy bastard . = ..() diff --git a/code/modules/mob/living/carbon/human/human_stripping.dm b/code/modules/mob/living/carbon/human/human_stripping.dm index a334bf9e95e..b2dce5234b4 100644 --- a/code/modules/mob/living/carbon/human/human_stripping.dm +++ b/code/modules/mob/living/carbon/human/human_stripping.dm @@ -178,10 +178,7 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/id key = STRIPPABLE_ITEM_ID item_slot = ITEM_SLOT_ID -<<<<<<< HEAD can_be_silent = TRUE //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/strippable_item/mob_item_slot/belt key = STRIPPABLE_ITEM_BELT @@ -199,10 +196,7 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/pocket /// Which pocket we're referencing. Used for visible text. var/pocket_side -<<<<<<< HEAD can_be_silent = TRUE //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/strippable_item/mob_item_slot/pocket/get_obscuring(atom/source) return isnull(get_item(source)) \ @@ -230,11 +224,7 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( var/result = start_unequip_mob(item, source, user, strip_delay = POCKET_STRIP_DELAY, hidden = TRUE) -<<<<<<< HEAD if (!(result || HAS_TRAIT(user, TRAIT_STICKY_FINGERS))) //SKYRAT EDIT ADDITION original if (!result) -======= - if (!result) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 warn_owner(source) return result diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index ff0c813f8a8..c46d3a26d69 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -74,13 +74,10 @@ There are several things that need to be remembered: ..() if(obscured_flags & HIDEFACE) sec_hud_set_security_status() -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - ERP Overlays if(obscured_flags & HIDESEXTOY) update_inv_lewd() // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* --------------------------------------- */ //vvvvvv UPDATE_INV PROCS vvvvvv @@ -116,7 +113,6 @@ There are several things that need to be remembered: var/handled_by_bodyshape = TRUE var/icon_file var/woman -<<<<<<< HEAD var/digi // SKYRAT EDIT ADDITION - Digi female gender shaping var/female_sprite_flags = uniform.female_sprite_flags // SKYRAT EDIT ADDITION - Digi female gender shaping var/mutant_styles = NONE // SKYRAT EDIT ADDITON - mutant styles to pass down to build_worn_icon. @@ -138,20 +134,11 @@ There are several things that need to be remembered: female_sprite_flags &= ~FEMALE_UNIFORM_FULL // clear the FEMALE_UNIFORM_DIGI_FULL bit if it was set, we don't want that. female_sprite_flags |= FEMALE_UNIFORM_TOP_ONLY // And set the FEMALE_UNIFORM_TOP bit if it is unset. // SKYRAT EDIT ADDITION END -======= - //BEGIN SPECIES HANDLING - if((bodyshape & BODYSHAPE_DIGITIGRADE) && (uniform.supports_variations_flags & CLOTHING_DIGITIGRADE_VARIATION)) - icon_file = DIGITIGRADE_UNIFORM_FILE - //Female sprites have lower priority than digitigrade sprites - else if(dna.species.sexes && (bodyshape & BODYSHAPE_HUMANOID) && physique == FEMALE && !(uniform.female_sprite_flags & NO_FEMALE_UNIFORM)) //Agggggggghhhhh - woman = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!icon_exists(icon_file, RESOLVE_ICON_STATE(uniform))) icon_file = DEFAULT_UNIFORM_FILE handled_by_bodyshape = FALSE -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Taur-friendly suits! if(bodyshape & BODYSHAPE_TAUR) if(istype(uniform) && uniform.gets_cropped_on_taurs) @@ -169,29 +156,13 @@ There are several things that need to be remembered: mutant_styles = mutant_styles, // SKYRAT EDIT ADDITION - Taur-friendly uniforms! ) -======= - //END SPECIES HANDLING - uniform_overlay = uniform.build_worn_icon( - default_layer = UNIFORM_LAYER, - default_icon_file = icon_file, - isinhands = FALSE, - female_uniform = woman ? uniform.female_sprite_flags : null, - override_state = target_overlay, - override_file = handled_by_bodyshape ? icon_file : null, - ) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/bodypart/chest/my_chest = get_bodypart(BODY_ZONE_CHEST) my_chest?.worn_uniform_offset?.apply_offset(uniform_overlay) overlays_standing[UNIFORM_LAYER] = uniform_overlay apply_overlay(UNIFORM_LAYER) -<<<<<<< HEAD - update_mutant_bodyparts() -======= update_body_parts() apply_overlay(UNIFORM_LAYER) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/update_worn_id(update_obscured = TRUE) remove_overlay(ID_LAYER) @@ -256,7 +227,6 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/hands.dmi' -<<<<<<< HEAD // SKYRAT EDIT ADDITION var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -267,9 +237,6 @@ There are several things that need to be remembered: // SKYRAT EDIT END var/mutable_appearance/gloves_overlay = gloves.build_worn_icon(default_layer = GLOVES_LAYER, default_icon_file = icon_file, override_file = mutant_override ? icon_file : null) // SKYRAT EDIT CHANGE -======= - var/mutable_appearance/gloves_overlay = gloves.build_worn_icon(default_layer = GLOVES_LAYER, default_icon_file = icon_file) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/feature_y_offset = 0 //needs to be typed, hand_bodyparts can have nulls @@ -306,7 +273,6 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/eyes.dmi' -<<<<<<< HEAD // SKYRAT EDIT ADDITION var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -322,10 +288,6 @@ There are several things that need to be remembered: if(!mutant_override) my_head.worn_glasses_offset?.apply_offset(glasses_overlay) // SKYRAT EDIT END -======= - var/mutable_appearance/glasses_overlay = glasses.build_worn_icon(default_layer = GLASSES_LAYER, default_icon_file = icon_file) - my_head.worn_glasses_offset?.apply_offset(glasses_overlay) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlays_standing[GLASSES_LAYER] = glasses_overlay apply_overlay(GLASSES_LAYER) @@ -353,7 +315,6 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/ears.dmi' -<<<<<<< HEAD // SKYRAT EDIT ADDITION var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -369,10 +330,6 @@ There are several things that need to be remembered: if(!mutant_override) my_head.worn_ears_offset?.apply_offset(ears_overlay) // SKYRAT EDIT END -======= - var/mutable_appearance/ears_overlay = ears.build_worn_icon(default_layer = EARS_LAYER, default_icon_file = icon_file) - my_head.worn_ears_offset?.apply_offset(ears_overlay) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlays_standing[EARS_LAYER] = ears_overlay apply_overlay(EARS_LAYER) @@ -395,7 +352,6 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/neck.dmi' -<<<<<<< HEAD // SKYRAT EDIT ADDITION var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -418,11 +374,6 @@ There are several things that need to be remembered: if(!mutant_override) my_chest?.worn_belt_offset?.apply_offset(neck_overlay) // SKYRAT EDIT END -======= - var/mutable_appearance/neck_overlay = worn_item.build_worn_icon(default_layer = NECK_LAYER, default_icon_file = icon_file) - var/obj/item/bodypart/chest/my_chest = get_bodypart(BODY_ZONE_CHEST) - my_chest?.worn_belt_offset?.apply_offset(neck_overlay) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlays_standing[NECK_LAYER] = neck_overlay apply_overlay(NECK_LAYER) @@ -449,7 +400,6 @@ There are several things that need to be remembered: var/icon_file = DEFAULT_SHOES_FILE -<<<<<<< HEAD // SKYRAT EDIT ADDITION START var/mutant_override = FALSE @@ -469,9 +419,6 @@ There are several things that need to be remembered: var/mutable_appearance/shoes_overlay = shoes.build_worn_icon(default_layer = SHOES_LAYER, default_icon_file = icon_file, override_file = mutant_override ? icon_file : null) // SKYRAT EDIT CHANGE -======= - var/mutable_appearance/shoes_overlay = shoes.build_worn_icon(default_layer = SHOES_LAYER, default_icon_file = icon_file) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!shoes_overlay) return @@ -533,7 +480,6 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/head/default.dmi' -<<<<<<< HEAD // SKYRAT EDIT ADDITION - This needs to be refactored. var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -555,11 +501,6 @@ There are several things that need to be remembered: if(!mutant_override) my_head?.worn_head_offset?.apply_offset(head_overlay) // SKYRAT EDIT END -======= - var/mutable_appearance/head_overlay = head.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = icon_file) - var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD) - my_head?.worn_head_offset?.apply_offset(head_overlay) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlays_standing[HEAD_LAYER] = head_overlay apply_overlay(HEAD_LAYER) @@ -583,7 +524,6 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/belt.dmi' -<<<<<<< HEAD // SKYRAT EDIT ADDITION var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -600,11 +540,6 @@ There are several things that need to be remembered: if(!mutant_override) my_chest?.worn_belt_offset?.apply_offset(belt_overlay) // SKYRAT EDIT END -======= - var/mutable_appearance/belt_overlay = belt.build_worn_icon(default_layer = BELT_LAYER, default_icon_file = icon_file) - var/obj/item/bodypart/chest/my_chest = get_bodypart(BODY_ZONE_CHEST) - my_chest?.worn_belt_offset?.apply_offset(belt_overlay) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlays_standing[BELT_LAYER] = belt_overlay apply_overlay(BELT_LAYER) @@ -619,7 +554,6 @@ There are several things that need to be remembered: if(wear_suit) var/obj/item/worn_item = wear_suit update_hud_wear_suit(worn_item) -<<<<<<< HEAD if(update_obscured) update_obscured_slots(worn_item.flags_inv) @@ -657,27 +591,8 @@ There are several things that need to be remembered: // SKYRAT EDIT END overlays_standing[SUIT_LAYER] = suit_overlay update_body_parts() - update_mutant_bodyparts() -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - - var/icon_file = DEFAULT_SUIT_FILE - - var/mutable_appearance/suit_overlay = wear_suit.build_worn_icon(default_layer = SUIT_LAYER, default_icon_file = icon_file) - var/obj/item/bodypart/chest/my_chest = get_bodypart(BODY_ZONE_CHEST) - my_chest?.worn_suit_offset?.apply_offset(suit_overlay) - overlays_standing[SUIT_LAYER] = suit_overlay - - update_body_parts() apply_overlay(SUIT_LAYER) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/update_pockets() if(client && hud_used) var/atom/movable/screen/inventory/inv @@ -705,7 +620,6 @@ There are several things that need to be remembered: var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD) if(isnull(my_head)) //Decapitated return -<<<<<<< HEAD if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1]) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1] @@ -745,38 +659,6 @@ There are several things that need to be remembered: // SKYRAT EDIT END overlays_standing[FACEMASK_LAYER] = mask_overlay - apply_overlay(FACEMASK_LAYER) - update_mutant_bodyparts() //e.g. upgate needed because mask now hides lizard snout - -/mob/living/carbon/human/update_worn_back(update_obscured = TRUE) - remove_overlay(BACK_LAYER) - - if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1]) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1] - inv.update_icon() - -======= - - if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1]) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1] - inv.update_icon() - - if(wear_mask) - var/obj/item/worn_item = wear_mask - update_hud_wear_mask(worn_item) - - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - - if(check_obscured_slots(transparent_protection = TRUE) & ITEM_SLOT_MASK) - return - - var/icon_file = 'icons/mob/clothing/mask.dmi' - - var/mutable_appearance/mask_overlay = wear_mask.build_worn_icon(default_layer = FACEMASK_LAYER, default_icon_file = icon_file) - my_head.worn_mask_offset?.apply_offset(mask_overlay) - overlays_standing[FACEMASK_LAYER] = mask_overlay - apply_overlay(FACEMASK_LAYER) update_body_parts() //e.g. upgate needed because mask now hides lizard snout @@ -787,7 +669,6 @@ There are several things that need to be remembered: var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1] inv.update_icon() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(back) var/obj/item/worn_item = back var/mutable_appearance/back_overlay @@ -798,7 +679,6 @@ There are several things that need to be remembered: var/icon_file = 'icons/mob/clothing/back.dmi' -<<<<<<< HEAD // SKYRAT EDIT ADDITION var/mutant_override = FALSE if(bodyshape & BODYSHAPE_CUSTOM) @@ -809,21 +689,14 @@ There are several things that need to be remembered: // SKYRAT EDIT END back_overlay = back.build_worn_icon(default_layer = BACK_LAYER, default_icon_file = icon_file, override_file = mutant_override ? icon_file : null) // SKYRAT EDIT CHANGE -======= - back_overlay = back.build_worn_icon(default_layer = BACK_LAYER, default_icon_file = icon_file) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!back_overlay) return var/obj/item/bodypart/chest/my_chest = get_bodypart(BODY_ZONE_CHEST) -<<<<<<< HEAD // SKYRAT EDIT ADDITION if(!mutant_override) my_chest?.worn_back_offset?.apply_offset(back_overlay) // SKYRAT EDIT END -======= - my_chest?.worn_back_offset?.apply_offset(back_overlay) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 overlays_standing[BACK_LAYER] = back_overlay apply_overlay(BACK_LAYER) @@ -858,81 +731,12 @@ There are several things that need to be remembered: hands += hand_overlay return hands -<<<<<<< HEAD /proc/wear_female_version(t_color, icon, layer, type, greyscale_colors, mutant_styles) // SKYRAT EDIT CHANGE - Digi female gender shaping - ORIGINAL: /proc/wear_female_version(t_color, icon, layer, type, greyscale_colors) var/index = "[t_color]-[greyscale_colors][(mutant_styles & STYLE_DIGI) ? "-d" : ""]" // SKYRAT EDIT CHANGE - Digi female gender shaping - Original: var/index = "[t_color]-[greyscale_colors]]" var/icon/female_clothing_icon = GLOB.female_clothing_icons[index] if(!female_clothing_icon) //Create standing/laying icons if they don't exist generate_female_clothing(index, t_color, icon, type) return mutable_appearance(GLOB.female_clothing_icons[index], layer = -layer, icon_state = t_color) // SKYRAT EDIT - Taur-friendly uniforms and suits - Adds `icon_state = t_color` -======= -/// Modifies a sprite slightly to conform to female body shapes -/proc/wear_female_version(icon_state, icon, type, greyscale_colors) - var/index = "[icon_state]-[greyscale_colors]" - var/static/list/female_clothing_icons = list() - var/icon/female_clothing_icon = female_clothing_icons[index] - if(!female_clothing_icon) //Create standing/laying icons if they don't exist - var/female_icon_state = "female[type == FEMALE_UNIFORM_FULL ? "_full" : ((!type || type & FEMALE_UNIFORM_TOP_ONLY) ? "_top" : "")][type & FEMALE_UNIFORM_NO_BREASTS ? "_no_breasts" : ""]" - var/icon/female_cropping_mask = icon('icons/mob/clothing/under/masking_helpers.dmi', female_icon_state) - female_clothing_icon = icon(icon, icon_state) - female_clothing_icon.Blend(female_cropping_mask, ICON_MULTIPLY) - female_clothing_icon = fcopy_rsc(female_clothing_icon) - female_clothing_icons[index] = female_clothing_icon - - return icon(female_clothing_icon) - -// These coordonates point to roughly somewhere in the middle of the left leg -// Used in approximating what color the pants of clothing should be -#define LEG_SAMPLE_X_LOWER 13 -#define LEG_SAMPLE_X_UPPER 14 - -#define LEG_SAMPLE_Y_LOWER 8 -#define LEG_SAMPLE_Y_UPPER 9 - -/// Modifies a sprite to conform to digitigrade body shapes -/proc/wear_digi_version(icon/base_icon, key, greyscale_config = /datum/greyscale_config/jumpsuit/worn_digi, greyscale_colors) - ASSERT(key, "wear_digi_version: no key passed") - ASSERT(ispath(greyscale_config, /datum/greyscale_config), "wear_digi_version: greyscale_config is not a valid path (got: [greyscale_config])") - // items with greyscale colors containing multiple colors are invalid - if(isnull(greyscale_colors) || length(SSgreyscale.ParseColorString(greyscale_colors)) > 1) - var/pant_color - // approximates the color of the pants by sampling a few pixels in the middle of the left leg - for(var/x in LEG_SAMPLE_X_LOWER to LEG_SAMPLE_X_UPPER) - for(var/y in LEG_SAMPLE_Y_LOWER to LEG_SAMPLE_Y_UPPER) - var/xy_color = base_icon.GetPixel(x, y) - pant_color = pant_color ? BlendRGB(pant_color, xy_color, 0.5) : xy_color - - greyscale_colors = pant_color || "#1d1d1d" // black pants always look good - - var/index = "[key]-[greyscale_config]-[greyscale_colors]" - var/static/list/digitigrade_clothing_icons = list() - var/icon/digitigrade_clothing_icon = digitigrade_clothing_icons[index] - if(!digitigrade_clothing_icon) - var/static/icon/torso_mask - if(!torso_mask) - torso_mask = icon('icons/mob/clothing/under/masking_helpers.dmi', "digi_torso_mask") - var/static/icon/leg_mask - if(!leg_mask) - leg_mask = icon('icons/mob/clothing/under/masking_helpers.dmi', "digi_leg_mask") - - base_icon.Blend(leg_mask, ICON_SUBTRACT) // cuts the legs off - - var/icon/leg_icon = SSgreyscale.GetColoredIconByType(greyscale_config, greyscale_colors) - leg_icon.Blend(torso_mask, ICON_SUBTRACT) // cuts the torso off - - base_icon.Blend(leg_icon, ICON_OVERLAY) // puts the new legs on - - digitigrade_clothing_icon = fcopy_rsc(base_icon) - digitigrade_clothing_icons[index] = digitigrade_clothing_icon - - return icon(digitigrade_clothing_icon) - -#undef LEG_SAMPLE_X_LOWER -#undef LEG_SAMPLE_X_UPPER - -#undef LEG_SAMPLE_Y_LOWER -#undef LEG_SAMPLE_Y_UPPER ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/proc/get_overlays_copy(list/unwantedLayers) var/list/out = new @@ -1059,10 +863,7 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E female_uniform = NO_FEMALE_UNIFORM, override_state = null, override_file = null, -<<<<<<< HEAD mutant_styles = NONE, // SKYRAT EDIT ADD - Further outfit modification for outfits (added `mutant_styles` argument) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) // SKYRAT EDIT ADDITION START - Taur-friendly uniforms and suits @@ -1086,7 +887,6 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E //Find a valid layer from variables+arguments var/layer2use = alternate_worn_layer || default_layer -<<<<<<< HEAD var/mutable_appearance/standing if(female_uniform) standing = wear_female_version(t_state, file2use, layer2use, female_uniform, greyscale_colors, mutant_styles) //should layer2use be in sync with the adjusted value below? needs testing - shiz // SKYRAT EDIT CHANGE - ORIGINAL: standing = wear_female_version(t_state, file2use, layer2use, female_uniform, greyscale_colors) @@ -1103,36 +903,6 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E //Get the overlays for this item when it's being worn //eg: ammo counters, primed grenade flashes, etc. var/list/worn_overlays = worn_overlays(standing, isinhands, file2use, mutant_styles) // SKYRAT EDIT CHANGE - ORIGINAL: var/list/worn_overlays = worn_overlays(standing, isinhands, file2use) -======= - var/mob/living/carbon/wearer = loc - var/is_digi = istype(wearer) && (wearer.bodyshape & BODYSHAPE_DIGITIGRADE) && !wearer.is_digitigrade_squished() - - var/mutable_appearance/standing // this is the actual resulting MA - var/icon/building_icon // used to construct an icon across multiple procs before converting it to MA - if(female_uniform) - building_icon = wear_female_version( - icon_state = t_state, - icon = file2use, - type = female_uniform, - greyscale_colors = greyscale_colors, - ) - if(!isinhands && is_digi && (supports_variations_flags & CLOTHING_DIGITIGRADE_MASK)) - building_icon = wear_digi_version( - base_icon = building_icon || icon(file2use, t_state), - key = "[t_state]-[file2use]-[female_uniform]", - greyscale_config = digitigrade_greyscale_config_worn || greyscale_config_worn, - greyscale_colors = digitigrade_greyscale_colors || greyscale_colors || color, - ) - if(building_icon) - standing = mutable_appearance(building_icon, layer = -layer2use) - - // no special handling done, default it - standing ||= mutable_appearance(file2use, t_state, layer = -layer2use) - - //Get the overlays for this item when it's being worn - //eg: ammo counters, primed grenade flashes, etc. - var/list/worn_overlays = worn_overlays(standing, isinhands, file2use) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(length(worn_overlays)) standing.overlays += worn_overlays @@ -1257,10 +1027,6 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E var/static/icon/cut_legs_mask = icon('icons/effects/cut.dmi', "Cut2") var/static/icon/lenghten_torso_mask = icon('icons/effects/cut.dmi', "Cut3") var/static/icon/lenghten_legs_mask = icon('icons/effects/cut.dmi', "Cut4") -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 appearance.remove_filter(list( "Cut_Torso", "Cut_Legs", @@ -1273,10 +1039,6 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E "Monkey_Gnome_Cut_Torso", "Monkey_Gnome_Cut_Legs", )) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(get_mob_height()) // Don't set this one directly, use TRAIT_DWARF if(MONKEY_HEIGHT_DWARF) @@ -1376,15 +1138,6 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E "params" = displacement_map_filter(lenghten_legs_mask, x = 0, y = 0, size = 2), ), )) -<<<<<<< HEAD - // Kinda gross but because many humans overlays do not use KEEP_TOGETHER we need to manually propogate the filter - // Otherwise overlays, such as worn overlays on icons, won't have the filter "applied", and the effect kinda breaks - if(!(appearance.appearance_flags & KEEP_TOGETHER)) - for(var/image/overlay in list() + appearance.underlays + appearance.overlays) - apply_height_filters(overlay) - return appearance - -======= // Kinda gross but because many humans overlays do not use KEEP_TOGETHER we need to manually propogate the filter // Otherwise overlays, such as worn overlays on icons, won't have the filter "applied", and the effect kinda breaks @@ -1393,6 +1146,4 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E apply_height_filters(overlay) return appearance - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef RESOLVE_ICON_STATE diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index dda4c4c1a12..e4f3341278a 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -45,24 +45,16 @@ return r_store if(ITEM_SLOT_SUITSTORE) return s_store -<<<<<<< HEAD - return ..() - -======= return ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/carbon/human/get_slot_by_item(obj/item/looking_for) if(looking_for == belt) return ITEM_SLOT_BELT -<<<<<<< HEAD -======= if(belt && (looking_for in belt)) return ITEM_SLOT_BELTPACK ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(looking_for == wear_id) return ITEM_SLOT_ID @@ -173,7 +165,6 @@ if(ITEM_SLOT_GLOVES) if(gloves) return -<<<<<<< HEAD gloves = equipping //SKYRAT EDIT ADDITION - ERP UPDATE @@ -192,19 +183,6 @@ if(wear_suit) return -======= - gloves = equipping - update_worn_gloves() - if(ITEM_SLOT_FEET) - if(shoes) - return - shoes = equipping - update_worn_shoes() - if(ITEM_SLOT_OCLOTHING) - if(wear_suit) - return - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 wear_suit = equipping if(wear_suit.breakouttime) //when equipping a straightjacket @@ -229,13 +207,9 @@ return s_store = equipping update_suit_storage() -<<<<<<< HEAD - -======= if(ITEM_SLOT_BELTPACK) if(!belt || !belt.atom_storage?.attempt_insert(equipping, src, override = TRUE, force = indirect_action ? STORAGE_SOFT_LOCKED : STORAGE_NOT_LOCKED)) not_handled = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else to_chat(src, span_danger("You are trying to equip this item to an unsupported inventory slot. Report this to a coder!")) diff --git a/code/modules/mob/living/carbon/human/login.dm b/code/modules/mob/living/carbon/human/login.dm index a37fccc9029..6e6dd578967 100644 --- a/code/modules/mob/living/carbon/human/login.dm +++ b/code/modules/mob/living/carbon/human/login.dm @@ -3,11 +3,8 @@ dna?.species?.on_owner_login(src) -<<<<<<< HEAD if(SStts.tts_enabled && isnull(voice)) // SKYRAT EDIT - None option for TTS - ORIGINAL: if(SStts.tts_enabled && !voice) -======= - if(SStts.tts_enabled && !voice) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + voice = pick(SStts.available_speakers) if(!LAZYLEN(afk_thefts)) diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index 30f818b0e11..d4dea2abfcc 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -19,10 +19,6 @@ BODY_ZONE_CHEST = /obj/item/bodypart/chest, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID -<<<<<<< HEAD - mutant_bodyparts = list("wings" = "None") -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mutantbrain = /obj/item/organ/internal/brain/dullahan mutanteyes = /obj/item/organ/internal/eyes/dullahan mutanttongue = /obj/item/organ/internal/tongue/dullahan @@ -295,7 +291,3 @@ owner.gib(DROP_ALL_REMAINS) owner = null return ..() -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 0809b25040a..334138857f2 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -11,10 +11,7 @@ siemens_coeff = 0.5 //They thrive on energy payday_modifier = 1.0 inherent_traits = list( -<<<<<<< HEAD // TRAIT_NO_UNDERWEAR, // SKYRAT EDIT - LET THEM WEAR PANTIES -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TRAIT_MUTANT_COLORS, TRAIT_FIXED_MUTANT_COLORS, TRAIT_AGENDER, @@ -63,10 +60,6 @@ RegisterSignal(new_ethereal, COMSIG_LIVING_HEALTH_UPDATE, PROC_REF(refresh_light_color)) ethereal_light = new_ethereal.mob_light(light_type = /obj/effect/dummy/lighting_obj/moblight/species) refresh_light_color(new_ethereal) -<<<<<<< HEAD - update_mail_goodies(new_ethereal) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/organ/internal/heart/ethereal/ethereal_heart = new_ethereal.get_organ_slot(ORGAN_SLOT_HEART) ethereal_heart.ethereal_color = default_color diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 6e9dba8580c..e969461ca13 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -3,7 +3,6 @@ name = "Felinid" id = SPECIES_FELINE examine_limb_id = SPECIES_HUMAN -<<<<<<< HEAD mutant_bodyparts = list("ears" = "Cat", "wings" = "None") mutantbrain = /obj/item/organ/internal/brain/felinid mutanttongue = /obj/item/organ/internal/tongue/cat @@ -13,14 +12,6 @@ /obj/item/organ/external/tail/cat = "Cat", ) */ // SKYRAT EDIT REMOVAL END -======= - mutantbrain = /obj/item/organ/internal/brain/felinid - mutanttongue = /obj/item/organ/internal/tongue/cat - mutantears = /obj/item/organ/internal/ears/cat - mutant_organs = list( - /obj/item/organ/external/tail/cat = "Cat", - ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 inherent_traits = list( TRAIT_CATLIKE_GRACE, TRAIT_HATED_BY_DOGS, @@ -51,16 +42,12 @@ target_human.dna.features["tail_cat"] = "Cat" if(target_human.dna.features["ears"] == "None") target_human.dna.features["ears"] = "Cat" -<<<<<<< HEAD /* SKYRAT EDIT -- START -- ORIGINAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(target_human.dna.features["ears"] == "None") mutantears = /obj/item/organ/internal/ears else var/obj/item/organ/internal/ears/cat/ears = new(FALSE, target_human.dna.features["ears"]) ears.Insert(target_human, movement_flags = DELETE_IF_REPLACED) -<<<<<<< HEAD */ if(target_human.dna.features["ears"] == "Cat") var/obj/item/organ/internal/ears/cat/ears = new @@ -68,8 +55,6 @@ else mutantears = /obj/item/organ/internal/ears // SKYRAT EDIT -- END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /datum/species/human/felinid/randomize_features(mob/living/carbon/human/human_mob) @@ -176,11 +161,7 @@ // stored_feature_id is only set once (the first time an organ is inserted), so this should be safe. var/obj/item/organ/internal/ears/cat/kitty_ears = new kitty_ears.Insert(soon_to_be_felinid, special = TRUE, movement_flags = DELETE_IF_REPLACED) -<<<<<<< HEAD - if(should_external_organ_apply_to(/obj/item/organ/external/tail/cat, soon_to_be_felinid)) //only give them a tail if they actually have sprites for it / are a compatible subspecies. -======= if(should_visual_organ_apply_to(/obj/item/organ/external/tail/cat, soon_to_be_felinid)) //only give them a tail if they actually have sprites for it / are a compatible subspecies. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/organ/external/tail/cat/kitty_tail = new kitty_tail.Insert(soon_to_be_felinid, special = TRUE, movement_flags = DELETE_IF_REPLACED) @@ -203,13 +184,8 @@ old_tail.Remove(purrbated_human, special = TRUE) qdel(old_tail) // Locate does not work on assoc lists, so we do it by hand -<<<<<<< HEAD - for(var/external_organ in target_species.external_organs) - if(!should_external_organ_apply_to(external_organ, purrbated_human)) -======= for(var/external_organ in target_species.mutant_organs) if(!should_visual_organ_apply_to(external_organ, purrbated_human)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue if(ispath(external_organ, /obj/item/organ/external/tail)) var/obj/item/organ/external/tail/new_tail = new external_organ() @@ -230,23 +206,17 @@ human_for_preview.set_haircolor("#ffcccc", update = FALSE) // pink human_for_preview.set_hairstyle("Hime Cut", update = TRUE) -<<<<<<< HEAD /* SKYRAT EDIT - Making the species menu icons work better - ORIGINAL: -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/organ/internal/ears/cat/cat_ears = human_for_preview.get_organ_by_type(/obj/item/organ/internal/ears/cat) if (cat_ears) cat_ears.color = human_for_preview.hair_color human_for_preview.update_body() -<<<<<<< HEAD */ // START human_for_preview.dna.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list(human_for_preview.hair_color)) human_for_preview.dna.mutant_bodyparts["ears"] = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list(human_for_preview.hair_color)) regenerate_organs(human_for_preview, src, visual_only = TRUE) human_for_preview.update_body(TRUE) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/species/human/felinid/get_physical_attributes() return "Felinids are very similar to humans in almost all respects, with their biggest differences being the ability to lick their wounds, \ @@ -303,7 +273,6 @@ SPECIES_PERK_NAME = "Hydrophobia", SPECIES_PERK_DESC = "Felinids don't like getting soaked with water.", ), -<<<<<<< HEAD // SKYRAT EDIT ADDITION START list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, @@ -312,8 +281,6 @@ SPECIES_PERK_DESC = "Felinids are unhurt by high falls, and land on their feet.", ), // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) return to_add diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 891359ea21a..13471b2872b 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -27,10 +27,6 @@ payday_modifier = 1.0 siemens_coeff = 0 no_equip_flags = ITEM_SLOT_MASK | ITEM_SLOT_OCLOTHING | ITEM_SLOT_GLOVES | ITEM_SLOT_FEET | ITEM_SLOT_ICLOTHING | ITEM_SLOT_SUITSTORE -<<<<<<< HEAD - nojumpsuit = 1 -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC sexes = FALSE meat = /obj/item/food/meat/slab/human/mutant/golem diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index 660c26e7fc6..d9054a84898 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -4,10 +4,7 @@ inherent_traits = list( TRAIT_USES_SKINTONES, ) -<<<<<<< HEAD mutant_bodyparts = list("wings" = "None") -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 skinned_type = /obj/item/stack/sheet/animalhide/human changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT payday_modifier = 1.1 @@ -38,11 +35,7 @@ ) /datum/species/human/get_cough_sound(mob/living/carbon/human/human) -<<<<<<< HEAD if(human.gender == FEMALE) // SKYRAT EDIT CHANGE -======= - if(human.physique == FEMALE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return pick( 'sound/voice/human/female_cough1.ogg', 'sound/voice/human/female_cough2.ogg', @@ -61,11 +54,7 @@ ) /datum/species/human/get_cry_sound(mob/living/carbon/human/human) -<<<<<<< HEAD if(human.gender == FEMALE) // SKYRAT EDIT CHANGE -======= - if(human.physique == FEMALE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return pick( 'sound/voice/human/female_cry1.ogg', 'sound/voice/human/female_cry2.ogg', diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index fe14941cca2..fcbfc16e73c 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -42,18 +42,13 @@ BODY_ZONE_CHEST = /obj/item/bodypart/chest/jelly, ) var/datum/action/innate/regenerate_limbs/regenerate_limbs -<<<<<<< HEAD var/datum/action/innate/alter_form/alter_form //SKYRAT EDIT ADDITION - CUSTOMIZATION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/species/jelly/on_species_gain(mob/living/carbon/new_jellyperson, datum/species/old_species, pref_load) . = ..() if(ishuman(new_jellyperson)) regenerate_limbs = new regenerate_limbs.Grant(new_jellyperson) -<<<<<<< HEAD - update_mail_goodies(new_jellyperson) alter_form = new //SKYRAT EDIT CUSTOMIZATION alter_form.Grant(new_jellyperson) //SKYRAT EDIT CUSTOMIZATION @@ -67,14 +62,6 @@ if(alter_form) //SKYRAT EDIT CUSTOMIZATION alter_form.Remove(former_jellyperson) //SKYRAT EDIT CUSTOMIZATION -======= - new_jellyperson.AddElement(/datum/element/soft_landing) - RegisterSignal(new_jellyperson, COMSIG_HUMAN_ON_HANDLE_BLOOD, PROC_REF(slime_blood)) - -/datum/species/jelly/on_species_loss(mob/living/carbon/former_jellyperson, datum/species/new_species, pref_load) - if(regenerate_limbs) - regenerate_limbs.Remove(former_jellyperson) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 former_jellyperson.RemoveElement(/datum/element/soft_landing) UnregisterSignal(former_jellyperson, COMSIG_HUMAN_ON_HANDLE_BLOOD) return ..() @@ -433,11 +420,7 @@ return data -<<<<<<< HEAD -/datum/action/innate/swap_body/ui_act(action, params) -======= /datum/action/innate/swap_body/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 1bfcc698aa6..5da9dffe1a9 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -7,14 +7,9 @@ TRAIT_MUTANT_COLORS, ) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE -<<<<<<< HEAD mutant_bodyparts = list("body_markings" = "None", "legs" = "Normal Legs") // SKYRAT EDIT CHANGE - ORIGINAL: mutant_bodyparts = list("legs" = "Normal Legs") //body_markings = list(/datum/bodypart_overlay/simple/body_marking/lizard = "None") // SKYRAT EDIT REMOVAL - We do this our own way external_organs = list( -======= - body_markings = list(/datum/bodypart_overlay/simple/body_marking/lizard = "None") - mutant_organs = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/external/horns = "None", /obj/item/organ/external/frills = "None", /obj/item/organ/external/snout = "Round", @@ -52,20 +47,17 @@ /datum/species/lizard/body_temperature_core(mob/living/carbon/human/humi, seconds_per_tick, times_fired) return -<<<<<<< HEAD + //SKYRAT EDIT REMOVAL BEGIN /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/species/lizard/randomize_features() var/list/features = ..() features["lizard_markings"] = pick(SSaccessories.lizard_markings_list) return features -<<<<<<< HEAD + */ //SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + /datum/species/lizard/get_scream_sound(mob/living/carbon/human/lizard) return pick( diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm index 3fc3137f972..1ca2979d3d6 100644 --- a/code/modules/mob/living/carbon/human/species_types/monkeys.dm +++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -3,11 +3,7 @@ /datum/species/monkey name = "\improper Monkey" id = SPECIES_MONKEY -<<<<<<< HEAD - external_organs = list( -======= mutant_organs = list( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/external/tail/monkey = "Monkey", ) mutanttongue = /obj/item/organ/internal/tongue/monkey diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 008b5e21c01..0e4c6679ad5 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -3,13 +3,8 @@ plural_form = "Mothmen" id = SPECIES_MOTH inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG -<<<<<<< HEAD mutant_bodyparts = list("moth_markings" = "None") // SKYRAT EDIT CHANGE - ORIGINAL: body_markings = list(/datum/bodypart_overlay/simple/body_marking/moth = "None") // external_organs = list(/obj/item/organ/external/wings/moth = "Plain", /obj/item/organ/external/antennae = "Plain") // SKYRAT EDIT REMOVAL - Fixing moths -======= - body_markings = list(/datum/bodypart_overlay/simple/body_marking/moth = "None") - mutant_organs = list(/obj/item/organ/external/wings/moth = "Plain", /obj/item/organ/external/antennae = "Plain") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 meat = /obj/item/food/meat/slab/human/mutant/moth mutanttongue = /obj/item/organ/internal/tongue/moth mutanteyes = /obj/item/organ/internal/eyes/moth @@ -29,15 +24,10 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/moth, ) -<<<<<<< HEAD -/datum/species/moth/regenerate_organs(mob/living/carbon/C, datum/species/old_species, replace_current= TRUE, list/excluded_zones, visual_only) -======= /datum/species/moth/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() RegisterSignal(human_who_gained_species, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, PROC_REF(damage_weakness)) -<<<<<<< HEAD /datum/species/moth/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load) . = ..() RegisterSignal(human_who_gained_species, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, PROC_REF(damage_weakness)) @@ -55,21 +45,6 @@ /datum/species/moth/randomize_features() var/list/features = ..() features["moth_markings"] = pick(SSaccessories.moth_wings_list) // SKYRAT EDIT CHANGE - ORIGINAL: features["moth_markings"] = pick(SSaccessories.moth_markings_list) -======= -/datum/species/moth/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) - . = ..() - UnregisterSignal(C, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS) - -/datum/species/moth/proc/damage_weakness(datum/source, list/damage_mods, damage_amount, damagetype, def_zone, sharpness, attack_direction, obj/item/attacking_item) - SIGNAL_HANDLER - - if(istype(attacking_item, /obj/item/melee/flyswatter)) - damage_mods += 10 // Yes, a 10x damage modifier - -/datum/species/moth/randomize_features() - var/list/features = ..() - features["moth_markings"] = pick(SSaccessories.moth_markings_list) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return features /datum/species/moth/get_scream_sound(mob/living/carbon/human/moth) @@ -165,11 +140,7 @@ SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, SPECIES_PERK_ICON = "tshirt", SPECIES_PERK_NAME = "Meal Plan", -<<<<<<< HEAD - SPECIES_PERK_DESC = "Moths can eat clothes for nourishment.", -======= SPECIES_PERK_DESC = "Moths can eat clothes for temporary nourishment.", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ), list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index c438b008f5c..9cf63ea0408 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -6,18 +6,6 @@ fixed_mut_color = "#DBBF92" -<<<<<<< HEAD - inherent_traits = list( - TRAIT_MUTANT_COLORS, - TRAIT_NOBREATH, - TRAIT_NOFLASH, - TRAIT_NO_UNDERWEAR, - ) - inherent_factions = list(FACTION_MUSHROOM) - - no_equip_flags = ITEM_SLOT_MASK | ITEM_SLOT_OCLOTHING | ITEM_SLOT_GLOVES | ITEM_SLOT_FEET | ITEM_SLOT_ICLOTHING - -======= mutant_organs = list(/obj/item/organ/external/mushroom_cap = "Round") inherent_traits = list( @@ -30,7 +18,6 @@ no_equip_flags = ITEM_SLOT_MASK | ITEM_SLOT_OCLOTHING | ITEM_SLOT_GLOVES | ITEM_SLOT_FEET | ITEM_SLOT_ICLOTHING ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 heatmod = 1.5 mutanttongue = /obj/item/organ/internal/tongue/mush @@ -85,11 +72,7 @@ preference = "feature_mushperson_cap" -<<<<<<< HEAD //dna_block = DNA_MUSHROOM_CAPS_BLOCK // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA. -======= - dna_block = DNA_MUSHROOM_CAPS_BLOCK ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 restyle_flags = EXTERNAL_RESTYLE_PLANT bodypart_overlay = /datum/bodypart_overlay/mutant/mushroom_cap diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index d5405bb848a..8b347a22cca 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -16,10 +16,6 @@ TRAIT_UNHUSKABLE, ) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 inherent_biotypes = MOB_HUMANOID|MOB_MINERAL inherent_respiration_type = RESPIRATION_PLASMA mutantlungs = /obj/item/organ/internal/lungs/plasmaman diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 6bc38e34106..38e75704795 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -7,13 +7,8 @@ TRAIT_MUTANT_COLORS, TRAIT_PLANT_SAFE, ) -<<<<<<< HEAD external_organs = list( // /obj/item/organ/external/pod_hair = "None", // SKYRAT EDIT REMOVAL - Customization (it messes up unit tests.) -======= - mutant_organs = list( - /obj/item/organ/external/pod_hair = "None", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID | MOB_PLANT inherent_factions = list(FACTION_PLANTS, FACTION_VINES) diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index 7f9a6de3124..0e7ac486ba5 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -22,11 +22,7 @@ mutantlungs = null species_language_holder = /datum/language_holder/shadowpeople -<<<<<<< HEAD examine_limb_id = SPECIES_SHADOW // SKYRAT EDIT: Fixing Shadowpeople -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bodypart_overrides = list( BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/shadow, BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/shadow, diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index e07f91ec45b..4718645b563 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -5,10 +5,6 @@ sexes = FALSE meat = /obj/item/food/meat/slab/human/mutant/skeleton inherent_traits = list( -<<<<<<< HEAD - TRAIT_NO_UNDERWEAR, -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TRAIT_EASYDISMEMBER, TRAIT_FAKEDEATH, TRAIT_GENELESS, diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index 27d68e1853a..4fe671dc24a 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -4,14 +4,9 @@ id = SPECIES_SNAIL inherent_traits = list( TRAIT_MUTANT_COLORS, -<<<<<<< HEAD // TRAIT_NO_UNDERWEAR, //SKYRAT EDIT REMOVAL - Roundstart Snails - Snails deserve to wear underwear TRAIT_NO_SLIP_ALL, TRAIT_WATER_BREATHING, //SKYRAT EDIT ADDITION - Roundstart Snails - Sea snails exist, and land snails can weather being underwater for almost a day. -======= - TRAIT_NO_UNDERWEAR, - TRAIT_NO_SLIP_ALL, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) coldmod = 0.5 //snails only come out when its cold and wet @@ -33,11 +28,7 @@ ) ///Multiplier for the speed we give them. Positive numbers make it move slower, negative numbers make it move faster. -<<<<<<< HEAD var/snail_speed_mod = 1 // SKYRAT EDIT REMOVAL - Moved the movespeed to the shell. Original - var/snail_speed_mod = 6 -======= - var/snail_speed_mod = 6 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/species/snail/prepare_human_for_preview(mob/living/carbon/human/human) human.dna.features["mcolor"] = COLOR_BEIGE @@ -124,10 +115,8 @@ max_integrity = 200 resistance_flags = FIRE_PROOF | ACID_PROOF -<<<<<<< HEAD + // SKYRAT EDIT ADDITION - CLARIFICATION - Roundstart Snails - These armor values don't actually do any protection of the wearer, this is for checking direct damage to the backpack. Damage resistance stuff is in their heart file. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/armor/backpack_snail melee = 40 bullet = 30 diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 7700b3685e1..d3dfb813520 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -17,10 +17,6 @@ TRAIT_NO_MIRROR_REFLECTION, ) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID -<<<<<<< HEAD - mutant_bodyparts = list("wings" = "None") -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN exotic_bloodtype = "U" blood_deficiency_drain_rate = BLOOD_DEFICIENCY_MODIFIER // vampires already passively lose blood, so this just makes them lose it slightly more quickly when they have blood deficiency. diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index 30a72b8a472..c763127a4be 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -97,10 +97,7 @@ damage_modifier = 20 // 120 damage to KO a zombie, which kills it mutanteyes = /obj/item/organ/internal/eyes/zombie mutantbrain = /obj/item/organ/internal/brain/zombie -<<<<<<< HEAD -======= mutanttongue = /obj/item/organ/internal/tongue/zombie ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN inherent_traits = list( diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 4e9037b7965..3bdff375e22 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -62,10 +62,7 @@ damage_dealt = actual_hit.get_damage() - delta // Unfortunately bodypart receive_damage doesn't return damage dealt so we do it manually else damage_dealt = -1 * adjustBruteLoss(damage_amount, forced = forced) -<<<<<<< HEAD INVOKE_ASYNC(src, TYPE_PROC_REF(/mob/living, adjust_pain), damage_amount) // SKYRAT EDIT ADDITION - ERP Pain -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(BURN) if(isbodypart(def_zone)) var/obj/item/bodypart/actual_hit = def_zone @@ -84,10 +81,7 @@ damage_dealt = actual_hit.get_damage() - delta // See above else damage_dealt = -1 * adjustFireLoss(damage_amount, forced = forced) -<<<<<<< HEAD INVOKE_ASYNC(src, TYPE_PROC_REF(/mob/living, adjust_pain), damage_amount) // SKYRAT EDIT ADDITION - ERP Pain -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(TOX) damage_dealt = -1 * adjustToxLoss(damage_amount, forced = forced) if(OXY) diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index ceed2ead52d..1f94edf44cd 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -133,13 +133,10 @@ med_hud_set_status() stop_pulling() -<<<<<<< HEAD cut_overlay(GLOB.combat_indicator_overlay) //SKYRAT EDIT ADDITION - COMBAT_INDICATOR set_combat_indicator(FALSE) //SKYRAT EDIT ADDITION - COMBAT_INDICATOR set_ssd_indicator(FALSE) //SKYRAT EDIT ADDITION - SSD_INDICATOR -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SIGNAL(src, COMSIG_LIVING_DEATH, gibbed) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_MOB_DEATH, src, gibbed) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 7410340d27d..272b5671ae0 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -3,8 +3,6 @@ /datum/emote/living mob_type_allowed_typecache = /mob/living mob_type_blacklist_typecache = list(/mob/living/brain) -<<<<<<< HEAD -======= /datum/emote/living/taunt key = "taunt" @@ -15,7 +13,6 @@ /datum/emote/living/taunt/run_emote(mob/living/user, params, type_override, intentional) . = ..() user.spin(TAUNT_EMOTE_DURATION, 0.1 SECONDS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/emote/living/blush key = "blush" @@ -195,11 +192,7 @@ return var/mob/living/carbon/human/human_user = user -<<<<<<< HEAD if(human_user.gender == FEMALE) // SKYRAT EDIT CHANGE -======= - if(human_user.physique == FEMALE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return pick('sound/voice/human/gasp_female1.ogg', 'sound/voice/human/gasp_female2.ogg', 'sound/voice/human/gasp_female3.ogg') return pick('sound/voice/human/gasp_male1.ogg', 'sound/voice/human/gasp_male2.ogg') @@ -443,10 +436,6 @@ return return user.dna.species.get_sniff_sound(user) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/emote/living/snore key = "snore" @@ -698,11 +687,7 @@ return TRUE /datum/emote/living/custom/proc/get_custom_emote_from_user() -<<<<<<< HEAD return stripped_multiline_input(usr, "Choose an emote to display.", "Me" , null, MAX_MESSAGE_LEN) // SKYRAT EDIT CHANGE - ORIGINAL : return copytext(sanitize(input("Choose an emote to display.") as text|null), 1, MAX_MESSAGE_LEN) -======= - return copytext(sanitize(input("Choose an emote to display.") as text|null), 1, MAX_MESSAGE_LEN) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/emote/living/custom/proc/get_custom_emote_type_from_user() var/type = input("Is this a visible or hearable emote?") as null|anything in list("Visible", "Hearable", "Both") @@ -721,10 +706,7 @@ /datum/emote/living/custom/run_emote(mob/user, params, type_override = null, intentional = FALSE) if(params && type_override) emote_type = type_override -<<<<<<< HEAD message = user.say_emphasis(message) //SKYRAT EDIT ADDITION - EMOTES -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() ///Reset the message and emote type after it's run. message = null diff --git a/code/modules/mob/living/init_signals.dm b/code/modules/mob/living/init_signals.dm index 2c96a9e4adc..0797f77c082 100644 --- a/code/modules/mob/living/init_signals.dm +++ b/code/modules/mob/living/init_signals.dm @@ -40,11 +40,8 @@ RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_DEAF), PROC_REF(on_hearing_loss)) RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_DEAF), PROC_REF(on_hearing_regain)) -<<<<<<< HEAD -======= RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_STASIS), PROC_REF(on_stasis_trait_gain)) RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_STASIS), PROC_REF(on_stasis_trait_loss)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignals(src, list( SIGNAL_ADDTRAIT(TRAIT_CRITICAL_CONDITION), @@ -192,38 +189,25 @@ SIGNAL_HANDLER add_traits(list(TRAIT_UI_BLOCKED, TRAIT_PULL_BLOCKED), TRAIT_INCAPACITATED) update_appearance() -<<<<<<< HEAD -======= update_incapacitated() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Called when [TRAIT_INCAPACITATED] is removed from the mob. /mob/living/proc/on_incapacitated_trait_loss(datum/source) SIGNAL_HANDLER remove_traits(list(TRAIT_UI_BLOCKED, TRAIT_PULL_BLOCKED), TRAIT_INCAPACITATED) update_appearance() -<<<<<<< HEAD - -======= update_incapacitated() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Called when [TRAIT_RESTRAINED] is added to the mob. /mob/living/proc/on_restrained_trait_gain(datum/source) SIGNAL_HANDLER ADD_TRAIT(src, TRAIT_HANDS_BLOCKED, TRAIT_RESTRAINED) -<<<<<<< HEAD -======= update_incapacitated() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Called when [TRAIT_RESTRAINED] is removed from the mob. /mob/living/proc/on_restrained_trait_loss(datum/source) SIGNAL_HANDLER REMOVE_TRAIT(src, TRAIT_HANDS_BLOCKED, TRAIT_RESTRAINED) -<<<<<<< HEAD - -======= update_incapacitated() /// Called when [TRAIT_STASIS] is added to the mob @@ -235,7 +219,6 @@ /mob/living/proc/on_stasis_trait_loss(datum/source) SIGNAL_HANDLER update_incapacitated() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * Called when traits that alter succumbing are added/removed. diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 2f50837fccc..67e34a69589 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -69,18 +69,13 @@ if(istype(potential_spine)) damage_softening_multiplier *= potential_spine.athletics_boost_multiplier -<<<<<<< HEAD //SKYRAT EDIT ADDITION START - Landing in liquids if(impacted_turf.liquids && impacted_turf.liquids.liquid_state >= LIQUID_STATE_WAIST) Knockdown(2 SECONDS) return //SKYRAT EDIT ADDITION END - // If you are incapped, you probably can't brace yourself - var/can_help_themselves = !incapacitated(IGNORE_RESTRAINTS) -======= // If you are incapped, you probably can't brace yourself var/can_help_themselves = !INCAPACITATED_IGNORING(src, INCAPABLE_RESTRAINTS) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(levels <= 1 && can_help_themselves) var/obj/item/organ/external/wings/gliders = get_organ_by_type(/obj/item/organ/external/wings) if(HAS_TRAIT(src, TRAIT_FREERUNNING) || gliders?.can_soften_fall()) // the power of parkour or wings allows falling short distances unscathed @@ -106,11 +101,7 @@ if(HAS_TRAIT(src, TRAIT_CATLIKE_GRACE) && (small_surface_area || usable_legs >= 2) && body_position == STANDING_UP && can_help_themselves) . |= ZIMPACT_NO_MESSAGE|ZIMPACT_NO_SPIN skip_knockdown = TRUE -<<<<<<< HEAD - if(small_surface_area || (isfelinid(src) || istajaran(src))) // SKYRAT EDIT CHANGE - ORIGINAL: if(small_surface_area) -======= - if(small_surface_area) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + if(small_surface_area || isfeline(src)) // SKYRAT EDIT CHANGE - ORIGINAL: if(small_surface_area) visible_message( span_notice("[src] makes a hard landing on [impacted_turf], but lands safely on [p_their()] feet!"), span_notice("You make a hard landing on [impacted_turf], but land safely on your feet!"), @@ -451,7 +442,6 @@ log_combat(src, M, "grabbed", addition="passive grab") if(!supress_message && !(iscarbon(AM) && HAS_TRAIT(src, TRAIT_STRONG_GRABBER))) -<<<<<<< HEAD //SKYRAT EDIT START - Tail coiling if(ishuman(M)) if(zone_selected == BODY_ZONE_PRECISE_GROIN && M.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) && src.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)) @@ -464,14 +454,6 @@ span_warning("[src] grabs you [grabbed_by_hands ? "by your hands":"passively"]!"), null, null, src) to_chat(src, span_notice("You grab [M] [grabbed_by_hands ? "by their hands":"passively"]!")) // SKYRAT EDIT END -======= - if(ishuman(M)) - var/mob/living/carbon/human/grabbed_human = M - var/grabbed_by_hands = (zone_selected == "l_arm" || zone_selected == "r_arm") && grabbed_human.usable_hands > 0 - M.visible_message(span_warning("[src] grabs [M] [grabbed_by_hands ? "by their hands":"passively"]!"), \ - span_warning("[src] grabs you [grabbed_by_hands ? "by your hands":"passively"]!"), null, null, src) - to_chat(src, span_notice("You grab [M] [grabbed_by_hands ? "by their hands":"passively"]!")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else M.visible_message(span_warning("[src] grabs [M] passively!"), \ span_warning("[src] grabs you passively!"), null, null, src) @@ -590,25 +572,6 @@ investigate_log("has succumbed to death.", INVESTIGATE_DEATHS) death() -<<<<<<< HEAD -/** - * Checks if a mob is incapacitated - * - * Normally being restrained, agressively grabbed, or in stasis counts as incapacitated - * unless there is a flag being used to check if it's ignored - * - * args: - * * flags (optional) bitflags that determine if special situations are exempt from being considered incapacitated - * - * bitflags: (see code/__DEFINES/status_effects.dm) - * * IGNORE_RESTRAINTS - mob in a restraint (handcuffs) is not considered incapacitated - * * IGNORE_STASIS - mob in stasis (stasis bed, etc.) is not considered incapacitated - * * IGNORE_GRAB - mob that is agressively grabbed is not considered incapacitated -**/ -/mob/living/incapacitated(flags) - if(HAS_TRAIT(src, TRAIT_INCAPACITATED)) - return TRUE -======= // Remember, anything that influences this needs to call update_incapacitated somehow when it changes // Most often best done in [code/modules/mob/living/init_signals.dm] /mob/living/build_incapacitated(flags) @@ -624,15 +587,6 @@ incap_status |= INCAPABLE_STASIS return incap_status ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - - if(!(flags & IGNORE_RESTRAINTS) && HAS_TRAIT(src, TRAIT_RESTRAINED)) - return TRUE - if(!(flags & IGNORE_GRAB) && pulledby && pulledby.grab_state >= GRAB_AGGRESSIVE) - return TRUE - if(!(flags & IGNORE_STASIS) && HAS_TRAIT(src, TRAIT_STASIS)) - return TRUE - return FALSE /mob/living/canUseStorage() if (usable_hands <= 0) @@ -752,13 +706,8 @@ if(!silent) to_chat(src, span_notice("You will now stand up as soon as you are able to.")) else -<<<<<<< HEAD /*if(!silent) SKYRAT EDIT REMOVAL to_chat(src, "You stand up.")*/ -======= - if(!silent) - to_chat(src, span_notice("You stand up.")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 get_up(instant) SEND_SIGNAL(src, COMSIG_LIVING_RESTING, new_resting, silent, instant) @@ -768,15 +717,11 @@ /// Proc to append and redefine behavior to the change of the [/mob/living/var/resting] variable. /mob/living/proc/update_resting() update_rest_hud_icon() -<<<<<<< HEAD SEND_SIGNAL(src, COMSIG_LIVING_UPDATED_RESTING, resting) //SKYRAT EDIT ADDITION - GUNPOINT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/proc/get_up(instant = FALSE) set waitfor = FALSE -<<<<<<< HEAD var/get_up_time = 1 SECONDS var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = get_organ_slot(ORGAN_SLOT_SPINE) if(istype(potential_spine)) @@ -807,19 +752,6 @@ if(resting || body_position == STANDING_UP || HAS_TRAIT(src, TRAIT_FLOORED)) return to_chat(src, span_notice("You stand up.")) // SKYRAT EDIT ADDITION -======= - - var/get_up_time = 1 SECONDS - - var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = get_organ_slot(ORGAN_SLOT_SPINE) - if(istype(potential_spine)) - get_up_time *= potential_spine.athletics_boost_multiplier - - if(!instant && !do_after(src, 1 SECONDS, src, timed_action_flags = (IGNORE_USER_LOC_CHANGE|IGNORE_TARGET_LOC_CHANGE|IGNORE_HELD_ITEM), extra_checks = CALLBACK(src, TYPE_PROC_REF(/mob/living, rest_checks_callback)), interaction_key = DOAFTER_SOURCE_GETTING_UP, hidden = TRUE)) - return - if(resting || body_position == STANDING_UP || HAS_TRAIT(src, TRAIT_FLOORED)) - return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_body_position(STANDING_UP) set_lying_angle(0) @@ -981,11 +913,7 @@ if(full_heal_flags) fully_heal(full_heal_flags) -<<<<<<< HEAD if(stat == DEAD && can_be_revived() || (full_heal_flags & HEAL_ADMIN)) //in some cases you can't revive (e.g. no brain) //SKYRAT EDIT ADDITION - DNR TRAIT - Added: " || (full_heal_flags & HEAL_ADMIN)" -======= - if(stat == DEAD && can_be_revived()) //in some cases you can't revive (e.g. no brain) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_suicide(FALSE) set_stat(UNCONSCIOUS) //the mob starts unconscious, updatehealth() //then we check if the mob should wake up. @@ -1233,11 +1161,7 @@ /mob/living/proc/itch(obj/item/bodypart/target_part = null, damage = 0.5, can_scratch = TRUE, silent = FALSE) if ((mob_biotypes & (MOB_ROBOTIC | MOB_SPIRIT))) return FALSE -<<<<<<< HEAD - var/will_scratch = can_scratch && !incapacitated() -======= var/will_scratch = can_scratch && !incapacitated ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/applied_damage = 0 if (will_scratch && damage) applied_damage = apply_damage(damage, damagetype = BRUTE, def_zone = target_part) @@ -1324,10 +1248,6 @@ . = TRUE //If we're in an aggressive grab or higher, we're lying down, we're vulnerable to grabs, or we're staggered and we have some amount of stamina loss, we must resist if(pulledby.grab_state || body_position == LYING_DOWN || HAS_TRAIT(src, TRAIT_GRABWEAKNESS) || get_timed_status_effect_duration(/datum/status_effect/staggered) && (getFireLoss()*0.5 + getBruteLoss()*0.5) >= 40) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/altered_grab_state = pulledby.grab_state if((body_position == LYING_DOWN || HAS_TRAIT(src, TRAIT_GRABWEAKNESS) || get_timed_status_effect_duration(/datum/status_effect/staggered)) && pulledby.grab_state < GRAB_KILL) //If prone, resisting out of a grab is equivalent to 1 grab state higher. won't make the grab state exceed the normal max, however altered_grab_state++ @@ -1351,7 +1271,6 @@ //SKYRAT EDIT END resist_chance = (resist_chance/altered_grab_state) ///Resist chance divided by the value imparted by your grab state. It isn't until you reach neckgrab that you gain a penalty to escaping a grab. if(prob(resist_chance)) -<<<<<<< HEAD //SKYRAT EDIT ADDITION // Akula break-out flavor if(HAS_TRAIT(src, TRAIT_SLIPPERY)) @@ -1363,8 +1282,6 @@ pulledby.stop_pulling() return FALSE //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 visible_message(span_danger("[src] breaks free of [pulledby]'s grip!"), \ span_danger("You break free of [pulledby]'s grip!"), null, null, pulledby) to_chat(pulledby, span_warning("[src] breaks free of your grip!")) @@ -1372,17 +1289,10 @@ pulledby.stop_pulling() return FALSE else -<<<<<<< HEAD adjustStaminaLoss(rand(10,15))//failure to escape still imparts a pretty serious penalty //SKYRAT EDIT CHANGE: //adjustStaminaLoss(rand(15,20))//failure to escape still imparts a pretty serious penalty visible_message("[src] struggles as they fail to break free of [pulledby]'s grip!", \ "You struggle as you fail to break free of [pulledby]'s grip!", null, null, pulledby) to_chat(pulledby, "[src] struggles as they fail to break free of your grip!") -======= - adjustStaminaLoss(rand(15,20))//failure to escape still imparts a pretty serious penalty - visible_message(span_danger("[src] struggles as they fail to break free of [pulledby]'s grip!"), \ - span_warning("You struggle as you fail to break free of [pulledby]'s grip!"), null, null, pulledby) - to_chat(pulledby, span_danger("[src] struggles as they fail to break free of your grip!")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(moving_resist && client) //we resisted by trying to move client.move_delay = world.time + 4 SECONDS else @@ -1509,19 +1419,11 @@ if(!(interaction_flags_atom & INTERACT_ATOM_IGNORE_INCAPACITATED)) var/ignore_flags = NONE if(interaction_flags_atom & INTERACT_ATOM_IGNORE_RESTRAINED) -<<<<<<< HEAD - ignore_flags |= IGNORE_RESTRAINTS - if(!(interaction_flags_atom & INTERACT_ATOM_CHECK_GRAB)) - ignore_flags |= IGNORE_GRAB - - if(incapacitated(ignore_flags)) -======= ignore_flags |= INCAPABLE_RESTRAINTS if(!(interaction_flags_atom & INTERACT_ATOM_CHECK_GRAB)) ignore_flags |= INCAPABLE_GRAB if(INCAPACITATED_IGNORING(src, ignore_flags)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(src, span_warning("You are incapacitated at the moment!")) return FALSE @@ -1636,10 +1538,7 @@ if(!dropItemToGround(item)) if(!(item.item_flags & ABSTRACT)) qdel(item) -<<<<<<< HEAD -======= continue ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item_contents += item var/mob/living/new_mob @@ -2035,12 +1934,7 @@ GLOBAL_LIST_EMPTY(fire_appearances) if(isliving(dropping)) var/mob/living/M = dropping if(M.can_be_held && U.pulling == M) -<<<<<<< HEAD return M.mob_try_pickup(U) //SKYRAT EDIT CHANGE //blame kevinz dont open the mobs inventory if you are picking them up -======= - M.mob_try_pickup(U)//blame kevinz - return//dont open the mobs inventory if you are picking them up ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /mob/living/proc/mob_pickup(mob/living/user) @@ -2056,11 +1950,7 @@ GLOBAL_LIST_EMPTY(fire_appearances) /mob/living/proc/mob_try_pickup(mob/living/user, instant=FALSE) if(!ishuman(user)) -<<<<<<< HEAD - return FALSE -======= return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!user.get_empty_held_indexes()) to_chat(user, span_warning("Your hands are full!")) return FALSE @@ -2326,16 +2216,9 @@ GLOBAL_LIST_EMPTY(fire_appearances) /mob/living/proc/can_look_up() if(next_move > world.time) return FALSE -<<<<<<< HEAD - if(incapacitated(IGNORE_RESTRAINTS)) - return FALSE - return TRUE - -======= if(INCAPACITATED_IGNORING(src, INCAPABLE_RESTRAINTS)) return FALSE return TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * look_up Changes the perspective of the mob to any openspace turf above the mob * @@ -2469,20 +2352,14 @@ GLOBAL_LIST_EMPTY(fire_appearances) if(. >= UNCONSCIOUS) REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_KNOCKEDOUT) remove_traits(list(TRAIT_HANDS_BLOCKED, TRAIT_INCAPACITATED, TRAIT_FLOORED, TRAIT_CRITICAL_CONDITION), STAT_TRAIT) -<<<<<<< HEAD -======= log_combat(src, src, "regained consciousness") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SOFT_CRIT) if(pulledby) ADD_TRAIT(src, TRAIT_IMMOBILIZED, PULLED_WHILE_SOFTCRIT_TRAIT) //adding trait sources should come before removing to avoid unnecessary updates if(. >= UNCONSCIOUS) REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_KNOCKEDOUT) ADD_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT) -<<<<<<< HEAD -======= log_combat(src, src, "entered soft crit") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(UNCONSCIOUS) if(. != HARD_CRIT) become_blind(UNCONSCIOUS_TRAIT) @@ -2490,26 +2367,17 @@ GLOBAL_LIST_EMPTY(fire_appearances) ADD_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT) else REMOVE_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT) -<<<<<<< HEAD -======= log_combat(src, src, "lost consciousness") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HARD_CRIT) if(. != UNCONSCIOUS) become_blind(UNCONSCIOUS_TRAIT) ADD_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT) -<<<<<<< HEAD -======= log_combat(src, src, "entered hard crit") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(DEAD) REMOVE_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT) remove_from_alive_mob_list() add_to_dead_mob_list() -<<<<<<< HEAD -======= log_combat(src, src, "died") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!can_hear()) stop_sound_channel(CHANNEL_AMBIENCE) refresh_looping_ambience() @@ -2546,10 +2414,7 @@ GLOBAL_LIST_EMPTY(fire_appearances) /mob/living/set_pulledby(new_pulledby) . = ..() -<<<<<<< HEAD -======= update_incapacitated() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(. == FALSE) //null is a valid value here, we only want to return if FALSE is explicitly passed. return if(pulledby) @@ -2670,13 +2535,10 @@ GLOBAL_LIST_EMPTY(fire_appearances) body_position = new_value SEND_SIGNAL(src, COMSIG_LIVING_SET_BODY_POSITION, new_value, .) if(new_value == LYING_DOWN) // From standing to lying down. -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - SOUNDS if(has_gravity()) playsound(src, "bodyfall", 50, TRUE) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 on_lying_down() else // From lying down to standing up. on_standing_up() @@ -3030,8 +2892,6 @@ GLOBAL_LIST_EMPTY(fire_appearances) return "[span_notice("You'd estimate [p_their()] fitness level at about...")] [span_boldwarning("What?!? [our_fitness_level]???")]" return span_notice("You'd estimate [p_their()] fitness level at about [our_fitness_level]. [comparative_fitness <= 0.33 ? "Pathetic." : ""]") -<<<<<<< HEAD -======= ///Performs the aftereffects of blocking a projectile. /mob/living/proc/block_projectile_effects() @@ -3054,4 +2914,3 @@ GLOBAL_LIST_EMPTY(fire_appearances) REMOVE_TRAIT(src, TRAIT_BLOCKING_PROJECTILES, BLOCKING_TRAIT) cut_overlay(selected_overlay) update_transform(0.8) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 6ef04896d36..e4e55920734 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -1,14 +1,9 @@ /mob/living/proc/run_armor_check(def_zone = null, attack_flag = MELEE, absorb_text = null, soften_text = null, armour_penetration, penetrated_text, silent=FALSE, weak_against_armour = FALSE) -<<<<<<< HEAD SEND_SIGNAL(src, COMSIG_MOB_RUN_ARMOR) //SKYRAT EDIT ADDITION var/our_armor = getarmor(def_zone, attack_flag) -======= - var/our_armor = getarmor(def_zone, attack_flag) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(our_armor <= 0) return our_armor if(weak_against_armour && our_armor >= 0) @@ -156,7 +151,6 @@ return . = combat_mode combat_mode = new_mode -<<<<<<< HEAD SEND_SIGNAL(src, COMSIG_LIVING_COMBAT_MODE_TOGGLE, new_mode) //SKYRAT EDIT ADDITION if(hud_used?.action_intent) hud_used.action_intent.update_appearance() @@ -169,10 +163,6 @@ face_mouse = (client?.prefs?.read_preference(/datum/preference/toggle/face_cursor_combat_mode) && combat_mode) ? TRUE : FALSE //SKYRAT EDIT ADDITION END -======= - if(hud_used?.action_intent) - hud_used.action_intent.update_appearance() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(silent || !(client?.prefs.read_preference(/datum/preference/toggle/sound_combatmode))) return if(combat_mode) @@ -273,11 +263,7 @@ /** * Called when this mob is grabbed by another mob. */ -<<<<<<< HEAD /mob/living/proc/grabbedby(mob/living/user, supress_message = FALSE, grabbed_part) // SKYRAT EDIT CHANGE - ORIGINAL: /mob/living/proc/grabbedby(mob/living/user, supress_message = FALSE) -======= -/mob/living/proc/grabbedby(mob/living/user, supress_message = FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(user == src || anchored || !isturf(user.loc)) return FALSE diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index fe697ee2f67..e5d564c978e 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -1,10 +1,6 @@ /mob/living see_invisible = SEE_INVISIBLE_LIVING -<<<<<<< HEAD hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD, DNR_HUD) // SKYRAT EDIT ADDITION - DNR_HUD -======= - hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pressure_resistance = 10 hud_type = /datum/hud/living interaction_flags_click = ALLOW_RESTING diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm index 8bff7884b1e..99c795ec09d 100644 --- a/code/modules/mob/living/living_movement.dm +++ b/code/modules/mob/living/living_movement.dm @@ -90,14 +90,11 @@ if(pulling) if(isliving(pulling)) var/mob/living/L = pulling -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(HAS_TRAIT(L, TRAIT_OVERSIZED) && !HAS_TRAIT(src, TRAIT_OVERSIZED) && !iscyborg(src)) add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/bulky_drag, multiplicative_slowdown = PULL_OVERSIZED_SLOWDOWN) return //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!slowed_by_drag || L.body_position == STANDING_UP || L.buckled || grab_state >= GRAB_AGGRESSIVE) remove_movespeed_modifier(/datum/movespeed_modifier/bulky_drag) return @@ -132,11 +129,7 @@ return ..() /mob/living/can_z_move(direction, turf/start, turf/destination, z_move_flags = ZMOVE_FLIGHT_FLAGS, mob/living/rider) -<<<<<<< HEAD - if(z_move_flags & ZMOVE_INCAPACITATED_CHECKS && incapacitated()) -======= if(z_move_flags & ZMOVE_INCAPACITATED_CHECKS && incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(z_move_flags & ZMOVE_FEEDBACK) to_chat(rider || src, span_warning("[rider ? src : "You"] can't do that right now!")) return FALSE diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index 4808ea1acb3..9c7fb890baa 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -33,10 +33,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( // Misc RADIO_KEY_AI_PRIVATE = RADIO_CHANNEL_AI_PRIVATE, // AI Upload channel -<<<<<<< HEAD -======= RADIO_KEY_ENTERTAINMENT = RADIO_CHANNEL_ENTERTAINMENT, // Entertainment monitors ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //kinda localization -- rastaf0 @@ -65,12 +62,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list( "в" = MODE_KEY_DEADMIN, // Misc -<<<<<<< HEAD - "щ" = RADIO_CHANNEL_AI_PRIVATE -======= "щ" = RADIO_CHANNEL_AI_PRIVATE, "з" = RADIO_CHANNEL_ENTERTAINMENT, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )) /** @@ -242,13 +235,10 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list( //Get which verb is prefixed to the message before radio but after most modifications message_mods[SAY_MOD_VERB] = say_mod(message, message_mods) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START: autopunctuation //ensure EOL punctuation exists and that word-bounded 'i' are capitalized before we do anything else message = autopunct_bare(message) // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //This is before anything that sends say a radio message, and after all important message type modifications, so you can scumb in alien chat or something if(saymode && !saymode.handle_message(src, message, language)) return diff --git a/code/modules/mob/living/navigation.dm b/code/modules/mob/living/navigation.dm index 7ca8c8bed0f..a18342c4456 100644 --- a/code/modules/mob/living/navigation.dm +++ b/code/modules/mob/living/navigation.dm @@ -12,11 +12,7 @@ set name = "Navigate" set category = "IC" -<<<<<<< HEAD - if(incapacitated()) -======= if(incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(length(client.navigation_images)) addtimer(CALLBACK(src, PROC_REF(cut_navigation)), world.tick_lag) @@ -50,11 +46,7 @@ if(isnull(navigate_target)) return -<<<<<<< HEAD - if(incapacitated()) -======= if(incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return COOLDOWN_START(src, navigate_cooldown, 15 SECONDS) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index a82cf873a2c..6c5d6cfe872 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -181,11 +181,7 @@ RegisterSignal(ai_tracking_tool, COMSIG_TRACKABLE_TRACKING_TARGET, PROC_REF(on_track_target)) RegisterSignal(ai_tracking_tool, COMSIG_TRACKABLE_GLIDE_CHANGED, PROC_REF(tracked_glidesize_changed)) -<<<<<<< HEAD - add_traits(list(TRAIT_PULL_BLOCKED, TRAIT_HANDS_BLOCKED), ROUNDSTART_TRAIT) -======= add_traits(list(TRAIT_PULL_BLOCKED, TRAIT_AI_ACCESS, TRAIT_HANDS_BLOCKED), INNATE_TRAIT) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alert_control = new(src, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER, ALARM_CAMERA, ALARM_BURGLAR, ALARM_MOTION), list(z), camera_view = TRUE) RegisterSignal(alert_control.listener, COMSIG_ALARM_LISTENER_TRIGGERED, PROC_REF(alarm_triggered)) @@ -485,22 +481,14 @@ if(usr != src) return -<<<<<<< HEAD - if(href_list["emergencyAPC"]) //This check comes before incapacitated() because the only time it would be useful is when we have no power. -======= if(href_list["emergencyAPC"]) //This check comes before incapacitated because the only time it would be useful is when we have no power. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!apc_override) to_chat(src, span_notice("APC backdoor is no longer available.")) return apc_override.ui_interact(src) return -<<<<<<< HEAD - if(incapacitated()) -======= if(incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if (href_list["switchcamera"]) diff --git a/code/modules/mob/living/silicon/ai/ai_defense.dm b/code/modules/mob/living/silicon/ai/ai_defense.dm index f8a65876d6c..55a00a6ffc0 100644 --- a/code/modules/mob/living/silicon/ai/ai_defense.dm +++ b/code/modules/mob/living/silicon/ai/ai_defense.dm @@ -63,11 +63,7 @@ . = ..() if(user.combat_mode) return -<<<<<<< HEAD - if(stat != DEAD && !incapacitated() && (client || deployed_shell?.client)) -======= if(stat != DEAD && !incapacitated && (client || deployed_shell?.client)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // alive and well AIs control their floor bolts balloon_alert(user, "the AI's bolt motors resist.") return ITEM_INTERACT_SUCCESS diff --git a/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm b/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm index 1822f6d47f2..5415b7b1931 100644 --- a/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm +++ b/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm @@ -47,11 +47,7 @@ data["search_mode"] = search_mode == PAINTINGS_FILTER_SEARCH_TITLE ? "Title" : "Author" return data -<<<<<<< HEAD -/datum/portrait_picker/ui_act(action, params) -======= /datum/portrait_picker/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/mob/living/silicon/ai/ai_say.dm b/code/modules/mob/living/silicon/ai/ai_say.dm index 6f29aa85424..4fd7548b7ca 100644 --- a/code/modules/mob/living/silicon/ai/ai_say.dm +++ b/code/modules/mob/living/silicon/ai/ai_say.dm @@ -56,10 +56,6 @@ ai_holo.say(message, sanitize = FALSE, language = language) else to_chat(src, span_alert("No holopad connected.")) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* SKYRAT EDIT REMOVAL - MOVED TO: MODULAR_SKYRAT/MODULES/ALT_VOX/CODE/VOX_PROCS.DM // Make sure that the code compiles with AI_VOX undefined diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm index cb3fde737e5..e4a98f5f366 100644 --- a/code/modules/mob/living/silicon/ai/examine.dm +++ b/code/modules/mob/living/silicon/ai/examine.dm @@ -1,9 +1,5 @@ /mob/living/silicon/ai/examine(mob/user) -<<<<<<< HEAD . = list("This is [icon2html(src, user)] [src]!", EXAMINE_SECTION_BREAK) //SKYRAT EDIT CHANGE -======= - . = list("This is [icon2html(src, user)] [src]!") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(stat == DEAD) . += span_deadsay("It appears to be powered-down.") . += span_notice("Its floor bolts are [is_anchored ? "tightened" : "loose"].") @@ -30,12 +26,9 @@ . += "The wireless networking light is blinking." else if (!shunted && !client) . += "[src]Core.exe has stopped responding! NTOS is searching for a solution to the problem..." -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION . += get_silicon_flavortext() //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . += "" . += ..() diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index 64fcf1573bb..7a6b4c5f207 100644 --- a/code/modules/mob/living/silicon/laws.dm +++ b/code/modules/mob/living/silicon/laws.dm @@ -30,7 +30,6 @@ addtimer(CALLBACK(src, PROC_REF(show_laws)), 0) addtimer(CALLBACK(src, PROC_REF(deadchat_lawchange)), 0) last_lawchange_announce = world.time -<<<<<<< HEAD // SKYRAT EDIT ADDITION START: AI LAWSYNC if(isAI(src)) var/mob/living/silicon/ai/ai = src @@ -38,8 +37,6 @@ if(cyborg.connected_ai && cyborg.lawupdate) cyborg.lawsync() // SKYRAT EDIT ADDITON END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/silicon/proc/set_zeroth_law(law, law_borg, announce = TRUE) laws_sanity_check() diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index fde9128be49..68ee438dc12 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -46,12 +46,9 @@ . += span_warning("It doesn't seem to be responding.") if(DEAD) . += span_deadsay("It looks like its system is corrupted and requires a reset.") -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION . += get_silicon_flavortext() //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . += "" . += ..() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 1792138eb99..0e4bac64708 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -11,11 +11,7 @@ post_tipped_callback = CALLBACK(src, PROC_REF(after_tip_over)), \ post_untipped_callback = CALLBACK(src, PROC_REF(after_righted)), \ roleplay_friendly = TRUE, \ -<<<<<<< HEAD roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/silicon/beep, /datum/emote/silicon/beep2), /* SKYRAT EDIT CHANGE - ORIGINAL: roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/silicon/beep)*/ \ -======= - roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/silicon/beep), \ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 roleplay_callback = CALLBACK(src, PROC_REF(untip_roleplay))) set_wires(new /datum/wires/robot(src)) @@ -162,7 +158,6 @@ if(lockcharge == TRUE) to_chat(src,span_userdanger("ERROR: Lockdown is engaged. Please disengage lockdown to pick module.")) -<<<<<<< HEAD return // SKYRAT EDIT START - Making the cyborg model list static to reduce how many times it's generated. @@ -198,35 +193,6 @@ model.transform_to(GLOB.cyborg_model_list[input_model]) -======= - return - - var/list/model_list = list( - "Engineering" = /obj/item/robot_model/engineering, - "Medical" = /obj/item/robot_model/medical, - "Miner" = /obj/item/robot_model/miner, - "Janitor" = /obj/item/robot_model/janitor, - "Service" = /obj/item/robot_model/service, - ) - if(!CONFIG_GET(flag/disable_peaceborg)) - model_list["Peacekeeper"] = /obj/item/robot_model/peacekeeper - if(!CONFIG_GET(flag/disable_secborg)) - model_list["Security"] = /obj/item/robot_model/security - - // Create radial menu for choosing borg model - var/list/model_icons = list() - for(var/option in model_list) - var/obj/item/robot_model/model = model_list[option] - var/model_icon = initial(model.cyborg_base_icon) - model_icons[option] = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = model_icon) - - var/input_model = show_radial_menu(src, src, model_icons, radius = 42) - if(!input_model || model.type != /obj/item/robot_model) - return - - model.transform_to(model_list[input_model]) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Used to setup the a basic and (somewhat) unique name for the robot. /mob/living/silicon/robot/proc/setup_default_name() @@ -431,11 +397,7 @@ return ..() /mob/living/silicon/robot/execute_mode() -<<<<<<< HEAD - if(incapacitated()) -======= if(incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return var/obj/item/W = get_active_held_item() if(W) @@ -543,13 +505,8 @@ lampButton?.update_appearance() update_icons() return -<<<<<<< HEAD - set_light_range(lamp_intensity) - set_light_color(lamp_doom? COLOR_RED : lamp_color) //Red for doomsday killborgs, borg's choice otherwise -======= set_light_range(max(MINIMUM_USEFUL_LIGHT_RANGE, lamp_intensity)) set_light_color(lamp_doom ? COLOR_RED : lamp_color) //Red for doomsday killborgs, borg's choice otherwise ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 set_light_on(TRUE) lamp_enabled = TRUE lampButton?.update_appearance() @@ -766,9 +723,8 @@ if (hasExpanded) hasExpanded = FALSE -<<<<<<< HEAD //update_transform(0.5) // Original - update_transform(0.8) // SKYRAT EDIT CHANGE + update_transform(0.6) // SKYRAT EDIT CHANGE //SKYRAT EDIT ADDITION BEGIN - CYBORG if (hasShrunk) @@ -776,9 +732,6 @@ update_transform(4/3) //SKYRAT EDIT ADDITION END -======= - update_transform(0.5) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 logevent("Chassis model has been reset.") log_silicon("CYBORG: [key_name(src)] has reset their cyborg model.") model.transform_to(/obj/item/robot_model) @@ -999,11 +952,7 @@ M.visible_message(span_warning("[M] really can't seem to mount [src]...")) return -<<<<<<< HEAD - if(stat || incapacitated()) -======= if(stat || incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(model && !model.allow_riding) M.visible_message(span_boldwarning("Unfortunately, [M] just can't seem to hold onto [src]!")) diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm index abdaa32bfa8..f41f4bd8ffc 100644 --- a/code/modules/mob/living/silicon/robot/robot_defines.dm +++ b/code/modules/mob/living/silicon/robot/robot_defines.dm @@ -7,11 +7,7 @@ /mob/living/silicon/robot name = "Cyborg" real_name = "Cyborg" -<<<<<<< HEAD icon = 'icons/mob/silicon/robots.dmi' //SKYRAT EDIT - Modified in modular_skyrat\modules\altborgs\code\robot_defines.dm (to allow for custom transformation animations) -======= - icon = 'icons/mob/silicon/robots.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "robot" maxHealth = 100 health = 100 diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index dff9283c94c..52edb85f221 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -173,14 +173,11 @@ if(!gun.chambered) . = TRUE gun.recharge_newshot() //try to reload a new shot. -<<<<<<< HEAD /// SKYRAT EDIT START - Cargo borgs else if(istype(module, /obj/item/hand_labeler/cyborg)) var/obj/item/hand_labeler/cyborg/labeler = module labeler.labels_left = 30 /// SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(cyborg.toner < cyborg.tonermax) . = TRUE @@ -253,14 +250,11 @@ cyborg.diag_hud_set_aishell() log_silicon("CYBORG: [key_name(cyborg)] has transformed into the [new_model] model.") -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - ALTBORGS - Old check for 'dogborg' var no longer necessary, refactored into model_features instead. new_model.update_dogborg() new_model.update_tallborg() //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 INVOKE_ASYNC(new_model, PROC_REF(do_transform_animation)) qdel(src) return new_model @@ -275,35 +269,26 @@ for(var/skin in borg_skins) var/list/details = borg_skins[skin] reskin_icons[skin] = image(icon = details[SKIN_ICON] || 'icons/mob/silicon/robots.dmi', icon_state = details[SKIN_ICON_STATE]) -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - ALTBORGS if (!isnull(details[SKIN_FEATURES])) if (TRAIT_R_WIDE in details[SKIN_FEATURES]) var/image/reskin = reskin_icons[skin] reskin.pixel_x -= 16 //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/borg_skin = show_radial_menu(cyborg, cyborg, reskin_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), cyborg, old_model), radius = 38, require_near = TRUE) if(!borg_skin) return FALSE var/list/details = borg_skins[borg_skin] -<<<<<<< HEAD //SKYRAT EDIT START if(cyborg.hasExpanded && (((TRAIT_R_WIDE in details[SKIN_FEATURES]) && (TRAIT_R_WIDE in model_features)) || ((TRAIT_R_TALL in details[SKIN_FEATURES]) && (TRAIT_R_TALL in model_features)))) to_chat(cyborg, span_warning("You can't make yourself into a larger frame when you've already used an expander!")) return FALSE //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!isnull(details[SKIN_ICON_STATE])) cyborg_base_icon = details[SKIN_ICON_STATE] if(!isnull(details[SKIN_ICON])) cyborg.icon = details[SKIN_ICON] -<<<<<<< HEAD cyborg_icon_override = details[SKIN_ICON] // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!isnull(details[SKIN_PIXEL_X])) cyborg.base_pixel_x = details[SKIN_PIXEL_X] if(!isnull(details[SKIN_PIXEL_Y])) @@ -314,15 +299,12 @@ hat_offset = details[SKIN_HAT_OFFSET] if(!isnull(details[SKIN_TRAITS])) model_traits += details[SKIN_TRAITS] -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(!isnull(details[SKIN_FEATURES])) model_features += details[SKIN_FEATURES] if (!isnull(details[SKIN_HAT_REST_OFFSET])) rest_hat_offset = details[SKIN_HAT_REST_OFFSET] //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/i in old_model.added_modules) added_modules += i old_model.added_modules -= i @@ -373,11 +355,7 @@ /obj/item/robot_model/proc/check_menu(mob/living/silicon/robot/user, obj/item/robot_model/old_model) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(user.model != old_model) return FALSE @@ -430,7 +408,6 @@ /obj/item/pipe_dispenser, /obj/item/extinguisher, /obj/item/weldingtool/largetank/cyborg, -<<<<<<< HEAD /obj/item/screwdriver/cyborg/power, // Skyrat ADDITION - Combines Screwdriver and Wrench into one /obj/item/crowbar/cyborg/power, // Skyrat ADDITION - Combines Crowbar and Wirecutters into one /obj/item/multitool/cyborg, //Skyrat ADDITION - Adds multitool for easier access @@ -439,12 +416,6 @@ /obj/item/t_scanner, /obj/item/analyzer, /obj/item/holosign_creator/atmos, // Skyrat Edit - Adds Holofans to engineering borgos -======= - /obj/item/borg/cyborg_omnitool/engineering, - /obj/item/borg/cyborg_omnitool/engineering, - /obj/item/t_scanner, - /obj/item/analyzer, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/assembly/signaler/cyborg, /obj/item/blueprints/cyborg, /obj/item/electroadaptive_pseudocircuit, @@ -452,10 +423,7 @@ /obj/item/stack/sheet/glass, /obj/item/borg/apparatus/sheet_manipulator, /obj/item/stack/rods/cyborg, -<<<<<<< HEAD /obj/item/lightreplacer/cyborg, // Skyrat Edit - Surprised Engie borgs don't get these -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/stack/tile/iron/base/cyborg, /obj/item/stack/cable_coil, ) @@ -776,10 +744,7 @@ /obj/item/storage/bag/ore/cyborg, /obj/item/pickaxe/drill/cyborg, /obj/item/shovel, -<<<<<<< HEAD /obj/item/kinetic_crusher, //SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/crowbar/cyborg, /obj/item/weldingtool/mini, /obj/item/extinguisher/mini, @@ -824,13 +789,8 @@ /obj/item/robot_model/peacekeeper/do_transform_animation() ..() -<<<<<<< HEAD to_chat(loc, "Under Safeguard, you are an enforcer of the PEACE and preventer of HARM. \ You are not a security member and you are expected to follow orders and prevent harm above all else. Space law means nothing to you.") // SKYRAT EDIT Changes verbiage off ASIMOV/HUMAN Focus -======= - to_chat(loc, "Under ASIMOV, you are an enforcer of the PEACE and preventer of HUMAN HARM. \ - You are not a security member and you are expected to follow orders and prevent harm above all else. Space law means nothing to you.") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/robot_model/security name = "Security" @@ -872,7 +832,6 @@ name = "Service" basic_modules = list( /obj/item/assembly/flash/cyborg, -<<<<<<< HEAD // SKYRAT EDIT START // /obj/item/reagent_containers/borghypo/borgshaker, /obj/item/reagent_containers/borghypo/borgshaker/specific/alcohol, @@ -912,28 +871,6 @@ /obj/item/reagent_containers/cup/rag, //obj/item/storage/bag/money, //This is never used and there's already too much bloat // SKYRAT EDIT END -======= - /obj/item/reagent_containers/borghypo/borgshaker, - /obj/item/borg/apparatus/beaker/service, - /obj/item/reagent_containers/cup/beaker/large, //I know a shaker is more appropiate but this is for ease of identification - /obj/item/reagent_containers/condiment/enzyme, - /obj/item/reagent_containers/dropper, - /obj/item/rsf, - /obj/item/storage/bag/tray, - /obj/item/pen, - /obj/item/toy/crayon/spraycan/borg, - /obj/item/extinguisher/mini, - /obj/item/hand_labeler/borg, - /obj/item/razor, - /obj/item/instrument/guitar, - /obj/item/instrument/piano_synth, - /obj/item/lighter, - /obj/item/borg/lollipop, - /obj/item/stack/pipe_cleaner_coil/cyborg, - /obj/item/chisel, - /obj/item/reagent_containers/cup/rag, - /obj/item/storage/bag/money, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) radio_channels = list(RADIO_CHANNEL_SERVICE) emag_modules = list( diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 4373bc5a146..379a794d275 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -1,9 +1,5 @@ /mob/living/silicon gender = NEUTER -<<<<<<< HEAD - has_unlimited_silicon_privilege = TRUE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 verb_say = "states" verb_ask = "queries" verb_exclaim = "declares" @@ -78,12 +74,9 @@ TRAIT_NOFIRE_SPREAD, TRAIT_BRAWLING_KNOCKDOWN_BLOCKED, TRAIT_FENCE_CLIMBER, -<<<<<<< HEAD -======= TRAIT_SILICON_ACCESS, TRAIT_REAGENT_SCANNER, TRAIT_UNOBSERVANT, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) add_traits(traits_to_apply, ROUNDSTART_TRAIT) diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index 4bab3c64a5a..526718fe7bd 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -75,14 +75,11 @@ to_chat(user, span_danger("You punch [src], but don't leave a dent!")) return TRUE else -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - if(HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && !src.incapacitated(IGNORE_RESTRAINTS)) + if(HAS_TRAIT(src, TRAIT_QUICKREFLEXES) && (src.stat != UNCONSCIOUS) && !INCAPACITATED_IGNORING(src, INCAPABLE_RESTRAINTS)) visible_message(span_warning("[user] tries to pet [src], but it moves out of the way.")) return TRUE // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 visible_message(span_notice("[user] pets [src]."), span_notice("[user] pets you."), null, null, user) to_chat(user, span_notice("You pet [src].")) SEND_SIGNAL(user, COMSIG_MOB_PAT_BORG) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index b9cc7fcccd5..ee7cd135798 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -12,10 +12,6 @@ hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD, DIAG_BATT_HUD, DIAG_PATH_HUD = HUD_LIST_LIST) maxbodytemp = INFINITY minbodytemp = 0 -<<<<<<< HEAD - has_unlimited_silicon_privilege = TRUE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sentience_type = SENTIENCE_ARTIFICIAL status_flags = NONE //no default canpush pass_flags = PASSFLAPS @@ -980,15 +976,6 @@ Pass a positive integer as an argument to override a bot's default speed. return data // Actions received from TGUI -<<<<<<< HEAD -/mob/living/simple_animal/bot/ui_act(action, params) - . = ..() - if(.) - return - var/mob/user = usr - if(!allowed(user)) - to_chat(usr, span_warning("Access denied.")) -======= /mob/living/simple_animal/bot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) @@ -996,7 +983,6 @@ Pass a positive integer as an argument to override a bot's default speed. var/mob/user = ui.user if(!allowed(user)) to_chat(user, span_warning("Access denied.")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(action == "lock") @@ -1016,15 +1002,6 @@ Pass a positive integer as an argument to override a bot's default speed. if("airplane") bot_mode_flags ^= BOT_MODE_REMOTE_ENABLED if("hack") -<<<<<<< HEAD - if(!HAS_SILICON_ACCESS(usr)) - return - if(!(bot_cover_flags & BOT_COVER_EMAGGED)) - bot_cover_flags |= (BOT_COVER_EMAGGED|BOT_COVER_HACKED|BOT_COVER_LOCKED) - to_chat(usr, span_warning("You overload [src]'s [hackables].")) - message_admins("Safety lock of [ADMIN_LOOKUPFLW(src)] was disabled by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_VERBOSEJMP(src)]") - usr.log_message("disabled safety lock of [src]", LOG_GAME) -======= if(!HAS_SILICON_ACCESS(user)) return if(!(bot_cover_flags & BOT_COVER_EMAGGED)) @@ -1032,42 +1009,22 @@ Pass a positive integer as an argument to override a bot's default speed. to_chat(user, span_warning("You overload [src]'s [hackables].")) message_admins("Safety lock of [ADMIN_LOOKUPFLW(src)] was disabled by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]") user.log_message("disabled safety lock of [src]", LOG_GAME) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bot_reset() to_chat(src, span_userdanger("(#$*#$^^( OVERRIDE DETECTED")) to_chat(src, span_boldnotice(get_emagged_message())) return if(!(bot_cover_flags & BOT_COVER_HACKED)) -<<<<<<< HEAD - to_chat(usr, span_boldannounce("You fail to repair [src]'s [hackables].")) - return - bot_cover_flags &= ~(BOT_COVER_EMAGGED|BOT_COVER_HACKED) - to_chat(usr, span_notice("You reset the [src]'s [hackables].")) - usr.log_message("re-enabled safety lock of [src]", LOG_GAME) -======= to_chat(user, span_boldannounce("You fail to repair [src]'s [hackables].")) return bot_cover_flags &= ~(BOT_COVER_EMAGGED|BOT_COVER_HACKED) to_chat(user, span_notice("You reset the [src]'s [hackables].")) user.log_message("re-enabled safety lock of [src]", LOG_GAME) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bot_reset() to_chat(src, span_userdanger("Software restored to standard.")) to_chat(src, span_boldnotice(possessed_message)) if("eject_pai") if(!paicard) return -<<<<<<< HEAD - to_chat(usr, span_notice("You eject [paicard] from [initial(src.name)].")) - ejectpai(usr) - if("toggle_personality") - if (can_be_possessed) - disable_possession(usr) - else - enable_possession(usr) - if("rename") - rename(usr) -======= to_chat(user, span_notice("You eject [paicard] from [initial(src.name)].")) ejectpai(user) if("toggle_personality") @@ -1077,7 +1034,6 @@ Pass a positive integer as an argument to override a bot's default speed. enable_possession(user) if("rename") rename(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/simple_animal/bot/update_icon_state() icon_state = "[isnull(base_icon_state) ? initial(icon_state) : base_icon_state][get_bot_flag(bot_mode_flags, BOT_MODE_ON)]" diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 8a22d6680b2..bbd45e12a27 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -42,11 +42,7 @@ var/list/targets = list() for(var/mob/living/carbon/nearby_carbon in view(7, src)) //Let's find us a target var/threatlevel = 0 -<<<<<<< HEAD - if(nearby_carbon.incapacitated()) -======= if(nearby_carbon.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue threatlevel = nearby_carbon.assess_threat(judgement_criteria) if(threatlevel < THREAT_ASSESS_DANGEROUS) diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index e4f706ede12..c670f6561c8 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -142,12 +142,8 @@ // Actions received from TGUI /mob/living/simple_animal/bot/floorbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() -<<<<<<< HEAD - if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr))) -======= var/mob/user = ui.user if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return switch(action) @@ -165,11 +161,7 @@ if(tilestack) tilestack.forceMove(drop_location()) if("line_mode") -<<<<<<< HEAD - var/setdir = tgui_input_list(usr, "Select construction direction", "Direction", list("north", "east", "south", "west", "disable")) -======= var/setdir = tgui_input_list(user, "Select construction direction", "Direction", list("north", "east", "south", "west", "disable")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(isnull(setdir) || QDELETED(ui) || ui.status != UI_INTERACTIVE) return switch(setdir) diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 03287785b11..dbfe987cac5 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -286,42 +286,21 @@ data["paiInserted"] = !!paicard return data -<<<<<<< HEAD -/mob/living/simple_animal/bot/mulebot/ui_act(action, params) - . = ..() - if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr))) -======= /mob/living/simple_animal/bot/mulebot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() var/mob/user = ui.user if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return switch(action) if("lock") -<<<<<<< HEAD - if(HAS_SILICON_ACCESS(usr)) -======= if(HAS_SILICON_ACCESS(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bot_cover_flags ^= BOT_COVER_LOCKED return TRUE if("on") if(bot_mode_flags & BOT_MODE_ON) turn_off() else if(bot_cover_flags & BOT_COVER_MAINTS_OPEN) -<<<<<<< HEAD - to_chat(usr, span_warning("[name]'s maintenance panel is open!")) - return - else if(cell) - if(!turn_on()) - to_chat(usr, span_warning("You can't switch on [src]!")) - return - return TRUE - else - bot_control(action, usr, params) // Kill this later. // Kill PDAs in general please -======= to_chat(user, span_warning("[name]'s maintenance panel is open!")) return else if(cell) @@ -331,7 +310,6 @@ return TRUE else bot_control(action, user, params) // Kill this later. // Kill PDAs in general please ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /mob/living/simple_animal/bot/mulebot/bot_control(command, mob/user, list/params = list(), pda = FALSE) @@ -734,11 +712,7 @@ // player on mulebot attempted to move /mob/living/simple_animal/bot/mulebot/relaymove(mob/living/user, direction) -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(load == user) unload(0) @@ -832,11 +806,7 @@ /mob/living/simple_animal/bot/mulebot/paranormal/mouse_drop_receive(atom/movable/AM, mob/user, params) var/mob/living/L = user -<<<<<<< HEAD - if(user.incapacitated() || (istype(L) && L.body_position == LYING_DOWN)) -======= if(user.incapacitated || (istype(L) && L.body_position == LYING_DOWN)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(!istype(AM) || iscameramob(AM) || istype(AM, /obj/effect/dummy/phased_mob)) //allows ghosts! diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 302a2138d1f..164ad55a4a2 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -202,16 +202,10 @@ return data // Actions received from TGUI -<<<<<<< HEAD -/mob/living/simple_animal/bot/secbot/ui_act(action, params) - . = ..() - if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr))) -======= /mob/living/simple_animal/bot/secbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() var/mob/user = ui.user if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return switch(action) @@ -370,19 +364,11 @@ weapon.attack(current_target, src) if(ishuman(current_target)) current_target.set_stutter(10 SECONDS) -<<<<<<< HEAD current_target.Paralyze(60) // SKYRAT EDIT CHANGE - original was current_target.Paralyze(100) var/mob/living/carbon/human/human_target = current_target threat = human_target.assess_threat(judgement_criteria) else current_target.Paralyze(60) // SKYRAT EDIT CHANGE - original was current_target.Paralyze(100) -======= - current_target.Paralyze(100) - var/mob/living/carbon/human/human_target = current_target - threat = human_target.assess_threat(judgement_criteria) - else - current_target.Paralyze(100) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 current_target.set_stutter(10 SECONDS) threat = current_target.assess_threat(judgement_criteria) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 574d4d7085c..789dcc1c13f 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -320,11 +320,7 @@ /mob/living/simple_animal/hostile/proc/CheckAndAttack() var/atom/target_from = GET_TARGETS_FROM(src) -<<<<<<< HEAD - if(target && isturf(target_from.loc) && target.Adjacent(target_from) && !incapacitated()) -======= if(target && isturf(target_from.loc) && target.Adjacent(target_from) && !incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AttackingTarget(target) /mob/living/simple_animal/hostile/proc/MoveToTarget(list/possible_targets)//Step 5, handle movement between us and our target diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm index e0b90009e5a..1d993b18c30 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm @@ -86,14 +86,11 @@ crusher_kill = TRUE if(crusher_loot) // spawn crusher loot, if any spawn_crusher_loot() -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - ASHWALKER TROPHIES var/datum/status_effect/ashwalker_damage/ashie_damage = has_status_effect(/datum/status_effect/ashwalker_damage) if(!crusher_kill && ashie_damage && crusher_loot && ashie_damage.total_damage >= maxHealth * 0.6) spawn_crusher_loot() // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(true_spawn && !(flags_1 & ADMIN_SPAWNED_1)) var/tab = "megafauna_kills" if(crusher_kill) @@ -218,7 +215,6 @@ L.add_mob_memory(/datum/memory/megafauna_slayer, antagonist = src) L.client.give_award(/datum/award/achievement/boss/boss_killer, L) L.client.give_award(achievement_type, L) -<<<<<<< HEAD //SKYRAT EDIT START /* if(crusher_kill && istype(L.get_active_held_item(), /obj/item/kinetic_crusher)) @@ -226,9 +222,6 @@ var/obj/item/held_item = L.get_active_held_item() if(crusher_kill && (istype(held_item, /obj/item/kinetic_gauntlet) || held_item.GetComponent(/datum/component/kinetic_crusher))) //trust me, i hate this just as much as you //SKYRAT EDIT END -======= - if(crusher_kill && istype(L.get_active_held_item(), /obj/item/kinetic_crusher)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 L.client.give_award(crusher_achievement_type, L) L.client.give_award(/datum/award/score/boss_score, L) //Score progression for bosses killed in general L.client.give_award(score_achievement_type, L) //Score progression for specific boss killed diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm index 2a13f225ba1..f892c7d05e9 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm @@ -250,11 +250,8 @@ Difficulty: Hard /obj/item/crusher_trophy/wendigo_horn/effect_desc() return "melee hits inflict twice as much damage" -<<<<<<< HEAD //SKYRAT EDIT START - MOVED TO MODULAR /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/crusher_trophy/wendigo_horn/add_to(obj/item/kinetic_crusher/crusher, mob/living/user) . = ..() if(.) @@ -264,11 +261,8 @@ Difficulty: Hard . = ..() if(.) crusher.AddComponent(/datum/component/two_handed, force_wielded=20) -<<<<<<< HEAD */ //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/wendigo_skull name = "wendigo skull" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm index dd4b08d2459..57b49047436 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm @@ -81,12 +81,4 @@ var/obj/item/I = user.get_active_held_item() if(!I) return -<<<<<<< HEAD - //SKYRAT EDIT START - if(istype(I, /obj/item/kinetic_gauntlet)) - var/obj/item/kinetic_gauntlet/gauntlet = I - gauntlet.next_attack = 0 //i hate this but i also don't know how else to implement this - //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 I.melee_attack_chain(user, target, null) diff --git a/code/modules/mob/living/simple_animal/hostile/ooze.dm b/code/modules/mob/living/simple_animal/hostile/ooze.dm index ca615d073a3..f25fd4dc0fe 100644 --- a/code/modules/mob/living/simple_animal/hostile/ooze.dm +++ b/code/modules/mob/living/simple_animal/hostile/ooze.dm @@ -287,10 +287,7 @@ obj_damage = 15 death_message = "deflates and spills its vital juices!" edible_food_types = MEAT | VEGETABLES -<<<<<<< HEAD ghost_controllable = TRUE //SKYRAT EDIT ADDITION - These guys can be helpful... maybe players will be helpful. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/simple_animal/hostile/ooze/grapes/get_innate_actions() var/static/list/innate_actions = list( diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 6b3c51b338d..9d5041fe870 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -495,11 +495,7 @@ //ANIMAL RIDING /mob/living/simple_animal/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE) -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return for(var/atom/movable/A in get_turf(src)) if(A != src && A != M && A.density) @@ -525,11 +521,7 @@ return /mob/living/simple_animal/relaymove(mob/living/user, direction) -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return return relaydrive(user, direction) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index c72c32b5614..b630f4c4d39 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -178,11 +178,7 @@ hud_list[hud] = list() else -<<<<<<< HEAD var/image/I = image('modular_skyrat/master_files/icons/mob/huds/hud.dmi', src, "") //SKYRAT EDIT: original filepath 'icons/mob/huds/hud.dmi' -======= - var/image/I = image('icons/mob/huds/hud.dmi', src, "") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 I.appearance_flags = RESET_COLOR|RESET_TRANSFORM hud_list[hud] = I set_hud_image_active(hud, update_huds = FALSE) //by default everything is active. but dont add it to huds to keep control. @@ -270,11 +266,7 @@ * * ignored_mobs (optional) doesn't show any message to any mob in this list. * * visible_message_flags (optional) is the type of message being sent. */ -<<<<<<< HEAD /atom/proc/visible_message(message, self_message, blind_message, vision_distance = DEFAULT_MESSAGE_RANGE, list/ignored_mobs, visible_message_flags = NONE, separation = " ", pref_to_check) // SKYRAT EDIT ADDITION - separation, pref checks -======= -/atom/proc/visible_message(message, self_message, blind_message, vision_distance = DEFAULT_MESSAGE_RANGE, list/ignored_mobs, visible_message_flags = NONE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/turf/T = get_turf(src) if(!T) return @@ -300,11 +292,7 @@ var/raw_msg = message if(visible_message_flags & EMOTE_MESSAGE) -<<<<<<< HEAD message = "[src][separation][message]" // SKYRAT EDIT - Better emotes -======= - message = "[src] [message]" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/mob/M in hearers) if(!M.client) @@ -369,11 +357,7 @@ * * self_message (optional) is what the src mob hears. * * audible_message_flags (optional) is the type of message being sent. */ -<<<<<<< HEAD /atom/proc/audible_message(message, deaf_message, hearing_distance = DEFAULT_MESSAGE_RANGE, self_message, audible_message_flags = NONE, separation = " ", pref_to_check) // SKYRAT EDIT ADDITION - Better emotes, pref checks -======= -/atom/proc/audible_message(message, deaf_message, hearing_distance = DEFAULT_MESSAGE_RANGE, self_message, audible_message_flags = NONE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/hearers = get_hearers_in_view(hearing_distance, src) //SKYRAT EDIT ADDITION BEGIN - AI QoL @@ -391,17 +375,12 @@ hearers -= src var/raw_msg = message if(audible_message_flags & EMOTE_MESSAGE) -<<<<<<< HEAD message = "[src][separation][message]" //SKYRAT EDIT CHANGE for(var/mob/M in hearers) // SKYRAT EDIT ADDITION - Emote pref checks if(pref_to_check && !M.client?.prefs.read_preference(pref_to_check)) continue // SKYRAT EDIT END -======= - message = "[src] [message]" - for(var/mob/M in hearers) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(audible_message_flags & EMOTE_MESSAGE && runechat_prefs_check(M, audible_message_flags) && M.can_hear()) M.create_chat_message(src, raw_message = raw_msg, runechat_flags = audible_message_flags) M.show_message(message, MSG_AUDIBLE, deaf_message, MSG_VISUAL) @@ -417,11 +396,7 @@ * * deaf_message (optional) is what deaf people will see. * * hearing_distance (optional) is the range, how many tiles away the message can be heard. */ -<<<<<<< HEAD /mob/audible_message(message, deaf_message, hearing_distance = DEFAULT_MESSAGE_RANGE, self_message, audible_message_flags = NONE, separation = " ", pref_to_check) // SKYRAT EDIT ADDITION - Better emotes, pref checks -======= -/mob/audible_message(message, deaf_message, hearing_distance = DEFAULT_MESSAGE_RANGE, self_message, audible_message_flags = NONE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(!self_message) return @@ -466,14 +441,6 @@ /mob/proc/get_slot_by_item(obj/item/looking_for) if(looking_for in held_items) return ITEM_SLOT_HANDS -<<<<<<< HEAD - - return null - -///Is the mob incapacitated -/mob/proc/incapacitated(flags) - return -======= return null @@ -492,7 +459,6 @@ /// Returns an updated incapacitated bitflag. If a flag is set it means we're incapacitated in that case /mob/proc/build_incapacitated() return NONE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * This proc is called whenever someone clicks an inventory ui slot. @@ -606,7 +572,6 @@ else result = examinify.examine(src) // if a tree is examined but no client is there to see it, did the tree ever really exist? -<<<<<<< HEAD //SKYRAT EDIT CHANGE if(result.len) for(var/i = 1; i <= length(result); i++) @@ -618,11 +583,6 @@ result.Cut(i, i + 1) i-- //SKYRAT EDIT END -======= - if(result.len) - for(var/i in 1 to (length(result) - 1)) - result[i] += "\n" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(src, examine_block("[result.Join()]")) SEND_SIGNAL(src, COMSIG_MOB_EXAMINATE, examinify) @@ -633,11 +593,7 @@ /mob/living/blind_examine_check(atom/examined_thing) //need to be next to something and awake -<<<<<<< HEAD - if(!Adjacent(examined_thing) || incapacitated()) -======= if(!Adjacent(examined_thing) || incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(src, span_warning("Something is there, but you can't see it!")) return FALSE @@ -840,7 +796,6 @@ if(!check_respawn_delay()) return -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(ckey) if(is_banned_from(ckey, BAN_RESPAWN)) @@ -848,8 +803,6 @@ return //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 usr.log_message("used the respawn button.", LOG_GAME) to_chat(usr, span_boldnotice("Please roleplay correctly!")) @@ -1259,15 +1212,13 @@ // Only update if this player is a target if(obj.target && obj.target.current && obj.target.current.real_name == name) obj.update_explanation_text() -<<<<<<< HEAD - if(client) // NOVA EDIT ADDITION - Update the mob chat color list, removing the old name - GLOB.chat_colors_by_mob_name -= oldname // NOVA EDIT ADDITION + // SKYRAT EDIT BEGIN - Update the mob chat color list, removing the old name + if(client) + GLOB.chat_colors_by_mob_name -= oldname - if(client) // NOVA EDIT ADDITION - Update the mob chat color list, adding the new name - GLOB.chat_colors_by_mob_name[name] = list(chat_color, chat_color_darkened) // NOVA EDIT ADDITION -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + if(client) + GLOB.chat_colors_by_mob_name[name] = list(chat_color, chat_color_darkened) + // SKYRAT EDIT END log_mob_tag("TAG: [tag] RENAMED: [key_name(src)]") return TRUE @@ -1449,10 +1400,6 @@ VV_DROPDOWN_OPTION(VV_HK_GIVE_DIRECT_CONTROL, "Give Direct Control") VV_DROPDOWN_OPTION(VV_HK_OFFER_GHOSTS, "Offer Control to Ghosts") VV_DROPDOWN_OPTION(VV_HK_VIEW_PLANES, "View/Edit Planes") -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/vv_do_topic(list/href_list) . = ..() @@ -1514,10 +1461,6 @@ if(!check_rights(R_DEBUG)) return usr.client.edit_plane_masters(src) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /** * extra var handling for the logging var */ diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 7ca5b15a6aa..7f439db6bc9 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -151,12 +151,9 @@ /// bitflags defining which status effects can be inflicted (replaces canknockdown, canstun, etc) var/status_flags = CANSTUN|CANKNOCKDOWN|CANUNCONSCIOUS|CANPUSH -<<<<<<< HEAD /// Can they interact with station electronics var/has_unlimited_silicon_privilege = FALSE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Calls relay_move() to whatever this is set to when the mob tries to move var/atom/movable/remote_control diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 0fc8c166024..a3fceb0493e 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -345,13 +345,9 @@ return return TRUE -<<<<<<< HEAD -///Is the passed in mob an admin ghost WITH AI INTERACT enabled -======= ///Returns TRUE/FALSE on whether the mob is an Admin Ghost AI. ///This requires this snowflake check because AI interact gives the access to the mob's client, rather ///than the mob like everyone else, and we keep it that way so they can't accidentally give someone Admin AI access. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /proc/isAdminGhostAI(mob/user) if(!isAdminObserver(user)) return FALSE @@ -434,11 +430,7 @@ ///Can the mob see reagents inside of containers? /mob/proc/can_see_reagents() -<<<<<<< HEAD - return stat == DEAD || has_unlimited_silicon_privilege || HAS_TRAIT(src, TRAIT_REAGENT_SCANNER) //Dead guys and silicons can always see reagents -======= return stat == DEAD || HAS_TRAIT(src, TRAIT_REAGENT_SCANNER) //Dead guys and silicons can always see reagents ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Can this mob hold items /mob/proc/can_hold_items(obj/item/I) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 6bc86e8377e..2e2f5c85b53 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -504,14 +504,11 @@ if(move_intent == MOVE_INTENT_RUN) move_intent = MOVE_INTENT_WALK else -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - GUNPOINT if (HAS_TRAIT(src,TRAIT_NORUNNING)) to_chat(src, "You find yourself unable to run.") return FALSE //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 move_intent = MOVE_INTENT_RUN if(hud_used?.static_inventory) for(var/atom/movable/screen/mov_intent/selector in hud_used.static_inventory) diff --git a/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/code/modules/mob_spawn/ghost_roles/mining_roles.dm index e05a3b26c32..aa2e41eb1d2 100644 --- a/code/modules/mob_spawn/ghost_roles/mining_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/mining_roles.dm @@ -14,11 +14,8 @@ the hostile creatures, and the ash drakes swooping down from the cloudless skies, all you can wish for is the feel of soft grass between your toes and \ the fresh air of Earth. These thoughts are dispelled by yet another recollection of how you got here... " spawner_job_path = /datum/job/hermit -<<<<<<< HEAD quirks_enabled = TRUE // SKYRAT EDIT ADDITION - ghost role loadouts random_appearance = FALSE // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/human/hermit/Initialize(mapload) . = ..() @@ -84,11 +81,8 @@ flavour_text = "Ch'yea. You came here, like, on spring break, hopin' to pick up some bangin' hot chicks, y'knaw?" spawner_job_path = /datum/job/beach_bum outfit = /datum/outfit/beachbum -<<<<<<< HEAD quirks_enabled = TRUE // SKYRAT EDIT ADDITION - ghost role loadouts random_appearance = FALSE // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/human/beach/lifeguard you_are_text = "You're a spunky lifeguard!" @@ -129,10 +123,7 @@ flavour_text = "Time to mix drinks and change lives. Smoking space drugs makes it easier to understand your patrons' odd dialect." spawner_job_path = /datum/job/space_bartender outfit = /datum/outfit/spacebartender -<<<<<<< HEAD random_appearance = FALSE // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/spacebartender name = "Space Bartender" @@ -168,11 +159,8 @@ and eventually bring life to this desolate planet while waiting for contact from your creators. \ Estimated time of last contact: Deployment, 5000 millennia ago." spawner_job_path = /datum/job/lifebringer -<<<<<<< HEAD restricted_species = list(/datum/species/pod) //SKYRAT EDIT ADDITION random_appearance = FALSE // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/human/seed_vault/Initialize(mapload) . = ..() @@ -240,11 +228,8 @@ spawner_job_path = /datum/job/ash_walker var/datum/team/ashwalkers/team var/obj/structure/ash_walker_eggshell/eggshell -<<<<<<< HEAD restricted_species = list(/datum/species/lizard/ashwalker) //SKYRAT EDIT ADDITION random_appearance = FALSE // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/human/ash_walker/Destroy() eggshell = null @@ -258,13 +243,10 @@ return FALSE /obj/effect/mob_spawn/ghost_role/human/ash_walker/special(mob/living/carbon/human/spawned_human) -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN spawned_human.fully_replace_character_name(null, spawned_human.generate_random_mob_name(TRUE)) // SKYRAT EDIT MOVE - Moving before parent call prevents char name randomization quirks_enabled = TRUE // ghost role quirks // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() spawned_human.fully_replace_character_name(null, spawned_human.generate_random_mob_name(TRUE)) to_chat(spawned_human, "Drag the corpses of men and beasts to your nest. It will absorb them to create more of your kind. Invade the strange structure of the outsiders if you must. Do not cause unnecessary destruction, as littering the wastes with ugly wreckage is certain to not gain you favor. Glory to the Necropolis!") @@ -314,21 +296,14 @@ important_text = "The base is rigged with explosives, DO NOT abandon it or let it fall into enemy hands!" outfit = /datum/outfit/lavaland_syndicate spawner_job_path = /datum/job/lavaland_syndicate -<<<<<<< HEAD loadout_enabled = TRUE // SKYRAT EDIT ADDITION - ghost role loadouts quirks_enabled = TRUE // SKYRAT EDIT ADDITION - ghost role loadouts random_appearance = FALSE // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 deletes_on_zero_uses_left = FALSE /obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/special(mob/living/new_spawn) . = ..() -<<<<<<< HEAD new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_SPAWNER) // SKYRAT EDIT CHANGE - ORIGINAL: new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_MIND) -======= - new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_MIND) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms name = "Syndicate Comms Agent" @@ -349,7 +324,6 @@ ears = /obj/item/radio/headset/syndicate/alt shoes = /obj/item/clothing/shoes/combat r_pocket = /obj/item/gun/ballistic/automatic/pistol -<<<<<<< HEAD r_hand = /obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/sindano/evil // SKYRAT EDIT - Original: /obj/item/gun/ballistic/rifle/sniper_rifle implants = list(/obj/item/implant/weapons_auth) @@ -361,14 +335,6 @@ syndicate.faction |= ROLE_SYNDICATE */ // SKYRAT EDIT REMOVAL END -======= - r_hand = /obj/item/gun/ballistic/rifle/sniper_rifle - - implants = list(/obj/item/implant/weapons_auth) - -/datum/outfit/lavaland_syndicate/post_equip(mob/living/carbon/human/syndicate, visualsOnly = FALSE) - syndicate.faction |= ROLE_SYNDICATE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/outfit/lavaland_syndicate/comms name = "Lavaland Syndicate Comms Agent" diff --git a/code/modules/mob_spawn/ghost_roles/space_roles.dm b/code/modules/mob_spawn/ghost_roles/space_roles.dm index 6eb8fc1e6a2..411f6bfd970 100644 --- a/code/modules/mob_spawn/ghost_roles/space_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/space_roles.dm @@ -160,11 +160,8 @@ l_pocket = /obj/item/uplink/nuclear r_pocket = /obj/item/modular_computer/pda/nukeops -<<<<<<< HEAD -======= skillchips = list(/obj/item/skillchip/disk_verifier) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser/captain name = "Syndicate Battlecruiser Captain" you_are_text = "You are the captain aboard the syndicate flagship: the SBC Starfury." diff --git a/code/modules/mob_spawn/ghost_roles/unused_roles.dm b/code/modules/mob_spawn/ghost_roles/unused_roles.dm index 1f0fcf843f3..102501f9b39 100644 --- a/code/modules/mob_spawn/ghost_roles/unused_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/unused_roles.dm @@ -272,11 +272,7 @@ /obj/effect/mob_spawn/ghost_role/human/syndicatespace/special(mob/living/new_spawn) . = ..() -<<<<<<< HEAD new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_SPAWNER) // SKYRAT EDIT CHANGE - ORIGINAL: new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_MIND) -======= - new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_MIND) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/job/spawn_job = SSjob.GetJobType(spawner_job_path) var/policy = get_policy(spawn_job.policy_index) if(policy) diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm index b555caefc3d..6f10e3a7965 100644 --- a/code/modules/mob_spawn/mob_spawn.dm +++ b/code/modules/mob_spawn/mob_spawn.dm @@ -38,15 +38,12 @@ if(faction) faction = string_list(faction) -<<<<<<< HEAD -======= /obj/effect/mob_spawn/Destroy() spawned_mob_ref = null if(istype(outfit)) QDEL_NULL(outfit) return ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Creates whatever mob the spawner makes. Return FALSE if we want to exit from here without doing that, returning NULL will be logged to admins. /obj/effect/mob_spawn/proc/create(mob/mob_possessor, newname) var/mob/living/spawned_mob = new mob_type(get_turf(src)) //living mobs only @@ -68,10 +65,7 @@ spawned_human.underwear = "Nude" spawned_human.undershirt = "Nude" spawned_human.socks = "Nude" -<<<<<<< HEAD spawned_human.bra = "Nude" //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 randomize_human_normie(spawned_human) if(hairstyle) spawned_human.set_hairstyle(hairstyle, update = FALSE) @@ -144,20 +138,12 @@ /// Whether this offers a temporary body or not. Essentially, you'll be able to reenter your body after using this spawner. var/temp_body = FALSE -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/effect/mob_spawn/ghost_role/Initialize(mapload) . = ..() SSpoints_of_interest.make_point_of_interest(src) LAZYADD(GLOB.mob_spawners[name], src) -<<<<<<< HEAD -/obj/effect/mob_spawn/Destroy() -======= /obj/effect/mob_spawn/ghost_role/Destroy() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/spawners = GLOB.mob_spawners[name] LAZYREMOVE(spawners, src) if(!LAZYLEN(spawners)) @@ -176,7 +162,6 @@ var/user_ckey = user.ckey // Just in case shenanigans happen, we always want to remove it from the list. LAZYADD(ckeys_trying_to_spawn, user_ckey) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(restricted_species && !(user.client?.prefs?.read_preference(/datum/preference/choiced/species) in restricted_species)) var/incorrect_species = tgui_alert(user, "Current species preference incompatible, proceed with random appearance?", "Incompatible Species", list("Yes", "No")) @@ -185,8 +170,6 @@ return // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(prompt_ghost) var/prompt = "Become [prompt_name]?" if(!temp_body && user.can_reenter_corpse && user.mind) @@ -209,15 +192,12 @@ to_chat(user, span_warning("You are banned from this role!")) LAZYREMOVE(ckeys_trying_to_spawn, user_ckey) return -<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(is_banned_from(user.ckey, BAN_GHOST_ROLE_SPAWNER)) // Ghost role bans to_chat(user, span_warning("Error, you are banned from playing ghost roles!")) LAZYREMOVE(ckeys_trying_to_spawn, user_ckey) return // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!allow_spawn(user, silent = FALSE)) LAZYREMOVE(ckeys_trying_to_spawn, user_ckey) return @@ -301,10 +281,7 @@ ///these mob spawn subtypes trigger immediately (New or Initialize) and are not player controlled... since they're dead, you know? /obj/effect/mob_spawn/corpse -<<<<<<< HEAD -======= density = FALSE //these are pretty much abstract objects that leave a corpse in their place. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///when this mob spawn should auto trigger. var/spawn_when = CORPSE_INSTANT diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm index f29b1af46c9..8c08aa3b3e9 100644 --- a/code/modules/mod/mod_activation.dm +++ b/code/modules/mod/mod_activation.dm @@ -17,17 +17,10 @@ if(!pick) return var/part_reference = display_names[pick] -<<<<<<< HEAD var/obj/item/part = locate(part_reference) in parts - if(!istype(part) || user.incapacitated()) - return - if(activating) // SKYRAT EDIT - RETRACTABLE EVERYTHING -======= - var/obj/item/part = locate(part_reference) in mod_parts if(!istype(part) || user.incapacitated) return - if(active || activating) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + if(activating) // SKYRAT EDIT - RETRACTABLE EVERYTHING balloon_alert(user, "deactivate the suit first!") playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return @@ -51,11 +44,7 @@ /// Quickly deploys all parts (or retracts if all are on the wearer) /obj/item/mod/control/proc/quick_deploy(mob/user) -<<<<<<< HEAD if(activating) // SKYRAT EDIT - RETRACTABLE EVERYTHING -======= - if(active || activating) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 balloon_alert(user, "deactivate the suit first!") playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return FALSE @@ -130,14 +119,11 @@ if(!QDELING(wearer) && !wearer.equip_to_slot_if_possible(overslot, overslot.slot_flags, qdel_on_fail = FALSE, disable_warning = TRUE)) wearer.dropItemToGround(overslot, force = TRUE, silent = TRUE) part_datum.overslotting = null -<<<<<<< HEAD // SKYRAT EDIT START - Avoiding exploits with the modules staying active when any of the parts are retracted. for(var/obj/item/mod/module/module as anything in modules) if(module.active) module.deactivate(display_message = !!user) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SEND_SIGNAL(src, COMSIG_MOD_PART_RETRACTED, user, part) if(!user) return diff --git a/code/modules/mod/mod_ai.dm b/code/modules/mod/mod_ai.dm index 2a269c6d417..8024f14e22f 100644 --- a/code/modules/mod/mod_ai.dm +++ b/code/modules/mod/mod_ai.dm @@ -2,13 +2,10 @@ . = ..() if(!.) return -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - No AIs in MODsuits if(!allow_ai) return // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!open) //mod must be open balloon_alert(user, "suit must be open to transfer!") return @@ -95,13 +92,10 @@ pai_assistant.can_holo = FALSE if (pai_assistant.holoform) pai_assistant.fold_in() -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - pAIs in MODsuits if(can_pai_move_suit) pai_assistant.remote_control = src // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SStgui.close_uis(card) on_gained_assistant(card.pai) return TRUE @@ -150,13 +144,10 @@ /obj/item/mod/control/relaymove(mob/user, direction) if((!active && wearer) || get_charge() < CHARGE_PER_STEP || user != ai_assistant || !COOLDOWN_FINISHED(src, cooldown_mod_move) || (wearer?.pulledby?.grab_state > GRAB_PASSIVE)) return FALSE -<<<<<<< HEAD // SKYRAT EDIT START - pAIs in MODsuits with a bit more functionalities if(active && !can_pai_move_suit && ispAI(ai_assistant)) return FALSE // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/timemodifier = MOVE_DELAY * (ISDIAGONALDIR(direction) ? sqrt(2) : 1) * (wearer ? WEARER_DELAY : LONE_DELAY) if(wearer && !wearer.Process_Spacemove(direction)) return FALSE @@ -230,9 +221,5 @@ ai.notify_revival("You have been recovered from the wreckage!", source = card) balloon_alert(user, "ai transferred to card") stored_ai = null -<<<<<<< HEAD - #undef AI_FALL_TIME -======= #undef AI_FALL_TIME ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 9e1ac621309..fe207660fcd 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -19,10 +19,7 @@ actions_types = list( /datum/action/item_action/mod/deploy, /datum/action/item_action/mod/activate, -<<<<<<< HEAD /datum/action/item_action/mod/sprite_accessories, // SKYRAT EDIT - Hide mutant parts action -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/action/item_action/mod/panel, /datum/action/item_action/mod/module, /datum/action/item_action/mod/deploy/ai, @@ -162,11 +159,7 @@ else . += span_notice("You could use a MOD core on it to install one.") if(isnull(ai_assistant)) -<<<<<<< HEAD - . += span_notice("You could install a pAI with a pAI card.") // SKYRAT EDIT CHANGE - ORIGINAL: . += span_notice("You could install an AI or pAI using their storage card.") -======= . += span_notice("You could install an AI or pAI using their storage card.") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(isAI(ai_assistant)) . += span_notice("You could remove [ai_assistant] with an intellicard.") . += span_notice("You could copy/set link frequency with a multitool.") @@ -241,21 +234,17 @@ balloon_alert(wearer, "retract parts first!") playsound(src, 'sound/machines/scanbuzz.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE) return -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Can't remove your MODsuit from your back when it's still active (as it can cause runtimes and even the MODsuit control unit to delete itself) if(active) - if(!wearer.incapacitated()) + if(!wearer.incapacitated) balloon_alert(wearer, "deactivate first!") playsound(src, 'sound/machines/scanbuzz.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE) return // SKYRAT EDIT ADDITION END - if(!wearer.incapacitated()) -======= if(!wearer.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/atom/movable/screen/inventory/hand/ui_hand = over_object if(wearer.putItemFromInventoryInHandIfPossible(src, ui_hand.held_index)) add_fingerprint(user) @@ -685,10 +674,6 @@ part.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) part.add_atom_colour(new_color, FIXED_COLOUR_PRIORITY) wearer?.regenerate_icons() -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/mod/control/proc/on_exit(datum/source, atom/movable/part, direction) SIGNAL_HANDLER diff --git a/code/modules/mod/mod_link.dm b/code/modules/mod/mod_link.dm index 667509c087e..e5c7195bd8c 100644 --- a/code/modules/mod/mod_link.dm +++ b/code/modules/mod/mod_link.dm @@ -174,13 +174,10 @@ /obj/item/clothing/neck/link_scryer/examine(mob/user) . = ..() -<<<<<<< HEAD // SKYRAT EDIT NIFSOFT SCRYERS - START if(custom_examine_controls) return // SKYRAT EDIT NIFSOFT SCRYERS - END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(cell) . += span_notice("The battery charge reads [cell.percent()]%. Right-click with an empty hand to remove it.") else diff --git a/code/modules/mod/mod_paint.dm b/code/modules/mod/mod_paint.dm index a2e5b104ea1..0693b05a348 100644 --- a/code/modules/mod/mod_paint.dm +++ b/code/modules/mod/mod_paint.dm @@ -55,11 +55,7 @@ data["currentColor"] = current_color return data -<<<<<<< HEAD -/obj/item/mod/paint/ui_act(action, list/params) -======= /obj/item/mod/paint/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -128,15 +124,9 @@ balloon_alert(user, "no skin picked!") return mod.theme.set_skin(mod, pick) -<<<<<<< HEAD - -/obj/item/mod/paint/proc/check_menu(obj/item/mod/control/mod, mob/user) - if(user.incapacitated() || !user.is_holding(src) || !mod || mod.active || mod.activating) -======= /obj/item/mod/paint/proc/check_menu(obj/item/mod/control/mod, mob/user) if(user.incapacitated || !user.is_holding(src) || !mod || mod.active || mod.activating) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index 8c42a0000a3..68c7f6db1cf 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -146,11 +146,7 @@ part_datum.sealed_layer = category[SEALED_LAYER] part_datum.unsealed_message = category[UNSEALED_MESSAGE] || "No unseal message set! Tell a coder!" part_datum.sealed_message = category[SEALED_MESSAGE] || "No seal message set! Tell a coder!" -<<<<<<< HEAD part_datum.can_overslot = TRUE //SKYRAT EDIT CHANGE, overslottable everything - Original: part_datum.can_overslot = category[CAN_OVERSLOT] || FALSE -======= - part_datum.can_overslot = category[CAN_OVERSLOT] || FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 part.clothing_flags = category[UNSEALED_CLOTHING] || NONE part.visor_flags = category[SEALED_CLOTHING] || NONE part.flags_inv = category[UNSEALED_INVISIBILITY] || NONE diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm index 345da11ca66..b4be809ecd9 100644 --- a/code/modules/mod/modules/_module.dm +++ b/code/modules/mod/modules/_module.dm @@ -104,7 +104,6 @@ if(mod.wearer) balloon_alert(mod.wearer, "not active!") return -<<<<<<< HEAD // SKYRAT EDIT START - DEPLOYABLE EVERYTHING OVER EVERYTHING var/can_activate = TRUE if(!(allow_flags & MODULE_ALLOW_INACTIVE)) @@ -116,8 +115,6 @@ balloon_alert(mod.wearer, "not fully deployed!") return // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(module_type != MODULE_USABLE) if(active) deactivate() @@ -139,7 +136,6 @@ if(!COOLDOWN_FINISHED(src, cooldown_timer)) balloon_alert(mod.wearer, "on cooldown!") return FALSE -<<<<<<< HEAD if(((!mod.active || mod.activating) && !(allow_flags & MODULE_ALLOW_INACTIVE)) || !mod.get_charge()) // SKYRAT EDIT ADDITION: INACTIVE USE balloon_alert(mod.wearer, "unpowered!") return FALSE @@ -151,11 +147,6 @@ balloon_alert(mod.wearer, "deploy all parts first!") return FALSE // SKYRAT EDIT END -======= - if(!mod.active || mod.activating || !mod.get_charge()) - balloon_alert(mod.wearer, "unpowered!") - return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!(allow_flags & MODULE_ALLOW_PHASEOUT) && istype(mod.wearer.loc, /obj/effect/dummy/phased_mob)) //specifically a to_chat because the user is phased out. to_chat(mod.wearer, span_warning("You cannot activate this right now.")) @@ -228,11 +219,7 @@ /// Called when an activated module without a device is used /obj/item/mod/module/proc/on_select_use(atom/target) -<<<<<<< HEAD - if(!(allow_flags & MODULE_ALLOW_INCAPACITATED) && mod.wearer.incapacitated(IGNORE_GRAB)) -======= if(!(allow_flags & MODULE_ALLOW_INCAPACITATED) && INCAPACITATED_IGNORING(mod.wearer, INCAPABLE_GRAB)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE mod.wearer.face_atom(target) if(!used()) @@ -364,20 +351,14 @@ used_overlay = overlay_state_inactive else return -<<<<<<< HEAD /* SKYRAT EDIT START - Making MODsuits mutant-compatible - ORIGINAL: -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mutable_appearance/module_icon = mutable_appearance(overlay_icon_file, used_overlay, layer = standing.layer + 0.1) if(!use_mod_colors) module_icon.appearance_flags |= RESET_COLOR . += module_icon -<<<<<<< HEAD */ return handle_module_icon(standing, used_overlay) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Updates the signal used by active modules to be activated /obj/item/mod/module/proc/update_signal(value) diff --git a/code/modules/mod/modules/module_kinesis.dm b/code/modules/mod/modules/module_kinesis.dm index f180a044494..374be840d95 100644 --- a/code/modules/mod/modules/module_kinesis.dm +++ b/code/modules/mod/modules/module_kinesis.dm @@ -67,11 +67,7 @@ clear_grab(playsound = !deleting) /obj/item/mod/module/anomaly_locked/kinesis/process(seconds_per_tick) -<<<<<<< HEAD - if(!mod.wearer.client || mod.wearer.incapacitated(IGNORE_GRAB)) -======= if(!mod.wearer.client || INCAPACITATED_IGNORING(mod.wearer, INCAPABLE_GRAB)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 clear_grab() return if(!range_check(grabbed_atom)) diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index 4cac02e72e8..f1b14b0f900 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -953,8 +953,6 @@ balloon_alert(mod.wearer, "ammo box dispensed.") playsound(src, 'sound/machines/microwave/microwave-end.ogg', 50, TRUE) -<<<<<<< HEAD -======= /obj/item/mod/module/fishing_glove name = "MOD fishing glove module" desc = "A MOD module that takes in an external fishing rod to enable the user to fish without having to hold one." @@ -1025,7 +1023,6 @@ if(gloves && !deleting) qdel(gloves.GetComponent(/datum/component/profound_fisher)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/mod/module/shock_absorber name = "MOD shock absorption module" desc = "A module that makes the user resistant to the knockdown inflicted by Stun Batons." diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm index d9316e061b8..531bc5b32fd 100644 --- a/code/modules/mod/modules/modules_maint.dm +++ b/code/modules/mod/modules/modules_maint.dm @@ -59,10 +59,7 @@ flash_color(mod.wearer, flash_color = "#FF0000", flash_time = 10 SECONDS) set_off = FALSE -<<<<<<< HEAD /* SKYRAT EDIT: See skyrat_modular/modules/jukebox -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Rave Visor - Gives you a rainbow visor and plays jukebox music to you. /obj/item/mod/module/visor/rave name = "MOD rave visor module" @@ -141,11 +138,7 @@ return music_player.selection = new_song -<<<<<<< HEAD SKYRAT EDIT END */ -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Tanner - Tans you with spraytan. /obj/item/mod/module/tanner name = "MOD tanning module" diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm index cdd246e2ac8..0f445702017 100644 --- a/code/modules/mod/modules/modules_medical.dm +++ b/code/modules/mod/modules/modules_medical.dm @@ -225,12 +225,7 @@ organ_evacced.Remove(target, special = TRUE) organ_evacced.forceMove(get_turf(target)) -<<<<<<< HEAD - if (!organ.Insert(target)) - organ.forceMove(drop_location()) -======= organ.Insert(target) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 organ = null ///Patrient Transport - Generates hardlight bags you can put people in. @@ -433,8 +428,6 @@ /datum/surgery/advanced/bioware/cortex_folding, /datum/surgery/advanced/bioware/cortex_folding/mechanic, ) -<<<<<<< HEAD -======= /obj/item/mod/module/surgical_processor/emergency desc = "A module using an onboard surgical computer which can be connected to other computers to download and \ @@ -454,4 +447,3 @@ /datum/surgery/stomach_pump, /datum/surgery/advanced/wing_reconstruction, ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm index 665e0d3bd3e..2f9279c45e1 100644 --- a/code/modules/mod/modules/modules_security.dm +++ b/code/modules/mod/modules/modules_security.dm @@ -19,11 +19,7 @@ /obj/item/mod/module/magnetic_harness/Initialize(mapload) . = ..() if(!guns_typecache) -<<<<<<< HEAD guns_typecache = typecacheof(list(/obj/item/gun/ballistic, /obj/item/gun/energy, /obj/item/gun/grenadelauncher, /obj/item/gun/chem, /obj/item/gun/syringe, /obj/item/gun/microfusion)) //SKYRAT EDIT - MICROFUSION -======= - guns_typecache = typecacheof(list(/obj/item/gun/ballistic, /obj/item/gun/energy, /obj/item/gun/grenadelauncher, /obj/item/gun/chem, /obj/item/gun/syringe)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/mod/module/magnetic_harness/on_install() var/obj/item/clothing/suit = mod.get_part_from_slot(ITEM_SLOT_OCLOTHING) @@ -572,11 +568,7 @@ projectile.ricochets_max += 1 projectile.min_ricochets += 1 projectile.ricochet_incidence_leeway = 0 //allows the projectile to bounce at any angle. -<<<<<<< HEAD - ADD_TRAIT(projectile, TRAIT_ALWAYS_HIT_ZONE, MOD_TRAIT) -======= projectile.accuracy_falloff = 0 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef SHOOTING_ASSISTANT_OFF #undef STORMTROOPER_MODE diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index e8c6ce11191..18c1ac69267 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -80,11 +80,7 @@ else balloon_alert(mod.wearer, "invalid target!") -<<<<<<< HEAD -/obj/item/mod/module/clamp/on_suit_deactivation(deleting = FALSE) //SKYRAT EDIT -======= /obj/item/mod/module/clamp/on_suit_deactivation(deleting = FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(deleting) return for(var/atom/movable/crate as anything in stored_crates) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 4b336f542d7..238cc8757f8 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -75,15 +75,9 @@ var/comp_light_color = COLOR_WHITE ///Power usage when the computer is open (screen is active) and can be interacted with. -<<<<<<< HEAD var/base_active_power_usage = 0.4 WATTS // SKYRAT EDIT CHANGE - ORIGINAL: 2 WATTS ///Power usage when the computer is idle and screen is off. var/base_idle_power_usage = 0.2 WATTS //SKYRAT EDIT CHANGE - ORIGINAL: 1 WATTS -======= - var/base_active_power_usage = 2 WATTS - ///Power usage when the computer is idle and screen is off. - var/base_idle_power_usage = 1 WATTS ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Modular computers can run on various devices. Each DEVICE (Laptop, Console & Tablet) // must have its own DMI file. Icon states must be called exactly the same in all files, but may look differently diff --git a/code/modules/modular_computers/computers/item/computer_power.dm b/code/modules/modular_computers/computers/item/computer_power.dm index 20da5b6b793..0b18bf47bdc 100644 --- a/code/modules/modular_computers/computers/item/computer_power.dm +++ b/code/modules/modular_computers/computers/item/computer_power.dm @@ -53,19 +53,6 @@ if(open_programs in idle_threads) power_usage += (open_programs.power_cell_use / 2) -<<<<<<< HEAD - if(light_on) - power_usage *= FLASHLIGHT_DRAIN_MULTIPLIER - if(active_program) - power_usage += active_program.power_cell_use - for(var/datum/computer_file/program/open_programs as anything in idle_threads) - if(!open_programs.power_cell_use) - continue - if(open_programs in idle_threads) - power_usage += (open_programs.power_cell_use / 2) - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(use_energy(power_usage * seconds_per_tick)) return TRUE power_failure() diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm index 7a34ff756ce..d3e461edd74 100644 --- a/code/modules/modular_computers/computers/item/pda.dm +++ b/code/modules/modular_computers/computers/item/pda.dm @@ -38,14 +38,10 @@ /datum/computer_file/program/messenger, /datum/computer_file/program/nt_pay, /datum/computer_file/program/notepad, -<<<<<<< HEAD // SKYRAT EDIT ADDITION START /datum/computer_file/program/maintenance/camera, // Adds camera to all base tablets // SKRAT EDIT ADDITION END /datum/computer_file/program/crew_manifest -======= - /datum/computer_file/program/crew_manifest, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) ///List of items that can be stored in a PDA var/static/list/contained_item = list( @@ -333,11 +329,8 @@ starting_programs = list( /datum/computer_file/program/filemanager, /datum/computer_file/program/robotact, -<<<<<<< HEAD /datum/computer_file/program/crew_manifest, // SKYRAT EDIT ADDITION - Manifests for borgs /datum/computer_file/program/messenger, // SKYRAT EDIT ADDITION - Messenger for borgs -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/modular_computer/pda/silicon/Initialize(mapload) @@ -432,11 +425,7 @@ return TRUE /obj/item/modular_computer/pda/silicon/ui_state(mob/user) -<<<<<<< HEAD - return GLOB.reverse_contained_state -======= return GLOB.deep_inventory_state ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/modular_computer/pda/silicon/cyborg/syndicate icon_state = "tablet-silicon-syndicate" diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm index c60a9e4911d..1e20936b921 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -365,18 +365,12 @@ /datum/computer_file/program/newscaster, ) -<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL BEGIN - Mutes the Curator's ringer on spawn -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/modular_computer/pda/curator/Initialize(mapload) . = ..() for(var/datum/computer_file/program/messenger/msg in stored_files) msg.alert_silenced = TRUE -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/modular_computer/pda/psychologist name = "psychologist PDA" diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm index f7726b6f233..966bb1c80ed 100644 --- a/code/modules/modular_computers/file_system/programs/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm @@ -305,7 +305,6 @@ if("toggleprivate") self_paid = !self_paid . = TRUE -<<<<<<< HEAD //SKYRAT EDIT START if("company_import_window") var/datum/component/armament/company_imports/gun_comp = computer.GetComponent(/datum/component/armament/company_imports) @@ -316,8 +315,6 @@ gun_comp.ui_interact(usr) . = TRUE //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(.) post_signal(cargo_shuttle) diff --git a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm index 2b17195ae65..a93e60db61c 100644 --- a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm +++ b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm @@ -157,11 +157,7 @@ /datum/computer_file/program/messenger/ui_state(mob/user) if(issilicon(user)) -<<<<<<< HEAD - return GLOB.reverse_contained_state -======= return GLOB.deep_inventory_state ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return GLOB.default_state /datum/computer_file/program/messenger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) @@ -627,13 +623,10 @@ playsound(computer, 'sound/machines/terminal_error.ogg', 15, TRUE) return FALSE -<<<<<<< HEAD // SKYRAT EDIT BEGIN - PDA messages show a visible message; again! sender.visible_message(span_notice("[sender]'s PDA rings out with the soft sound of keypresses"), vision_distance = COMBAT_MESSAGE_RANGE) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/shell_addendum = "" if(istype(source, /obj/item/circuit_component)) var/obj/item/circuit_component/circuit = source diff --git a/code/modules/modular_computers/file_system/programs/records.dm b/code/modules/modular_computers/file_system/programs/records.dm index 5ab1fca228a..0aab001db04 100644 --- a/code/modules/modular_computers/file_system/programs/records.dm +++ b/code/modules/modular_computers/file_system/programs/records.dm @@ -40,10 +40,7 @@ var/list/current_record = list() current_record["age"] = person.age -<<<<<<< HEAD current_record["chrono_age"] = person.chrono_age // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 current_record["fingerprint"] = person.fingerprint current_record["gender"] = person.gender current_record["name"] = person.name @@ -57,11 +54,8 @@ for(var/datum/record/crew/person in GLOB.manifest.general) var/list/current_record = list() -<<<<<<< HEAD current_record["age"] = person.age // SKYRAT EDIT ADDITION - Chronological age current_record["chrono_age"] = person.chrono_age // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 current_record["bloodtype"] = person.blood_type current_record["ma_dis"] = person.major_disabilities_desc current_record["mi_dis"] = person.minor_disabilities_desc diff --git a/code/modules/pai/hud.dm b/code/modules/pai/hud.dm index 5cf5a7c2731..77bcafefc82 100644 --- a/code/modules/pai/hud.dm +++ b/code/modules/pai/hud.dm @@ -5,11 +5,7 @@ var/required_software /atom/movable/screen/pai/Click() -<<<<<<< HEAD - if(isobserver(usr) || usr.incapacitated()) -======= if(isobserver(usr) || usr.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE var/mob/living/silicon/pai/user = usr if(required_software && !user.installed_software.Find(required_software)) diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm index b402e382f4a..bacea4b5d3d 100644 --- a/code/modules/pai/pai.dm +++ b/code/modules/pai/pai.dm @@ -166,8 +166,6 @@ card = null return ..() -<<<<<<< HEAD -======= // Need to override parent here because the message we dispatch is turf-based, not based on the location of the object because that could be fuckin anywhere /mob/living/silicon/pai/send_applicable_messages() var/turf/location = get_turf(src) @@ -179,19 +177,15 @@ /mob/living/silicon/pai/get_blind_suicide_message() return "[src] bleeps electronically." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/silicon/pai/emag_act(mob/user) return handle_emag(user) /mob/living/silicon/pai/examine(mob/user) . = ..() . += "Its master ID string seems to be [(!master_name || emagged) ? "empty" : master_name]." -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION . += get_silicon_flavortext() //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /mob/living/silicon/pai/get_status_tab_items() . += ..() diff --git a/code/modules/pai/say.dm b/code/modules/pai/say.dm index c1b07477c16..c7ed1a566d8 100644 --- a/code/modules/pai/say.dm +++ b/code/modules/pai/say.dm @@ -1,6 +1,2 @@ /mob/living/silicon/pai/binarycheck() -<<<<<<< HEAD - return radio?.translate_binary -======= return (radio?.special_channels & RADIO_SPECIAL_BINARY) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/pai/shell.dm b/code/modules/pai/shell.dm index 6cb00032c34..6a8a8e709c8 100644 --- a/code/modules/pai/shell.dm +++ b/code/modules/pai/shell.dm @@ -30,11 +30,7 @@ * FALSE otherwise. */ /mob/living/silicon/pai/proc/check_menu(atom/anchor) -<<<<<<< HEAD - if(incapacitated()) -======= if(incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(get_turf(src) != get_turf(anchor)) return FALSE diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 9dd079e88d3..48e2a9a049f 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -95,11 +95,7 @@ if(toppaper) . += toppaper.icon_state . += toppaper.overlays -<<<<<<< HEAD if(!integrated_pen && pen) // SKYRAT EDIT - CARGO BORGS - ORIGINAL: if(pen) -======= - if(pen) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . += "clipboard_pen" . += "clipboard_over" @@ -162,11 +158,7 @@ return data -<<<<<<< HEAD -/obj/item/clipboard/ui_act(action, params) -======= /obj/item/clipboard/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm index 9153b3b7d6f..fc1b986ce6d 100644 --- a/code/modules/paperwork/fax.dm +++ b/code/modules/paperwork/fax.dm @@ -43,12 +43,9 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department /obj/item/card, /obj/item/folder/biscuit, /obj/item/food/breadslice, -<<<<<<< HEAD -======= /obj/item/food/chapslice, /obj/item/food/cookie, /obj/item/food/grilled_chapslice, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/food/pizza/flatbread, /obj/item/food/pizzaslice, /obj/item/food/root_flatbread, @@ -72,8 +69,6 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department fax_name = "[current_area.name]" return ..() -<<<<<<< HEAD -======= /obj/machinery/fax/admin/syndicate name = "Syndicate Fax Machine" @@ -95,7 +90,6 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department visible_to_network = FALSE return ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/fax/Initialize(mapload) . = ..() if (!fax_id) @@ -262,11 +256,7 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department var/list/data = list() //Record a list of all existing faxes. for(var/obj/machinery/fax/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax)) -<<<<<<< HEAD - if(FAX.fax_id == fax_id || is_centcom_level(FAX.z)) //skip yourself and the centcom fax machine. -======= if(FAX.fax_id == fax_id) //skip yourself ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue var/list/fax_data = list() fax_data["fax_name"] = FAX.fax_name @@ -287,20 +277,13 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department data["fax_history"] = fax_history var/list/special_networks_data = list() for(var/key in special_networks) -<<<<<<< HEAD -======= if(special_networks[key]["fax_id"] == fax_id) continue ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 special_networks_data += list(special_networks[key]) data["special_faxes"] = special_networks_data return data -<<<<<<< HEAD -/obj/machinery/fax/ui_act(action, list/params) -======= /obj/machinery/fax/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -343,11 +326,7 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department history_add("Send", params["name"]) GLOB.requests.fax_request(usr.client, "sent a fax message from [fax_name]/[fax_id] to [params["name"]]", fax_paper) -<<<<<<< HEAD - to_chat(GLOB.admins, span_adminnotice("[icon2html(src.icon, GLOB.admins)]FAX REQUEST: [ADMIN_FULLMONTY(usr)]: [span_linkify("sent a fax message from [fax_name]/[fax_id][ADMIN_FLW(src)] to [html_encode(params["name"])]")] [ADMIN_SHOW_PAPER(fax_paper)] [ADMIN_PRINT_FAX(fax_paper, fax_name)]"), confidential = TRUE) -======= to_chat(GLOB.admins, span_adminnotice("[icon2html(src.icon, GLOB.admins)]FAX REQUEST: [ADMIN_FULLMONTY(usr)]: [span_linkify("sent a fax message from [fax_name]/[fax_id][ADMIN_FLW(src)] to [html_encode(params["name"])]")] [ADMIN_SHOW_PAPER(fax_paper)] [ADMIN_PRINT_FAX(fax_paper, fax_name, params["id"])]"), confidential = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/client/staff as anything in GLOB.admins) if(staff?.prefs.read_preference(/datum/preference/toggle/comms_notification)) SEND_SOUND(staff, sound('sound/misc/server-ready.ogg')) diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index ab7cc758d92..41d9aabb54a 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -83,11 +83,7 @@ return data -<<<<<<< HEAD -/obj/structure/filingcabinet/ui_act(action, params) -======= /obj/structure/filingcabinet/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index c35128df598..50c833ca89f 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -106,11 +106,7 @@ return data -<<<<<<< HEAD -/obj/item/folder/ui_act(action, params) -======= /obj/item/folder/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 3ac8f4f6bc8..98f6662f8c5 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -1,9 +1,5 @@ /// A mini-tool used to apply label items onto something to modify its name. -<<<<<<< HEAD -/obj/item/hand_labeler //SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE -======= /obj/item/hand_labeler ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "hand labeler" desc = "A combined label printer, applicator, and remover, all in a single portable device. Designed to be easy to operate and use." icon = 'icons/obj/service/bureaucracy.dmi' diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 1c78a8e76af..14202b1bf3b 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -64,12 +64,9 @@ ///If TRUE, staff can read paper everywhere, but usually from requests panel. var/request_state = FALSE -<<<<<<< HEAD -======= ///If this paper can be selected as a candidate for a future message in a bottle when spawned outside of mapload. Doesn't affect manually doing that. var/can_become_message_in_bottle = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/paper/Initialize(mapload) . = ..() pixel_x = base_pixel_x + rand(-9, 9) @@ -79,13 +76,6 @@ add_raw_text(default_raw_text) update_appearance() -<<<<<<< HEAD - -/obj/item/paper/Destroy() - . = ..() - camera_holder = null - clear_paper() -======= if(can_become_message_in_bottle && !mapload && prob(MESSAGE_BOTTLE_CHANCE)) LAZYADD(SSpersistence.queued_message_bottles, src) @@ -95,7 +85,6 @@ clear_paper() LAZYREMOVE(SSpersistence.queued_message_bottles, src) return ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Determines whether this paper has been written or stamped to. /obj/item/paper/proc/is_empty() @@ -324,11 +313,7 @@ set category = "Object" set src in usr -<<<<<<< HEAD - if(!usr.can_read(src) || usr.is_blind() || usr.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB) || (isobserver(usr) && !isAdminGhostAI(usr))) -======= if(!usr.can_read(src) || usr.is_blind() || INCAPACITATED_IGNORING(usr, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB) || (isobserver(usr) && !isAdminGhostAI(usr))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(ishuman(usr)) var/mob/living/carbon/human/H = usr @@ -373,11 +358,7 @@ return UI_UPDATE if(!in_range(user, src) && !isobserver(user)) return UI_CLOSE -<<<<<<< HEAD - if(user.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB) || (isobserver(user) && !isAdminGhostAI(user))) -======= if(INCAPACITATED_IGNORING(user, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB) || (isobserver(user) && !isAdminGhostAI(user))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return UI_UPDATE // Even harder to read if your blind...braile? humm // .. or if you cannot read @@ -553,37 +534,16 @@ static_data["user_name"] = user.real_name -<<<<<<< HEAD - static_data["raw_text_input"] = list() - for(var/datum/paper_input/text_input as anything in raw_text_inputs) - static_data["raw_text_input"] += list(text_input.to_list()) - - static_data["raw_field_input"] = list() - for(var/datum/paper_field/field_input as anything in raw_field_input_data) - static_data["raw_field_input"] += list(field_input.to_list()) - - static_data["raw_stamp_input"] = list() - for(var/datum/paper_stamp/stamp_input as anything in raw_stamp_data) - static_data["raw_stamp_input"] += list(stamp_input.to_list()) - - static_data["max_length"] = MAX_PAPER_LENGTH - static_data["max_input_field_length"] = MAX_PAPER_INPUT_FIELD_LENGTH - static_data["paper_color"] = color ? color : COLOR_WHITE - static_data["paper_name"] = name -======= static_data += convert_to_data() static_data["max_length"] = MAX_PAPER_LENGTH static_data["max_input_field_length"] = MAX_PAPER_INPUT_FIELD_LENGTH ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 static_data["default_pen_font"] = PEN_FONT static_data["default_pen_color"] = COLOR_BLACK static_data["signature_font"] = FOUNTAIN_PEN_FONT return static_data; -<<<<<<< HEAD -======= /obj/item/paper/proc/convert_to_data() var/list/data = list() @@ -621,7 +581,6 @@ add_atom_colour(new_color, FIXED_COLOUR_PRIORITY) name = data[LIST_PAPER_NAME] ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/paper/ui_data(mob/user) var/list/data = list() @@ -826,19 +785,11 @@ /datum/paper_input/proc/to_list() return list( -<<<<<<< HEAD - raw_text = raw_text, - font = font, - color = colour, - bold = bold, - advanced_html = advanced_html, -======= LIST_PAPER_RAW_TEXT = raw_text, LIST_PAPER_FONT = font, LIST_PAPER_FIELD_COLOR = colour, LIST_PAPER_BOLD = bold, LIST_PAPER_ADVANCED_HTML = advanced_html, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /// Returns the raw contents of the input as html, with **ZERO SANITIZATION** @@ -874,17 +825,10 @@ /datum/paper_stamp/proc/to_list() return list( -<<<<<<< HEAD - class = class, - x = stamp_x, - y = stamp_y, - rotation = rotation, -======= LIST_PAPER_CLASS = class, LIST_PAPER_STAMP_X = stamp_x, LIST_PAPER_STAMP_Y = stamp_y, LIST_PAPER_ROTATION = rotation, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /// A reference to some data that replaces a modifiable input field at some given index in paper raw input parsing. @@ -906,15 +850,9 @@ /datum/paper_field/proc/to_list() return list( -<<<<<<< HEAD - field_index = field_index, - field_data = field_data.to_list(), - is_signature = is_signature, -======= LIST_PAPER_FIELD_INDEX = field_index, LIST_PAPER_FIELD_DATA = field_data.to_list(), LIST_PAPER_IS_SIGNATURE = is_signature, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) /obj/item/paper/construction diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index f2ca575dbde..7e178addec6 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -16,7 +16,6 @@ var/hit_probability = 2 ///Reference to the paper that's folded up in this paperplane, which we return when unfolded. var/obj/item/paper/internal_paper -<<<<<<< HEAD // SKYRAT EDIT START - Better paper planes /// How long does getting shot in the eyes knock you down for? @@ -28,8 +27,6 @@ /// Does it get deleted when hitting anything or landing? var/delete_on_impact = FALSE // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/paperplane/syndicate desc = "Paper, masterfully folded in the shape of a plane." @@ -68,11 +65,7 @@ user.visible_message(span_suicide("[user] jams [src] in [user.p_their()] nose. It looks like [user.p_theyre()] trying to commit suicide!")) user.adjust_eye_blur(12 SECONDS) if(eyes) -<<<<<<< HEAD eyes.apply_organ_damage(rand(impact_eye_damage_lower, impact_eye_damage_higher)) // SKYRAT EDIT START - Better paper planes -======= - eyes.apply_organ_damage(rand(6,8)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sleep(1 SECONDS) return BRUTELOSS @@ -109,11 +102,7 @@ /obj/item/paperplane/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) if(iscarbon(hit_atom) && HAS_TRAIT(hit_atom, TRAIT_PAPER_MASTER)) var/mob/living/carbon/hit_carbon = hit_atom -<<<<<<< HEAD - if(hit_carbon.can_catch_item(TRUE)) -======= if(hit_carbon.can_catch_item(src, skip_throw_mode_check = TRUE)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hit_carbon.throw_mode_on(THROW_MODE_TOGGLE) . = ..() diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 4c36e9cd057..1c54aefa269 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -179,11 +179,7 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks()) return data -<<<<<<< HEAD -/obj/machinery/photocopier/ui_act(action, list/params) -======= /obj/machinery/photocopier/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/photography/camera/silicon_camera.dm b/code/modules/photography/camera/silicon_camera.dm index 7af70b0a3e2..a8bf7a3ba90 100644 --- a/code/modules/photography/camera/silicon_camera.dm +++ b/code/modules/photography/camera/silicon_camera.dm @@ -7,11 +7,7 @@ /// Checks if we can take a picture at this moment. Returns TRUE if we can, FALSE if we can't. /obj/item/camera/siliconcam/proc/can_take_picture(mob/living/silicon/clicker) -<<<<<<< HEAD - if(clicker.stat != CONSCIOUS || clicker.incapacitated()) -======= if(clicker.stat != CONSCIOUS || clicker.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm index f052d636100..342abb1625c 100644 --- a/code/modules/photography/photos/photo.dm +++ b/code/modules/photography/photos/photo.dm @@ -113,11 +113,7 @@ var/n_name = tgui_input_text(usr, "What would you like to label the photo?", "Photo Labelling", max_length = MAX_NAME_LEN) //loc.loc check is for making possible renaming photos in clipboards -<<<<<<< HEAD - if(n_name && (loc == usr || loc.loc && loc.loc == usr) && usr.stat == CONSCIOUS && !usr.incapacitated()) -======= if(n_name && (loc == usr || loc.loc && loc.loc == usr) && usr.stat == CONSCIOUS && !usr.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "photo[(n_name ? "- '[n_name]'" : null)]" add_fingerprint(usr) diff --git a/code/modules/plumbing/plumbers/acclimator.dm b/code/modules/plumbing/plumbers/acclimator.dm index 92fc3caf607..51300af110b 100644 --- a/code/modules/plumbing/plumbers/acclimator.dm +++ b/code/modules/plumbing/plumbers/acclimator.dm @@ -88,11 +88,7 @@ data["emptying"] = emptying return data -<<<<<<< HEAD -/obj/machinery/plumbing/acclimator/ui_act(action, params) -======= /obj/machinery/plumbing/acclimator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm index b0d79df69d8..f1be4f730a1 100644 --- a/code/modules/plumbing/plumbers/pill_press.dm +++ b/code/modules/plumbing/plumbers/pill_press.dm @@ -36,11 +36,8 @@ CAT_PILLS = GLOB.reagent_containers[CAT_PILLS], CAT_PATCHES = GLOB.reagent_containers[CAT_PATCHES], "Bottles" = list(/obj/item/reagent_containers/cup/bottle), -<<<<<<< HEAD CAT_HYPOS = GLOB.reagent_containers[CAT_HYPOS], // SKYRAT EDIT ADDITION - Hypovials -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) packaging_types = list() @@ -73,13 +70,10 @@ packaging_category = CAT_PATCHES else if(ispath(container, /obj/item/reagent_containers/pill)) packaging_category = CAT_PILLS -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - HYPOVIALS else if(ispath(container, /obj/item/reagent_containers/cup/vial)) packaging_category = CAT_HYPOS // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else packaging_category = "Bottles" return container @@ -98,13 +92,10 @@ suffix = "Pill" if(CAT_PATCHES) suffix = "Patch" -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - HYPOVIALS if (CAT_HYPOS) suffix = "Vial" //SKYRAT EDIT ADDITION END - HYPOVIALS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else suffix = "Bottle" container.name = "[product_name] [suffix]" @@ -137,27 +128,6 @@ ui.open() /obj/machinery/plumbing/pill_press/ui_static_data(mob/user) -<<<<<<< HEAD - var/list/data = list() - - data["min_volume"] = MIN_VOLUME - data["max_volume"] = MAX_VOLUME - data["packaging_types"] = packaging_types - - return data - -/obj/machinery/plumbing/pill_press/ui_data(mob/user) - var/list/data = list() - - data["current_volume"] = current_volume - data["product_name"] = product_name - data["packaging_type"] = packaging_type - data["packaging_category"] = packaging_category - - return data - -/obj/machinery/plumbing/pill_press/ui_act(action, params) -======= var/list/data = list() data["min_volume"] = MIN_VOLUME @@ -177,7 +147,6 @@ return data /obj/machinery/plumbing/pill_press/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/plumbing/plumbers/splitters.dm b/code/modules/plumbing/plumbers/splitters.dm index 83b6c88ef84..c2f9216c92b 100644 --- a/code/modules/plumbing/plumbers/splitters.dm +++ b/code/modules/plumbing/plumbers/splitters.dm @@ -32,11 +32,7 @@ data["max_transfer"] = max_transfer return data -<<<<<<< HEAD -/obj/machinery/plumbing/splitter/ui_act(action, params) -======= /obj/machinery/plumbing/splitter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/plumbing/plumbers/synthesizer.dm b/code/modules/plumbing/plumbers/synthesizer.dm index dd8d789e608..ed4121d6ad0 100644 --- a/code/modules/plumbing/plumbers/synthesizer.dm +++ b/code/modules/plumbing/plumbers/synthesizer.dm @@ -89,11 +89,7 @@ .["current_reagent"] = initial(reagent_id.name) -<<<<<<< HEAD -/obj/machinery/plumbing/synthesizer/ui_act(action, params) -======= /obj/machinery/plumbing/synthesizer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/point/point.dm b/code/modules/point/point.dm index 53e3b420bee..681fbce2c6b 100644 --- a/code/modules/point/point.dm +++ b/code/modules/point/point.dm @@ -7,19 +7,6 @@ * * Not intended as a replacement for the mob verb */ -<<<<<<< HEAD -/atom/movable/proc/point_at(atom/pointed_atom) - if(!isturf(loc)) - return - - if (pointed_atom in src) - create_point_bubble(pointed_atom) - return - - var/turf/tile = get_turf(pointed_atom) - if (!tile) - return -======= /atom/movable/proc/point_at(atom/pointed_atom, intentional = FALSE) if(!isturf(loc)) return FALSE @@ -31,14 +18,10 @@ var/turf/tile = get_turf(pointed_atom) if (!tile) return FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/turf/our_tile = get_turf(src) var/obj/visual = new /obj/effect/temp_visual/point(our_tile, invisibility) -<<<<<<< HEAD - animate(visual, pixel_x = (tile.x - our_tile.x) * world.icon_size + pointed_atom.pixel_x, pixel_y = (tile.y - our_tile.y) * world.icon_size + pointed_atom.pixel_y, time = 1.7, easing = EASE_OUT) -======= SEND_SIGNAL(src, COMSIG_MOVABLE_POINTED, pointed_atom, visual, intentional) animate(visual, pixel_x = (tile.x - our_tile.x) * world.icon_size + pointed_atom.pixel_x, pixel_y = (tile.y - our_tile.y) * world.icon_size + pointed_atom.pixel_y, time = 1.7, easing = EASE_OUT) @@ -48,7 +31,6 @@ . = ..() if(.) face_atom(pointed_atom) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /atom/movable/proc/create_point_bubble(atom/pointed_atom) var/mutable_appearance/thought_bubble = mutable_appearance( @@ -135,12 +117,6 @@ if(client && !(pointing_at in view(client.view, src))) return FALSE -<<<<<<< HEAD - point_at(pointing_at) - - SEND_SIGNAL(src, COMSIG_MOB_POINTED, pointing_at) -======= point_at(pointing_at, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm index f425b2083cd..7c6f48fa832 100644 --- a/code/modules/power/apc/apc_main.dm +++ b/code/modules/power/apc/apc_main.dm @@ -8,15 +8,9 @@ ///Cap for how fast cells charge, as a percentage per second (.01 means cellcharge is capped to 1% per second) #define CHARGELEVEL 0.01 ///Charge percentage at which the lights channel stops working -<<<<<<< HEAD #define APC_CHANNEL_LIGHT_TRESHOLD 10 //SKYRAT EDIT CHANGE - Original: 15 ///Charge percentage at which the equipment channel stops working #define APC_CHANNEL_EQUIP_TRESHOLD 20 //SKYRAT EDIT CHANGE - Original: 30 -======= -#define APC_CHANNEL_LIGHT_TRESHOLD 15 -///Charge percentage at which the equipment channel stops working -#define APC_CHANNEL_EQUIP_TRESHOLD 30 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Charge percentage at which the APC icon indicates discharging #define APC_CHANNEL_ALARM_TRESHOLD 75 @@ -450,18 +444,6 @@ if(!QDELETED(remote_control_user) && user == remote_control_user) . = UI_INTERACTIVE -<<<<<<< HEAD -/obj/machinery/power/apc/ui_act(action, params) - . = ..() - - if(. || !can_use(usr, 1) || (locked && !HAS_SILICON_ACCESS(usr) && !failure_timer && action != "toggle_nightshift")) - return - switch(action) - if("lock") - if(HAS_SILICON_ACCESS(usr)) - if((obj_flags & EMAGGED) || (machine_stat & (BROKEN|MAINT)) || remote_control_user) - to_chat(usr, span_warning("The APC does not respond to the command!")) -======= /obj/machinery/power/apc/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() var/mob/user = ui.user @@ -473,7 +455,6 @@ if(HAS_SILICON_ACCESS(user)) if((obj_flags & EMAGGED) || (machine_stat & (BROKEN|MAINT)) || remote_control_user) to_chat(user, span_warning("The APC does not respond to the command!")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else locked = !locked update_appearance() @@ -482,17 +463,10 @@ coverlocked = !coverlocked . = TRUE if("breaker") -<<<<<<< HEAD - toggle_breaker(usr) - . = TRUE - if("toggle_nightshift") - toggle_nightshift_lights(usr) -======= toggle_breaker(user) . = TRUE if("toggle_nightshift") toggle_nightshift_lights(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = TRUE if("charge") chargemode = !chargemode @@ -515,19 +489,6 @@ update() . = TRUE if("overload") -<<<<<<< HEAD - if(HAS_SILICON_ACCESS(usr)) - overload_lighting() - . = TRUE - if("hack") - if(get_malf_status(usr)) - malfhack(usr) - if("occupy") - if(get_malf_status(usr)) - malfoccupy(usr) - if("deoccupy") - if(get_malf_status(usr)) -======= if(HAS_SILICON_ACCESS(user)) overload_lighting() . = TRUE @@ -539,7 +500,6 @@ malfoccupy(user) if("deoccupy") if(get_malf_status(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 malfvacate() if("reboot") failure_timer = 0 @@ -638,15 +598,9 @@ if(!nightshift_lights || (nightshift_lights && !low_power_nightshift_lights)) low_power_nightshift_lights = TRUE INVOKE_ASYNC(src, PROC_REF(set_nightshift), TRUE) -<<<<<<< HEAD - else if(cell.percent() < APC_CHANNEL_EQUIP_TRESHOLD) - equipment = autoset(equipment, AUTOSET_ON) // SKYRAT EDIT CHANGE - ORIGINAL: AUTOSET_OFF - lighting = autoset(lighting, AUTOSET_OFF) // SKYRAT EDIT CHANGE - ORIGINAL: AUTOSET_ON -======= else if(cell.percent() < APC_CHANNEL_EQUIP_TRESHOLD) // turn off equipment equipment = autoset(equipment, AUTOSET_OFF) lighting = autoset(lighting, AUTOSET_ON) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 environ = autoset(environ, AUTOSET_ON) alarm_manager.send_alarm(ALARM_POWER) if(!nightshift_lights || (nightshift_lights && !low_power_nightshift_lights)) @@ -662,7 +616,6 @@ INVOKE_ASYNC(src, PROC_REF(set_nightshift), FALSE) if(cell.percent() > APC_CHANNEL_ALARM_TRESHOLD) alarm_manager.clear_alarm(ALARM_POWER) -<<<<<<< HEAD // SKYRAT ADDITION START - CLOCK CULT if(integration_cog) var/power_delta = clamp(cell.charge - 50, 0, 50) @@ -673,19 +626,12 @@ if(cell.charge <= 50) cell.charge = 0 // SKYRAT ADDITION END -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else // no cell, switch everything off charging = APC_NOT_CHARGING equipment = autoset(equipment, AUTOSET_FORCE_OFF) lighting = autoset(lighting, AUTOSET_FORCE_OFF) environ = autoset(environ, AUTOSET_FORCE_OFF) alarm_manager.send_alarm(ALARM_POWER) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // update icon & area power if anything changed if(last_lt != lighting || last_eq != equipment || last_en != environ || force_update) force_update = FALSE @@ -747,11 +693,7 @@ /obj/machinery/power/apc/proc/overload_lighting() if(!operating || shorted) return -<<<<<<< HEAD - if(cell && cell.use(0.02 * STANDARD_CELL_CHARGE)) -======= if(cell && cell.use(0.02 * STANDARD_BATTERY_CHARGE)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 INVOKE_ASYNC(src, PROC_REF(break_lights)) /obj/machinery/power/apc/proc/break_lights() diff --git a/code/modules/power/apc/apc_tool_act.dm b/code/modules/power/apc/apc_tool_act.dm index c3d2ec749cd..9d7c008c616 100644 --- a/code/modules/power/apc/apc_tool_act.dm +++ b/code/modules/power/apc/apc_tool_act.dm @@ -110,11 +110,7 @@ if(isnull(choice) \ || !user.is_holding(installing_cable) \ || !user.Adjacent(src) \ -<<<<<<< HEAD - || user.incapacitated() \ -======= || user.incapacitated \ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 || !can_place_terminal(user, installing_cable, silent = TRUE) \ ) return ITEM_INTERACT_BLOCKING diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index f8a43f425c1..0af39edabdf 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -569,7 +569,6 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri /obj/item/stack/cable_coil/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!ishuman(interacting_with)) return NONE -<<<<<<< HEAD if(user.combat_mode) return NONE @@ -600,44 +599,13 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri if(!do_after(user, use_delay, attacked_humanoid)) return ITEM_INTERACT_BLOCKING -======= - - if(user.combat_mode) - return NONE - - return try_heal_loop(interacting_with, user) - -/obj/item/stack/cable_coil/proc/try_heal_loop(atom/interacting_with, mob/living/user, repeating = FALSE) - var/mob/living/carbon/human/attacked_humanoid = interacting_with - var/obj/item/bodypart/affecting = attacked_humanoid.get_bodypart(check_zone(user.zone_selected)) - if(isnull(affecting) || !IS_ROBOTIC_LIMB(affecting)) - return NONE - - if (!affecting.burn_dam) - balloon_alert(user, "limb not damaged") - return ITEM_INTERACT_BLOCKING - - user.visible_message(span_notice("[user] starts to fix some of the wires in [attacked_humanoid == user ? user.p_their() : "[attacked_humanoid]'s"] [affecting.name]."), - span_notice("You start fixing some of the wires in [attacked_humanoid == user ? "your" : "[attacked_humanoid]'s"] [affecting.name].")) - - var/use_delay = repeating ? 1 SECONDS : 0 - if(user == attacked_humanoid) - use_delay = 5 SECONDS - - if(!do_after(user, use_delay, attacked_humanoid)) - return ITEM_INTERACT_BLOCKING - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (!attacked_humanoid.item_heal(user, brute_heal = 0, burn_heal = 15, heal_message_brute = "dents", heal_message_burn = "burnt wires", required_bodytype = BODYTYPE_ROBOTIC)) return ITEM_INTERACT_BLOCKING if (use(1) && amount > 0) INVOKE_ASYNC(src, PROC_REF(try_heal_loop), interacting_with, user, TRUE) -<<<<<<< HEAD -======= return ITEM_INTERACT_SUCCESS ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /////////////////////////////////////////////// // Cable laying procedures @@ -656,11 +624,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri to_chat(user, span_warning("There is no cable left!")) return -<<<<<<< HEAD - if(get_dist(T,user) > 1) -======= if(get_dist(T,user) > 1) // Too far ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(user, span_warning("You can't lay cable at a place that far away!")) return diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 7f2961d1c97..addb8cdb6b8 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -19,14 +19,11 @@ w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*7, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) grind_results = list(/datum/reagent/lithium = 15, /datum/reagent/iron = 5, /datum/reagent/silicon = 5) -<<<<<<< HEAD -======= /obj/item/stock_parts/power_store/cell/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_FISHING_BAIT, INNATE_TRAIT) ADD_TRAIT(src, TRAIT_POISONOUS_BAIT, INNATE_TRAIT) //bro is fishing using lithium... ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* Cell variants*/ /obj/item/stock_parts/power_store/cell/empty diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 086c4e3cced..62fc52ff8dd 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -289,11 +289,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) return data -<<<<<<< HEAD -/obj/machinery/gravity_generator/main/ui_act(action, params) -======= /obj/machinery/gravity_generator/main/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -424,7 +420,6 @@ GLOBAL_LIST_EMPTY(gravity_generators) if(mobs.client) shake_camera(mobs, 15, 1) mobs.playsound_local(T, null, 100, 1, 0.5, sound_to_use = alert_sound) -<<<<<<< HEAD //SKYRAT EDIT ADDITON BEGIN if(!SSmapping.level_has_any_trait(z, ZTRAIT_STATION)) // SHUT THE FUCK UP ABANDONED STATIONS, I DON'T CARE return @@ -433,8 +428,6 @@ GLOBAL_LIST_EMPTY(gravity_generators) else priority_announce("A gravity generator has lost its graviton field integrity ballast, artificial gravity is offline.", "Gravity Generator", ANNOUNCER_GRAVGENOFF) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/gravity_generator/main/proc/gravity_in_level() var/turf/T = get_turf(src) diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm index da88c54576a..0047fb370fa 100644 --- a/code/modules/power/lighting/light.dm +++ b/code/modules/power/lighting/light.dm @@ -189,7 +189,6 @@ return . += mutable_appearance(overlay_icon, base_state) -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - AESTHETICS #define LIGHT_ON_DELAY_UPPER (2 SECONDS) @@ -199,8 +198,6 @@ #define NIGHTSHIFT_COLOR_MODIFIER 0.15 //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Area sensitivity is traditionally tied directly to power use, as an optimization // But since we want it for fire reacting, we disregard that /obj/machinery/light/setup_area_power_relationship() @@ -221,17 +218,10 @@ /obj/machinery/light/proc/handle_fire(area/source, new_fire) SIGNAL_HANDLER -<<<<<<< HEAD update(instant = TRUE, play_sound = FALSE) //SKYRAT EDIT CHANGE - ORIGINAL: update() // update the icon_state and luminosity of the light depending on its state /obj/machinery/light/proc/update(trigger = TRUE, instant = FALSE, play_sound = TRUE) // SKYRAT EDIT CHANGE -======= - update() - -// update the icon_state and luminosity of the light depending on its state -/obj/machinery/light/proc/update(trigger = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(status) if(LIGHT_BROKEN,LIGHT_BURNED,LIGHT_EMPTY) on = FALSE @@ -250,7 +240,6 @@ power_set = fire_power brightness_set = fire_brightness else if (nightshift_enabled) -<<<<<<< HEAD brightness_set -= brightness_set * NIGHTSHIFT_LIGHT_MODIFIER // SKYRAT EDIT CHANGE - ORIGINAL: brightness_set = nightshift_brightness power_set -= power_set * NIGHTSHIFT_LIGHT_MODIFIER // SKYRAT EDIT CHANGE - ORIGINAL: power_set = nightshift_light_power if(!color) @@ -271,21 +260,11 @@ blue = clamp(blue, 0, 255) color_set = rgb(red, green, blue) // Splice the numbers together and turn them back to hex. // SKYRAT EDIT ADDITION END -======= - brightness_set = nightshift_brightness - power_set = nightshift_light_power - if(!color) - color_set = nightshift_light_color ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if (major_emergency) color_set = bulb_low_power_colour brightness_set = brightness * bulb_major_emergency_brightness_mul var/matching = light && brightness_set == light.light_range && power_set == light.light_power && color_set == light.light_color -<<<<<<< HEAD if(!matching && (maploaded || instant)) // SKYRAT EDIT CHANGE - ORIGINAL: if(!matching) -======= - if(!matching) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switchcount++ if( prob( min(60, (switchcount**2)*0.01) ) ) if(trigger) @@ -297,7 +276,6 @@ l_power = power_set, l_color = color_set ) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START maploaded = FALSE if(play_sound) @@ -307,8 +285,6 @@ turning_on = TRUE addtimer(CALLBACK(src, PROC_REF(delayed_turn_on), trigger, play_sound, color_set, power_set, brightness_set), rand(LIGHT_ON_DELAY_LOWER, LIGHT_ON_DELAY_UPPER)) // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(has_emergency_power(LIGHT_EMERGENCY_POWER_USE) && !turned_off()) use_power = IDLE_POWER_USE low_power_mode = TRUE @@ -320,7 +296,6 @@ update_current_power_usage() broken_sparks(start_only=TRUE) -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - AESTHETICS #undef LIGHT_ON_DELAY_UPPER @@ -329,8 +304,6 @@ #undef NIGHTSHIFT_COLOR_MODIFIER // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/light/update_current_power_usage() if(!on && static_power_used > 0) //Light is off but still powered removeStaticPower(static_power_used, AREA_USAGE_STATIC_LIGHT) @@ -410,15 +383,10 @@ . += span_danger("The [fitting] has been smashed.") if(cell || has_mock_cell) . += span_notice("Its backup power charge meter reads [has_mock_cell ? 100 : round((cell.charge / cell.maxcharge) * 100, 0.1)]%.") -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(constant_flickering) . += span_danger("The lighting ballast appears to be damaged, this could be fixed with a multitool.") //SKYRAT EDIT END -======= - - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // attack with item - insert light (if right type), otherwise try to break the light @@ -536,23 +504,16 @@ // if a light is turned off, it won't activate emergency power /obj/machinery/light/proc/turned_off() var/area/local_area = get_room_area() -<<<<<<< HEAD - return !local_area.lightswitch && local_area.power_light || flickering || constant_flickering //SKYRAT EDIT CHANGE - ORIGINAL : return !local_area.lightswitch && local_area.power_light || flickering -======= return !local_area.lightswitch && local_area.power_light || flickering ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // returns whether this light has power // true if area has power and lightswitch is on /obj/machinery/light/proc/has_power() var/area/local_area = get_room_area() -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(isnull(local_area)) return FALSE //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return local_area.lightswitch && local_area.power_light // returns whether this light has emergency power @@ -594,21 +555,13 @@ if(status != LIGHT_OK || !has_power()) break on = !on -<<<<<<< HEAD update(FALSE, TRUE) //SKYRAT EDIT CHANGE -======= - update(FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sleep(rand(5, 15)) if(has_power()) on = (status == LIGHT_OK) else on = FALSE -<<<<<<< HEAD - update(FALSE, TRUE) // SKYRAT EDIT CHANGE -======= - update(FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + update(FALSE, TRUE) //SKYRAT EDIT CHANGE . = TRUE //did we actually flicker? flickering = FALSE diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm index bae06b6e0cd..47000049047 100644 --- a/code/modules/power/pipecleaners.dm +++ b/code/modules/power/pipecleaners.dm @@ -233,11 +233,7 @@ By design, d1 is the smallest direction and d2 is the highest return FALSE if(!user.is_holding(src)) return FALSE -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index a47d4b9b979..e27ea98f8ca 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -246,11 +246,7 @@ data["current_heat"] = current_heat . = data -<<<<<<< HEAD -/obj/machinery/power/port_gen/pacman/ui_act(action, params) -======= /obj/machinery/power/port_gen/pacman/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/power/power_store.dm b/code/modules/power/power_store.dm index b348cd10b14..d0d612aaed0 100644 --- a/code/modules/power/power_store.dm +++ b/code/modules/power/power_store.dm @@ -305,31 +305,19 @@ if(stomach_cell.charge() > charge_limit) to_chat(H, span_warning("Your charge is full!")) return -<<<<<<< HEAD H.visible_message(span_notice("[user] hovers their fingers above [src], arcs forming from its surface!")) //SKYRAT EDIT CHANGE - Ethereal Rework 2024 - ORIGINAL: to_chat(H, span_notice("You begin clumsily channeling power from [src] into your body.")) -======= - to_chat(H, span_notice("You begin clumsily channeling power from [src] into your body.")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 stomach.drain_time = world.time + CELL_DRAIN_TIME while(do_after(user, CELL_DRAIN_TIME, target = src)) if((charge < CELL_POWER_DRAIN) || (stomach_cell.charge() > charge_limit)) return if(istype(stomach)) -<<<<<<< HEAD - to_chat(H, span_purple("You receive some charge from [src], wasting some in the process.")) // SKYRAT EDIT CHANGE - Ethereal Rework 2024 - Original: to_chat(H, span_notice("You receive some charge from [src], wasting some in the process.")) -======= to_chat(H, span_notice("You receive some charge from [src], wasting some in the process.")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 stomach.adjust_charge(CELL_POWER_GAIN) charge -= CELL_POWER_DRAIN //you waste way more than you receive, so that ethereals cant just steal one cell and forget about hunger else to_chat(H, span_warning("You can't receive charge from [src]!")) return -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/stock_parts/power_store/blob_act(obj/structure/blob/B) SSexplosions.high_mov_atom += src diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 62249ca7c9f..22682471d13 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -3,11 +3,7 @@ /obj/machinery/field/containment name = "containment field" desc = "An energy field." -<<<<<<< HEAD - icon = 'icons/obj/machines/engine/singularity.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= icon = 'icons/obj/machines/engine/singularity.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "Contain_F" density = FALSE move_resist = INFINITY diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 39b6a97fbce..da084035a9c 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -1,11 +1,7 @@ /obj/machinery/power/emitter name = "emitter" desc = "A heavy-duty industrial laser, often used in containment fields and power generation." -<<<<<<< HEAD icon = 'icons/obj/machines/engine/singularity.dmi' //SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= - icon = 'icons/obj/machines/engine/singularity.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "emitter" base_icon_state = "emitter" @@ -356,11 +352,8 @@ /obj/machinery/power/emitter/proc/integrate(obj/item/gun/energy/energy_gun, mob/user) if(!istype(energy_gun, /obj/item/gun/energy)) return -<<<<<<< HEAD if(istype(energy_gun, /obj/item/gun/energy/cell_loaded))//SKYRAT EDIT MEDIGUNS - return //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + return if(!user.transferItemToLoc(energy_gun, src)) return gun = energy_gun @@ -430,11 +423,7 @@ . = ..() /obj/machinery/power/emitter/prototype/user_buckle_mob(mob/living/buckled_mob, mob/user, check_loc = TRUE) -<<<<<<< HEAD - if(user.incapacitated() || !istype(user)) -======= if(user.incapacitated || !istype(user)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return for(var/atom/movable/atom in get_turf(src)) if(atom.density && (atom != src && atom != buckled_mob)) diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index 42394c7e21b..73801e0d7d0 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -276,11 +276,7 @@ ///security level and shuttle lockdowns for [/proc/begin_the_end()] /proc/narsie_start_destroy_station() -<<<<<<< HEAD SSsecurity_level.set_level(SEC_LEVEL_GAMMA) //SKYRAT EDIT CHANGE - ALERTS - ORIGINAL "delta" -======= - SSsecurity_level.set_level(SEC_LEVEL_DELTA) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SSshuttle.registerHostileEnvironment(GLOB.cult_narsie) SSshuttle.lockdown = TRUE addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(narsie_apocalypse)), 1 MINUTES) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 3dac3bbb838..77ce6b6a949 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -69,21 +69,9 @@ var/max_charge = 0 var/new_charge = 0 for(var/datum/stock_part/capacitor/capacitor in component_parts) -<<<<<<< HEAD // SKYRAT EDIT CHANGE START - Original: power_coefficient += capacitor.tier - switch(capacitor.tier) - if(1) - power_coefficient = 1 - if(2) - power_coefficient = 2 - if(3) - power_coefficient = 4 - else - power_coefficient = 8 + power_coefficient = 2 ** (capacitor.tier - 1) // SKYRAT EDIT CHANGE END -======= - power_coefficient += capacitor.tier ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 input_level_max = initial(input_level_max) * power_coefficient output_level_max = initial(output_level_max) * power_coefficient for(var/obj/item/stock_parts/power_store/power_cell in component_parts) @@ -136,11 +124,7 @@ if(isnull(choice) \ || !user.is_holding(item) \ || !user.Adjacent(src) \ -<<<<<<< HEAD - || user.incapacitated() \ -======= || user.incapacitated \ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 || !can_place_terminal(user, item, silent = TRUE) \ ) return @@ -385,11 +369,7 @@ ) return data -<<<<<<< HEAD -/obj/machinery/power/smes/ui_act(action, params) -======= /obj/machinery/power/smes/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -443,10 +423,6 @@ /obj/machinery/power/smes/proc/log_smes(mob/user) investigate_log("Input/Output: [input_level]/[output_level] | Charge: [charge] | Output-mode: [output_attempt?"ON":"OFF"] | Input-mode: [input_attempt?"AUTO":"OFF"] by [user ? key_name(user) : "outside forces"]", INVESTIGATE_ENGINE) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/power/smes/emp_act(severity) . = ..() diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 1cf2ee3a9c3..cf694f491b7 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -486,11 +486,7 @@ data["history"] = history return data -<<<<<<< HEAD -/obj/machinery/power/solar_control/ui_act(action, params) -======= /obj/machinery/power/solar_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 28aef8718b4..eb359c78a90 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -561,10 +561,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) final_countdown = TRUE -<<<<<<< HEAD SEND_GLOBAL_SIGNAL(COMSIG_MAIN_SM_DELAMINATING, final_countdown) // SKYRAT EDIT ADDITION - DELAM_SCRAM -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 notify_ghosts( "[src] has begun the delamination process!", source = src, @@ -1053,11 +1050,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) /// Consume the santa hat and add it as an overlay /obj/machinery/power/supermatter_crystal/proc/holiday_item_interaction(source, mob/living/user, obj/item/item, list/modifiers) SIGNAL_HANDLER -<<<<<<< HEAD if(istype(item, /obj/item/clothing/head/costume/santa) || istype(item, /obj/item/clothing/head/costume/skyrat/christmas)) // SKYRAT EDIT CHANGE - Loadouts -======= - if(istype(item, /obj/item/clothing/head/costume/santa)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 QDEL_NULL(item) RegisterSignal(src, COMSIG_ATOM_EXAMINE, PROC_REF(holiday_hat_examine)) if(istype(src, /obj/machinery/power/supermatter_crystal/shard)) diff --git a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm index c795895affc..10a3e1bcda0 100644 --- a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm +++ b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm @@ -37,11 +37,8 @@ GLOBAL_LIST_INIT(sm_delam_list, list( if(sm.damage <= sm.warning_point) // Damage is too low, lets not return FALSE -<<<<<<< HEAD notify_delam_suppression(sm) // SKYRAT EDIT ADDITION - DELAM_SCRAM -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (sm.damage >= sm.emergency_point && sm.damage_archived < sm.emergency_point) sm.investigate_log("has entered the emergency point.", INVESTIGATE_ENGINE) message_admins("[sm] has entered the emergency point [ADMIN_VERBOSEJMP(sm)].") @@ -60,22 +57,15 @@ GLOBAL_LIST_INIT(sm_delam_list, list( switch(sm.get_status()) if(SUPERMATTER_DELAMINATING) -<<<<<<< HEAD // SKYRAT EDIT ADDITION alert_sound_to_playing('modular_skyrat/master_files/sound/effects/reactor/meltdown.ogg', override_volume = TRUE) alert_sound_to_playing('sound/effects/alert.ogg', override_volume = TRUE) // SKYRAT EDIT END - playsound(sm, 'sound/misc/bloblarm.ogg', 100, FALSE, 40, 30, falloff_distance = 10) if(SUPERMATTER_EMERGENCY) // SKYRAT EDIT ADDITION alert_sound_to_playing('modular_skyrat/master_files/sound/effects/reactor/core_overheating.ogg', override_volume = TRUE) alert_sound_to_playing('sound/misc/notice1.ogg', override_volume = TRUE) // SKYRAT EDIT END -======= - playsound(sm, 'sound/misc/bloblarm.ogg', 100, FALSE, 40, 30, falloff_distance = 10) - if(SUPERMATTER_EMERGENCY) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - playsound(sm, 'sound/machines/engine_alert1.ogg', 100, FALSE, 30, 30, falloff_distance = 10) if(SUPERMATTER_DANGER) playsound(sm, 'sound/machines/engine_alert2.ogg', 100, FALSE, 30, 30, falloff_distance = 10) if(SUPERMATTER_WARNING) diff --git a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm index 5d87e1476f9..597d09b3f5c 100644 --- a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm +++ b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm @@ -34,9 +34,6 @@ continue victim.playsound_local(victim_turf, 'sound/magic/charge.ogg') if(victim.z == 0) //victim is inside an object, this is to maintain an old bug turned feature with lockers n shit i guess. tg issue #69687 -<<<<<<< HEAD - to_chat(victim, span_boldannounce("You hold onto \the [victim.loc] as hard as you can, as reality distorts around you. You feel safe.")) -======= var/message = "" var/location = victim.loc if(istype(location, /obj/structure/disposalholder)) // sometimes your loc can be a disposalsholder when you're inside a disposals type, so let's just pass a message that makes sense. @@ -44,7 +41,6 @@ else message = "You hold onto \the [victim.loc] as hard as you can, as reality distorts around you. You feel safe." to_chat(victim, span_boldannounce(message)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 continue to_chat(victim, span_boldannounce("You feel reality distort for a moment...")) if (isliving(victim)) @@ -144,11 +140,7 @@ priority_announce( text = "Fatal error occurred in emergency shuttle uplink during transit. Unable to reestablish connection.", title = "Shuttle Failure", -<<<<<<< HEAD sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', -======= - sound = 'sound/misc/announce_dig.ogg', ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sender_override = "Emergency Shuttle Uplink Alert", color_override = "grey", ) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 87666b08ac8..a3bdd2b55bd 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -42,10 +42,7 @@ return ITEM_INTERACT_BLOCKING return ..() -<<<<<<< HEAD /* SKYRAT EDIT CHANGE BEGIN - MOVED TO modular_skyrat/master_files/code/modules/power/tesla/coil.dm -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/power/energy_accumulator/tesla_coil/RefreshParts() . = ..() var/power_multiplier = 0 @@ -54,10 +51,7 @@ power_multiplier += capacitor.tier zap_cooldown -= (capacitor.tier * 20) input_power_multiplier = max(1 * (power_multiplier / 8), 0.25) //Max out at 50% efficency. -<<<<<<< HEAD */// SKYRAT EDIT CHANGE END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/power/energy_accumulator/tesla_coil/examine(mob/user) . = ..() diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 3f8fa7fe82d..0e7957b65fb 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -50,11 +50,7 @@ var/turf/spawned_turf = get_turf(src) message_admins("A tesla has been created at [ADMIN_VERBOSEJMP(spawned_turf)].") -<<<<<<< HEAD - investigate_log("(tesla) was created at [AREACOORD(spawned_turf)].", INVESTIGATE_ENGINE) -======= investigate_log("was created at [AREACOORD(spawned_turf)].", INVESTIGATE_ENGINE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/energy_ball/Destroy() if(orbiting && istype(orbiting.parent, /obj/energy_ball)) diff --git a/code/modules/power/thermoelectric_generator.dm b/code/modules/power/thermoelectric_generator.dm index 8eabc0ca796..48295914ef5 100644 --- a/code/modules/power/thermoelectric_generator.dm +++ b/code/modules/power/thermoelectric_generator.dm @@ -1,10 +1,8 @@ -<<<<<<< HEAD + /* Skyrat removal START, moved to modular file -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define TEG_EFFICIENCY 0.65 /obj/machinery/power/thermoelectric_generator @@ -227,9 +225,7 @@ Skyrat removal START, moved to modular file cold_circ = null #undef TEG_EFFICIENCY -<<<<<<< HEAD + Skyrat removal END */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/power/turbine/turbine_computer.dm b/code/modules/power/turbine/turbine_computer.dm index 84ce8052ceb..2ad777edd62 100644 --- a/code/modules/power/turbine/turbine_computer.dm +++ b/code/modules/power/turbine/turbine_computer.dm @@ -68,11 +68,7 @@ return data -<<<<<<< HEAD -/obj/machinery/computer/turbine_computer/ui_act(action, params) -======= /obj/machinery/computer/turbine_computer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/projectiles/ammunition/_firing.dm b/code/modules/projectiles/ammunition/_firing.dm index 2104f1366b8..edfb48ecc84 100644 --- a/code/modules/projectiles/ammunition/_firing.dm +++ b/code/modules/projectiles/ammunition/_firing.dm @@ -17,12 +17,8 @@ return FALSE AddComponent(/datum/component/pellet_cloud, projectile_type, pellets) -<<<<<<< HEAD - //var/next_delay = click_cooldown_override || CLICK_CD_RANGE // ORIGINAL + //var/next_delay = click_cooldown_override || CLICK_CD_RANGE // SKYRAT EDIT: ORIGINAL var/next_delay = click_cooldown_override || ((user.staminaloss <= STAMINA_THRESHOLD_TIRED_CLICK_CD) ? CLICK_CD_RANGE : CLICK_CD_RANGE_TIRED) // SKYRAT EDIT CHANGE -======= - var/next_delay = click_cooldown_override || CLICK_CD_RANGE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HAS_TRAIT(user, TRAIT_DOUBLE_TAP)) next_delay = round(next_delay * 0.5) user.changeNext_move(next_delay) diff --git a/code/modules/projectiles/ammunition/energy/_energy.dm b/code/modules/projectiles/ammunition/energy/_energy.dm index 1f2e8a78ec7..0d3e11ec51a 100644 --- a/code/modules/projectiles/ammunition/energy/_energy.dm +++ b/code/modules/projectiles/ammunition/energy/_energy.dm @@ -8,7 +8,4 @@ var/select_name = CALIBER_ENERGY fire_sound = 'sound/weapons/laser.ogg' firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/red -<<<<<<< HEAD var/select_color = FALSE //SKYRAT EDIT ADDITION - This is the color that shows up when selecting an ammo type. Disabled by default -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index b0452e24672..207190d08f9 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -194,10 +194,7 @@ desc = "[initial(desc)] There [(shells_left == 1) ? "is" : "are"] [shells_left] [casing_phrasing]\s left!" /obj/item/ammo_box/update_icon_state() -<<<<<<< HEAD -======= . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/shells_left = LAZYLEN(stored_ammo) switch(multiple_sprites) if(AMMO_BOX_PER_BULLET) @@ -205,33 +202,19 @@ if(AMMO_BOX_FULL_EMPTY) icon_state = "[multiple_sprite_use_base ? base_icon_state : initial(icon_state)]-[shells_left ? "full" : "empty"]" -<<<<<<< HEAD - if(ammo_band_color && ammo_band_icon) - update_ammo_band() - - return ..() - -/obj/item/ammo_box/proc/update_ammo_band() - overlays.Cut() -======= /obj/item/ammo_box/update_overlays() . = ..() if(ammo_band_color && ammo_band_icon) . += update_ammo_band() /obj/item/ammo_box/proc/update_ammo_band() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/band_icon = ammo_band_icon if(!(length(stored_ammo)) && ammo_band_icon_empty) band_icon = ammo_band_icon_empty var/image/ammo_band_image = image(icon, src, band_icon) ammo_band_image.color = ammo_band_color ammo_band_image.appearance_flags = RESET_COLOR|KEEP_APART -<<<<<<< HEAD - overlays += ammo_band_image -======= return ammo_band_image ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Count of number of bullets in the magazine /obj/item/ammo_box/magazine/proc/ammo_count(countempties = TRUE) diff --git a/code/modules/projectiles/boxes_magazines/internal/rifle.dm b/code/modules/projectiles/boxes_magazines/internal/rifle.dm index 92ac1a846c2..b1f761831ee 100644 --- a/code/modules/projectiles/boxes_magazines/internal/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/internal/rifle.dm @@ -60,9 +60,5 @@ /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/syndie max_ammo = 3 caliber = CALIBER_REBAR_SYNDIE -<<<<<<< HEAD - ammo_type = /obj/item/ammo_casing/rebar -======= ammo_type = /obj/item/ammo_casing/rebar/syndie ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 4d476a6ddaf..5293a1220e0 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -45,11 +45,7 @@ var/weapon_weight = WEAPON_LIGHT var/dual_wield_spread = 24 //additional spread when dual wielding ///Can we hold up our target with this? Default to yes -<<<<<<< HEAD var/can_hold_up = FALSE // SKYRAT EDIT - DISABLED ORIGINAL: TRUE -======= - var/can_hold_up = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Just 'slightly' snowflakey way to modify projectile damage for projectiles fired from this gun. var/projectile_damage_multiplier = 1 @@ -81,11 +77,8 @@ pin = new pin(src) add_seclight_point() -<<<<<<< HEAD give_gun_safeties() // SKYRAT EDIT ADDITION - GUN SAFETIES give_manufacturer_examine() // SKYRAT EDIT ADDITON - MANUFACTURER EXAMINE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 add_bayonet_point() /obj/item/gun/Destroy() diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 55938cec48a..75d3d89a4b3 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -7,10 +7,7 @@ w_class = WEIGHT_CLASS_NORMAL pickup_sound = 'sound/items/gun_pick_up.ogg' drop_sound = 'sound/items/gun_drop.ogg' -<<<<<<< HEAD -======= sound_vary = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///sound when inserting magazine var/load_sound = 'sound/weapons/gun/general/magazine_insert_full.ogg' @@ -400,10 +397,6 @@ if (display_message) balloon_alert(user, "[magazine_wording] unloaded") update_appearance() -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/ballistic/can_shoot() return chambered?.loaded_projectile @@ -437,18 +430,11 @@ chambered = null var/num_loaded = magazine?.attackby(A, user, params, TRUE) if (num_loaded) -<<<<<<< HEAD handle_box_reload(user, A, num_loaded) // SKYRAT EDIT CHANGE - ORIGINAL: balloon_alert(user, "[num_loaded] [cartridge_wording]\s loaded") playsound(src, load_sound, load_sound_volume, load_sound_vary) if (chambered == null && bolt_type == BOLT_TYPE_NO_BOLT) chamber_round() SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) // SKYRAT EDIT ADDITION - this is normally done by handle_magazine which does not get called so we have to do it manually here -======= - balloon_alert(user, "[num_loaded] [cartridge_wording]\s loaded") - playsound(src, load_sound, load_sound_volume, load_sound_vary) - if (chambered == null && bolt_type == BOLT_TYPE_NO_BOLT) - chamber_round() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 A.update_appearance() update_appearance() return @@ -575,10 +561,7 @@ SSblackbox.record_feedback("tally", "station_mess_created", 1, CB.name) if (num_unloaded) balloon_alert(user, "[num_unloaded] [cartridge_wording]\s unloaded") -<<<<<<< HEAD SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) // SKYRAT EDIT ADDITION - this is normally handled by eject_magazine() but internal magazines are a special case -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 playsound(user, eject_sound, eject_sound_volume, eject_sound_vary) update_appearance() else diff --git a/code/modules/projectiles/guns/ballistic/bows/_bow.dm b/code/modules/projectiles/guns/ballistic/bows/_bow.dm index 901eb4e636c..c0ce0b1ef2c 100644 --- a/code/modules/projectiles/guns/ballistic/bows/_bow.dm +++ b/code/modules/projectiles/guns/ballistic/bows/_bow.dm @@ -32,17 +32,7 @@ /obj/item/gun/ballistic/bow/update_overlays() . = ..() if(chambered) -<<<<<<< HEAD - // . += "[chambered.base_icon_state][drawn ? "_drawn" : ""]" SKYRAT EDIT REMOVAL - // SKYRAT EDIT START - var/icon_state = icon_exists(/obj/item/gun/ballistic/bow::icon, chambered.base_icon_state) ? chambered.base_icon_state : "arrow" - if(drawn) - icon_state += "_drawn" - . += icon(/obj/item/gun/ballistic/bow::icon, icon_state) - // SKYRAT EDIT END -======= . += "[chambered.base_icon_state][drawn ? "_drawn" : ""]" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/ballistic/bow/click_alt(mob/user) if(isnull(chambered)) diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm index 6cd688584ac..4f5a01b1ebd 100644 --- a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm +++ b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm @@ -21,11 +21,7 @@ /obj/item/ammo_casing/arrow/update_icon_state() . = ..() -<<<<<<< HEAD icon_state = "[initial(icon_state)]" //SKYRAT EDIT: Original: icon_state = "[base_icon_state]" -======= - icon_state = "[base_icon_state]" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///base arrow projectile /obj/projectile/bullet/arrow diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm index c5c105cef01..cc6bfbb6477 100644 --- a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm +++ b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm @@ -21,11 +21,7 @@ slot_flags = ITEM_SLOT_BACK obj_flags = UNIQUE_RENAME accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bow/holy -<<<<<<< HEAD //projectile_damage_multiplier = 0.4 // SKYRAT EDIT REMOVAL -======= - projectile_damage_multiplier = 0.4 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/ammo_box/magazine/internal/bow/holy name = "divine bowstring" diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 67d3e7210d3..a73049a1f03 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -1,11 +1,7 @@ /obj/item/gun/ballistic/automatic/pistol name = "\improper Makarov pistol" -<<<<<<< HEAD // desc = "A small, easily concealable 9mm handgun. Has a threaded barrel for suppressors." // SKYRAT EDIT: Original desc = "A small, easily concealable 9x25mm Mk.12 handgun. Has a threaded barrel for suppressors." // SKYRAT EDIT: Calibre rename -======= - desc = "A small, easily concealable 9mm handgun. Has a threaded barrel for suppressors." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "pistol" w_class = WEIGHT_CLASS_SMALL accepted_magazine_type = /obj/item/ammo_box/magazine/m9mm @@ -108,11 +104,7 @@ simulated_hit.firer = throwingdatum.get_thrower() simulated_hit.on_hit(hit_atom) -<<<<<<< HEAD /obj/item/gun/ballistic/automatic/pistol/m1911 //ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= -/obj/item/gun/ballistic/automatic/pistol/m1911 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "\improper M1911" desc = "A classic .45 handgun with a small magazine capacity." icon_state = "m1911" @@ -208,11 +200,7 @@ /obj/item/gun/ballistic/automatic/pistol/aps name = "\improper Stechkin APS machine pistol" -<<<<<<< HEAD desc = "A modernized reproduction of an old Soviet machine pistol. It fires quickly, but kicks like a mule. Uses 9mm ammo. Has a threaded barrel for suppressors." //SKYRAT EDIT -======= - desc = "An old Soviet machine pistol. It fires quickly, but kicks like a mule. Uses 9mm ammo. Has a threaded barrel for suppressors." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon_state = "aps" w_class = WEIGHT_CLASS_NORMAL accepted_magazine_type = /obj/item/ammo_box/magazine/m9mm_aps diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm index e32d6f21d97..888b784ddf8 100644 --- a/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/code/modules/projectiles/guns/ballistic/rifle.dm @@ -201,16 +201,9 @@ inhand_icon_state = "rebarxbow" worn_icon_state = "rebarxbow" rack_sound = 'sound/weapons/gun/sniper/rack.ogg' -<<<<<<< HEAD - must_hold_to_load = TRUE - mag_display = FALSE - empty_indicator = TRUE - bolt_type = BOLT_TYPE_LOCKING -======= mag_display = FALSE empty_indicator = TRUE bolt_type = BOLT_TYPE_OPEN ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 semi_auto = FALSE internal_magazine = TRUE can_modify_ammo = FALSE @@ -255,20 +248,15 @@ return FALSE return ..() -<<<<<<< HEAD -======= /obj/item/gun/ballistic/rifle/rebarxbow/shoot_with_empty_chamber(mob/living/user) if(chambered || !magazine || !length(magazine.contents)) return ..() drop_bolt(user) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/ballistic/rifle/rebarxbow/examine(mob/user) . = ..() . += "The crossbow is [bolt_locked ? "not ready" : "ready"] to fire." -<<<<<<< HEAD -======= /obj/item/gun/ballistic/rifle/rebarxbow/update_overlays() . = ..() if(!magazine) @@ -276,7 +264,6 @@ if(!bolt_locked) . += "[initial(icon_state)]" + "_bolt_locked" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/ballistic/rifle/rebarxbow/forced name = "Stressed Rebar Crossbow" desc = "Some idiot decided that they would risk shooting themselves in the face if it meant they could have a draw this crossbow a bit faster. Hopefully, it was worth it." diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 98ed42901d4..68a625f619e 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -157,11 +157,7 @@ accepted_magazine_type = /obj/item/ammo_box/magazine/m12g can_suppress = FALSE burst_size = 2 -<<<<<<< HEAD - fire_delay = 10 //Skyrat edit - Original: 1 -======= - fire_delay = 1 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + fire_delay = 5 //Skyrat edit - Original: 1 pin = /obj/item/firing_pin/implant/pindicate fire_sound = 'sound/weapons/gun/shotgun/shot_alt.ogg' actions_types = list(/datum/action/item_action/toggle_firemode) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index d058fc9b673..387ed3c6ee6 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -5,10 +5,7 @@ icon = 'icons/obj/weapons/guns/energy.dmi' pickup_sound = 'sound/items/gun_pick_up.ogg' drop_sound = 'sound/items/gun_drop.ogg' -<<<<<<< HEAD -======= sound_vary = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// What type of power cell this uses var/obj/item/stock_parts/power_store/cell @@ -250,20 +247,13 @@ if(!skip_worn_icon) worn_icon_state = temp_icon_to_use return ..() -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/energy/update_overlays() . = ..() // SKYRAT EDIT START if(!automatic_charge_overlays || !cell) return -<<<<<<< HEAD // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/overlay_icon_state = "[icon_state]_charge" if(modifystate) diff --git a/code/modules/projectiles/guns/energy/beam_rifle.dm b/code/modules/projectiles/guns/energy/beam_rifle.dm index fb21cde100b..c9550e0fc2d 100644 --- a/code/modules/projectiles/guns/energy/beam_rifle.dm +++ b/code/modules/projectiles/guns/energy/beam_rifle.dm @@ -52,10 +52,7 @@ hitscan = TRUE tracer_type = /obj/effect/projectile/tracer/tracer/beam_rifle -<<<<<<< HEAD /* SKYRAT EDIT REMOVE - God -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/projectile/beam/event_horizon/on_hit(atom/target, blocked, pierce_hit) . = ..() @@ -66,7 +63,4 @@ var/obj/reality_tear/temporary/tear = new(rift_loc) tear.start_disaster() message_admins("[ADMIN_LOOKUPFLW(target)] has been hit by an anti-existential beam at [ADMIN_VERBOSEJMP(rift_loc)], creating a singularity.") -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index b18fc6fddd5..d0df2710696 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -123,11 +123,7 @@ /obj/item/gun/energy/recharge/kinetic_accelerator/proc/check_menu(mob/living/carbon/human/user) if(!istype(user)) return FALSE -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -161,17 +157,10 @@ modkit_upgrade.modify_projectile(kinetic_projectile) /obj/item/gun/energy/recharge/kinetic_accelerator/cyborg -<<<<<<< HEAD icon_state = "kineticgun" // SKYRAT EDIT CHANGE holds_charge = TRUE unique_frequency = TRUE max_mod_capacity = 100 // SKYRAT EDIT CHANGE FROM 90 - Balance due to fauna changes and no level perks applying -======= - icon_state = "kineticgun_b" - holds_charge = TRUE - unique_frequency = TRUE - max_mod_capacity = 90 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/energy/recharge/kinetic_accelerator/minebot trigger_guard = TRIGGER_GUARD_ALLOW_ALL diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index 43c9f428583..1183cbfe653 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -136,11 +136,7 @@ /obj/projectile/magic/antimagic, /obj/projectile/magic/arcane_barrage, /obj/projectile/magic/bounty, -<<<<<<< HEAD ///obj/projectile/magic/change, //SKYRAT EDIT REMOVAL -======= - /obj/projectile/magic/change, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/projectile/magic/death, /obj/projectile/magic/door, /obj/projectile/magic/fetch, diff --git a/code/modules/projectiles/guns/special/meat_hook.dm b/code/modules/projectiles/guns/special/meat_hook.dm index 5852129bdb7..cfa932a6541 100644 --- a/code/modules/projectiles/guns/special/meat_hook.dm +++ b/code/modules/projectiles/guns/special/meat_hook.dm @@ -59,18 +59,11 @@ hitsound = 'sound/effects/splat.ogg' /// The chain we send out while we are in motion, referred to as "initial" to not get confused with the chain we use to reel the victim in. var/datum/beam/initial_chain -<<<<<<< HEAD var/chain_icon = 'icons/effects/beam.dmi' // SKYRAT EDIT ADDITION /obj/projectile/hook/fire(setAngle) if(firer) initial_chain = firer.Beam(src, icon_state = "chain", icon = chain_icon, emissive = FALSE) // SKYRAT EDIT CHANGE - Adds icon arg - ORIGINAL: chain = firer.Beam(src, icon_state = "chain", emissive = FALSE) -======= - -/obj/projectile/hook/fire(setAngle) - if(firer) - initial_chain = firer.Beam(src, icon_state = "chain", emissive = FALSE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ADD_TRAIT(firer, TRAIT_IMMOBILIZED, REF(src)) addtimer(TRAIT_CALLBACK_REMOVE(firer, TRAIT_IMMOBILIZED, REF(src)), IMMOBILIZATION_TIMER) // safety if we miss, if we get a hit we stay immobilized return ..() diff --git a/code/modules/projectiles/guns/special/syringe_gun.dm b/code/modules/projectiles/guns/special/syringe_gun.dm index a3530a514e4..caa51c59053 100644 --- a/code/modules/projectiles/guns/special/syringe_gun.dm +++ b/code/modules/projectiles/guns/special/syringe_gun.dm @@ -46,16 +46,12 @@ /obj/item/gun/syringe/recharge_newshot() if(!syringes.len) return -<<<<<<< HEAD //SKYRAT EDIT SMARTDARTS if(istype(syringes[length(syringes)], /obj/item/reagent_containers/syringe/smartdart)) chambered.newshot(/obj/projectile/bullet/dart/syringe/dart) else chambered.newshot() //SKYRAT EDIT SMARTDARTS END -======= - chambered.newshot() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/gun/syringe/can_shoot() return syringes.len diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index becf252d324..f1402f85e8b 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -1,7 +1,3 @@ -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MOVES_HITSCAN -1 //Not actually hitscan but close as we get without actual hitscan. #define MUZZLE_EFFECT_PIXEL_INCREMENT 17 //How many pixels to move the muzzle flash up so your character doesn't look like they're shitting out lasers. #define MAX_RANGE_HIT_PRONE_TARGETS 10 //How far do the projectile hits the prone mob @@ -212,19 +208,15 @@ var/wound_falloff_tile ///How much we want to drop the embed_chance value, if we can embed, per tile, for falloff purposes var/embed_falloff_tile -<<<<<<< HEAD - var/static/list/projectile_connections = list(COMSIG_ATOM_ENTERED = PROC_REF(on_entered)) // SKYRAT EDIT ADDITION START /// If this should be able to hit the target even on direct firing when `ignored_factions` applies var/ignore_direct_target = FALSE // SKYRAT EDIT ADDITION END -======= ///How much accuracy is lost for each tile travelled var/accuracy_falloff = 7 ///How much accuracy before falloff starts to matter. Formula is range - falloff * tiles travelled var/accurate_range = 100 var/static/list/projectile_connections = list(COMSIG_ATOM_ENTERED = PROC_REF(on_entered)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// If true directly targeted turfs can be hit var/can_hit_turfs = FALSE @@ -320,31 +312,17 @@ playsound(src, get_sfx_skyrat(impact_sound), vol_by_damage(), TRUE, -1) // SKYRAT EDIT ADDITION END -<<<<<<< HEAD - if(isturf(target_turf) && hitsound_wall) -======= if(isturf(target) && hitsound_wall) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/volume = clamp(vol_by_damage() + 20, 0, 100) if(suppressed) volume = 5 playsound(loc, hitsound_wall, volume, TRUE, -1) -<<<<<<< HEAD - if(damage > 0 && (damage_type == BRUTE || damage_type == BURN) && iswallturf(target_turf) && prob(75)) var/turf/closed/wall/target_wall = target_turf if(impact_effect_type && !hitscan) new impact_effect_type(target_wall, hitx, hity) -======= - - if(damage > 0 && (damage_type == BRUTE || damage_type == BURN) && iswallturf(target_turf) && prob(75)) - var/turf/closed/wall/target_wall = target_turf - if(impact_effect_type && !hitscan) - new impact_effect_type(target_wall, hitx, hity) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 target_wall.add_dent(WALL_DENT_SHOT, hitx, hity) return BULLET_ACT_HIT @@ -352,7 +330,6 @@ if(!isliving(target)) if(impact_effect_type && !hitscan) new impact_effect_type(target_turf, hitx, hity) -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - IMPACT SOUNDS if(isturf(target) && hitsound_wall) var/volume = clamp(vol_by_damage() + 20, 0, 100) @@ -361,8 +338,6 @@ playsound(loc, hitsound_wall, volume, TRUE, -1) SKYRAT EDIT REMOVAL END */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return BULLET_ACT_HIT @@ -396,25 +371,15 @@ if(hit_limb_zone) organ_hit_text = " in \the [living_target.parse_zone_with_bodypart(hit_limb_zone)]" if(suppressed == SUPPRESSED_VERY) -<<<<<<< HEAD - //playsound(loc, hitsound, 5, TRUE, -1) SKYRAT EDIT REMOVAL - IMPACT SOUNDS - else if(suppressed) - //playsound(loc, hitsound, 5, TRUE, -1) SKYRAT EDIT REMOVAL - IMPACT SOUNDS -======= - playsound(loc, hitsound, 5, TRUE, -1) else if(suppressed) playsound(loc, hitsound, 5, TRUE, -1) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + else if(suppressed) to_chat(living_target, span_userdanger("You're shot by \a [src][organ_hit_text]!")) else - /* SKYRAT EDIT REMOVAL - IMPACT SOUNDS if(hitsound) var/volume = vol_by_damage() playsound(src, hitsound, volume, TRUE, -1) -<<<<<<< HEAD - SKYRAT EDIT REMOVAL END */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + living_target.visible_message(span_danger("[living_target] is hit by \a [src][organ_hit_text]!"), \ span_userdanger("You're hit by \a [src][organ_hit_text]!"), null, COMBAT_MESSAGE_RANGE) if(living_target.is_blind()) @@ -512,14 +477,8 @@ store_hitscan_collision(point_cache) return TRUE -<<<<<<< HEAD - if(!HAS_TRAIT(src, TRAIT_ALWAYS_HIT_ZONE)) - var/distance = get_dist(T, starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations. - def_zone = ran_zone(def_zone, max(100-(7*distance), 5)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use. -======= var/distance = get_dist(T, starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations. def_zone = ran_zone(def_zone, clamp(accurate_range - (accuracy_falloff * distance), 5, 100)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return process_hit(T, select_target(T, A, A), A) // SELECT TARGET FIRST! @@ -636,22 +595,15 @@ if((target.pass_flags_self & pass_flags) && !direct_target) return FALSE if(HAS_TRAIT(target, TRAIT_UNHITTABLE_BY_PROJECTILES)) -<<<<<<< HEAD -======= if(!HAS_TRAIT(target, TRAIT_BLOCKING_PROJECTILES) && isliving(target)) var/mob/living/living_target = target living_target.block_projectile_effects() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(!ignore_source_check && firer) var/mob/M = firer if((target == firer) || ((target == firer.loc) && ismecha(firer.loc)) || (target in firer.buckled_mobs) || (istype(M) && (M.buckled == target))) return FALSE -<<<<<<< HEAD if(ignored_factions?.len && ismob(target) && (!direct_target || ignore_direct_target)) //SKYRAT EDIT: ignore_direct_target -======= - if(ignored_factions?.len && ismob(target) && !direct_target) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/mob/target_mob = target if(faction_check(target_mob.faction, ignored_factions)) return FALSE diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index c3bf0064ab8..0e50326f1b0 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -2,11 +2,7 @@ name = "laser" icon_state = "laser" pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE -<<<<<<< HEAD - damage = 25 -======= damage = 20 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 damage_type = BURN hitsound = 'sound/weapons/sear.ogg' hitsound_wall = 'sound/weapons/effects/searwall.ogg' diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index 77de46e53d7..2915e3e59bd 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -140,29 +140,6 @@ /obj/projectile/bullet/rebar/hydrogen name = "metallic hydrogen bolt" icon_state = "rebar_hydrogen" -<<<<<<< HEAD - damage = 40 - speed = 0.6 - dismemberment = 0 //goes through clean. - damage_type = BRUTE - armour_penetration = 30 //very pointy. - projectile_piercing = PASSMOB //felt this might have been a nice compromise for the lower damage for the difficulty of getting it - wound_bonus = -15 - bare_wound_bonus = 10 - embed_type = /datum/embed_data/rebar_hydrogen - embed_falloff_tile = -3 - shrapnel_type = /obj/item/ammo_casing/rebar/hydrogen - -/datum/embed_data/rebar_hydrogen - embed_chance = 50 - fall_chance = 2 - jostle_chance = 3 - ignore_throwspeed_threshold = TRUE - pain_stam_pct = 0.6 - pain_mult = 4 - jostle_pain_mult = 2 - rip_time =18 -======= damage = 55 speed = 0.6 projectile_piercing = PASSMOB|PASSVEHICLE @@ -195,7 +172,6 @@ . = ..() if(pierces >= 3) qdel(src) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/projectile/bullet/rebar/healium name = "healium bolt" diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm index 2ac1a93c78c..5543b11d115 100644 --- a/code/modules/projectiles/projectile/energy/stun.dm +++ b/code/modules/projectiles/projectile/energy/stun.dm @@ -2,10 +2,7 @@ name = "electrode" icon_state = "spark" color = COLOR_YELLOW -<<<<<<< HEAD stamina = 70 // SKYRAT EDIT CHANGE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 paralyze = 10 SECONDS stutter = 10 SECONDS jitter = 40 SECONDS @@ -22,10 +19,7 @@ do_sparks(1, TRUE, src) else if(iscarbon(target)) var/mob/living/carbon/C = target -<<<<<<< HEAD C.adjust_confusion_up_to(15 SECONDS, 30 SECONDS) // SKYRAT EDIT ADDITION - Electrode jitteriness -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 C.add_mood_event("tased", /datum/mood_event/tased) SEND_SIGNAL(C, COMSIG_LIVING_MINOR_SHOCK) if(HAS_TRAIT(C, TRAIT_HULK)) diff --git a/code/modules/projectiles/projectile/special/curse.dm b/code/modules/projectiles/projectile/special/curse.dm index 040e9f805f7..03b2e0feb53 100644 --- a/code/modules/projectiles/projectile/special/curse.dm +++ b/code/modules/projectiles/projectile/special/curse.dm @@ -72,7 +72,3 @@ speed = 1 range = 20 color = "#ff7e7e"//Tint it slightly -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/reagents/chem_splash.dm b/code/modules/reagents/chem_splash.dm index cbc9be1d401..af3c11ce210 100644 --- a/code/modules/reagents/chem_splash.dm +++ b/code/modules/reagents/chem_splash.dm @@ -112,11 +112,8 @@ var/distance = max(1, get_dist(thing, epicenter)) var/fraction = 0.5 / (2 ** distance) //50/25/12/6... for a 200u splash, 25/12/6/3... for a 100u, 12/6/3/1 for a 50u source.expose(thing, TOUCH, fraction) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Liquids if(isturf(epicenter)) var/turf/center_of_mess = epicenter center_of_mess.add_liquid_from_reagents(source) // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/reagents/chemistry/holder/mob_life.dm b/code/modules/reagents/chemistry/holder/mob_life.dm index 0a354a22790..0692d166d2c 100644 --- a/code/modules/reagents/chemistry/holder/mob_life.dm +++ b/code/modules/reagents/chemistry/holder/mob_life.dm @@ -57,7 +57,6 @@ if(!owner) owner = reagent.holder.my_atom -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION var/can_process = reagent_process_flags_valid(owner, reagent) //If the mob can't process it, remove the reagent at it's normal rate without doing any addictions, overdoses, or on_mob_life() for the reagent @@ -66,8 +65,6 @@ return //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(owner && reagent && (!dead || (reagent.chemical_flags & REAGENT_DEAD_PROCESS))) if(owner.reagent_check(reagent, seconds_per_tick, times_fired)) return diff --git a/code/modules/reagents/chemistry/holder/reactions.dm b/code/modules/reagents/chemistry/holder/reactions.dm index e4fad9b8c28..ebb3c0c10e9 100644 --- a/code/modules/reagents/chemistry/holder/reactions.dm +++ b/code/modules/reagents/chemistry/holder/reactions.dm @@ -213,7 +213,6 @@ var/reaction_message = equilibrium.reaction.mix_message if(equilibrium.reaction.mix_sound) playsound(get_turf(my_atom), equilibrium.reaction.mix_sound, 80, TRUE) -<<<<<<< HEAD //SKYRAT EDIT ADDITION //If the reaction pollutes, pollute it here if we have an atom if(equilibrium.reaction.pollutant_type && my_atom) @@ -221,8 +220,6 @@ if(my_turf) // reactions can happen in nullspace (like inside of a mob's stomach for instance). my_turf.pollute_turf(equilibrium.reaction.pollutant_type, equilibrium.reaction.pollutant_amount * equilibrium.reacted_vol) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 qdel(equilibrium) update_total() SEND_SIGNAL(src, COMSIG_REAGENTS_REACTED, .) @@ -351,7 +348,6 @@ extract.desc = "This extract has been used up." extract.grind_results.Cut() -<<<<<<< HEAD //SKYRAT EDIT ADDITION //If the reaction pollutes, pollute it here if we have an atom if(selected_reaction.pollutant_type && my_atom) @@ -360,7 +356,5 @@ my_turf.pollute_turf(selected_reaction.pollutant_type, selected_reaction.pollutant_amount * multiplier) //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //finish the reaction selected_reaction.on_reaction(src, null, multiplier) diff --git a/code/modules/reagents/chemistry/holder/ui_data.dm b/code/modules/reagents/chemistry/holder/ui_data.dm index 3b5f0ee0a14..244b264721f 100644 --- a/code/modules/reagents/chemistry/holder/ui_data.dm +++ b/code/modules/reagents/chemistry/holder/ui_data.dm @@ -297,11 +297,7 @@ var/datum/chemical_reaction/reaction = sub_reactions[ui_reaction_index] return reaction.type -<<<<<<< HEAD -/datum/reagents/ui_act(action, params) -======= /datum/reagents/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 579b6521b09..0d5fbeb18b6 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -34,7 +34,6 @@ var/obj/item/reagent_containers/beaker = null /// Dispensable_reagents is copypasted in plumbing synthesizers. Please update accordingly. (I didn't make it global because that would limit custom chem dispensers) var/list/dispensable_reagents = list() -<<<<<<< HEAD /// These become available once the manipulator has been upgraded to tier 2 (nano) // SKYRAT EDIT CHANGE - ORIGINAL: /// These become available once the manipulator has been upgraded to tier 4 (femto) var/list/upgrade_reagents = list() // SKYRAT EDIT ADDITION BEGIN @@ -43,10 +42,6 @@ /// These become available once the manipulator has been upgraded to tier 4 (femto) var/list/upgrade3_reagents = list() // SKYRAT EDIT ADDITION END -======= - /// These become available once the manipulator has been upgraded to tier 4 (femto) - var/list/upgrade_reagents = list() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// These become available once the machine has been emaged var/list/emagged_reagents = list() /// Starting purity of the created reagents @@ -55,15 +50,12 @@ var/list/recording_recipe /// Saves all the recipes recorded by the machine var/list/saved_recipes = list() -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN /// Used for custom transfer amounts var/list/transferAmounts = list() /// The custom transfer amount var/customTransferAmount // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The default list of dispensable_reagents var/static/list/default_dispensable_reagents = list( @@ -93,12 +85,9 @@ /datum/reagent/water, /datum/reagent/fuel, ) -<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - ORIGINAL /* -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The default list of reagents upgrade_reagents var/static/list/default_upgrade_reagents = list( /datum/reagent/acetone, @@ -116,7 +105,6 @@ /datum/reagent/drug/space_drugs, /datum/reagent/toxin ) -<<<<<<< HEAD */ var/static/list/default_upgrade_reagents = list( /datum/reagent/fuel/oil, @@ -151,19 +139,10 @@ if(dispensable_reagents) dispensable_reagents = sort_list(dispensable_reagents, GLOBAL_PROC_REF(cmp_reagents_asc)) -======= -/obj/machinery/chem_dispenser/Initialize(mapload) - if(dispensable_reagents != null && !dispensable_reagents.len) - dispensable_reagents = default_dispensable_reagents - if(dispensable_reagents) - dispensable_reagents = sort_list(dispensable_reagents, GLOBAL_PROC_REF(cmp_reagents_asc)) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(upgrade_reagents != null && !upgrade_reagents.len) upgrade_reagents = default_upgrade_reagents if(upgrade_reagents) upgrade_reagents = sort_list(upgrade_reagents, GLOBAL_PROC_REF(cmp_reagents_asc)) -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(upgrade2_reagents != null && !upgrade2_reagents.len) upgrade2_reagents = default_upgrade2_reagents @@ -174,8 +153,6 @@ if(upgrade3_reagents) upgrade3_reagents = sort_list(upgrade3_reagents, GLOBAL_PROC_REF(cmp_reagents_asc)) //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(emagged_reagents != null && !emagged_reagents.len) emagged_reagents = default_emagged_reagents @@ -443,7 +420,6 @@ if(is_operational) recording_recipe = null return TRUE -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CHEMISTRY QOL if("custom_amount") if(!beaker) @@ -455,8 +431,6 @@ transferAmounts += customTransferAmount return TRUE //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("reaction_lookup") if(beaker) @@ -489,15 +463,12 @@ /obj/machinery/chem_dispenser/item_interaction(mob/living/user, obj/item/tool, list/modifiers) if(is_reagent_container(tool) && !(tool.item_flags & ABSTRACT) && tool.is_open_container()) -<<<<<<< HEAD //SKYRAT EDIT ADDITION START - CHEMISTRY QOL var/obj/item/reagent_containers/container = tool if(customTransferAmount) transferAmounts -= customTransferAmount transferAmounts = container.possible_transfer_amounts //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!user.transferItemToLoc(tool, src)) return ITEM_INTERACT_BLOCKING replace_beaker(user, tool) @@ -543,15 +514,11 @@ recharge_amount *= capacitor.tier parts_rating += capacitor.tier for(var/datum/stock_part/servo/servo in component_parts) -<<<<<<< HEAD /* SKYRAT EDIT - ORIGINAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if (servo.tier > 3) dispensable_reagents |= upgrade_reagents else dispensable_reagents -= upgrade_reagents -<<<<<<< HEAD */ //SKYRAT EDIT START if (servo.tier > 1) @@ -569,8 +536,6 @@ else dispensable_reagents -= upgrade3_reagents //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 parts_rating += servo.tier power_cost = max(new_power_cost, 0.1 KILO WATTS) @@ -651,7 +616,6 @@ /datum/reagent/consumable/tonic, /datum/reagent/water, ) -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN var/static/list/drink_upgrade_reagents = list( /datum/reagent/consumable/applejuice, @@ -669,8 +633,6 @@ /datum/reagent/consumable/sol_dry ) //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 upgrade_reagents = null /// The default list of emagged reagents dispensable by the soda dispenser var/static/list/drink_emagged_reagents = list( @@ -686,7 +648,6 @@ dispensable_reagents = drinks_dispensable_reagents if(emagged_reagents != null && !emagged_reagents.len) emagged_reagents = drink_emagged_reagents -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(upgrade_reagents != null && !upgrade_reagents.len) upgrade_reagents = drink_upgrade_reagents @@ -701,8 +662,6 @@ if(upgrade3_reagents) upgrade3_reagents = sort_list(upgrade3_reagents, GLOBAL_PROC_REF(cmp_reagents_asc)) //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() AddComponent(/datum/component/simple_rotation) @@ -766,10 +725,7 @@ /datum/reagent/consumable/ethanol/rice_beer, /datum/reagent/consumable/ethanol/rum, /datum/reagent/consumable/ethanol/sake, -<<<<<<< HEAD /datum/reagent/consumable/ethanol/synthanol, // SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/consumable/ethanol/tequila, /datum/reagent/consumable/ethanol/triple_sec, /datum/reagent/consumable/ethanol/vermouth, @@ -779,11 +735,8 @@ /datum/reagent/consumable/ethanol/yuyake, ) upgrade_reagents = null -<<<<<<< HEAD upgrade2_reagents = null //SKYRAT EDIT upgrade3_reagents = null //SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// The default list of emagged reagents dispensable by the beer dispenser var/static/list/beer_emagged_reagents = list( /datum/reagent/consumable/ethanol, diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 1ffee0555eb..51adc8d68a5 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -128,15 +128,12 @@ if(!isnull(filling)) . += filling -<<<<<<< HEAD /obj/machinery/chem_master/wrench_act(mob/living/user, obj/item/tool) //SKYRAT ADDITION START if(default_unfasten_wrench(user, tool) == SUCCESSFUL_UNFASTEN) return ITEM_INTERACT_SUCCESS return ITEM_INTERACT_BLOCKING //SKYRAT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/chem_master/Exited(atom/movable/gone, direction) . = ..() if(gone == beaker) @@ -171,11 +168,8 @@ CAT_TUBES = GLOB.reagent_containers[CAT_TUBES], CAT_PILLS = GLOB.reagent_containers[CAT_PILLS], CAT_PATCHES = GLOB.reagent_containers[CAT_PATCHES], -<<<<<<< HEAD CAT_HYPOS = GLOB.reagent_containers[CAT_HYPOS], // SKYRAT EDIT CAT_DARTS = GLOB.reagent_containers[CAT_DARTS], // SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) return containers @@ -488,13 +482,10 @@ item_name_default = "[master_reagent.name] [item_name_default]" if(!(initial(selected_container.reagent_flags) & OPENCONTAINER)) // Closed containers get both reagent name and units in the name item_name_default = "[master_reagent.name] [item_name_default] ([volume_in_each]u)" -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Autonamed hyposprays/smartdarts if(ispath(selected_container, /obj/item/reagent_containers/cup/vial) || ispath(selected_container, /obj/item/reagent_containers/syringe/smartdart)) item_name_default = "[master_reagent.name] [item_name_default]" // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/item_name = tgui_input_text(usr, "Container name", "Name", diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index ba786c76a05..c9ad2424b2d 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -153,11 +153,7 @@ data["resistances"] = get_resistance_data(blood) return data -<<<<<<< HEAD -/obj/machinery/computer/pandemic/ui_act(action, params) -======= /obj/machinery/computer/pandemic/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index d009179bb34..f70ae995832 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -220,15 +220,11 @@ inverse_chem = /datum/reagent/inverse/hercuri inverse_chem_val = 0.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -<<<<<<< HEAD process_flags = REAGENT_ORGANIC | REAGENT_SYNTHETIC // SKYRAT EDIT ADDITION - Lets hercuri process in synths -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/medicine/c2/hercuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() var/need_mob_update -<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN -- Adds check for owner_flags; indented the getFireLoss check and everything under it, so synths can get cooled down var/owner_flags = affected_mob.dna.species.reagent_flags if (owner_flags & PROCESS_ORGANIC) @@ -237,12 +233,6 @@ else need_mob_update = affected_mob.adjustFireLoss(-1.25 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype) // SKYRAT EDIT CHANGE END -======= - if(affected_mob.getFireLoss() > 50) - need_mob_update = affected_mob.adjustFireLoss(-3 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype) - else - need_mob_update = affected_mob.adjustFireLoss(-2.25 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_bodytype = affected_bodytype) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 affected_mob.adjust_bodytemperature(rand(-25,-5) * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, 50) if(ishuman(affected_mob)) var/mob/living/carbon/human/humi = affected_mob @@ -545,14 +535,11 @@ if(HAS_TRAIT_FROM(exposed_mob, TRAIT_HUSK, BURN) && carbies.getFireLoss() < UNHUSK_DAMAGE_THRESHOLD && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/c2/synthflesh) + reac_volume >= SYNTHFLESH_UNHUSK_AMOUNT)) carbies.cure_husk(BURN) carbies.visible_message("A rubbery liquid coats [carbies]'s burns. [carbies] looks a lot healthier!") //we're avoiding using the phrases "burnt flesh" and "burnt skin" here because carbies could be a skeleton or a golem or something -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - non-modular changeling balancing if(HAS_TRAIT_FROM(exposed_mob, TRAIT_HUSK, CHANGELING_DRAIN) && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/c2/synthflesh) + reac_volume >= SYNTHFLESH_LING_UNHUSK_AMOUNT))//Costs a little more than a normal husk carbies.cure_husk(CHANGELING_DRAIN) carbies.visible_message("A rubbery liquid coats [carbies]'s tissues. [carbies] looks a lot healthier!") // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /******ORGAN HEALING******/ /*Suffix: -rite*/ @@ -596,10 +583,7 @@ /datum/reagent/medicine/c2/penthrite/on_mob_life(mob/living/carbon/human/affected_mob, seconds_per_tick, times_fired) . = ..() var/need_mob_update -<<<<<<< HEAD need_mob_update = affected_mob.adjustStaminaLoss(-12.5 * REM * seconds_per_tick, updating_stamina = FALSE) //SKYRAT EDIT ADDITION - COMBAT - makes your heart beat faster, fills you with energy. For miners -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_STOMACH, 0.25 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) if(affected_mob.health <= HEALTH_THRESHOLD_CRIT && affected_mob.health > (affected_mob.crit_threshold + HEALTH_THRESHOLD_FULLCRIT * (2 * normalise_creation_purity()))) //we cannot save someone below our lowered crit threshold. diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm index 73af6360841..2c7e8cfe517 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm @@ -57,11 +57,7 @@ if(HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE)) // we're an accomplished drinker booze_power *= 0.7 if(HAS_TRAIT(drinker, TRAIT_LIGHT_DRINKER)) -<<<<<<< HEAD booze_power *= 1.33 // SKYRAT EDIT CHANGE - ALCOHOL_PROCESSING - ORIGINAL: booze_power *= 2 -======= - booze_power *= 2 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // water will dilute alcohol effects var/total_water_volume = 0 @@ -77,20 +73,12 @@ booze_power *= (total_alcohol_volume / combined_dilute_volume) // Volume, power, and server alcohol rate effect how quickly one gets drunk -<<<<<<< HEAD drinker.adjust_drunk_effect(booze_power * ALCOHOL_RATE * REM * seconds_per_tick) // SKYRAT EDIT CHANGE - ALCOHOL_PROCESSING - ORIGINAL: (sqrt(volume) * booze_power * ALCOHOL_RATE * REM * seconds_per_tick) -======= - drinker.adjust_drunk_effect(sqrt(volume) * booze_power * ALCOHOL_RATE * REM * seconds_per_tick) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(boozepwr > 0) var/obj/item/organ/internal/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) var/heavy_drinker_multiplier = (HAS_TRAIT(drinker, TRAIT_HEAVY_DRINKER) ? 0.5 : 1) if (istype(liver)) -<<<<<<< HEAD if(liver.apply_organ_damage(((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * liver.alcohol_tolerance * heavy_drinker_multiplier * seconds_per_tick, 0))/300))) // SKYRAT EDIT CHANGE - ALCOHOL_PROCESSING - ORIGINAL: if((((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * liver.alcohol_tolerance * heavy_drinker_multiplier * seconds_per_tick, 0))/150))) -======= - if(liver.apply_organ_damage(((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * liver.alcohol_tolerance * heavy_drinker_multiplier * seconds_per_tick, 0))/150))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return UPDATE_MOB_HEALTH /datum/reagent/consumable/ethanol/expose_obj(obj/exposed_obj, reac_volume) @@ -502,10 +490,6 @@ quality = DRINK_NICE taste_description = "burning cinnamon" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // This drink is really popular with a certain demographic. var/teenage_girl_quality = DRINK_VERYGOOD @@ -530,10 +514,6 @@ atom.reagents.add_reagent(/datum/reagent/gold, convert_amount) return ..() -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/consumable/ethanol/patron name = "Patron" description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." @@ -717,11 +697,7 @@ /datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) . = ..() if(drinker.blood_volume < BLOOD_VOLUME_NORMAL) -<<<<<<< HEAD drinker.blood_volume = min(drinker.blood_volume + (1 * REM * seconds_per_tick), BLOOD_VOLUME_NORMAL) //Bloody Mary quickly restores blood loss. // SKYRAT EDIT - Bloodshot is now the go-to drink for bloodloss, not Bloody Mary - ORIGINAL: drinker.blood_volume = min(drinker.blood_volume + (3 * REM * delta_time), BLOOD_VOLUME_NORMAL) -======= - drinker.blood_volume = min(drinker.blood_volume + (3 * REM * seconds_per_tick), BLOOD_VOLUME_NORMAL) //Bloody Mary quickly restores blood loss. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/consumable/ethanol/brave_bull name = "Brave Bull" @@ -2682,11 +2658,7 @@ var/mob/living/carbon/exposed_carbon = exposed_mob var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH) if(istype(stomach)) -<<<<<<< HEAD - stomach.adjust_charge(reac_volume * 0.003 * STANDARD_CELL_CHARGE) -======= stomach.adjust_charge(reac_volume * 0.003 * ETHEREAL_CHARGE_NORMAL) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/consumable/ethanol/telepole name = "Telepole" @@ -2706,11 +2678,7 @@ var/mob/living/carbon/exposed_carbon = exposed_mob var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH) if(istype(stomach)) -<<<<<<< HEAD - stomach.adjust_charge(reac_volume * 0.002 * STANDARD_CELL_CHARGE) -======= stomach.adjust_charge(reac_volume * 0.002 * ETHEREAL_CHARGE_NORMAL) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/consumable/ethanol/pod_tesla name = "Pod Tesla" @@ -2737,11 +2705,7 @@ var/mob/living/carbon/exposed_carbon = exposed_mob var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH) if(istype(stomach)) -<<<<<<< HEAD - stomach.adjust_charge(reac_volume * 0.005 * STANDARD_CELL_CHARGE) -======= stomach.adjust_charge(reac_volume * 0.005 * ETHEREAL_CHARGE_NORMAL) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Welcome to the Blue Room Bar and Grill, home to Mars' finest cocktails /datum/reagent/consumable/ethanol/rice_beer diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm index 2ef9a3725f7..f0cb3c2ea94 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm @@ -55,11 +55,8 @@ affected_mob.adjust_temp_blindness(-2 SECONDS * REM * seconds_per_tick) var/need_mob_update switch(current_cycle) -<<<<<<< HEAD if(1 to 20) //nothing -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(21 to 110) if(SPT_PROB(100 * (1 - (sqrt(110 - current_cycle) / 10)), seconds_per_tick)) need_mob_update = affected_mob.adjustOrganLoss(ORGAN_SLOT_EYES, -2 * REM * seconds_per_tick) @@ -1296,8 +1293,4 @@ var/mob/living/carbon/exposed_carbon = exposed_mob var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH) if(istype(stomach)) -<<<<<<< HEAD - stomach.adjust_charge(reac_volume * 0.003 * STANDARD_CELL_CHARGE) -======= stomach.adjust_charge(reac_volume * 0.003 * ETHEREAL_CHARGE_NORMAL) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index b428c500bbe..c6cee8e91c0 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -73,11 +73,7 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM ph = 8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -<<<<<<< HEAD - addiction_types = list(/datum/addiction/nicotine = 18) // 7.2 per 2 seconds -======= addiction_types = list(/datum/addiction/nicotine = 15) // 6 per 2 seconds ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Nicotine is used as a pesticide IRL. /datum/reagent/drug/nicotine/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index fa3d0551671..ce9811aaee8 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -53,13 +53,10 @@ var/obj/item/the_real_food = holder.my_atom if(isitem(the_real_food) && !is_reagent_container(the_real_food)) exposed_mob.add_mob_memory(/datum/memory/good_food, food = the_real_food) -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - Racial Drinks if (RACE_DRINK) exposed_mob.add_mood_event("quality_drink", /datum/mood_event/race_drink) // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Gets just how much nutrition this reagent is worth for the passed mob /datum/reagent/consumable/proc/get_nutriment_factor(mob/living/carbon/eater) @@ -956,11 +953,7 @@ var/mob/living/carbon/exposed_carbon = exposed_mob var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH) if(istype(stomach)) -<<<<<<< HEAD - stomach.adjust_charge(reac_volume * 0.03 * STANDARD_CELL_CHARGE) -======= stomach.adjust_charge(reac_volume * 0.03 * ETHEREAL_CHARGE_NORMAL) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/consumable/liquidelectricity/enriched/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm index 727b092f1f0..60af57de6e4 100644 --- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm @@ -230,11 +230,7 @@ Basically, we fill the time between now and 2s from now with hands based off the //Just the removed itching mechanism - omage to its origins. /datum/reagent/inverse/ichiyuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() -<<<<<<< HEAD - if(prob(resetting_probability) && !(HAS_TRAIT(affected_mob, TRAIT_RESTRAINED) || affected_mob.incapacitated())) -======= if(prob(resetting_probability) && !(HAS_TRAIT(affected_mob, TRAIT_RESTRAINED) || affected_mob.incapacitated)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = TRUE if(spammer < world.time) to_chat(affected_mob,span_warning("You can't help but itch yourself.")) @@ -664,10 +660,7 @@ Basically, we fill the time between now and 2s from now with hands based off the /datum/brain_trauma/hypnosis, // Hypnosis, same reason as obsessed, plus a bug makes it remain even after the neurowhine purges and then turn into "nothing" on the med reading upon a second application /datum/brain_trauma/special/honorbound, // Designed to be chaplain exclusive ) -<<<<<<< HEAD forbiddentraumas += typesof(/datum/brain_trauma/very_special) // SKYRAT EDIT ADDITION - No very special (lewd) quirks gained by inverse neurine -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 traumalist -= forbiddentraumas var/obj/item/organ/internal/brain/brain = affected_mob.get_organ_slot(ORGAN_SLOT_BRAIN) traumalist = shuffle(traumalist) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 4ead1ea509e..ac174d4d10a 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1349,12 +1349,9 @@ if (affected_mob.get_timed_status_effect_duration(/datum/status_effect/hallucination) >= 10 SECONDS) affected_mob.adjust_hallucinations(-10 SECONDS * REM * seconds_per_tick) -<<<<<<< HEAD -======= if(affected_mob.getStaminaLoss() >= 100) affected_mob.reagents.remove_reagent(type, 2 * REM * seconds_per_tick) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/need_mob_update = FALSE if(SPT_PROB(10, seconds_per_tick)) need_mob_update += affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 50, affected_organ_flags) @@ -1700,7 +1697,6 @@ if(!affected_mob.blood_volume) return -<<<<<<< HEAD // SKYRAT EDIT CHANGE BEGIN -- Adds check for owner_flags var/owner_flags if (iscarbon(affected_mob)) @@ -1709,8 +1705,6 @@ if (!isnull(owner_flags) && !(owner_flags & PROCESS_ORGANIC)) return // SKYRAT EDIT CHANGE END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(SPT_PROB(7.5, seconds_per_tick)) affected_mob.losebreath += rand(2, 4) affected_mob.adjustOxyLoss(rand(1, 3), updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 5a8ef017a1e..63013d89e09 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1,9 +1,5 @@ /datum/reagent/blood -<<<<<<< HEAD data = list("viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null,"quirks"=null, "monkey_origins" = FALSE) // SKYRAT EDIT - Rebalancing blood for Hemophages - ORIGINAL: data = list("viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null,"quirks"=null) -======= - data = list("viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null,"quirks"=null) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Blood" color = "#C80000" // rgb: 200, 0, 0 metabolization_rate = 12.5 * REAGENTS_METABOLISM //fast rate so it disappears fast. @@ -68,7 +64,6 @@ if(!data || !(data["blood_type"] in get_safe_blood(exposed_carbon.dna.blood_type))) exposed_carbon.reagents.add_reagent(/datum/reagent/toxin, reac_volume * 0.5) else -<<<<<<< HEAD /* SKYRAT EDIT - Rebalancing blood for Hemophages - ORIGINAL: exposed_carbon.blood_volume = min(exposed_carbon.blood_volume + round(reac_volume, 0.1), BLOOD_VOLUME_MAXIMUM) */ // ORIGINAL END - SKYRAT EDIT: @@ -77,9 +72,6 @@ exposed_carbon.blood_volume = min(exposed_carbon.blood_volume + round(reac_volume, 0.1), max_blood_volume) // SKYRAT EDIT END -======= - exposed_carbon.blood_volume = min(exposed_carbon.blood_volume + round(reac_volume, 0.1), BLOOD_VOLUME_MAXIMUM) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 exposed_carbon.reagents.remove_reagent(type, reac_volume) // Because we don't want blood to just lie around in the patient's blood, makes no sense. @@ -215,21 +207,7 @@ var/cooling_temperature = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_CLEANS default_container = /obj/item/reagent_containers/cup/glass/waterbottle -<<<<<<< HEAD evaporates = TRUE //SKYRAT EDIT ADDITION - -/datum/glass_style/shot_glass/water - required_drink_type = /datum/reagent/water - icon_state = "shotglassclear" - -/datum/glass_style/drinking_glass/water - required_drink_type = /datum/reagent/water - name = "glass of water" - desc = "The father of all refreshments." - icon_state = "glass_clear" -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - /datum/glass_style/shot_glass/water required_drink_type = /datum/reagent/water icon_state = "shotglassclear" @@ -306,11 +284,7 @@ if(methods & VAPOR) exposed_mob.adjust_wet_stacks(reac_volume * WATER_TO_WET_STACKS_FACTOR_VAPOR) // Spraying someone with water with the hope to put them out is just simply too funny to me not to add it. -<<<<<<< HEAD if(!isfeline(exposed_mob)) // SKYRAT EDIT - Feline trait :) - ORIGINAL: if(!isfelinid(exposed_mob)) -======= - if(!isfelinid(exposed_mob)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return exposed_mob.incapacitate(1) // startles the felinid, canceling any do_after @@ -752,12 +726,8 @@ if(current_cycle >= CYCLES_TO_TURN) var/datum/species/species_type = race -<<<<<<< HEAD //affected_mob.set_species(species_type) //ORIGINAL affected_mob.set_species(species_type, TRUE, FALSE, null, null, null, null, TRUE) //SKYRAT EDIT CHANGE - CUSTOMIZATION -======= - affected_mob.set_species(species_type) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 holder.del_reagent(type) to_chat(affected_mob, span_warning("You've become \a [LOWER_TEXT(initial(species_type.name))]!")) return @@ -820,22 +790,14 @@ if(isjellyperson(affected_mob)) to_chat(affected_mob, span_warning("Your jelly shifts and morphs, turning you into another subspecies!")) var/species_type = pick(subtypesof(/datum/species/jelly)) -<<<<<<< HEAD //affected_mob.set_species(species_type) //ORIGINAL affected_mob.set_species(species_type, TRUE, FALSE, null, null, null, null, TRUE, TRUE) //SKYRAT EDIT CHANGE - CUSTOMIZATION -======= - affected_mob.set_species(species_type) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 holder.del_reagent(type) return UPDATE_MOB_HEALTH if(current_cycle >= CYCLES_TO_TURN) //overwrite since we want subtypes of jelly var/datum/species/species_type = pick(subtypesof(race)) -<<<<<<< HEAD //affected_mob.set_species(species_type) //ORIGINAL affected_mob.set_species(species_type, TRUE, FALSE, null, null, null, null, TRUE, TRUE) //SKYRAT EDIT CHANGE - CUSTOMIZATION -======= - affected_mob.set_species(species_type) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 holder.del_reagent(type) to_chat(affected_mob, span_warning("You've become \a [initial(species_type.name)]!")) return UPDATE_MOB_HEALTH @@ -2581,11 +2543,7 @@ if(target.mind) var/datum/antagonist/changeling/changeling = IS_CHANGELING(target) if(changeling) -<<<<<<< HEAD changeling.adjust_chemicals(-4 * REM * seconds_per_tick) //SKYRAT EDIT - BZ-BUFF-VS-LING - ORIGINAL: changeling.adjust_chemicals(-2 * REM * seconds_per_tick) -======= - changeling.adjust_chemicals(-2 * REM * seconds_per_tick) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/reagent/pax/peaceborg name = "Synthpax" diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm index 456ea2e1357..b61a4d4d67c 100644 --- a/code/modules/reagents/chemistry/recipes.dm +++ b/code/modules/reagents/chemistry/recipes.dm @@ -59,15 +59,12 @@ ///Tagging vars ///A bitflag var for tagging reagents for the reagent loopup functon var/reaction_tags = NONE -<<<<<<< HEAD //SKYRAT EDIT ADDITION ///If defined, it'll emitt that pollutant on reaction var/pollutant_type ///How much amount per volume of the pollutant shall we emitt if `pollutant_type` is defined var/pollutant_amount = 1 //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///REACTION PROCS diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm index 0548c378bbd..03b586223ef 100644 --- a/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/code/modules/reagents/chemistry/recipes/medicine.dm @@ -9,14 +9,11 @@ rate_up_lim = 35 reaction_tags = REACTION_TAG_HEALING | REACTION_TAG_EASY -<<<<<<< HEAD //SKYRAT EDIT ADDITION pollutant_type = /datum/pollutant/chemical_vapors pollutant_amount = 0.2 //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/chemical_reaction/medicine/leporazine results = list(/datum/reagent/medicine/leporazine = 2) required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/copper = 1) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 879dbd132c2..e7876c1ce56 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -41,7 +41,7 @@ required_other = TRUE /datum/chemical_reaction/sodiumchloride/pre_reaction_other_checks(datum/reagents/holder) - . = ..() + . = ..() if(holder.has_reagent(/datum/reagent/consumable/liquidelectricity) || holder.has_reagent(/datum/reagent/consumable/liquidelectricity/enriched)) return FALSE @@ -779,11 +779,7 @@ /datum/chemical_reaction/pentaerythritol results = list(/datum/reagent/pentaerythritol = 2) -<<<<<<< HEAD - required_reagents = list(/datum/reagent/acetaldehyde = 1, /datum/reagent/toxin/formaldehyde = 3, /datum/reagent/water = 1 ) -======= required_reagents = list(/datum/reagent/acetaldehyde = 1, /datum/reagent/toxin/formaldehyde = 3, /datum/reagent/lye = 1) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 reaction_tags = REACTION_TAG_EASY | REACTION_TAG_CHEMICAL /datum/chemical_reaction/acetaldehyde @@ -969,11 +965,7 @@ optimal_ph_min = 3 optimal_ph_max = 12 required_temp = 50 -<<<<<<< HEAD reaction_flags = REAGENT_SPLITRETAINVOL //SKYRAT EDIT CHANGE - ORIGINAL: reaction_flags = REACTION_INSTANT | REAGENT_SPLITRETAINVOL -======= - reaction_flags = REACTION_INSTANT | REAGENT_SPLITRETAINVOL ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 reaction_tags = REACTION_TAG_EASY | REACTION_TAG_UNIQUE /datum/chemical_reaction/ant_slurry // We're basically gluing ants together with synthflesh & maint sludge to make a bigger ant. diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 01f39175c1a..f6cafb535d8 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -118,18 +118,9 @@ balloon_alert(user, "transferring [amount_per_transfer_from_this]u") mode_change_message(user) -<<<<<<< HEAD -/obj/item/reagent_containers/attack(mob/M, mob/living/user, def_zone) - if(user.combat_mode) - return ..() /obj/item/reagent_containers/pre_attack_secondary(atom/target, mob/living/user, params) if(HAS_TRAIT(target, TRAIT_DO_NOT_SPLASH)) return ..() -======= -/obj/item/reagent_containers/pre_attack_secondary(atom/target, mob/living/user, params) - if(HAS_TRAIT(target, TRAIT_DO_NOT_SPLASH)) - return ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!user.combat_mode) return ..() if (try_splash(user, target)) @@ -246,17 +237,13 @@ log_combat(thrown_by, M, "splashed", R) reagents.expose(target, TOUCH, splash_multiplier) reagents.expose(target_turf, TOUCH, (1 - splash_multiplier)) // 1 - splash_multiplier because it's what didn't hit the target -<<<<<<< HEAD target_turf.add_liquid_from_reagents(reagents, reagent_multiplier = (1 - splash_multiplier)) // SKYRAT EDIT ADDITION - liquid spills (molotov buff) (huge) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(bartender_check(target) && thrown) visible_message(span_notice("[src] lands onto the [target.name] without spilling a single drop.")) return else -<<<<<<< HEAD //SKYRAT EDIT CHANGE START - liquid spills on non-mobs if(target.can_liquid_spill_on_hit()) target.add_liquid_from_reagents(reagents, thrown_from = src, thrown_to = target) @@ -268,15 +255,6 @@ reagents.expose(target, TOUCH) //SKYRAT EDIT END visible_message("[src] spills its contents all over [target].") - //reagents.expose(target, TOUCH) //SKYRAT EDIT REMOVAL -======= - if(isturf(target) && reagents.reagent_list.len && thrown_by) - log_combat(thrown_by, target, "splashed (thrown) [english_list(reagents.reagent_list)]", "in [AREACOORD(target)]") - thrown_by.log_message("splashed (thrown) [english_list(reagents.reagent_list)] on [target].", LOG_ATTACK) - message_admins("[ADMIN_LOOKUPFLW(thrown_by)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] in [ADMIN_VERBOSEJMP(target)].") - visible_message(span_notice("[src] spills its contents all over [target].")) - reagents.expose(target, TOUCH) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(src)) return diff --git a/code/modules/reagents/reagent_containers/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm index 44e491bce73..4172b48b46e 100644 --- a/code/modules/reagents/reagent_containers/condiment.dm +++ b/code/modules/reagents/reagent_containers/condiment.dm @@ -62,11 +62,8 @@ M.visible_message(span_warning("[user] fed [M] from [src]."), \ span_warning("[user] fed you from [src].")) log_combat(user, M, "fed", reagents.get_reagent_log_string()) -<<<<<<< HEAD SEND_SIGNAL(M, COMSIG_GLASS_DRANK, src, user) // SKYRAT EDIT ADDITION - Hemophages can't casually drink what's not going to regenerate their blood -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 reagents.trans_to(M, 10, transferred_by = user, methods = INGEST) playsound(M.loc,'sound/items/drink.ogg', rand(10,50), TRUE) return TRUE diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm index b89e484322b..c0610f4513b 100644 --- a/code/modules/reagents/reagent_containers/cups/_cup.dm +++ b/code/modules/reagents/reagent_containers/cups/_cup.dm @@ -84,10 +84,7 @@ to_chat(user, span_notice("You swallow a gulp of [src].")) SEND_SIGNAL(src, COMSIG_GLASS_DRANK, target_mob, user) -<<<<<<< HEAD SEND_SIGNAL(target_mob, COMSIG_GLASS_DRANK, src, user) // SKYRAT EDIT ADDITION - Hemophages can't casually drink what's not going to regenerate their blood -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/fraction = min(gulp_size/reagents.total_volume, 1) reagents.trans_to(target_mob, gulp_size, transferred_by = user, methods = INGEST) checkLiked(fraction, target_mob) @@ -165,11 +162,7 @@ to_chat(user, span_notice("You fill [src] with [trans] unit\s of the contents of [target].")) target.update_appearance() -<<<<<<< HEAD - return ITEM_INTERACT_SUCCESS -======= return NONE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/attackby(obj/item/attacking_item, mob/user, params) var/hotness = attacking_item.get_temperature() @@ -227,11 +220,7 @@ /obj/item/reagent_containers/cup/beaker name = "beaker" -<<<<<<< HEAD desc = "A beaker. It can hold up to 60 units." //SKYRAT EDIT: Used to say can hold up to 50 units. -======= - desc = "A beaker. It can hold up to 50 units." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/obj/medical/chemical.dmi' icon_state = "beaker" inhand_icon_state = "beaker" @@ -242,12 +231,9 @@ fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100) pickup_sound = 'sound/items/handling/beaker_pickup.ogg' drop_sound = 'sound/items/handling/beaker_place.ogg' -<<<<<<< HEAD volume = 60 //SKYRAT EDIT: Addition possible_transfer_amounts = list(5,10,15,20,30,60) //SKYRAT EDIT: Addition -======= sound_vary = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/beaker/Initialize(mapload) . = ..() @@ -264,7 +250,6 @@ /obj/item/reagent_containers/cup/beaker/large name = "large beaker" -<<<<<<< HEAD desc = "A large beaker. Can hold up to 120 units." //SKYRAT EDIT: Used to say Can hold up to 100 units. icon_state = "beakerlarge" custom_materials = list(/datum/material/glass= SHEET_MATERIAL_AMOUNT*1.25) @@ -272,19 +257,10 @@ amount_per_transfer_from_this = 10 //possible_transfer_amounts = list(5,10,15,20,25,30,50,100) //SKYRAT EDIT: Original Values possible_transfer_amounts = list(5,10,15,20,30,40,60,120) //SKYRAT EDIT: New Values -======= - desc = "A large beaker. Can hold up to 100 units." - icon_state = "beakerlarge" - custom_materials = list(/datum/material/glass= SHEET_MATERIAL_AMOUNT*1.25) - volume = 100 - amount_per_transfer_from_this = 10 - possible_transfer_amounts = list(5,10,15,20,25,30,50,100) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100) /obj/item/reagent_containers/cup/beaker/plastic name = "x-large beaker" -<<<<<<< HEAD desc = "An extra-large beaker. Can hold up to 150 units." //SKYRAT EDIT: Used to say Can hold up to 120 units icon_state = "beakerwhite" custom_materials = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plastic=SHEET_MATERIAL_AMOUNT * 1.5) @@ -292,14 +268,6 @@ amount_per_transfer_from_this = 10 //possible_transfer_amounts = list(5,10,15,20,25,30,60,120) //SKYRAT EDIT: Original values possible_transfer_amounts = list(5,10,15,20,25,30,50,75,150) //SKYRAT EDIT: New Values -======= - desc = "An extra-large beaker. Can hold up to 120 units." - icon_state = "beakerwhite" - custom_materials = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plastic=SHEET_MATERIAL_AMOUNT * 1.5) - volume = 120 - amount_per_transfer_from_this = 10 - possible_transfer_amounts = list(5,10,15,20,25,30,60,120) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fill_icon_thresholds = list(0, 1, 10, 20, 40, 60, 80, 100) /obj/item/reagent_containers/cup/beaker/meta @@ -384,11 +352,7 @@ /obj/item/reagent_containers/cup/bucket name = "bucket" -<<<<<<< HEAD desc = "It's a bucket. You can squeeze a mop's contents into it by using right-click." //SKYRAT EDIT CHANGE - ORIGINAL: desc = "It's a bucket." -======= - desc = "It's a bucket." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 icon = 'icons/obj/service/janitor.dmi' worn_icon = 'icons/mob/clothing/head/utility.dmi' icon_state = "bucket" @@ -400,13 +364,8 @@ custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 2) w_class = WEIGHT_CLASS_NORMAL amount_per_transfer_from_this = 20 -<<<<<<< HEAD possible_transfer_amounts = list(5,10,15,20,25,30,50,100) //SKYRAT EDIT CHANGE volume = 100 //SKYRAT EDIT CHANGE -======= - possible_transfer_amounts = list(5,10,15,20,25,30,50,70) - volume = 70 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 flags_inv = HIDEHAIR slot_flags = ITEM_SLOT_HEAD resistance_flags = NONE @@ -439,11 +398,8 @@ melee = 10 acid = 50 -<<<<<<< HEAD // SKYRAT EDIT CHANGE START - LIQUIDS /* Original -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/bucket/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/mop)) if(reagents.total_volume < 1) @@ -453,7 +409,6 @@ user.balloon_alert(user, "doused [O]") playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE) return -<<<<<<< HEAD */ /obj/item/reagent_containers/cup/bucket/attackby(obj/mop, mob/living/user, params) if(istype(mop, /obj/item/mop)) @@ -483,16 +438,6 @@ user.put_in_hands(new_cleanbot_ass) return // SKYRAT EDIT CHANGE END - LIQUIDS -======= - else if(isprox(O)) //This works with wooden buckets for now. Somewhat unintended, but maybe someone will add sprites for it soon(TM) - to_chat(user, span_notice("You add [O] to [src].")) - qdel(O) - var/obj/item/bot_assembly/cleanbot/new_cleanbot_ass = new(null, src) - user.put_in_hands(new_cleanbot_ass) - return - - return ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/bucket/equipped(mob/user, slot) . = ..() diff --git a/code/modules/reagents/reagent_containers/cups/drinkingglass.dm b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm index 33f06000a48..fa3a53434bb 100644 --- a/code/modules/reagents/reagent_containers/cups/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm @@ -14,10 +14,7 @@ obj_flags = UNIQUE_RENAME drop_sound = 'sound/items/handling/drinkglass_drop.ogg' pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg' -<<<<<<< HEAD -======= sound_vary = TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 custom_price = PAYCHECK_LOWER //the screwdriver cocktail can make a drinking glass into the world's worst screwdriver. beautiful. toolspeed = 25 diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm index 986c6de3c5e..a214ea47eb1 100644 --- a/code/modules/reagents/reagent_containers/cups/glassbottle.dm +++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm @@ -39,18 +39,13 @@ var/bottle_knockdown_duration = BOTTLE_KNOCKDOWN_DEFAULT_DURATION tool_behaviour = TOOL_ROLLINGPIN // Used to knock out the Chef. toolspeed = 1.3 //it's a little awkward to use, but it's a cylinder alright. -<<<<<<< HEAD -======= /// A contained piece of paper, a photo, or space cash, that we can use as a message or gift to future spessmen. var/obj/item/message_in_a_bottle ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/Initialize(mapload, vol) . = ..() var/static/list/recipes = list(/datum/crafting_recipe/molotov) AddElement(/datum/element/slapcrafting, recipes) -<<<<<<< HEAD -======= register_context() register_item_context() @@ -131,7 +126,6 @@ return "photo_in_bottle" if(istype(message_in_a_bottle, /obj/item/stack/spacecash)) return "cash_in_bottle" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/small name = "small glass bottle" @@ -144,16 +138,6 @@ if(bartender_check(target) && ranged) return SplashReagents(target, ranged, override_spillable = TRUE) -<<<<<<< HEAD - var/obj/item/broken_bottle/B = new(drop_location()) - if(!ranged && thrower) - thrower.put_in_hands(B) - B.mimic_broken(src, target, break_top) - B.inhand_icon_state = broken_inhand_icon_state - - qdel(src) - target.Bumped(B) -======= var/obj/item/broken_bottle/broken = new(drop_location()) if(!ranged && thrower) thrower.put_in_hands(broken) @@ -164,7 +148,6 @@ qdel(src) target.Bumped(broken) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/try_splash(mob/living/user, atom/target) @@ -440,12 +423,9 @@ list_reagents = list(/datum/reagent/water/holywater = 100) drink_type = NONE -<<<<<<< HEAD -======= /obj/item/reagent_containers/cup/glass/bottle/holywater/add_message_overlay() return //looks too weird... ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/holywater/hell desc = "A flask of holy water...it's been sitting in the Necropolis a while though." icon_state = "unholyflask" @@ -608,10 +588,6 @@ list_reagents = list(/datum/reagent/consumable/ethanol/sake = 100) /obj/item/reagent_containers/cup/glass/bottle/sake/Initialize(mapload) -<<<<<<< HEAD - . = ..() -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(prob(10)) name = "Fluffy Tail Sake" desc += " On the bottle is a picture of a kitsune with nine touchable tails." @@ -620,15 +596,12 @@ name = "Inubashiri's Home Brew" desc += " Awoo." icon_state = "sakebottle_i" -<<<<<<< HEAD -======= return ..() /obj/item/reagent_containers/cup/glass/bottle/sake/add_message_overlay() if(icon_state == "sakebottle_k") //doesn't fit the sprite return return ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/fernet name = "Fernet Bronca" @@ -649,12 +622,9 @@ icon_state = "curacao_bottle" list_reagents = list(/datum/reagent/consumable/ethanol/curacao = 100) -<<<<<<< HEAD -======= /obj/item/reagent_containers/cup/glass/bottle/curacao/add_message_overlay() return //doesn't fit the sprite ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/navy_rum name = "Pride of the Union Navy-Strength Rum" desc = "Ironically named, given it's made in Bermuda." @@ -699,12 +669,9 @@ ///Whether this bottle was a victim of a successful sabrage attempt var/sabraged = FALSE -<<<<<<< HEAD -======= /obj/item/reagent_containers/cup/glass/bottle/champagne/add_message_overlay() return //doesn't stylistically fit the sprite ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/champagne/cursed sabrage_success_percentile = 0 //force of the sharp item used to sabrage will not increase success chance @@ -864,24 +831,18 @@ icon_state = "hoochbottle" list_reagents = list(/datum/reagent/consumable/ethanol/hooch = 100) -<<<<<<< HEAD -======= /obj/item/reagent_containers/cup/glass/bottle/hooch/add_message_overlay() return //doesn't fit the sprite ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/moonshine name = "moonshine jug" desc = "It is said that the ancient Applalacians used these stoneware jugs to capture lightning in a bottle." icon_state = "moonshinebottle" list_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 100) -<<<<<<< HEAD -======= /obj/item/reagent_containers/cup/glass/bottle/moonshine/add_message_overlay() return //doesn't fit the sprite ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/mushi_kombucha name = "Solzara Brewing Company Mushi Kombucha" desc = "Best drunk over ice to savour the mushroomy flavour." @@ -933,17 +894,6 @@ ) /obj/item/reagent_containers/cup/glass/bottle/molotov/CheckParts(list/parts_list) -<<<<<<< HEAD - ..() - var/obj/item/reagent_containers/cup/glass/bottle/B = locate() in contents - if(B) - icon_state = B.icon_state - B.reagents.copy_to(src, 100) - if(istype(B, /obj/item/reagent_containers/cup/glass/bottle/juice)) - desc += " You're not sure if making this out of a carton was the brightest idea." - isGlass = FALSE - return -======= . = ..() var/obj/item/reagent_containers/cup/glass/bottle/bottle = locate() in contents if(!bottle) @@ -953,7 +903,6 @@ if(istype(bottle, /obj/item/reagent_containers/cup/glass/bottle/juice)) desc += " You're not sure if making this out of a carton was the brightest idea." isGlass = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/cup/glass/bottle/molotov/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum, do_splash = FALSE) ..(hit_atom, throwingdatum, do_splash = FALSE) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index bdf8f0ace2a..4b6ee9c8c78 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -397,10 +397,7 @@ current_range = 2 spray_range = 2 spray_sound = 'sound/effects/snap.ogg' -<<<<<<< HEAD -======= possible_transfer_amounts = list(5) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/reagent_containers/spray/chemsprayer/party/spray(atom/A, mob/user) . = ..() diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index cc31dcee92c..e2cc9257e31 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -79,14 +79,7 @@ . = ..() if(. && atom_integrity > 0) if(tank_volume && (damage_flag == BULLET || damage_flag == LASER)) -<<<<<<< HEAD - //SKYRAT EDIT CHANGE - var/guaranteed_violent = (damage_flag == BULLET || damage_flag == LASER) - boom(damage_type, guaranteed_violent) - //SKYRAT EDIT END -======= boom() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/reagent_dispensers/attackby(obj/item/W, mob/user, params) if(W.is_refillable()) @@ -168,11 +161,7 @@ * This is most dangerous for fuel tanks, which will explosion(). * Other dispensers will scatter their contents within range. */ -<<<<<<< HEAD /obj/structure/reagent_dispensers/proc/boom(damage_type = BRUTE, guaranteed_violent = FALSE) //SKYRAT EDIT CHANGE -======= -/obj/structure/reagent_dispensers/proc/boom() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(src)) return // little bit of sanity sauce before we wreck ourselves somehow var/datum/reagent/fuel/volatiles = reagents.has_reagent(/datum/reagent/fuel) @@ -278,7 +267,6 @@ if(check_holidays(APRIL_FOOLS)) icon_state = "fuel_fools" -<<<<<<< HEAD /obj/structure/reagent_dispensers/fueltank/boom(damage_type = BRUTE, guaranteed_violent = FALSE) //SKYRAT EDIT CHANGE if(damage_type == BURN || guaranteed_violent) @@ -287,18 +275,12 @@ else . = ..() //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/structure/reagent_dispensers/fueltank/blob_act(obj/structure/blob/B) boom(guaranteed_violent = TRUE) //SKYRAT EDIT CHANGE /obj/structure/reagent_dispensers/fueltank/ex_act() -<<<<<<< HEAD boom(guaranteed_violent = TRUE) //SKYRAT EDIT CHANGE -======= - boom() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE /obj/structure/reagent_dispensers/fueltank/fire_act(exposed_temperature, exposed_volume) @@ -312,11 +294,7 @@ /obj/structure/reagent_dispensers/fueltank/bullet_act(obj/projectile/hitting_projectile) if(hitting_projectile.damage > 0 && ((hitting_projectile.damage_type == BURN) || (hitting_projectile.damage_type == BRUTE))) log_bomber(hitting_projectile.firer, "detonated a", src, "via projectile") -<<<<<<< HEAD boom(guaranteed_violent = TRUE) // SKYRAT EDIT CHANGE -======= - boom() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return hitting_projectile.on_hit(src, 0) // we override parent like this because otherwise we won't actually properly log the fact that a projectile caused this welding tank to explode. @@ -351,7 +329,6 @@ icon_state = "fuel_high" tank_volume = 5000 -<<<<<<< HEAD /obj/structure/reagent_dispensers/fueltank/large/boom(damage_type = BRUTE, guaranteed_violent = FALSE) //SKYRAT EDIT CHANGE if(damage_type == BURN || guaranteed_violent) explosion(src, devastation_range = 1, heavy_impact_range = 2, light_impact_range = 7, flame_range = 12) @@ -360,8 +337,6 @@ . = ..() //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Wall mounted dispeners, like pepper spray or virus food. Not a normal tank, and shouldn't be able to be turned into a plumbed stationary one. /obj/structure/reagent_dispensers/wall anchored = TRUE @@ -382,14 +357,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/wall/peppertank, 3 desc = "IT'S PEPPER TIME, BITCH!" find_and_hang_on_wall() -<<<<<<< HEAD -/obj/structure/reagent_dispensers/water_cooler//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE -======= /obj/structure/reagent_dispensers/water_cooler ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "liquid cooler" desc = "A machine that dispenses liquid to drink." - icon = 'icons/obj/machines/vending.dmi' + icon = 'icons/obj/machines/vending.dmi' //SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE icon_state = "water_cooler" anchored = TRUE tank_volume = 500 @@ -456,14 +427,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/wall/virusfood, 30 anchored = TRUE reagent_id = /datum/reagent/consumable/nutraslop -<<<<<<< HEAD -/obj/structure/reagent_dispensers/plumbed//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE -======= /obj/structure/reagent_dispensers/plumbed ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "stationary water tank" anchored = TRUE - icon_state = "water_stationary" + icon_state = "water_stationary" //SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE desc = "A stationary, plumbed, water tank." can_be_tanked = FALSE diff --git a/code/modules/reagents/withdrawal/generic_addictions.dm b/code/modules/reagents/withdrawal/generic_addictions.dm index db74181a794..f38d4e27680 100644 --- a/code/modules/reagents/withdrawal/generic_addictions.dm +++ b/code/modules/reagents/withdrawal/generic_addictions.dm @@ -269,10 +269,7 @@ QDEL_NULL(fake_alert_ref) QDEL_NULL(health_doll_ref) -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - MOVED TO MODULAR. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Nicotine /datum/addiction/nicotine name = "nicotine" @@ -297,7 +294,4 @@ affected_carbon.set_jitter_if_lower(30 SECONDS * seconds_per_tick) if(SPT_PROB(5, seconds_per_tick)) affected_carbon.emote("cough") -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm index 4cbc9a216a5..0d207ed7e11 100644 --- a/code/modules/recycling/conveyor.dm +++ b/code/modules/recycling/conveyor.dm @@ -434,11 +434,8 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) /// Updates the switch's `position` and `last_pos` variable. Useful so that the switch can properly cycle between the forwards, backwards and neutral positions. /obj/machinery/conveyor_switch/proc/update_position(direction) if(position == CONVEYOR_OFF) -<<<<<<< HEAD -======= playsound(src, 'sound/machines/lever_start.ogg', 40, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(oneway) //is it a oneway switch position = oneway else @@ -447,10 +444,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) else position = CONVEYOR_BACKWARDS else -<<<<<<< HEAD -======= playsound(src, 'sound/machines/lever_stop.ogg', 40, TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 position = CONVEYOR_OFF /obj/machinery/conveyor_switch/proc/on_user_activation(mob/user, direction) diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index ea387ad0953..360fad94cff 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -3,11 +3,7 @@ #define SEND_PRESSURE (0.05*ONE_ATMOSPHERE) /obj/machinery/disposal -<<<<<<< HEAD icon = 'icons/obj/pipes_n_cables/disposal.dmi' //SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE -======= - icon = 'icons/obj/pipes_n_cables/disposal.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 density = TRUE armor_type = /datum/armor/machinery_disposal max_integrity = 200 @@ -420,11 +416,7 @@ data["isai"] = HAS_AI_ACCESS(user) return data -<<<<<<< HEAD -/obj/machinery/disposal/bin/ui_act(action, params) -======= /obj/machinery/disposal/bin/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm index d2380833221..78469d49191 100644 --- a/code/modules/recycling/disposal/holder.dm +++ b/code/modules/recycling/disposal/holder.dm @@ -195,11 +195,7 @@ // called when player tries to move while in a pipe /obj/structure/disposalholder/relaymove(mob/living/user, direction) -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return for(var/mob/M in range(5, get_turf(src))) M.show_message("CLONG, clong!", MSG_AUDIBLE) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 8d4c75839bf..966510451d0 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -1,9 +1,5 @@ /obj/item/delivery -<<<<<<< HEAD icon = 'icons/obj/storage/wrapping.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE -======= - icon = 'icons/obj/storage/wrapping.dmi' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 inhand_icon_state = "deliverypackage" var/giftwrapped = 0 var/sort_tag = 0 @@ -313,11 +309,7 @@ return data /** User clicks a button on the tagger */ -<<<<<<< HEAD -/obj/item/dest_tagger/ui_act(action, params) -======= /obj/item/dest_tagger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/religion/burdened/psyker.dm b/code/modules/religion/burdened/psyker.dm index d7413b55dfc..b256b4f9d4a 100644 --- a/code/modules/religion/burdened/psyker.dm +++ b/code/modules/religion/burdened/psyker.dm @@ -254,11 +254,7 @@ wound_bonus = -10 embed_type = null -<<<<<<< HEAD -/obj/projectile/bullet/c38/holy/on_hit(atom/target, blocked = 0, pierce_hit) -======= /obj/projectile/bullet/c38/holy/on_hit(atom/target, blocked, pierce_hit) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() var/roll_them_bones = rand(1,38) if(roll_them_bones == 1 && isliving(target)) diff --git a/code/modules/religion/sparring/sparring_contract.dm b/code/modules/religion/sparring/sparring_contract.dm index 5eb2eaa99f3..314953dce28 100644 --- a/code/modules/religion/sparring/sparring_contract.dm +++ b/code/modules/religion/sparring/sparring_contract.dm @@ -65,11 +65,7 @@ area_names += key return area_names -<<<<<<< HEAD -/obj/item/sparring_contract/ui_act(action, list/params) -======= /obj/item/sparring_contract/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/research/anomaly/anomaly_refinery.dm b/code/modules/research/anomaly/anomaly_refinery.dm index fbc4f5937d7..1269edb9265 100644 --- a/code/modules/research/anomaly/anomaly_refinery.dm +++ b/code/modules/research/anomaly/anomaly_refinery.dm @@ -315,11 +315,7 @@ ui = new(user, src, "AnomalyRefinery") ui.open() -<<<<<<< HEAD -/obj/machinery/research/anomaly_refinery/ui_act(action, list/params) -======= /obj/machinery/research/anomaly_refinery/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 28e2653c0f1..c7916f035a7 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -88,10 +88,6 @@ other types of metals and chemistry for reagents). return isnull(desc) ? initial(object_build_item_path.desc) : desc -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //////////////////////////////////////// //Disks for transporting design datums// //////////////////////////////////////// diff --git a/code/modules/research/designs/autolathe/security_designs.dm b/code/modules/research/designs/autolathe/security_designs.dm index de8d8e04abe..95a6abd4f6f 100644 --- a/code/modules/research/designs/autolathe/security_designs.dm +++ b/code/modules/research/designs/autolathe/security_designs.dm @@ -223,12 +223,7 @@ departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/c9mm -<<<<<<< HEAD -// name = "Ammo Box (9mm)" //SKYRAT EDIT: Original - name = "Ammo Box (9x25mm Mk.12) (Lethal)" //SKYRAT EDIT: Calibre rename -======= - name = "Ammo Box (9mm) (Lethal)" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + name = "Ammo Box (9x25mm Mk.12) (Lethal)" //SKYRAT EDIT: Calibre rename - Original: name = "Ammo Box (9mm)" id = "c9mm" build_type = AUTOLATHE materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 300) diff --git a/code/modules/research/designs/autolathe/service_designs.dm b/code/modules/research/designs/autolathe/service_designs.dm index b20b7d8ab16..94772421b69 100644 --- a/code/modules/research/designs/autolathe/service_designs.dm +++ b/code/modules/research/designs/autolathe/service_designs.dm @@ -581,11 +581,7 @@ /datum/design/telescreen_entertainment name = "Entertainment Telescreen" id = "telescreen_entertainment" -<<<<<<< HEAD - build_type = PROTOLATHE -======= build_type = AUTOLATHE | PROTOLATHE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 materials = list( /datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, @@ -597,8 +593,6 @@ ) departmental_flags = DEPARTMENT_BITFLAG_SERVICE -<<<<<<< HEAD -======= /datum/design/entertainment_radio name = "Entertainment Radio" id = "radio_entertainment" @@ -614,7 +608,6 @@ ) departmental_flags = DEPARTMENT_BITFLAG_SERVICE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/design/barcode_scanner name = "Barcode Scanner" id = "barcode_scanner" diff --git a/code/modules/research/designs/bluespace_designs.dm b/code/modules/research/designs/bluespace_designs.dm index a0bc32f37fc..62fd0e7c9e5 100644 --- a/code/modules/research/designs/bluespace_designs.dm +++ b/code/modules/research/designs/bluespace_designs.dm @@ -50,11 +50,7 @@ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE ) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO -<<<<<<< HEAD //autolathe_exportable = FALSE //SKYRAT EDIT REMOVAL -======= - autolathe_exportable = FALSE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/design/desynchronizer name = "Desynchronizer" diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 07d8f75d697..6ed86087b19 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -77,10 +77,7 @@ category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS ) -<<<<<<< HEAD *///SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Advanced Robotic Limbs @@ -2747,8 +2744,6 @@ RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING ) -<<<<<<< HEAD -======= /datum/design/module/fishing_glove name = "MOD Fishing Glove Module" id = "mod_fishing" @@ -2760,7 +2755,6 @@ ) build_path = /obj/item/mod/module/fishing_glove ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/design/posisphere name = "Positronic Sphere" desc = "The latest in Artificial Pesterance." diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 8c3c7cc5e10..90b8acee031 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -986,8 +986,6 @@ ) departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE -<<<<<<< HEAD -======= /datum/design/fishing_gloves name = "Athletic Fishing Gloves" desc = "A pair of gloves to fish without a fishing rod and train your athletics with." @@ -1000,7 +998,6 @@ ) departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/design/stabilized_hook name = "Gyro-Stabilized Hook" desc = "An advanced fishing hook that gives the user a tighter control on the fish when reeling in." @@ -1015,11 +1012,7 @@ /datum/design/auto_reel name = "Fishing Line Auto-Reel" -<<<<<<< HEAD - desc = "An advanced line reel which can be used speed up both fishing and casually snagging other items in your direction." -======= desc = "An advanced line reel which can be used speed up fishing or casually snag other items in your direction." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 id = "auto_reel" build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 4, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3) diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index b6bb8c8c7fa..901bc304dc1 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -421,14 +421,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/wrench/bolter -<<<<<<< HEAD - departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING - category = list( - RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED - ) -======= category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED ) departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index f89010c2b67..f0e0978a607 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -102,11 +102,7 @@ autolathe_exportable = FALSE /datum/design/mag_autorifle -<<<<<<< HEAD - name = "WT-550 Autorifle Magazine (4.6x30mm)" -======= name = "WT-550 Autorifle Magazine (4.6x30mm) (Lethal)" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "A 20 round magazine for the out of date WT-550 Autorifle." id = "mag_autorifle" build_type = PROTOLATHE | AWAY_LATHE @@ -118,11 +114,7 @@ departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/mag_autorifle/ap_mag -<<<<<<< HEAD - name = "WT-550 Autorifle Armour Piercing Magazine (4.6x30mm AP)" -======= name = "WT-550 Autorifle Armour Piercing Magazine (4.6x30mm AP) (Lethal)" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." id = "mag_autorifle_ap" materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 6) @@ -130,11 +122,7 @@ departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/mag_autorifle/ic_mag -<<<<<<< HEAD - name = "WT-550 Autorifle Incendiary Magazine (4.6x30mm IC)" -======= name = "WT-550 Autorifle Incendiary Magazine (4.6x30mm IC) (Lethal/Highly Destructive)" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." id = "mag_autorifle_ic" materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 6, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index c0f577eaa4e..ded27054695 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -166,11 +166,7 @@ return data -<<<<<<< HEAD -/obj/machinery/rnd/experimentor/ui_act(action, list/params) -======= /obj/machinery/rnd/experimentor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index cbe8342ac2b..2f02301aeaa 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -347,13 +347,10 @@ charge_per_item += design.materials[material] charge_per_item = ROUND_UP((charge_per_item / (MAX_STACK_SIZE * SHEET_MATERIAL_AMOUNT)) * coefficient * active_power_usage) var/build_time_per_item = (design.construction_time * design.lathe_time_factor * efficiency_coeff) ** 0.8 -<<<<<<< HEAD // SKYRAT EDIT - Faster lathes if(!speedup_disabled) build_time_per_item *= 0.1 // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //start production busy = TRUE diff --git a/code/modules/research/machinery/departmental_protolathe.dm b/code/modules/research/machinery/departmental_protolathe.dm index 052103653a1..407d62764d4 100644 --- a/code/modules/research/machinery/departmental_protolathe.dm +++ b/code/modules/research/machinery/departmental_protolathe.dm @@ -43,9 +43,5 @@ name = "department protolathe (Security)" allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY circuit = /obj/item/circuitboard/machine/protolathe/department/security -<<<<<<< HEAD stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A" -======= - stripe_color = "#DE3A3A" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 payment_department = ACCOUNT_SEC diff --git a/code/modules/research/machinery/departmental_techfab.dm b/code/modules/research/machinery/departmental_techfab.dm index 0cd29a100ee..339c98a6222 100644 --- a/code/modules/research/machinery/departmental_techfab.dm +++ b/code/modules/research/machinery/departmental_techfab.dm @@ -43,9 +43,5 @@ name = "department techfab (Security)" allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY circuit = /obj/item/circuitboard/machine/techfab/department/security -<<<<<<< HEAD stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A" -======= - stripe_color = "#DE3A3A" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 payment_department = ACCOUNT_SEC diff --git a/code/modules/research/ordnance/doppler_array.dm b/code/modules/research/ordnance/doppler_array.dm index dae4c3e3133..6b1be676984 100644 --- a/code/modules/research/ordnance/doppler_array.dm +++ b/code/modules/research/ordnance/doppler_array.dm @@ -290,11 +290,7 @@ data["records"] += list(record_data) return data -<<<<<<< HEAD -/obj/machinery/doppler_array/ui_act(action, list/params) -======= /obj/machinery/doppler_array/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/research/ordnance/tank_compressor.dm b/code/modules/research/ordnance/tank_compressor.dm index 2bdfe2afa12..89f38ee4a32 100644 --- a/code/modules/research/ordnance/tank_compressor.dm +++ b/code/modules/research/ordnance/tank_compressor.dm @@ -275,11 +275,7 @@ ui = new(user, src, "TankCompressor") ui.open() -<<<<<<< HEAD -/obj/machinery/atmospherics/components/binary/tank_compressor/ui_act(action, list/params) -======= /obj/machinery/atmospherics/components/binary/tank_compressor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 1318d9a4d15..d4dde8732a0 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -319,11 +319,7 @@ Nothing else in the console has ID requirements. "id_cache" = flat_id_cache, ) -<<<<<<< HEAD -/obj/machinery/computer/rdconsole/ui_act(action, list/params) -======= /obj/machinery/computer/rdconsole/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/research/server_control.dm b/code/modules/research/server_control.dm index 12a832ed0e3..73596925a2d 100644 --- a/code/modules/research/server_control.dm +++ b/code/modules/research/server_control.dm @@ -61,11 +61,7 @@ return data -<<<<<<< HEAD -/obj/machinery/computer/rdservercontrol/ui_act(action, params) -======= /obj/machinery/computer/rdservercontrol/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return TRUE diff --git a/code/modules/research/techweb/nodes/service_nodes.dm b/code/modules/research/techweb/nodes/service_nodes.dm index fbd201f8a04..3735dc41b3b 100644 --- a/code/modules/research/techweb/nodes/service_nodes.dm +++ b/code/modules/research/techweb/nodes/service_nodes.dm @@ -165,11 +165,8 @@ prereq_ids = list(TECHWEB_NODE_FISHING_EQUIP) design_ids = list( "fishing_rod_tech", -<<<<<<< HEAD -======= "fishing_gloves", "mod_fishing", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "stabilized_hook", "auto_reel", "fish_analyzer", diff --git a/code/modules/research/xenobiology/vatgrowing/petri_dish.dm b/code/modules/research/xenobiology/vatgrowing/petri_dish.dm index 0a7ebb07d8d..df2fa619cc3 100644 --- a/code/modules/research/xenobiology/vatgrowing/petri_dish.dm +++ b/code/modules/research/xenobiology/vatgrowing/petri_dish.dm @@ -59,10 +59,7 @@ list(CELL_LINE_TABLE_COCKROACH, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 7), list(CELL_LINE_TABLE_BLOBBERNAUT, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) ) -<<<<<<< HEAD -======= name = "basic sample petri dish" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/petri_dish/random/Initialize(mapload) . = ..() diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index 6f43c04f754..2ec4c6b43ff 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -8,8 +8,6 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) #define ACCESS_GRANTING_COOLDOWN (30 SECONDS) -#define ACCESS_GRANTING_COOLDOWN (30 SECONDS) - /obj/machinery/keycard_auth name = "Keycard Authentication Device" desc = "This device is used to trigger station functions, which require more than one ID card to authenticate, or to give the Janitor access to a department." @@ -66,11 +64,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) return UI_CLOSE return ..() -<<<<<<< HEAD -/obj/machinery/keycard_auth/ui_act(action, params) -======= /obj/machinery/keycard_auth/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(. || waiting || !allowed(usr)) return @@ -94,7 +88,6 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) if(!event_source) sendEvent(KEYCARD_BSA_UNLOCK) . = TRUE -<<<<<<< HEAD //SKYRAT EDIT START if("pin_unrestrict") if(!event_source) @@ -105,8 +98,6 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) sendEvent(KEYCARD_ENG_OVERRIDE) . = TRUE //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if("give_janitor_access") var/mob/living/living_user = usr if(!living_user || !istype(living_user)) diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index 4140cf4cef1..5ce62f8c042 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -174,11 +174,7 @@ else return SHUTTLE_CONSOLE_ERROR -<<<<<<< HEAD -/obj/machinery/computer/shuttle/ui_act(action, params) -======= /obj/machinery/computer/shuttle/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index b3964492899..4f1729aa029 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -347,11 +347,7 @@ . = ..() -<<<<<<< HEAD /obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, area/signal_origin, reason, red_alert, set_coefficient=null, silent=FALSE) // SKYRAT EDIT CHANGE - AUTOTRANSFER - adds silent arg -======= -/obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, area/signal_origin, reason, red_alert, set_coefficient=null) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!isnum(set_coefficient)) set_coefficient = SSsecurity_level.current_security_level.shuttle_call_time_mod alert_coeff = set_coefficient @@ -372,13 +368,10 @@ else SSshuttle.emergency_last_call_loc = null -<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(silent) return // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 priority_announce( text = "The emergency shuttle has been called. [red_alert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [(timeLeft(60 SECONDS))] minutes.[reason][SSshuttle.emergency_last_call_loc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ][SSshuttle.admin_emergency_no_recall ? "\n\nWarning: Shuttle recall subroutines disabled; Recall not possible." : ""]", title = "Emergency Shuttle Dispatched", diff --git a/code/modules/shuttle/ferry.dm b/code/modules/shuttle/ferry.dm index 82898b9b55a..d1f54b889d1 100644 --- a/code/modules/shuttle/ferry.dm +++ b/code/modules/shuttle/ferry.dm @@ -23,10 +23,6 @@ /obj/machinery/computer/shuttle/ferry/request name = "ferry console" circuit = /obj/item/circuitboard/computer/ferry/request -<<<<<<< HEAD possible_destinations = "ferry_home;ferry_away;ferry_ntf" //SKYRAT EDIT CHANGE -======= - possible_destinations = "ferry_home;ferry_away" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 req_access = list(ACCESS_CENT_GENERAL) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 16ba3cf0d9c..ee2cad1be70 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -52,7 +52,6 @@ All ShuttleMove procs go here if(!shuttle_depth) CRASH("A turf queued to move via shuttle somehow had no skipover in baseturfs. [src]([type]):[loc]") -<<<<<<< HEAD //SKYRAT EDIT ADDITION if(newT.lgroup) @@ -70,8 +69,7 @@ All ShuttleMove procs go here newT.reasses_liquids() //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + newT.CopyOnTop(src, 1, shuttle_depth, TRUE) newT.blocks_air = TRUE newT.air_update_turf(TRUE, FALSE) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 1c5837709e8..d3e18f4f876 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -493,11 +493,8 @@ ///List of shuttle events that can run or are running var/list/datum/shuttle_event/event_list = list() -<<<<<<< HEAD var/admin_forced = FALSE //SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define WORLDMAXX_CUTOFF (world.maxx + 1) #define WORLDMAXY_CUTOFF (world.maxx + 1) /** @@ -704,7 +701,6 @@ * Arguments: * * destination_port - Stationary docking port to move the shuttle to */ -<<<<<<< HEAD /obj/docking_port/mobile/proc/request(obj/docking_port/stationary/destination_port, forced = FALSE) // SKYRAT EDIT ADDITION - Forced check if(!check_dock(destination_port) && !forced) // SKYRAT EDIT ADDITION - Forced check testing("check_dock failed on request for [src]") @@ -715,13 +711,6 @@ admin_forced = TRUE // SKYRAT EDIT END -======= -/obj/docking_port/mobile/proc/request(obj/docking_port/stationary/destination_port) - if(!check_dock(destination_port)) - testing("check_dock failed on request for [src]") - return - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(mode == SHUTTLE_IGNITING && destination == destination_port) return diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index e7d6f6999bd..4f6dbdc2f26 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -162,10 +162,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( var/pack_cost var/list/goodies_by_buyer = list() // if someone orders more than GOODY_FREE_SHIPPING_MAX goodies, we upcharge to a normal crate so they can't carry around 20 combat shotties var/list/clean_up_orders = list() // orders to remove since we are done with them -<<<<<<< HEAD var/list/forced_briefcases = list() // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/supply_order/spawning_order in SSshuttle.shopping_list) if(!empty_turfs.len) @@ -196,11 +193,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( continue pack_cost = spawning_order.pack.get_cost() -<<<<<<< HEAD if(spawning_order.paying_account && spawning_order.charge_on_purchase) // SKYRAT EDIT CHANGE - ORIGINAL: if(spawning_order.paying_account) -======= - if(spawning_order.paying_account) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 paying_for_this = spawning_order.paying_account if(spawning_order.pack.goody) LAZYADD(goodies_by_buyer[spawning_order.paying_account], spawning_order) @@ -213,11 +206,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( cargo.adjust_money(price - pack_cost) //Cargo gets the handling fee value += pack_cost -<<<<<<< HEAD if(!spawning_order.pack.goody && !(spawning_order?.paying_account in forced_briefcases)) // SKYRAT EDIT CHANGE - ORIGINAL : if(!spawning_order.pack.goody) -======= - if(!spawning_order.pack.goody) //we handle goody crates below ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/structure/closet/crate = spawning_order.generate(pick_n_take(empty_turfs)) crate.name += " - #[spawning_order.id]" diff --git a/code/modules/spells/spell_types/pointed/finger_guns.dm b/code/modules/spells/spell_types/pointed/finger_guns.dm index 704de6795d3..cf80489fc91 100644 --- a/code/modules/spells/spell_types/pointed/finger_guns.dm +++ b/code/modules/spells/spell_types/pointed/finger_guns.dm @@ -33,11 +33,7 @@ return FALSE var/mob/living/carbon/human/human_invoker = invoker -<<<<<<< HEAD - if(human_invoker.incapacitated()) -======= if(human_invoker.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(feedback) to_chat(human_invoker, span_warning("You can't properly point your fingers while incapacitated.")) return FALSE diff --git a/code/modules/spells/spell_types/shapeshift/_shapeshift.dm b/code/modules/spells/spell_types/shapeshift/_shapeshift.dm index 06768b6470b..2df9172c560 100644 --- a/code/modules/spells/spell_types/shapeshift/_shapeshift.dm +++ b/code/modules/spells/spell_types/shapeshift/_shapeshift.dm @@ -140,12 +140,8 @@ return FALSE if(QDELETED(caster)) return FALSE - -<<<<<<< HEAD - return !caster.incapacitated() -======= return !caster.incapacitated ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + /// Actually does the shapeshift, for the caster. /datum/action/cooldown/spell/shapeshift/proc/do_shapeshift(mob/living/caster) diff --git a/code/modules/spells/spell_types/teleport/teleport.dm b/code/modules/spells/spell_types/teleport/teleport.dm index 421200b4ac5..57e88b98520 100644 --- a/code/modules/spells/spell_types/teleport/teleport.dm +++ b/code/modules/spells/spell_types/teleport/teleport.dm @@ -48,9 +48,5 @@ return var/mob/living/carbon/caster = cast_on -<<<<<<< HEAD - if(caster.incapacitated() || !caster.is_holding(target)) -======= if(caster.incapacitated || !caster.is_holding(target)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return . | SPELL_CANCEL_CAST diff --git a/code/modules/spells/spell_types/touch/_touch.dm b/code/modules/spells/spell_types/touch/_touch.dm index a3efb846b89..d1adc9619be 100644 --- a/code/modules/spells/spell_types/touch/_touch.dm +++ b/code/modules/spells/spell_types/touch/_touch.dm @@ -19,11 +19,7 @@ * (generally) inadvisable unless you know what you're doing */ /datum/action/cooldown/spell/touch -<<<<<<< HEAD - check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_HANDS_BLOCKED|AB_CHECK_INCAPACITATED -======= check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_HANDS_BLOCKED ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 sound = 'sound/items/welder.ogg' invocation = "High Five!" invocation_type = INVOCATION_SHOUT diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index c81e2a80ca2..60d35a6415e 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -1,15 +1,9 @@ -<<<<<<< HEAD ///BSA unlocked by head ID swipes GLOBAL_VAR_INIT(bsa_unlock, FALSE) /* SKYRAT EDIT REMOVAL - MOVED TO MODULAR BSA_OVERHAUL -======= -///BSA unlocked by head ID swipes -GLOBAL_VAR_INIT(bsa_unlock, FALSE) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Crew has to build a bluespace cannon // Cargo orders part for high price // Requires high amount of power @@ -307,11 +301,7 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE) data["target"] = get_target_name() return data -<<<<<<< HEAD -/obj/machinery/computer/bsa_control/ui_act(action, params) -======= /obj/machinery/computer/bsa_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return @@ -397,10 +387,6 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE) QDEL_NULL(centerpiece.back_ref) qdel(centerpiece) return cannon -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/machinery/computer/bsa_control/emag_act(mob/user, obj/item/card/emag/emag_card) if(obj_flags & EMAGGED) return FALSE @@ -408,7 +394,4 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE) balloon_alert(user, "rigged to explode") to_chat(user, span_warning("You emag [src] and hear the focusing crystal short out. You get the feeling it wouldn't be wise to stand near [src] when the BSA fires...")) return TRUE -<<<<<<< HEAD */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index f948505590f..5a14c0e16b6 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -164,11 +164,7 @@ data["choiceB"] = initial(mutation2.name) return data -<<<<<<< HEAD -/obj/machinery/dna_vault/ui_act(action, params) -======= /obj/machinery/dna_vault/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/station_goals/vault_mutation.dm b/code/modules/station_goals/vault_mutation.dm index cd0098b35a7..b05bda05db7 100644 --- a/code/modules/station_goals/vault_mutation.dm +++ b/code/modules/station_goals/vault_mutation.dm @@ -144,7 +144,3 @@ /datum/mutation/human/plasmocile/proc/remove_buff(obj/item/organ/internal/lungs/our_lungs) our_lungs.plas_breath_dam_min = initial(our_lungs.plas_breath_dam_min) our_lungs.plas_breath_dam_max = initial(our_lungs.plas_breath_dam_max) -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/surgery/advanced/brainwashing.dm b/code/modules/surgery/advanced/brainwashing.dm index 201a7f031e6..3a933546552 100644 --- a/code/modules/surgery/advanced/brainwashing.dm +++ b/code/modules/surgery/advanced/brainwashing.dm @@ -1,19 +1,14 @@ /obj/item/disk/surgery/brainwashing -<<<<<<< HEAD name = "Surgery Disk" //SKYRAT EDIT: Formerly "Brainwashing Surgery Disk" //Finally I can upload the funny surgery disk without letting everyone in the room know about it! desc = "The disk provides instructions on some kind of surgery, but the label has been scratched off..." //Skyrat edit: Moved to Special Desc. surgeries = list(/datum/surgery/advanced/brainwashing) special_desc_requirement = EXAMINE_CHECK_JOB // SKYRAT EDIT special_desc_jobs = list("Medical Doctor, Chief Medical Officer, Roboticist") // SKYRAT EDIT CHANGE //You mean to tell me the roles that get this role-exclusive item know what it does? special_desc = "The disk provides instructions on how to impress an order on a brain, making it the primary objective of the patient." -======= - name = "Brainwashing Surgery Disk" - desc = "The disk provides instructions on how to impress an order on a brain, making it the primary objective of the patient." surgeries = list( /datum/surgery/advanced/brainwashing, /datum/surgery/advanced/brainwashing/mechanic, ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/surgery/advanced/brainwashing name = "Brainwashing" diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm index dc5a6246bba..ab11ce0c20f 100644 --- a/code/modules/surgery/amputation.dm +++ b/code/modules/surgery/amputation.dm @@ -16,10 +16,7 @@ /datum/surgery_step/clamp_bleeders, /datum/surgery_step/sever_limb, ) -<<<<<<< HEAD removes_target_bodypart = TRUE // SKYRAT EDIT ADDITION - Surgically unremovable limbs -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/surgery/amputation/mechanic name = "Disassemble" diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 6354ed16720..b4f0515359a 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -77,11 +77,7 @@ ///Controls if the limb is disabled. TRUE means it is disabled (similar to being removed, but still present for the sake of targeted interactions). var/bodypart_disabled = FALSE ///Handles limb disabling by damage. If 0 (0%), a limb can't be disabled via damage. If 1 (100%), it is disabled at max limb damage. Anything between is the percentage of damage against maximum limb damage needed to disable the limb. -<<<<<<< HEAD var/disabling_threshold_percentage = 1 //SKYRAT EDIT CHANGE - COMBAT - ORIGINAL : var/disabling_threshold_percentage = 0 -======= - var/disabling_threshold_percentage = 0 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Damage variables ///A mutiplication of the burn and brute damage that the limb's stored damage contributes to its attached mob's overall wellbeing. @@ -207,13 +203,10 @@ var/robotic_emp_paralyze_damage_percent_threshold = 0.3 /// A potential texturing overlay to put on the limb var/datum/bodypart_overlay/texture/texture_bodypart_overlay -<<<<<<< HEAD // SKYRAT EDIT BEGIN /// If we even wanna try and handle icons/overlays of the limb (Taurs don't, f.e.). See update_body_parts var/show_icon = TRUE // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/bodypart/apply_fantasy_bonuses(bonus) . = ..() @@ -361,7 +354,6 @@ for(var/datum/wound/wound as anything in wounds) switch(wound.severity) if(WOUND_SEVERITY_TRIVIAL) -<<<<<<< HEAD // check_list += "\t [span_danger("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)].")]" // SKYRAT EDIT - Medical overhaul-ish - ORIGINAL check_list += "\t [span_danger("Your [name] is suffering [wound.a_or_from] [wound.get_topic_name(owner)].")]" // SKYRAT EDIT - Medical overhaul-ish if(WOUND_SEVERITY_MODERATE) @@ -373,15 +365,6 @@ if(WOUND_SEVERITY_CRITICAL) // check_list += "\t [span_boldwarning("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)]!!")]" // SKYRAT EDIT - Medical overhaul-ish - ORIGINAL check_list += "\t [span_boldwarning("Your [name] is suffering [wound.a_or_from] [wound.get_topic_name(owner)]!!")]" // SKYRAT EDIT - Medical overhaul-ish -======= - check_list += "\t [span_danger("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)].")]" - if(WOUND_SEVERITY_MODERATE) - check_list += "\t [span_warning("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)]!")]" - if(WOUND_SEVERITY_SEVERE) - check_list += "\t [span_boldwarning("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)]!!")]" - if(WOUND_SEVERITY_CRITICAL) - check_list += "\t [span_boldwarning("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)]!!!")]" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/obj/item/embedded_thing in embedded_objects) var/stuck_word = embedded_thing.is_embed_harmless() ? "stuck" : "embedded" @@ -560,7 +543,6 @@ return // now we have our wounding_type and are ready to carry on with wounds and dealing the actual damage if(wounding_dmg >= WOUND_MINIMUM_DAMAGE && wound_bonus != CANT_WOUND) -<<<<<<< HEAD //SKYRAT EDIT ADDITION - MEDICAL //This makes it so the more damaged bodyparts are, the more likely they are to get wounds //However, this bonus isn't applied when the object doesn't pass the initial wound threshold, nor is it when it already has enough wounding dmg @@ -574,8 +556,6 @@ var/obj/item/stack/medical/gauze/our_gauze = current_gauze our_gauze.get_hit() //SKYRAT EDIT ADDITION END - MEDICAL -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 check_wounding(wounding_type, wounding_dmg, wound_bonus, bare_wound_bonus, attack_direction, damage_source = damage_source) for(var/datum/wound/iter_wound as anything in wounds) @@ -702,15 +682,12 @@ update_disabled() if(updating_health) owner.updatehealth() -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION //Consider moving this to a new species proc "spec_heal" maybe? if(owner.stat == DEAD && HAS_TRAIT(owner, TRAIT_REVIVES_BY_HEALING)) if(owner.health > 50) owner.revive(FALSE) //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cremation_progress = min(0, cremation_progress - ((brute_dam + burn_dam)*(100/max_damage))) return update_bodypart_damage_state() @@ -1003,7 +980,6 @@ if(should_draw_greyscale) //Should the limb be colored? draw_color ||= species_color || (skin_tone ? skintone2hex(skin_tone) : null) -<<<<<<< HEAD // SKYRAT EDIT ADDITION var/datum/species/owner_species = human_owner.dna.species @@ -1015,11 +991,7 @@ aux_zone_markings = LAZYCOPY(owner_species.body_markings[aux_zone]) markings_alpha = owner_species.markings_alpha // SKYRAT EDIT END - - recolor_external_organs() -======= recolor_bodypart_overlays() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE //to update the bodypart's icon when not attached to a mob @@ -1092,16 +1064,10 @@ huskify_image(thing_to_husk = aux) draw_color = husk_color if(draw_color) -<<<<<<< HEAD var/limb_color = alpha != 255 ? "[draw_color][num2hex(alpha, 2)]" : "[draw_color]" // SKYRAT EDIT ADDITION - Alpha values on limbs. We check if the limb is attached and if the owner has an alpha value to append limb.color = limb_color // SKYRAT EDIT CHANGE - ORIGINAL: limb.color = "[draw_color]" if(aux_zone) aux.color = limb_color // SKYRAT EDIT CHANGE - ORIGINAL: aux.color = "[draw_color]" -======= - limb.color = "[draw_color]" - if(aux_zone) - aux.color = "[draw_color]" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //EMISSIVE CODE START // For some reason this was applied as an overlay on the aux image and limb image before. @@ -1142,7 +1108,6 @@ . += overlay.get_overlay(external_layer, src) for(var/datum/layer in .) overlay.modify_bodypart_appearance(layer) -<<<<<<< HEAD // SKYRAT EDIT ADDITION BEGIN - MARKINGS CODE var/override_color var/atom/offset_spokesman = owner || src @@ -1199,8 +1164,6 @@ if (emissive) . += emissive // SKYRAT EDIT END - MARKINGS CODE END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return . /obj/item/bodypart/proc/huskify_image(image/thing_to_husk, draw_blood = TRUE) @@ -1406,11 +1369,7 @@ QDEL_NULL(current_gauze) ///Loops through all of the bodypart's external organs and update's their color. -<<<<<<< HEAD -/obj/item/bodypart/proc/recolor_external_organs() -======= /obj/item/bodypart/proc/recolor_bodypart_overlays() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/bodypart_overlay/mutant/overlay in bodypart_overlays) overlay.inherit_color(src, force = TRUE) @@ -1483,13 +1442,8 @@ var/burn_damage = AUGGED_LIMB_EMP_BURN_DAMAGE if(severity == EMP_HEAVY) time_needed *= 2 -<<<<<<< HEAD brute_damage *= 1.3 // SKYRAT EDIT : Balance - Lowers total damage from ~125 Brute to ~30 burn_damage *= 1.3 // SKYRAT EDIT : Balance - Lowers total damage from ~104 Burn to ~24 -======= - brute_damage *= 2 - burn_damage *= 2 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 receive_damage(brute_damage, burn_damage) do_sparks(number = 1, cardinal_only = FALSE, source = owner || src) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index e45a6893bd6..44682189bde 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -68,13 +68,10 @@ chest_owner.add_splatter_floor(chest_owner.loc) playsound(get_turf(chest_owner), 'sound/misc/splort.ogg', 80, TRUE) for(var/obj/item/organ/organ in contents) -<<<<<<< HEAD // SKYRAT EDIT START - Non-spillable organs if(!organ.drop_when_organ_spilling) continue // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/org_zone = check_zone(organ.zone) if(org_zone != BODY_ZONE_CHEST) continue @@ -275,11 +272,7 @@ return FALSE var/obj/item/bodypart/chest/mob_chest = new_limb_owner.get_bodypart(BODY_ZONE_CHEST) -<<<<<<< HEAD - if(mob_chest && !(mob_chest.acceptable_bodytype & bodytype) && !(mob_chest.acceptable_bodyshape & bodyshape) && !(mob_chest.acceptable_bodyshape & bodyshape) && !special) -======= if(mob_chest && !(mob_chest.acceptable_bodytype & bodytype) && !(mob_chest.acceptable_bodyshape & bodyshape) && !special) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE @@ -413,20 +406,12 @@ qdel(phantom_loss) //Copied from /datum/species/proc/on_species_gain() -<<<<<<< HEAD - for(var/obj/item/organ/external/organ_path as anything in dna.species.external_organs) -======= for(var/obj/item/organ/organ_path as anything in dna.species.mutant_organs) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Load a persons preferences from DNA var/zone = initial(organ_path.zone) if(zone != limb_zone) continue -<<<<<<< HEAD - var/obj/item/organ/external/new_organ = SSwardrobe.provide_type(organ_path) -======= var/obj/item/organ/new_organ = SSwardrobe.provide_type(organ_path) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 new_organ.Insert(src) update_body_parts() diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 7c99bc4ad74..538b124e932 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -176,7 +176,7 @@ if(dropped) var/obj/item/organ/internal/eyes/eyes = locate(/obj/item/organ/internal/eyes) in src // This is a bit of copy/paste code from eyes.dm:generate_body_overlay - if(eyes?.eye_icon_state && (head_flags & HEAD_EYESPRITES)) + if((eyes?.eye_icon_state || eyes.eye_icon_state == "None") && (head_flags & HEAD_EYESPRITES)) //SKYRAT EDIT - Ignores None iconstate for synths var/image/eye_left = image('icons/mob/human/human_face.dmi', "[eyes.eye_icon_state]_l", -BODY_LAYER, SOUTH) var/image/eye_right = image('icons/mob/human/human_face.dmi', "[eyes.eye_icon_state]_r", -BODY_LAYER, SOUTH) if(head_flags & HEAD_EYECOLOR) @@ -194,13 +194,8 @@ if(worn_face_offset) worn_face_offset.apply_offset(eye_left) worn_face_offset.apply_offset(eye_right) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - Customization (Emissives and synths) - if(eyes.eye_icon_state == "None") - eye_left.alpha = 0 - eye_right.alpha = 0 - if (eyes.is_emissive) // Because it was done all weird up there. var/mutable_appearance/emissive_left = emissive_appearance(eye_left.icon, eye_left.icon_state, src, -BODY_LAYER, eye_left.alpha) var/mutable_appearance/emissive_right = emissive_appearance(eye_right.icon, eye_right.icon_state, src, -BODY_LAYER, eye_right.alpha) @@ -230,21 +225,6 @@ . = ..() AddElement(/datum/element/toy_talk) -======= - . += eye_left - . += eye_right - else if(!eyes && (head_flags & HEAD_EYEHOLES)) - var/image/no_eyes = image('icons/mob/human/human_face.dmi', "eyes_missing", -BODY_LAYER, SOUTH) - worn_face_offset?.apply_offset(no_eyes) - . += no_eyes - - return - -/obj/item/bodypart/head/Initialize(mapload) - . = ..() - AddElement(/datum/element/toy_talk) - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/bodypart/head/GetVoice() return "The head of [real_name]" diff --git a/code/modules/surgery/bodyparts/head_hair_and_lips.dm b/code/modules/surgery/bodyparts/head_hair_and_lips.dm index e2cd3d8573c..d977d4ae902 100644 --- a/code/modules/surgery/bodyparts/head_hair_and_lips.dm +++ b/code/modules/surgery/bodyparts/head_hair_and_lips.dm @@ -50,11 +50,7 @@ lip_style = human_head_owner.lip_style lip_color = human_head_owner.lip_color hairstyle = human_head_owner.hairstyle -<<<<<<< HEAD hair_alpha = human_head_owner.hair_alpha ? human_head_owner.hair_alpha : owner_species.hair_alpha // SKYRAT EDIT - Customization - Hair alpha - ORIGINAL: hair_alpha = owner_species.hair_alpha -======= - hair_alpha = owner_species.hair_alpha ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 hair_color = human_head_owner.hair_color facial_hairstyle = human_head_owner.facial_hairstyle facial_hair_alpha = owner_species.facial_hair_alpha @@ -114,14 +110,11 @@ hair_overlay = image(hair_sprite_accessory.icon, hair_sprite_accessory.icon_state, -HAIR_LAYER, image_dir) hair_overlay.alpha = hair_alpha hair_overlay.pixel_y = hair_sprite_accessory.y_offset -<<<<<<< HEAD // SKYRAT EDIT ADDITION - Species hair offset if(LAZYFIND(owner?.dna?.species?.offset_features, OFFSET_HAIR)) hair_overlay.pixel_x += owner.dna.species.offset_features[OFFSET_HAIR][INDEX_X] hair_overlay.pixel_y += owner.dna.species.offset_features[OFFSET_HAIR][INDEX_Y] // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //Emissive blocker if(blocks_emissive != EMISSIVE_BLOCK_NONE) hair_overlay.overlays += emissive_blocker(hair_overlay.icon, hair_overlay.icon_state, location, alpha = hair_alpha) @@ -134,14 +127,11 @@ var/hair_gradient_color = gradient_colors[GRADIENT_HAIR_KEY] var/image/hair_gradient_overlay = get_gradient_overlay(hair_sprite_accessory.icon, hair_sprite_accessory.icon_state, -HAIR_LAYER, SSaccessories.hair_gradients_list[hair_gradient_style], hair_gradient_color, image_dir) hair_gradient_overlay.pixel_y = hair_sprite_accessory.y_offset -<<<<<<< HEAD // SKYRAT EDIT ADDITION - Species hair offset if(LAZYFIND(owner?.dna?.species?.offset_features, OFFSET_HAIR)) hair_gradient_overlay.pixel_x += owner.dna.species.offset_features[OFFSET_HAIR][INDEX_X] hair_gradient_overlay.pixel_y += owner.dna.species.offset_features[OFFSET_HAIR][INDEX_Y] // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . += hair_gradient_overlay if(show_debrained && (head_flags & HEAD_DEBRAIN)) diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm index 0ced4ce2fe2..dec8efb154e 100644 --- a/code/modules/surgery/bodyparts/helpers.dm +++ b/code/modules/surgery/bodyparts/helpers.dm @@ -182,13 +182,8 @@ /mob/living/carbon/proc/synchronize_bodytypes() var/all_limb_flags = NONE for(var/obj/item/bodypart/limb as anything in bodyparts) -<<<<<<< HEAD - for(var/obj/item/organ/external/ext_organ in limb) - all_limb_flags |= ext_organ.external_bodytypes -======= for(var/obj/item/organ/organ in limb) all_limb_flags |= organ.external_bodytypes ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 all_limb_flags |= limb.bodytype bodytype = all_limb_flags @@ -197,13 +192,8 @@ /mob/living/carbon/proc/synchronize_bodyshapes() var/all_limb_flags = NONE for(var/obj/item/bodypart/limb as anything in bodyparts) -<<<<<<< HEAD - for(var/obj/item/organ/external/ext_organ in limb) - all_limb_flags |= ext_organ.external_bodyshapes -======= for(var/obj/item/organ/organ in limb) all_limb_flags |= organ.external_bodyshapes ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 all_limb_flags |= limb.bodyshape bodyshape = all_limb_flags diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm index 1402f6f9be3..b76aa2d1ef2 100644 --- a/code/modules/surgery/bodyparts/robot_bodyparts.dm +++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm @@ -124,13 +124,8 @@ if (severity == EMP_HEAVY) knockdown_time *= 2 owner.Knockdown(knockdown_time) -<<<<<<< HEAD - if(owner.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB)) // So the message isn't duplicated. If they were stunned beforehand by something else, then the message not showing makes more sense anyways. - return FALSE -======= if(INCAPACITATED_IGNORING(owner, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB)) // So the message isn't duplicated. If they were stunned beforehand by something else, then the message not showing makes more sense anyways. return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(owner, span_danger("As your [plaintext_zone] unexpectedly malfunctions, it causes you to fall to the ground!")) return @@ -178,13 +173,8 @@ if (severity == EMP_HEAVY) knockdown_time *= 2 owner.Knockdown(knockdown_time) -<<<<<<< HEAD - if(owner.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB)) // So the message isn't duplicated. If they were stunned beforehand by something else, then the message not showing makes more sense anyways. - return FALSE -======= if(INCAPACITATED_IGNORING(owner, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB)) // So the message isn't duplicated. If they were stunned beforehand by something else, then the message not showing makes more sense anyways. return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 to_chat(owner, span_danger("As your [plaintext_zone] unexpectedly malfunctions, it causes you to fall to the ground!")) return @@ -287,29 +277,19 @@ if(all_robotic) owner.add_traits(list( -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL BEGIN - Synths are not immune to temperature TRAIT_RESISTCOLD, TRAIT_RESISTHEAT, SKYRAT EDIT REMOVAL END */ -======= - TRAIT_RESISTCOLD, - TRAIT_RESISTHEAT, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TRAIT_RESISTLOWPRESSURE, TRAIT_RESISTHIGHPRESSURE, ), AUGMENTATION_TRAIT) else owner.remove_traits(list( -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL BEGIN - Synths are not immune to temperature TRAIT_RESISTCOLD, TRAIT_RESISTHEAT, SKYRAT EDIT REMOVAL END */ -======= - TRAIT_RESISTCOLD, - TRAIT_RESISTHEAT, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TRAIT_RESISTLOWPRESSURE, TRAIT_RESISTHIGHPRESSURE, ), AUGMENTATION_TRAIT) diff --git a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm index 0fd5a36d7ed..1933711cac1 100644 --- a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm @@ -47,34 +47,7 @@ icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi' limb_id = SPECIES_LIZARD -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - MOVED TO MODULAR MUTANT_BODYPARTS.DM -======= -/// Checks if this mob is wearing anything that does not have a valid sprite set for digitigrade legs -/// (In other words, is the mob's digitigrade body squished by its clothing?) -/mob/living/carbon/proc/is_digitigrade_squished() - return FALSE - -/mob/living/carbon/human/is_digitigrade_squished() - var/obj/item/clothing/shoes/worn_shoes = shoes - var/obj/item/clothing/under/worn_suit = wear_suit - var/obj/item/clothing/under/worn_uniform = w_uniform - - var/uniform_compatible = isnull(worn_uniform) \ - || (worn_uniform.supports_variations_flags & DIGITIGRADE_VARIATIONS) \ - || !(worn_uniform.body_parts_covered & LEGS) \ - || (worn_suit?.flags_inv & HIDEJUMPSUIT) // If suit hides our jumpsuit, it doesn't matter if it squishes - - var/suit_compatible = isnull(worn_suit) \ - || (worn_suit.supports_variations_flags & DIGITIGRADE_VARIATIONS) \ - || !(worn_suit.body_parts_covered & LEGS) - - var/shoes_compatible = isnull(worn_shoes) \ - || (worn_shoes.supports_variations_flags & DIGITIGRADE_VARIATIONS) - - return !uniform_compatible || !suit_compatible || !shoes_compatible - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/bodypart/leg/left/digitigrade icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi' limb_id = BODYPART_ID_DIGITIGRADE @@ -83,26 +56,6 @@ /obj/item/bodypart/leg/left/digitigrade/update_limb(dropping_limb = FALSE, is_creating = FALSE) . = ..() -<<<<<<< HEAD - if(ishuman(owner)) - var/mob/living/carbon/human/human_owner = owner - var/obj/item/clothing/shoes/worn_shoes = human_owner.get_item_by_slot(ITEM_SLOT_FEET) - var/uniform_compatible = FALSE - var/suit_compatible = FALSE - var/shoes_compatible = FALSE - if(!(human_owner.w_uniform) || (human_owner.w_uniform.supports_variations_flags & (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON))) //Checks uniform compatibility - uniform_compatible = TRUE - if((!human_owner.wear_suit) || (human_owner.wear_suit.supports_variations_flags & (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON)) || !(human_owner.wear_suit.body_parts_covered & LEGS)) //Checks suit compatability - suit_compatible = TRUE - if((worn_shoes == null) || (worn_shoes.supports_variations_flags & (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON))) - shoes_compatible = TRUE - - if((uniform_compatible && suit_compatible && shoes_compatible) || (suit_compatible && shoes_compatible && human_owner.wear_suit?.flags_inv & HIDEJUMPSUIT)) //If the uniform is hidden, it doesnt matter if its compatible - limb_id = BODYPART_ID_DIGITIGRADE - - else - limb_id = SPECIES_LIZARD -======= var/old_id = limb_id limb_id = owner?.is_digitigrade_squished() ? SPECIES_LIZARD : BODYPART_ID_DIGITIGRADE if(old_id != limb_id) @@ -110,7 +63,6 @@ for(var/obj/item/thing as anything in owner?.get_equipped_items()) if(thing.supports_variations_flags & DIGITIGRADE_VARIATIONS) thing.update_slot_icon() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/bodypart/leg/right/digitigrade icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi' @@ -120,27 +72,6 @@ /obj/item/bodypart/leg/right/digitigrade/update_limb(dropping_limb = FALSE, is_creating = FALSE) . = ..() -<<<<<<< HEAD - if(ishuman(owner)) - var/mob/living/carbon/human/human_owner = owner - var/obj/item/clothing/shoes/worn_shoes = human_owner.get_item_by_slot(ITEM_SLOT_FEET) - var/uniform_compatible = FALSE - var/suit_compatible = FALSE - var/shoes_compatible = FALSE - if(!(human_owner.w_uniform) || (human_owner.w_uniform.supports_variations_flags & (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON))) //Checks uniform compatibility - uniform_compatible = TRUE - if((!human_owner.wear_suit) || (human_owner.wear_suit.supports_variations_flags & (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON)) || !(human_owner.wear_suit.body_parts_covered & LEGS)) //Checks suit compatability - suit_compatible = TRUE - if((worn_shoes == null) || (worn_shoes.supports_variations_flags & (CLOTHING_DIGITIGRADE_VARIATION|CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON))) - shoes_compatible = TRUE - - if((uniform_compatible && suit_compatible && shoes_compatible) || (suit_compatible && shoes_compatible && human_owner.wear_suit?.flags_inv & HIDEJUMPSUIT)) //If the uniform is hidden, it doesnt matter if its compatible - limb_id = BODYPART_ID_DIGITIGRADE - - else - limb_id = SPECIES_LIZARD -*/ -======= var/old_id = limb_id limb_id = owner?.is_digitigrade_squished() ? SPECIES_LIZARD : BODYPART_ID_DIGITIGRADE if(old_id != limb_id) @@ -148,4 +79,4 @@ for(var/obj/item/thing as anything in owner?.get_equipped_items()) if(thing.supports_variations_flags & DIGITIGRADE_VARIATIONS) thing.update_slot_icon() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +*/ diff --git a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm index 8f363f7a16d..85f25dd7149 100644 --- a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm @@ -252,11 +252,7 @@ limb_id = SPECIES_FLYPERSON is_dimorphic = FALSE should_draw_greyscale = FALSE -<<<<<<< HEAD head_flags = HEAD_HAIR|HEAD_FACIAL_HAIR|HEAD_EYESPRITES|HEAD_EYEHOLES|HEAD_DEBRAIN // SKYRAT EDIT - Flies deserve hair - ORIGINAL: head_flags = HEAD_EYESPRITES|HEAD_EYEHOLES|HEAD_DEBRAIN -======= - head_flags = HEAD_EYESPRITES|HEAD_EYEHOLES|HEAD_DEBRAIN ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 teeth_count = 0 bodypart_traits = list(TRAIT_ANTENNAE) diff --git a/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm index ea62b65d3f9..c960d3b7a7b 100644 --- a/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm @@ -1,7 +1,4 @@ -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - Moved to modular_skyrat\master_files\code\modules\surgery\bodyparts\species_parts\moth_bodyparts.dm -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/bodypart/head/moth icon = 'icons/mob/human/species/moth/bodyparts.dmi' icon_state = "moth_head" @@ -63,7 +60,4 @@ icon_static = 'icons/mob/human/species/moth/bodyparts.dmi' limb_id = SPECIES_MOTH should_draw_greyscale = FALSE -<<<<<<< HEAD */ // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm index 1b0da47e2f1..19bfa06f605 100644 --- a/code/modules/surgery/coronary_bypass.dm +++ b/code/modules/surgery/coronary_bypass.dm @@ -13,11 +13,7 @@ ) /datum/surgery/gastrectomy/mechanic -<<<<<<< HEAD - name = "Engine Diagnostic (Heart)" // Nova Edit: Original name = "Engine Diagnostic" -======= - name = "Engine Diagnostic" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + name = "Engine Diagnostic (Heart Repair)" // SKYRAT EDIT: Original name = "Engine Diagnostic" requires_bodypart_type = BODYTYPE_ROBOTIC steps = list( /datum/surgery_step/mechanic_open, diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm index 87fc6cad778..a8c7c7825b6 100644 --- a/code/modules/surgery/healing.dm +++ b/code/modules/surgery/healing.dm @@ -1,10 +1,6 @@ /datum/surgery/healing target_mobtypes = list(/mob/living) -<<<<<<< HEAD requires_bodypart_type = BODYTYPE_ORGANIC //SKYRAT EDIT CHANGE - ORIGINAL VALUE: requires_bodypart_type = FALSE -======= - requires_bodypart_type = NONE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 replaced_by = /datum/surgery surgery_flags = SURGERY_IGNORE_CLOTHES | SURGERY_REQUIRE_RESTING possible_locs = list(BODY_ZONE_CHEST) diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm index 049eaf78c10..7c11ef3b98e 100644 --- a/code/modules/surgery/limb_augmentation.dm +++ b/code/modules/surgery/limb_augmentation.dm @@ -59,10 +59,7 @@ /datum/surgery_step/clamp_bleeders, /datum/surgery_step/replace_limb, ) -<<<<<<< HEAD removes_target_bodypart = TRUE // SKYRAT EDIT ADDITION - Surgically unremovable limbs -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 //SURGERY STEP SUCCESSES diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm index 96d7eecaebc..a31af5f69cc 100644 --- a/code/modules/surgery/lobectomy.dm +++ b/code/modules/surgery/lobectomy.dm @@ -68,16 +68,11 @@ if(ishuman(target)) var/mob/living/carbon/human/human_target = target var/obj/item/organ/internal/lungs/target_lungs = human_target.get_organ_slot(ORGAN_SLOT_LUNGS) -<<<<<<< HEAD - target_lungs.operated = TRUE - human_target.setOrganLoss(ORGAN_SLOT_LUNGS, 60) -======= human_target.setOrganLoss(ORGAN_SLOT_LUNGS, 60) if(target_lungs) target_lungs.operated = TRUE if(target_lungs.organ_flags & ORGAN_EMP) //If our organ is failing due to an EMP, fix that target_lungs.organ_flags &= ~ORGAN_EMP ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 display_results( user, target, diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm index 42ebacdb7e0..b777a2101d6 100644 --- a/code/modules/surgery/organ_manipulation.dm +++ b/code/modules/surgery/organ_manipulation.dm @@ -239,24 +239,6 @@ tool = tool.contents[1] target_organ = tool user.temporarilyRemoveItemFromInventory(target_organ, TRUE) -<<<<<<< HEAD - if(target_organ.Insert(target)) - if(apparatus) - apparatus.icon_state = initial(apparatus.icon_state) - apparatus.desc = initial(apparatus.desc) - apparatus.cut_overlays() - display_results( - user, - target, - span_notice("You insert [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]."), - span_notice("[user] inserts [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"), - span_notice("[user] inserts something into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"), - ) - display_pain(target, "Your [target.parse_zone_with_bodypart(target_zone)] throbs with pain as your new [tool.name] comes to life!") - target_organ.on_surgical_insertion(user, target, target_zone, tool) - else - target_organ.forceMove(target.loc) -======= target_organ.Insert(target) if(apparatus) apparatus.icon_state = initial(apparatus.icon_state) @@ -271,7 +253,6 @@ ) display_pain(target, "Your [target.parse_zone_with_bodypart(target_zone)] throbs with pain as your new [tool.name] comes to life!") target_organ.on_surgical_insertion(user, target, target_zone, tool) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else if(current_type == "extract") if(target_organ && target_organ.owner == target) @@ -311,11 +292,7 @@ ///only operate on internal organs /datum/surgery_step/manipulate_organs/internal/can_use_organ(mob/user, obj/item/organ/organ) -<<<<<<< HEAD return isinternalorgan(organ) && !(organ.organ_flags & ORGAN_UNREMOVABLE) // SKYRAT EDIT - Don't show unremovable organs - ORIGINAL: return isinternalorgan(organ) -======= - return isinternalorgan(organ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///prosthetic surgery gives full effectiveness to crowbars (and hemostats) /datum/surgery_step/manipulate_organs/internal/mechanic @@ -329,11 +306,7 @@ ///Only operate on external organs /datum/surgery_step/manipulate_organs/external/can_use_organ(mob/user, obj/item/organ/organ) -<<<<<<< HEAD return isexternalorgan(organ) && !(organ.organ_flags & ORGAN_UNREMOVABLE) // SKYRAT EDIT - Don't show unremovable organs - ORIGINAL: return isexternalorgan(organ) -======= - return isexternalorgan(organ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///prosthetic surgery gives full effectiveness to crowbars (and hemostats) /datum/surgery_step/manipulate_organs/external/mechanic diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm index 736e417184e..4d28b987abc 100644 --- a/code/modules/surgery/organs/_organ.dm +++ b/code/modules/surgery/organs/_organ.dm @@ -1,7 +1,3 @@ -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ name = "organ" icon = 'icons/obj/medical/organs/organs.dmi' @@ -82,12 +78,9 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) volume = reagent_vol,\ after_eat = CALLBACK(src, PROC_REF(OnEatFrom))) -<<<<<<< HEAD -======= if(bodypart_overlay) setup_bodypart_overlay() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/Destroy() if(bodypart_owner && !owner && !QDELETED(bodypart_owner)) bodypart_remove(bodypart_owner) @@ -149,11 +142,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) return /obj/item/organ/proc/on_life(seconds_per_tick, times_fired) -<<<<<<< HEAD - CRASH("Oh god oh fuck something is calling parent organ life") -======= return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/examine(mob/user) . = ..() @@ -355,8 +344,6 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) /// Tries to replace the existing organ on the passed mob with this one, with special handling for replacing a brain without ghosting target /obj/item/organ/proc/replace_into(mob/living/carbon/new_owner) return Insert(new_owner, special = TRUE, movement_flags = DELETE_IF_REPLACED) -<<<<<<< HEAD -======= /// Get all possible organ slots by checking every organ, and then store it and give it whenever needed @@ -370,4 +357,3 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) all_organ_slots |= initial(an_organ.slot) return all_organ_slots ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/surgery/organs/external/restyling.dm b/code/modules/surgery/organs/external/restyling.dm index 4ed1d555ecf..f862d9e9c08 100644 --- a/code/modules/surgery/organs/external/restyling.dm +++ b/code/modules/surgery/organs/external/restyling.dm @@ -1,14 +1,7 @@ -<<<<<<< HEAD -//Contains a bunch of procs for different types, but in the end it just lets you restyle external_organs so thats why its here - -///Helper proc to fetch a list of styles a player might want to restyle their features into during the round : returns list("Cabbage" = /datum/sprite_accessory/cabbage) -/obj/item/organ/external/proc/get_valid_restyles() -======= //Contains a bunch of procs for different types, but in the end it just lets you restyle the bodypart overlay so thats why its here ///Helper proc to fetch a list of styles a player might want to restyle their features into during the round : returns list("Cabbage" = /datum/sprite_accessory/cabbage) /obj/item/organ/proc/get_valid_restyles() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/valid_restyles valid_restyles = list() @@ -38,30 +31,18 @@ ///Asks the external organs inside the limb if they can restyle /obj/item/bodypart/proc/attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) var/list/valid_features = list() -<<<<<<< HEAD - for(var/obj/item/organ/external/feature in contents) - if(feature.restyle_flags & restyle_type) - valid_features.Add(feature) - - var/obj/item/organ/external/target_organ -======= for(var/obj/item/organ/feature in contents) if(feature.restyle_flags & restyle_type) valid_features.Add(feature) var/obj/item/organ/target_organ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 switch(LAZYLEN(valid_features)) if(1) target_organ = valid_features[1] if(2 to INFINITY) var/choose_options = list() var/name_to_organ = list() //literally so I dont have to loop again after someones made their choice -<<<<<<< HEAD - for(var/obj/item/organ/external/organ_choice as anything in valid_features) -======= for(var/obj/item/organ/organ_choice as anything in valid_features) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 choose_options[organ_choice.name] = image(organ_choice) name_to_organ[organ_choice.name] = organ_choice var/picked_option = show_radial_menu(trimmer, original_target, choose_options, radius = 38, require_near = TRUE) @@ -76,11 +57,7 @@ target_organ.attempt_feature_restyle(source, trimmer, original_target, body_zone, restyle_type, style_speed) ///Invoke async so we dont break signals -<<<<<<< HEAD -/obj/item/organ/external/proc/on_attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) -======= /obj/item/organ/proc/on_attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SIGNAL_HANDLER if(restyle_flags & restyle_type) @@ -89,11 +66,7 @@ to_chat(trimmer, span_warning("This tool is incompatible with the [src.name]!")) ///Restyles the external organ from a list of valid options -<<<<<<< HEAD -/obj/item/organ/external/proc/attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) -======= /obj/item/organ/proc/attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/restyles = get_valid_restyles() var/new_style = tgui_input_list(trimmer, "Select a new style", "Grooming", restyles) @@ -107,8 +80,4 @@ span_notice("You successfully change [original_target == trimmer ? "your" : original_target.name + "'s"] [name].") ) -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 simple_change_sprite(restyles[new_style]) //turn name to type and pass it on diff --git a/code/modules/surgery/organs/external/spines.dm b/code/modules/surgery/organs/external/spines.dm index ff93b774842..c7b49df959f 100644 --- a/code/modules/surgery/organs/external/spines.dm +++ b/code/modules/surgery/organs/external/spines.dm @@ -9,30 +9,18 @@ preference = "feature_lizard_spines" -<<<<<<< HEAD //dna_block = DNA_SPINES_BLOCK // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA. -======= - dna_block = DNA_SPINES_BLOCK ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 restyle_flags = EXTERNAL_RESTYLE_FLESH bodypart_overlay = /datum/bodypart_overlay/mutant/spines -<<<<<<< HEAD -/obj/item/organ/external/spines/Insert(mob/living/carbon/receiver, special, movement_flags) -======= /obj/item/organ/external/spines/mob_insert(mob/living/carbon/receiver, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // If we have a tail, attempt to add a tail spines overlay var/obj/item/organ/external/tail/our_tail = receiver.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) our_tail?.try_insert_tail_spines(our_tail.bodypart_owner) return ..() -<<<<<<< HEAD -/obj/item/organ/external/spines/Remove(mob/living/carbon/organ_owner, special, movement_flags) -======= /obj/item/organ/external/spines/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // If we have a tail, remove any tail spines overlay var/obj/item/organ/external/tail/our_tail = organ_owner.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) our_tail?.remove_tail_spines(our_tail.bodypart_owner) @@ -44,11 +32,7 @@ feature_key = "spines" /datum/bodypart_overlay/mutant/spines/get_global_feature_list() -<<<<<<< HEAD return SSaccessories.sprite_accessories["spines"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.spines_list -======= - return SSaccessories.spines_list ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bodypart_overlay/mutant/spines/can_draw_on_bodypart(mob/living/carbon/human/human) . = ..() diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm index 8e87f8d1eff..89ef9599d45 100644 --- a/code/modules/surgery/organs/external/tails.dm +++ b/code/modules/surgery/organs/external/tails.dm @@ -7,11 +7,7 @@ zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_EXTERNAL_TAIL -<<<<<<< HEAD //dna_block = DNA_TAIL_BLOCK // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA. -======= - dna_block = DNA_TAIL_BLOCK ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 restyle_flags = EXTERNAL_RESTYLE_FLESH // defaults to cat, but the parent type shouldn't be created regardless @@ -24,11 +20,7 @@ ///The overlay for tail spines, if any var/datum/bodypart_overlay/mutant/tail_spines/tail_spines_overlay -<<<<<<< HEAD -/obj/item/organ/external/tail/Insert(mob/living/carbon/receiver, special, movement_flags) -======= /obj/item/organ/external/tail/mob_insert(mob/living/carbon/receiver, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) receiver.clear_mood_event("tail_lost") @@ -42,11 +34,7 @@ // If it's not your tail AND of different species, we are horrified if(IS_WEAKREF_OF(receiver, original_owner)) receiver.add_mood_event("tail_regained", /datum/mood_event/tail_regained_right) -<<<<<<< HEAD - else if(type in receiver.dna.species.external_organs) -======= else if(type in receiver.dna.species.mutant_organs) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 receiver.add_mood_event("tail_regained", /datum/mood_event/tail_regained_species) else receiver.add_mood_event("tail_regained", /datum/mood_event/tail_regained_wrong) @@ -76,17 +64,12 @@ tail_spines_overlay = new tail_spines_overlay.tail_spine_key = tail_spine_key -<<<<<<< HEAD // SKYRAT EDIT ADDITION START if(!bodypart.owner.dna.mutant_bodyparts["spines"]) bodypart.owner.dna.mutant_bodyparts["spines"][MUTANT_INDEX_NAME] = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) // SKYRAT EDIT ADDITION END var/feature_name = bodypart.owner.dna.mutant_bodyparts["spines"][MUTANT_INDEX_NAME] // SKYRAT EDIT CHANGE - ORIGINAL: var/feature_name = bodypart.owner.dna.features["spines"] //tail spines don't live in DNA, but share feature names with regular spines tail_spines_overlay.set_appearance_from_dna(bodypart.owner.dna, feature_name, feature_key = "spines") // SKYRAT EDIT CHANGE - ORIGINAL: tail_spines_overlay.set_appearance_from_name(feature_name) -======= - var/feature_name = bodypart.owner.dna.features["spines"] //tail spines don't live in DNA, but share feature names with regular spines - tail_spines_overlay.set_appearance_from_name(feature_name) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bodypart.add_bodypart_overlay(tail_spines_overlay) /// If we have a tail spines overlay, delete it @@ -104,11 +87,7 @@ organ_owner.clear_mood_event("tail_regained") -<<<<<<< HEAD - if(type in organ_owner.dna.species.external_organs) -======= if(type in organ_owner.dna.species.mutant_organs) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 organ_owner.add_mood_event("tail_lost", /datum/mood_event/tail_lost) organ_owner.add_mood_event("tail_balance_lost", /datum/mood_event/tail_balance_lost) @@ -165,23 +144,17 @@ ///Tail parent type, with wagging functionality /datum/bodypart_overlay/mutant/tail layers = EXTERNAL_FRONT|EXTERNAL_BEHIND -<<<<<<< HEAD feature_key = "tail" // SKYRAT EDIT - Customization - ORIGINAL: feature_key = "tail_monkey" -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/wagging = FALSE /datum/bodypart_overlay/mutant/tail/get_base_icon_state() return "[wagging ? "wagging_" : ""][sprite_datum.icon_state]" //add the wagging tag if we be wagging -<<<<<<< HEAD // SKYRAT EDIT ADDITION - CUSTOMIZATION /datum/bodypart_overlay/mutant/tail/get_global_feature_list() return SSaccessories.sprite_accessories["tail"] // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bodypart_overlay/mutant/tail/can_draw_on_bodypart(mob/living/carbon/human/human) if(human.wear_suit && (human.wear_suit.flags_inv & HIDEJUMPSUIT)) return FALSE @@ -196,24 +169,15 @@ wag_flags = WAG_ABLE /datum/bodypart_overlay/mutant/tail/get_global_feature_list() -<<<<<<< HEAD return SSaccessories.sprite_accessories["tail"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.tails_list_human -======= - return SSaccessories.tails_list_human ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/external/tail/cat/get_butt_sprite() return icon('icons/mob/butts.dmi', BUTT_SPRITE_CAT) ///Cat tail bodypart overlay /datum/bodypart_overlay/mutant/tail/cat -<<<<<<< HEAD feature_key = "tail" // SKYRAT EDIT - Customization - ORIGINAL: feature_key = "tail_cat" // color_source = ORGAN_COLOR_HAIR // SKYRAT EDIT REMOVAL -======= - feature_key = "tail_cat" - color_source = ORGAN_COLOR_HAIR ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/external/tail/monkey name = "monkey tail" @@ -226,11 +190,7 @@ ///Monkey tail bodypart overlay /datum/bodypart_overlay/mutant/tail/monkey color_source = NONE -<<<<<<< HEAD feature_key = "tail" // SKYRAT EDIT - Customization - ORIGINAL: feature_key = "tail_monkey" -======= - feature_key = "tail_monkey" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bodypart_overlay/mutant/tail/monkey/get_global_feature_list() return SSaccessories.tails_list_monkey @@ -243,7 +203,6 @@ bodypart_overlay = /datum/bodypart_overlay/mutant/tail/lizard wag_flags = WAG_ABLE -<<<<<<< HEAD //dna_block = DNA_LIZARD_TAIL_BLOCK // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA. ///Lizard tail bodypart overlay datum @@ -252,16 +211,6 @@ /datum/bodypart_overlay/mutant/tail/lizard/get_global_feature_list() return SSaccessories.sprite_accessories["tail"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.tails_list_lizard -======= - dna_block = DNA_LIZARD_TAIL_BLOCK - -///Lizard tail bodypart overlay datum -/datum/bodypart_overlay/mutant/tail/lizard - feature_key = "tail_lizard" - -/datum/bodypart_overlay/mutant/tail/lizard/get_global_feature_list() - return SSaccessories.tails_list_lizard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/external/tail/lizard/fake name = "fabricated lizard tail" @@ -277,11 +226,7 @@ var/tail_spine_key = NONE /datum/bodypart_overlay/mutant/tail_spines/get_global_feature_list() -<<<<<<< HEAD return SSaccessories.sprite_accessories["tailspines"] // SKYRAT EDIT CHANGE - ORIGINAL: return SSaccessories.tail_spines_list -======= - return SSaccessories.tail_spines_list ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/bodypart_overlay/mutant/tail_spines/get_base_icon_state() return (!isnull(tail_spine_key) ? "[tail_spine_key]_" : "") + (wagging ? "wagging_" : "") + sprite_datum.icon_state // Select the wagging state if appropriate diff --git a/code/modules/surgery/organs/external/wings/functional_wings.dm b/code/modules/surgery/organs/external/wings/functional_wings.dm index 9dd80d36731..61655be60cd 100644 --- a/code/modules/surgery/organs/external/wings/functional_wings.dm +++ b/code/modules/surgery/organs/external/wings/functional_wings.dm @@ -35,25 +35,14 @@ QDEL_NULL(fly) return ..() -<<<<<<< HEAD -/obj/item/organ/external/wings/functional/Insert(mob/living/carbon/receiver, special, movement_flags) - . = ..() - if(!.) - return -======= /obj/item/organ/external/wings/functional/mob_insert(mob/living/carbon/receiver, special, movement_flags) . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(QDELETED(fly)) fly = new fly.Grant(receiver) -<<<<<<< HEAD -/obj/item/organ/external/wings/functional/Remove(mob/living/carbon/organ_owner, special, movement_flags) -======= /obj/item/organ/external/wings/functional/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() fly?.Remove(organ_owner) if(wings_open) @@ -156,15 +145,11 @@ var/open_feature_key = "wingsopen" /datum/bodypart_overlay/mutant/wings/functional/get_global_feature_list() -<<<<<<< HEAD /* SKYRAT EDIT - CUSTOMIZATION - ORIGINAL: -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(wings_open) return SSaccessories.wings_open_list else return SSaccessories.wings_list -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END // SKYRAT EDIT ADDITION START if(wings_open) @@ -172,9 +157,6 @@ return SSaccessories.sprite_accessories["wings"] // SKYRAT EDIT ADDITION END -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Update our wingsprite to the open wings variant /datum/bodypart_overlay/mutant/wings/functional/proc/open_wings() wings_open = TRUE diff --git a/code/modules/surgery/organs/external/wings/moth_wings.dm b/code/modules/surgery/organs/external/wings/moth_wings.dm index 896661c8931..3ddf98ee17b 100644 --- a/code/modules/surgery/organs/external/wings/moth_wings.dm +++ b/code/modules/surgery/organs/external/wings/moth_wings.dm @@ -5,11 +5,7 @@ preference = "feature_moth_wings" -<<<<<<< HEAD //dna_block = DNA_MOTH_WINGS_BLOCK // SKYRAT EDIT REMOVAL -======= - dna_block = DNA_MOTH_WINGS_BLOCK ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bodypart_overlay = /datum/bodypart_overlay/mutant/wings/moth @@ -78,11 +74,7 @@ ///Moth wing bodypart overlay, including burn functionality! /datum/bodypart_overlay/mutant/wings/moth -<<<<<<< HEAD feature_key = "wings" // SKYRAT EDIT - Customization - ORIGINAL: feature_key = "moth_wings" -======= - feature_key = "moth_wings" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 layers = EXTERNAL_BEHIND | EXTERNAL_FRONT ///Accessory datum of the burn sprite var/datum/sprite_accessory/burn_datum = /datum/sprite_accessory/moth_wings/burnt_off @@ -95,19 +87,11 @@ burn_datum = fetch_sprite_datum(burn_datum) /datum/bodypart_overlay/mutant/wings/moth/get_global_feature_list() -<<<<<<< HEAD return SSaccessories.sprite_accessories["wings"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.moth_wings_list /datum/bodypart_overlay/mutant/wings/moth/can_draw_on_bodypart(mob/living/carbon/human/human) if(!(human.wear_suit?.flags_inv & HIDEMUTWINGS)) return ..(human, ignore_suit = TRUE) // SKYRAT EDIT - Customization - ORIGINAL: return TRUE -======= - return SSaccessories.moth_wings_list - -/datum/bodypart_overlay/mutant/wings/moth/can_draw_on_bodypart(mob/living/carbon/human/human) - if(!(human.wear_suit?.flags_inv & HIDEMUTWINGS)) - return TRUE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE /datum/bodypart_overlay/mutant/wings/moth/get_base_icon_state() diff --git a/code/modules/surgery/organs/external/wings/wings.dm b/code/modules/surgery/organs/external/wings/wings.dm index 894c0fb05d2..62efd492530 100644 --- a/code/modules/surgery/organs/external/wings/wings.dm +++ b/code/modules/surgery/organs/external/wings/wings.dm @@ -31,7 +31,3 @@ return TRUE return FALSE -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/surgery/organs/internal/appendix/_appendix.dm b/code/modules/surgery/organs/internal/appendix/_appendix.dm index 8dc22c6b8ff..a75d700e1e5 100644 --- a/code/modules/surgery/organs/internal/appendix/_appendix.dm +++ b/code/modules/surgery/organs/internal/appendix/_appendix.dm @@ -6,11 +6,6 @@ name = "appendix" icon_state = "appendix" base_icon_state = "appendix" -<<<<<<< HEAD - visual = FALSE -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_APPENDIX food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/bad_food = 5) diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm b/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm index 930bfb06271..aa67fe0c08d 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm @@ -27,16 +27,6 @@ eye_owner.remove_traits(HUD_traits, ORGAN_TRAIT) balloon_alert(eye_owner, "hud enabled") -<<<<<<< HEAD -/obj/item/organ/internal/cyberimp/eyes/hud/Insert(mob/living/carbon/eye_owner, special = FALSE, movement_flags) - . = ..() - if(!.) - return - eye_owner.add_traits(HUD_traits, ORGAN_TRAIT) - toggled_on = TRUE - -/obj/item/organ/internal/cyberimp/eyes/hud/Remove(mob/living/carbon/eye_owner, special, movement_flags) -======= /obj/item/organ/internal/cyberimp/eyes/hud/mob_insert(mob/living/carbon/eye_owner, special = FALSE, movement_flags) . = ..() @@ -44,7 +34,6 @@ toggled_on = TRUE /obj/item/organ/internal/cyberimp/eyes/hud/mob_remove(mob/living/carbon/eye_owner, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() eye_owner.remove_traits(HUD_traits, ORGAN_TRAIT) toggled_on = FALSE diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm index 55a488706cc..6fa9924abc2 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm @@ -2,11 +2,6 @@ /obj/item/organ/internal/cyberimp name = "cybernetic implant" desc = "A state-of-the-art implant that improves a baseline's functionality." -<<<<<<< HEAD - visual = FALSE -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 organ_flags = ORGAN_ROBOTIC failing_desc = "seems to be broken." var/implant_color = COLOR_WHITE diff --git a/code/modules/surgery/organs/internal/ears/_ears.dm b/code/modules/surgery/organs/internal/ears/_ears.dm index 7f2cf3b021f..53b95b54d9b 100644 --- a/code/modules/surgery/organs/internal/ears/_ears.dm +++ b/code/modules/surgery/organs/internal/ears/_ears.dm @@ -4,10 +4,6 @@ desc = "There are three parts to the ear. Inner, middle and outer. Only one of these parts should be normally visible." zone = BODY_ZONE_HEAD slot = ORGAN_SLOT_EARS -<<<<<<< HEAD - visual = FALSE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gender = PLURAL healing_factor = STANDARD_ORGAN_HEALING @@ -139,34 +135,6 @@ icon_state = "kitty" visual = TRUE damage_multiplier = 2 -<<<<<<< HEAD - // Keeps track of which cat ears sprite is associated with this. - var/variant = "Cat" - -/obj/item/organ/internal/ears/cat/Initialize(mapload, variant_pref) - . = ..() - if(variant_pref) - variant = variant_pref - -//SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION -/* -/obj/item/organ/internal/ears/cat/on_mob_insert(mob/living/carbon/human/ear_owner) - . = ..() - if(istype(ear_owner) && ear_owner.dna) - color = ear_owner.hair_color - ear_owner.dna.features["ears"] = ear_owner.dna.species.mutant_bodyparts["ears"] = variant - ear_owner.dna.update_uf_block(DNA_EARS_BLOCK) - ear_owner.update_body() - -/obj/item/organ/internal/ears/cat/on_mob_remove(mob/living/carbon/human/ear_owner) - . = ..() - if(istype(ear_owner) && ear_owner.dna) - color = ear_owner.hair_color - ear_owner.dna.species.mutant_bodyparts -= "ears" - ear_owner.update_body() -*/ -//SKYRAT EDIT REMOVAL END -======= preference = "feature_human_ears" @@ -195,7 +163,6 @@ if(draw_layer != bitflag_to_layer(colorless_layer)) return ..() return overlay ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/ears/penguin name = "penguin ears" diff --git a/code/modules/surgery/organs/internal/eyes/_eyes.dm b/code/modules/surgery/organs/internal/eyes/_eyes.dm index 1991a7f5a06..fe21ba8daa5 100644 --- a/code/modules/surgery/organs/internal/eyes/_eyes.dm +++ b/code/modules/surgery/organs/internal/eyes/_eyes.dm @@ -50,38 +50,21 @@ /// indication that the eyes are undergoing some negative effect var/damaged = FALSE /// Native FOV that will be applied if a config is enabled -<<<<<<< HEAD - var/native_fov = FOV_180_DEGREES //SKYRAT EDIT CHANGE + var/native_fov = FOV_180_DEGREES //SKYRAT EDIT CHANGE - Original FOV_90_DEGREES -/obj/item/organ/internal/eyes/Insert(mob/living/carbon/eye_recipient, special = FALSE, movement_flags = DELETE_IF_REPLACED) - // If we don't do this before everything else, heterochromia will be reset leading to eye_color_right no longer being accurate - if(ishuman(eye_recipient)) - var/mob/living/carbon/human/human_recipient = eye_recipient -======= - var/native_fov = FOV_90_DEGREES /obj/item/organ/internal/eyes/mob_insert(mob/living/carbon/receiver, special, movement_flags) // If we don't do this before everything else, heterochromia will be reset leading to eye_color_right no longer being accurate if(ishuman(receiver)) var/mob/living/carbon/human/human_recipient = receiver ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 old_eye_color_left = human_recipient.eye_color_left old_eye_color_right = human_recipient.eye_color_right . = ..() -<<<<<<< HEAD - if(!.) - return - - eye_recipient.cure_blind(NO_EYES) - apply_damaged_eye_effects() - refresh(eye_recipient, call_update = TRUE) -======= receiver.cure_blind(NO_EYES) apply_damaged_eye_effects() refresh(receiver, call_update = TRUE) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// Refreshes the visuals of the eyes /// If call_update is TRUE, we also will call update_body @@ -106,7 +89,6 @@ if(CONFIG_GET(flag/native_fov) && native_fov) affected_human.add_fov_trait(type, native_fov) -<<<<<<< HEAD // SKYRAT EDIT ADDITION - EMISSIVES if (affected_human.emissive_eyes) is_emissive = TRUE @@ -115,48 +97,21 @@ if(call_update) affected_human.update_body() -/obj/item/organ/internal/eyes/Remove(mob/living/carbon/eye_owner, special, movement_flags) - . = ..() - if(ishuman(eye_owner)) - var/mob/living/carbon/human/human_owner = eye_owner -======= - if(call_update) - affected_human.update_body() - /obj/item/organ/internal/eyes/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) . = ..() if(ishuman(organ_owner)) var/mob/living/carbon/human/human_owner = organ_owner ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(initial(eye_color_left)) human_owner.eye_color_left = old_eye_color_left if(initial(eye_color_right)) human_owner.eye_color_right = old_eye_color_right if(native_fov) -<<<<<<< HEAD - eye_owner.remove_fov_trait(type) -======= organ_owner.remove_fov_trait(type) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!special) human_owner.update_body() // Cure blindness from eye damage -<<<<<<< HEAD - eye_owner.cure_blind(EYE_DAMAGE) - eye_owner.cure_nearsighted(EYE_DAMAGE) - // Eye blind and temp blind go to, even if this is a bit of cheesy way to clear blindness - eye_owner.remove_status_effect(/datum/status_effect/eye_blur) - eye_owner.remove_status_effect(/datum/status_effect/temporary_blindness) - // Then become blind anyways (if not special) - if(!special) - eye_owner.become_blind(NO_EYES) - - eye_owner.update_tint() - eye_owner.update_sight() - is_emissive = FALSE // SKYRAT EDIT ADDITION -======= organ_owner.cure_blind(EYE_DAMAGE) organ_owner.cure_nearsighted(EYE_DAMAGE) // Eye blind and temp blind go to, even if this is a bit of cheesy way to clear blindness @@ -168,7 +123,7 @@ organ_owner.update_tint() organ_owner.update_sight() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + is_emissive = FALSE // SKYRAT EDIT ADDITION #define OFFSET_X 1 #define OFFSET_Y 2 @@ -178,29 +133,19 @@ if(!istype(parent) || parent.get_organ_by_type(/obj/item/organ/internal/eyes) != src) CRASH("Generating a body overlay for [src] targeting an invalid parent '[parent]'.") - if(isnull(eye_icon_state)) + if(isnull(eye_icon_state) || eye_icon_state == "None") // SKYRAT EDIT - Synths, adds eye_icon_state == "None" return list() -<<<<<<< HEAD var/eye_icon = parent.dna?.species.eyes_icon || 'icons/mob/human/human_face.dmi' // SKYRAT EDIT ADDITION var/mutable_appearance/eye_left = mutable_appearance(eye_icon, "[eye_icon_state]_l", -eyes_layer) // SKYRAT EDIT CHANGE - Customization - ORIGINAL: var/mutable_appearance/eye_left = mutable_appearance('icons/mob/human/human_face.dmi', "[eye_icon_state]_l", -BODY_LAYER) var/mutable_appearance/eye_right = mutable_appearance(eye_icon, "[eye_icon_state]_r", -eyes_layer) // SKYRAT EDIT CHANGE - Customization - ORIGINAL: var/mutable_appearance/eye_right = mutable_appearance('icons/mob/human/human_face.dmi', "[eye_icon_state]_r", -BODY_LAYER) -======= - var/mutable_appearance/eye_left = mutable_appearance('icons/mob/human/human_face.dmi', "[eye_icon_state]_l", -BODY_LAYER) - var/mutable_appearance/eye_right = mutable_appearance('icons/mob/human/human_face.dmi', "[eye_icon_state]_r", -BODY_LAYER) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/overlays = list(eye_left, eye_right) var/obscured = parent.check_obscured_slots(TRUE) if(overlay_ignore_lighting && !(obscured & ITEM_SLOT_EYES)) -<<<<<<< HEAD overlays += emissive_appearance(eye_left.icon, eye_left.icon_state, parent, -eyes_layer, alpha = eye_left.alpha) // SKYRAT EDIT CHANGE - ORIGINAL: overlays += emissive_appearance(eye_left.icon, eye_left.icon_state, parent, -BODY_LAYER, alpha = eye_left.alpha) overlays += emissive_appearance(eye_right.icon, eye_right.icon_state, parent, -eyes_layer, alpha = eye_right.alpha) // SKYRAT EDIT CHANGE - ORIGINAL: overlays += emissive_appearance(eye_left.icon, eye_left.icon_state, parent, -BODY_LAYER, alpha = eye_left.alpha) -======= - overlays += emissive_appearance(eye_left.icon, eye_left.icon_state, parent, -BODY_LAYER, alpha = eye_left.alpha) - overlays += emissive_appearance(eye_right.icon, eye_right.icon_state, parent, -BODY_LAYER, alpha = eye_right.alpha) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/bodypart/head/my_head = parent.get_bodypart(BODY_ZONE_HEAD) if(my_head) if(my_head.head_flags & HEAD_EYECOLOR) @@ -210,12 +155,7 @@ my_head.worn_face_offset.apply_offset(eye_left) my_head.worn_face_offset.apply_offset(eye_right) -<<<<<<< HEAD - // SKYRAT EDIT START - Customization (Synths + Emissives) - if(eye_icon_state == "None") - eye_left.alpha = 0 - eye_right.alpha = 0 - + // SKYRAT EDIT START - Customization Emissives) if (is_emissive) // Because it was done all weird up there. var/mutable_appearance/emissive_left = emissive_appearance_copy(eye_left, owner) var/mutable_appearance/emissive_right = emissive_appearance_copy(eye_right, owner) @@ -229,8 +169,6 @@ // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return overlays #undef OFFSET_X @@ -511,11 +449,7 @@ deactivate(close_ui = TRUE) /// Set the initial color of the eyes on insert to be the mob's previous eye color. -<<<<<<< HEAD -/obj/item/organ/internal/eyes/robotic/glow/Insert(mob/living/carbon/eye_recipient, special = FALSE, movement_flags = DELETE_IF_REPLACED) -======= /obj/item/organ/internal/eyes/robotic/glow/mob_insert(mob/living/carbon/eye_recipient, special = FALSE, movement_flags = DELETE_IF_REPLACED) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() left_eye_color_string = old_eye_color_left right_eye_color_string = old_eye_color_right @@ -792,10 +726,7 @@ desc = "These eyes seem to have a large range, but might be cumbersome with glasses." eye_icon_state = "snail_eyes" icon_state = "snail_eyeballs" -<<<<<<< HEAD eyes_layer = ABOVE_BODY_FRONT_HEAD_LAYER //SKYRAT EDIT - Roundstart Snails -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/eyes/jelly name = "jelly eyes" diff --git a/code/modules/surgery/organs/internal/heart/_heart.dm b/code/modules/surgery/organs/internal/heart/_heart.dm index 7b7d8dcf622..b0c3ea4840d 100644 --- a/code/modules/surgery/organs/internal/heart/_heart.dm +++ b/code/modules/surgery/organs/internal/heart/_heart.dm @@ -3,11 +3,6 @@ desc = "I feel bad for the heartless bastard who lost this." icon_state = "heart-on" base_icon_state = "heart" -<<<<<<< HEAD - visual = FALSE -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_HEART item_flags = NO_BLOOD_ON_ITEM diff --git a/code/modules/surgery/organs/internal/heart/heart_ethereal.dm b/code/modules/surgery/organs/internal/heart/heart_ethereal.dm index c44c1d8034e..3e853a965b1 100644 --- a/code/modules/surgery/organs/internal/heart/heart_ethereal.dm +++ b/code/modules/surgery/organs/internal/heart/heart_ethereal.dm @@ -21,25 +21,14 @@ add_atom_colour(ethereal_color, FIXED_COLOUR_PRIORITY) update_appearance() -<<<<<<< HEAD -/obj/item/organ/internal/heart/ethereal/Insert(mob/living/carbon/heart_owner, special = FALSE, movement_flags) - . = ..() - if(!.) - return -======= /obj/item/organ/internal/heart/ethereal/mob_insert(mob/living/carbon/heart_owner, special = FALSE, movement_flags) . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RegisterSignal(heart_owner, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change)) RegisterSignal(heart_owner, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(on_owner_fully_heal)) RegisterSignal(heart_owner, COMSIG_QDELETING, PROC_REF(owner_deleted)) -<<<<<<< HEAD -/obj/item/organ/internal/heart/ethereal/Remove(mob/living/carbon/heart_owner, special, movement_flags) -======= /obj/item/organ/internal/heart/ethereal/mob_remove(mob/living/carbon/heart_owner, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UnregisterSignal(heart_owner, list(COMSIG_MOB_STATCHANGE, COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_QDELETING)) REMOVE_TRAIT(heart_owner, TRAIT_CORPSELOCKED, SPECIES_TRAIT) stop_crystalization_process(heart_owner) diff --git a/code/modules/surgery/organs/internal/liver/_liver.dm b/code/modules/surgery/organs/internal/liver/_liver.dm index 2a34b650d02..06488e5d7b1 100644 --- a/code/modules/surgery/organs/internal/liver/_liver.dm +++ b/code/modules/surgery/organs/internal/liver/_liver.dm @@ -1,21 +1,12 @@ #define LIVER_DEFAULT_TOX_TOLERANCE 3 //amount of toxins the liver can filter out #define LIVER_DEFAULT_TOX_RESISTANCE 1 //lower values lower how harmful toxins are to the liver -<<<<<<< HEAD #define LIVER_FAILURE_STAGE_SECONDS 180 //amount of seconds before liver failure reaches a new stage // SKYRAT EDIT CHANGE - Original: 60 -======= -#define LIVER_FAILURE_STAGE_SECONDS 60 //amount of seconds before liver failure reaches a new stage ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define MAX_TOXIN_LIVER_DAMAGE 2 //the max damage the liver can receive per second (~1 min at max damage will destroy liver) /obj/item/organ/internal/liver name = "liver" desc = "Pairing suggestion: chianti and fava beans." icon_state = "liver" -<<<<<<< HEAD - visual = FALSE -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_LIVER @@ -315,10 +306,6 @@ #undef HAS_NO_TOXIN #undef HAS_PAINFUL_TOXIN #undef LIVER_DEFAULT_TOX_TOLERANCE -<<<<<<< HEAD //#undef LIVER_DEFAULT_TOX_RESISTANCE // SKYRAT EDIT REMOVAL - Needed in modular -======= -#undef LIVER_DEFAULT_TOX_RESISTANCE ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef LIVER_FAILURE_STAGE_SECONDS #undef MAX_TOXIN_LIVER_DAMAGE diff --git a/code/modules/surgery/organs/internal/lungs/_lungs.dm b/code/modules/surgery/organs/internal/lungs/_lungs.dm index 8f551ce807d..88ce26d66a9 100644 --- a/code/modules/surgery/organs/internal/lungs/_lungs.dm +++ b/code/modules/surgery/organs/internal/lungs/_lungs.dm @@ -1,11 +1,6 @@ /obj/item/organ/internal/lungs name = "lungs" icon_state = "lungs" -<<<<<<< HEAD - visual = FALSE -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_LUNGS gender = PLURAL @@ -158,27 +153,16 @@ add_gas_reaction(/datum/gas/zauker, while_present = PROC_REF(too_much_zauker)) ///Simply exists so that you don't keep any alerts from your previous lack of lungs. -<<<<<<< HEAD -/obj/item/organ/internal/lungs/Insert(mob/living/carbon/receiver, special = FALSE, movement_flags) - . = ..() - if(!.) - return . -======= /obj/item/organ/internal/lungs/mob_insert(mob/living/carbon/receiver, special = FALSE, movement_flags) . = ..() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 receiver.clear_alert(ALERT_NOT_ENOUGH_OXYGEN) receiver.clear_alert(ALERT_NOT_ENOUGH_CO2) receiver.clear_alert(ALERT_NOT_ENOUGH_NITRO) receiver.clear_alert(ALERT_NOT_ENOUGH_PLASMA) receiver.clear_alert(ALERT_NOT_ENOUGH_N2O) -<<<<<<< HEAD -/obj/item/organ/internal/lungs/Remove(mob/living/carbon/organ_owner, special, movement_flags) -======= /obj/item/organ/internal/lungs/mob_remove(mob/living/carbon/organ_owner, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() // This is very "manual" I realize, but it's useful to ensure cleanup for gases we're removing happens // Avoids stuck alerts and such diff --git a/code/modules/surgery/organs/internal/stomach/_stomach.dm b/code/modules/surgery/organs/internal/stomach/_stomach.dm index f1bed46c891..7650f0e20a6 100644 --- a/code/modules/surgery/organs/internal/stomach/_stomach.dm +++ b/code/modules/surgery/organs/internal/stomach/_stomach.dm @@ -5,11 +5,6 @@ name = "stomach" desc = "Onaka ga suite imasu." icon_state = "stomach" -<<<<<<< HEAD - visual = FALSE -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_STOMACH @@ -201,10 +196,7 @@ ///This gets called after the owner takes a bite of food /obj/item/organ/internal/stomach/proc/after_eat(atom/edible) -<<<<<<< HEAD SEND_SIGNAL(src, COMSIG_STOMACH_AFTER_EAT, edible) // SKYRAT EDIT ADDITION - Hemophage Organs -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return /obj/item/organ/internal/stomach/proc/handle_disgust(mob/living/carbon/human/disgusted, seconds_per_tick, times_fired) @@ -254,19 +246,11 @@ disgusted.throw_alert(ALERT_DISGUST, /atom/movable/screen/alert/disgusted) disgusted.add_mood_event("disgust", /datum/mood_event/disgusted) -<<<<<<< HEAD -/obj/item/organ/internal/stomach/Insert(mob/living/carbon/receiver, special, movement_flags) - . = ..() - receiver.hud_used?.hunger?.update_appearance() - -/obj/item/organ/internal/stomach/Remove(mob/living/carbon/stomach_owner, special, movement_flags) -======= /obj/item/organ/internal/stomach/mob_insert(mob/living/carbon/receiver, special, movement_flags) . = ..() receiver.hud_used?.hunger?.update_appearance() /obj/item/organ/internal/stomach/mob_remove(mob/living/carbon/stomach_owner, special, movement_flags) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(ishuman(stomach_owner)) var/mob/living/carbon/human/human_owner = owner human_owner.clear_alert(ALERT_DISGUST) diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/internal/tongue/_tongue.dm index 66d9ebef2ce..07d030b2b39 100644 --- a/code/modules/surgery/organs/internal/tongue/_tongue.dm +++ b/code/modules/surgery/organs/internal/tongue/_tongue.dm @@ -2,11 +2,6 @@ name = "tongue" desc = "A fleshy muscle mostly used for lying." icon_state = "tongue" -<<<<<<< HEAD - visual = FALSE -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zone = BODY_ZONE_PRECISE_MOUTH slot = ORGAN_SLOT_TONGUE attack_verb_continuous = list("licks", "slobbers", "slaps", "frenches", "tongues") @@ -128,43 +123,17 @@ food_taste_reaction = FOOD_LIKED return food_taste_reaction -<<<<<<< HEAD -/obj/item/organ/internal/tongue/Insert(mob/living/carbon/tongue_owner, special = FALSE, movement_flags) - . = ..() - if(!.) - return - if(modifies_speech) - RegisterSignal(tongue_owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) - tongue_owner.voice_filter = voice_filter -======= /obj/item/organ/internal/tongue/mob_insert(mob/living/carbon/receiver, special, movement_flags) . = ..() if(modifies_speech) RegisterSignal(receiver, COMSIG_MOB_SAY, PROC_REF(handle_speech)) receiver.voice_filter = voice_filter ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* This could be slightly simpler, by making the removal of the * NO_TONGUE_TRAIT conditional on the tongue's `sense_of_taste`, but * then you can distinguish between ageusia from no tongue, and * ageusia from having a non-tasting tongue. */ -<<<<<<< HEAD - REMOVE_TRAIT(tongue_owner, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) - if(!sense_of_taste || (organ_flags & ORGAN_FAILING)) - ADD_TRAIT(tongue_owner, TRAIT_AGEUSIA, ORGAN_TRAIT) - apply_tongue_effects() - -/obj/item/organ/internal/tongue/Remove(mob/living/carbon/tongue_owner, special, movement_flags) - . = ..() - temp_say_mod = "" - UnregisterSignal(tongue_owner, COMSIG_MOB_SAY) - REMOVE_TRAIT(tongue_owner, TRAIT_SPEAKS_CLEARLY, SPEAKING_FROM_TONGUE) - REMOVE_TRAIT(tongue_owner, TRAIT_AGEUSIA, ORGAN_TRAIT) - // Carbons by default start with NO_TONGUE_TRAIT caused TRAIT_AGEUSIA - ADD_TRAIT(tongue_owner, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) - tongue_owner.voice_filter = initial(tongue_owner.voice_filter) -======= REMOVE_TRAIT(receiver, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) apply_tongue_effects() @@ -178,7 +147,6 @@ // Carbons by default start with NO_TONGUE_TRAIT caused TRAIT_AGEUSIA ADD_TRAIT(organ_owner, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) organ_owner.voice_filter = initial(organ_owner.voice_filter) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/tongue/apply_organ_damage(damage_amount, maximum = maxHealth, required_organ_flag) . = ..() @@ -188,10 +156,6 @@ /// Applies effects to our owner based on how damaged our tongue is /obj/item/organ/internal/tongue/proc/apply_tongue_effects() -<<<<<<< HEAD - //tongues can't taste food when they are failing -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(sense_of_taste) //tongues can't taste food when they are failing if(organ_flags & ORGAN_FAILING) @@ -219,11 +183,7 @@ say_mod = "hisses" taste_sensitivity = 10 // combined nose + tongue, extra sensitive modifies_speech = TRUE -<<<<<<< HEAD languages_native = list(/datum/language/draconic, /datum/language/ashtongue) //SKYRAT EDIT: Ashtongue for Ashwalkers -======= - languages_native = list(/datum/language/draconic) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 liked_foodtypes = GORE | MEAT | SEAFOOD | NUTS | BUGS disliked_foodtypes = GRAIN | DAIRY | CLOTH | GROSS voice_filter = @{"[0:a] asplit [out0][out2]; [out0] asetrate=%SAMPLE_RATE%*0.9,aresample=%SAMPLE_RATE%,atempo=1/0.9,aformat=channel_layouts=mono,volume=0.2 [p0]; [out2] asetrate=%SAMPLE_RATE%*1.1,aresample=%SAMPLE_RATE%,atempo=1/1.1,aformat=channel_layouts=mono,volume=0.2[p2]; [p0][0][p2] amix=inputs=3"} @@ -231,7 +191,6 @@ new /regex("s+", "g") = "sss", new /regex("S+", "g") = "SSS", new /regex(@"(\w)x", "g") = "$1kss", -<<<<<<< HEAD //new /regex(@"(\w)X", "g") = "$1KSSS", // SKYRAT EDIT REMOVAL new /regex(@"\bx([\-|r|R]|\b)", "g") = "ecks$1", new /regex(@"\bX([\-|r|R]|\b)", "g") = "ECKS$1", @@ -258,16 +217,6 @@ /obj/item/organ/internal/tongue/lizard/New(class, timer, datum/mutation/human/copymut) . = ..() AddComponent(/datum/component/speechmod, replacements = CONFIG_GET(flag/russian_text_formation) ? russian_speech_replacements : speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech))) // SKYRAT EDIT CHANGE - ORIGINAL: AddComponent(/datum/component/speechmod, replacements = speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech))) -======= - new /regex(@"(\w)X", "g") = "$1KSSS", - new /regex(@"\bx([\-|r|R]|\b)", "g") = "ecks$1", - new /regex(@"\bX([\-|r|R]|\b)", "g") = "ECKS$1", - ) - -/obj/item/organ/internal/tongue/lizard/New(class, timer, datum/mutation/human/copymut) - . = ..() - AddComponent(/datum/component/speechmod, replacements = speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/tongue/lizard/silver name = "silver tongue" @@ -457,11 +406,7 @@ var/message = speech_args[SPEECH_MESSAGE] var/mob/living/carbon/human/user = source var/rendered = span_abductor("[user.real_name]: [message]") -<<<<<<< HEAD - user.log_talk(message, LOG_SAY, tag="abductor") -======= user.log_talk(message, LOG_SAY, tag=SPECIES_ABDUCTOR) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/mob/living/carbon/human/living_mob in GLOB.alive_mob_list) var/obj/item/organ/internal/tongue/abductor/tongue = living_mob.get_organ_slot(ORGAN_SLOT_TONGUE) if(!istype(tongue)) @@ -633,14 +578,10 @@ GLOBAL_LIST_INIT(english_to_zombie, list()) color = "#96DB00" // TODO proper sprite, rather than recoloured pink tongue modifies_speech = TRUE voice_filter = "atempo=0.5" // makes them talk really slow -<<<<<<< HEAD liked_foodtypes = VEGETABLES | FRUIT | GROSS | RAW //SKYRAT EDIT - Roundstart Snails - Food Prefs disliked_foodtypes = DAIRY | ORANGES | SUGAR //SKYRAT EDIT: Roundstart Snails - As it turns out, you can't give a snail processed sugar or citrus. /* SKYRAT EDIT START - Roundstart Snails: Less annoying speech. -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/tongue/snail/modify_speech(datum/source, list/speech_args) var/new_message var/message = speech_args[SPEECH_MESSAGE] @@ -650,10 +591,7 @@ GLOBAL_LIST_INIT(english_to_zombie, list()) else new_message += message[i] speech_args[SPEECH_MESSAGE] = new_message -<<<<<<< HEAD */ // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/organ/internal/tongue/ethereal name = "electric discharger" diff --git a/code/modules/surgery/organs/internal/vocal_cords/_vocal_cords.dm b/code/modules/surgery/organs/internal/vocal_cords/_vocal_cords.dm index 26703dcc6d1..f2d9abae416 100644 --- a/code/modules/surgery/organs/internal/vocal_cords/_vocal_cords.dm +++ b/code/modules/surgery/organs/internal/vocal_cords/_vocal_cords.dm @@ -1,10 +1,6 @@ /obj/item/organ/internal/vocal_cords //organs that are activated through speech with the :x/MODE_KEY_VOCALCORDS channel name = "vocal cords" icon_state = "appendix" -<<<<<<< HEAD - visual = FALSE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zone = BODY_ZONE_PRECISE_MOUTH slot = ORGAN_SLOT_VOICE gender = PLURAL @@ -90,10 +86,6 @@ next_command = world.time + (cooldown * cooldown_mod) /obj/item/organ/internal/adamantine_resonator -<<<<<<< HEAD - visual = FALSE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "adamantine resonator" desc = "Fragments of adamantine exist in all golems, stemming from their origins as purely magical constructs. These are used to \"hear\" messages from their leaders." zone = BODY_ZONE_HEAD diff --git a/code/modules/surgery/organs/organ_movement.dm b/code/modules/surgery/organs/organ_movement.dm index b4c51aa4542..010daa3fd24 100644 --- a/code/modules/surgery/organs/organ_movement.dm +++ b/code/modules/surgery/organs/organ_movement.dm @@ -18,12 +18,8 @@ mob_insert(receiver, special, movement_flags) bodypart_insert(limb_owner = receiver, movement_flags = movement_flags) -<<<<<<< HEAD - return TRUE -======= if(!special) receiver.update_body_parts() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* * Remove the organ from the select mob. @@ -37,12 +33,9 @@ mob_remove(organ_owner, special, movement_flags) bodypart_remove(limb_owner = organ_owner, movement_flags = movement_flags) -<<<<<<< HEAD -======= if(!special) organ_owner.update_body_parts() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* * Insert the organ into the select mob. * @@ -76,14 +69,11 @@ wash(CLEAN_TYPE_BLOOD) organ_flags &= ~ORGAN_VIRGIN -<<<<<<< HEAD -======= if(external_bodytypes) receiver.synchronize_bodytypes() if(external_bodyshapes) receiver.synchronize_bodyshapes() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 receiver.organs |= src receiver.organs_slot[slot] = src owner = receiver @@ -139,12 +129,9 @@ ADD_TRAIT(src, TRAIT_NODROP, ORGAN_INSIDE_BODY_TRAIT) interaction_flags_item &= ~INTERACT_ITEM_ATTACK_HAND_PICKUP -<<<<<<< HEAD -======= if(bodypart_overlay) limb.add_bodypart_overlay(bodypart_overlay) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /* * Remove the organ from the select mob. * @@ -188,12 +175,9 @@ SEND_SIGNAL(organ_owner, COMSIG_CARBON_LOSE_ORGAN, src, special) ADD_TRAIT(src, TRAIT_USED_ORGAN, ORGAN_TRAIT) -<<<<<<< HEAD -======= organ_owner.synchronize_bodytypes() organ_owner.synchronize_bodyshapes() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/diseases = organ_owner.get_static_viruses() if(!LAZYLEN(diseases)) return @@ -242,8 +226,6 @@ REMOVE_TRAIT(src, TRAIT_NODROP, ORGAN_INSIDE_BODY_TRAIT) interaction_flags_item |= INTERACT_ITEM_ATTACK_HAND_PICKUP -<<<<<<< HEAD -======= if(!bodypart_overlay) return @@ -254,7 +236,6 @@ color = bodypart_overlay.draw_color // so a pink felinid doesn't drop a gray tail ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /// In space station videogame, nothing is sacred. If somehow an organ is removed unexpectedly, handle it properly /obj/item/organ/proc/forced_removal() SIGNAL_HANDLER diff --git a/code/modules/surgery/revival.dm b/code/modules/surgery/revival.dm index 37bbc54f4f5..42e92fa1eca 100644 --- a/code/modules/surgery/revival.dm +++ b/code/modules/surgery/revival.dm @@ -112,26 +112,19 @@ on_revived(user, target) return TRUE -<<<<<<< HEAD //SKYRAT EDIT CHANGE - DNR TRAIT - need this so that people don't just keep spamming the revival surgery; it runs success just bc the surgery steps are done if(HAS_TRAIT(target, TRAIT_DNR)) target.visible_message(span_warning("...[target.p_they()] lie[target.p_s()] still, unaffected. Further attempts are futile, target.p_theyre() gone.")) else target.visible_message(span_warning("...[target.p_they()] convulse[target.p_s()], then lie[target.p_s()] still.")) //SKYRAT EDIT CHANGE END - DNR TRAIT - ORIGINAL: target.visible_message(span_warning("...[target.p_they()] convulse[target.p_s()], then lie[target.p_s()] still.")) -======= - target.visible_message(span_warning("...[target.p_they()] convulse[target.p_s()], then lie[target.p_s()] still.")) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE /// Called when you have been successfully raised from the dead /datum/surgery_step/revive/proc/on_revived(mob/surgeon, mob/living/patient) patient.visible_message(span_notice("...[patient] wakes up, alive and aware!")) patient.emote("gasp") -<<<<<<< HEAD to_chat(patient, "[CONFIG_GET(string/blackoutpolicy)]") //SKYRAT EDIT ADDITION - BLACKOUT POLICY -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(HAS_MIND_TRAIT(surgeon, TRAIT_MORBID) && ishuman(surgeon)) // Contrary to their typical hatred of resurrection, it wouldn't be very thematic if morbid people didn't love playing god var/mob/living/carbon/human/morbid_weirdo = surgeon morbid_weirdo.add_mood_event("morbid_revival_success", /datum/mood_event/morbid_revival_success) diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm index 05e12140e01..015871a829f 100644 --- a/code/modules/surgery/surgery_step.dm +++ b/code/modules/surgery/surgery_step.dm @@ -80,10 +80,7 @@ return FALSE #define SURGERY_SLOWDOWN_CAP_MULTIPLIER 2.5 //increase to make surgery slower but fail less, and decrease to make surgery faster but fail more -<<<<<<< HEAD #define SURGERY_SPEEDUP_AREA 0.5 // Skyrat Edit Addition - reward for doing surgery in surgery -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Modifier given to surgery speed for dissected bodies. #define SURGERY_SPEED_DISSECTION_MODIFIER 0.8 ///Modifier given to users with TRAIT_MORBID on certain surgeries @@ -123,15 +120,10 @@ if(check_morbid_curiosity(user, tool, surgery)) speed_mod *= SURGERY_SPEED_MORBID_CURIOSITY -<<<<<<< HEAD /* SKYRAT EDIT START - Worked in with reward buffs below if(HAS_TRAIT(target, TRAIT_ANALGESIA)) speed_mod *= SURGERY_SPEED_TRAIT_ANALGESIA */ // SKYRAT EDIT END -======= - if(HAS_TRAIT(target, TRAIT_ANALGESIA)) - speed_mod *= SURGERY_SPEED_TRAIT_ANALGESIA ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/implement_speed_mod = 1 if(implement_type) //this means it isn't a require hand or any item step. @@ -149,7 +141,6 @@ var/was_sleeping = (target.stat != DEAD && target.IsSleeping()) -<<<<<<< HEAD // Skyrat Edit Addition - reward for doing surgery on calm patients, and for using surgery rooms(ie. surgerying alone) if(was_sleeping || HAS_TRAIT(target, TRAIT_ANALGESIA) || target.stat == DEAD) modded_time *= SURGERY_SPEEDUP_AREA @@ -164,8 +155,6 @@ to_chat(user, span_notice("You are able to work faster due to the quiet environment!")) // Skyrat Edit End -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(do_after(user, modded_time, target = target, interaction_key = user.has_status_effect(/datum/status_effect/hippocratic_oath) ? target : DOAFTER_SOURCE_SURGERY)) //If we have the hippocratic oath, we can perform one surgery on each target, otherwise we can only do one surgery in total. if((prob(100-fail_prob) || (iscyborg(user) && !silicons_obey_prob)) && !try_to_fail) @@ -192,33 +181,6 @@ surgery.step_in_progress = FALSE return advance #undef SURGERY_SPEEDUP_AREA // SKYRAT EDIT ADDITION -/** - * Handles updating the mob's mood depending on the surgery states. - * * surgery_state = SURGERY_STATE_STARTED, SURGERY_STATE_FAILURE, SURGERY_STATE_SUCCESS - * * To prevent typos, the event category is defined as SURGERY_MOOD_CATEGORY ("surgery") -*/ -/datum/surgery_step/proc/update_surgery_mood(mob/living/target, surgery_state) - if(!target) - CRASH("Not passed a target, how did we get here?") - if(!surgery_effects_mood) - return - if(HAS_TRAIT(target, TRAIT_ANALGESIA)) - target.clear_mood_event(SURGERY_MOOD_CATEGORY) //incase they gained the trait mid-surgery. has the added side effect that if someone has a bad surgical memory/mood and gets drunk & goes back to surgery, they'll forget they hated it, which is kinda funny imo. - return - if(target.stat >= UNCONSCIOUS) - var/datum/mood_event/surgery/target_mood_event = target.mob_mood.mood_events[SURGERY_MOOD_CATEGORY] - if(!target_mood_event || target_mood_event.surgery_completed) //don't give sleeping mobs trauma. that said, if they fell asleep mid-surgery after already getting the bad mood, lets make sure they wake up to a (hopefully) happy memory. - return - switch(surgery_state) - if(SURGERY_STATE_STARTED) - target.add_mood_event(SURGERY_MOOD_CATEGORY, surgery_started_mood_event) - if(SURGERY_STATE_SUCCESS) - target.add_mood_event(SURGERY_MOOD_CATEGORY, surgery_success_mood_event) - if(SURGERY_STATE_FAILURE) - target.add_mood_event(SURGERY_MOOD_CATEGORY, surgery_failure_mood_event) - else - CRASH("passed invalid surgery_state, \"[surgery_state]\".") - /** * Handles updating the mob's mood depending on the surgery states. @@ -373,7 +335,6 @@ /datum/surgery_step/proc/display_pain(mob/living/target, pain_message, mechanical_surgery = FALSE) if(target.stat < UNCONSCIOUS) if(HAS_TRAIT(target, TRAIT_ANALGESIA)) -<<<<<<< HEAD target.add_mood_event("mild_surgery", /datum/mood_event/mild_surgery) // SKYRAT EDIT ADDITION - Adds mood effects to surgeries if(!pain_message) return @@ -384,12 +345,6 @@ // SKYRAT EDIT ADDITION END else target.add_mood_event("severe_surgery", /datum/mood_event/severe_surgery) // SKYRAT EDIT ADDITION - Adds mood effects to surgeries -======= - if(!pain_message) - return - to_chat(target, span_notice("You feel a dull, numb sensation as your body is surgically operated on.")) - else ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(!pain_message) return to_chat(target, span_userdanger(pain_message)) diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 52cabf1e811..c0f71b57ca2 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -644,11 +644,7 @@ for(var/key in whitelist) .["whitelist"] += whitelist[key] -<<<<<<< HEAD -/obj/item/blood_filter/ui_act(action, params) -======= /obj/item/blood_filter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm index b3284d17cb2..29ea239ad84 100644 --- a/code/modules/tgs/v5/__interop_version.dm +++ b/code/modules/tgs/v5/__interop_version.dm @@ -1,5 +1 @@ -<<<<<<< HEAD -"5.9.0" -======= "5.10.0" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm index 972d5158b26..a47bfd78000 100644 --- a/code/modules/tgs/v5/_defines.dm +++ b/code/modules/tgs/v5/_defines.dm @@ -95,10 +95,7 @@ #define DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION "newServerVersion" #define DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE "broadcastMessage" -<<<<<<< HEAD -======= #define DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT "clientCount" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE "commandResponse" #define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE "commandResponseMessage" #define DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES "chatResponses" diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm index e1cafdd679e..59e5e63e5cd 100644 --- a/code/modules/tgs/v5/topic.dm +++ b/code/modules/tgs/v5/topic.dm @@ -149,13 +149,9 @@ if(DMAPI5_TOPIC_COMMAND_HEALTHCHECK) if(event_handler && event_handler.receive_health_checks) event_handler.HandleEvent(TGS_EVENT_HEALTH_CHECK) -<<<<<<< HEAD - return TopicResponse() -======= var/list/health_check_response = TopicResponse() health_check_response[DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT] = TGS_CLIENT_COUNT return health_check_response; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH) detached = FALSE diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm index ba5d83e74f5..acd19dfa641 100644 --- a/code/modules/tgs/v5/undefs.dm +++ b/code/modules/tgs/v5/undefs.dm @@ -18,15 +18,6 @@ #undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER #undef DMAPI5_PARAMETER_CUSTOM_COMMANDS -#undef DMAPI5_PARAMETER_TOPIC_PORT - -#undef DMAPI5_CHUNK -#undef DMAPI5_CHUNK_PAYLOAD -#undef DMAPI5_CHUNK_TOTAL -#undef DMAPI5_CHUNK_SEQUENCE_ID -#undef DMAPI5_CHUNK_PAYLOAD_ID - -#undef DMAPI5_MISSING_CHUNKS #undef DMAPI5_CHUNK #undef DMAPI5_CHUNK_PAYLOAD @@ -103,10 +94,7 @@ #undef DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION #undef DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE -<<<<<<< HEAD -======= #undef DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE #undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE #undef DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES diff --git a/code/modules/tgui/states/not_incapacitated.dm b/code/modules/tgui/states/not_incapacitated.dm index f3f0cd22abb..ab8cd5f6246 100644 --- a/code/modules/tgui/states/not_incapacitated.dm +++ b/code/modules/tgui/states/not_incapacitated.dm @@ -29,10 +29,6 @@ GLOBAL_DATUM_INIT(not_incapacitated_turf_state, /datum/ui_state/not_incapacitate /datum/ui_state/not_incapacitated_state/can_use_topic(src_object, mob/user) if(user.stat != CONSCIOUS) return UI_CLOSE -<<<<<<< HEAD - if(HAS_TRAIT(src, TRAIT_UI_BLOCKED) || user.incapacitated() || (turf_check && !isturf(user.loc))) -======= if(HAS_TRAIT(src, TRAIT_UI_BLOCKED) || user.incapacitated || (turf_check && !isturf(user.loc))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return UI_DISABLED return UI_INTERACTIVE diff --git a/code/modules/tgui_input/alert.dm b/code/modules/tgui_input/alert.dm index 2bb4a34d3d4..0b12184ba7a 100644 --- a/code/modules/tgui_input/alert.dm +++ b/code/modules/tgui_input/alert.dm @@ -120,11 +120,7 @@ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) return data -<<<<<<< HEAD -/datum/tgui_alert/ui_act(action, list/params) -======= /datum/tgui_alert/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/tgui_input/checkboxes.dm b/code/modules/tgui_input/checkboxes.dm index b7e22792ca6..9e548b9c136 100644 --- a/code/modules/tgui_input/checkboxes.dm +++ b/code/modules/tgui_input/checkboxes.dm @@ -115,11 +115,7 @@ return data -<<<<<<< HEAD -/datum/tgui_checkbox_input/ui_act(action, list/params) -======= /datum/tgui_checkbox_input/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/tgui_input/keycombo.dm b/code/modules/tgui_input/keycombo.dm index 330d8ec231a..7a9e8399a8c 100644 --- a/code/modules/tgui_input/keycombo.dm +++ b/code/modules/tgui_input/keycombo.dm @@ -8,11 +8,7 @@ * * user - The user to show the number input to. * * message - The content of the number input, shown in the body of the TGUI window. * * title - The title of the number input modal, shown on the top of the TGUI window. -<<<<<<< HEAD - * * default - The default (or current) key, shown as a placeholder. -======= * * default - The default (or current) key, shown as a placeholder. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 */ /proc/tgui_input_keycombo(mob/user = usr, message, title = "Key Input", default = 0, timeout = 0, ui_state = GLOB.always_state) if (!istype(user)) @@ -111,11 +107,7 @@ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) return data -<<<<<<< HEAD -/datum/tgui_input_keycombo/ui_act(action, list/params) -======= /datum/tgui_input_keycombo/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/tgui_input/list.dm b/code/modules/tgui_input/list.dm index 769f6754866..fcee265e5a8 100644 --- a/code/modules/tgui_input/list.dm +++ b/code/modules/tgui_input/list.dm @@ -137,11 +137,7 @@ data["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1) return data -<<<<<<< HEAD -/datum/tgui_list_input/ui_act(action, list/params) -======= /datum/tgui_list_input/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/tgui_input/number.dm b/code/modules/tgui_input/number.dm index 2ecaae0504c..0266610b84c 100644 --- a/code/modules/tgui_input/number.dm +++ b/code/modules/tgui_input/number.dm @@ -136,11 +136,7 @@ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) return data -<<<<<<< HEAD -/datum/tgui_input_number/ui_act(action, list/params) -======= /datum/tgui_input_number/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/tgui_input/say_modal/modal.dm b/code/modules/tgui_input/say_modal/modal.dm index 5e67acf7d35..1185aaa12af 100644 --- a/code/modules/tgui_input/say_modal/modal.dm +++ b/code/modules/tgui_input/say_modal/modal.dm @@ -86,11 +86,7 @@ if(!payload?["channel"]) CRASH("No channel provided to an open TGUI-Say") window_open = TRUE -<<<<<<< HEAD if(payload["channel"] != OOC_CHANNEL && payload["channel"] != ADMIN_CHANNEL && payload["channel"] != LOOC_CHANNEL) // SKYRAT EDIT CHANGE (Add LOOC_CHANNEL) -======= - if(payload["channel"] != OOC_CHANNEL && payload["channel"] != ADMIN_CHANNEL) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 start_thinking() if(!client.typing_indicators) log_speech_indicators("[key_name(client)] started typing at [loc_name(client.mob)], indicators DISABLED.") diff --git a/code/modules/tgui_input/say_modal/speech.dm b/code/modules/tgui_input/say_modal/speech.dm index 299499d4453..8fff832477c 100644 --- a/code/modules/tgui_input/say_modal/speech.dm +++ b/code/modules/tgui_input/say_modal/speech.dm @@ -10,11 +10,7 @@ /datum/tgui_say/proc/alter_entry(payload) var/entry = payload["entry"] /// No OOC leaks -<<<<<<< HEAD if(!entry || payload["channel"] == OOC_CHANNEL || payload["channel"] == ME_CHANNEL || payload["channel"] == LOOC_CHANNEL) // SKYRAT EDIT CHANGE - CUSTOMIZATION -======= - if(!entry || payload["channel"] == OOC_CHANNEL || payload["channel"] == ME_CHANNEL) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return pick(hurt_phrases) /// Random trimming for larger sentences if(length(entry) > 50) @@ -51,7 +47,6 @@ if(ADMIN_CHANNEL) SSadmin_verbs.dynamic_invoke_verb(client, /datum/admin_verb/cmd_admin_say, entry) return TRUE -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - CUSTOMIZATION if(LOOC_CHANNEL) client.looc(entry) @@ -60,8 +55,6 @@ client.mob.whisper_verb(entry) return TRUE // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE /** diff --git a/code/modules/tgui_input/text.dm b/code/modules/tgui_input/text.dm index c0b59be5842..ec94fbd6766 100644 --- a/code/modules/tgui_input/text.dm +++ b/code/modules/tgui_input/text.dm @@ -133,11 +133,7 @@ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) return data -<<<<<<< HEAD -/datum/tgui_input_text/ui_act(action, list/params) -======= /datum/tgui_input_text/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/transport/elevator/elev_panel.dm b/code/modules/transport/elevator/elev_panel.dm index 63108a20fef..659049a7448 100644 --- a/code/modules/transport/elevator/elev_panel.dm +++ b/code/modules/transport/elevator/elev_panel.dm @@ -299,11 +299,7 @@ return data -<<<<<<< HEAD -/obj/machinery/elevator_control_panel/ui_act(action, list/params) -======= /obj/machinery/elevator_control_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/transport/tram/tram_controller.dm b/code/modules/transport/tram/tram_controller.dm index 04111ca9a9c..11b3bbcdec9 100644 --- a/code/modules/transport/tram/tram_controller.dm +++ b/code/modules/transport/tram/tram_controller.dm @@ -1096,11 +1096,7 @@ return data -<<<<<<< HEAD -/obj/machinery/transport/tram_controller/ui_act(action, params) -======= /obj/machinery/transport/tram_controller/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/transport/tram/tram_controls.dm b/code/modules/transport/tram/tram_controls.dm index bf8d95c81b2..308e58cf5f0 100644 --- a/code/modules/transport/tram/tram_controls.dm +++ b/code/modules/transport/tram/tram_controls.dm @@ -130,11 +130,7 @@ this_destination["id"] = destination.platform_code . += list(this_destination) -<<<<<<< HEAD -/obj/machinery/computer/tram_controls/ui_act(action, params) -======= /obj/machinery/computer/tram_controls/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/transport/transport_module.dm b/code/modules/transport/transport_module.dm index 96fb50f2815..01a34931305 100644 --- a/code/modules/transport/transport_module.dm +++ b/code/modules/transport/transport_module.dm @@ -612,11 +612,7 @@ if(!isliving(user)) return FALSE // Gotta be awake and aware -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE // Maintain the god given right to fight an elevator if(user.combat_mode) @@ -708,11 +704,7 @@ * * boolean, FALSE if the menu should be closed, TRUE if the menu is clear to stay opened. */ /obj/structure/transport/linear/proc/check_menu(mob/user, starting_loc) -<<<<<<< HEAD - if(user.incapacitated() || !user.Adjacent(src) || starting_loc != src.loc) -======= if(user.incapacitated || !user.Adjacent(src) || starting_loc != src.loc) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE return TRUE diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 94f284cb03e..91c2f8c1382 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -291,13 +291,10 @@ #include "weird_food.dm" #include "wizard_loadout.dm" #include "worn_icons.dm" -<<<<<<< HEAD // SKYRAT EDIT START #include "~skyrat\automapper.dm" #include "~skyrat\opposing_force.dm" // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // END_INCLUDE #ifdef REFERENCE_TRACKING_DEBUG //Don't try and parse this file if ref tracking isn't turned on. IE: don't parse ref tracking please mr linter #include "find_reference_sanity.dm" diff --git a/code/modules/unit_tests/barsigns.dm b/code/modules/unit_tests/barsigns.dm index b21017befef..0914522446f 100644 --- a/code/modules/unit_tests/barsigns.dm +++ b/code/modules/unit_tests/barsigns.dm @@ -2,16 +2,12 @@ * Test if icon states for each datum actually exist in the DMI. */ /datum/unit_test/barsigns_icon -<<<<<<< HEAD var/list/blacklisted_sign_types = list(/datum/barsign/skyrat, /datum/barsign/skyrat/large) // SKYRAT EDIT ADDITION - Modular barsigns -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/unit_test/barsigns_icon/Run() var/obj/machinery/barsign_type = /obj/machinery/barsign var/icon/barsign_icon = initial(barsign_type.icon) var/list/barsign_icon_states = icon_states(barsign_icon) -<<<<<<< HEAD barsign_icon_states += icon_states(SKYRAT_BARSIGN_FILE) // SKYRAT EDIT ADDITION - Need to check modular barsigns barsign_icon_states += icon_states(SKYRAT_LARGE_BARSIGN_FILE) // SKYRAT EDIT ADDITION - Need to check modular barsigns @@ -21,11 +17,6 @@ if(sign_type in blacklisted_sign_types) continue // SKYRAT EDIT ADDITION END -======= - - // Check every datum real bar sign - for(var/sign_type in (subtypesof(/datum/barsign) - /datum/barsign/hiddensigns)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/barsign/sign = new sign_type() if(!(sign.icon_state in barsign_icon_states)) @@ -35,23 +26,16 @@ * Check that bar signs have a name and desc, and that the name is unique. */ /datum/unit_test/barsigns_name -<<<<<<< HEAD var/list/blacklisted_sign_types = list(/datum/barsign/skyrat, /datum/barsign/skyrat/large) // SKYRAT EDIT ADDITION - Modular barsigns -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/unit_test/barsigns_name/Run() var/list/existing_names = list() -<<<<<<< HEAD for(var/sign_type in (subtypesof(/datum/barsign) - /datum/barsign/hiddensigns)) // SKYRAT EDIT ADDITION BEGIN - MODULAR BARSIGNS if(sign_type in blacklisted_sign_types) continue // SKYRAT EDIT ADDITION END -======= - for(var/sign_type in subtypesof(/datum/barsign) - /datum/barsign/hiddensigns) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/barsign/sign = new sign_type() if(!sign.name) diff --git a/code/modules/unit_tests/changeling.dm b/code/modules/unit_tests/changeling.dm index 4b47dd9b0da..bdcc9b2d281 100644 --- a/code/modules/unit_tests/changeling.dm +++ b/code/modules/unit_tests/changeling.dm @@ -11,11 +11,7 @@ var/datum/antagonist/changeling/ling_datum = IS_CHANGELING(ling) // Get the ability we're testing -<<<<<<< HEAD ling_datum.give_power(/datum/action/changeling/sting/transformation) // SKYRAT EDIT CHANGE - Transformation sting not purchasable here - ORIGINAL : ling_datum.purchase_power(/datum/action/changeling/sting/transformation) -======= - ling_datum.purchase_power(/datum/action/changeling/sting/transformation) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/datum/action/changeling/sting/transformation/sting_action = locate() in ling.actions sting_action.selected_dna = ling_datum.current_profile sting_action.sting_duration = 0.5 SECONDS // just makes sure everything settles. @@ -79,21 +75,12 @@ // The more DNA features and random things we change, the more likely we are to catch something not updating correctly. // Yeah guess who/what this is, I dare you. ling.dna.features["mcolor"] = "#886600" -<<<<<<< HEAD ling.dna.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Smooth", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) // SKYRAT EDIT CHANGE - ORIGINAL: ling.dna.features["tail_lizard"] = "Smooth" ling.dna.mutant_bodyparts["snout"] = list(MUTANT_INDEX_NAME = "Sharp + Light", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) // SKYRAT EDIT CHANGE - ORIGINAL: ling.dna.features["snout"] = "Sharp + Light" ling.dna.mutant_bodyparts["horns"] = list(MUTANT_INDEX_NAME = "Curled", MUTANT_INDEX_COLOR_LIST = list("#292826", "#292826", "#8292826")) // SKYRAT EDIT CHANGE - ORIGINAL: ling.dna.features["horns"] = "Curved" ling.dna.mutant_bodyparts["frills"] = list(MUTANT_INDEX_NAME = "Short", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) // SKYRAT EDIT CHANGE - ORIGINAL: ling.dna.features["frills"] = "Sort" ling.dna.mutant_bodyparts["spines"] = list(MUTANT_INDEX_NAME = "Long + Membrane", MUTANT_INDEX_COLOR_LIST = list("#886600", "#886600", "#886600")) // SKYRAT EDIT CHANGE - ORIGINAL: ling.dna.features["spines"] = "Long + Membrane" ling.dna.body_markings["chest"] = list("Light Belly" = list("#886600", 0)) // SKYRAT EDIT CHANGE - ORIGINAL : ling.dna.features[lizard_markings] = list("Light Belly") -======= - ling.dna.features["tail_lizard"] = "Smooth" - ling.dna.features["snout"] = "Sharp + Light" - ling.dna.features["horns"] = "Curled" - ling.dna.features["frills"] = "Short" - ling.dna.features["spines"] = "Long + Membrane" - ling.dna.features["lizard_markings"] = "Light Belly" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ling.dna.features["legs"] = DIGITIGRADE_LEGS ling.eye_color_left = COLOR_WHITE ling.eye_color_right = COLOR_WHITE diff --git a/code/modules/unit_tests/embedding.dm b/code/modules/unit_tests/embedding.dm index 11181722e22..05e8cc8b8aa 100644 --- a/code/modules/unit_tests/embedding.dm +++ b/code/modules/unit_tests/embedding.dm @@ -8,15 +8,7 @@ TEST_ASSERT_EQUAL(bullet.get_embed().embed_chance, 100, "embed_chance failed to modify") bullet.preparePixelProjectile(victim, firer) bullet.fire(get_angle(firer, victim), victim) -<<<<<<< HEAD - // SKYRAT EDIT REMOVAL START - TODO - Figure out why it's not embedding during the unit test and fix it. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/components = victim.GetComponents(/datum/component/embedded) TEST_ASSERT_EQUAL(components.len, 1, "Projectile with 100% embed chance didn't embed, or embedded multiple times") var/datum/component/embedded/comp = components[1] TEST_ASSERT_EQUAL(comp.weapon.get_embed().embed_chance, 100, "embed_chance modification did not transfer to shrapnel") -<<<<<<< HEAD - // SKYRATEDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/unit_tests/emoting.dm b/code/modules/unit_tests/emoting.dm index 193f79ccd74..4eecaca015c 100644 --- a/code/modules/unit_tests/emoting.dm +++ b/code/modules/unit_tests/emoting.dm @@ -9,17 +9,12 @@ human.say("*shrug") TEST_ASSERT_EQUAL(emotes_used, 1, "Human did not shrug") -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - Following check does not affect us /* human.say("*beep") TEST_ASSERT_EQUAL(emotes_used, 1, "Human beeped, when that should be restricted to silicons") */ //SKYRAT EDIT REMOVAL END -======= - human.say("*beep") - TEST_ASSERT_EQUAL(emotes_used, 1, "Human beeped, when that should be restricted to silicons") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 human.setOxyLoss(140) @@ -28,17 +23,12 @@ human.say("*shrug") TEST_ASSERT_EQUAL(emotes_used, 1, "Human shrugged while unconscious") -<<<<<<< HEAD //SKYRAT EDIT REMOVAL BEGIN - Following check fails due to global cooldown from the above test step (.8s) /* human.say("*deathgasp") TEST_ASSERT_EQUAL(emotes_used, 2, "Human could not deathgasp while unconscious") */ //SKYRAT EDIT REMOVAL END -======= - human.say("*deathgasp") - TEST_ASSERT_EQUAL(emotes_used, 2, "Human could not deathgasp while unconscious") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 human.key = null diff --git a/code/modules/unit_tests/fish_unit_tests.dm b/code/modules/unit_tests/fish_unit_tests.dm index 73ce3df8714..2fb2487f781 100644 --- a/code/modules/unit_tests/fish_unit_tests.dm +++ b/code/modules/unit_tests/fish_unit_tests.dm @@ -1,7 +1,5 @@ #define TRAIT_FISH_TESTING "made_you_read_this" -<<<<<<< HEAD -======= ///Ensures that all fish have an aquarium icon state and that sprite_width and sprite_height have been set. /datum/unit_test/fish_aquarium_icons @@ -18,7 +16,6 @@ if(!fish::sprite_height) TEST_FAIL("[fish] doesn't have a set sprite_height.") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Checks that things associated with fish size and weight work correctly. /datum/unit_test/fish_size_weight @@ -95,18 +92,11 @@ incompatible_traits = list(/datum/fish_trait/dummy/two) inheritability = 100 diff_traits_inheritability = 100 -<<<<<<< HEAD - -/datum/fish_trait/dummy/apply_to_fish(obj/item/fish/fish) - ADD_TRAIT(fish, TRAIT_FISH_TESTING, FISH_TRAIT_DATUM) - fish.grind_results[/datum/reagent] = 10 -======= reagents_to_add = list(/datum/reagent = 10) /datum/fish_trait/dummy/apply_to_fish(obj/item/fish/fish) . = ..() ADD_TRAIT(fish, TRAIT_FISH_TESTING, FISH_TRAIT_DATUM) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/fish_trait/dummy/two incompatible_traits = list(/datum/fish_trait/dummy) @@ -286,27 +276,17 @@ /datum/unit_test/explosive_fishing/Run() var/datum/fish_source/source = GLOB.preset_fish_sources[/datum/fish_source/unit_test] source.spawn_reward_from_explosion(run_loc_floor_bottom_left, 1) -<<<<<<< HEAD - if(length(source.fish_table)) -======= if(source.fish_counts[/obj/item/wrench]) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TEST_FAIL("The unit test item wasn't removed/spawned from fish_table during 'spawn_reward_from_explosion'.") /datum/fish_source/unit_test fish_table = list( /obj/item/wrench = 1, -<<<<<<< HEAD - ) - fish_counts = list( - /obj/item/wrench = 1, -======= /obj/item/screwdriver = INFINITY, ) fish_counts = list( /obj/item/wrench = 1, /obj/item/screwdriver = 0, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) #undef TRAIT_FISH_TESTING diff --git a/code/modules/unit_tests/mecha_damage.dm b/code/modules/unit_tests/mecha_damage.dm index a688fb0bd2a..f922d342b49 100644 --- a/code/modules/unit_tests/mecha_damage.dm +++ b/code/modules/unit_tests/mecha_damage.dm @@ -31,10 +31,7 @@ // Get a sample laser weapon. // The captain's laser gun here is chosen primarily because it deals more damage than normal lasers. var/obj/item/gun/energy/laser/dummy_laser = allocate(/obj/item/gun/energy/laser/captain) -<<<<<<< HEAD qdel(dummy_laser.GetComponent(/datum/component/gun_safety)) // SKYRAT EDIT - Safeties on guns make them impossible to shoot :) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/ammo_casing/laser_ammo = dummy_laser.ammo_type[1] var/obj/projectile/beam/laser_fired = initial(laser_ammo.projectile_type) var/expected_laser_damage = round(dummy_laser.projectile_damage_multiplier * initial(laser_fired.damage) * (1 - expected_laser_armor / 100), DAMAGE_PRECISION) @@ -42,10 +39,7 @@ // Get a sample ballistic weapon. // The syndicate .357 here is chosen because it does a lot of damage. var/obj/item/gun/ballistic/dummy_gun = allocate(/obj/item/gun/ballistic/revolver) -<<<<<<< HEAD qdel(dummy_gun.GetComponent(/datum/component/gun_safety)) // SKYRAT EDIT - Safeties on guns make them impossible to shoot :) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/ammo_casing/ballistic_ammo = dummy_gun.magazine.ammo_type var/obj/projectile/bullet_fired = initial(ballistic_ammo.projectile_type) var/expected_bullet_damage = round(dummy_gun.projectile_damage_multiplier * initial(bullet_fired.damage) * (1 - expected_bullet_armor / 100), DAMAGE_PRECISION) diff --git a/code/modules/unit_tests/organ_bodypart_shuffle.dm b/code/modules/unit_tests/organ_bodypart_shuffle.dm index 487554154a3..11c0bcd71be 100644 --- a/code/modules/unit_tests/organ_bodypart_shuffle.dm +++ b/code/modules/unit_tests/organ_bodypart_shuffle.dm @@ -2,11 +2,7 @@ /datum/unit_test/organ_bodypart_shuffle /datum/unit_test/organ_bodypart_shuffle/Run() -<<<<<<< HEAD - var/mob/living/carbon/human/hollow_boy = allocate(/mob/living/carbon/human/consistent) -======= var/mob/living/carbon/human/hollow_boy = allocate(/mob/living/carbon/human/consistent) //freshly filled with wet insides ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Test if organs are all properly updating when forcefully removed var/list/removed_organs = list() @@ -34,8 +30,3 @@ continue TEST_ASSERT(organ in hollow_boy.organs, "Organ '[organ.name] was put in an empty bodypart that replaced a humans, but the organ did not come with.") -<<<<<<< HEAD - // Test if bodyparts are all properly updating when forcefully removed - hollow_boy = allocate(/mob/living/carbon/human/consistent) //freshly filled with wet insides -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/code/modules/unit_tests/organ_set_bonus.dm b/code/modules/unit_tests/organ_set_bonus.dm index 395fbf81809..ce425936265 100644 --- a/code/modules/unit_tests/organ_set_bonus.dm +++ b/code/modules/unit_tests/organ_set_bonus.dm @@ -25,20 +25,13 @@ for(var/datum/infuser_entry/infuser_entry as anything in flatten_list(GLOB.infuser_entries)) var/output_organs = infuser_entry.output_organs var/mob/living/carbon/human/lab_rat = allocate(/mob/living/carbon/human/consistent) -<<<<<<< HEAD lab_rat.dna.mutant_bodyparts["moth_antennae"] = list(MUTANT_INDEX_NAME = "Plain", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF"), MUTANT_INDEX_EMISSIVE_LIST = list(FALSE)) // SKYRAT EDIT - Customization -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/list/obj/item/organ/inserted_organs = list() // Attempt to insert entire list of mutant organs for the given infusion_entry. for(var/obj/item/organ/organ as anything in output_organs) organ = new organ() -<<<<<<< HEAD - TEST_ASSERT(organ.Insert(lab_rat, special = TRUE, movement_flags = DELETE_IF_REPLACED), "The organ `[organ.type]` for `[infuser_entry.type]` was not inserted in the mob when expected, Insert() returned falsy when TRUE was expected.") -======= organ.Insert(lab_rat, special = TRUE, movement_flags = DELETE_IF_REPLACED) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 inserted_organs += organ // Search for added Status Effect. diff --git a/code/modules/unit_tests/outfit_sanity.dm b/code/modules/unit_tests/outfit_sanity.dm index e397826428a..d0de12a7b20 100644 --- a/code/modules/unit_tests/outfit_sanity.dm +++ b/code/modules/unit_tests/outfit_sanity.dm @@ -86,8 +86,6 @@ for (var/_ in 1 to number) if (!H.equip_to_slot_or_del(new path(H), ITEM_SLOT_BACKPACK, TRUE, indirect_action = TRUE)) TEST_FAIL("[outfit.name]'s backpack_contents are invalid! Couldn't add [path] to backpack.") -<<<<<<< HEAD -======= if (outfit.belt_contents) var/list/belt_contents = outfit.belt_contents?.Copy() @@ -97,6 +95,5 @@ if (!H.equip_to_slot_or_del(new path(H), ITEM_SLOT_BELTPACK, TRUE, indirect_action = TRUE)) TEST_FAIL("[outfit.name]'s belt_contents are invalid! Couldn't add [path] to backpack.") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #undef CHECK_OUTFIT_SLOT diff --git a/code/modules/unit_tests/paintings.dm b/code/modules/unit_tests/paintings.dm index fe09a127d92..abe3ba9aa97 100644 --- a/code/modules/unit_tests/paintings.dm +++ b/code/modules/unit_tests/paintings.dm @@ -3,13 +3,10 @@ /datum/unit_test/paintings/Run() for(var/obj/item/canvas/canvas as anything in typesof(/obj/item/canvas)) -<<<<<<< HEAD //SKYRAT EDIT START if(canvas == /obj/item/canvas/drawingtablet) //This doesn't need frames. continue //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 canvas = new canvas var/canvas_icons = icon_states(canvas.icon) for(var/frame_type in SSpersistent_paintings.frame_types_by_patronage_tier) diff --git a/code/modules/unit_tests/projectiles.dm b/code/modules/unit_tests/projectiles.dm index 006e5311fa3..6e97fc054a2 100644 --- a/code/modules/unit_tests/projectiles.dm +++ b/code/modules/unit_tests/projectiles.dm @@ -23,14 +23,11 @@ TEST_ASSERT(loaded_bullet, "Ammo casing has no loaded bullet") gunner.put_in_hands(test_gun, forced=TRUE) -<<<<<<< HEAD //SKYRAT EDIT ADDITION BEGIN if(test_gun.GetComponent(/datum/component/gun_safety)) qdel(test_gun.GetComponent(/datum/component/gun_safety)) loaded_bullet.wound_bonus = CANT_WOUND //Baseline wounding makes things weird //SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 gunner.set_combat_mode(FALSE) // just to make sure we know we're not trying to pistol-whip them var/expected_damage = loaded_bullet.damage loaded_bullet.def_zone = BODY_ZONE_CHEST diff --git a/code/modules/unit_tests/say.dm b/code/modules/unit_tests/say.dm index 97dec7269cf..c5bcb061b1f 100644 --- a/code/modules/unit_tests/say.dm +++ b/code/modules/unit_tests/say.dm @@ -200,11 +200,7 @@ speaker.forceMove(run_loc_floor_bottom_left) listener.forceMove(locate((run_loc_floor_bottom_left.x + distance), run_loc_floor_bottom_left.y, run_loc_floor_bottom_left.z)) -<<<<<<< HEAD var/pangram_quote = "The quick brown fox jumps over the lazy dog." // SKYRAT EDIT CHANGE - account for autopunct in living_say.dm - ORIGINAL: var/pangram_quote = "The quick brown fox jumps over the lazy dog" -======= - var/pangram_quote = "The quick brown fox jumps over the lazy dog" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // speaking speaker.say(pangram_quote) @@ -241,19 +237,11 @@ // Normally speaking, if there isn't a functional telecomms array on the same z-level, then handheld radios // have a short delay before sending the message. We use the centcom frequency to get around this. speaker_radio.set_frequency(FREQ_CENTCOM) -<<<<<<< HEAD - speaker_radio.independent = TRUE - listener_radio.set_frequency(FREQ_CENTCOM) - listener_radio.independent = TRUE - - var/pangram_quote = "The quick brown fox jumps over the lazy dog." // SKYRAT EDIT CHANGE - account for autopunct in living_say.dm - ORIGINAL: var/pangram_quote = "The quick brown fox jumps over the lazy dog" -======= speaker_radio.special_channels = RADIO_SPECIAL_CENTCOM listener_radio.set_frequency(FREQ_CENTCOM) listener_radio.special_channels = RADIO_SPECIAL_CENTCOM - var/pangram_quote = "The quick brown fox jumps over the lazy dog" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + var/pangram_quote = "The quick brown fox jumps over the lazy dog." // SKYRAT EDIT CHANGE - account for autopunct in living_say.dm - ORIGINAL: var/pangram_quote = "The quick brown fox jumps over the lazy dog" speaker.say(pangram_quote) TEST_ASSERT(handle_speech_result, "Handle speech signal was not fired (radio test)") diff --git a/code/modules/unit_tests/screenshot_humanoids.dm b/code/modules/unit_tests/screenshot_humanoids.dm index a28da130007..3bfaffb8c70 100644 --- a/code/modules/unit_tests/screenshot_humanoids.dm +++ b/code/modules/unit_tests/screenshot_humanoids.dm @@ -7,17 +7,10 @@ // Test lizards as their own thing so we can get more coverage on their features var/mob/living/carbon/human/lizard = allocate(/mob/living/carbon/human/dummy/consistent) lizard.dna.features["mcolor"] = "#099" -<<<<<<< HEAD lizard.dna.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Light Tiger", MUTANT_INDEX_COLOR_LIST = list("#009999", "#009999", "#009999")) // SKYRAT EDIT - Customization - ORIGINAL: lizard.dna.features["tail_lizard"] = "Light Tiger" lizard.dna.mutant_bodyparts["snout"] = list(MUTANT_INDEX_NAME = "Sharp + Light", MUTANT_INDEX_COLOR_LIST = list("#009999", "#009999", "#009999")) // SKYRAT EDIT - Customization - ORIGINAL: lizard.dna.features["snout"] = "Sharp + Light" lizard.dna.mutant_bodyparts["horns"] = list(MUTANT_INDEX_NAME = "Simple", MUTANT_INDEX_COLOR_LIST = list("#009999", "#009999", "#009999")) // SKYRAT EDIT - Customization - ORIGINAL: lizard.dna.features["horns"] = "Simple" lizard.dna.mutant_bodyparts["frills"] = list(MUTANT_INDEX_NAME = "Aquatic", MUTANT_INDEX_COLOR_LIST = list("#009999", "#009999", "#009999")) // SKYRAT EDIT - Customization - ORIGINAL: lizard.dna.features["frills"] = "Aquatic" -======= - lizard.dna.features["tail_lizard"] = "Light Tiger" - lizard.dna.features["snout"] = "Sharp + Light" - lizard.dna.features["horns"] = "Simple" - lizard.dna.features["frills"] = "Aquatic" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lizard.dna.features["legs"] = "Normal Legs" lizard.set_species(/datum/species/lizard) lizard.equipOutfit(/datum/outfit/job/engineer) @@ -26,16 +19,10 @@ // let me have this var/mob/living/carbon/human/moth = allocate(/mob/living/carbon/human/dummy/consistent) -<<<<<<< HEAD moth.dna.features["mcolor"] = "#E5CD99" // SKYRAT EDIT ADDITION - Customization moth.dna.mutant_bodyparts["moth_antennae"] = list(MUTANT_INDEX_NAME = "Firewatch", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) // SKYRAT EDIT - Customization - ORIGINAL: moth.dna.features["moth_antennae"] = "Firewatch" moth.dna.mutant_bodyparts["moth_markings"] = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) // SKYRAT EDIT - Customization - ORIGINAL: moth.dna.features["moth_markings"] = "None" moth.dna.mutant_bodyparts["wings"] = list(MUTANT_INDEX_NAME = "Moth (Firewatch)", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) // SKYRAT EDIT - Customization - ORIGINAL: moth.dna.features["moth_wings"] = "Firewatch" -======= - moth.dna.features["moth_antennae"] = "Firewatch" - moth.dna.features["moth_markings"] = "None" - moth.dna.features["moth_wings"] = "Firewatch" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 moth.set_species(/datum/species/moth) moth.equipOutfit(/datum/outfit/job/cmo, visualsOnly = TRUE) test_screenshot("[/datum/species/moth]", get_flat_icon_for_all_directions(moth)) @@ -59,12 +46,9 @@ /datum/unit_test/screenshot_humanoids/proc/make_dummy(species, job_outfit) var/mob/living/carbon/human/dummy/consistent/dummy = allocate(/mob/living/carbon/human/dummy/consistent) dummy.set_species(species) -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - More consistent screenshots var/datum/species/dummy_species = new species dummy_species.prepare_human_for_preview(dummy) // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dummy.equipOutfit(job_outfit, visualsOnly = TRUE) return dummy diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm index 6b7689ddd68..5eb63bf4957 100644 --- a/code/modules/unit_tests/simple_animal_freeze.dm +++ b/code/modules/unit_tests/simple_animal_freeze.dm @@ -73,7 +73,6 @@ /mob/living/simple_animal/hostile/vatbeast, /mob/living/simple_animal/hostile/zombie, /mob/living/simple_animal/soulscythe, -<<<<<<< HEAD // MODULAR SKYRAT ENTRIES // PLEASE REFACTOR THESE AS YOU CAN @@ -147,8 +146,6 @@ /mob/living/simple_animal/hostile/zombie/cheesezombie, /mob/living/simple_animal/hostile/zombie/nocorpse, -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // DO NOT ADD NEW ENTRIES TO THIS LIST // READ THE COMMENT ABOVE ) diff --git a/code/modules/unit_tests/species_change_clothing.dm b/code/modules/unit_tests/species_change_clothing.dm index 77e1a263ce0..c73da727103 100644 --- a/code/modules/unit_tests/species_change_clothing.dm +++ b/code/modules/unit_tests/species_change_clothing.dm @@ -9,21 +9,14 @@ morphing_human.equipOutfit(/datum/outfit/job/assistant/consistent) morphing_human.dna.features["legs"] = DIGITIGRADE_LEGS //you WILL have digitigrade legs -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL START - This part of the test is useless as it's behavior that we actually WANT from those shoes, here. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/obj/item/human_shoes = morphing_human.get_item_by_slot(ITEM_SLOT_FEET) human_shoes.supports_variations_flags = NONE //do not fit lizards at all costs. morphing_human.set_species(/datum/species/lizard) var/obj/item/lizard_shoes = morphing_human.get_item_by_slot(ITEM_SLOT_FEET) -<<<<<<< HEAD // TEST_ASSERT_NOTEQUAL(human_shoes, lizard_shoes, "Lizard still has shoes after changing species.") */ // SKYRAT EDIT REMOVAL END -======= - TEST_ASSERT_NOTEQUAL(human_shoes, lizard_shoes, "Lizard still has shoes after changing species.") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Testing whether item-species restrictions properly blocks changing into a blacklisted species. morphing_human.set_species(/datum/species/monkey) diff --git a/code/modules/unit_tests/strippable.dm b/code/modules/unit_tests/strippable.dm index 66224d5532d..334344e23eb 100644 --- a/code/modules/unit_tests/strippable.dm +++ b/code/modules/unit_tests/strippable.dm @@ -8,11 +8,8 @@ var/datum/strip_menu/strip_menu = allocate(/datum/strip_menu, target, strippable) -<<<<<<< HEAD - run_loc_floor_bottom_left.luminosity = 6 // SKYRAT EDIT - Making this unit test pass by lighting a turf up. + //run_loc_floor_bottom_left.luminosity = 6 // SKYRAT EDIT - Uncomment if this fails. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/ui_state = strip_menu.ui_state(user) TEST_ASSERT_EQUAL(strip_menu.ui_status(user, ui_state), UI_INTERACTIVE, "Perfect conditions were not interactive.") diff --git a/code/modules/unit_tests/trauma_granting.dm b/code/modules/unit_tests/trauma_granting.dm index 0ac385ef4f7..26f536d74df 100644 --- a/code/modules/unit_tests/trauma_granting.dm +++ b/code/modules/unit_tests/trauma_granting.dm @@ -17,12 +17,9 @@ trauma_blacklist += typesof(/datum/brain_trauma/special/imaginary_friend) // Requires a obsession target trauma_blacklist += typesof(/datum/brain_trauma/special/obsessed) -<<<<<<< HEAD //SKYRAT EDIT START trauma_blacklist += typesof(/datum/brain_trauma/very_special/induced_hypnosis) // Requires an object to properly work //SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/datum/brain_trauma/trauma as anything in typesof(/datum/brain_trauma) - trauma_blacklist) if(trauma == initial(trauma.abstract_type)) diff --git a/code/modules/unit_tests/turf_icons.dm b/code/modules/unit_tests/turf_icons.dm index 6ffed11ea84..f9d8296419e 100644 --- a/code/modules/unit_tests/turf_icons.dm +++ b/code/modules/unit_tests/turf_icons.dm @@ -1,10 +1,6 @@ /// Makes sure turf icons actually exist. :) /datum/unit_test/turf_icons -<<<<<<< HEAD var/modular_mineral_turf_file = 'modular_skyrat/modules/xenoarch/icons/mining.dmi' //= 'icons/turf/mining.dmi' //MODULARITY SUPPORT - insert your snowflake MAP_SWITCH icon file here if you use that define. // SKYRAT EDIT - Added our modular file here (thanks) -======= - var/modular_mineral_turf_file //= 'icons/turf/mining.dmi' //MODULARITY SUPPORT - insert your snowflake MAP_SWITCH icon file here if you use that define. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/unit_test/turf_icons/Run() for(var/turf/turf_path as anything in (subtypesof(/turf) - typesof(/turf/closed/mineral))) @@ -32,13 +28,10 @@ var/list/ignored_types = list() //ignored_types += typesof(YOUR_DOWNSTREAM_TYPEPATH(s)_HERE) //MODULARITY SUPPORT. If you have snowflake typepaths that are blacklisted in, for example, create & destroy unit test because they require certain SS's being init, use this to blacklist them. -<<<<<<< HEAD //SKYRAT EDIT START ignored_types += typesof(/turf/open/openspace/ocean) ignored_types += typesof(/turf/open/misc/ocean) // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for(var/turf/open/open_turf_path as anything in (subtypesof(/turf/open) - ignored_types)) diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm index 71ed3ce0e39..1b431edb0a1 100644 --- a/code/modules/unit_tests/unit_test.dm +++ b/code/modules/unit_tests/unit_test.dm @@ -339,7 +339,6 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests()) returnable_list += typesof(/turf/open/space/openspace) returnable_list += typesof(/turf/open/openspace) -<<<<<<< HEAD //SKYRAT EDIT ADDITION START - OUR UNCREATABLES DOWN HERE //Not designed to be spawned without a turf. returnable_list += typesof(/obj/effect/abstract/liquid_turf) @@ -355,9 +354,6 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests()) // Can't be bothered adding more to them. returnable_list += list(/obj/item/organ/external/neck_accessory, /obj/item/organ/external/head_accessory) //SKYRAT EDIT ADDITION END - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return returnable_list /proc/RunUnitTests() diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm index 658504d69a8..01246168798 100644 --- a/code/modules/uplink/uplink_devices.dm +++ b/code/modules/uplink/uplink_devices.dm @@ -113,21 +113,13 @@ . += span_notice("You can destroy this device with a screwdriver.") // Multitool uplink -<<<<<<< HEAD ////obj/item/multitool/uplink/Initialize(mapload, owner, tc_amount = 20, datum/uplink_handler/uplink_handler_override = null) //ORIGINAL -/obj/item/multitool/uplink/Initialize(mapload, owner, tc_amount = 35, datum/uplink_handler/uplink_handler_override = null) //SKYRAT EDIT CHANGE -======= -/obj/item/multitool/uplink/Initialize(mapload, owner, tc_amount = 20, datum/uplink_handler/uplink_handler_override = null) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/item/multitool/uplink/Initialize(mapload, owner, tc_amount = 35, datum/uplink_handler/uplink_handler_override = null) //SKYRAT EDIT CHANGE. Original tc_amount = 20 . = ..() AddComponent(/datum/component/uplink, owner, FALSE, TRUE, UPLINK_TRAITORS, tc_amount) // Pen uplink -<<<<<<< HEAD ///obj/item/pen/uplink/Initialize(mapload, owner, tc_amount = 20, datum/uplink_handler/uplink_handler_override = null) //ORIGINAL -/obj/item/pen/uplink/Initialize(mapload, owner, tc_amount = 35, datum/uplink_handler/uplink_handler_override = null) //SKYRAT EDIT CHANGE -======= -/obj/item/pen/uplink/Initialize(mapload, owner, tc_amount = 20, datum/uplink_handler/uplink_handler_override = null) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 +/obj/item/pen/uplink/Initialize(mapload, owner, tc_amount = 35, datum/uplink_handler/uplink_handler_override = null) //SKYRAT EDIT CHANGE. Original tc_amount = 20 . = ..() AddComponent(/datum/component/uplink, owner, TRUE, FALSE, UPLINK_TRAITORS, tc_amount) diff --git a/code/modules/uplink/uplink_items/badass.dm b/code/modules/uplink/uplink_items/badass.dm index 80c2edb2076..5c5e0390b50 100644 --- a/code/modules/uplink/uplink_items/badass.dm +++ b/code/modules/uplink/uplink_items/badass.dm @@ -91,11 +91,7 @@ /datum/uplink_item/badass/stickers name = "Syndicate Sticker Pack" desc = "Contains 8 random stickers precisely engineered to resemble suspicious objects, which may or may not be useful for fooling crew." -<<<<<<< HEAD - item = /obj/item/storage/box/syndie_kit/stickers -======= item = /obj/item/storage/box/stickers/syndie_kit ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 cost = 1 /datum/uplink_item/badass/demotivational_posters diff --git a/code/modules/uplink/uplink_items/clownops.dm b/code/modules/uplink/uplink_items/clownops.dm index 3d9b8069a48..a5b4b0ec1df 100644 --- a/code/modules/uplink/uplink_items/clownops.dm +++ b/code/modules/uplink/uplink_items/clownops.dm @@ -141,10 +141,7 @@ cost = 80 purchasable_from = UPLINK_CLOWN_OPS -<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL START -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/stealthy_tools/combatbananashoes name = "Combat Banana Shoes" desc = "While making the wearer immune to most slipping attacks like regular combat clown shoes, these shoes \ @@ -154,10 +151,7 @@ cost = 6 surplus = 0 purchasable_from = UPLINK_CLOWN_OPS -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/badass/clownopclumsinessinjector //clowns can buy this too, but it's in the role-restricted items section for them name = "Clumsiness Injector" diff --git a/code/modules/uplink/uplink_items/device_tools.dm b/code/modules/uplink/uplink_items/device_tools.dm index dab2de920ae..b5ae6c935ee 100644 --- a/code/modules/uplink/uplink_items/device_tools.dm +++ b/code/modules/uplink/uplink_items/device_tools.dm @@ -66,12 +66,8 @@ cost = 1 surplus = 20 -<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL -/datum/uplink_item/device_tools/briefcase_launchpad -======= /datum/uplink_item/device_tools/briefcase_launchpad ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 name = "Briefcase Launchpad" desc = "A briefcase containing a launchpad, a device able to teleport items and people to and from targets up to eight tiles away from the briefcase. \ Also includes a remote control, disguised as an ordinary folder. Touch the briefcase with the remote to link it." @@ -87,10 +83,7 @@ Comes with 4 charges, recharges randomly. Warranty null and void if exposed to an electromagnetic pulse." item = /obj/item/storage/box/syndie_kit/syndicate_teleporter cost = 8 -<<<<<<< HEAD */ //END SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/device_tools/camera_app name = "SyndEye Program" @@ -184,10 +177,7 @@ cost = 3 purchasable_from = ~UPLINK_ALL_SYNDIE_OPS -<<<<<<< HEAD /* SKYRAT EDIT REMOVAL - It's laggy and doesn't really add much roleplay value -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/device_tools/suspiciousphone name = "Protocol CRAB-17 Phone" desc = "The Protocol CRAB-17 Phone, a phone borrowed from an unknown third party, it can be used to crash the space market, funneling the losses of the crew to your bank account.\ @@ -196,10 +186,7 @@ restricted = TRUE cost = 7 limited_stock = 1 -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/device_tools/binary name = "Binary Translator Key" diff --git a/code/modules/uplink/uplink_items/explosive.dm b/code/modules/uplink/uplink_items/explosive.dm index f72ae43440d..0ecea6a5b60 100644 --- a/code/modules/uplink/uplink_items/explosive.dm +++ b/code/modules/uplink/uplink_items/explosive.dm @@ -36,10 +36,7 @@ cost = 4 cant_discount = TRUE -<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL START -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/explosives/detomatix name = "Detomatix disk" desc = "When inserted into a tablet, this cartridge gives you four opportunities to \ @@ -48,11 +45,7 @@ item = /obj/item/computer_disk/virus/detomatix cost = 6 restricted = TRUE -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/explosives/emp name = "EMP Grenades and Implanter Kit" desc = "A box that contains five EMP grenades and an EMP implant with three uses. Useful to disrupt communications, \ diff --git a/code/modules/uplink/uplink_items/job.dm b/code/modules/uplink/uplink_items/job.dm index fe0322355b1..73eae12ce08 100644 --- a/code/modules/uplink/uplink_items/job.dm +++ b/code/modules/uplink/uplink_items/job.dm @@ -319,10 +319,7 @@ restricted_roles = list(JOB_ROBOTICIST, JOB_RESEARCH_DIRECTOR) surplus = 15 -<<<<<<< HEAD /* // SKYRAT EDIT REMOVAL START -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/role_restricted/spider_injector name = "Australicus Slime Mutator" desc = "Crikey mate, it's been a wild travel from the Australicus sector but we've managed to get \ @@ -335,11 +332,8 @@ restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_ROBOTICIST) surplus = 10 -<<<<<<< HEAD */ // SKYRAT EDIT REMOVAL END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /datum/uplink_item/role_restricted/blastcannon name = "Blast Cannon" desc = "A highly specialized weapon, the Blast Cannon is actually relatively simple. It contains an attachment for a tank transfer valve mounted to an angled pipe specially constructed \ diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm index e697338604b..50ae39c2996 100644 --- a/code/modules/uplink/uplink_items/nukeops.dm +++ b/code/modules/uplink/uplink_items/nukeops.dm @@ -253,13 +253,8 @@ /datum/uplink_item/weapon_kits/high_cost/machinegun name = "L6 Squad Automatic Weapon (Moderate)" -<<<<<<< HEAD desc = "A fully-loaded Scarborough Arms belt-fed machine gun. \ This deadly weapon has a 50-round box chambered for 7.12x82mm ammunition." //SKYRAT EDIT - AUSSEC TO SCARBOROUGH -======= - desc = "A fully-loaded Aussec Armoury belt-fed machine gun. \ - This deadly weapon has a massive 50-round magazine of devastating 7mm ammunition." ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 item = /obj/item/gun/ballistic/automatic/l6_saw /datum/uplink_item/ammo_nuclear/basic/machinegun diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm index dc0735619d9..155ef2b4570 100644 --- a/code/modules/vehicles/_vehicle.dm +++ b/code/modules/vehicles/_vehicle.dm @@ -190,8 +190,5 @@ . = ..() if(trailer && .) var/dir_to_move = get_dir(trailer.loc, old_loc) -<<<<<<< HEAD trailer.glide_size = glide_size //SKYRAT EDIT: Carts -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 step(trailer, dir_to_move) diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index cee92059aac..846d6a6434b 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -586,11 +586,7 @@ /obj/vehicle/sealed/mecha/proc/process_occupants(seconds_per_tick) for(var/mob/living/occupant as anything in occupants) -<<<<<<< HEAD - if(!(mecha_flags & IS_ENCLOSED) && occupant?.incapacitated()) //no sides mean it's easy to just sorta fall out if you're incapacitated. -======= if(!(mecha_flags & IS_ENCLOSED) && occupant?.incapacitated) //no sides mean it's easy to just sorta fall out if you're incapacitated. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mob_exit(occupant, randomstep = TRUE) //bye bye continue if(cell && cell.maxcharge) @@ -662,11 +658,7 @@ if(phasing) balloon_alert(user, "not while [phasing]!") return -<<<<<<< HEAD - if(user.incapacitated()) -======= if(user.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(!get_charge()) return diff --git a/code/modules/vehicles/mecha/equipment/tools/radio.dm b/code/modules/vehicles/mecha/equipment/tools/radio.dm index 87b2ce60376..18740fc22b9 100644 --- a/code/modules/vehicles/mecha/equipment/tools/radio.dm +++ b/code/modules/vehicles/mecha/equipment/tools/radio.dm @@ -36,11 +36,7 @@ return TRUE if("set_frequency") var/new_frequency = text2num(params["new_frequency"]) -<<<<<<< HEAD - radio.set_frequency(sanitize_frequency(new_frequency, radio.freerange, radio.syndie)) -======= radio.set_frequency(sanitize_frequency(new_frequency, radio.freerange, (radio.special_channels & RADIO_SPECIAL_SYNDIE))) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return TRUE return FALSE diff --git a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm index 71efe27e323..c19aede50d9 100644 --- a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm @@ -14,17 +14,9 @@ harmful = TRUE mech_flags = EXOSUIT_MODULE_RIPLEY ///Bool for whether we beat the hell out of things we punch (and tear off their arms) -<<<<<<< HEAD - var/killer_clamp = TRUE - ///How much base damage this clamp does - var/clamp_damage = 20 - ///Var for the chassis we are attached to, needed to access ripley contents and such - var/obj/vehicle/sealed/mecha/ripley/cargo_holder -======= var/killer_clamp = FALSE ///How much base damage this clamp does var/clamp_damage = 20 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ///Audio for using the hydraulic clamp var/clampsound = 'sound/mecha/hydraulic.ogg' ///Chassis but typed for the cargo_hold var diff --git a/code/modules/vehicles/mecha/mech_bay.dm b/code/modules/vehicles/mecha/mech_bay.dm index 94955618e27..c9f0aa20fa7 100644 --- a/code/modules/vehicles/mecha/mech_bay.dm +++ b/code/modules/vehicles/mecha/mech_bay.dm @@ -114,11 +114,7 @@ ui = new(user, src, "MechBayPowerConsole", name) ui.open() -<<<<<<< HEAD -/obj/machinery/computer/mech_bay_power_console/ui_act(action, params) -======= /obj/machinery/computer/mech_bay_power_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/vehicles/mecha/mech_fabricator.dm b/code/modules/vehicles/mecha/mech_fabricator.dm index 2108e268eaf..b167f381415 100644 --- a/code/modules/vehicles/mecha/mech_fabricator.dm +++ b/code/modules/vehicles/mecha/mech_fabricator.dm @@ -427,11 +427,7 @@ return data -<<<<<<< HEAD -/obj/machinery/mecha_part_fabricator/ui_act(action, list/params) -======= /obj/machinery/mecha_part_fabricator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) diff --git a/code/modules/vehicles/mecha/mecha_control_console.dm b/code/modules/vehicles/mecha/mecha_control_console.dm index 82e25d7e74e..d31bd5a5bd2 100644 --- a/code/modules/vehicles/mecha/mecha_control_console.dm +++ b/code/modules/vehicles/mecha/mecha_control_console.dm @@ -45,11 +45,7 @@ return data -<<<<<<< HEAD -/obj/machinery/computer/mecha/ui_act(action, params) -======= /obj/machinery/computer/mecha/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm index dbc20f46d0c..a1e398f6f90 100644 --- a/code/modules/vehicles/mecha/mecha_mob_interaction.dm +++ b/code/modules/vehicles/mecha/mecha_mob_interaction.dm @@ -20,11 +20,7 @@ moved_inside(M) /obj/vehicle/sealed/mecha/enter_checks(mob/M) -<<<<<<< HEAD - if(M.incapacitated()) -======= if(M.incapacitated) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return FALSE if(atom_integrity <= 0) to_chat(M, span_warning("You cannot get in the [src], it has been destroyed!")) diff --git a/code/modules/vehicles/mecha/working/clarke.dm b/code/modules/vehicles/mecha/working/clarke.dm index b1eec324bbb..0acfa2749a5 100644 --- a/code/modules/vehicles/mecha/working/clarke.dm +++ b/code/modules/vehicles/mecha/working/clarke.dm @@ -96,11 +96,7 @@ ) return data -<<<<<<< HEAD -/obj/item/mecha_parts/mecha_equipment/orebox_manager/ui_act(action, list/params) -======= /obj/item/mecha_parts/mecha_equipment/orebox_manager/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return TRUE diff --git a/code/modules/vehicles/mecha/working/ripley.dm b/code/modules/vehicles/mecha/working/ripley.dm index 778dc033185..f5c55f613ee 100644 --- a/code/modules/vehicles/mecha/working/ripley.dm +++ b/code/modules/vehicles/mecha/working/ripley.dm @@ -338,11 +338,7 @@ GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/ripley/cargo) )) return data -<<<<<<< HEAD -/obj/item/mecha_parts/mecha_equipment/ejector/ui_act(action, list/params) -======= /obj/item/mecha_parts/mecha_equipment/ejector/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return TRUE @@ -386,11 +382,7 @@ GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/ripley/cargo) to_chat(source, span_warning("You don't have the room to remove [cuffs]!")) return COMSIG_MOB_BLOCK_CUFF_REMOVAL -<<<<<<< HEAD -/obj/item/mecha_parts/mecha_equipment/ejector/seccage/ui_act(action, list/params) -======= /obj/item/mecha_parts/mecha_equipment/ejector/seccage/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if(action == "eject") var/mob/passenger = locate(params["cargoref"]) in contents if(!passenger) diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index cd59352417e..25e8ed97409 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -169,11 +169,7 @@ pick_up_board(skater) /obj/vehicle/ridden/scooter/skateboard/proc/pick_up_board(mob/living/carbon/skater) -<<<<<<< HEAD - if (skater.incapacitated() || !Adjacent(skater)) -======= if (skater.incapacitated || !Adjacent(skater)) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return if(has_buckled_mobs()) to_chat(skater, span_warning("You can't lift this up when somebody's on it.")) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 6eedf60c65a..1ab99d16fe9 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -988,15 +988,9 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock) var/list/weighted_crits = list() weighted_crits[CRUSH_CRIT_SHATTER_LEGS] = 100 -<<<<<<< HEAD - weighted_crits[CRUSH_CRIT_PARAPALEGIC] = 80 + weighted_crits[CRUSH_CRIT_PARAPLEGIC] = 80 //weighted_crits[CRUSH_CRIT_HEADGIB] = 20 // SKYRAT EDIT REMOVAL weighted_crits[CRUSH_CRIT_SQUISH_LIMB] = 80 // SKYRAT EDIT CHANGE - ORIGINAL: weighted_crits[CRUSH_CRIT_SQUISH_LIMB] = 100 -======= - weighted_crits[CRUSH_CRIT_PARAPLEGIC] = 80 - weighted_crits[CRUSH_CRIT_HEADGIB] = 20 - weighted_crits[CRUSH_CRIT_SQUISH_LIMB] = 100 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return weighted_crits @@ -1033,11 +1027,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock) if(left_leg || right_leg) carbon_target.visible_message(span_danger("[carbon_target]'s legs shatter with a sickening crunch!"), span_userdanger("Your legs shatter with a sickening crunch!")) return TRUE -<<<<<<< HEAD - if(CRUSH_CRIT_PARAPALEGIC) // paralyze this binch -======= if(CRUSH_CRIT_PARAPLEGIC) // paralyze this binch ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // the new paraplegic gets like 4 lines of losing their legs so skip them if (!iscarbon(atom_target)) return FALSE @@ -1192,21 +1182,6 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock) obj_flags |= EMAGGED balloon_alert(user, "product lock disabled") return TRUE -<<<<<<< HEAD - -/obj/machinery/vending/interact(mob/user) - if (!HAS_AI_ACCESS(user)) - if(seconds_electrified && !(machine_stat & NOPOWER)) - if(shock(user, 100)) - return - - if(tilted && !user.buckled && !isAdminGhostAI(user)) - to_chat(user, span_notice("You begin righting [src].")) - if(do_after(user, 5 SECONDS, target=src)) - untilt(user) - return - -======= /obj/machinery/vending/interact(mob/user) if (HAS_AI_ACCESS(user)) @@ -1222,7 +1197,6 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock) untilt(user) return ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ..() /obj/machinery/vending/attack_robot_secondary(mob/user, list/modifiers) @@ -1458,11 +1432,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock) sec_radio = new (src) sec_radio.set_listening(FALSE) sec_radio.set_frequency(FREQ_SECURITY) -<<<<<<< HEAD sec_radio.talk_into(src, "SECURITY ALERT: [usr] recorded attempting to purchase [item_record.name] in [get_area(src)]. Please watch for substance abuse.", FREQ_SECURITY) // SKYRAT EDIT CHANGE -======= - sec_radio.talk_into(src, "SECURITY ALERT: Underaged crewmember [usr] recorded attempting to purchase [item_record.name] in [get_area(src)]. Please watch for substance abuse.", FREQ_SECURITY) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GLOB.narcd_underages += usr flick(icon_deny,src) vend_ready = TRUE diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm index 8e3ca159b36..f7fca7e017b 100644 --- a/code/modules/vending/engivend.dm +++ b/code/modules/vending/engivend.dm @@ -24,11 +24,7 @@ ) premium = list( /obj/item/storage/belt/utility = 3, -<<<<<<< HEAD ///obj/item/construction/rcd/loaded = 2, // SKYRAT EDIT REMOVAL -======= - /obj/item/construction/rcd/loaded = 2, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/storage/box/smart_metal_foam = 1, ) refill_canister = /obj/item/vending_refill/engivend diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index a4a2af1acf2..d1a237eaf64 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -58,10 +58,7 @@ /obj/item/skillchip/sabrage = 2, /obj/item/skillchip/useless_adapter = 5, /obj/item/skillchip/wine_taster = 2, -<<<<<<< HEAD -======= /obj/item/skillchip/big_pointer = 2, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ), ), list( diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index abaa754b402..f700456a4e1 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -41,10 +41,7 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE) icon_state = "secdrobe" product_ads = "Beat perps in style!;It's red so you can't see the blood!;You have the right to be fashionable!;Now you can be the fashion police you always wanted to be!" vend_reply = "Thank you for using the SecDrobe!" -<<<<<<< HEAD /* SKYRAT EDIT - LISTS OVERRIDDEN IN 'modular_skyrat\modules\sec_haul\code\misc\vending.dm' -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 products = list( /obj/item/clothing/head/beret/sec = 3, /obj/item/clothing/head/soft/sec = 3, @@ -69,12 +66,8 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE) /obj/item/clothing/under/rank/security/officer/formal = 3, /obj/item/clothing/suit/jacket/officer/blue = 3, /obj/item/clothing/head/beret/sec/navyofficer = 3, -<<<<<<< HEAD ) */ -======= - ) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe payment_department = ACCOUNT_SEC light_color = COLOR_MOSTLY_PURE_RED @@ -340,11 +333,7 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE) /obj/item/storage/backpack/satchel/explorer = 1, /obj/item/storage/backpack/messenger/explorer = 1, /obj/item/storage/bag/books = 1, -<<<<<<< HEAD - /obj/item/radio/headset/headset_srv = 2, -======= /obj/item/radio/headset/headset_srvent = 2, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ) refill_canister = /obj/item/vending_refill/wardrobe/curator_wardrobe payment_department = ACCOUNT_SRV diff --git a/code/modules/wiremod/components/abstract/module.dm b/code/modules/wiremod/components/abstract/module.dm index c3d4451d7e7..e43cba9b239 100644 --- a/code/modules/wiremod/components/abstract/module.dm +++ b/code/modules/wiremod/components/abstract/module.dm @@ -236,12 +236,7 @@ return ..() #define WITHIN_RANGE(id, table) (id >= 1 && id <= length(table)) - -<<<<<<< HEAD -/obj/item/circuit_component/module/ui_act(action, list/params) -======= /obj/item/circuit_component/module/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/wiremod/components/admin/proccall.dm b/code/modules/wiremod/components/admin/proccall.dm index 8aa36bf1f69..594c0a6e7d1 100644 --- a/code/modules/wiremod/components/admin/proccall.dm +++ b/code/modules/wiremod/components/admin/proccall.dm @@ -114,11 +114,7 @@ arguments += add_input_port(data["name"], data["datatype"]) return ..() -<<<<<<< HEAD -/obj/item/circuit_component/proccall/ui_act(action, list/params) -======= /obj/item/circuit_component/proccall/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/wiremod/components/bci/reagent_injector.dm b/code/modules/wiremod/components/bci/reagent_injector.dm index 593e43b7d8a..d7f4a969f31 100644 --- a/code/modules/wiremod/components/bci/reagent_injector.dm +++ b/code/modules/wiremod/components/bci/reagent_injector.dm @@ -9,13 +9,10 @@ display_name = "Reagent Injector" desc = "A component that can inject reagents from a BCI's reagent storage." category = "BCI" -<<<<<<< HEAD //SKYRAT EDIT CHANGE BEGIN - Add container type flag - This is required since we have two reagent components, and the BCI only allows one active //circuit_flags = CIRCUIT_NO_DUPLICATES - SKYRAT EDIT - ORIGINAL circuit_flags = CIRCUIT_NO_DUPLICATES|CIRCUIT_REAGENT_CONTAINER_TYPE //SKYRAT EDIT CHANGE END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 circuit_flags = CIRCUIT_NO_DUPLICATES required_shells = list(/obj/item/organ/internal/cyberimp/bci) diff --git a/code/modules/wiremod/components/id/access_checker.dm b/code/modules/wiremod/components/id/access_checker.dm index 20dc3dadf31..1644d12cba5 100644 --- a/code/modules/wiremod/components/id/access_checker.dm +++ b/code/modules/wiremod/components/id/access_checker.dm @@ -87,11 +87,7 @@ data["oneAccess"] = check_any.value return data -<<<<<<< HEAD -/obj/item/circuit_component/compare/access/ui_act(action, params) -======= /obj/item/circuit_component/compare/access/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/code/modules/wiremod/core/component_printer.dm b/code/modules/wiremod/core/component_printer.dm index 96c58336f0c..cb51a0e8ab7 100644 --- a/code/modules/wiremod/core/component_printer.dm +++ b/code/modules/wiremod/core/component_printer.dm @@ -117,11 +117,7 @@ materials.use_materials(design.materials, efficiency_coeff, 1, "printed", "[design.name]") return new design.build_path(drop_location()) -<<<<<<< HEAD -/obj/machinery/component_printer/ui_act(action, list/params) -======= /obj/machinery/component_printer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return @@ -280,11 +276,7 @@ get_asset_datum(/datum/asset/spritesheet/research_designs) ) -<<<<<<< HEAD -/obj/machinery/debug_component_printer/ui_act(action, list/params) -======= /obj/machinery/debug_component_printer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return @@ -372,11 +364,7 @@ update_static_data_for_all_viewers() -<<<<<<< HEAD -/obj/machinery/module_duplicator/ui_act(action, list/params) -======= /obj/machinery/module_duplicator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if (.) return diff --git a/code/modules/wiremod/core/integrated_circuit.dm b/code/modules/wiremod/core/integrated_circuit.dm index 9d07d2ca9e1..29f8d42b489 100644 --- a/code/modules/wiremod/core/integrated_circuit.dm +++ b/code/modules/wiremod/core/integrated_circuit.dm @@ -264,7 +264,6 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit) to_chat(user, span_danger("You can't insert multiple instances of this component into the same circuit!")) return FALSE -<<<<<<< HEAD // SKYRAT ADDITION BEGIN - This is required since we have two reagent components, and the BCI only allows one active if(to_add.circuit_flags & CIRCUIT_REAGENT_CONTAINER_TYPE) if(shell && shell.reagents) @@ -272,8 +271,6 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit) return FALSE // SKYRAT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 var/success = FALSE if(user) success = user.transferItemToLoc(to_add, src) diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm index 7c3fe016558..7adefcaa5ed 100644 --- a/code/modules/wiremod/shell/brain_computer_interface.dm +++ b/code/modules/wiremod/shell/brain_computer_interface.dm @@ -3,10 +3,6 @@ desc = "An implant that can be placed in a user's head to control circuits using their brain." icon = 'icons/obj/science/circuits.dmi' icon_state = "bci" -<<<<<<< HEAD - visual = FALSE -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 zone = BODY_ZONE_HEAD w_class = WEIGHT_CLASS_TINY diff --git a/config/awaymissionconfig.txt b/config/awaymissionconfig.txt index f4d8e25546d..0a96d93984a 100644 --- a/config/awaymissionconfig.txt +++ b/config/awaymissionconfig.txt @@ -14,8 +14,5 @@ #_maps/RandomZLevels/snowdin.dmm #_maps/RandomZLevels/research.dmm #_maps/RandomZLevels/SnowCabin.dmm -<<<<<<< HEAD #_maps/RandomZLevels/blackmesa.dmm -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 #_maps/RandomZLevels/museum.dmm diff --git a/config/config.txt b/config/config.txt index 418f1e876f9..51f28e06311 100644 --- a/config/config.txt +++ b/config/config.txt @@ -5,10 +5,7 @@ $include dbconfig.txt $include comms.txt $include logging.txt $include resources.txt -<<<<<<< HEAD $include skyrat/skyrat_config.txt -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 $include interviews.txt $include lua.txt $include auxtools.txt diff --git a/config/game_options.txt b/config/game_options.txt index d0bdd7e6475..beea3882b75 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -305,13 +305,10 @@ LAW_WEIGHT custom,0 ## standard-ish laws. These are fairly ok to run ## Unique AI station trait uses weights so we don't want asimov -<<<<<<< HEAD #SKYRAT EDIT ADDITION BEGIN LAW_WEIGHT armadyne_safeguard,40 LAW_WEIGHT dagothbot,8 #SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LAW_WEIGHT asimov,0 LAW_WEIGHT asimovpp,5 LAW_WEIGHT paladin,5 @@ -393,7 +390,6 @@ ROUNDSTART_RACES ethereal ## Races that are radical departures to what a species is, so while they technically can be roundstart - it's probably not wise #ROUNDSTART_RACES android #ROUNDSTART_RACES golem -<<<<<<< HEAD ## SKYRAT RACES DOWN THERE ROUNDSTART_RACES mammal @@ -413,8 +409,6 @@ ROUNDSTART_RACES aquatic ROUNDSTART_RACES insect ROUNDSTART_RACES synth ROUNDSTART_RACES ghoul -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ##------------------------------------------------------------------------------------------- @@ -591,4 +585,4 @@ MAX_POSITIVE_QUIRKS 6 # A config that skews with the random spawners weights # If the value is lower than 1, it'll tend to even out the odds # If higher than 1, it'll lean toward common spawns even more. -RANDOM_LOOT_WEIGHT_MODIFIER 1 \ No newline at end of file +RANDOM_LOOT_WEIGHT_MODIFIER 1 diff --git a/config/jobconfig.toml b/config/jobconfig.toml index dc6d2bd1289..949228e3680 100644 --- a/config/jobconfig.toml +++ b/config/jobconfig.toml @@ -19,7 +19,6 @@ ## Best of luck editing! [AI] -<<<<<<< HEAD "Playtime Requirements" = 2400 "Required Account Age" = 30 "# Required Character Age" = 0 @@ -60,34 +59,6 @@ "# Required Character Age" = 0 "Spawn Positions" = 1 "Total Positions" = 1 -======= -"# Playtime Requirements" = 180 -"# Required Account Age" = 30 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - -[ASSISTANT] -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = -1 -"# Total Positions" = -1 - -[ATMOSPHERIC_TECHNICIAN] -"# Playtime Requirements" = 60 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 2 -"# Total Positions" = 3 - -[BARTENDER] -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 [BITRUNNER] "# Playtime Requirements" = 0 @@ -97,7 +68,6 @@ "# Total Positions" = 3 [BOTANIST] -<<<<<<< HEAD "Playtime Requirements" = 0 "Required Account Age" = 0 "# Required Character Age" = 0 @@ -117,20 +87,6 @@ "# Required Character Age" = 0 "Spawn Positions" = 1 "Total Positions" = 1 -======= -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 2 -"# Total Positions" = 3 - -[CAPTAIN] -"# Playtime Requirements" = 180 -"# Required Account Age" = 14 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 [CARGO_TECHNICIAN] "# Playtime Requirements" = 0 @@ -140,7 +96,6 @@ "# Total Positions" = 5 [CHAPLAIN] -<<<<<<< HEAD "Playtime Requirements" = 0 "Required Account Age" = 0 "# Required Character Age" = 0 @@ -188,48 +143,6 @@ "# Required Character Age" = 0 "Spawn Positions" = 1 "Total Positions" = 1 -======= -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - -[CHEMIST] -"# Playtime Requirements" = 60 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 2 -"# Total Positions" = 2 - -[CHIEF_ENGINEER] -"# Playtime Requirements" = 180 -"# Required Account Age" = 7 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - -[CHIEF_MEDICAL_OFFICER] -"# Playtime Requirements" = 180 -"# Required Account Age" = 7 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - -[CLOWN] -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - -[COOK] -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 2 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 [CORONER] "# Playtime Requirements" = 0 @@ -239,7 +152,6 @@ "# Total Positions" = 1 [CURATOR] -<<<<<<< HEAD "Playtime Requirements" = 0 "Required Account Age" = 0 "# Required Character Age" = 0 @@ -441,157 +353,3 @@ "# Required Character Age" = 0 "Spawn Positions" = 1 "Total Positions" = 1 -======= -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - -[CYBORG] -"# Playtime Requirements" = 120 -"# Required Account Age" = 21 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 0 - -[DETECTIVE] -"# Playtime Requirements" = 300 -"# Required Account Age" = 7 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - -[GENETICIST] -"# Playtime Requirements" = 60 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 2 -"# Total Positions" = 2 - -[HEAD_OF_PERSONNEL] -"# Playtime Requirements" = 180 -"# Required Account Age" = 10 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - -[HEAD_OF_SECURITY] -"# Playtime Requirements" = 300 -"# Required Account Age" = 14 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - -[JANITOR] -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 2 - -[LAWYER] -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 2 -"# Total Positions" = 2 - -[MEDICAL_DOCTOR] -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 4 -"# Total Positions" = 6 - -[MIME] -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - -[PARAMEDIC] -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 2 -"# Total Positions" = 2 - -[PRISONER] -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 2 -"# Total Positions" = 0 - -[PSYCHOLOGIST] -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - -[QUARTERMASTER] -"# Playtime Requirements" = 0 -"# Required Account Age" = 7 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - -[RESEARCH_DIRECTOR] -"# Playtime Requirements" = 180 -"# Required Account Age" = 7 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - -[ROBOTICIST] -"# Playtime Requirements" = 60 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 2 -"# Total Positions" = 2 - -[SCIENTIST] -"# Playtime Requirements" = 60 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 3 -"# Total Positions" = 5 - -[SECURITY_OFFICER] -"# Playtime Requirements" = 300 -"# Required Account Age" = 7 -"# Required Character Age" = 0 -"# Spawn Positions" = 5 -"# Total Positions" = 5 - -[SHAFT_MINER] -"# Playtime Requirements" = 0 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 3 -"# Total Positions" = 3 - -[STATION_ENGINEER] -"# Playtime Requirements" = 60 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 5 -"# Total Positions" = 5 - -[VETERAN_ADVISOR] -"# Playtime Requirements" = 6000 -"# Required Account Age" = 7 -"# Required Character Age" = 0 -"# Spawn Positions" = 0 -"# Total Positions" = 0 - -[WARDEN] -"# Playtime Requirements" = 300 -"# Required Account Age" = 7 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/config/maps.txt b/config/maps.txt index 75f4cb7a815..3bb36ceaa17 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -62,7 +62,6 @@ endmap map runtimestation endmap -<<<<<<< HEAD ##SKYRAT MAPS## @@ -80,5 +79,3 @@ map kilostation maxplayers 75 votable endmap -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt index 3e258cbbeac..fb34b2208a5 100644 --- a/config/spaceruinblacklist.txt +++ b/config/spaceruinblacklist.txt @@ -83,10 +83,7 @@ #_maps/RandomRuins/SpaceRuins/waystation.dmm #_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm #_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm -<<<<<<< HEAD #_maps/RandomRuins/SpaceRuins/skyrat/drones_derelict.dmm #modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/forgottenship_skyrat.dmm #modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/shuttle8532.dmm #modular_skyrat/modules/ruins/maps/space/dangerous_research.dmm -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/config/word_filter.toml b/config/word_filter.toml index eae833ed34b..90397231aec 100644 --- a/config/word_filter.toml +++ b/config/word_filter.toml @@ -23,10 +23,6 @@ [soft_ic] "testsofterblocks" = "This term is commonly considered OOC, only use it with context." -<<<<<<< HEAD -# Anything in here will warn the player if said ICly *except* PDAs, the player must approve their message to send it -======= # Anything in here will warn the player if said ICly *except* PDAs. the player must approve their message to send it ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 [soft_ic_outside_pda] "testsoftestblocks" = "Stop saying debug phrases ICly." diff --git a/html/changelogs/archive/2018-04.yml b/html/changelogs/archive/2018-04.yml index 2268af99b4f..c75868fd213 100644 --- a/html/changelogs/archive/2018-04.yml +++ b/html/changelogs/archive/2018-04.yml @@ -409,11 +409,7 @@ flags are removed. - code_imp: New stationloving component replaces all of this. - code_imp: 'Added new signals: COMSIG_MOVABLE_Z_CHANGED is now sent when a movable -<<<<<<< HEAD - changes Z level, COMSIG_PREQDELETED is sent before the object''s Destroy() -======= changes Z level, COMSIG_PARENT_PREQDELETED is sent before the object''s Destroy() ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 is called and allows interrupting the deletion, COMSIG_ITEM_IMBUE_SOUL is sent when a wizard attempts to make a thing their phylactery' - bugfix: slime pressurization potions are no longer consumed when attempting to diff --git a/html/changelogs/archive/2018-08.yml b/html/changelogs/archive/2018-08.yml index e61132f7a18..3ee21a1a6f6 100644 --- a/html/changelogs/archive/2018-08.yml +++ b/html/changelogs/archive/2018-08.yml @@ -63,11 +63,7 @@ the vault contains a set of valuable Syndicate documents.' - tweak: Added a scrubber pipenet to the Lavaland mining base. Garen: -<<<<<<< HEAD - - bugfix: mobs now call COMSIG_ATOM_ATTACKBY -======= - bugfix: mobs now call COMSIG_PARENT_ATTACKBY ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JJRcop: - rscadd: Deadchat can use emoji now, be sure to freak out scrying orb users. Kmc2000: diff --git a/html/changelogs/archive/2021-05.yml b/html/changelogs/archive/2021-05.yml index 6d0f6584475..7aa13a74c97 100644 --- a/html/changelogs/archive/2021-05.yml +++ b/html/changelogs/archive/2021-05.yml @@ -602,7 +602,6 @@ added. - bugfix: Removed instances of duplicated pipes in icebox atmos. 2021-05-24: -<<<<<<< HEAD Cheshify: - rscadd: New gear is available within Mothership Astrum. - balance: Mothership Astrum has been entirely rebalanced. @@ -631,14 +630,11 @@ found on the maps at round-start. GoldenKeyboard: - rscadd: Cryopods can store items; and their control computer can dispense them. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PositiveEntropy: - imageadd: The cyborg toolset is now all new and improved, with a new coat of paint! RandomGamer123: - spellcheck: Attacking someone with a blood filter now uses the correct verb conjugation - bugfix: Lockers can now only be unlocked if you're next to them. -<<<<<<< HEAD SkyratBot: - bugfix: Fixed another source to the bug preventing reconnect. - bugfix: Lockers can now only be unlocked if you're next to them. @@ -657,8 +653,6 @@ - refactor: tamable component + egg layer component, animal variety element Sonic121x: - imageadd: ID trim for department peace keeper -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SpaceDragon00: - qol: Inspecting a weapon shows a warning label. By default, this shows force, throwforce, armour_penetration, and block_chance in an esoteric manner. Inspecting @@ -667,12 +661,9 @@ and the damage of those modes - qol: Using credits on a PDA, Laptop, or Tablet now inserts the credits into the contained ID card, if there is one -<<<<<<< HEAD ZephyrTFA: - admin: LOOC can now be muted. How you managed to earn a LOOC mute is beyond me though. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 alexkar598: - code_imp: Removed a proc thats used nowhere and implemented nowhere maxymax13: @@ -682,7 +673,6 @@ ID card models. - imageadd: The rainbow ID card has been resprited. - imageadd: The flames ID card has been slightly improved. -<<<<<<< HEAD thestubborn: - bugfix: blueshield jacket should show up now - rscadd: Tentacle Beard! @@ -758,7 +748,6 @@ - rscadd: From June 23rd to June 29th, celebrates pride week w/ rainbow floor tiles. - rscdel: Removed the toggle intent selection style preference - bugfix: Fixes the jumpskirt in hand icon displaying an error -======= tralezab: - refactor: tamable component + egg layer component, animal variety element 2021-05-25: @@ -800,12 +789,10 @@ - bugfix: Gastrectomy now correctly has a surgery failure message RandomGamer123: - rscdel: Removed the toggle intent selection style preference ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Waltermeldron: - rscadd: Adds Integrated Circuits back to science. Circuit Components can be printed off and placed onto these circuits. These circuits can be placed into shells that can be printed at the protolathe. -<<<<<<< HEAD Yawet330: - tweak: Mold weight & Max occurances - tweak: Mold rats now respect hardsuits. @@ -838,7 +825,6 @@ - bugfix: Jatum handles better non-assoc list - bugfix: Fixed UIs like the cargo chatroom console and the genetics console not opening. -======= dragomagol: - qol: door remotes now use balloon alerts instead of chat messages ninjanomnom: @@ -854,7 +840,6 @@ BraveMole: - bugfix: Jatum handles better non-assoc list Mickyan: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: you can knock cigarettes out of people's mouths again, hooray! - balance: objects that can be knocked off now have a chance to fall whenever the wearer is knocked down @@ -863,7 +848,6 @@ - balance: Broken prescription glasses can be repaired using cloth or a welding tool - balance: Increased point cost of Nearsighted quirk from -1 to -4 -<<<<<<< HEAD Swiftfeather: - bugfix: Teleportation now blocked at gateway missions tf-4: @@ -934,7 +918,6 @@ - bugfix: Fixed duplicate PunPun in Tramstation bar - bugfix: Fixed duplicated chemistry locker embedded in the Tramstation HPLC machine - bugfix: Organs without owner no longer runtime -======= PositiveEntropy, Twaticus, AdipemDragon: - imageadd: Replaces the old stool sprites with new and improved ones made by Twaticus and AdipemDragon! @@ -1022,4 +1005,3 @@ - refactor: Rainbow bunch flowers now use GAGS instead of their old method of greyscaling ninjanomnom: - bugfix: Screwdrivers no longer cause an error icon while in the belt ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-06.yml b/html/changelogs/archive/2021-06.yml index fda6adca5d5..0bbef2f594d 100644 --- a/html/changelogs/archive/2021-06.yml +++ b/html/changelogs/archive/2021-06.yml @@ -2,7 +2,6 @@ Arkatos: - refactor: Notice board now uses tgui. - bugfix: Notice boards will now properly drop their contents upon destruction. -<<<<<<< HEAD KathrinBailey: - bugfix: Wildcat magazines now show up. - rscadd: Prototype version of Privateers, including a new shuttle for their exclusive @@ -151,7 +150,6 @@ instant mozi_h: - bugfix: Fixed a small icon inconsistency with the notice board. -======= FlamingLily: - qol: Surgery masks no longer block surgery. Gamer025: @@ -240,7 +238,6 @@ peptron1: - rscadd: Ghosts can now find out how much power is in the network by examining cables ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-06-07: 'ArcaneMusic, Celotajs: ft PowerfulBacon': - rscadd: Modular, GAGS winter coats and sprites. @@ -249,50 +246,6 @@ - rscadd: Added the ability to dye your hair with gradients by using a hair dye spray. - rscadd: The new Colorist quirk, allowing you to spawn with a hair dye spray. -<<<<<<< HEAD - FlamingLily: - - bugfix: Internals activating in stripping menu - - bugfix: Stasis units exist again - - bugfix: "\U0001F633 machines exist again" - - bugfix: Holobadge boxes exist again - - bugfix: Gas Miners exist again (and atmos now uses sexy decals like Journey instead - of canisters to indicate their contents) - SkyratBot: - - imageadd: The circuit multitool has a new sprite. - thestubborn: - - rscadd: poly clothing to the keff and cowbell collar - - rscdel: unused sprites - - bugfix: detective can now use his badge - unit0016: - - bugfix: Metastation perma should FINALLY. FINALLY. No longer be spaced roundstart. -2021-06-08: - SkyratBot: - - bugfix: Fixed the unbearable lag on the R&D consoles. -2021-06-09: - KathrinBailey: - - rscadd: New prison for Deltastation - - rscadd: Security protolathe for Deltastation - - rscadd: 'qol: Improvements and minor bugfixes for Deltastation security' - Melbert: - - bugfix: Fixes self-use sleepers like syndie-sleepers so you can actually use them - by yourself when you're inside them. - ORCACommander,Azarak: - - bugfix: Run time in Gags caused by Peacekeeper Uniforms - - bugfix: GAGS shoes failing to render - - bugfix: GAGS jumpsuits - - code_imp: fixed silent syntax error - SkyratBot: - - rscadd: Robotics Two Person Mecha! - - bugfix: Swarmer traps are functional again - - rscadd: audio_cooldown, a var for coders to use in new emotes to add a cooldown - for sounds when the emote is used voluntarily. - - rscadd: Clapping and laughing now have 5-second audio cooldowns. - - bugfix: The heroine bud can no longer be removed by click-dragging - - bugfix: Straight jackets and cargo gauntlets no longer pretend they're trying - to equip themselves when you hold them in your hand and mouse over an inventory - slot they can be equipped to. - - bugfix: The drive-by landing station trait can no longer send players to space. -======= Gamer025: - bugfix: The message for new duplicate keybinds should only appear once now - bugfix: Resetting your keybinds to classic mode works correctly now @@ -355,67 +308,11 @@ - bugfix: Players with zero living time will now be caught as expected by a default config soft panic bunker. interestingusernam3: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Fake N-spect scanners, buyable via black market uplink (Tools section). - rscadd: Bananium HONK-spect scanners, craftable from fake N-spect scanners (Crafting menu, misc section). - rscadd: The N-spect scanner now draws power from a removable power cell when printing reports. The cell it starts with has enough power for 100 reports. -<<<<<<< HEAD - - bugfix: Telekinesis throwing is now logged even if you don't hit someone. - bobbahbrown: - - bugfix: Players with zero living time will now be caught as expected by a default - config soft panic bunker. - cacogen: - - code_imp: Mauna mug uses ctrl+click instead of attack_self() to toggle power - - code_imp: Resetting an object's name and description with a pen will return them - to what they were before being changed, instead of their initial values - - bugfix: Resetting a sculpture's description will no longer result in a description - telling you to yell at Firecage - linnpap: - - bugfix: Fixed the reproductive reagent emote - tf-4: - - bugfix: Various space hotel fixes - - bugfix: Doubled up lattices have been halved. - - bugfix: The security voidsuit helmet worn and object icons are now once again - present. - unit0016: - - imageadd: Stasis units now only light up when a body is inside. -2021-06-10: - FlamingLily: - - bugfix: Delta station's plasma tank is no longer labelled as safe to breathe O2. - - bugfix: The thief who's stolen Ice box's stasis units has not been caught. Insurance - has provided a replacement set. - SkyratBot: - - bugfix: Fixed race condition in creation of z-levels. - - spellcheck: The remaining damage message when tending burns no longer calls it - brute damage. - - bugfix: Input system won't request in-place movements constantly anymore. - tf-4: - - bugfix: The Vox ponytail hairstyle no longer gives you a massive fuck off square - over your face - - code_imp: Added SIGNAL_HANDLER to a bunch of procs that didn't use it - thestubborn: - - bugfix: vendors now get a bunch of loadout job locked stuff - unit0016: - - bugfix: Circuit Multitool is no longer invisible - - imagedel: "Duplicate SM sprite and worse codersprites are gone \U0001F980" -2021-06-11: - KasparoVy: - - rscdel: The borg shinker module will no longer work on certain compact chassis - models, providing a feedback message. This includes the peacekeeper-ball, vroomba, - eyeborg, mining drone and some others. - - tweak: SkyRat Altborg code's been refactored - indicating that a model is small, - is a dogborg or has unique wreck sprites is now done in a features list. - SkyratBot: - - bugfix: '*me should no longer force someone else''s message on your emote.' - - bugfix: fixed the 2person mech crushing it's own parts - - bugfix: The chemistry diamond is now NFPA compliant - - bugfix: Durathread strangling caused by golems can now be cut off with jaws of - life as well. - - rscadd: 'New emote: *tilt "tilts their head to the side."' - - admin: Added the ability to enforce two-factor authentication onto admins. -======= tralezab: - rscadd: Robotics Two Person Mecha! 2021-06-09: @@ -430,14 +327,12 @@ - bugfix: The drive-by landing station trait can no longer send players to space. - bugfix: Swarmer traps are functional again Timberpoes: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Admins will no longer accidentally toggle delaying the end of the shift off when multiple admins attempt to delay at the same time. - admin: When a round end delay goes past the ordinary server restart time, admins are now required to manually end the shift through Reboot World in the Server verb tab or Reboot-World in the command bar. The shift will no longer automatically restart past this point just because an admin undelayed end. -<<<<<<< HEAD - bugfix: 'Fixed defibrillator paddles and wall mounts not detecting charge changes. qol: Examining defibrillators now tell you if there is a power cell inside and how to remove it' @@ -461,7 +356,6 @@ unit0016: - bugfix: Xenobiology on NSS Journey no longer generates roundstart atmos diffs. - rscadd: Interdyne has been remapped from the ground up. -======= - bugfix: Straight jackets and cargo gauntlets no longer pretend they're trying to equip themselves when you hold them in your hand and mouse over an inventory slot they can be equipped to. @@ -518,12 +412,10 @@ - bugfix: The chemistry diamond is now NFPA compliant vincentiusvin: - bugfix: fixed the 2person mech crushing it's own parts ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-06-12: Arkatos: - bugfix: Fixed a case where slip mood debuff was not triggering at all. You should think about being more careful next time... -<<<<<<< HEAD SkyratBot: - admin: Opening and closing job slots is now logged. - bugfix: The tram control console now displays an icon for science correctly. @@ -546,7 +438,6 @@ GoldenAlpharex, but actually Mothblocks: - bugfix: Looking at the images in the Color Customization of the GAGS menu will no longer make you feel like you dropped your glasses. -======= JohnFulpWillard: - admin: Opening and closing job slots is now logged. Thunder12345: @@ -556,7 +447,6 @@ vincentiusvin: - bugfix: stimformation should not be called if no gas is actually being formed. 2021-06-13: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Inept, Coiax, AdipemDragon, YakumoChen: - rscadd: 'The release of the new cookbook, "Tiziran Cooking: a Taste of the Homeworld" has brought Lizard food to the masses! Try out some new treats, like Moonfish, @@ -568,7 +458,6 @@ They all like saltwater! - rscadd: A few new snacks are also now available at the station's snack vendors, for those of you too lazy to visit the kitchen. -<<<<<<< HEAD Mqiib's spritework: - imageadd: Skeletons and Robots now have unique wing sprites Ryll/Shaps: @@ -646,7 +535,6 @@ un-graftable, un-shearable, un-mutatable plant traits that show up on the plant analyzer now. qol: The plant analyzer now differentiates between traits you can mess with and traits you cannot.' -======= JohnFulpWillard: - qol: Sloths can now be picked up. 2021-06-14: @@ -666,7 +554,6 @@ un-shearable, un-mutatable plant traits that show up on the plant analyzer now. - qol: The plant analyzer now differentiates between traits you can mess with and traits you cannot. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Killer Tomatos no longer have liquid contents naturally. - balance: Liquid Contents and Hypodermic Prickles are no longer compatible with one another. They already didn't work together in most cases, this just makes @@ -675,7 +562,6 @@ - code_imp: Autodoc'd grown food / plant gene code - refactor: Refactored grown food / plant gene code - admin: A bunch more botany grief stuff is logged now -<<<<<<< HEAD SkyratBot: - bugfix: Fixed the tgui changelog dates sometimes being inaccurate to the source files. @@ -712,7 +598,6 @@ - bugfix: countess, karn, and formal red now hide shoes 2021-06-20: Arkatos: -======= Mothblocks: - rscadd: When a midround ghost event doesn't get any applicants, a sleeper agent/syndicate infiltrator will roll in its place. @@ -791,30 +676,10 @@ - qol: Swarmers will now show severity of their injuries as a red screen overlay to the user. - qol: Swarmer's abilities now have tooltips to clarify their use upon mouse hover. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Smartfridges will now show an approximate number of their stored items correctly on their sprite. - bugfix: Smartfridges will now count maximum number of allowed items correctly. - bugfix: Smartfridges will now show their UI only when directly interacted with. -<<<<<<< HEAD - Cheshify: - - balance: Mothership Astrum has been entirely rebalanced again. - - bugfix: Accidental debug tools and mapping errors have been removed from Astrum. - - bugfix: Dangerous Research should have all of it's floors in place. - OrionTheFox: - - rscadd: Nanotrasen has been hard at work shipping out new (old) warning tape rolls - for departments with common hazards! - - bugfix: To avoid a pending lawsuit, Nanotrasen has re-evaluated the fire safety - of their new ERT hangars, and properly sectioned them off from the rest of the - arrivals hallways on Delta and Meta. - SkyratBot: - - bugfix: Metastation has received the correct health HUDs for its new medbay - - bugfix: Camera coverage has been improved in Metastation's medbay - - bugfix: Restores drug vendor to Kilostation Medbay - - bugfix: Restores Crew Health Monitor to to the Kilostation medbay - - bugfix: 'Additional scrubbers/vents to some areas on Kilo that had inadequate - coverage qol: Declutter pass of Kilo medbay, holodeck area' -======= EOBGames: - rscadd: Metastation's medbay has received another revision. Stop by the next time you get hurt, and marvel at the new design! @@ -846,20 +711,11 @@ - bugfix: Restores Crew Health Monitor to to the Kilostation medbay - bugfix: Additional scrubbers/vents to some areas on Kilo that had inadequate coverage - qol: Declutter pass of Kilo medbay, holodeck area ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Some cameras in Kilostation now have better names - bugfix: Misc. piping and wiring issues on Kilostation have been repaired - bugfix: Missing air alarm added to Kilostation Botany - bugfix: The water tank stuck in a door in Kilostation engineering has been released back into its natural maintenance habitat -<<<<<<< HEAD - - bugfix: Chat feedback is improved when setting down briefcase launchpads. - - bugfix: Urinals no longer alert you about the letter "i" being stuck to your hand - in certain edge cases. - - rscadd: Added a new machine to the robotics lab; the ectoscopic sniffer. - - bugfix: Fixed being unable to add extra circuit components when an integrated - circuit was removed. -======= Timberpoes: - rscdel: Removed the fake error texture floor tiles. 2021-06-20: @@ -874,7 +730,6 @@ SmArtKar: - bugfix: Luminescents once again use slime extracts SpaceDragon00: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Combat defibs no longer enable their safeties when being EMPed - bugfix: Visible message sends its message to mobs that are also its location - bugfix: shock_touching (Renamed to shock_pulling) now actually uses the damage @@ -882,39 +737,6 @@ - code_imp: Removed useless mob/user input for cooldowncheck - code_imp: Added recharge_time variable to paddles for variable charge times - code_imp: Added can_hurt, do_success, and do_cancel to reduce code duplication -<<<<<<< HEAD - - bugfix: Luminescents once again use slime extracts - ZephyrTFA: - - balance: Medibots are no longer able to be upgraded - sasichkamega: - - rscadd: added a small heal to those on the same tile as felinid while purring. -2021-06-21: - Cheshify: - - bugfix: Vox should no longer be able to breathe station airmix with black-market - organs. - Gandalf2k15: - - rscadd: The Nanotrasen Representative has been added to the game! - - rscadd: More explosion sound effects! - Melbert: - - bugfix: Fixed nuke ops lobby meta exploit - - bugfix: Fixes contractor tablets breaking due to contract targets cryoing. - OrionTheFox: - - bugfix: The CE's Naval Uniform has been remodelled to be more recognizable from - the HoS's, as well as their antennae properly attached. Nanotrasen's Representative - is now also welcome to a selection of these uniforms. - Ryll/Shaps: - - bugfix: OOC heart commendations should once again function and poll people as - it should during the shuttle's return trip. - SkyratBot: - - bugfix: tgui input lists no longer break when duplicate keys are passed - - bugfix: H.A.U.L. gauntlets no longer output a message about losing their grip - power when you drop them to the floor. - - bugfix: Removing the H.A.U.L. gauntlets while pulling something will now stop - the enhanced pulling effect. - - bugfix: Fixed signal ports receiving signals when a signal is not actually sent - - bugfix: Some overlays missing from variant defibs are now properly applied. - - spellcheck: multiple projectiles are now pluralized correctly -======= Timberpoes: - bugfix: Chat feedback is improved when setting down briefcase launchpads. - bugfix: Urinals no longer alert you about the letter "i" being stuck to your hand @@ -932,19 +754,16 @@ - bugfix: Makes roleblocks in mafia actually end properly - bugfix: Tachyon-doppler arrays now connect with servers on different z-levels. SpaceDragon00: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: People with digitigrade legs are now properly paralyzed by the Paraplegic perk - bugfix: Usable_limbs can no longer be set below 0, which let people walk when they shouldn't be able to -<<<<<<< HEAD - bugfix: Tachyon-doppler arrays now connect with servers on different z-levels. - bugfix: Makes roleblocks in mafia actually end properly ZephyrTFA: - bugfix: Cryo Storage now silences PDAs that it hoovers. 2021-06-22: ATHATH: -======= Timberpoes: - bugfix: H.A.U.L. gauntlets no longer output a message about losing their grip power when you drop them to the floor. @@ -969,7 +788,6 @@ - qol: Contractor batons will now stun cyborgs on a left click and harmbaton them on a right click, instead of stunning cyborgs if you're NOT in combat mode and harmbatonning them if you are. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Stunning a cyborg with a contractor baton now puts your contractor baton on cooldown, just like knocking a human down does. Don't worry, you can still easily chainstun/baton 'n' bash borgs with contractor batons. @@ -982,18 +800,11 @@ wield a classic baton have been accounted for. This shouldn't affect normal gameplay unless an admin tries some REALLY weird stuff. Like, clumsy contractor cyborg level weird. -<<<<<<< HEAD - SkyratBot: - - bugfix: Fix some runtimes with quirks and equipping silicons. - - bugfix: Eggs now give 5u yolk no matter what it is cracked in -======= Timberpoes: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The traitor's Agent ID card has a new option available during forging called Wallet ID Spoofing. Selecting this option will automatically snap the Agent ID card to the front of any wallet, allowing the traitor to hide more valuable ID cards behind it. This is disabled when the card is unforged. -<<<<<<< HEAD - refactor: Refactors dbcore.dm to possibly resolve the crashes that happen on Terry. coiax: - tweak: You can now open your own mail, even after being mindswapped into a different @@ -1003,7 +814,6 @@ - bugfix: Anthromorphs can now wear chaplain stuff. Gandalf2k15: - rscadd: Synthetics can now suffer moderate to severe wounds, watch out! -======= Watermelon914: - refactor: Refactors dbcore.dm to possibly resolve the crashes that happen on Terry. carshalash: @@ -1015,85 +825,10 @@ - imageadd: new sprites for mech action figures Greniza: - imageadd: New turf decals for alternative tiletypes ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles: - rscadd: Tramstation's Tram is now more capable of making things regret being in the way of it - bugfix: Tramstation's Tram is now less likely to unintentionally explode -<<<<<<< HEAD - Semoro and azizonkg: - - bugfix: Ported fixes of SStimer subsystem from RU SS220 Paradise - - config: 'Added a new config var: flag/log_timers_on_bucket_reset' - SkyratBot: - - bugfix: Specific chem dispenser recipes no longer create fonts of infinite power. - - bugfix: Fixed explosions delimbing you if they're weaker - - bugfix: Cigarettes with the smoke_all property actually let you smoke in everything - the cigarette contains now. - - bugfix: Intento leaderboard works good - - imageadd: new sprites for mech action figures - - bugfix: Replaces broken valueless space cash item in old AI sat ruin with a 200 - credit one - - imageadd: New turf decals for alternative tiletypes - linnpap: - - soundadd: Replaced the *woof sound -2021-06-24: - DuffCreeper: - - balance: Removes 'Lick' and 'Boop' to be an upgrade at robotics for borgs - - code_imp: Removed icky single letter vars - Gandalf2k15: - - rscdel: The duplicate *awoo2 has been removed from the pool of available emotes. - Melbert: - - refactor: Cow tipping and medibot tipping is now a component. - SkyratBot: - - bugfix: Paper bins after being stacked too high to fall over or getting burnt - will no longer void your "important" paper forms when trying to add more paper - afterwards. - SpaceVampire: - - balance: Late-Join cyborgs not being linked to the AI correctly. - YakumoChen: - - bugfix: Dynamic will no longer create malf humans for players for never play silicon - in the first place. - ZephyrTFA: - - bugfix: A lot of icon states were missing - - code_imp: Electric Welders are much cleaner under the hood - capsaicinz: - - rscadd: Added a new space ruin, "Shuttle 8532" - thestubborn: - - rscadd: a full engineer ert and one for plants - - bugfix: the brig skirt works now -2021-06-25: - DuffCreeper: - - bugfix: Fixed up 'Affection' module being abled to be added to a borg multiple - times. Also restricted it to dogborgs only - - bugfix: Fixed an exploit relating to the shrink module - Elli-Skala: - - bugfix: fixed space vine gases being freezing cold - OrionTheFox: - - bugfix: Hazard tapes now block running instead of walking. They're like holobarriers - lite. - SkyratBot: - - bugfix: 'Fixed heretic ghouls having reduced max health after being revived after - deghouled qol: heretic ghouls now have a little moodlet tooltip' - - refactor: Refactors USB code to be easier to use for less experienced coders. - - bugfix: Bodybags can once again be closed. - - bugfix: Cargo crates no longer deliver a complementary emissive blocker with every - delivery. - - bugfix: Directional lighting no longer creates shadows on emissive flooring. - - bugfix: 'QMs can now use the Nanotrasen Internal Requisition Network program on - modular computers to order things remotely. qol: All people may now download - the Nanotrasen Internal Requisition Network program on modular computers to - request to order things remotely.' - - balance: The Forcefield Projector takes a second to put a forcefield down. - - bugfix: The spare Codex Cicatrix created by the ritual, no longer comes with free - charges. - thestubborn: - - bugfix: battered sausage now shows up -2021-06-26: - OrionTheFox: - - bugfix: Delta/Meta's windows overlooking the ERT hangar no longer have grilles - covering all the furniture. Whoops. - SkyratBot: -======= RandomGamer123: - bugfix: Cigarettes with the smoke_all property actually let you smoke in everything the cigarette contains now. @@ -1181,7 +916,6 @@ been reduced to ensure they don't charcoalize it too. - code_imp: Cleaned up cigarette code a bit. Timberpoes: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Agent ID cards can now steal accesses wirelessly from other players by right click slapping them with the agent ID card. This operation is completely covert, minus the fact you have to hold your ID card in your hand to initiate @@ -1190,7 +924,6 @@ including bags, wallets, tablets and PDAs without having to open them or remove ID cards first by right clicking. You can still open containers to steal accesses from exact cards as before. -<<<<<<< HEAD - rscadd: 'Added new mechanics or gameplay changes expansion: Expands content of an existing thing qol: made something easier to use' - spellcheck: Fixes bug in Ripley mech construction where it would say "securing @@ -1260,7 +993,6 @@ - rscadd: Added funtionality so free golems get an alert from policy.json. - rscdel: Deleted a line of text for Free golem's flavor text. Since in my opinion the spawn-in text, with the addition of the policy.json text was a bit too much. -======= carshalash: - bugfix: fixed inaccurate foodtypes/taste tags 2021-06-27: @@ -1270,7 +1002,6 @@ - bugfix: Fixes passive vents on space tiles flooding space with whatever was being vented SpaceDragon00: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'Reverted the normal blob''s max HP and initial HP values, which were accidentally modified (Old: 30 and 30, New: 25 and 21)' - bugfix: Fixed an issue where certain strains with bonus core regeneration were @@ -1279,18 +1010,13 @@ Resource blobs - code_imp: Added an initial HP define that is set as a normal blob's integrity upon Initialize -<<<<<<< HEAD - refactor: 'hunger mechanics are now inherent to stomaches expansion: ethereal charge mechanic is now unique to their stomache and can be transferred freely' -======= Timberpoes: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Baseball bats can now be used to break kneecaps with their right click attack. This requires the target to be one of either prone, immobilised or buckled to something. If you aim for the legs and right click, you'll wind up a swing for the kneecaps. Research indicates that this isn't good for the target's legs. -<<<<<<< HEAD -======= - bugfix: Fixes an issue where right clicking on an ID-secured locker would unintentionally trigger twice, locking then unlocking the locker. Right clicking now correctly attempts to lock and unlock a locker only once. @@ -1309,7 +1035,6 @@ transferred freely dragomagol: - imagedel: removes the yellow siding tiles at Centcom ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ninjanomnom & Trina (Sprites): - rscadd: Stationary tanks can now be constructed using most materials. Start the frame with a stack of plasteel. @@ -1319,48 +1044,6 @@ - balance: Stationary tanks share behavior with canisters and can over-pressurize and explode in the same fashion. 2021-06-29: -<<<<<<< HEAD - Cheshify: - - rscadd: A new Station Announcer can sometimes show up! - - bugfix: Astrum's returning gateway is fixed. - - balance: A new strain of Cordyceps has been found, requiring Neurine and Modafinil - to cure. - DuffCreeper: - - rscdel: Removed Stock Market - Gandalf2k15: - - rscadd: A subsystem has been added that allows the station to start dirty. - OrionTheFox: - - rscadd: Added 2 new space ruins! - - rscadd: Spaceship Walls are now NT-approved, the plating/glass of which can be - gotten by crafting Titanium Sheets/Titanium Glass in-hand. - - rscadd: Vague Metal Pole decor items for mapping purposes - RandomGamer123 and IndieanaJones: - - bugfix: Offering a cyborg on a cult offer rune no longer creates an empty soulstone - and round removes the cyborg. - SkyratBot: - - bugfix: RD consoles now have hardware supporting ID changes by default. - - bugfix: Obsessed antags will now recieve a chat message stating the antag's policy - flavour text, if any such policy exists in config. - - server: Added configs to disable laggy hard deletes once they lag the server too - much. - - admin: laggy hard deletes only output once per type path. - - rscadd: Cigarettes heat their contents while they are lit. - - balance: Candy cigarettes now caramelize their own sugar. Their temperature has - been reduced to ensure they don't charcoalize it too. - - code_imp: Cleaned up cigarette code a bit. - - bugfix: async modal message/title swapped - - bugfix: async modal not firing callbacks - SpookyTheFox: - - bugfix: prevented ghosts from un-flipping tables - theOOZ: - - rscadd: Adds a donator item to the mask page for CKEY 'TheOOZ'. -2021-06-30: - Azarak: - - rscadd: Adds advanced botany equipment to Ghost Cafe botany and an Enhanced Interrogation - Chamber to the showroom. - - rscadd: Warning strips in Ghost Cafe botany are no longer annoying, and pool updated - to the new liquids system. -======= Arokha: - bugfix: async modal message/title swapped - bugfix: async modal not firing callbacks @@ -1369,39 +1052,12 @@ cyborg into a construct of their choosing. - bugfix: Offering a cyborg on a cult offer rune no longer creates an empty soulstone and round removes the cyborg. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - balance: Knives (such as the kitchen knife, hunting knife, combat knife, etc...) are generally more effective at causing slashing wounds now. The butcher's cleaver in particular is now equal to a circular saw in terms of wounding. - balance: Scalpels are an eensy bit less effective at wounding enemies wearing armor, though they are still very effective at causing bleeding. -<<<<<<< HEAD - SkyratBot: - - imagedel: removes the yellow siding tiles at Centcom - - bugfix: Fixed issue which made cooked steaks inedible. You should now be able - to eat griddled steaks again. - - balance: Reduces the maximum weight paradox bags can hold - - imageadd: Adds paradox bag icon and belt sprites - - bugfix: fixes singularity beacons - - balance: Jaunting spells of all types (except for Nightmare) no longer allow for - the user to end up inside a wall or most other dense objects. Instead, you will - be moved to a valid spot on the path you took, or returned to your start location. - ZephyrTFA: - - bugfix: Ambitions no longer instantly give you your gear when you request admin - approval - - admin: Ambitions now require admin approval; however they will be automatically - approved if you dont even open them. - capsaicinz: - - rscadd: Adds a new space ruin, ARBORLINK Vault Tango. - thestubborn: - - bugfix: makes the headphones show up - - bugfix: makes the poly clown mask work - - bugfix: made the westerner outfit obj one state - unit0016: - - rscadd: DS-2. - - rscdel: DS-1. -======= Sheits: - balance: Reduces the maximum weight paradox bags can hold - imageadd: Adds paradox bag icon and belt sprites @@ -1426,4 +1082,3 @@ components. - expansion: Adds USB connections for the arrest console. - bugfix: Fixed race conditions happening with circuits. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-07.yml b/html/changelogs/archive/2021-07.yml index 6484fc45242..0edd094e33c 100644 --- a/html/changelogs/archive/2021-07.yml +++ b/html/changelogs/archive/2021-07.yml @@ -3,30 +3,6 @@ - bugfix: Fixed a case where a relic war hammer was not able to do kneejerk action. - bugfix: Fixed a case where a radial menu for the null rod reskin variant selection was showing one duplicate option. -<<<<<<< HEAD - SkyratBot: - - imageadd: new riot armor sprites - - admin: Adds logging for impacted cyborgs during law changes - - admin: Adds additional cyborg logging - - rscadd: Transit tube dispenser stations are now buildable via RPD - - bugfix: Transit tube dispenser station sprite errors have been fixed. The sprites - themselves have not been changed, but the names and orientation has been corrected. - - bugfix: Fixed cyborg locker right click to lock - - bugfix: Fixed race conditions happening with circuits. - - balance: Debriding surgery efficiency has been multiplied by 8 - - bugfix: Fixed an infinite loop bug with portal teleports. The cake is a stack - overflow. - - bugfix: Fixed portals layer so they appear over most other objects. - - bugfix: 'Fixed hand teleporter portals moving in zero gravity. qol: Portals on - dense objects no longer require clicking to enter and can be walked into. qol: - Portals you are standing on may be entered by clicking even with a tool in hand.' - - code_imp: Removed an unused teleport arg that may cause issues with new portal - code. - - bugfix: fixes buying shuttle insurance while the shuttle is docked - ZephyrTFA: - - bugfix: Use the correct timer flags for it to actually hash correctly - - bugfix: Actually call submit when it auto approves so they get their gear. -======= - qol: Updated radial menu for a null rod reskin variant selection. It will now include a small button for showing additional information about each given null rod variant. @@ -59,35 +35,16 @@ bloons3: - admin: Adds logging for impacted cyborgs during law changes - admin: Adds additional cyborg logging ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bobbahbrown: - admin: Added other tickets opened by a user to the adminhelp dialogue - server: Added the $reset directive to reset a configuration entry's values to its default -<<<<<<< HEAD - cacogen: - - balance: Cannabis has more believable effects - jjpark-kb: - - rscadd: Added reagent forging (check PR) - - soundadd: added hammer hit and water hiss - - imageadd: added icons for all new items/structures - - rscadd: added two wirebrushes (basic and advanced) - - soundadd: added a wirebrush sound - - imageadd: added two wirebrush icons (basic and advanced) - unit0016: - - bugfix: DO is now a head of cargo, instead of the CL. And while being a head he's - also command and all that stuff. -2021-07-02: - Gandalf2k15: - - rscadd: Sentient firelocks. -======= tralezab: - bugfix: fixes buying shuttle insurance while the shuttle is docked - expansion: added barticles to bonfires 2021-07-02: Cheshify: - bugfix: The flashlight pens are now actually pen-sized ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Glowshrooms created from spread now should behave like things that actually exist again. @@ -100,57 +57,6 @@ breaking the windows into sci halls - bugfix: Tramstation Kitchen Freezer now uses the proper area so the kitchen and freezer air alarms dont control the same vents -<<<<<<< HEAD - Ryll/Shaps: - - bugfix: You can no longer sacrifice pAI shells as a cultist - - bugfix: OOC heart commendations once again properly save and persist between rounds! - SkyratBot: - - bugfix: The flashlight pens are now actually pen-sized - - bugfix: Some greyscale icons like the sombrero have had their errors fixed. - - bugfix: The detective's scanner should now always properly output the correct - data for scans and should no longer print out blank entries erroneously. - - bugfix: Nuclear operatives' uplink implants now properly only show items they - are allowed to buy, preventing them bypassing uplink restrictions. - - bugfix: Fixed rogue vending machines targeting incorporeal. - - bugfix: changeling legs now copy digitigrade/normal legs - Swiftfeather: - - bugfix: Robohand bundle now costs what it is worth - bobbahbrown: - - bugfix: You may no longer circumvent config VAS protections by proxying proc calls. - softcerv: - - rscadd: Added plushies based of a familiar shark and deer. - thestubborn: - - rscadd: all maps now have a locker for the second detective -2021-07-04: - Arkatos: - - bugfix: Large cardboard boxes will now show a proper icon when they are open. - Cheshify: - - bugfix: Anthromorphs can wear armor - MMMiracles: - - bugfix: Fixed a few errant pipe issues in Tramstation Atmospherics - SkyratBot: - - bugfix: Fixed fully_heal proc curing blindness from quirks and blindfolds. - - bugfix: Fixed cooldowns for speech and soundemitter circuit components. - - code_imp: Brought the speech component more in line with other components. - - code_imp: Made the any datatype for circuit components much easier to read in - code. - - bugfix: Inhand sprites for hydrogen fire axes now face the right way - - bugfix: Fixed incorporeal movers procing containment field effects. - - spellcheck: updated outdated references to intents in martial arts instructions - - spellcheck: Ion carbine gun parts kits are no longer called "generic gun parts - kit". - - spellcheck: The "advanced" in advanced energy gun parts kit is no longer misspelled. - - bugfix: Fixed carps not properly being tameable. - - bugfix: Fixed the tameable component not properly being removed from a mob. - - bugfix: The turbine now behaves correctly if the intake is blocked. - - bugfix: Fixed Create Command Report UI lacking an option derived from command_name(). - - bugfix: Fixed the sound emitter's frequency port - - bugfix: The "Is This Thing On?" explosion calibration experiment will now accept - explosions with negative devastation or heavy strength because, once again, - any explosion will do! - - bugfix: Fixed Cross Server messages containing HTML garbage. - - bugfix: Analyzing stationary tanks no longer gives you the same thing four times. -======= RandomGamer123: - bugfix: Nuclear operatives' uplink implants now properly only show items they are allowed to buy, preventing them bypassing uplink restrictions. @@ -212,21 +118,11 @@ - bugfix: Fixed the sound emitter's frequency port - bugfix: Fixed cooldowns for speech and soundemitter circuit components. - code_imp: Brought the speech component more in line with other components. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Limited the maximum string length of a circuit component port to 5K characters to fix exploits that can create strings that duplicate in size each iteration. - bugfix: Fixed being able to insert an infinite amount of components into a shell because of an oversight. - bugfix: Fixed being able to interact the circuit of a locked shell. -<<<<<<< HEAD - - rscadd: Adds a midround ruleset that allows living players to become the blob - if they are randomly selected. - - rscadd: catwalk flooring! - - bugfix: Killing and reviving polar bears no longer makes them easier to move. - Superlagg: - - rscadd: PDA customization is now set and saved per character. - - rscadd: PDA ring messages can now be set in character preferences. -======= Wayland-Smithy: - bugfix: Fixed incorporeal movers procing containment field effects. - bugfix: Fixed fully_heal proc curing blindness from quirks and blindfolds. @@ -234,7 +130,6 @@ - bugfix: Fixed Cross Server messages containing HTML garbage. YakumoChen: - expansion: Adds a contraband flavor of Gallery's Peanuts to Getmore vendor ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bobbahbrown: - rscadd: Added a brand new upgrade to janicarts, the vacuum upgrade, which you can procure from RnD. This upgrade vacuums items from under the janicart directly @@ -244,25 +139,6 @@ to insert a key with a trashbag attached. - rscadd: You can now right-click while riding a janicart to remove the bag without unbuckling yourself, neato! -<<<<<<< HEAD - jjpark-kb: - - bugfix: fix light replacers breaking lights after replacing - tf-4, theOOZ: - - rscadd: Hairbrushes - now you can brush people's hair for a small mood boost. - unit0016: - - rscadd: NSS Journey now has a drone bay. - - bugfix: The catwalks are no longer non-existent on DS-2 and Interdyne. -2021-07-05: - Nari Harimoto: - - bugfix: the autolathe shockwire is properly defined again, autolathes may now - potentially shock you when hacking - SkyratBot: - - bugfix: Mafia psychologist couldn't reveal role - - imagedel: removes the weird light from the upgraded mining hardsuit helmet sprite - - bugfix: Borgs can now click on adjacent portals (with no module slot active) to - use them like humans. - - balance: nuke op and detective holsters can now be placed in armor best suit storage -======= thestubborn: - expansion: Bananas can be holstered tralezab: @@ -274,7 +150,6 @@ - qol: commission plaques will no longer hide items you dropped below them - balance: hierophant club dash now doesnt work on blocked turfs Greniza: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Environment protection bags, which protect their occupants from weather, and give protection from temperature and pressure. The rare variants even have the same protection effects as a space suit. @@ -289,20 +164,6 @@ - bugfix: Using wirecutters on an unlabeled bodybag no longer sends the "You cut the tag off of the bodybag" message. - bugfix: Allows bodybags to be picked up again. -<<<<<<< HEAD - - balance: mmis can no longer possess savannah ivanovs - - bugfix: the single missing pipe in library maintenance isn't missing anymore - theOOZ: - - rscadd: Adds a uni-horn - thestubborn: - - bugfix: kills akimbo reps in the womb -2021-07-06: - Gandalf2k15: - - bugfix: Beepsky no longer hardstuns. - GoldenAlpharex: - - imageadd: A fresh coat of paint was applied to the Nanotrasen Representative's - closet on behalf of the Nanotrasen Branding Committee. Rejoice! -======= KIBORG04: - bugfix: Mafia psychologist couldn't reveal role Nari Harimoto: @@ -338,7 +199,6 @@ - bugfix: switchblade can now be used to butcher and slice necks - bugfix: fixes voice of god not giving you large text - bugfix: wisps no longer fall in chasms ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Changelings birthed from headslugs that weren't already changelings (for example, from the icebox mutation pool) are no longer full changeling antagonists, @@ -346,134 +206,12 @@ the past). MeyHaZah: - imageadd: Concussive Gauntlets Resprite -<<<<<<< HEAD - SkyratBot: - - balance: hierophant club dash now doesnt work on blocked turfs - - rscadd: Added temperature and pressure sensors to circuits - - bugfix: carnivory trait shows up on the plant analyzer - - bugfix: switchblade can now be used to butcher and slice necks - - bugfix: wisps no longer fall in chasms - - bugfix: Fixed the cursed spring water double teleport polymorph machine. - - bugfix: Stationary pressure tanks now properly have their base pressure at 20000kPa. - - bugfix: Stationary pressure tanks now do not name themselves as "plasteel plasteel - pressure tank". -======= Wayland-Smithy: - bugfix: Fixed the cursed spring water double teleport polymorph machine. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 bobbahbrown: - bugfix: Buckling to a vehicle will no longer wait until you move to set your position on the vehicle properly. 2021-07-07: -<<<<<<< HEAD - Gandalf2k15: - - rscadd: Closets are now animated. - - rscadd: You can now be banned from EORG, do not EORG prep. - Nari Harimoto: - - bugfix: tram pharmacy now has medic access for when skeleton access is lifted - - bugfix: Deltastation bar's atmos alarm now correctly placed, and nudged a pipe - nearby to no longer have a redundant loop - SkyratBot: - - bugfix: Hologrids once again cannot be picked up, as is intended. - - bugfix: fixes voice of god not giving you large text - - bugfix: Fixed unplaced blob overmind spawning in places it can not move. - Varoxus: - - rscadd: Flask of holy water to chaplain's room, closet for their things in their - office. - - rscadd: Altar to the chapel, lighter and a poppy to the same room. - - rscadd: Body bags and burial garments to the chapel back room. - - rscadd: Table with a linen bin to the dorms hallway. - - rscadd: Buttons to the dorm rooms to bolt the doors. Praise be. - - rscadd: Changed out two of the changing rooms for restrooms, each has a door bolt - button. - - rscadd: Water cooler to the fitness room so you can stay hydrated while you get - SWOLE. - - rscadd: Benches, chairs and 'lounging chairs' (beds) to the pool area to liven - up the space a bit. Also added a light to a darkened area of the pool. - - rscadd: Art area to the library, expanded the librarian's desk and added a curator - vendor behind it. - - rscadd: Autosurgeon to the medical cabinet in the medbay. - - rscadd: General medical supplies to the medbay such as body bags, medipens, latex - gloves and sterile masks. - - rscadd: Plumbing constructor to the chem room. - - rscadd: Medical and Chem drobes to the medical area. - - rscadd: 'A few items to the maint bar: Bar sign, wet rag, bartender drobe, syndicate - lantern.' - - rscadd: A waste disposal room complete with a recycler and a mass driver. Dirt, - grime, and trash included. - - rscadd: Fully functional and stocked Xenobio/cytology room to the science area. - - rscadd: Science skillchips to the nanite room. - - rscadd: Genetics console and scanner to the science area. - - rscadd: Replaced the circuitry machines and tools with an Exofab and related equipment - such as a surgery table and duffel bag, autosugeron, cells, and a computer frame - for an eventual OR table. - - rscadd: Placed the circuitry machines into the maint science area and added a - bit of oil and grime along with it. - - rscadd: An oxygen tank to the mining bay and some survival knives to the mining - bay lockers. - - rscadd: A turret control panel to the hangar bay near the entrance to science. - - rscadd: Hangar bay blast doors that are closed by default, buttons to either side - of the blast doors to open them if needed. - - rscadd: Janidrobe to the maint janitor's closet. - - rscadd: Another set of BR-magboots to the maint EVA room. - - rscadd: A pair of space heaters to the old... stripper area? - - rscadd: 'Added some more space to the engineering room and added a lot of tools - and equipment to it: Portable air pumps, portable scrubbers, engineering lockers, - power monitoring console, oxygen tanks, RPDs, cell charger and batteries, spare - materials, light replacer/RLD and bulbs, engi skillchips, toolbelts.' - - rscadd: Replaced maint garden area with an old sauna, complete with blood, dust, - and grime, broken lights for extra flair. - - rscadd: Interdyne comms keys to the Admiral and corporate liaison lockers. - - rscadd: Replaced the syndicate tome in the safe with a CQC manual. - - rscadd: Another door to the quantum pad room that leads out into the science hall, - both doors made unusable by AI. - - rscadd: Some decorative rocks to the hallway between the pool and the dorms area. - - rscadd: 'Signage all around the station: Medical signs near medical, hydro sign - to botany, EVA signs near the EVA exits, jani sign near the jani closet, docking - area signs near the hangar bay.' - - rscadd: Changed the turret armor values to better match those on the syndicate - forgotten ship, less armored in some areas, more armored in others, made the - fire rate the same. - - rscadd: Eggs to the kitchen fridges. - - rscadd: A few more maint loot and trash spawners. - - rscadd: Air alarms to Engi, sci, and disposals areas. - capsaicinz: - - rscadd: lattices under grilles. grilles on lattices. lattices where it makes sense, - and those under grilles, too! nss journey. - theOOZ: - - rscadd: Moth sparkle quirk. - thestubborn: - - rscadd: A Xeno hybrid language! Someone somewhere is gonna hate this! - - rscadd: But they may also love it! -2021-07-08: - SkyratBot: - - balance: Removes stuns from Voice of God. - - rscadd: New ERT type, marines, for whatever you might want them for. - - rscadd: Tacticool armor from tgmc to compliment. -2021-07-09: - Gandalf2k15: - - rscadd: Prisoner transports - GoldenAlpharex: - - bugfix: Submitted ambitions will no longer sound like ducks. - - code_imp: Minor code improvements to ambitions. - Nari Harimoto: - - bugfix: the examine text on the Seed Extractor now accurately displays the amount - of seeds you may potentially get - SkyratBot: - - code_imp: Rust is now a component - - refactor: refactor almost all of the rust heretic atom procs - - rscadd: Wirebrush for advanced rust removal - - bugfix: fix issue with the thermomachine rotation when pulled/pushed - - balance: Nanotrasen has released experimental new laser lenses for laser rifles, - energy guns, and illegal hellfire modkits, increasing the number of shots they - can fire from full charge by roughly 20%. - - rscadd: Added a name to clown.txt - - rscadd: Chaplains who worship the machine gods can now trade in 2000 favor to - receive a random cybernetic implant - - bugfix: runtime errors from weather - - bugfix: Environmental Protection Bags protect from ash storms - - bugfix: properly updates the light color of the mining hardsuit helmet -======= ArcaneMusic: - expansion: A new ruin has surfaced on icebox. Signal pings indicated that may have been a post office, once. @@ -526,29 +264,11 @@ energy guns, and illegal hellfire modkits, increasing the number of shots they can fire from full charge by roughly 20%. Wayland-Smithy: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Introduces the Lag Switch subsystem for when a smoother experience is worth trading a few bells and whistles for. Performance enhancement measures can be togged by admins with the Show Lag Switches admin verb or enabled automatically at a pop amount set via config. - config: 'Added a new config var: number/auto_lag_switch_pop' -<<<<<<< HEAD - - balance: Bats no longer stunlock people. Increased bat damage by 2. - YakumoChen: - - imageadd: Human skin hats, touched up by Krysonism - ZephyrTFA: - - bugfix: Mentors once again load into the game correctly - - bugfix: Cultures no longer runtime - lyricalpaws: - - rscadd: Demonic core - softcerv: - - bugfix: Removes stray pixels in the object icon for the flower pin. - - balance: Makes the flower pin a small item. -2021-07-10: - Arkatos: - - bugfix: Fixed a case where you could make more engraved messages than your soapstone - had uses by queing them fast enough. -======= ZephyrTFA: - code_imp: Rust is now a component - refactor: refactor almost all of the rust heretic atom procs @@ -561,13 +281,11 @@ had uses by queing them fast enough. Ghilker: - bugfix: fix issue with the thermomachine rotation when pulled/pushed ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nari Harimoto: - bugfix: Removing the Thermal Vision mutation will now remove the active vision as well PositiveEntropy, Kryson, maxymax13: - imageadd: The Security TV, Smartfridge, and Booze-o-Mat now have new updated sprites! -<<<<<<< HEAD SkyratBot: - bugfix: Fixed the component printer's layout being broken. unit0016: @@ -625,7 +343,6 @@ SkyratBot: - bugfix: restraints now use equip_to_slot() instead of snowflake code when applied, thus fixing issues such as cuffs not falling off when hit by a shrink ray. -======= Time-Green: - refactor: "A majority of species features have been turned into organs. Soon you\ \ will be able to combine a moth and a lizard into one \xFCber being" @@ -715,7 +432,6 @@ - bugfix: the metastation genetics monkey pen no longer has a ' in front of its name SpaceDragon00: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Secure safes no longer show up as weapons (I'm labelling this as a fix because I don't know any scenarios where you'd even be able to use a secure safe as an item, so its force value seemed unnecessary) @@ -728,7 +444,6 @@ - code_imp: Added a proc to initialize a list of object subtypes keyed to their object paths - code_imp: Turned Hits_To_Crit into a define -<<<<<<< HEAD - code_imp: 'Improved the clarity of some comments, along with adding some where they were previously missing qol: A gun''s weapon notes now gives you the notes of its magazine, which gives you the notes of its ammo, making it so you don''t @@ -782,7 +497,6 @@ - spellcheck: Circuit board for All-In-One Grinder is now named appropriately - bugfix: The Tram whiteship now has a chance to spawn! - bugfix: latejoin arrivals are less likely to spawn on top of each other now. -======= - code_imp: Improved the clarity of some comments, along with adding some where they were previously missing - qol: A gun's weapon notes now gives you the notes of its magazine, which gives @@ -792,12 +506,10 @@ - bugfix: glasses arent horribly embedded in lizard snouts anymore Watermelon914: - bugfix: Fixed admins getting spammy logs from arrest console circuits. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 coiax: - balance: Ashwalkers now have lungs adapted for the atmosphere of Indecipheres, and now breathe. However, if the Indecipheres atmosphere has miasma, they are immune to it. -<<<<<<< HEAD itseasytosee: - bugfix: Syndicate hardsuit helmet sprites will now properly update when combat mode is activated. @@ -816,7 +528,6 @@ - bugfix: Packages sent through disposals to Virology on Icebox won't end up at Xenobio anymore. - admin: Adds a safety check to the "Release Obj" admin proc -======= dragomagol: - bugfix: The Tram whiteship now has a chance to spawn! itseasytosee: @@ -889,12 +600,10 @@ Wayland-Smithy: - qol: Holopad incoming calls can now be rejected. - qol: AI secondary attack now opens Holopad UIs. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed connected Holopad callers not seeing their own runechat text. - bugfix: Fixed AI hologram transmit runechat text. - bugfix: Fixed the AI radio help message giving false info about the generic department key. -<<<<<<< HEAD - bugfix: Fixed the rat king's abilities being usable while dead. - bugfix: Fixed the rat king's Domain ability being usable on cooldown. - balance: Removes the refresher crystal from lavaland loot. @@ -943,7 +652,6 @@ lyricalpaws: - bugfix: Brushing someone's hair no longer tells them they brushed their name's hair -======= 2021-07-15: Wayland-Smithy: - qol: Revenants can orbit adjacent people and things with Right Click, unless they @@ -959,7 +667,6 @@ - bugfix: Eggs now work when cracked into glasses tralezab: - balance: space dragons are rarer ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-07-16: ATHATH: - spellcheck: The grammar of the box and organ box suicides has been slightly improved. @@ -969,59 +676,18 @@ now causes you to die of burn damage, not brute damage. - rscadd: A special suicide has been added to space helmets. It has a special variant for if you attempt it in a cold environment (while not immune to cold). -<<<<<<< HEAD Cheshify: - bugfix: An unidentified object in black mesa has been resolved Mordent: - bugfix: Hover effect on tgui Tabs made less visually laggy. SkyratBot: -======= Mordent: - bugfix: Hover effect on tgui Tabs made less visually laggy. Watermelon914: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added a more complex AI to carps that allow you to tell them to attack people or to follow you. These carps can be tamed with raw meat, which'll then give you control over them if you succeed in taming them. A carp will only be tamed to 1 person. -<<<<<<< HEAD - capsaicinz: - - rscadd: syndicate simplemobs to arborlink vault space ruin. makarov and magazines. - - rscdel: arborlink vault space ruin turrets. - lyricalpaws: - - bugfix: Stops vanguards rolling antags - - server: dynamic.json edited, mirror required -2021-07-17: - GoldenAlpharex: - - bugfix: Turnstiles are no longer scared of flashlights - SkyratBot: - - bugfix: You can now put people in coffins again after fireman carrying them. - - bugfix: slippery things, among others will no longer stop working forever after - throwing them into hyperspace - - bugfix: grav anomalies will no longer permanently make you unclickable - - bugfix: Fixed HTML encoding of automatic evac news alerts emergency_reason. - - rscdel: deletes a door from deltastation mining shuttle - Wallem: - - rscadd: Due to a leak in Nanotrasen Brand Ant Farms during shipping, a large influx - of space-ants have been inadvertently dumped onto every Nanotrasen station. - Don't go leaving food around too long, and please be sure to watch your step, - we're pretty sure they bite... - - imageadd: New giant ant sprite by Doshmobile - Yawet330: - - bugfix: Math fixed - coiax: - - bugfix: Ethereal players cannot erroneously revive during mafia games. -2021-07-20: - Arkatos: - - bugfix: Fixed a case where a PDA's action button icon did not properly update - upon light toggle. - Cheshify: - - rscadd: Borgs have access to Lidocaine, a numbing agent for surgeries! - Gandalf2k15: - - rscadd: You can now empty showers using a plunger! - - bugfix: Showers no longer defy the laws of physics and once again require plumbing. - Nari Harimoto: -======= 2021-07-17: Arkatos: - bugfix: Fixed a case where a PDA's action button icon did not properly update @@ -1042,7 +708,6 @@ - qol: AI now opens the holopad with left click, and projects a hologram with right click. AI's right clicking the holopad will immediately project, no more double clicking ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: AI's right clicking any holopad while projected via the "Project Hologram?" button when presence is requested, will cancel the projection and put their camera back to where they started (moving far away from the pad will not do @@ -1051,70 +716,6 @@ that has two options, jump to the location, works as it does currently, and "Project Hologram" which will immediately project a hologram there, right clicking the pad will move you back to where you were -<<<<<<< HEAD - - rscadd: 'Ctrl+leftclicking on the holopad will end the holopad call directly without - jumping you back to your last location (it does nothing if you are not already - a hologram) qol: AI''s can now examine a holopad to see the AI specific controls - for the pads (need to shift+right click and examine from the menu, cant shift-click - examine, issue with how the AI itself functions.) qol: when you jump to someone - from their name in chat, or a location from chat such as when presence is requested, - you can hit "~" or "0" to jump back qol: when you jump back to your previous - location with the "Jump Back" key or to a saved location with "1-9" it stops - all following, so you can jump back or jump to a location and you wont jump - back to the person you tracked' - PositiveEntropy, Meyhazah: - - imageadd: Adds new fire extinguisher sprites based on Tau Ceti's! - SkyratBot: - - imageadd: Replaces the old aquarium sprites - - bugfix: The implant pad will no longer incorrectly describe TRAC implants as being - usable as teleporter beacons. - - balance: Wizard gets bonus points for choosing the randomized options in their - spellbook. They will get 15 points worth of spells if they choose "Full random" - and they will get 12 points worth of spells if they choose "Semi random". - - bugfix: Fixed the duffelbag curse and curse of hunger code in general. - - bugfix: Fixed carrying being broken. - - bugfix: NanoTrasen has pushed a fix for nonexistent ghost ears, allowing them - to theoretically hear nearby sounds again if they existed, which they don't. - - refactor: Directional lights might seem more smooth now - - bugfix: Flight potions now work on fly people, androids and skeletons - - bugfix: NanoTrasen has realized that its previous theoretical fix for ghost ears - didn't work, not that that's a problem since ghosts don't exist but NanoTrasen - has fixed its mistake. - - bugfix: fixed up some issues with the ski shoes vehicle description - - bugfix: One standard moth plushie has been issued to the tramstation psychologist's - office. - - bugfix: fixed sentient diseases reinfecting when dead - - balance: space dragons are rarer - - bugfix: Fixed a Holodisk replay Hologram bug, and Hologram Rays not updating when - the pad is moved. - - bugfix: A Charlie station fluff paper about the Supermatter is no longer misnamed - "singularity generator". THERE WAS NEVER SUCH A THING AS A SINGULARITY GENERATOR. - OCEANIA HAD ALWAYS BEEN AT WAR WITH EASTASIA. - - bugfix: Fixed carps losing track of who they're following if they take a path - that obstructs their vision - - balance: Space Dragon has received some nerfs to make fighting it and its carps - fairer to the crew. - - bugfix: Fixed a bug where carp rifts without an owner could spawn infinite carp. - - bugfix: Fixed light explosions having 0 chance to delimb someone if they have - no bomb resist. - - balance: Elder Atmosian armor now takes less metallic hydrogen to craft and is - better armored. - - bugfix: A rogue decal has been purged from Deltastation - - bugfix: The toxins airlocks on Delta, Tram, Meta and Kilo can now be opened from - inside the airlock - Wallem, based off of work done by Keelin: - - bugfix: Lets people wash the ant debuff off of themselves, as intended. - unit0016: - - rscadd: 'Posters! Several posters referencing more ''historic'' events of the - frontier. There may also be a holodisk somewhere in the depths of maintenance... - expansion: Two new space ruins are on the prowl. One may look familiar...' -2021-07-21: - BurgerBB: - - bugfix: Fixes closets/lockers/crates/ect being subject to ant decompisition. - FlamingLily: - - code_imp: All indicators are now within a single indicators module - - rscadd: Surrender button when in CI -======= - rscadd: Ctrl+leftclicking on the holopad will end the holopad call directly without jumping you back to your last location (it does nothing if you are not already a hologram) @@ -1212,7 +813,6 @@ - expansion: added downsides to shoving too much fuel/moderator inside the machine, the cooling volume can be adjusted in the GUI to make it stronger/weaker based on the user needs ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nari Harimoto: - bugfix: Fixes a bug where emotes such as a carp gnash will mess up a name if the name contains a pronoun within it @@ -1226,104 +826,6 @@ Ryll/Shaps: - bugfix: You should no longer lose deathnettle durability when clicking on floors or walls -<<<<<<< HEAD - SkyratBot: - - bugfix: Deltastation's HoP line now has a flasher. - - bugfix: Deltastation's Atmos waste now sends external connectors to waste, rather - than the other way around. - - bugfix: cutting open heads wont drop horns, frills etc on the ground (you could - literally stick it into a human to give them frills but nooooooo you wanted - to report the bug) - - bugfix: Hulks and larvas can no longer just punch the SM with no consequences - - bugfix: Fixed weather being opaque - Wallem: - - bugfix: ants have a higher tolerance to extreme ph levels when breeding. New ant - desc. -2021-07-22: - OrionTheFox: - - balance: Long-term terraforming projects have proven partially successful, as - miners no longer report the cold rocks of LV-669 as airless voids! Safety regulations - have dropped to allow for low-pressure suits instead of full EVA gear. - - rscadd: With this new information, Nanotrasen has officially re-vamped their efforts - to mine the plentiful ores, re-locating their mining station to what was once - a populated area of the planet. Aside from the newly modeled station, expect - to find some old run-down ruins. -2021-07-23: - OrionTheFox: - - rscadd: Added the HoP's Parade Uniform and Jacket, both male and female versions! - ZephyrTFA: - - balance: Immovable rods are nicer to people who are resting. - tf-4: - - spellcheck: Cowboy clothing now speaks proper-like - thestubborn: - - bugfix: fixed area error with the delta det office - unit0016: - - bugfix: Xenobio on NSS Journey now no longer has a horribly accursed scrubber - line (And the 'storage room' has been repurposed to not just be a "Throw bodies - here" room) -2021-07-24: - BurgerBB: - - rscdel: Removes Vatbeast/Slime nests, snake nests, and toxic bee nests from maint. - - balance: Reduces the health of nests from 150 to 100. - BurgerLUA: - - balance: Nerfs ant decomposition times. - FlamingLily: - - bugfix: Alt titles for skyrat jobs now work as intended on the manifest - RatFromTheJungle: - - rscadd: Added laserguns & the CFA wildcat to cargo. - - bugfix: put THC back into weed, removed tg's "Cannabis" chem from them - Seris02: - - bugfix: fixed extra job icons not showing on the sechud - - imageadd: added vanguard, NT rep, civil dispute officer, corrections officer and - security medic HUD icons - lyricalpaws: - - tweak: 'Removes robohand from uplink (but not code) qol: So long, space cowboy' - softcerv: - - rscadd: Adds the Draconic necklace, an item craftable by ashwalkers through tribal - materials that allows the user to speak Draconic so that they can communicate - with Ash Walkers. - - imageadd: added Obj and Mob textures for the Draconic necklace. -2021-07-25: - FlamingLily: - - bugfix: Suit sensor tracking for job changes. - - bugfix: QM head status. again. -2021-07-26: - tf-4: - - bugfix: hairbrush mood events now have a linebreak -2021-07-28: - Domitius: - - bugfix: One spraycan can no longer colour every light on the station. - FlamingLily: - - bugfix: sartge disabler - Gandalf2k15: - - balance: Guns now start in the armory instead of tokens. - GoldenAlpharex: - - bugfix: Magic mirrors are no longer scared of colorful ears and tails and will - finally change their colors when they're meant to. - Intergalatic language police, Neko division.: - - bugfix: Instead of saying gato, those fucking cats now say Gatto, as intended. - Probably - Melbert: - - bugfix: Roses in mask slot now have their correct worn sprite again. - Nari Harimoto: - - bugfix: AI can now no longer be pushed even when anchored, only when dead or unanchored - can it be pushed (grab a dead core to swap places) - - bugfix: borgs can now no longer be pushed when in combat mode and alive, you will - always swap places with dead borg corpses. - RatFromTheJungle: - - rscadd: added pens to autolathes, so you can write with them, or form a book club - or something. - SkyratBot: - - bugfix: Syndicate hackers outsmarted another group of syndicate hackers, and updated - defensive protocols of cyborgs slaved to malfunctioning ais, once again letting - them defend against emags - - bugfix: Research consoles now correctly show GAGS-ified icons properly. No more - missing janicart upgrades! - - bugfix: Orange shoes no longer turn into errors when detaching handcuffs - - spellcheck: Made the Doppler Array explosive sale message less wordy. - - code_imp: killed the grown misc file! - - rscadd: Added brain-computer interface circuit shells. -======= TheSmallBlue: - expansion: Added the To Number circuit component. Time-Green: @@ -1434,106 +936,19 @@ Melbert: - qol: Ctrl-click now activates the porta-seeder. Thunder12345: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added class mechanics to Capture The Flag, with two new classes. - rscadd: The Assaulter class is a fast skirmisher armed with a shotgun and rocket gloves, but a very fragile energy shield. - rscadd: The Marksman class is a sniper armed with a hitscan rifle doing lower than standard damage. -<<<<<<< HEAD - - imageadd: Added a bunch of icons for Assaulter and Marksman gear. - - tweak: The fair maidens on the medieval simulation shuttle are no longer weapons - of mass destruction -======= - imageadd: 'Added a bunch of icons for Assaulter and Marksman gear. tweak: The fair maidens on the medieval simulation shuttle are no longer weapons of mass destruction' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: You can no longer spawn outside of CTF matches when multiple classes are available. - refactor: Rewritten the multi-class part of CTF spawning to use radial menus. - refactor: Medieval simulation has been refactored to bring it fully under the CTF framework -<<<<<<< HEAD - - balance: Add musical instruments to maint loot list - - bugfix: fixed cryocells and hfr runtiming on quick consecutive wrench actions. - - bugfix: Fixed Index Table outputting a table instead of a list. - - bugfix: toggling combat mode will now send a sound to the player even if the character - is deafened. - - bugfix: Fixed Chat Highlighting working on your own Binary messages. - - bugfix: fixed some oddities with the wheelchair wheels overlay. - - rscadd: Gas masks now properly filter gases when a filter is applied (can be made - roundstart from any lathe and every gas mask starts with one in them) - - bugfix: A CABAL of syndicate hackers broke Nanotrasen protections, allowing malfunctions - in AI to finally happen again - - bugfix: fixed hfr crate having the wrong parts - - bugfix: lavaland syndie base and seed vault no longer explode into green tiles - - bugfix: Nightmares were getting a broken ui panel, now they don't! - - bugfix: Fixes some hardships with placing lattice on multiz maps. - - bugfix: High Volume Vent Pump Layer 3 icon state to be correct - - bugfix: You can no longer be the living dead by having adminordrazine when you - die - - code_imp: killed the aquarium misc file! - - spellcheck: Tiger Cooperative Traitors now have a slightly better uplink information - flavor text - - bugfix: Fixed Chat Highlighting working on your own OOC messages. - - rscadd: Adds ANTI-TIDER-2500 to the SecTech vendor - Spc-Dragonfruits: - - balance: Despite their age, rifles and their respective calibers are able to massively - outperform a modern pistol. - - rscadd: Added a new AK magazine variant, the RPK magazine. It holds 45 rounds - instead of 30. - Wallem: - - bugfix: Only foods which are created at mapload require player interaction in - order to decompose. - ZephyrTFA: - - rscadd: Engineering cyborgs can now install an advanced materials upgrade - - balance: Events now roll roughly half as often - capsaicinz: - - rscadd: adds the sneed plushie. - coiax: - - rscadd: Appendicitis is now no longer a disease. It has the same effects, although - shows up slightly differently on health scanners. It also is no longer caused - by the event system, and can happen to any appendix inside a person. -2021-07-29: - BurgerLUA: - - rscadd: Plumbing units are now researchable and obtained via Advanced Engineering - research. - - rscadd: Adds the mining Plumbing device. - Edgar-Allan-ShitPoest: - - rscadd: Added weak curator katana - - rscadd: Added ronin kit to curator's heroic beacon - FlamingLily: - - rscdel: Nanotrasen Nanomachine programmers have been fired. - ForrestWick: - - rscadd: 'gives black market dealer some more items and ingredients qol: allows - black market dealer to have a bag and holofan roundstart' - GoldenAlpharex, with some help of Imaginos (PositiveEntropy): - - imageadd: 'Added a new badge to display on future berets. expansion: Nanotrasen''s - fashion department decided to release a brand new series of berets, meant to - replace the old collection and featuring a wider array of possibilities!' - - refactor: Berets are now converted to GAGS, with more options for customization - and greater consistancy between the sprites. - - code_imp: Not all GAGS sprites can be recolored in vendors by default anymore. - Guestify: - - bugfix: Replaces security newscasters with non security ones in non security rooms - on Tramstation - Improvedname: - - balance: Construction bags fit once more in your pockets - Melbert: - - bugfix: The mapped sprite for GAGS Lizard Plushes works, now. Mappers rejoice. - - admin: Tray planted kudzu will now log in investigate -> botany instead of its - own file. - - bugfix: Some things that wouldn't dispense themselves from smartfridges now will - properly give themselves up. Some examples include Roses, Nettles / Deathnettles, - and Salad of Edens. - - bugfix: Plant Analyzer's readout should look less weird and more consistent again. - Mey-Ha-Zah, Fikou: - - imageadd: new sprites for the ash walker egg - OrionTheFox: - - bugfix: Lea's Cowboy Poncho, specifically it's Toggle Component, works properly - now -======= TiviPlus: - bugfix: fixed normal panic bunker sometimes rejecting when it shouldnt aaaa1023: @@ -1576,56 +991,10 @@ can it be pushed (grab a dead core to swap places) - bugfix: borgs can now no longer be pushed when in combat mode and alive, you will always swap places with dead borg corpses. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PositiveEntropy, tf-4: - imageadd: Thanks to a collaboration between the frontier sector and the core sector, the parade jackets now boast new and varied apperances for all to enjoy, with a new parade jacket releasing for the Head of Security! -<<<<<<< HEAD - - imageadd: 'In no short effort than the finest of tailors, the captain''s hat, - the centcom hat, the captain''s jumpsuit and the captain''s carapace now have - finer gold trims and the finest quality leather available, making them more - vibrant for all! expansion: To utilize the new variants, simply alt-click a - parade jacket, or a centcom commander coat. You can also obtain a Head of Security - parade jacket by simply accessing the Head of Security''s closet!' - RatFromTheJungle: - - balance: Cuts biorecons healing power in half. - - balance: Cuts the armor granted by dermal hardening by about half. - SkyratBot: - - bugfix: Meta medbay now has all its areas set correctly - - bugfix: Fixed item quirks like photographer putting their items in the wrong spot. - - bugfix: HFR now properly take damage when overfilled with fuel - - admin: Added the ability to save/load integrated circuits. - - bugfix: the elite syndie suit now has the proper icons on its first equip - - bugfix: robots now work properly - - bugfix: Sentient monkeys are no longer subsceptible to being knocked over by mobs - in their way. - - code_imp: Killed the miscellaneous items file! - - bugfix: Fixed carps being given orders without a friend via radial menu. - - bugfix: Fixed sentient carps being unridable because of the ai datum. - - bugfix: Fixed spectral instruments spawn probability - - rscadd: traitors now get some extra flavor. doesn't mean anything mechanically - or ruleswise right now, but maybe it will inspire some more creative traitoring? - - rscadd: a few antags now have a tgui menu instead of a greet. spiffy! they include - antag info you need. - - bugfix: Fixed APC's using extreme amounts of power instantly - - code_imp: Removes all misc files/folders from the projectiles module - - code_imp: killed the global vars misc file! - - code_imp: Added an autofocus argument to tgui_alert, defaults on, that can be - used to prevent accidental inputs from surprise alerts when used. - - bugfix: Fixes ridden skateboards crashing back-to-back when bumping a dense atom - while another is behind them. - - bugfix: Fixed the launchpad usb connection not working with null x/y offset inputs. - - admin: default instakill rifle doesnt delete itself - - admin: Admins can't make it possible to deconstruct a hedge by wrenching with - a single var edit anymore. - - bugfix: fixed normal panic bunker sometimes rejecting when it shouldnt - - bugfix: Zombies no longer get permanently hungry. - - bugfix: Fixed wallets not granting access for ID cards inside them. - - balance: tram is now twice as fast, pray it doesnt get faster - - code_imp: bless aware hud is no longer hardcoded for chaplains - - rscdel: Nanites have been removed. -======= - imageadd: In no short effort than the finest of tailors, the captain's hat, the centcom hat, the captain's jumpsuit and the captain's carapace now have finer gold trims and the finest quality leather available, making them more vibrant @@ -1695,43 +1064,10 @@ - bugfix: Fixes ridden skateboards crashing back-to-back when bumping a dense atom while another is behind them. Greniza: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: prisoner transport bags can now be cinched properly - bugfix: syndicate prisoner transport bags now expel the expected amount of gas due to an occupant's exhale - spellcheck: makes cinching a PTB have proper pronouns according to an onlooker -<<<<<<< HEAD - - bugfix: Rust Heretics can once again benefit from rust - - bugfix: Vatbeasts can use their powerful tentacle slap ability again. - - bugfix: Removed the duplicate QM stamp on Icebox - Snakebittenn: - - rscadd: Adds Japanese language. - - rscadd: Slightly lowers space chance on Zolmach. - Wallem: - - bugfix: Flowers now have a Natrual Insecticide gene which protects them from decomposition - upon harvest. - Yawet330: - - rscadd: Syndiborgs to uplink - itseasytosee: - - bugfix: Certain non-magic ranged weapons will no longer "appear to have a magic - crystal installed" - - bugfix: constructs examine text color matches the rest of their theme. - - soundadd: There are now sounds for adjusting the pressure on a pneumatic cannon. - softcerv: - - imageadd: Adds in textures for mediguns and medicells. - - rscadd: Adds mediguns, upgradeable healing guns, orderable via cargo. - - rscadd: Adds medicells, upgrades to mediguns that unlock new healing types. - tf-4: - - bugfix: Monkeys on the interlink will no longer slowly burn themselves to death - in their attempts to grab the light in their pen. - timothymtorres, SomeoneYouProbablyKnow: - - imageadd: Added referee costume - unit0016: - - bugfix: Interdyne having half a base most rounds, and also the FREE ROUNDSTART - (BASE /TG/) SECURITY EQUIPMENT ON ROCKPLANET. - - rscdel: Cybersun has been disabled. -2021-07-30: -======= Improvedname: - balance: Construction bags fit once more in your pockets Itseasytosee: @@ -1793,51 +1129,11 @@ InvalidArgument3: - rscadd: Exosuit-mounted kinetic accelerator equipment. Unlocked through Mining Technology. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JustANormalHooman, Nari Harimoto: - bugfix: Biobags can feed reproductive extracts again, and can be fed multiple cubes from a bag with one click - refactor: reproductive extracts now have a storage component for the purposes of being fed -<<<<<<< HEAD - SkyratBot: - - bugfix: Adds APC electronics and replaces uranium with plasma in donut whiteship - - code_imp: Removes some unnecessary code bloat from the circuit component files. - - rscadd: Exosuit-mounted kinetic accelerator equipment. Unlocked through Mining - Technology. - - bugfix: Fixed pAI loudness booster to work when not in holoform - - bugfix: Fixed gas meters showing error icons before round starts and right before - they are created - - code_imp: Removes the misc ID trims file. - - rscadd: 'Getting hit point blank by an explosion will shake your screen a good - bit more then before qol: "Shakes" from explosions or hitting things really - hard will look a bit smoother now' - YakumoChen: - - bugfix: being on fire wih a fireproof SEVA suit no longer somehow burns my jumpsuit - off anyway - softcerv: - - balance: Medigun Crates now cost 2x more. - - bugfix: Charge rate is closer to what I intended. - unit0016: - - bugfix: Interdyne and DS-2 no longer have empty alcoves where nanites used to - be. -2021-07-31: - GoldenAlpharex: - - imageadd: More badges have made their way in Nanotrasen's Beret Production Line, - resulting in a wider variety of berets being possible! - - refactor: Nanotrasen's Fashion Division went through another thorough revision - of its beret selection, improving its consistency and its looks in its brand - new "Beret-lliant" collection! - SkyratBot: - - rscadd: Casino emergency shuttle - - admin: Adds logging for cult reaching red eye and halo milestones - - bugfix: rev art now works correctly! - - refactor: 'Refactors the UI code of integrated circuits to be a lot less messy - and much more organised and to use much better practices to allow for better - features to be added. qol: Adds dragndrop functionality to integrated circuits - so that you no longer have to click to connect ports, you can drag instead.' - - bugfix: reactive armor now properly updates its sprite on the mob -======= LemonInTheDark: - rscadd: Getting hit point blank by an explosion will shake your screen a good bit more then before @@ -1884,4 +1180,3 @@ - bugfix: rev art now works correctly! wesoda25: - admin: Adds logging for cult reaching red eye and halo milestones ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-08.yml b/html/changelogs/archive/2021-08.yml index c4c6a7fc36f..6aad056b728 100644 --- a/html/changelogs/archive/2021-08.yml +++ b/html/changelogs/archive/2021-08.yml @@ -1,16 +1,3 @@ -<<<<<<< HEAD -2021-08-02: - FlamingLily: - - rscadd: sex - - rscadd: gas miners - - rscdel: Stasis beds. Again. Fuck you. (Is this too much? Idk, /j anyway) - - rscadd: NTR Rooms - GoldenAlpharex: - - bugfix: You can now speak again. - Lyroy: - - bugfix: Added some of the new jobs to the list of jobs allowed to take certain - job-related items in the loadout menu. -======= 2021-08-01: SmArtKar: - imageadd: Added new sprites and animations for module duplicator @@ -35,7 +22,6 @@ - bugfix: The wisdom cow no longer spawns in space. NamelessFairy: - bugfix: Adds a missing wall to delta maint ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nari Harimoto: - bugfix: Tram's RD telescreen can now view their dept cameras again - bugfix: Delta and Meta RD offices now have a RD telescreen again @@ -51,7 +37,6 @@ now share an APC and air alarm - bugfix: trams toxins storage room now uses its correct area, added an APC to power the room -<<<<<<< HEAD RatFromTheJungle: - imageadd: new demonic core sprite (ooo animated ooo) SkyratBot: @@ -186,7 +171,6 @@ - imageadd: icons for the new items and enemies. - code_imp: added code and items for the prison, such as jumpsuits, enemies, and the ghost roles. -======= Ryll/Shaps: - qol: Adds a new preference for photosensitive players in the OOC preferences menu to replace the bright white flash from things like flashes/flashbangs with a @@ -255,7 +239,6 @@ - bugfix: Cultists can once again draw runes in lavaland mining station JohnFulpWillard: - bugfix: Using Twisted Construction on an AI shell no longer ghosts the AI ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles: - rscadd: Tramstation's service wing has been revamped! - rscadd: The Kitchen and Hydroponics has been redesigned entirely with small adjustments @@ -268,7 +251,6 @@ - rscadd: The stairs leading to the bar have been made very accessible from the tram dock, being right beside the kitchen entrance. The lower segment of the bar has been redesigned the better fit this change. -<<<<<<< HEAD Melbert: - code_imp: Uncomments the code that makes chaplains enjoy holymelons. Chaplains will now gain positive moodlets from eating holy melons once again. @@ -377,7 +359,6 @@ an existing thing qol: made something easier to use' - bugfix: railings can now be vaulted/climbed over from both sides. - admin: Admins now have a "View All Circuits" button to investigate circuits easier. -======= Mothblocks: - bugfix: Fixed medical HUDs not showing the defib icon. SmArtKar: @@ -495,7 +476,6 @@ - code_imp: Made the Occupational Corruption Device's deadchat message less cryptic, and repathed it to something more descriptive Zytolg: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Missing APC in Icebox Bar Maint - bugfix: Changes icebox apiary to the correct type - bugfix: Icebox Disposals was unlinked under the bar table. This should fix that. @@ -505,7 +485,6 @@ - bugfix: Icebox - Kitchen was missing the Processor and Grinder, you can now find them in the freezer and downstairs respectively. - bugfix: Icebox - Changes the bot portal in the bar to the correct subtype. -<<<<<<< HEAD - bugfix: Folded gold wheelchairs are now actually made of gold. - bugfix: Adds a missing wall on CentCom in the supplypod facility - bugfix: Most if not all CentCom windows should now be on plating @@ -578,7 +557,6 @@ BurgerLUA: - balance: Nicotine addiction is now more realistic and has additional side effects from a pool of possible side effects. -======= 2021-08-08: Mokiros: - bugfix: added parentheses to properly calculate days in round time @@ -591,7 +569,6 @@ ArcaneMusic: - bugfix: Accounting machines now assign the job to the bank account, meaning that new accounts can buy things without being considered budget cards. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, MeyHaZah, some sprites from /vg/station: - balance: mining soulstone can no longer grab sleeping/unconscious people - balance: voice of god can immobilize in addition to knocking down @@ -611,8 +588,6 @@ - balance: winter biodome is a bit harder, its antique laser has now been replaced with a freeze cube in a vault - balance: spellblade from bubblegum is replaced with a soulscythe -<<<<<<< HEAD -======= TheSmallBlue: - bugfix: Pathfinding component should now properly go around walls every time. Time-Green: @@ -651,12 +626,10 @@ 2021-08-11: InsaneRed: - bugfix: Fixed up distro pipes on botany of tramstation, adds 2 extra water tanks ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - bugfix: Default AI behavior cooldowns have been returned back to 0,8 seconds instead of 0.1 seconds, meaning Ian will no longer disembowel you with 20 attacks in 2 seconds. -<<<<<<< HEAD Seris02: - bugfix: fixes SOOC SkyratBot: @@ -677,20 +650,17 @@ - bugfix: Mediguns now eject Medicells into the user's hands instead of always on the floor. 2021-08-12: -======= 2021-08-12: EricZilla: - imageadd: Centcom finally sent us new PDAs. The uh, clown one keeps looking at me. Fikou: - bugfix: fixes cannons not working ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Gamer025: - code_imp: url_encode and decode now try to stringify inputs Gamer025 & Wayland-Smithy: - bugfix: Submenus like Sound and Ghost inside Settings are no longer gone -<<<<<<< HEAD -======= + Gurkenglas: - qol: All circuit component input ports act as a combiner. - refactor: 'Circuits: set_input and set_output are now put. input_value and output_value @@ -699,12 +669,11 @@ - rscadd: the crystallizer can now produce crystalized hyper noblium that makes your clothes pressure proof! not dying to pressure from other people is not guaranteed. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + MMMiracles: - bugfix: Spider midwives can no longer send commands while dead - bugfix: Nurse spiders can no longer heal dead spiders and get a message when trying to do so. -<<<<<<< HEAD SkyratBot: - imageadd: Centcom finally sent us new PDAs. The uh, clown one keeps looking at me. @@ -780,7 +749,6 @@ - balance: removed some loot left over as an oversight and nerfed the Warden boss fight a bit. - bugfix: removed and replaced some zombies that spawned invisible -======= Whoneedspacee: - bugfix: Megafauna are no longer stopped by corpses and chairs. sqnztb: @@ -807,14 +775,12 @@ - bugfix: Fixes changelogs parsing on linux enviroments Ghilker: - bugfix: HFR fuel mixes now properly consume the correct amounts ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: Paper that's on a clipboard doesn't need to be poked to realise that its appearance has changed and to properly display it on a clipboard. - bugfix: You finally figured that using a stamp on a clipboard was more important than using the pen that's currently attached to it. Congratulations! - code_imp: Added support for preventing a pen from being removed from a clipboard. -<<<<<<< HEAD - spellcheck: Ambitions now properly tell admins that auto-approve lasts TEN, not FIVE minutes. OrionTheFox: @@ -907,7 +873,6 @@ GoldenAlpharex: - bugfix: Space-proof beret now actually appears to have been made into a beret, instead of a reality-bending bunch of letters. -======= JohnFulpWillard: - spellcheck: DNA activators will now become expended once used, even if it hasn't activated anything. @@ -1011,133 +976,10 @@ - bugfix: Auto rifle ammo crates have a name now Krysonism: - bugfix: Fixed an exploit that allowed SaturnX enjoyers to become permanently invisible. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Pepsiman0: - bugfix: 'the chem mass spectrometer is now a proper machine that is now: buildable, deconstructable, movable and upgradable. (the research for the board is in the basic bio tech node)' -<<<<<<< HEAD - SkyratBot: - - bugfix: Fixed the circuit duplicator not working. - - bugfix: if a character is blind, they can feel how full they feel while eating - - bugfix: Fixed an exploit that allowed SaturnX enjoyers to become permanently invisible. - - bugfix: fixes wizard failing to spawn without a spellbook when you roll a d20 - - bugfix: The intern responsible for NTNet circuit components not working has been - sacked. - - bugfix: Player controlled mulebot mobility is now affected by motor wires. - Spc-Dragonfruits: - - rscadd: Added ARG-75 rifle and 7.62mm rifle magazine - - rscadd: Added CMG-1 smg -2021-08-21: - GoldenAlpharex: - - code_imp: Skyrat coders will now be able to have the building tool detect their - modifications in the modular_skyrat directory, helping them re-compile with - less pain involved. - MMMiracles: - - bugfix: Solar assemblies can no longer be built on top of existing solar panels. - SkyratBot: - - bugfix: corrected Fiery Rebirth's and Curse of Corrosion's heretic research descriptions - - bugfix: fixed heretic research progression after unlocking the Lonely Ritual - - bugfix: fix crystallizer from getting stuck on same amount of gases, limits the - allowed amount of allowed gas inside by double the recipe amount per type - - bugfix: Fixed microwave's attack_hand_secondary return value. - - code_imp: Failsafe is more robust now and the game can actually recover from an - deleted MC - - admin: The add component option in view variables now uses a tgui list that can - be searched. - - bugfix: fixes thermomachine abuse by slowing the exchange ratio based on the moles - amount on the ports (both if cooling, only main if not) - - bugfix: Fix fire being extinguished by pAIs, borgs, or simple animals by walking - over the mob. - - bugfix: fixes service achievements -2021-08-22: - Arkatos: - - bugfix: Fixed several messages which were not showing properly about finding a - rabbit in a hat, rattling your bones, denying sect membership or cooking sausages. - Deek-Za: - - bugfix: Fixed a small error in Access Code. - - balance: Prevents security and their respective tokens from potentially being - taken entirely out of the fight in the event of a bombing. - FlamingLily: - - balance: NT Reps offices are all with maintenance doors, now. - Gandalf2k15: - - balance: Mold cores are no longer the Achilles heel of mold, mold no longer slips. - GoldenAlpharex: - - bugfix: Ghost Cafe Visitors are now always eligible to a free box of chameleon - clothes, and as such will always receive one in their left hand upon joining - the Ghost Cafe! - - bugfix: Admins are now the one that decide how you spawn when they quick-spawn - you, instead of having to awkwardly wait for you to do it yourself. - LeonY24: - - soundadd: M16, MP40 and AKM now have their interaction sounds. - Melbert: - - bugfix: Some mask slot items won't prevent you from breathing properly due to - a runtime error - Seris02: - - bugfix: AIs will no longer hear all emotes from all ai_eye cameras - SkyratBot: - - admin: Adds component removals and mass component removals to the VV menu. - - bugfix: Moving aside your mask will no longer make you impervious to disease - - code_imp: prevent possible QDEL_IN harddel - - bugfix: tweaked soda dispenser reagent temperatures - Yawet330: - - tweak: The syndicate advanced card can now hold infinite syndicate and captain - access, along with two CC accesses. Bruh. - axietheaxolotl: - - rscadd: Added double beds - - imageadd: added double bedsheets - - bugfix: fixed e_gun subtypes using the AC-2 worn icon - - rscadd: Added Command and CC budgets - - rscadd: Added Captain to Command Budget - - rscadd: Added the Titan Crew, Blueshield, NT Rep to CC budget. - goatking-ss13: - - bugfix: Latejoin prisoners will now spawn in the permabrig, as intended. - jjpark-kb: - - rscadd: added the ability to grow plants on basalt turfs - softcerv: - - balance: 'see #7628' - - rscdel: 'Removed small hypovials from the autolathe qol: Hypovials can now be - produced by ChemMasters and pill presses, like on oldbase.' - - balance: Pill presses now have a buffer of 60 to accommodate for hypovials. - - bugfix: incubus draft recipe now makes incubus draft instead of succubus milk - thestubborn: - - bugfix: hopefully fixes headphone off state -2021-08-23: - CandleJaxx: - - rscadd: Added Vox clothing sprites that fit on their newly-adjusted sprite - - rscadd: vox suit / helmet additions to better fit their new sprites - - rscadd: vox-specific GAGS jumpsuits, skirts, shoes, berets, prison suits - - rscadd: gloves for vox-fucked-up-hands - - rscadd: 'modular species specific clothing section for future utilization on broader - scope projects qol: made something easier to use change: Vox species parts and - markings have been edited to appear more alien. - - More to be posted as the PR progresses' - Gandalf2k15: - - balance: Be antag now starts set to off. - - bugfix: Be antag now actually works. - GoldenAlpharex: - - admin: Added a Manage Player Ranks verb for those with the +PERMISSIONS flag, - to allow for easy in-game editing of the donator, mentor and veteran members. - - bugfix: Nanotrasen has seized control of their drinking glass factory once more, - meaning that the Syndicate no longer manages to smuggle modified shot glasses - in the station's standard-issue glass boxes. - SkyratBot: - - bugfix: fixes hot ice igniting using 100x the actual number of the sheets - - bugfix: fixes hot ice being ignitable with a condenser - - bugfix: Fixed runtime in monkey AI which would prevent monkey from pickpocketing - weapons or picking weapons off the ground. - Snakebittenn: - - rscadd: Adds a Medical bandolier for vials/beakers/medicells/etc. - - bugfix: Fixes Crusader bandolier sprite. - sqnztb: - - balance: Head roles and security cannot have nymphomania. NT fleet now under same - head role quirk restrictions. -2021-08-24: - CandleJaxx: - - bugfix: Adds missing Vox icons for their mining gear. - SkyratBot: -======= PositiveEntropy, Kryson, TetraZeta: - imageadd: Ports new Hypospray, Combat Autoinjector, Pestle, Mortar and Dropper sprites from Shiptest! @@ -1208,25 +1050,20 @@ Wayland-Smithy: - bugfix: Fixed dash abilities, like from Hiero Club, null owner refs. esainane: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The HFR now places its side components in the correct orientation when constructed by using a Multitool on the rapid HFR boxes. The core still needs rotating if your design requires it, and is best done before you step away unless you want to disassemble and move a side component. -<<<<<<< HEAD Superlagg: - bugfix: Character preference ringtones should actually work again. softcerv: - rscadd: Hypospray kits can be now be Ctrl+Shift clicked to change the design. thestubborn: - bugfix: Fixed the paramedic jacket's sprite. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-08-25: AccountName5: - bugfix: Fixed bug that prevented you from placing vertical bridge pipes on horizontal smart pipes. -<<<<<<< HEAD FlamingLily: - tweak: Made it more clear that combat indicator is an in character state. GoldenAlpharex: @@ -1334,7 +1171,6 @@ - code_imp: added a stack trace to job list initialization from text file - config: Reorganized jobs.txt and added missing entries SkyratBot: -======= Colovorat: - bugfix: Cables from protolathe and autolathe should merge just fine now Ghommie: @@ -1401,13 +1237,11 @@ - expansion: Can now search and change categories while the autolathe is busy, line up those designs! Ghilker: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: error when typing the mole efficiency (instead of 0.1 it was 0.001, didn't push the change) - bugfix: infinite power consumption (capped) - bugfix: efficiency not being tied to laser tiers (issue connected to infinite power consumption) -<<<<<<< HEAD - refactor: Area based lighting can be varedited and changed now - bugfix: colossus bolts no longer instantly explode you if youre in a car/mech - bugfix: roundstart offstation antagonists such as wizards and nuke ops no longer @@ -1468,7 +1302,6 @@ lay eggs as opposed to 10 seconds. qol: Spiders can see further in the dark now.' - spellcheck: Changed the wording on antag panel policy a little bit. -======= tralezab: - bugfix: fixes field generators not being interactable 2021-08-29: @@ -1489,30 +1322,12 @@ to 10 seconds. - qol: Spiders can see further in the dark now. Y0SH1M4S73R: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Variables within an SDQL spell list variable can have their names changed without causing a cascade of errors - refactor: SDQL spell query execution has been moved to a component - admin: The parse error handling for SDQL spells has been improved significantly - admin: Projectile SDQL spells can now fire any projectile - admin: Touch SDQL spells can now use any touch attack item -<<<<<<< HEAD - jjpark-kb: - - bugfix: ashwalking should work for all of the plants now... not just plants with - mutations - softcerv: - - code_imp: replaced some usage of span_class with the newer standard. -2021-08-31: - Foxtrot (Funce): - - balance: Spacevines only occur once in a round now. - - balance: Spacevine event only happens at 60 players or more. No more lowpop plant - stations. - SkyratBot: - - bugfix: Naive clowns now worry less about their "sleeping" pets. - jjpark-kb: - - rscadd: added spacevine spacewalking mutation - - rscadd: spacevines allow you to spacewalk, similar to lattices -======= esainane: - bugfix: Smart pipes now calculate their direction properly, and construction code checks direction logic properly. This fixes many problems with atmospherics @@ -1570,4 +1385,3 @@ Ooze, NT combat defib and misspelling in heretic rust spell. dragomagol: - admin: gives brainwash victims a hud icon ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-09.yml b/html/changelogs/archive/2021-09.yml index c2993dda923..526ef9b04cc 100644 --- a/html/changelogs/archive/2021-09.yml +++ b/html/changelogs/archive/2021-09.yml @@ -1,11 +1,9 @@ 2021-09-01: -<<<<<<< HEAD GoldenAlpharex: - bugfix: Cyborgs and AIs can now understand and speak all the languages the crew speaks at the beginning of a shift, with a few rare exceptions. - code_imp: Changed the Neo-Russkya and the Yangyu's typepaths to reflect their actual name. -======= AlinaStarkova: - bugfix: Maint areas have been cleaned up to properly cover maint, minor tiles and airlocks which had space areas were fixed to have an actual maint area @@ -23,7 +21,6 @@ - bugfix: Hostile mobs will always face their targets when shooting. - spellcheck: Corrected a possessive case in the text of the ancient note found in the ice library ruin. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nari Harimoto: - bugfix: Nanotrasen expert roboticists have found an error in cyborg programming which allows them to interact with things farther than they are supposed to. @@ -32,34 +29,6 @@ checks for range such. and hotkeys are also now respected with can_interact() - bugfix: the emitter area around the SM chamber now has APCs, so no more infinate power for the thermomachines and other equipment -<<<<<<< HEAD - SkyratBot: - - spellcheck: Corrected a possessive case in the text of the ancient note found - in the ice library ruin. - - bugfix: trash cannons now accept any oxygen tank, not just red ones - - admin: gives brainwash victims a hud icon - - bugfix: fixes wormhole jaunter portals floating in space. - - bugfix: Meat steaks now have protein as expected. - - admin: Admins can click a category in the banning panel to toggle all checkboxes - within that category - - bugfix: Fixed the anti-drop implant not removing the nodrop trait on held items - if they're somehow dropped. - - bugfix: Female uniforms now update color correctly. - - code_imp: Female clothing generation now takes greyscale_colors as an arg, which - is null by default if the clothing item doesn't use GAGS. - - bugfix: Fix staff of lava not terraforming lava properly - - bugfix: Hardcore random traitors now get their hardcore random points for greentexting. - - spellcheck: Fix typo in Sparkler description - - spellcheck: Fix grammar when attacked by an unknown assailant - - bugfix: fixes a broken antag panel that rarely showed up - - bugfix: balloon alerts no longer become transparent, scale up/down or get colored - alongside their holder. - - bugfix: Any instance where you'd see "illusion" as a school of magic is now "translocation". - the illusion school has been dead for awhile now! - - bugfix: Hostile mobs will always face their targets when shooting. - YakumoChen: - - balance: Lowered the Brainwash Disk back to 5 TC -======= Sealed101: - bugfix: 'Tramstation: Restored the missing law office stamp. Hail bureaucracy!' - bugfix: 'Tramstation: Replaced the Core AI module in RD''s office with an AI Core @@ -1019,4 +988,3 @@ - bugfix: NanoTrasen denies all allegations of unethically producing electrical cables by forcing ill-equipped employees to lay them and materializing new cables out of thin air. The reports were clearly exaggerated. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-10.yml b/html/changelogs/archive/2021-10.yml index 41fe8005839..463548c4012 100644 --- a/html/changelogs/archive/2021-10.yml +++ b/html/changelogs/archive/2021-10.yml @@ -1,4 +1,3 @@ -<<<<<<< HEAD 2021-10-06: AMonekyThatCodes: - refactor: Adds basic mobs, a replacement for simple mobs that will hopefully destroy @@ -198,7 +197,6 @@ Kush1Push1: - rscadd: Russian players can use unique races text formation (from lizardmen and fly persons tongues) with their language. -======= 2021-10-01: Mooshimi: - code_imp: AIs will no longer get the asimov lawset on unique-lawset station trait @@ -221,7 +219,6 @@ - spellcheck: The NT IRN app will properly tell you that it cannot be used with department budget cards, who is this 'budgetorders' fellow anyways? - bugfix: Oven boards can now be researched with the rest of the kitchen's machinery. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles: - rscadd: Tramstation's cargo crates now spawn with some maintenance loot at roundstart. - bugfix: Fixed a singular rogue corner decal in Tramstation's cargo @@ -229,7 +226,6 @@ grid and not directly back into the dinner area. - bugfix: Tramstation's directional signs have been updated to properly show department directions. -<<<<<<< HEAD - rscadd: Tramstation's Security and Service wing has been flipped around. - rscadd: Tramstation's commissary has been placed above in the central wing beside the kitchen. @@ -327,7 +323,6 @@ them to make them shoot out things faster.... - admin: "You can now ping other admins (or whatever other roles) in asay by using\ \ @\_theirckey in your message" -======= Melbert: - balance: The firebreath Mutation is now a cone of fire, instead of a real fireball. Mooshimi: @@ -391,13 +386,11 @@ rate, it will instead adjust the reaction rate so that it consumes all of the gas. Ryll/Shaps: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Getting hit by the tram and landing on lattice or unplated flooring (on the upper z-level) will now cause you to smash through it and fall to the z-level below at the cost of taking some extra damage. Note that floors with plating will still hold steady, so you can still use flooring to make getting hit by the tram insanely lethal, it just takes a bit more effort. -<<<<<<< HEAD - balance: Bone wounds in general have been made less obnoxious, especially when suffered on the legs. Instead of limping every step with that leg, you now have a chance to limp each step with that leg that scales with the severity of the @@ -586,7 +579,6 @@ - refactor: Refactor spawner code to make it clean and unison. All of the random spawners now follow the same formatting. - spellcheck: fixed airlocks id from entrence to entrance -======= esainane: - bugfix: The Space Hotel ruin's Staff Room and Staff Store now use distinct areas, and no longer have APCs fighting each other for control. @@ -606,7 +598,6 @@ Wayland-Smithy: - bugfix: Fixed many Tramstation department sign arrows pointing to upload and vault. esainane: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Completely restructure HFR main processes, fixing many unusual edge cases when the HFR was unpowered, out of fuel, interacted with other subsystems poorly, etc. @@ -654,603 +645,6 @@ modifier and the gas production modifier. This means the top tier Hypernoblium/Anti-noblium recipe is now worth using, providing a production bonus of 3x rather than a penalty of x0.03. This recipe is still just as hard to operate safely. -<<<<<<< HEAD - - bugfix: Fix dir delay when riding something and turning - - bugfix: fixed fake artefacts so they look real - - bugfix: Discord new round notifications will no longer come shortly before the - round starts. You should now have enough time to actually ready up before round - start. - - admin: Admins should no longer get trolled by URL keys creating clickable links - that look the same as admin PM shortcuts. - - bugfix: Fixes a logic error in ID cards which could cause their accesses to be - unintentionally overwritten. - - bugfix: Quirks being removed/renamed/rebalanced will no longer break your quirks - menu - - admin: Admins can now save custom shells from integrated circuits. - - rscadd: You now store some events as mini stories in your head! - - rscadd: You can engrave said memories onto walls with a chisel! - - bugfix: Using a soulstone on a construct shell no longer destroys it and the shade - if no option for the construct mob type is taken. - - rscadd: Electric razors can now be printed at any lathe. Its in medical section. - - rscadd: Electric razor can be bought from the library vendor. - - bugfix: Fixes pizzas not being able to be processed. - - bugfix: you can now properly toggle on/off exosuit modules such as the generators, - repair droid, tesla energy relays, and RCS - - bugfix: 'Maint sect night vision eyes trait now correctly make your eyes show - as glowing an unnatural red when examined instead of doing nothing. qol: Tweaks - the logic for the cultist glowy red eye trait, allowing admins to add this to - players to make them appear as if they were cultists when examined, without - actually forcing them to make that person a full blown cultist. The cultist - glowy red eye message has been modified as a result, and now examines as "... - glowing with an unnatural red aura!"' - - admin: Expanded explosion logging should now make your day a little bit brighter. - - bugfix: Fixed the beginning of words being filtered "e.g. lol filtering lollipop" - - bugfix: Detective vests can store detective's (and nukeops agent) holsters. - - spellcheck: was/were grammar fix on items being knocked off - - bugfix: The transparent area of the image used by imaginary friend mobs should - no longer catch clicks. - - balance: Lowered the cost of the obsessed midround ruleset from 10 to 3. - - bugfix: The HFR now actually consumes oxygen used to mitigate iron content - - bugfix: Fix oversight allowing players to spam observers with notifications for - ghost roles. - - bugfix: Fixed xenos will now take damage while in crit state - - bugfix: Fixed wormhole jaunter to trigger when falling into a chasm - - bugfix: Fixed wormhole jaunter to be affected by EMP - - admin: Adds admin input requests circuit component - - bugfix: machines no longer duplicate themself and robots interaction is not messed - up anymore - - rscadd: Added in a new sock type, Thigh-high and Knee-high ace socks. - - bugfix: Bee socks are now properly ordered in the code. - - rscadd: Hauntium can now be worn by the undead! - - bugfix: Mechs with no damage will no longer punch - - bugfix: The Qualified Doctor skin for medborgs is now not the only option - - admin: 'Adds the signal handler circuit component. qol: Big dropdowns on the integrated - circuit ui will now expand when opened.' - - bugfix: Fixed any ports returning a string if set to the value of 0. - - bugfix: fixed lighting bug - - bugfix: Fixes malfunctioning bots breaking when they ordered from the bar. Uh... - oops! - - bugfix: The Derelict now has one APC per area. Weird behavior as two APCs fight - for control over the same region should no longer be seen. - - bugfix: 'Fixes screwdrivers not being recycle-friendly in the autolathe. qol: - Moves screwdrivering an autolathe''s maintenance panel open to right click.' - - bugfix: Fixes being able to feed the autolathe when its maintenance panel is open. - - bugfix: Fixed the hair dye spray to be tiny, as it was intended. - - rscadd: Pig Latin mutation - - balance: Due to their newfound love for seafood, felinids have developed an immunity - to carpotoxin. - - code_imp: The maximum entries in a bitfield2list has been raised from 16 to 24. - - spellcheck: The NT IRN app will properly tell you that it cannot be used with - department budget cards, who is this 'budgetorders' fellow anyways? - - bugfix: Ntnets are now type safe again. - - bugfix: patched mechs being slow randomly after phasing - - imageadd: Improves the Display Case sprite, giving it a fresh new 3/4ths perspective! - - bugfix: Fixed many Tramstation department sign arrows pointing to upload and vault. - - bugfix: Swarmers-banned ghosts can no longer create Swarmer bodies from the beacon. - - bugfix: Liquid Electricity blood packs in blood freezers now have proper labeling. - - bugfix: 'Donating Ethereal blood to a new bag now also properly labels it. qol: - Balloon message upon labeling your blood pack with a pen for more clarity' - - admin: you can now customize what udders produce using `reagent_produced_typepath` - or by using the `custom_milk_reagent` argument when adding the component - - bugfix: Contractor drop pods are now actually clickable and you can place your - target into them without having to drag them to the tiny bit of pod where the - rubble overlaps it. - - admin: now logging when you update available jobs! - - bugfix: Old photos from persistent photo albums will now no longer be lost. - - bugfix: The HFR interface now lets you toggle waste removal at power level 6, - rather than merely having it permitted in the backend. - - bugfix: Maintenance sect's adapted eyes will no longer render you permanently - blind despite having them repaired via the darkness. - - spellcheck: Fix the grammar for the message shown when appraising great art. - - bugfix: Fixed mindshield implants not retroactively working against slime or mansus - links. - - bugfix: Fixed stargazers that were either mindshielded, dead or protected against - psych magick by the time they became what they are not receiving the slime link - speech ability. - - bugfix: Stargazers will no permanently longer lose their slime link speech ability - upon death. - - bugfix: Full tile windows that have become opaque from being painted a dark color - will now lose their opacity when repainted with a light enough color - - bugfix: server restarting stuff uses alert instead of tgui alert - - bugfix: Gets rid of the placeholder alien bed and replaces its appearance in Snowdin - with the proper alien bed. - - bugfix: Stickmen flatguns now properly drop out of your hands when picked up, - as intended. - - balance: The minimum threat for traitor related rulesets to be considered running - has been lowered to their cost. - - bugfix: Fixed a regression that removed easy access to milk cartons from skeleton - pirates. - - bugfix: Jack-o-lantern helmets now glow in the dark when they are worn. - - bugfix: Admins will no longer receive erroneous SDQL spell parse errors when loading - a json file that contains projectile var overrides or touch attack var overrides - - bugfix: Fixed an issue with ping display that could cause display and chat errors - on exceptionally long shifts. - - code_imp: Added an argument for the decomposition component that allows for specifying - what kind of item something decomposes into. - - bugfix: Space ants no longer prey upon chickens and their produce. - - rscadd: Includes some examples from existing food and a new kind of food. Moldy - bread, moldy pizza slices, rotten eggs and moldy dead mice. - - code_imp: The tgui ProgressBar can now accept color specifications in hexademical, - rgb/rgba, color-\ class, and base CSS named colors. - - bugfix: Add missing gas color mappings to tgui, and disambiguate old mappings. - Exotic (and mundane) gases in the SM monitor and HFR interfaces have never been - more colorful! - - bugfix: 'tgui: IE8: Removed "iefix" css classes from Flex elements which resulted - in unusable layout in complex UIs, such as tgui prefs.' - - bugfix: 'tgui: IE8: Fixed button clicks.' - - rscadd: Hand a monkey an instrument. It'll play a cool song! - - bugfix: Fixed scanner gates not functioning when anchored and also fixed their - examine text not saying they need to be anchored. - - spellcheck: Nanotrasen recount blood packs in cargo order now its match reality - - admin: Admins are no longer able to bypass proccall protections using remote methods - of proccalling. - - refactor: Refactored batons and stunbatons code. Stunbatons are now a subtype - of batons. - - code_imp: Removed some batons copypasta. All batons share the same anti-dual wielding - abuse code now. Replaced some old anchored checks for teleprods with move_resist - ones. - - bugfix: Fixed clumsy checks for teleprods stunning the user twice. - - bugfix: Fixed teleprods not teleporting living mobs that aren't xenos or humans. - - balance: TRAIT_STUNRESISTANCE now affects all batons and not just stun batons. - - rscadd: Added the Proximity Pinpointer component, get the coordinates of any entity! - (As long as its in view) - - bugfix: Surgeries that repair organs will once again repair the organ. - - bugfix: fixed some phasing things getting stuck on some objects - - bugfix: Fixed the protect objective always failing. - - bugfix: Fixed hitting people accidentally with food if their mouth is covered - or if they can't otherwise consume food. - - admin: Mobs being forced to say things through ingame sources or admin magic will - now show up correctly in logs if whispered. - - code_imp: AIs will no longer get the asimov lawset on unique-lawset station trait - rounds - - bugfix: durand shield will no longer burn forever or take fire/acid damage from - the environment - - bugfix: secret recipes are now actually secret - - bugfix: Agent IDs and other similar Chameleon gear can no longer be used/forged - while you have your hand blocked and/or are in critical condition. - - bugfix: soul shards now properly remove antag when exorcised - - code_imp: vendor code has less spaces and more tabs - - bugfix: Removes a duplicate table and pipes and cable from the Metastation Eng - Foyer. - - bugfix: fixed changing a turf sometimes making an area dark - - bugfix: Reactions will now properly fully react when it has moles to consume. - Instead of the reaction stopping when one of the gasses is lower than reaction - rate, it will instead adjust the reaction rate so that it consumes all of the - gas. - - bugfix: Moths have finally figured out how to finish eating clothes again, rather - than infinitely eating a singular sock. - - bugfix: Traitors who aren't given codewords will no longer notice them when said - or have them in their antag menu. - - bugfix: restored lighting to areas that were supposed to have it - - bugfix: fix ebow was able to accept pka modkits with 0 cost - - bugfix: Fixes door welding and crowbarring secondary attack calling the primary - attack. - - balance: Projectiles fired by the watchers on lavaland will now deal damage and - apply a short slowdown to carbons. - - server: MOTD is now read sequentially in configuration, allowing for multiple - MOTD files. - - bugfix: shield wall generators in space now start unlocked, previously only usable - by the odd RD or cyborg. - - bugfix: Shamebrero and maybe some other greyscale icons flashing have been fixed - - bugfix: GODMODE dummies can no longer be deafened by flashbangs - - bugfix: Magmawing watchers do not apply a slowdown any more. - - code_imp: Adds area support for the Plasma Facility ruin. - - admin: The Set Var, Get Var, Proc Call, and Signal Handler admin circuit components - now use a "datum" datatype for their "Target" port. The "datum" datatype can - accept inputs from "atom" ports, and can be safely cast to the "atom" datatype - using the typecasting component when necessary. - - admin: The Get Var component now has an option port used to select the expected - datatype of the obtained var. Similarly, the Proc Call component now has an - option port used to select the expected datatype of the proc's return value. - Both of these options default to "any" - - bugfix: Vent and scrubber names once again contain their unique ID tags - - bugfix: Fixed a small irregularity in the outline glow of the `p` of the character - setup button when highligthed or pressed - - rscdel: Removed the research note download objective. - - rscadd: Added new master R&D servers to science departmental server rooms. This - server cannot be deconstructed via ordinary methods. This server cannot be rebuilt - if destroyed and cannot be repaired if sabotaged. If destroyed or sabotaged, - research point gain is halved for the rest of the shift. - - rscadd: Added a new antag objective for traitors and lings to steal the hard drive - from a master R&D server. Any other antag can steal it too, for fun. But only - traitors and lings and things that get traitor or ling objectives can get it - as a dedicated steal objective. - - rscadd: Added a new objective for the space ninja and interactions allowing them - to destroy the drive in the master R&D server or set the current research points - back to 0. Both of these interactions alert the AI and are performed by using - the gloves on an appropriate R&D server. - - bugfix: fixed a few small sprites issues with the lobby menu. - - bugfix: hopefully fixes pellet clouds only spawning one projectile - - code_imp: changed some turf changing code remember to report bugs - - bugfix: New photographs taken will now properly save. - - bugfix: NanoTrasen denies all allegations of unethically producing electrical - cables by forcing ill-equipped employees to lay them and materializing new cables - out of thin air. The reports were clearly exaggerated. - - bugfix: Fix atv covers not appearing - - bugfix: RnD discount experiments now reduce the proper amount of points needed - instead of gradually growing into a 100% free tech node. - - admin: adds infinity to vv classes - - code_imp: moved some ai law defines to the proper file - - bugfix: The HFR no longer yeets all iron content given scraps of Oxygen. - - bugfix: The HFR now burns Oxygen proportionally to the amount of iron content - removed when appropriate. - - bugfix: The HFR using Oxygen to mitigate iron content buildup now properly respects - delta time. - - bugfix: When reprogramming a smart pipe to permit more directions, the smart pipe - will now immediately connect in any newly allowed direction, rather than only - connecting when a component is newly placed. - - bugfix: The RPD now correctly reprograms smart pipes to more restrictive states. - - balance: Disables wrenching on money bot and scannter gate shells when they are - locked. - - spellcheck: Rectifies the name and description of the cryostylane inverse chem. - - bugfix: Malf AI's who shunt onto an APC can once again be tracked by the nuke - disk pinpointer. - - bugfix: Plasmamen that have all of their limbs replaced with non-plasma alternatives - will not autoignite in flammable environments. - - admin: admins are now alerted when miasma, freon, and co2 canisters are opened, - and are informed of the contents of canisters containing dangerous gases in - general, not just the spooky gas on its own. - - code_imp: added overall logging for all canisters opened - - rscadd: Added new CC armour suit, with accompanying helmet and gasmask - - rscadd: 'Added suit storage that contains this new armour and gasmask. expansion: - Expands on the old CC armour suit' - - imageadd: added some sprites for da drip - - bugfix: The species list will now scroll properly when there are too many. This - has meant nothing up until this point, but will when Halloween races are enabled - again. - - bugfix: Doors, reinforced windows, lockers, mass spectrometers and lockers can - now be attacked with right click - - bugfix: Shark biopsy samples are now clean and don't contain a duplicate shark - cell line. - - spellcheck: Fix truely -> truly in a tip of the round - - bugfix: fix pod emergency storage exploit - - bugfix: You can now bind Ctrl/Alt again. - - bugfix: you will no longer spawn behind the arrivals shuttle on kilo or on ice - wastes for icebox, when the stations has the random spawn trait - - bugfix: Cayenne no longer deletes the nuke disk when putting it back down. - - bugfix: pressing the close button while entering a mob as a ghost will no longer - force you to become that mob. - - bugfix: you can no longer ghost and re-enter posibrains indefinitely. - - imageadd: 'Updated appearance of the Survival Pen expansion: The Quartermaster - now starts with a Survival Pen because its flavorful. Survival Pen has also - been updated to use the fancy font, since, its fancy.' - - admin: individual logging now displays things that happened to the individual - again - - admin: Putting pdas/paper up against cameras is now logged. Not what is actually - written, I'm too scared of people injecting war and peace into the game logs - section of a log panel, but you'll be able to tell em off for spamming the poor - ai with messages - - bugfix: Fixed the quirks list in the preferences menu sometimes being empty. - - bugfix: The R&D console has been given back its tooltips - - bugfix: Fixed an oversight/exploit allowing the nuke disk to be removed from station - z-levels. - - admin: Improved the warnings for when stationloving objects such as the nuke disk - get relocated. - - bugfix: Players can once again select AI eyes and blob eyes from the various orbit, - observe and jump menus. - - bugfix: Mapped in atmospheric tanks will now connect to pipenets in the appropriate - direction - - bugfix: Icebox, Runtime, and a number of ruins have had their gas tanks rotated - or repiped - - bugfix: Opening a toilet's cistern will no longer strike the toilet with the crowbar. - - rscdel: You can no longer store dice in pill bottles and pills in dice bags. - - bugfix: fixes getting scared of dice bags if you have a medical phobia. - - admin: Meteor guns do damage once again. - - bugfix: observe button now works even if your tgui doesnt - - bugfix: The Metastation gravity generator is now properly connected to the power - grid again - - bugfix: A large number of doubled power cables have been fixed across on all stations - - bugfix: A large number of broken, disconnected or doubled up atmospherics pipes - have been fixed across all stations - - bugfix: Multiple disconnected vents and scrubbers have been reconnected to the - atmos network on Tram and Meta - - bugfix: A large number of improperly named and networked cameras have been fixed - across all stations - - bugfix: Doubled tiles, decals, disposals, pipes and wires from the great map merge - incident have been removed - - bugfix: Oven boards can now be researched with the rest of the kitchen's machinery. - - bugfix: adjusted arnold palmer recipe to be made with iced tea instead of hot - tea. - - rscadd: added disposals blast door at the end of tram disposals - - bugfix: Mega arachnids can snare people again. - - rscadd: Adding the ability to use a large number of characters in the chat client. - - code_imp: In the chat client code, the standard text checking procedures have - been replaced by special chat text checking procedures. - - rscadd: Secret Gateways can now be a thing enabled by config. They are not on - the repository, instead, loaded from a config folder. - - rscadd: Adds the secret and anti-phasing z level traits used by Secret Gateways, - secret prevents observers from looking at the z level in any way other than - observing through another player's eyes - - admin: admin loaded away missions can be secret as well - - bugfix: When something is disconnected from a smart pipe, the smart pipe now immediately - frees up connectivity in that direction for other pipes or components to use. - - bugfix: Fluid ducts now properly start as "omni" instead of "grey." - - spellcheck: Fixed the Popularity Contest theme having references to Grove Street - Families, a long since removed Gang. - - balance: Spiders and space carp (from dragons) will now pull and move dispensers, - such as water and fuel tanks, as well as canisters slower. - - balance: Spiders and space carp (from dragons) can no longer attack stationary - atmospherics equipment, such as pipes or air alarms, as well as APCs. - - bugfix: Better tools now deconstruct blast doors and shutters quicker like they - actually should. Each deconstruction step now provides a message upon completion - as well as uses the tool's sounds! - - refactor: Performance of core tgui components was improved (Button, Icon, Flex, - Stack). UI should feel a tiny bit faster. - - rscadd: shuttle windows can now be deconstructed - - admin: renames enable debug verbs to enable mapping verbs - - admin: individual logging is now visible even with client logged out - - code_imp: /area now retains a local reference to the APC in the area, if any - - bugfix: The weapons authorization setting for turrets will now check for weapons - on targets without a chameleon identification card instead of those with either - a chameleon ID or no ID at all. - - bugfix: The tgui color helper now properly handles partially transparent values. - - bugfix: Things pushed via bumping into them now get fingerprints and admin-viewable - hiddenprints added to them. - - code_imp: Treat DreamMaker warnings as errors in CI - - admin: Added a panel for editing station traits. - - admin: Admins can now cancel out of sending an announcement. - - bugfix: Fixed the chat messages for stepping on objects with the caltrop component. - No more "You step on the floor!". - - bugfix: Crafting stackable items while already holding an existing stack of them - no longer causes runtimes - - bugfix: Traitors that are unable to receive equipment required for specific objectives - will be able to order that equipment from the uplink. Other antagonists that - are unable to receive such equipment can call in a pod containing that equipment, - unless they somehow have an unlocked uplink on their person, in which case they - can order it from the uplink. - - admin: Added a preference to disable your usual deadmin preferences when you are - spawned in CentCom. This is on by default. - - bugfix: Certain memories should no longer be added to mobs that are unaware of - them (almost always unconsciousness, in some cases blindness and/or deafness). - - bugfix: Fixes a rare case of new players being unable to move - - admin: Check AI laws will no longer collapse the laws, making them unreadable. - - bugfix: Fixes the logging text on respawn to correctly say it's respawn instead - of "abandon mob" - - spellcheck: fixed a single typo - - bugfix: fixed traitors randomly spawning incredibly bugged. - - bugfix: RCDs end their attack chain early now - - refactor: Refactored how components are triggered and how ports can now be ordered. - - bugfix: Added a few cables to Lavaland Mining for charging - - bugfix: Midround Nightmares will once again spawn. - - bugfix: rclick on gasmasks removes filters - - bugfix: The HFR now actually produces T3 gas at Fusion Level 2, provided you have - enough plasma in the moderator - - admin: Admins can now give players a popup if they are not responding to tickets. - - admin: /area/var/static_lighting proper varedit support - - admin: ticket panel is wider, resolve button should now stay on the same line - - bugfix: Smart pipes now calculate their direction properly, and construction code - checks direction logic properly. This fixes many problems with atmospherics - construction. - - bugfix: Smart pipe construction now no longer tries to work around irrelevant - pipes which are on completely different layers and do not interact with the - new pipe in any way. - - bugfix: Smart pipes with less than two allowed directions can no longer be built. - The pipe would be invisible, but still interact in weird ways. - - bugfix: 'One tile can no longer have more than one atmospheric component ready - to connect in the same direction and layer. This prevents the scenario where - a temperature pump is placed in a manner which looks like it''s going to connect - to a horizontal bridge pipe, but actually turns the vertical plasma input pipe - behind it into a manifold, ruptures the connected plasma canister, and sets - Toxins on fire. qol: Smart pipes are now much, much smarter. During construction, - if a smart pipe would block placement of a component, it will see if permitted - connectivity can be reconfigured to make room for other components. This includes - negotiation with other smart pipes, preferring to create pipe crossings where - available, or create an opposing corner pipe if not. The RPD can now also reconfigure - allowed connectivity for existing smart pipes manually. Smart pipes can never - be reconfigured to have less than two allowed directions, and active connections - cannot be reconfigured. Automatic reconfiguration will never cause a smart pipe - to permit connectivity that was not previously permitted.' - - bugfix: Multi-layer pipe components can trigger smart pipe negotiation where relevant. - - refactor: Rearranged some atmospherics pipe code. Fewer redundant loops, add and - use documented and centralized helpers for bit manipulation where sensible. - Make bitfield assumptions explicit. - - code_imp: made a small part of the documentation in the area less wrong dear god - my eyes the goggles do nothing - - bugfix: Fixed the Bloodcrawl spell not ejecting users if somehow lost. - Snakebittenn: - - rscadd: Chameleon mutation can now be toggled on and off. - - balance: Chameleon mutation instability raised to 35. - - bugfix: Fixes a minor bug with chameleon mutation and transparency. - Spc-Dragonfruits: - - balance: '"Yangyu" renamed to "Japanese" as its description suggests, for consistency''s - sake.' - - balance: '"Neo-Russkye" renamed to "Pan-Slavic" for RP flavor.' - Superlagg: - - bugfix: breastmilk production no longer makes you fat. - - rscadd: 'A new ''musical'' toy has been added to the LustWish machines! qol: Lustwish - gags can now be customized more than once!' - - refactor: ballgag.dm should now be a lot easier to work with. - TiviPlus: - - bugfix: fixed pollution making all world objects unclickable - - bugfix: fixed rendering not working on poluttion affected areas - Wallem: - - rscadd: You can now pour ants back onto the ground, with the more ants you pour - leading to more damage! - - balance: Ants now do more damage, however they require more sugar in order to - breed. - - imageadd: The ant decal now has a couple shiny new sprites! - - bugfix: Flyswatter can now swat ants - axietheaxolotl: - - imageadd: added ID icons/HUD icons for upcoming department guards - - rscdel: Removed M45A5 Screenshake - - rscadd: added actual locker for BS and added mantles to vendor - - imageadd: added le icon for BS locker - - rscadd: fuck fuck fuck - capsaicinz: - - bugfix: fixes the GPS computer's sprite. - carrotattacker, Sampslig: - - rscadd: Adds the juice, a drink that lets you see bluespace rifts and travel through - them - cheapcents: - - rscadd: Completely changed Icebox's brig. - cowsLUL: - - bugfix: re-added pink tutu to loadouts - dankmemerino147: - - balance: Rebalanced sec webbing vs belt; the webbing still gets the extra two - slots, but the belt can now hold disablers - - spellcheck: peackeeper - faaaay: - - rscadd: Added generic "conversion kits". In the future, these may be used to implement - certain custom items. - fighterslam: - - bugfix: Fixes a misplaced wire in the Cytology lab on the NSS Journey map. - grimm-hollowknight, ported by tralezab with a few overlays: - - imageadd: New borg sprite, from Yogstation! - ihavenoideahowtonamemyaccount: - - rscadd: more halloween costumes options in the loadout - jjpark-kb: - - rscadd: added back handheld scanners for xenoarch - - rscadd: added a handheld recoverer for xenoarch - - rscadd: added clothing relic, if recovered gives ashwalker clothing - - rscadd: added animal relic, which is swab-able, and if recovered gives materials - - rscadd: added 10 new plants (for xenoarch plant relic) - - balance: borers will only output pure versions of the chemicals - - rscadd: added power armor - - rscadd: added power armor upgrades - - rscadd: added the staff of the ashlands, an ashwalker staff that converts turfs - to lava/basalt - - rscadd: added primitive (bone, goliath hide, sinew) tools for surgery and construction - - rscadd: added 5 clothing for ashwalkers - - rscadd: added fishing - - bugfix: removed speed upgrade (power armor) from the techweb - - rscadd: rodstoppers now give you 5 seconds to evacuate the area - - balance: rodstopper is not so destructive - - balance: borers can have multiple focuses - - balance: borers generate evolution points faster - - rscadd: added upgrade cost to examine for power armor upgrades - - balance: half the increase of speed for speed upgrades - - balance: storage upgrade for power armor costs more now - - bugfix: you must be wearing the power armor to get the benefits - - rscdel: removed the speed upgrade from power armor - - rscadd: added primitive centrifuge - - bugfix: you can make clay in sinks now - - bugfix: fixed cortical borer logs - - rscadd: added ceramics and glassblowing - - balance: xenoarch sold items dont have elasticity - - bugfix: 'delta_skyrat: fixes the pipe and wires at arrivals' - - rscadd: you can now examine the forge to see the upgrade count - - rscadd: added hurtsposal (disposals now can hurt you) - - bugfix: added one more in_use = false to the forge - - bugfix: forge gives back goliath hides upon deconstruction - - bugfix: forge actually gives the amount of ore it should have been - lyricalpaws: - - rscadd: Bright Cosmos holocigars - - rscadd: Holocigarettes - nikothedude: - - rscadd: Security HUDs and medical HUDs can now view sec/medical records on examine, - respectively, and can also view general records. - - rscadd: Certain antagonists (such as traitors, heretics, wizards, etc.) are now - able to view exploitables by examining someone. - - bugfix: Exploitables now finally have a way to be accessed. - oranges: - - rscadd: Added french kissing to the game - sheetofseaweed: - - bugfix: brought fishnet socks back - softcerv: - - spellcheck: capitalizes the names of the Temperature and Clotting Medicells. - - balance: Mediguns can now fit within the suit storage of the CMO winter coat and - labcoat along with the medical hardsuit. Medicells can now also fit inside of - medical belts. - sqnztb: - - bugfix: libital, lenturi, and meth work in plumbing machines again. - tf-4: - - imageadd: Resprites glue - thestubborn: - - bugfix: restores stuff we lost in the map reset - - bugfix: sec ushankas now show hair - - bugfix: you can wear the ushanka in the loadout now - - bugfix: stop rolling up your cardigan sleeves you fucks - twilightwanderer: - - bugfix: Restoring the usual Borg tools. -2021-10-07: - GoldenAlpharex: - - bugfix: By default, you will now receive your loadout clothes in your backpack, - instead of a suitcase. - SkyratBot: - - rscdel: The augment painter has been removed from the game. - - rscadd: Spraycans can now change the visual style of robotic augments via right-click. - - bugfix: ice reaction oversight, now freezes at the proper 274k instead of 245k - - bugfix: Kitchen cold rooms which are cold (that is, those on Ice, Meta, and Tram) - now have their air alarms configured to expect this. - - bugfix: fixed dropped arrows being controllable with the bow - - bugfix: The Space Hotel ruin's Staff Room and Staff Store now use distinct areas, - and no longer have APCs fighting each other for control. - - bugfix: The Kilostation Art Closet now provides station sevants with the necessary - art supplies. - - bugfix: The new mining base on Icebox will now fully load its surrounding plasma - lake area. - - code_imp: Indestructible paper wall support. It's better than the alternative. - - bugfix: Borg lights are now visible again. - - bugfix: The airlock to MetaStation's Medical Cold Room is now properly named and - requires Medbay General access. - capsaicinz: - - rscadd: added odd lizzy plushie. - tralezab code, melbert idea!: - - rscadd: There's a new wizard event, RPG titles. Summon the star duke! -2021-10-08: - Melbert: - - bugfix: Quirks that once were not compatible are now incompatible again - NamelessFairy & Mothblocks: - - rscadd: CTF can now be played through the CTF menu, accessible through the minigames - menu - SkyratBot: - - bugfix: Fixes catwalks not working at all! - - bugfix: penetrator rounds will no longer ignore vehicles - Tristrian: - - bugfix: BZ Metabolizes drains Changeling's chemicals again. - thestubborn: - - balance: you can no longer instantly weld as any job - - bugfix: oh yeah also a digi cap kilt now -2021-10-09: - Colovorat: - - imageadd: catwalk floor tile object sprite and inhand sprites - Deek-Za: - - bugfix: Decal Painter now paints decals once again - - rscdel: 'Disabled Tail Trauma qol: Less troubling start for tailed individuals.' - GoldenAlpharex: - - bugfix: Quirks will no longer be in a weird state where they reset and you don't - know why anymore. Check your Augments+ tab if that was happening to you, and - remove the augments you don't want. - - bugfix: The Limbs Augmentations And Markings page was relabeled "Augments+" and - has been revamped visually to work better. - - bugfix: You will no longer wake up on the Interlink with your cybernetics looking - wrong because you didn't ensure they were set right properly during your sleep - (in the prefs menu). - - bugfix: The breathing tube is now accessible again in the Augments+ tab. - - bugfix: The 'Other' gender is now no longer afraid of itself and will now properly - render, allowing you to change gender if you'd like. - - code_imp: Quirk balance tallying up is now done outside of the TGUI interface, - allowing us to hook other systems that cost points into it. - - refactor: Refactored the Augmentations panel to actually look decent and support - the usage of quirk points to balance stronger or crippling augments. - Melbert: - - bugfix: The huds for clown and mime fan are back - - bugfix: You can no longer be a simultaneous clown and mime fan, pick a side coward - - bugfix: Removing invasive spreading from a plant will now actually remove invasive - spreading - - refactor: Refactored seed / gene deletion, and a bit of gene addition / removal - SkyratBot: - - bugfix: fixed ambient occlusion stacking sometimes - - refactor: 'Refactored the circuit list datatype to support composite types (i.e. - entity list, any list, number list), which are lists that can only contain values - of the specified datatype. This also refactors anything that uses the list datatype - to use composite lists. qol: NTNet components now use composite lists to send - and receive data' - - bugfix: Prevented people from infinitely making lists with the list literal component. - - bugfix: the Driscoll poncho should be centered now - - bugfix: Observers will no longer see ghost icons representing Maintenance Loot - Spawners of Roundstart Past once the round has actually started. - - bugfix: Fixed default FPS for new players and applies it to them when they join. - - rscadd: Emagged and Syndicate borgs can now self-detonate. For emagged borgs, - this destroys the MMI, so know what you're signing up for. - - code_imp: freon_gas_act is now called freeze_turf. It was only ever used in two - places, neither of which involved Freon. - - bugfix: Vat beasts now longer lose their ability when someone rides them. - axietheaxolotl: - - rscadd: Added DeltaTri's donator item. - lyricalpaws: - - bugfix: Plants distill in to their distill reagents properly. -======= - bugfix: The Abandoned Zoo ruin no longer has duplicate copies of an APC, power cable, and rack on the same tile. tralezab: @@ -1392,16 +786,12 @@ timothymtorres: - qol: Adds random statue spawners to secure art exhibits in the library for Meta, Tram, and Delta. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-10-10: Arkatos: - bugfix: Thermomachine design icon in the R&D Console UI will now show properly. Guillaume Prata: - bugfix: Cyborgs can interact with a morgue tray to close it now, instead of needing to interact with the main structure. -<<<<<<< HEAD - SkyratBot: -======= Krysonism: - qol: The mega arachnid now has a toggleable self only small sprite. No more hitting yourself! @@ -1420,81 +810,11 @@ esainane: - bugfix: HFR ambience will no longer play intensely when the HFR is out of fuel - bugfix: SMs meant to be immobile should now be truly immobile. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Bluespace anomalies will no longer teleport camera eyes, such as AI eye, Blob Overmind eye, Advanced Camera consoles, or the Xenobiology Slime management console. This is particularly relevant for the Xenobiology advanced slime console, as the eye cannot move outside of, or while outside of, the area the console is in. -<<<<<<< HEAD - - code_imp: Remove a very useless check from APC code - - bugfix: SMs meant to be immobile should now be truly immobile. - - bugfix: Fixed the dispenser shell and For Each and Filter components not appearing - in the component printer. - - bugfix: HFR ambience will no longer play intensely when the HFR is out of fuel - - bugfix: fixed antagonist preference tooltip showing wrong descriptions - - bugfix: Fixed the changeling antag panel - - bugfix: Fixed the wizard's antag panel. - - bugfix: Fixed variables sometimes just not working. - - bugfix: The beams from Emitters, and all hitscan weaponry, now render properly - again. - - bugfix: Preferences menu now supports Halloween races - - spellcheck: Fixed a typo in the Hostile Statue description. - SolGov Board of Spacestation Maintenance: - - bugfix: NSS Journey's Botany Backroom is no longer missing a disposal pipe segment - - bugfix: NSS Journey's Toxins Launch Tube is properly aligned (No longer facing - its own wall) - jjpark-kb: - - rscadd: added a fishing master skill chip - - refactor: refactored fishing code - sandshark808: - - bugfix: As a felinid, typing *wag a second time will stop your tail from wagging - as intended. - - bugfix: Security Medic, Security Sergeant, and Corrections Officer now get mail - goodies. - - bugfix: Security Medic, Security Sergeant, and Corrections Officer now have RPG - titles for use in a special event. -2021-10-11: - ForrestWick: - - rscadd: Added snowmobiles to the game and placed them on Icebox's mining area, - security, and the Interdyne icemoon base. - - imageadd: snowmobile sprites have been added alongside the snowmobiles. - Gandalf2k15: - - refactor: Ian is has become is much better - Seris02: - - bugfix: welding rods down to nothing will no longer cause a runtime - - bugfix: fixed the default values not saving for the nc and vr prefs - - bugfix: brushing your own hair no longer causes runtimes - SkyratBot: - - bugfix: Fixes the changeling panel not working at all. - - balance: Rad collectors are gone, can be only spawned by admins. SM will now generate - power by releasing zaps that will hit tesla coils around it. Roundstart setups - might not be enough for bigger stations and t4 machines later in the round, - recommended to upgrade the powergen. - - rscadd: Added back the reset keybindings button. - - bugfix: Fixed weird scaling on the buttons in a tabbed list UI (such as "Communications" - in the keybindings menu) - - bugfix: The CE's blueprints can now once again show an overlay of the station's - original structural layout! Cleaning up after an explosion is now - well, realistically, - just as frustrating as ever, but it looks nice! - gonenoculer5: - - rscadd: Added the tarot card deck, loincloths, and Smoking Pipe to the loadout. - linnpap: - - bugfix: fixed peacoat and duster sprites so they aren't solid white - - bugfix: makes colorable leather jackets actually able to be colored -2021-10-12: - Deek-Za: - - balance: Sergeant's hat has armor added. - - bugfix: Sergeant's hat is now visible on anthro races. - - bugfix: Added contents to SecMed's office first-aid kits on Icebox - ForrestWick: - - bugfix: Gave cargo ordered snowmobiles the correct path for keys. - SkyratBot: - - bugfix: Basic mobs can once again be vareditted - - bugfix: 'fixes unpowered space ruins actually being powered expansion: more secret - away mission stuff' - - refactor: Refactored monkey AI a bit, noticeable changes should be minimal! -======= - spellcheck: Fixed a typo in the Hostile Statue description. - code_imp: Remove a very useless check from APC code - bugfix: The beams from Emitters, and all hitscan weaponry, now render properly @@ -1522,7 +842,6 @@ - admin: Get variable circuit components can now get GLOB variables - admin: Animate and Save Shell circuit components will now apply DF_VAR_EDITED - bugfix: Fixes the changeling panel not working at all. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Bluespace launchpad maximum range decreased from 60 to 40. Traitor launchpad unaffected. - balance: Bluespace launchpads will now give a visual indication of the turf they @@ -1531,7 +850,6 @@ - balance: Bluespace launchpads will now show a beam that fades out between the target turf and the launchpad after it has done the teleportation. Again, does not apply to traitor launchpads. -<<<<<<< HEAD - bugfix: Fixed two issues with paper code. Namely paper text being always colored black outside of edit mode and signatures showing the current name and not the real name. @@ -1562,7 +880,6 @@ finally ended. Miners should be cautious, as the Lavaland natives might start showing up again. - bugfix: Primal Podpeople have finally managed to exit their cryopods again. -======= esainane: - bugfix: The CE's blueprints can now once again show an overlay of the station's original structural layout! Cleaning up after an explosion is now - well, realistically, @@ -1576,13 +893,11 @@ - bugfix: MMI components can't be no longer attached to modules. This was causing race conditions with other MMI components present in the circuit (not much of a good thing). ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscdel: Removed the action button for toggling griffin and owl wings, you can still open and close them with alt-click. - refactor: Toggle Suit component for labcoats, suit coats, and formal coats (and some others) -<<<<<<< HEAD Seris02: - bugfix: server erp prefs will now actually turn off the erp emote SkyratBot: @@ -1668,7 +983,6 @@ ihavenoideahowtonamemyaccount: - rscadd: even more halloween costumes options in the loadout 2021-10-16: -======= tralezab: - bugfix: Basic mobs can once again be vareditted 2021-10-13: @@ -1722,7 +1036,6 @@ - bugfix: Lavaproof borg upgrade for miner borgs now works properly. LemonInTheDark: - bugfix: Fixes openspace not working if the floor below has been changed ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles: - rscadd: Tramstation's maintenance now has new catwalk tiles covering the various piping/wiring throughout. @@ -1730,7 +1043,6 @@ outages caused by rogue syndicate mice operatives. - bugfix: Patched up a few missed spots involving pipe/wiring for departments like Botany/Courtroom. -<<<<<<< HEAD SkyratBot: - bugfix: Fixed monkeys having the wrong on fire overlay when ablaze. - spellcheck: No more phantom hand grabbing. @@ -1802,7 +1114,6 @@ - bugfix: Secways will now say it's broken, rather than it's component. - code_imp: removes color_legacy prefs and changes sanitize_hexcolor()'s default to 6 characters -======= Maurukas: - balance: The super matter crystal can no longer be immediately delaminated by firing a gun into it, only brought close to the delamination threshold. @@ -1886,7 +1197,6 @@ YakumoChen: - spellcheck: Gives shaft miner a more accurate job description esainane: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Radiation Collectors, Tesla Coils, and Grounding Rods are now subtypes of a common energy_accumulator type. This centralizes logic for smoothing energy release; converting between Joules, Watts, and internal energy units; and ensures @@ -1894,7 +1204,6 @@ curve. - bugfix: Tesla Coils no longer generate power using half the smoothing that Radiation Collectors used. This was due to a mistake in handling delta_time. -<<<<<<< HEAD - code_imp: 'Removed many magic numbers from power generation code. qol: Tesla Coils will now display energy stored in Joules and power being produced in Watts, much like Radiation Collectors did. qol: Grounding Rods will now display recent @@ -1923,7 +1232,6 @@ - bugfix: Fixes dogborg models getting an improper pixel offset on their sprite. - bugfix: Dogborgs get their rest and rest-style verbs back. They are located under AI commands. -======= - code_imp: Removed many magic numbers from power generation code. - qol: Tesla Coils will now display energy stored in Joules and power being produced in Watts, much like Radiation Collectors did. @@ -1985,7 +1293,6 @@ - rscadd: Emagging the communications console will now let you purchase dangerous shuttles. The Gigafactral and the Monastery were moved over (and made cheaper), while the Disco Inferno and Oh, Hi Daniel make a return. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - admin: As an admin, if you start replying to a freshly submitted ticket that another admin is already replying to, you'll get a notice that someone already has it @@ -1995,7 +1302,6 @@ - refactor: Rolling paper will now use the customizable reagent holder component. This cleans up the code and expands the possibilities for using the component by adding support for dried items. -<<<<<<< HEAD softcerv: - bugfix: medical bandoliers can now hold hypovials again. 2021-10-20: @@ -2007,7 +1313,6 @@ while the Disco Inferno and Oh, Hi Daniel make a return. jjpark-kb: - bugfix: added a range after mark selection for cargo teleporters -======= esainane: - bugfix: Removed a scrubbers pipe that didn't lead anywhere near Upper Hydroponics on Tram. @@ -2025,7 +1330,6 @@ - expansion: Nearsighter quirk now lets you pick the look of your prescription glasses from the character preference menu - imageadd: Added thin prescription glasses ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-10-21: ATHATH: - bugfix: Butter bears can now attack objects, as they were intended to. @@ -2035,7 +1339,6 @@ variables (which are zero by default) become nonzero. - bugfix: Butter bear attacks are now considered to be blunt instead of sharp for the purposes of wounds. -<<<<<<< HEAD Gandalf2k15: - rscadd: Added a mob spawner function for admins. MMMiracles: @@ -2089,14 +1392,11 @@ - bugfix: The SDQL spell parse error modal grows properly. - bugfix: fixed implant abilities not being properly removed when the implant is removed. -======= Coconutwarrior97: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds a hydroponics airlock type, and replaces old medical hydroponics doors with the newer airlock type. - bugfix: Fixes an issue where people with the doctor phobia were afraid of hydroponics doors. -<<<<<<< HEAD - bugfix: Fixed the contents of certain coded or mapped closets exceeding their storage capacity, like the HoS closet on Delta, which had redundant grey HoS jumpsuit, trenchcoat and beret, or the mixed wardrobe closet with its duplicate @@ -2341,7 +1641,6 @@ - imageadd: Digitigrade sprites for the Tacticasual Uniform and Cargo Tech Casual Wear SkyratBot: -======= Ghommie: - balance: Moved Pun Pun away from the kitchen on Delta. It's now behind the bar counter. @@ -2362,7 +1661,6 @@ - bugfix: Fixes advanced roasting stick griddling itself when used on a bonfire with a rod griddle built over it instead of using the bonfire to roast the sausage. Timberpoes: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed an issue where the unbanning panel would give inaccurate information about the ban in the unban confirmation prompts. - bugfix: Fixed an issue where clicking the X to close out the confirmation popup @@ -2374,8 +1672,6 @@ one. - admin: Editing the IP, ckey or CID of a server ban will now kick any players matching the edited ban's new details. -<<<<<<< HEAD -======= Zytolg: - bugfix: Tramstation is now free from oddly decaled walls. - bugfix: The Lavaland Syndicate Base is now Powered again. @@ -2572,13 +1868,11 @@ NamelessFairy: - qol: Word filters now support soft filtering, allowing players to say a word only after they confirm wanting to say it after a warning. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Deadchat is now effected by OOC word filters - bugfix: A reason for a word being filtered will now be displayed nomatter what case the word is in - config: Adds new config options for soft filters - admin: Admins will get notifications when a soft filtered word is said -<<<<<<< HEAD - bugfix: Fixes notes and bans being shown to players on connect when the note or ban doesn't belong to them. - bugfix: fixes hats glued to corgis' heads when dressing corgis up @@ -2615,7 +1909,6 @@ SkyratBot: - rscdel: Removed leftover HTML from spawner menu - refactor: Spawner menu is now easier to read -======= Sealed101: - expansion: Spooky headless corgi spirits have been sighted across the Sector! - bugfix: fixes hats glued to corgis' heads when dressing corgis up @@ -2656,14 +1949,12 @@ are created or destroyed. 2021-10-28: Cyberboss: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Emergency inlet access on the mining station eastern-most airlocks has been removed. - bugfix: Fixed mining station east airlocks requiring external airlock access instead of mining access. - bugfix: Removed access requirements from southern mining station public external airlocks. -<<<<<<< HEAD - bugfix: The SM now properly provides bonus power for operating in a low pressure environment. Make sure you can keep it cool enough, and remember, space or a vacuum won't work, but it will damage the SM! @@ -2681,7 +1972,6 @@ of resize. A little easier to use. - bugfix: Fixed an issue with the crafting menu not being fully dimmed while crafting. 2021-10-30: -======= Guillaume Prata: - expansion: Atmospherics Technicians can receive some useful things from their mail now. @@ -2705,7 +1995,6 @@ optimumtact: - rscadd: Bans are now more user friendly 2021-10-29: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ATHATH: - balance: Heavily EMPing a jumpsuit or another piece of under clothing will now short out its suit sensors (as if they had shorted out from damage to the jumpsuit) @@ -2714,40 +2003,6 @@ - bugfix: The sensor list will now be updated when your jumpsuit is EMP'd to reflect any possible changes in suit sensor status. - bugfix: Under clothing will now respect the EMP_PROTECT_SELF flag. -<<<<<<< HEAD - Aphast: - - bugfix: Added a locked door inside of a dangerous research facility, to prevent - an unnecessary casualty. - GoldenAlpharex: - - bugfix: The AI VOX announcer voice is by default the one it's meant to be, the - normal one. - - bugfix: The non-standard VOX announcer voices have had their volumes reduced. - - code_imp: Improves the VOX announcer voice code quite a bit. - - bugfix: Fixed the veteran-only quirks, making them available once again. - - config: Added a newline at the end of veteran_players.txt to avoid mistakes happening - with the Manage Player Ranks verb. - IsaacTheSharkWolf: - - rscadd: Barbershop with spa and tattoo/piercing workshop. - - rscdel: A bunch of maint objects to save on performance - - bugfix: Fixed the whole airlock space_dir vars issue thingymajig (hopefully) - Melbert: - - bugfix: The OOC messages of people with minor admin ranks now respect OOC filters - in chat tabs - SkyratBot: - - code_imp: Vending machines no longer require a unique panel overlay for each new - type - - imageadd: Hot Ice icons are now consistent, and now have an stack icon showing - two pieces for when there are between 17 and 33 pieces in the stack. - - bugfix: You're (hopefully) no longer able to make timed singlecaps using nitryl. - I really liked this one honestly, it's got an aggressive amount of heart and - soul - - bugfix: Corporate Sofas now have their rear middle sprites fixed to align with - the rest of the rear sofa sprites. - - refactor: Reworked `/turf/var/intact` into variables which don't conflate underfloor - visibility, underfloor interactability, and overfloor presence. This fixes many - bugs relating to turfs in general, especially catwalks and glass flooring. - - imageadd: made command envirosuits more consistent -======= ArcaneMusic: - bugfix: Double Bedsheets now properly show the bedsheet sprites. JohnFulpWillard: @@ -2776,7 +2031,6 @@ - qol: Allows you to link integrated circuits to component printers and, as a result, let you print components off remotely which are put directly into your circuit. esainane: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Pressure Tanks will now refuse to accept materials without a specific material type during construction. - bugfix: Pressure Tanks will now drop the correct amount of materials during deconstruction. @@ -2784,8 +2038,6 @@ a sufficiently pressurized tank despite the warning, rather than doing nothing. - bugfix: Pressure Tanks will release their gas contents when destroyed, rather than voiding them. -<<<<<<< HEAD -======= - refactor: Reworked `/turf/var/intact` into variables which don't conflate underfloor visibility, underfloor interactability, and overfloor presence. This fixes many bugs relating to turfs in general, especially catwalks and glass flooring. @@ -2812,19 +2064,12 @@ - bugfix: You're (hopefully) no longer able to make timed singlecaps using nitryl. I really liked this one honestly, it's got an aggressive amount of heart and soul ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Timberpoes feat. JohnFulpWillard: - config: Modified how ambiguous VALUE_MODE_FLAG keyed_list config entries are parsed and added additional config logging for when weirdness with keyed_list config entries happens in general. (Timberpoes) - config: /datum/config_entry/keyed_list/probability was unused and has been deleted. (Timberpoes) -<<<<<<< HEAD - - bugfix: 'The Cloth Golem preferences profile now works (JohnFulpWillard) qol: - The species-changing magic mirror variants now list species names instead of - internal code IDs. (JohnFulpWillard) qol: Shadowperson species should now show - as "Shadow" instead of "???" (JohnFulpWillard)' -======= - bugfix: The Cloth Golem preferences profile now works (JohnFulpWillard) - qol: The species-changing magic mirror variants now list species names instead of internal code IDs. (JohnFulpWillard) @@ -2832,15 +2077,10 @@ esainane: - imageadd: Hot Ice icons are now consistent, and now have an stack icon showing two pieces for when there are between 17 and 33 pieces in the stack. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-10-31: GoldenAlpharex: - bugfix: You can finally remember how to place down wires again! How did you even forget something so simple? -<<<<<<< HEAD - ORCACommander: - - bugfix: Hair Dye is Back on the Menu -======= Krysonism: - balance: The organic slurry is now retained inside the rat after it is dipped in welding fuel. @@ -2853,4 +2093,3 @@ - rscdel: The remnants of the Old Mining Base are gone. We've always had the crater observatory. - qol: New Icebox Terrain ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-11.yml b/html/changelogs/archive/2021-11.yml index be29cdd0a61..f6fc047203c 100644 --- a/html/changelogs/archive/2021-11.yml +++ b/html/changelogs/archive/2021-11.yml @@ -1,91 +1,4 @@ 2021-11-01: -<<<<<<< HEAD - Gandalf2k15: - - rscadd: Items in the loadout menu will now automatically be colourable if they - support it. - Gonenoculer5: - - bugfix: Fixes the Fab-O-Vend's custom vendor setting on the vendor board. - - bugfix: Fixes the Fab-O-Vend's lack of buy reply strings and tells it where to - pay out its dues to. - - bugfix: Fixes the Fab-O-Vend's vendor resupply, or lack thereof due to improper - naming. - MMMiracles: - - bugfix: CMOs on Tramstation start back in their office again - RatFromTheJungle: - - balance: rebalance's pod people healing. - SkyratBot: - - bugfix: Using leftover funding from the quarter, the Icebox CMO has bought their - staff a dinky medical records laptop. - - code_imp: added check to make sure roleban_delimiter exists on a roleban - - admin: max ban message length added - - bugfix: It is no longer possible to add reagents to containers in the BRPED. - - bugfix: Vampires and Dullahans can be enabled in the config. - - bugfix: Swapped positions of a fuel tank and rack in Delta's Auxillary Tech Storage - - bugfix: fixes a runtime when transferring advanced ids to/from wallets - - bugfix: Vampires can now no longer transform into bat form when their brain is - placed in an MMI - The Syndicate: - - rscadd: We have exported newly designed Winterized Hardsuits for frozen conditions, - beware it does not have any better protection. - jjpark-kb: - - refactor: refactored reagent item imbueing into a component - - rscadd: added a reagent buckler, collar, ring, 3 shoes, axe, hammer, handcuff - - balance: changed some values on weapons and armor - - rscdel: removed the reagent tile -2021-11-02: - ForrestWick: - - bugfix: crucial removal of something from a ruin that can cause massive problems - SkyratBot: - - rscadd: Pai Printer Module - - bugfix: admin heals no longer delete all restraints in target's inventory - tf-4: - - bugfix: Ballistic guns that are vulnerable to EMPs will no longer have a phantom - mag when EMP'd - - bugfix: m23 and m2 shotguns can now be loaded with 14 gauge ammo as intended -2021-11-03: - Guillaume Prata: - - balance: Plasmamen belt tanks volume and the rate that their lungs consume plasma - got lowered to 1/4 to stop the easy 2 hour long O2 inside a plasmamen belt tank - trick. It doesn't change how long the internals last for plasmamen. - Kryson: - - balance: Regular medical syringe guns have been replaced with syringe rifles - - imageadd: new dna/dart/medical Syringe gun sprite - RatFromTheJungle: - - bugfix: fixes the guard baton being deleted because you brought your wintercoat - to work. - Ryll/Shaps: - - rscadd: Added shaking soda cans! Take an unopened soda can and right click it - in hand to shake it all around, increasing its fizziness. - - balance: Having an unopened soda can hucked at you will actually hurt quite a - bit, around the level of a toolbox. This also has a chance of bursting the soda - can on impact, leaving it useless as a weapon after. - SkyratBot: - - balance: brain washing now cures up to lobotomy tier traumas - - rscadd: You can now disarm someone into an available open locker to close it on - them as your disarming action. - - rscadd: You can now disarm someone into an available closed locker to open the - locker behind them up. - - balance: The organic slurry is now retained inside the rat after it is dipped - in welding fuel. - - bugfix: Gas mask subtypes will no longer scare people with Greytider Phobia - - bugfix: Cellular Emporium UI has been refreshed. Remaining genetic points and - readaptation can still be seen while scrolling. - - bugfix: Centcomm engineers have finally figured out how to remove the violin from - the wall in Icebox security - - bugfix: Icebox has received a number of genturf and area related fixes - - bugfix: A spooky active turf has been removed from the abandoned plasma facility - ruins - - bugfix: The area above the gulag has been moved to the mining exploration area - to prevent venting the - - bugfix: The duplicate APC in Icebox maint has been tracked down and destroyed. - Again. - - balance: Obsessed have a low chance of stuttering and displaying shifty behavior - near their targets, instead of vomiting or passing out if on good mood. This - is to better allow verbal interactions between obsessed and obsession target, - while keeping them shifty and creepy. - - spellcheck: corrected the name of the peripherals control board being secured - on the Savannah-Ivanov -======= MMMiracles: - bugfix: CMOs on Tramstation start back in their office again Melbert: @@ -112,7 +25,6 @@ placed in an MMI 2021-11-02: Mothblocks: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Radiation is now a status effect, where you are either irradiated or not. When irradiated, you will take constant toxin damage, and irregular burn damage. Radiation is removed once all toxin damage is healed. Standing under @@ -159,7 +71,6 @@ they're already irradiated (or can't be). - balance: Breathing tritium will now irradiate you after a certain amount, as well as deal toxin damage. -<<<<<<< HEAD - code_imp: vampire drain now uses the cooldown system - rscadd: 'There''s a new traitor flavor: The Champions of Evil' - bugfix: Shapeshifting into a Human while in a vent will once again gib you. @@ -172,14 +83,12 @@ 2021-11-04: SkyratBot: - bugfix: Removes a XSS vulnerability while picking religious sect. -======= phasenoisepon: - bugfix: admin heals no longer delete all restraints in target's inventory 2021-11-04: CocaColaTastesGood: - bugfix: Removes a XSS vulnerability while picking religious sect. - bugfix: Fixes an exploit that allowed players to arbitrarily spawn any path. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-11-05: ATHATH: - bugfix: Liches (and mortals) can no longer use explosive lances to store grenade @@ -187,7 +96,6 @@ mobs, or effects. As a side effect, you should no longer accidentally trigger your explosive lance on the wrong target by misclicking on a piece of graffiti during the heat of combat. -<<<<<<< HEAD GoldenAlpharex: - bugfix: The titlescreens are now centered again. Melbert: @@ -215,7 +123,6 @@ ReinaCoder: - bugfix: Fixes the two Disco Elysium detectives suits to be non-adjustable SkyratBot: -======= AndAllThatJazz: - bugfix: Fluid ducts will no longer duplicate when unwrenched ArcaneDefence: @@ -225,13 +132,11 @@ - bugfix: Fixes an exploit that allowed players to disable holodeck safety without following the proper conditions Ghommie: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The wine cork fired when champagne is popped open is now a projectile and not a thrown item. It can ricochet on walls and will leave an harmless wine cork item when its trajectory has finished. - bugfix: This also fixes a small exploit with hand-thrown corks knocking people down, which was unintended. -<<<<<<< HEAD - server: Init profiles are now logged separately from standard ones, in init_profiler.json - bugfix: Fixed the curator PDA having some inconsistent-looking icons for slotted in IDs and pAIs. @@ -241,7 +146,6 @@ - bugfix: Radstorms dont mutate people who are immune to rads - admin: Added the color matrix editor. It is available from a dropdown option in an atom's View Variables menu as well as when editing an existing color matrix. -======= - bugfix: Fixed the curator PDA having some inconsistent-looking icons for slotted in IDs and pAIs. - bugfix: Fixed blind mobs not receiving messages for when a food item has finished @@ -285,12 +189,10 @@ KittyNoodle: - bugfix: Radstorms dont mutate people who are immune to rads Seris02: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: custom say emotes, or in other words, radio emotes. The format is for example "screams and shouts*damnit!" with any relevant radio keys, language keys and all that used as normal, for example, ";,o screams and shouts*damnit!" or you can use just the emote, ie, ";screams!*" -<<<<<<< HEAD - bugfix: Corpses will no longer cough, spit, or choke on blood when you hit them in the chest really hard SpaceVampire: @@ -337,7 +239,6 @@ too fast. - imageadd: Added fallback icons for clothing inhands - server: Patches multiple(?) arbitrary file related vulnerabilities -======= TheBonded: - bugfix: Corpses will no longer cough, spit, or choke on blood when you hit them in the chest really hard @@ -353,14 +254,12 @@ - bugfix: Cold seiver now quickly heals your radiation instead of quickly killing you Ghommie: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed the emissive appearances (basically what you can see even in complete darkness) and possibly other overlays of vending machines being removed when the wire panel is opened/closed. - bugfix: Fixed the random double bed sheets spawners spawning normal bedsheets. - bugfix: Fixed double bed sheets other than the standard white one looking like single bed sheets when dyed. -<<<<<<< HEAD YakumoChen: - bugfix: Trash Piles can spawn in place of Maint Crates once again. dawsonkeyes: @@ -373,7 +272,6 @@ - rscadd: adds in the Hardlight Salve Medicell, please read https://github.com/Skyrat-SS13/Skyrat-tg/pull/9268 for more details. 2021-11-08: -======= GoldenAlpharex, with some oversight from Timberpoes: - bugfix: Maps will now correctly be loaded at the start of a round. Hurray! - code_imp: Improved the code for loading map configs and made it more documented, @@ -388,7 +286,6 @@ - rscadd: unit test for map load - rscadd: directory param to map load + whitelist for data and _maps - rscadd: advertising for mojave sun in tg commit logs ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nyksia: - bugfix: aliens can no longer clear eggs before the hugger bursts out Ryll/Shaps: @@ -397,31 +294,6 @@ and can no longer cause outright compound fractures in healthy targets. - bugfix: Throwing someone you have in a neckgrab or are choking will now properly throw them harder than normal. -<<<<<<< HEAD - Seris02: - - rscadd: Glow in the dark markings/bodyparts/eyes - SkyratBot: - - bugfix: CentCom's suit using an old icon, and fixed the gas mask and helmet's - icon not showing - - bugfix: Bits of space near the station are no longer randomly powered by unconnected - areas. Outlet Injectors used for sending gas to space have been replaced with - Passive Vents. - - bugfix: The waste air from Virology on Tramstation will now be removed. Previously, - the turf that the outlet injector was on was unpowered. - - spellcheck: Fixed a typo on the singulo toy. - - bugfix: anonymous names doesn't break anymore! it works! hip hip hooray! - - bugfix: Items with dash actions and the Bluespace Prophecy trauma now utilise - proper teleportation code, disallowing teleportation to and from teleport restricted - areas. - - rscadd: unit test for map load - - rscadd: directory param to map load + whitelist for data and _maps - - rscadd: advertising for mojave sun in tg commit logs - YakumoChen: - - bugfix: Nanotrasen has updated medical records upon finding out that it was still - tracking those incompatible with illegal cloning technology, which is banned - sector-wide. Such records have been expunged. -2021-11-09: -======= Timberpoes: - bugfix: Items with dash actions and the Bluespace Prophecy trauma now utilise proper teleportation code, disallowing teleportation to and from teleport restricted @@ -444,22 +316,11 @@ should no longer from time to time require reagents that are normally TOO hard (emphasis on TOO) to get or unobtainable by non-antag players (e.g. most mutation toxins, syndie stims, godblood, spores) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: Fixed certain preferences being reset to their default values when trying to change them, due to the dropdown menu of options changing numbers into text and due to that not being supported by numeric preferences. AKA, changing pixel scaling method will work again. -<<<<<<< HEAD - Melbert: - - bugfix: Chaplains can no longer select admin only null rods. - PositiveEntropy, Naevii: - - imageadd: Ports BeeStation cloak designs! - RatFromTheJungle: - - balance: rebalances teshari incomming damage to 20-25% vs the previous of 50%, - and gives them a single point more of punch damage so they quit magically rolling - 0, don't ask, I also don't know why. -======= JohnFulpWillard: - refactor: Bot emagging has been refactored, and as such, their cover can be closed if forced open by emag if the bot itself hasn't been emagged. @@ -473,118 +334,12 @@ alts between two people so that they don't show in suspicious connection history. PositiveEntropy, Naevii: - imageadd: Ports BeeStation cloak designs! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - rscadd: Yawns can now propagate and cause other nearby mobs who see it to yawn as well. ShizCalev: - bugfix: Radioactive microlasers will no longer irradiate humans wearing radiation proof clothing. -<<<<<<< HEAD - SkyratBot: - - imageadd: Turret Control frames now have a dedicated icon, rather than literally - using the APC image. - - bugfix: Randomized reagent recipes (so far only metalgen and the secret sauce) - should no longer from time to time require reagents that are normally TOO hard - (emphasis on TOO) to get or unobtainable by non-antag players (e.g. most mutation - toxins, syndie stims, godblood, spores) - coldud13: - - bugfix: floating lights and radios at arrivals on delta have been cleaned up - nikothedude: - - rscadd: Adds a fancy new menu for antags to view exploitables from! OOC>View crew - exploitables - - bugfix: Fixes the functionality of records. All previous methods of using records - work now. - - refactor: Record loading and saving is now handled in flavor_text.dm. admin_remove - now uses owner.remove_antag_datum(src) instead of on_remove() to remove antag - datums. -2021-11-10: - Guillaume Prata: - - bugfix: A small mistake on our contract with Nakamura Engineering made them supply - the station with Rad Insulated Atmos Hardsuits. The mistake was fixed so please - don't stand near the SM or the HFR with the hardsuit, it was never made for - that. - - bugfix: You can't put a PKA inside your Mining hardsuit helmet anymore but you - can put it in your hardsuit instead! - Iamgoofball: - - balance: Batons now knockdown again. - Melbert: - - admin: Admins can now tell when other admins are readied up in the pre-game lobby. - Check adminwho or view your stat panel. - Seris02: - - rscadd: adds thieving gloves - SkyratBot: - - bugfix: Virology's PanD.E.M.I.C 2200 should no longer bluescreen - - refactor: The Pandemic machine has been refreshed and is more helpful, intuitive - to use. - - bugfix: You now drop food trash items on use, putting the actual "Trash" in the - same hand you used the item in. - - admin: Silicon activity is now logged in silicon logs rather than being stuffed - into game.log - - admin: Bans will nolonger play a video - - bugfix: Fixed the response signal not being able to be connected to regular signals. - - admin: Adds a panel for "known alts", which let you write down confirmed, valid - alts between two people so that they don't show in suspicious connection history. - - bugfix: Fixed shoving being agressively weird, please report any oddities it's - a bit of a headache getting behavior to match and I'm flying a bit blind - - refactor: Bot emagging has been refactored, and as such, their cover can be closed - if forced open by emag if the bot itself hasn't been emagged. - - bugfix: Sergeant-At-Armsky can now be found in Delta's Armory! - - bugfix: 'Fixed missing award icons in the achievement menu sprite: All achievements - outside the misc category have been given their own icons and should no longer - use the base background one.' - - admin: Admin circuits are now abstract so that they don't appear in lockers when - attached to custom shells and such. - - bugfix: Fixes a grave oversight of being able to type with boxing gloves on. - - bugfix: Fixed Havana cigars running out of nicotine. As a result of increasing - the starting nicotine amount, the total `chem_volume` was increased to allow - room for other chems to still be injected. - Wallem: - - bugfix: Makes ants incapable of affecting the afterlife. - - bugfix: Ants, gibs, and garbage cleanable decals now properly show up above pipes. -2021-11-11: - ATHATH: - - bugfix: The gluttony sin ruin is no longer radioactive. - - bugfix: Quantum pads can teleport non-living things again. - - bugfix: Quantum pads can teleport creatures who aren't buckled to something again. - Creatures who are buckled to something unanchored can still be teleported by - quantum pads, but creatures who are buckled to something anchored cannot. - - bugfix: Quantum pads can no longer involuntarily teleport ghosts, although ghosts - can still click on a quantum pad to teleport to that quantum pad's destination - pad. - ArdentSpark: - - bugfix: Readding missing loadout items, and removing items from non-donator access - as it was previously - - bugfix: Adds Red Victorian Dress, Black Victorian Dress and Polychromic Sweater. - - bugfix: Migrates Poppy, Lily, Geranium, Rose, Sunflower, Harebell and Rainbow - Bunch to donator only once more, reducing the admin spam. - GoldenAlpharex: - - bugfix: Cat-people that were meant to land on their feet, will now land on their - feet. - Guillaume Prata: - - balance: Pneumatic airlocks seals are normal sized now and can be printed at the - Science lathe. - - balance: After dealing with another weekly subverted Engborg spacing the armory. - CentCom's Robotics division decided to downgrade the Engborg RCD by removing - it's Reinforced Wall deconstruction. - - balance: Due to budget cuts, the RPDs can't place transit tube under dense objects - like windows anymore. - Nanotrasen Threading department: - - imageadd: Departmental Vox guards can now wear their fancy coats! - SkyratBot: - - bugfix: Fixed non-human and non-silicon mobs being unable to mine rock walls when - bumping into them. - - bugfix: The "Choking (No N2O)" alert now functions correctly. - - bugfix: fixes the fall chance on mending globules to properly work as intended. - - imageadd: The irradiated status effect has a new alert sprite. - - refactor: 'Refactor parts of the job assignment system, unifying job eligibility - checks. qol: Adds improved logging for job assignment.' - - bugfix: fixed chem analyzer not showing impure reagents that don't have impure - chem (like multiver) - - bugfix: Cyborgs can now shake up compromised carbons with the hugging module. - - rscadd: Added antivirus-protection to plasmaman suits and all its variants(the - entire set). -======= V2LenKagamine: - bugfix: You now drop food trash items on use, putting the actual "Trash" in the same hand you used the item in. @@ -592,7 +347,6 @@ - admin: Admin circuits are now abstract so that they don't appear in lockers when attached to custom shells and such. esainane: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Wall mounted and directional objects have undergone major internal simplification. Please report anything unusual! - bugfix: You can no longer stack an indefinite amount of Intercoms on the same @@ -607,7 +361,6 @@ - bugfix: The pixel offsets of Intercoms, Fire Alarms, Fire Extinguisher Cabinets, Flashers, and Newscasters have been made consistent between roundstart and constructed instances. -<<<<<<< HEAD - bugfix: 'Constructed Turret Controls will no longer oddly overhang the wall they were placed on. qol: Defibrillator mounts now better indicate which side of the wall they are on.' @@ -685,7 +438,6 @@ Ebin-Halcyon: - bugfix: Interdyne and DS-2 air alarms/fire alarms are properly oriented, defibrilators are returned to their mounts -======= - bugfix: Constructed Turret Controls will no longer oddly overhang the wall they were placed on. - qol: Defibrillator mounts now better indicate which side of the wall they are @@ -929,7 +681,6 @@ - bugfix: You can now lose against elite mining mobs even if you can't die (cough cough Memento Mori) if you're over the minus 200 health threshold. Be careful not to bite the dust. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ghommie (Thanks to dorsisdwarf for the idea): - balance: The detomatix cart now sends forged messages (name and job of the message can also be forged) that can explode a PDA when someone tries to reply to them @@ -937,7 +688,6 @@ instead of detonating the PDA right off the bat. Because of this and the possibility that a portion of these messages goes "unreplied", the TC cost of the item has also been reduced to 4 and the number of charges upped to 6. -<<<<<<< HEAD GoldenAlpharex: - bugfix: Mentors will now no longer get de-mentored by default. ORCACommander: @@ -1000,7 +750,6 @@ SkyratBot: - bugfix: cargo consoles aren't breaking when department orders buys a canister. seriously though who buys canisters man -======= Mothblocks: - bugfix: Team antag HUDs will now properly display when they should, and won't display when they shouldn't. @@ -1029,40 +778,10 @@ - balance: Wings now allow falling short distances without taking damage (you will still suffer from knockdown) RandomGamer123: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixes the HFR (and other indestructible machinery with component parts) from being able to be blown up by external sources under special conditions. - bugfix: Fixes the nuke disk from being able to be made inaccessible by being placed in the center of the HFR. -<<<<<<< HEAD - - balance: Gives Space Pirates a bonus to hijack speed on the shuttle, and allows - them to hijack. - - bugfix: Fixed the foreach and filter circuit component not functioning correctly. - - balance: Double beds and double bedsheets, being double the size of normal beds - and bedsheets, just like their names suggest, now also cost double the materials - to craft and give double the materials when deconstructed. - itseasytosee: - - imageadd: added a sprite for the sectile when worn on your belt. -2021-11-17: - ArdentSpark: - - code_imp: Renamed Monophobia, Mute and Joker variables for code readability, as - well as correctly placing Mute with the rest of the negative traits. - Gandalf2k15: - - server: MODULARISATION AUDIT 15/11/21 - GoldenAlpharex: - - code_imp: Improved the comfy chair's armrest code. - Iajret: - - bugfix: That one broken filter in SM Engine room now should work flawlessly on - all maps - ORCACommander: - - bugfix: Nanotrassen has issued repalcement installation manuals to its security - camera contractors. - SkyratBot: - - rscadd: Added two new fish to the aquarium - - rscadd: Added /datum/design/component/list_assoc_literal - - bugfix: Pure Inacusiate is now humanly possible to create - - bugfix: Truly pure Multiver is much easier to achieve now -======= Thunder12345: - bugfix: Atheists will no longer mistakenly attempt to get closer to a god they do not believe in when committing suicide with their fedora @@ -1091,12 +810,10 @@ - bugfix: Pure Inacusiate is now humanly possible to create - bugfix: Truly pure Multiver is much easier to achieve now Paxilmaniac: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: the marine ert is no longer as vulnerable to atmospheric problems as before - imageadd: a new centcom themed combat uniform - imageadd: objectively better looking marine armor -<<<<<<< HEAD - bugfix: Atheists will no longer mistakenly attempt to get closer to a god they do not believe in when committing suicide with their fedora - bugfix: Special air alarms (syndicate, ruins, unlocked, engine, etc) should now @@ -1117,7 +834,6 @@ - code_imp: many spans to procs - bugfix: Departmental order consoles are now present on station 2021-11-28: -======= RaveRadbury: - qol: You can now load plates onto trays UnokiAs: @@ -1165,27 +881,10 @@ - bugfix: fixes an oversight where mime and clown couldn't use their own department orders console 2021-11-19: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ATHATH: - bugfix: Hulk punches now count as unarmed attacks for the purposes of blocking. - bugfix: Martial arts that grant their users the ability to block unarmed and melee attacks while they're in throw mode can now block hulk punches. -<<<<<<< HEAD - Archemagus (aka Laxesh): - - bugfix: Now floorbot, will try to fix floors, not only when emagged. - ArdentSpark: - - bugfix: 'Fixes engineering guard uniform: item sprite (No more ERROR)' - - bugfix: 'Fixes an economy exploit, moves Medibeam gun to cargo category: Miscellaneous' - - rscadd: Added Fragile quirk, which increases incoming brute by 1.25x and burn - by 1.2x - - bugfix: Restores Teshari Suit (Outerwear) and Hardsuit sprites. No more soft blood-red-hardsuits, - or coats covering your face. - AtoriBirb: - - rscadd: 7 sweaters already in the game to the under loadout datum - AyyRobotics(Original PR), AzlanonPC(Sprites), Aspev(SafetyMoth): - - rscadd: Added Safety Mothposters! - - imageadd: Updated contraband.dmi to add new poster icons. -======= Archanial: - bugfix: fixed stealthadmin nicknames should load now Farquaar: @@ -1402,12 +1101,10 @@ "\u041F\u0435\u043B\u044C\u043C\u0435\u0448\u043A\u0430": - bugfix: You could see parallax over blackness 2021-11-26: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 BastardBlaster: - bugfix: Cyborgs and those with rad immunity will no longer get the radiation burn message when near something being dusted by the supermatter. - spellcheck: Rewrote some messages when near something that was dusted by the SM -<<<<<<< HEAD Cobalt, Ramirez, Flavrius: - rscadd: A new ERT type, the NRI. Gandalf2k15: @@ -1518,14 +1215,12 @@ - code_imp: space heater now process on process_atmos() - bugfix: fixed stealthadmin nicknames should load now - bugfix: department order consoles include circuitboards -======= KathyRyals: - balance: Heretics no longer gib their target when sacrificing them, instead outright killing them and spilling all their organs everywhere in a gruesome manner. Melbert: - bugfix: Spading plants correctly updates the tray icon again Mothblocks: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added back dissection surgery, which can be used with an operating computer to perform experiments for research. - rscadd: Biological technology's requirement has been changed from scanning one @@ -1534,7 +1229,6 @@ extracts to performing a dissection surgery on a nonhuman. - rscadd: Xeno-organ biology and Alien Biological Tools' now have additional discounts for performing a dissection surgery on a xenomorph. -<<<<<<< HEAD - bugfix: Some things such as heretic influences won't spawn on open space anymore. - rscadd: Wooden pews now require a wrench in hand to be rotated - admin: The admin who adds a known alt is now logged in the table. @@ -1750,7 +1444,6 @@ zydras: - balance: Quartermaster now requires 40hr of Supply playtime, like every other Department Head requiring 40h of their department's. -======= PositiveEntropy: - imageadd: In no short effort of our best tailors, every Central Command outfit have been either redesigned or reshaded! All of them! @@ -1829,7 +1522,6 @@ tralezab: - rscadd: Malfunctioning Ais now roll for backstory, much like traitors! - expansion: Malfunctioning Ais now get a unique antag panel! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-11-30: GoldenAlpharex: - bugfix: Elevators are no longer defying the laws of physics and therefore can @@ -1839,7 +1531,6 @@ to prevent more physics-defying operations. - code_imp: Improved the industrial lift code by adding documentation and trying to enforce the coding standards in there while I was at it. -<<<<<<< HEAD MMMiracles: - bugfix: The Tramstation Tram no longer force unbuckles you from chairs/vehicles when moving. @@ -1849,11 +1540,9 @@ - bugfix: Some erroneous green paint has been scraped off the hydroponics airlocks. - imageadd: The blast cannon & blast wave projectile has new sprites. - bugfix: The camera circuit will now actually work. -======= Krysonism: - imageadd: The blast cannon & blast wave projectile has new sprites. Melbert: - rscadd: Deltastation - Service and arrivals complete revamp! Cargo tweaks! Thunder12345: - bugfix: Some erroneous green paint has been scraped off the hydroponics airlocks. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2021-12.yml b/html/changelogs/archive/2021-12.yml index 8d5c6a78f77..a02076e36e3 100644 --- a/html/changelogs/archive/2021-12.yml +++ b/html/changelogs/archive/2021-12.yml @@ -1,8 +1,6 @@ 2021-12-01: -<<<<<<< HEAD SkyratBot: - imageadd: Resprited the lipsticks -======= FernandoJ8: - imageadd: Resprited the lipsticks Fikou: @@ -15,24 +13,19 @@ Sealed101: - expansion: Added ventriloquism to disembodied heads. jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: pAI interfaces have been converted to TGUI. - refactor: Requesting a holographic pAI friend now correctly notifies ghosts of your loneliness. - rscadd: pAI door jacks have been given a bit more UI feedback. - rscdel: Requesting and downloading a pAI no longer uses two separate screens. -<<<<<<< HEAD - bugfix: Fixed nuke ops leader not having an antag HUD to other nuke ops. - bugfix: Baseball bats now correctly knockback targets in the direction of the bat to the target. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tastyfish: - bugfix: Cleanbots no longer disappear. - bugfix: Fixed edgecase causing PDA Skill Tracker to hard lock the PDA as your reward for getting legendary level. 2021-12-02: -<<<<<<< HEAD Ebin-Halcyon: - imageadd: Winter Hardsuit EVA sprite changes - bugfix: Winter Hardsuit tails now color themselves correctly @@ -63,7 +56,6 @@ - bugfix: Fix telecomms relays to work across multi-z - bugfix: Fixes an exploit with regenerative mesh and burn wounds. - code_imp: increased atmos performances a bit more -======= Aerden: - bugfix: Fixed being scared of the dark even if you have mesons. Ghilker: @@ -101,7 +93,6 @@ - qol: Catwalk Tiles now have unique names, so hovering over them in the radial menu will tell you the type! They're also recyclable now! Pickle-Coding: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Proto nitrate BZ reaction will now produce gases, instead of just deleting BZ. The gases it produces is nitrogen, helium, and plasma. - balance: Tritium combustion and proto nitrate tritium response will release radiation @@ -116,7 +107,6 @@ - balance: Proto nitrate BZ response hallucination and gas production now occur at the same time, instead of hallucinations only appearing below 30 moles and gas production + radiation (previously it just deleted BZ) above 30 moles. -<<<<<<< HEAD - bugfix: tanks being destroyed in cans/pumps/scrubbers wont cause errors now - bugfix: ED-209s can be constructed once more! - bugfix: The ship-in-a-bottle is now resistant to icebox/snowdin plasma rivers. @@ -133,7 +123,6 @@ - bugfix: The lathe in Deltastation's service hall can print circuit boards again. Reco201: - bugfix: Cyborg pka can now be seen again. -======= SuperNovaa41: - bugfix: Fixes an exploit with regenerative mesh and burn wounds. Tastyfish: @@ -161,13 +150,11 @@ sacced. It'll reroll a new target if that happens. Melbert: - bugfix: The lathe in Deltastation's service hall can print circuit boards again. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - admin: Simplified the "Transformation/Rudimentary Transformation" part of the admin player panel, you can now choose from ghost/human/monkey/cyborg/AI, and all options work whether the target is currently a human/other living mob/ghost. Seris02: -<<<<<<< HEAD - bugfix: mediborgs now have proper pixel placement - bugfix: borgs no longer have pixel shifting issues, specifically dogborgs - bugfix: silicons now show laws on examine @@ -197,7 +184,6 @@ - rscadd: Microfusion cell tech tree. - balance: Reload times now take an amount of time. - rscdel: Removed proprietary temporary hardlight guns. -======= - qol: made hair gradient color preferences not show up if no gradient is selected axietheaxolotl: - rscadd: Pride Pins @@ -215,12 +201,10 @@ - bugfix: fix an oversight where sec hailer shouldn't have the tint changes, the eye protection and the pepper immunity. All other sec masks (the swat and spacepol) are unchanged ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: Nanotrasen's Paranormal Containment team had some budget cuts, meaning that ghosts are no longer stripped of their hair colors- You can finally sport that bright pink floor bedhead even in death once again! -<<<<<<< HEAD - spellcheck: Fixes a spelling mistake in the feedback for fishing something. - spellcheck: Renamed to fishing master skillchip to something cooler and more in line with the skillchip naming theme. @@ -271,7 +255,6 @@ - admin: Ambitions now count towards tickets handled - balance: Captain and NT Rep gunsets have been removed in favour of energy guns. - rscdel: References to players removed from cargo freighter space ruin -======= HarseTheef: - bugfix: Forged agent id cards will no longer break wallets JohnFulpWillard: @@ -311,12 +294,10 @@ TheBonded: - rscadd: You can now tan wet hide into leather by lighting it on fire or placing it on a bonfire grill. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2021-12-06: GoldenAlpharex: - bugfix: Meat and pizza walls and floors should no longer cause a runtime every time they're built. -<<<<<<< HEAD - bugfix: You can no longer have an ID declare you as underage thanks to your good buddy the Head of Personnel. Melbert: @@ -341,7 +322,6 @@ - bugfix: The undercharger now actually functions as intended, removing recoil when on, and adding it when off. - balance: Phase emitters increase by 500 C per level instead of 1000 C. -======= Melbert: - bugfix: Chefs on Deltastation can now tussle in their Cafeteria. Paxilmaniac: @@ -365,13 +345,11 @@ Ghommie: - bugfix: Fixed the strip menu not being warded against telekinesis shenanigeans (No item was stripped from longer distances, but warnings were still sent). ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - imageadd: NanoTrasen's Bench Tailoring department has worked hard on fixing an error in their factory line that resulted in every bench cover being darker than it was supposed to be, bringing them back to what they were supposed to look like! -<<<<<<< HEAD SkyratBot: - bugfix: Screwdrivers can now be inserted into the destructive analyzer through left-click @@ -421,7 +399,6 @@ They will be on by default. - rscadd: IV drips now cause a moderate pierce wound when ripped out - bugfix: You will once again see events that required a playercount to run. -======= Pickle-Coding: - spellcheck: Mime finger gun description now states that it mutes your target instead of stunning. @@ -457,12 +434,10 @@ - qol: Leaders are now distributed evenly among the Families. - qol: As a result, the Families rulesets now only require 3 people to start, instead of 9. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: You can no longer become a Family Leader as a restricted role, such as a Head of Security. - admin: Admins can now promote people to Family Leader with a button from the traitor panel. -<<<<<<< HEAD tf-4: - bugfix: A charging microfusion gun will no longer runtime on examine - bugfix: Removed multiple lattices from the same spot on Blueshift @@ -475,7 +450,6 @@ SkyratBot: - bugfix: Fixed the strip menu not being warded against telekinesis shenanigeans (No item was stripped from longer distances, but warnings were still sent). -======= JohnFulpWillard: - bugfix: Magic mirrors will now allow you to swap species again. Mothblocks: @@ -533,7 +507,6 @@ twilightwanderer: - bugfix: Hints in bureaucracy forms vincentiusvin: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Plasma material objects that didn't spawn plasma gas when ignited due to weird code reasons will now do just that. - bugfix: Fixed plasma material objects exploding when used with condenser. @@ -541,7 +514,6 @@ - bugfix: You can no longer duplicate rods with rough false walls. - code_imp: Due to code structural changes the mole amount from welding plasma related objects may get buffed or nerfed. Mostly buffed. -<<<<<<< HEAD - bugfix: Hints in bureaucracy forms - rscadd: You can now become patron of your favorite painting by buying sponsorship from Nanotrasen Trust Foundation. @@ -573,12 +545,10 @@ SkyratBot: - bugfix: Closing the confirmation alert from headcrabs will no longer continue to headcrab you. -======= 2021-12-11: CandleJaxx: - bugfix: edited runechat layers for clarity and consistency with old PRs EOBGames: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'The release of the new cookbook, "Mothic Cuisine: of Fleet and Flotilla" has brought Mothic food to the masses! Try out some new treats, like cheesecake balls, cheese soup, and five-cheese pizza at the kitchen today! There might @@ -587,7 +557,6 @@ \ stocks seeds for T\xF6chta\xFCse Berries, a common ingredient in moth cooking,\ \ in the Megaseed vendors. Additionally, herbs and bell peppers have also made\ \ their way to the station's stock. Botanists, you know what to do." -<<<<<<< HEAD - bugfix: F2 works for quick screenshotting again. - bugfix: Deconstructing an active AI shell will no longer ghost the AI inhabiting it. @@ -718,7 +687,6 @@ SkyratBot: - bugfix: CentCom has finally begun shipping helmets with working flashlight mounts to Deltastation's armory. -======= Jackraxxus: - bugfix: Deconstructing an active AI shell will no longer ghost the AI inhabiting it. @@ -837,14 +805,12 @@ SuperNovaa41: - bugfix: Fixes the security warrant computer runtiming if you have no ID. jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: TGUI text input will now let you submit default values without rewriting the input - bugfix: TGUI text and number input will now accept pressing ENTER anywhere on the window (assuming the input is valid) - refactor: Many more inputs have been converted to TGUI - PDA messaging, GPS tags, cult runes, roulette machines, custom vendors, more. -<<<<<<< HEAD - bugfix: Fixes the security warrant computer runtiming if you have no ID. - bugfix: fixed rough iron false wall telling you that you need two rods instead of five. @@ -888,7 +854,6 @@ - bugfix: Fixed gas flowing into windows from above, I am.... so tired - bugfix: Fixes gas sometimes not moving up from below after a structure change, see above -======= vincentiusvin: - bugfix: fixed rough iron false wall telling you that you need two rods instead of five. @@ -911,12 +876,10 @@ - spellcheck: Fixed a small typo in Cargo's mail console, saying mail had homing beacons in them. LemonInTheDark: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixes shoving people into lockers sometimes trapping them in lockerspace. Crummy vacation destination, don't go there. - bugfix: Fixes directional shoving just not working - bugfix: Fixes shoving people carrying other people being weird -<<<<<<< HEAD Tokorizo: - rscadd: Vox sprites - bugfix: Syndicate infiltrator armor now works for Vox, new sprites have been added. @@ -964,7 +927,6 @@ - balance: Changes how TK is identified. - code_imp: Swaps which particles the TK movement points to. SkyratBot: -======= Melbert: - bugfix: Placing tiny fans in the aux base gives feedback - bugfix: Breaking / deconstructing aux base turrets no longer brick the console @@ -1019,12 +981,10 @@ JohnFulpWillard: - bugfix: Headrevs only get a revolutionary banner if they actually win. Krysonism: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Cows, roaches and their subtypes can be sentienced and mind transfer potioned again. - refactor: refactored syndicate sentience potion and abductor all access gland to use the new simple_access component. -<<<<<<< HEAD - bugfix: Headrevs only get a revolutionary banner if they actually win. - bugfix: fixed energy axe sprites's clipping issues and incorrect facing directions Zonespace27: @@ -1037,7 +997,6 @@ the server, to stop all those nasty runtimes on test servers. - config: SSDecay is now turned off by default in the config, to save about 4~ish seconds of loading time on test servers. -======= Melbert: - bugfix: Removed a floating teleport beacon in Icebox's chapel - bugfix: Fixed APC visibilty in icebox science outpost / RD office @@ -1060,7 +1019,6 @@ RandomGamer123: - bugfix: Inverse reagents are now properly consumed when being transferred into a living body (eg. through syringes). ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - admin: Added Datum Tagging, a new admin tool for quickly marking and referring back to various datums and atoms. You can tag atoms by ctrl+middle clicking @@ -1070,24 +1028,20 @@ View-Tags button at the bottom of the Admin -> Game status panel section. - admin: Tagged datums can also be referenced for things like proccalls and VV var edits, similarly to Marked objects. -<<<<<<< HEAD SkyratBot: - bugfix: You can no longer shove megafauna that you can't normally push. - bugfix: Adds seeds to vending machines as intended. Corrects pathway for lasagne. Fixes issue with Bell peppers and baking cheese. -======= Watermelon914: - bugfix: You can no longer shove megafauna that you can't normally push. carshalash: - bugfix: Adds seeds to vending machines as intended. Corrects pathway for lasagne. Fixes issue with Bell peppers and baking cheese. san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The Nanotrasen News Network has updated their news tickers for when a station horrifically blows up to be more accommodating towards the person directly responsible for making sure it didn't horrifically blow up. 2021-12-23: -<<<<<<< HEAD Melbert: - bugfix: Removed a floating teleport beacon in Icebox's chapel - bugfix: Fixed APC visibilty in icebox science outpost / RD office @@ -1212,7 +1166,6 @@ AtoriBirb: - imageadd: added new hair sprite to our modular hair.dmi GoldenAlpharex, sprites from WalterJe: -======= JohnFulpWillard: - bugfix: Balloon alerts when picking up staffs as a non wizard now properly appears over the player's head. @@ -1241,13 +1194,11 @@ GoldenAlpharex, sprites from WalterJe: - qol: Conveyors will now also convey how to interact with them with tools upon being examined. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - imageadd: Updated the sprites of the conveyor belts and the conveyor switches, ported and adapted from Tau Ceti! - refactor: Brought up to today's standards conveyor codes, alongside properly documenting it. Also changed how conveyor corners are handled to make them both more intuitive for mappers and for people in-game. -<<<<<<< HEAD Iamgoofball: - balance: You can no longer expand non-32x32 cyborg sprites. - rscdel: Removes the Cyborg Shrinker from the techweb. @@ -1275,7 +1226,6 @@ deal. Fikou, theOOZ: - imageadd: adds a new janiborg sprite! -======= ReinaCoder: - bugfix: Fixes Tramstation Vacant Commissary not having shutters - bugfix: Engineers now have access to the SM's External Airlock on Tramstation @@ -1292,7 +1242,6 @@ - bugfix: Changed the font of some messages to better reflect if they were errors, notices. 2021-12-25: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ? 'Fikou; Sprites: PositiveEntropy, Azlan, Infrared_Baron, Thunder12345, Yeeye; Code: Waltermeldron, Goof, Armhulen, ArcaneMusic, DatBoiTim; Descriptions: Nerevar' : - rscadd: Adds Modular Suits. Printable at robotics. @@ -1305,7 +1254,6 @@ As part of this, space wind pushing you is handled by gravity negation, not noslips. - balance: Hardsuits no longer defend from tackles, but negating gravity does. -<<<<<<< HEAD - code_imp: 'Adds support for digitigrade compatible shoes. qol: Piercing syringes now pierce when used from hand, not just as projectile.' - code_imp: Removes the unused outside of admin shenanigans cult hardsuit requirement @@ -1325,7 +1273,6 @@ HIDEHAIR. This will let sprites with earholes actually fit ears thru them, but not show the hair instead SkyratBot: -======= - code_imp: Adds support for digitigrade compatible shoes. - qol: Piercing syringes now pierce when used from hand, not just as projectile. - code_imp: Removes the unused outside of admin shenanigans cult hardsuit requirement @@ -1352,12 +1299,10 @@ panel. 2021-12-26: CRITAWAKETS: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - imageadd: The Spider Clan has issued a recall of all it's katanas, replacing them with new ones that are differently styled. Something about the old ones being literally impossible to find in bright conditions. Or maybe they just didnt like how it looked so they changed its "sprite". -<<<<<<< HEAD - imageadd: Resprites the sec grenade launcher - bugfix: Disarming a heavily incapacitated person with krav maga will no longer make them recoil in pain. @@ -1370,7 +1315,6 @@ - bugfix: plopped an xmas tree in tramsation's chapel - bugfix: dogs will no longer forget to unbuckle themselves when fetching items thrown nearby -======= Cheshify: - imageadd: The PanD.E.M.I.C 2200 is now visually different than the ChemMaster Fikou, theOOZ: @@ -1392,13 +1336,11 @@ axietheaxolotl: - imageadd: Resprited the Tactical Turtleneck Suit jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Double click and enter on tgui input lists no longer clears selection. - bugfix: 'Functionality restored: typing while not selecting the search bar will refocus. You can also quick search by typing while the search bar is hidden.' - refactor: Support for current value selections has been added to tgui input lists - lists now work for suit sensors, etc. -<<<<<<< HEAD jjpark-kb: - soundadd: added a started/stopped typing sound for tts device softcerv: @@ -1414,7 +1356,6 @@ work correctly. - bugfix: Ghost role spawners can now use your character. SkyratBot: -======= tf-4: - bugfix: Disarming a heavily incapacitated person with krav maga will no longer make them recoil in pain. @@ -1443,14 +1384,12 @@ timothymtorres: - bugfix: Fix all types of grenades to be deleted when shot bullets. tralezab: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Some code improvements and proper use of department datums by independent nation creation - refactor: Some wonderful cleanup of separatist code, if you notice minor differences it's because of that. - admin: The nations ruleset is back(?) and disabled for admins to run fi they so desire -<<<<<<< HEAD - bugfix: Makes all cyborg storage items drop their contents on module change. - bugfix: Fix all types of grenades to be deleted when shot bullets. - bugfix: Sechailer no longer has FOV. @@ -1541,10 +1480,8 @@ - bugfix: Dirt piles can no longer exceed their maximum reagent capacity by 10. Sorry prison botanists. SkyratBot: -======= 2021-12-28: Fikou: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: the mod installer from charliestation no longer has infinite uses - bugfix: fixes broken sprites on prototype suit - bugfix: fixes intellicards not updating @@ -1554,7 +1491,6 @@ the pathfinder - bugfix: fixes modsuits deleting everything inside when they explode - bugfix: fixes ais in modsuits not being able to use abilities -<<<<<<< HEAD - bugfix: 'fixes the tether not being able to hook onto catwalks/lattices qol: ais in modsuits now make the user stand up instead of weirdly crawling qol: a modsuit being destroyed with an ai inside now pops it out as a small card you can recover @@ -1603,7 +1539,6 @@ fuel. Removing fuel with a crowbar also doesn't smack the launcher when done. - bugfix: Fixes a hard-del with the exo-drone launcher. SkyratBot: -======= - bugfix: fixes the tether not being able to hook onto catwalks/lattices - qol: ais in modsuits now make the user stand up instead of weirdly crawling - qol: a modsuit being destroyed with an ai inside now pops it out as a small card @@ -1641,13 +1576,11 @@ - bugfix: accessories on clothes placed inside garment bags will no longer delete themselves. Kylerace: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'NanoTrasen fixed a problem with their orion trail arcade machines relaying security and medical comms to the most dangerous demographic: gamers. NanoTrasen assures you that this security exploit will never happen again.' - bugfix: you cant make radios play comms with a broken speaker by setting their frequency anymore. -<<<<<<< HEAD - bugfix: Spidercharges can now only be blown up in their intended location. - bugfix: Non-suicided brains put into suicided bodies will no longer be marked as suicided. Consequentially, said suicided bodies can be used for brain transplants. @@ -1658,7 +1591,6 @@ space-like. tastyfish: - spellcheck: Fixed augmented lung messages. -======= Melbert: - bugfix: Hulk is removed more consistently when the user actually enters soft crit. - bugfix: Exo-drone fuel pellets delete when empty. @@ -1693,4 +1625,3 @@ - bugfix: Fix mapping icons for catwalks to display correct icon state - refactor: Refactor turf transparency to be more robust. - refactor: Refactor catwalks to be elegant code. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-01.yml b/html/changelogs/archive/2022-01.yml index 3c0858fd588..fb2f9675fce 100644 --- a/html/changelogs/archive/2022-01.yml +++ b/html/changelogs/archive/2022-01.yml @@ -1,5 +1,4 @@ 2022-01-01: -<<<<<<< HEAD ErdinyoBarboza: - bugfix: Model 23-37 and M2 Auto are now 12 gauge again. Also fixes the descriptions of the Armory Shotguns @@ -29,7 +28,6 @@ - balance: All Shotguns in the armory are now Riot Shotguns that load normal shotgun shells. - balance: The armory shotgun ammunition storage now contains normal shotgun shells. -======= SmArtKar: - bugfix: MODsuits no longer runtime when EMPed with no module selected SuperNovaa41: @@ -59,7 +57,6 @@ JohnFulpWillard: - bugfix: Things on fire moving over a bonfire will now ignite its flame - bugfix: All of service can now access the Service cargo console. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles: - rscadd: Tramstation has gotten an extension, both in size and layout. - rscadd: Tramstation's medical has been completely overhauled to a new layout, hopefully @@ -68,7 +65,6 @@ top and bottom levels of the map. - rscadd: Cargo now resides over a small bank vault that stores both the station's materials and wealth. -<<<<<<< HEAD SkyratBot: - spellcheck: The exosuit fabricator should now spit out (more) grammatically correct messages. @@ -161,7 +157,6 @@ - bugfix: Chemical grenades no longer evaporate into thin air upon detonation. As a result, gunpowder and teslium now work with them. Also, you can recycle cleaner grenades if you want to bother. -======= Mothblocks: - rscdel: The station name has been removed from the hub entry. - bugfix: Massively decreased initialization times in best case scenarios. @@ -211,7 +206,6 @@ - balance: For servers with Blood Brothers enabled, their cost and weight are now lower. SuperNovaa41: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: You can no longer delete your cult eyes or halo by transforming into a monkey, and then into a human. - bugfix: You can no longer delete your cult eyes or halo by transforming as a changeling. @@ -219,7 +213,6 @@ - refactor: Turns cult eyes and cult halos into elements, and improves the code a touch. - bugfix: Spidercharge ACTUALLY can't be used anywhere now. -<<<<<<< HEAD - server: MS13 is the best - bugfix: All of service can now access the Service cargo console. - bugfix: Stuffing bread full of weed and such will no longer consign some of the @@ -282,7 +275,6 @@ - bugfix: Fixed the mentor PMs appearing in bold pink when it shouldn't be. - code_imp: Did some cleaning up of parts of the mentor code. - bugfix: Fixes a hard-deletion related to the void hood. -======= TemporalOroboros: - bugfix: Stuffing bread full of weed and such will no longer consign some of the reagents to the void. @@ -328,14 +320,12 @@ again change your species. - bugfix: Revenants (and any other non human) will no longer turn red/blue from the medieval shuttle teambuilding machines. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Changeling abilities unusable in lesser form are unusuable as a monkey again. - bugfix: Changelings can no longer unintentionally take DNA from monkeys. - bugfix: Changeling lesser form now toggles between "lesser form" and "human form" when used. -<<<<<<< HEAD SkyratBot: - bugfix: Silicons can disable holodeck safeties again. - bugfix: Fixes admins being able to sucessfully JMP as a new player mob. @@ -368,7 +358,6 @@ - rscadd: Added new sprites for Departmental Batons Fikou, sprites from Azlan: - bugfix: fixes mouth hole not working -======= Mothblocks: - qol: Restored the original manual refresh for the orbit menu. OrionTheFox: @@ -397,7 +386,6 @@ san7890: - bugfix: 'Cargonians and Janitors Rejoice: Disposals on TramStation have been fixed!' 2022-01-07: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - refactor: Refactored Dullahans in many areas to fix many, many of their bugs and glitches and ensure an actually functional experience playing as one, while @@ -426,7 +414,6 @@ like abductors. - bugfix: When switching from Dullahans to a different species, your old head will no longer stay behind. -<<<<<<< HEAD - bugfix: 'After a long series of tiresome meetings and heated debates, the Nanotrasen Executive Board is happy to announce that all departments will be able to obtain additional headsets for their departments from their clothing vendors, so more @@ -486,7 +473,6 @@ thestubborn: - bugfix: icebox's lawyer office has always had a drobe, stop gaslighting 2022-01-10: -======= - bugfix: Fixes a hard-deletion related to the void hood. Mothblocks: - balance: Malfunctioning AI should now happen more frequently. @@ -510,15 +496,12 @@ the anti-gravity and teleporter module from R&D. - qol: activating a suit now should be accidental click-proof - bugfix: fixes mouth hole not working ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: You can no longer override the ling DNA you're currently disguised as. This was apparently always intended but broken for ages. - code_imp: Modernized much of ling code. - refactor: Also refactored part of ling code. The ling chemical hud element should be a bit snappier now. -<<<<<<< HEAD -======= - bugfix: You can see rust again SmArtKar: - bugfix: Spiders no longer cause runtimes when coming into contact with spider @@ -552,7 +535,6 @@ Capsandi: - rscadd: 3 new space ruins, 2 chunks of a blown up space station and a NEW asteroid! Melbert: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'Tram medical: Adds some missing white medkits.' - bugfix: 'Tram medical: Cryo freezer actually works.' - bugfix: 'Tram medical: Adds some missing wall mounts and firelocks.' @@ -560,7 +542,6 @@ - bugfix: 'Tram medical: Changes windoor directions in the pharmacy, fixes access on shutters' - bugfix: 'Tram medical: Privacy shutters for the CMO''s office' -<<<<<<< HEAD SkyratBot: - bugfix: Wardens and Heads of Security Rejoice! You are now able to send tiders to the gulag to labor for the better of the station after they steal your third @@ -594,7 +575,6 @@ - bugfix: hypovials can fit inside fridges again tastyfish: - bugfix: Interdyne and DS-2 ID cards are now registered to their owner again. -======= Nari Harimoto: - expansion: Centcom has approved the funds to re-arrange Icebox's medbay department with a new design that better facilitates multiple level functionality @@ -635,14 +615,12 @@ - bugfix: TK will no longer try to interact with your HUD (again). fikou & urumasi (with stackoverflows send by shaps): - rscadd: the wizard now has a new flashy weapon. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-01-11: ATHATH: - bugfix: The pig, cow, and horse masks were not available for purchase in the AutoDrobe like the other animal masks are. This oversight has been corrected. - bugfix: The toggleable voice modification boxes of animal masks that don't cover your mouth now actually work. -<<<<<<< HEAD Ebin-Halcyon: - imageadd: Missing Teshari sprites and files that are named wrong GoldenAlpharex: @@ -653,7 +631,6 @@ it to their needs.' - bugfix: Fixed the instances where speech wasn't handled properly, such as hulks not yelling and tongue modifications. -======= EOBGames: - rscadd: A number of new posters have been introduced, for your decorating pleasure. - rscadd: Billboards have also made their way to the sector. @@ -668,17 +645,14 @@ - bugfix: The HoP can no longer open CE job slots again. Maurukas: - bugfix: Removes non-functioning reagent tanks from Metastation's plumbing room. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Refactored cult buildings to exorcise some copy+paste. Some cosmetic cult buildings won't drop metal now (but still work for cultists!). - balance: Buffed hydroponics dirt tray's capacity to 15u. -<<<<<<< HEAD Ryll/Shaps: - admin: Log messages for being deconverted from a revolution are now also registered in the mob's individual logs instead of just to the game.log SkyratBot: -======= Pepsilawn: - bugfix: Stray pixel on the drop pod sign removed. Pickle-Coding: @@ -696,89 +670,10 @@ - code_imp: Space vine code is cleaned up slightly. - refactor: Space vines now use more flowery, easier to see colors. - refactor: Space vine examination text is now easier to read. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed an issue where cancelling out of tgui input text didn't count as null/no entry. You can now properly cancel out of succumb, etc. - bugfix: Pressing enter on tgui input text will no longer briefly create a new line. -<<<<<<< HEAD - - balance: The Detective can now print .38 Rubber at the Security Protolathe. - - refactor: Decks of cards are actual lists of cards now + other improvements. - - bugfix: You can now put X4/C4 onto playing cards, and put them into decks without - deleting your explosive. - - bugfix: people with only morgue access can now get to the morgue in tramstation - - bugfix: Clicking an open locker on combat mode will no longer deposit your item. - - bugfix: The HoP can no longer open CE job slots again. - - bugfix: Stray pixel on the drop pod sign removed. - - bugfix: You can now stamp papers while blind. - - rscadd: Ectoscopic sniffers are now louder, and explain their purpose on examine. - - bugfix: Removes non-functioning reagent tanks from Metastation's plumbing room. - - code_imp: Nanotrasen has implemented improved checking in their protocols, only - delaying the inevitability that the AI can one day get to be a blood cultist. - - bugfix: Fixes holodecks not properly deleting simplemobs. - - rscadd: Various items provide special texts when suiciding with them. - - rscadd: Unique text is shown when suiciding with food, a clown box, bubblegum, - bubblegum bubblegum, bees, tinfoil hats, suitcases, Magnus's Grasp, and even - when inside a stealth implant box. - - rscadd: Crayons now color you when suiciding with them. - - rscadd: Blown kisses will now power the supermatter engine. - Stalkeros: - - rscadd: Adds xenoarch room to Icemoon's mining outpost. - fikou & urumasi (with stackoverflows send by shaps): - - rscadd: the wizard now has a new flashy weapon. - jjpark-kb: - - rscadd: added xenoarch bag and belt to cloth and leather recipes respectively - - rscadd: 'added some cytology swab cells to animal fossil (xenoarch) qol: brushes - will dig 1 depth on unsuccessful brushing (xenoarch)' - - balance: doubled the points received from a researcher (xenoarch) - - balance: xenoarch adv. tools require a point scanning experiment now - - rscdel: removed the digger (xenoarch) - oranges: - - balance: The engineering borg stun arm malfunction module has been rebalanced - to use more power - tastyfish: - - bugfix: The connect_range component now works correctly, meaning stacking machines - in Recycling now pick up stacks again. -2022-01-12: - ErdinyoBarboza: - - rscadd: TramStation is Skyrat-ified once more - LT3: - - bugfix: fixes and additions to Janitor alt titles - S34NW, dragomagol: - - imageadd: new aquarium DIY construction kit sprites - SkyratBot: - - bugfix: The civilian bounty computer will now properly give you new bounties if - they weren't already chosen. - - bugfix: Marker beacons will no longer teleport to your hands when picking it up - with TK. - - spellcheck: Admin help info is now slightly more readable - - bugfix: Deltastation's Hydroponics Desk now has proper windoors. - - rscadd: People with the claustrophobia quirk will now be afraid of Santa Claus - and certain Claus-like entities - - bugfix: Cyborgs now must be adjacent to a vending machine to lift it back upright. - Stalkeros: - - bugfix: 'Made xenoarch''s broken objects actually sell for their price, and made - broken objects actually sellable too. qol: It''s now more obvious that animal - remnants are swabbable.' - ma44: - - code_imp: Basic AI has been modified to allow for future features to be implemented - in a proper way. -2022-01-13: - ErdinyoBarboza: - - bugfix: Conflicting race food prefs have been fixed. Insects and Dwarves do not - like Junkfood, Fried food and Cloth. Akula, Aquatic, Vulpankin, Tajaran and - Anthromorphs do not like Vegetables, Fruits and Cloth. Unathi do not like Grain, - Dairy and Cloth. You can reverse this by taking the Deviant Perk - - bugfix: Tram Brig gets actual holding cells - - rscadd: Delta Perma Brig has been updated per compliance with humane standards - of living for inmates and Correction Officers now have their own room. Also - a changing room for the new inmates, - GoldenAlpharex: - - code_imp: Documents and improves the code of the shuttle subsystem, so its inner - workings are a little less of a mystery. - Melbert: - - bugfix: Antag info ui carries over to a fresh body correctly -======= oranges: - balance: The engineering borg stun arm malfunction module has been rebalanced to use more power @@ -809,7 +704,6 @@ - bugfix: You feel space itself shift around you. Atmos has changed. Please report any strange behavior, if you can notice it. Melbert: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Wrapping a bounty cube then unwrapping it no longer scams the owner out of a cut - bugfix: Wrapping a bounty cube then applying a barcode no longer grants a bigger @@ -819,8 +713,6 @@ by radios alone? - refactor: Refactored Pricetag component, less getcomponent and ugly signals, more sanity, harder to break -<<<<<<< HEAD -======= - bugfix: Antag info ui carries over to a fresh body correctly - expansion: Paper dispenser maintenance loot MOD. S34NW, dragomagol: @@ -866,7 +758,6 @@ LemonInTheDark: - server: Added support for define toggle live ref tracking. Consider using it if you're hunting hard deletes ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nari Harimoto: - bugfix: The icebox gremlins went and fixed some minor issues the construction crew made of the new Icebox Medbay @@ -880,7 +771,6 @@ names, letting you look up a silicon named "H.E.R.A." by simply searching "hera". - bugfix: Stealthed admins orbiting something will no longer count for that atom's orbiter count in the orbit menu -<<<<<<< HEAD SarmentiCampbell: - rscadd: Added mush kit to curator's heroic beacon SkyratBot: @@ -898,7 +788,6 @@ traitor uplink. Romerol is now a final objective that you can receive. - bugfix: Can no longer open storage containers in a locker (or other container) via right click. -======= SuperNovaa41: - bugfix: Emotes will now parse properly in dchat. - bugfix: Drone tools can no longer be removed from the drone. @@ -907,12 +796,10 @@ jlsnow301: - rscdel: Removes swarmers! The griefiest, lowest fun value antagonist is removed from the game. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Cameras are once again viewable from a distance, but this is limited to 2 tiles. - bugfix: The viewing range limit of 2 tiles also applies to the SecurEye tablet software. -<<<<<<< HEAD - bugfix: Fixes the equipment menu from runtiming if you the outfit has a skillchip. - rscdel: Removed podcaster reference shirt. - balance: "Replaces the Cr\xE8me de Menthe in Quadruple Sec with Grenadine because\ @@ -980,7 +867,6 @@ under you (and any other mobs). - bugfix: The carp plushie null rod variant now properly gives the carp faction to holy people instead of favouring the unworthy. -======= san7890: - code_imp: Traumas.dm is now spanned out and alphabetized. Just a small code improvement. 2022-01-14: @@ -1030,12 +916,10 @@ theOOZ: - balance: Venting now has an indicator tralezab: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: admin running department revolt works again - bugfix: separatists no longer have a bad greeting message - bugfix: united nations lawset is now properly rejecting law changes unless it completely overrides the laws -<<<<<<< HEAD - balance: Venting now has an indicator jjpark-kb: - rscadd: added a xenoarch guide to the xenoarch lockers @@ -1044,7 +928,6 @@ theOOZ: - balance: Roomba cyborg models can be flipped. 2022-01-15: -======= 2022-01-15: MMMiraclkes: - bugfix: Tramstation's prison area is no longer powered by a secret bathroom APC. @@ -1057,7 +940,6 @@ RandomGamer123: - bugfix: Allows for putting integrated circuits (and swiping your ID to lock them) into circuit airlocks without having to use combat mode. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - balance: Rubbershot is now much more bouncy than before, loses damage over range a bit slower, and has a somewhat tighter spread. Its pellets now also fly 50% @@ -1065,7 +947,6 @@ - bugfix: Bullets that deal both brute and stamina damage like .38 Rubber will now properly have both their brute and stamina damage reduced after each ricochet, instead of just the brute. -<<<<<<< HEAD SpookyTheFox: - rscadd: Added new functionality to the botany toolset arm implant - balance: Made a moderately strong weapon available if emagged @@ -1126,7 +1007,6 @@ 0.15 on quick suits like rescue and 0.2 on semi quick like advanced or medical to 0.35 on research and 0.4 on prototype) qol: the storage modsuit module now tries to scoop up the suit storage item' -======= SmoSmoSmoSmok: - bugfix: Mulebots wont crush people in no gravity Vexylius: @@ -1150,7 +1030,6 @@ on quick suits like rescue and 0.2 on semi quick like advanced or medical to 0.35 on research and 0.4 on prototype) - qol: the storage modsuit module now tries to scoop up the suit storage item ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: you can now print expanded storage modules - bugfix: the magnate suit now has a jetpack - bugfix: you can now spraypaint storage items @@ -1160,51 +1039,17 @@ are: standard, your current ones, using power cells. infinite, dont use power at all, used by some admin and wizard suits. ethereal, these dont use power cells, but an ethereal''s charge directly, they are craftable.' -<<<<<<< HEAD - JohnFulpWillard and theOOZ: - - balance: You can now tip Borgs over. - Ryll/Shaps, credit to Crystalwarrior of Hippiestation: - - rscadd: Suffering slashing or piercing wounds, as well as violent dismemberment, - can now send bloodsplatters flying from your body that can land on walls/floors/windows/whatever - in the environment. Juicy! - SkyratBot: - - bugfix: Mutations like Telepathy will now work again. - - rscadd: Time Eradication Agents now use a MODsuit, which comes with some extra - functionalities - - bugfix: Allows for putting integrated circuits (and swiping your ID to lock them) - into circuit airlocks without having to use combat mode. - - bugfix: Windoors can now have their electronics removed without creating infinite - assemblies. - - bugfix: On the mapping end, all of the engineering storages are no longer number - "2" (as far as the sprite labelling the rooms go). The sprites now reflect their - actual usage in their respective maps. - - bugfix: Nanotrasen has now stopped including a big chunk of iron in their berets, - making it a bit weaker to melee damage. Still just as fashionable, though. - - bugfix: Podpeople are no longer missing a hand when facing right, and podwomen - no longer stick out of their jumpsuit. - - admin: Added the objectives to the antag panel for admins. - - admin: Added logs for when a player gets a potential objective, when a player - takes an objective and when a player succeeds/fails an objective. - - bugfix: Fixes not drawing cards from non-standard decks. - - rscadd: An old space billboard has been spotted in the vicinity of the station. - Apparently, nobody at the advertising company realised how hard it is to read - a billboard when passing by at 2/3rds the speed of light. - - rscadd: chisels are now the animated statue's bane. - - code_imp: Badass.dmi has been moved to a new folder in the repository. -======= JohnFulpWillard: - qol: People who don't have head revolutionary enabled in their preference, will no longer be promoted to head revolutionaries by force. - bugfix: People banned from head revolutionary will no longer roll Head revolutionary. - bugfix: Assigning timers on people's IDs now work properly, yay Tramstation Brig! LemonInTheDark: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added a visual effect for dropping items from your inventory or hands - rscadd: Increased the animation time of the pickup effect, to make it less of a snapshot. Did some other things to it to hopefully make it look nicer - rscadd: Very minorly changed self attack animations - bugfix: Attack animations will display properly now -<<<<<<< HEAD - balance: Atmospheric gas masks are now normal-sized, the same as other full-face gas masks. That REALLY Good Soda Flavor: @@ -1272,7 +1117,6 @@ watch for wolves. - rscadd: To accommodate the grand new laundry room, the locker room (and surrounding maintenance tunnels) have been shuffled around. -======= ReinaCoder: - bugfix: there is now a fire alarm in Metastation arrivals Ryll/Shaps, credit to Crystalwarrior of Hippiestation: @@ -1306,7 +1150,6 @@ LemonInTheDark: - qol: Space movement, assuming I've done my job correctly, should feel significantly smoother ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed the immovable rod not properly carrying orbiters to new z levels - code_imp: Added a framework for different forms of looping movement - balance: Secborgs can no longer fly in space, as they have canonical wheels. The @@ -1318,9 +1161,7 @@ - server: Hello admins. Spamming meteors will no longer lag things out quite so much. Still not amazing cause of all the explosions, but it won't kill things anymore. Blow some people up for me yeah? -<<<<<<< HEAD - bugfix: Teleport runes made by wraiths now show their custom names properly. -======= SuperNovaa41: - bugfix: Fixes not drawing cards from non-standard decks. That REALLY Good Soda Flavor: @@ -1377,14 +1218,12 @@ to count as moving to not increase the chances of lone ops. This means no more disk conveyor belts. ReinaCoder: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixes Icebox not having a drone dispenser. - bugfix: Fixes Icebox not having a medical records console available to MD. - bugfix: Fixes the little cross section of Icebox medical and science maints not allowing medical and science access. - bugfix: Fixes the fire extinguisher on a disposal bin on Icebox - bugfix: Fixes the placement of a camera in Icebox medical -<<<<<<< HEAD - bugfix: Replaced snowed over plating in icebox airlocks with regular plating to make the plating unable to generate dangerous gases - spellcheck: Exploration Drone Control Console's computer board is now properly @@ -1456,7 +1295,6 @@ RatFromTheJungle: - rscadd: 'Adds modsuit+ other-stuff to maint-loot remove: removes alot of shit that has no business being in maint loot, from maintloot' -======= SuperNovaa41: - bugfix: Fixes AIs not being able to announce any custom laws. - bugfix: Fixes floorbots dropping full toolboxes. @@ -1479,7 +1317,6 @@ spelled. RandomGamer123: - bugfix: Teleport runes made by wraiths now show their custom names properly. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - rscadd: Added premium Two-Time root beer to soda vending machines for 200 credits! The soda grants you doubled fire-rate with ranged guns while in your system, @@ -1487,7 +1324,6 @@ stamina damage and drowsiness when it wears off. - rscadd: Added admin-only racing shooting gloves that grant the doubled fire-rate buff to the wearer with no downsides. -<<<<<<< HEAD SarmentiCampbell: - rscadd: Gave a RCD to the Syndicate Module - balance: The syndicate jack module had their tools replaced with power tools, @@ -1573,7 +1409,6 @@ - bugfix: Soulful toolboxes, made by using a soulstone with a shade in it on a toolbox now display their icon properly. - admin: Adds logging to the tippable component, to catch all the new borg griefing. -======= ShizCalev: - server: A couple mapping errors will now be more visible and actually logged in the mapping error log. @@ -1635,13 +1470,11 @@ - rscadd: They show up roundstart and midround, and do not have a license to kill. 2022-01-21: Ghommie: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Syndicate, ninja, fugitive hunter masks and some costume masks (cyborg visor, plague doctor, carp, owl, monkey) no longer impair vision with field of vision cones. - bugfix: Restored the LACK OF pepperspray protection the aforementioned costume masks (not the antag ones) had before the transition from gas mask tint to FoV. -<<<<<<< HEAD - bugfix: Fixes plants not maintaining their healthy size when picked up and put back down - bugfix: Hitting cancel when renaming a paper now actually cancels the operation. @@ -1680,7 +1513,6 @@ - bugfix: Portable Scrubbers and Large Scrubbers should no longer display as large, embittered ERROR icons for those who enjoy mapping. - refactor: Refactored AI law announcing. -======= JohnFulpWillard: - bugfix: Tramstation's Brig lockers can now be used more than once. - qol: Security Officers can right click Tramstation's permabrig lockers to open @@ -1723,36 +1555,12 @@ Melbert: - expansion: 'Deltastation: Atmosphics, Engineering, and Service Maintenance revamp!' Pickle-Coding: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Tritiumfire will need more tritium burned in order to release radiation. The higher the volume of the gasmixture, the more tritium is needed. - balance: Tritiumfire radiation pulse will always have a range of at least 6, but will need more tritium in order to increase range. - balance: Tritiumfire will be less likely to irradiate you if there is less tritium getting burned. -<<<<<<< HEAD - - rscadd: Reflectors have been slotted with USB ports. - - bugfix: Fixed aggressive mobs moving twice as slow as they should. This was the - result of a rather big refactor that moved us away from a BYOND thing. I don't - know how the BYOND thing fucking works internally, so the numbers might be a - bit off. If something seems (way) too fast/slow, lemme know yeah? - - soundadd: The next time you work out at the gym, please appreciate the new crispness - of the sound when that machine starts to squeak as a result of your effort. - So refreshing. - - bugfix: Setting volume pump to 0L/S will no longer runtime. - - bugfix: ghosts will now bob up and down - - balance: Borgs can halve their selfuntip time with the power of roleplay. - itseasytosee: - - bugfix: fixed stacked cannonball sprites looking wack - jjpark-kb: - - rscdel: removed some starting chemicals from the borer - - rscadd: 'Port Tarkon: changed atmospherics' - - rscadd: 'Port Tarkon: added a bluespace miner circuitboard to a safe' - - rscadd: 'Port Tarkon: Split the starting 25 uranium into small piles around the - map' - - balance: changed bluespace miner price from 200,000 to 75,000 - - bugfix: fixed bluespace miner missing "pressure too high" examine text -======= RandomGamer123: - bugfix: Soulful toolboxes, made by using a soulstone with a shade in it on a toolbox now display their icon properly. @@ -1774,13 +1582,11 @@ embittered ERROR icons for those who enjoy mapping. - bugfix: Nanotrasen finally realized that when spraying decals on TramStation to go UNDER any staircase accessories. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tastyfish: - bugfix: Objects transitioning through z-levels in disposals no longer lose their delivery destination tag. - bugfix: Tramstation port-aft disposals loop containing part of service, and engineering now work again. -<<<<<<< HEAD tf-4: - bugfix: fire alarms now ACTUALLY prepend their area name 2022-01-24: @@ -1812,7 +1618,6 @@ game! - rscadd: Playing videogames will now give you a slight mood buff. - bugfix: Ablative trenchcoats will no longer delete sechuds given from other sources. -======= zxaber: - bugfix: Fixed cyborg light overlay not showing when the light is off. 2022-01-23: @@ -1940,7 +1745,6 @@ - bugfix: Malfunction in malfunctioning ai protocols should be fixed, AIs should break regularly again. LemonInTheDark: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added an action button to janitor cyborgs. It'll draw water from your bucket and clean the ground under you as you walk. More wasteful then mopping mind @@ -1949,14 +1753,6 @@ version. It doesn't have the 2 second wait attached to it - refactor: Made being a cleaning chemical into a bitflag instead of having manual checks in mop code -<<<<<<< HEAD - - spellcheck: Improper snack names has been made to use \improper. - - imageadd: New sprites for HoS Jumpsuit/Jumpskirt, and Turtleneck/Skirtleneck - - imageadd: New sprites for Warden Jumpsuit/Jumpskirt - - imageadd: New sprites for Sec's formal uniforms - - bugfix: Malfunction in malfunctioning ai protocols should be fixed, AIs should - break regularly again. -======= PapaporoPaprito's sprites: - rscadd: ports some moth wings & antennae from fulp (credit to PapaporoPaprito for the original icons) @@ -1982,7 +1778,6 @@ game! - rscadd: Playing videogames will now give you a slight mood buff. san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The species of Rabbits signed a declaration saying that they no longer wanted to be a part of Easter. After a long four-year separatist movement and a lot of bloodshed, they aren't! @@ -1991,84 +1786,6 @@ - bugfix: If for some reason you wish to kill one of these creatures, the black and brown variants should now have their eyes comically turn into an X (because that wasn't there before). -<<<<<<< HEAD - - bugfix: Fixed some problems with bullets (Not making you guilty to Honorbound, - Monkeys wouldn't retaliate against you, and Stealth MODsuits wouldn't react - at all). - Vladoricious and Michiyamenotehifunana: - - rscadd: Added the CMO turtleneck and turtleneck skirt! Order them in the Medical - section of cargo! - cacogen: - - bugfix: 'Items returned to vending machines no longer disappear. Instead, they - increment that item''s count and can be vended again immediately for free expansion: - Nearly all vending machines accept returns (no refunds, though)' - jjpark-kb: - - bugfix: you can purchase borer eggs that are actually fertilized this time - mozi_h: - - refactor: filing cabinets now use tgui - tastyfish: - - rscadd: The Tramstation's confusing 'service lathe room' is now a real Service - Hallway. - - bugfix: On Tramstation, service orders now have their destination to Service Hallway, - since it now exists. - - bugfix: Skirt-wearing assistants now actually get skirts. - - bugfix: Teshari clothing colors are now more correct for a large portion of the - generated clothing. - theOOZ: - - bugfix: Runechat doesn't cover the sprites of oversized quirk-holders -2022-01-26: - AtoriBirb: - - rscadd: missing line of code to allow choosing digitigrade briefs, obvious anthro - h8, no other explaination - Azarak: - - bugfix: Fixes accessories always being treated like Teshari is wearing them - Kokonut (Maxymax13): - - imageadd: Touches up the new toolboxes' appearance. - Riggle: - - admin: gamemode panel now correctly displays the time - SkyratBot: - - spellcheck: Gives mannitol an actual taste. - - bugfix: An active turf was fixed on the DJ station - - rscadd: spacevines now have a spawning animation - - bugfix: Vending machine doesn't fall over if its weightless - - bugfix: removes catwalk satchels - - refactor: Reworks some tool interactions to use specific tool procs - Zonespace27: - - bugfix: Most skyrat traitor items now have their proper reputation requirements - - bugfix: Heads of Staff and Centcomm employees can no longer be thieves. - nikothedude: - - rscdel: Removed the joe swanson announcer. - tf-4: - - bugfix: The secborg research node has been removed, as they're supposed to be - unobtainable. - theOOZ: - - rscadd: Added the emag to OPFOR's item selection -2022-01-27: - AtoriBirb: - - bugfix: added the TRAIT_CAN_USE_FLIGHT_POTION to most of the Skyrat races. - Ebin-Halcyon: - - imageadd: Chrono suit + Honkerative digi sprites - - bugfix: Chrono suits are no longer sent to the 4th dimension and now properly - have worn sprites - ErdinyoBarboza: - - bugfix: Tramstation's gulag processing room has been rearranged so prisoners can - disembark on their own instead of being trapped. - - bugfix: Removed the firelocks in the TramStation SM chamber - - bugfix: Makes the screwdriver and wirecutters sprites use the correct versions - GoldenAlpharex, Serijas for the Cyborg sprites: - - bugfix: Fixed cyborgs re-generating a bunch of icons every time they'd pick a - model, with more optimizations to that to come. - - code_imp: Made some minor improvements here and there to paper plane code to make - it more functional. - LT3: - - bugfix: Medical cryo cells are now on the correct layer. - Melbert: - - admin: Comms console hacks by ninjas and traitors (the ones that spawn antags) - are now logged (find them in user logs and in the game log!). - PapaporoPaprito's sprites: - - rscadd: ports some moth wings & antennae from fulp (credit to PapaporoPaprito - for the original icons) -======= tastyfish: - qol: The destination tagger UI now shows its items in alphabetical order (intentionally). the-orange-cow: @@ -2082,39 +1799,12 @@ - bugfix: Updates food spawners to include Boritos, Semki's and Pistachios Kokonut (Maxymax13): - imageadd: Touches up the new toolboxes' appearance. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PositiveEntropy, Axietheaxolotl: - imageadd: Resprites/Reshades the Head of Security's Trenchcoat! - imageadd: Resprites commander caps into peaked caps! Flex your naval prowess with them! - imagedel: Removes the old captain parade tunic, replacing it with Captain's Parade Jacket! -<<<<<<< HEAD - SkyratBot: - - refactor: the telecommunications server monitor now uses tgui. - - bugfix: Made the trash of Ready Donkmeal nicer - - bugfix: Updates food spawners to include Boritos, Semki's and Pistachios - - balance: Removes the 20 seconds stunlock rng from tourettes. - - bugfix: blood barrage no longer has a seizure when you use it - - bugfix: Kilo uses regular newscasters instead of security variants - - balance: Antagonists cannot roll for thieves anymore, as you already have a larger - amount of impact on the round than thief would give you. - - admin: Admins no longer roll for thief while they sit around on centcom testing - things. - - bugfix: Bluespace gas vendors no longer deletes the gases it doesn't transfer - when transferring gases. - - bugfix: APOTHEOSIS! now forces you standing during your death animation, restoring - the old (not forced) standing when I originally added APOTHEOSIS! - - rscadd: Separatists now have an antagonist ui! - - spellcheck: Renames the MOD component to the MOD circuit adapter core, as it is - no longer the only MODsuit-related circuit component. - - bugfix: 'The MOD circuit adapter core can now activate inactive MODsuits. qol: - The MOD circuit adapter core''s "Selected Module" port is now a string port - instead of an entity port. qol: The MOD circuit adapter core now has a "On Module - Selected" output signal.' - - bugfix: The BCI action component now properly typechecks if it was inserted into - a BCI. -======= Riggle: - admin: gamemode panel now correctly displays the time SmoSmoSmoSmok: @@ -2178,12 +1868,10 @@ san7890: - bugfix: Followers of Nar'Sie who hope to summon her can hopefully ascertain the correct area to summon her, as the gambling and gaming dens have now been seperated. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Whenever radiation shelters are blueprinted and labelled as a "radiation shelter", you can rest easy now that the blueprint has an actual name. It doesn't matter on a day-to-day basis, but it looks a lot nicer for the people working with the blueprints. -<<<<<<< HEAD - bugfix: Heads of Personnel can now be midround thieves, as intended. Snakebittenn: - rscadd: Nanite Slurry has been renovated to passively heal synths and the robolimbs @@ -2238,7 +1926,6 @@ - bugfix: DJ Space ruin no longer uses incorrect turfs. - bugfix: The camera in the Ice Box Station Locker Room is no longer inside of a door. -======= tastyfish: - bugfix: Central Command has finally informed the Plexagon vendor that service hallway access exists, allowing HoP's to grant it to ID cards. @@ -2263,12 +1950,10 @@ Zonespace27: - qol: You can now use autosurgeons on other people after a delay. axietheaxolotl: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - imageadd: New sprites for the Parcel Parceaux, base Mime mask, Mime outfit and skirt, and mime sexy outfit. - imageadd: new sprites for lace-up shoes. - code_imp: Mimes spawn with lace-ups instead of black shoes -<<<<<<< HEAD - balance: Fire Locks now check for atmos issues on their own, rather than leaving it to the Fire Alarm. This should cut down on a single breach turning the main halls into a navigational mess. @@ -2286,14 +1971,11 @@ on the firelock itself. You can still emag a fire alarm to mute it, though. sprite: Fire Locks now have lights that display the reason they are active. Orange is Hot, Cyan means Cold, and White means a Fire Alarm was pulled.' -======= castawaynont: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: CentComm's Mark One SWAT suit's design has been reworked; it now lacks spaceproofing, but it has become significantly faster to move in and retains temperature-proofing. These adjustments have allowed CC to sell them for a lower cost of 1400. -<<<<<<< HEAD - bugfix: Tramstation brig's disposals now has a trunk under it - balance: lowers kilo's bombcap multiplier - bugfix: The warden can no longer consider half of security to be their office @@ -2301,7 +1983,6 @@ - refactor: Honkbots have been made a subtype of Secbots, which means they trigger phobias of security, and their behavior has additionally been overhauled to work more like Beepsky. -======= jjpark-kb: - qol: safes now use balloon alerts for the hint san7890: @@ -2313,7 +1994,6 @@ security portion of IceBox's security wing. - bugfix: The warden can no longer consider half of security to be their office on KiloStation. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Introducing: The Lizard''s Gas! A brand new (gas) station for you to go out and refuel your ships and your stomachs. It''s been a while since the power''s been turned on, but everything is just the way it was left all those @@ -2323,7 +2003,6 @@ - config: since gasthelizards.dmm is removed, the config has been updated as well. make sure it's up-to-date now that we've gotten rid of the dang ol' thing and replaced it with new hotness. -<<<<<<< HEAD - bugfix: Nanotrasen decided to redirect some of the plasma rivers on IceBox station towards the labor camp, helping add another layer of security between the station and those awful, awful prisoners. @@ -2378,7 +2057,6 @@ now abandoned. - bugfix: Attempting to write to paper no longer comically bluescreens. - bugfix: Spiders will now have a randomized number next to their name. -======= - bugfix: The IceBox Station Telecommunications Room now has a fire alarm. - bugfix: Atmossians, no longer fret. You now own all of the walls in TramStation's Incinerator Room. @@ -2431,7 +2109,6 @@ cacogen: - bugfix: Ice Box Public Mining downstairs now uses proper external airlocks san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: If you've been noticing some weirdness in the light as you spacewalk over to the AI Satellite on MetaStation, fear no longer for they have been fixed. - spellcheck: The last ash drake currently residing on the celestial body underneath @@ -2439,7 +2116,6 @@ - bugfix: For those of you into code, some stuff with the icon pathing has been shuffled around so it's no longer in the roots of the icon/ folder. If you aren't into code, that's fine too. -<<<<<<< HEAD - bugfix: Cuffing people as a PAI/ghost controlled beepsky no longer glitches out - balance: Folded bluespace bodybag with dwarves fit into backpack - bugfix: Ice Box Public Mining downstairs now uses proper external airlocks @@ -2484,7 +2160,6 @@ - bugfix: The teleporter room shutters on Blueshift are now functional thestubborn: - bugfix: sheriff hat will now display ears -======= - imageadd: Abandoned Kitchens now have a special sprite indicating that they are now abandoned. theOOZ: @@ -2517,4 +2192,3 @@ tralezab: - admin: Bounty Hunters can now be called via admin ert - expansion: Oh, and they have cool flame ids as well! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-02.yml b/html/changelogs/archive/2022-02.yml index 04bce0a01ee..46be8e5f440 100644 --- a/html/changelogs/archive/2022-02.yml +++ b/html/changelogs/archive/2022-02.yml @@ -1,109 +1,4 @@ 2022-02-01: -<<<<<<< HEAD - AtoriBirb: - - bugfix: a trait not removed when the chameleon gene is removed. - Ryll/Shaps: - - bugfix: Iron walls built on top of metal foam will produce metal foam instead - of a girder when decon'd. - SkyratBot: - - bugfix: Species-locked traitor items (currently the moth suspicious lantern) has - been re-added after an accidental removal. - - code_imp: Refactored the incapacitated proc to skip optional arguments and use - the named arguments properly to improve readability. - - balance: xeno weeds spread cooldown lowered from 15-20 seconds to 5-10 seconds - - code_imp: Blackmarket uplinks on the backend were tweaked in a way consistent - with other sold items. - - bugfix: Fixed the "skeletal guardian" away mission role not being a skeleton. - - bugfix: fixed new areas over starlight areas not having lighting objects - Spc-Dragonfruits: - - rscadd: '"Logistics Officer" QM title.' - - tweak: Titles "Head of Cargo", "Cargo Foreman" and "Cargo Guard" switched out - for "Head of Supply", "Supply Foreman" and "Supply Guard". - jjpark-kb: - - config: added a ssdecay disable nests config -2022-02-02: - ErdinyoBarboza: - - bugfix: Returns Tram Brig back to its original form. No more holding cells - GuiltyNeko: - - bugfix: Pipes, vents, scrubbers, and cables on icebox have been rearranged to - be slightly more sane - - bugfix: Meta Station's Supermatter Air Alarm is now the "engine" subtype, allowing - engineers access to it. - Melbert: - - bugfix: Cult deconversion text is the right color again - - balance: Icebox's cursed spring now only spawns on the lower levels of the moon. - Paxilmaniac: - - bugfix: the wooden tables in the barber's shops on both meta and delta no longer - have magic tables that cannot be touched in any way - SkyratBot: - - bugfix: Drones can now properly insert items into machines frames... or really - anything else. - - bugfix: If you're looking through the Medbay on some stations (and shuttles too), - take a moment to appreciate that the stasis beds have been re-arranged. - - balance: Rebalanced TC rewards from assassinations to be less, and lowered TC - rewards for plentiful objectives. - - balance: Lowers the progression reward of assassination objectives. - - bugfix: Fixed an oversight with the skittish trait that let players dive into - burial mounds, which are technically a subtype of crates. - - bugfix: Fixed a runtime error that made abandoned crates not update their lock - lights when unlocked. - - bugfix: Fixed an oversight with abandoned crates not resetting the number of attempts - left and not nulling the last attempted code when re-locked. - - bugfix: Fixed burial mounds somehow getting lock lights overlays. - - config: Add PR_ANNOUNCEMENTS_PER_ROUND and STATION_GOAL_BUDGET to be a config - instead of define - - bugfix: Last two Active Turfs in DJ Space Ruin were fixed. - - bugfix: 'Fixes exodrones erroneously reporting "travelling back to station" in - the status panel of their console UI when travelling from site to site. qol: - exodrones will now report the name of the target sites they''re travelling to.' - - bugfix: Kilo and tram's whiteships should actually spawn now. No promises on them - docking though - - bugfix: Prevents silicons from opening circuit airlocks by walking through them. - - bugfix: Clowns uploading their PDA cartridge to a screwdrivered-open airlock will - now properly cause it to Honk. - - bugfix: Fixed the thermomachine board being listed as a freezer/heater board in - the circuit imprinter. - - code_imp: Changes the descriptions of the HFR boards to not be the same as the - freezer/heater. - cacogen: - - bugfix: Fire alarms will be renamed with areas like air alarms, e.g. Bar fire - alarm --> The Adminbus fire alarm - jjpark-kb: - - balance: idle power usage for bluespace miners is up from 200 to 300 - kannthus: - - bugfix: Ghost Cafe Detainment now works as intended - tastyfish: - - bugfix: The Central Command intern finally found the request form to add the Corrections - Officer to Plexagon Access Management. You can now assign the CO job if you - have access to assign security jobs. - thestubborn: - - rscadd: pride pin in loadout :) - - spellcheck: 'its a blue bag now remove: crimble stuff is in the loft yet again' -2022-02-03: - Fikou, Armhulen, smartkar: - - rscadd: Brimdemons have invaded Lavaland. - - rscdel: Lobstrocities have awakened from their lavaland slumber, this somehow - made them unavailable in the gold slime pool. - MMMiracles: - - rscadd: Tramstation's maintenance has taken broken down into more modular segments - that will now load in randomly each round. - - rscadd: There is now a medical console and crew console in the main medbay treatment - room. - Melbert: - - bugfix: Fixes a hard delete with rod form. Also cleans up some rod code. - - bugfix: Admin sending a looping rod will no longer make all following rods loop - Ryll/Shaps: - - rscadd: Added in a new admin spawn, the mystery box! Dealing randomized (maybe) - death to thunderdomes near you! Maybe! - SkyratBot: - - bugfix: Upgraded BEPISes now longer give tech for free. For a fully upgraded machine, - you now need 200 credits for a 50% chance of a minor reward, and 600 credits - for a 50% chance of a major reward. - - bugfix: The BEPIS message telling you that you've gotten all the tech disks and - therefore are getting a minor reward instead now properly displays. - - spellcheck: Not having enough iron to create a foam wall no longer erroneously - tells you that you need four iron sheets instead of two. -======= ArcaneMusic: - qol: Blackmarket uplinks now draw from the player's ID card, not from an internal supply of credits. @@ -150,7 +45,6 @@ - expansion: xeno weeds will now be destroyed when their parent node is destroyed - balance: xeno weeds spread cooldown lowered from 15-20 seconds to 5-10 seconds jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Created a new input component that accepts only integers. More usage to come. - refactor: Pay stands are now holographic. It's 2562! Create one by right-clicking @@ -159,83 +53,6 @@ - refactor: Pay stands now have their own TGUI. - bugfix: Custom vendors now alert you when someone makes a purchase. - bugfix: Custom vendors now place items in your hand when you make a purchase. -<<<<<<< HEAD - - bugfix: Stickyban subsystem no longer runtimes on invalid entries - - bugfix: Connects robotics trashbin to disposal system on tramstation - - bugfix: Nanotrasen moved around some of the wall decorations in IceBoxStation's - Science to appease the ghostly overlords (as well as the AI). - - bugfix: Calls via holopads now transmit the caller's speech again. - - balance: Security Officers (and the whole lot) now have a name assigned to their - locker room, rather than have it be another appendage of the large beast known - as Brig. - - bugfix: lost sprites for connectable t-ray goggles found and restored - - bugfix: missing delta turbine air supply pipe has been installed - YakumoChen: - - imageadd: New Heart Tattoo that goes over your groin. - Zenitheevee: - - bugfix: MCR properly shows up in the right hand when held in the right hand. - tastyfish: - - bugfix: Fixed bluespace miner examine errors to show at the same pressure range - that the logic does. - tf-4: - - bugfix: Ghost roles can now use loadouts and quirks as God intended. - - code_imp: Cloaks, boatcloaks, veils, and shrouds are now GAGS instead of polychromatic. - - rscdel: The runescape cloaks have been removed. -2022-02-04: - Melbert: - - bugfix: Fixes being able to vote for maps which are outside their configured population - range (Such as Kilostation). - ShizCalev: - - bugfix: Fixed being able to fry objects that are actively storing other objects. - SkyratBot: - - bugfix: You can now once again resist out of aggressive grabs. - - bugfix: Merge datums will no longer spit blood if two mergable objects are on - the first tile examined. The directions are also trustworthy now - - balance: You no longer need beakers to build component printers or module duplicators. - - bugfix: Chaplains rejoice, you can now stop burying the dead in your own robes! - Burial garments have been added to the Religious Supply Crate, as was already - promised in the description. - - balance: Nerfs the stun on touching a field gen from 30 seconds(!) down to 10. - Adds sound and chat message feedback. - - rscadd: The Space Ruin "The Lizard's Gas" now has a GPS on it, so you can seek - it out a little bit easier now. - - bugfix: ethereals can now charge themselves using right click, but they will also - lock/unlock the APC above normal charge - - imageadd: Updated the icon for the Legion achievement. - - imageadd: Added an icon to the "Look Out, Sir!" achievement. - - bugfix: Clicking cancel on the carp rift will no longer summon you as a carp - - bugfix: Welding up a disposal segment will not longer delete most of the people/things/dogs - inside it - jjpark-kb: - - balance: lowered chance for meteor event - - rscdel: removed sentient disease event - tf-4: - - code_imp: The polychromic clown mask is now GAGS, allowing finer control over - its colours. - - bugfix: Flickering lights will now properly check if they should turn on or not - when fixed. -2022-02-05: - Gandalf2k15: - - admin: Added verb to fix chat called "FIX SAY". - Ryll/Shaps: - - config: Added ALLOW_ADMIN_PROFILING entry to the config, controlling whether admins - are given access to the server profiler - SkyratBot: - - balance: Returning to lobby is now the default assignment if your job spot was - taken. - jjpark-kb: - - rscdel: lone ops will no longer receive weight from nuke disk - - rscdel: removed fungal mold from event spawning - tf-4: - - code_imp: the colour-changing footwraps are now GAGS instead of polychromic. -2022-02-06: - RandomGamer123, Iamgoofball, IssacTheSharkWolf: - - bugfix: Shuttles on multi-z stations now have ceilings! - SkyratBot: - - bugfix: The 145.7 frequency is no longer received by all signalers. - - bugfix: you no longer see ghosts and through walls with nooartrium - - bugfix: fixes modsuit core recipes -======= san7890: - bugfix: Nanotrasen realized that when you punt someone down using IceBox Station's execution room, they would only fall a meager one Z-level (or sometimes, wouldn't @@ -433,28 +250,11 @@ LemonInTheDark: - bugfix: Wizards who exit rodform in a wall will no longer self gib. Skill issue? Mothblocks: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The Dynamic report for Peaceful Waypoint/Core Territory no longer guarantees providing any meta information. Previously, "Core Territory" guaranteed there were roundstart antagonists, and "Peaceful Waypoint" guaranteed the inverse. There is now a 15% chance to show the opposite result, meaning you can use the report as a good guess of what is coming, but cannot rely on it. -<<<<<<< HEAD - - refactor: Refactors reverse bear trap code. - - bugfix: You can now properly take reverse bear traps off of your head if you manage - to break free. - - bugfix: Wizards who exit rodform in a wall will no longer self gib. Skill issue? - - bugfix: fixes printing unresearched mech stuff and design disks - theOOZ: - - tweak: Updates "Poppy the Safety Possum" 's name to "Poppy The Safety Inspector". - - balance: 'Nerfs E-N''s explosion, buffs its laser output. qol: It is now clearly - indicated when E-N gets emagged.' - - rscadd: Adds a medium-risk progression traitor objective about E-N. - - rscadd: Adds a medium-risk progression traitor objective about Poppy the Safety - Inspector. - - bugfix: Fix Poppy's resting state. -2022-02-07: -======= RandomGamer123, Iamgoofball, IssacTheSharkWolf: - bugfix: Shuttles on multi-z stations now have ceilings! SuperNovaa41: @@ -476,7 +276,6 @@ - bugfix: fixes modsuit speed potion being fucky - qol: makes the gps module open the gps tgui instead of putting a gps in your hand - balance: Reworks the mining MODsuit, the full suit is bought from the mining vendor. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, PositiveEntropy: - imageadd: the elite nukie suit has new sprites - balance: the elite nukie suit starts with a little armor filled to standard by @@ -484,7 +283,6 @@ - balance: welding protection is now a part of the armor booster module, no longer a separate module in syndie suits - balance: adds a jetpack and holster to traitor modsuit -<<<<<<< HEAD Mothblocks: - bugfix: Fixed greyscale colors on female fitting versions of clothes. ORCACommander: @@ -505,9 +303,7 @@ It now properly scales exponentially. - rscdel: Removed the 'take' option for traitor uplinks in the traitor panel. - bugfix: It should no longer be possible to DC admins by spamming grenades. -======= Ghommie: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: blob overminds can now move vertically through station z-levels while its core hasn't been placed yet. - bugfix: disease mobs can too move vertically while a host hasn't been selected @@ -516,11 +312,6 @@ to be standing on or below open space. This also applies to other living mobs with generic incorporeal movement (not to be confused with the nightmare or wizard's jaunt) as long as they can fly or there's no gravity. -<<<<<<< HEAD - - bugfix: The song editor UI now updates properly on pianos/space minimoogs. - - bugfix: xeno egg now updates its icon properly when burst - - bugfix: Mapped in firelocks that are closed will STAY closed. -======= Jolly-66: - bugfix: Mapped in firelocks that are closed will STAY closed. MacBlaze1: @@ -545,87 +336,10 @@ TemporalOroboros: - qol: Used grenades now look used when examined. - bugfix: It should no longer be possible to DC admins by spamming grenades. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Wallem: - bugfix: Radio Gloves will no longer vacuum your earpieces when crafted. Wallem, Partheo & Tex: - imageadd: Ports canister sprites made by Partheo & Tex from Yogstation. -<<<<<<< HEAD - tf-4: - - bugfix: Victim logs are no longer mistakenly logged as subtler emotes. - - bugfix: The bamboo stool and carpskin chairs are no longer invisible. -2022-02-08: - LeonY24: - - rscadd: 'Glock-17: Black Mesa Edition' - - rscdel: No more Armadyne Glock-17 in the Black Mesa. - - bugfix: Ranged security from the Black Mesa finally shoot their foes with 9x19 - bullets, not 10mm. - SkyratBot: - - code_imp: changed a code-related default, please report if anything turns invisible - - bugfix: 'Literally unplayable bugs fixed: Pens can now be rotated again.' - - bugfix: TGUI alerts now display buttons in a column when there's more than 2 options. - - bugfix: TGUI alerts can now be disabled via turning TGUI inputs off in prefs. - - bugfix: Fixed some bluescreens related to TGUI inputs. - - bugfix: Fixes a runtime with material containers. - - bugfix: Tgui number input now uses a new component that makes it easier to use. - It now autofocuses and autoselects, just like the original. - - bugfix: Alert modals have been rewritten. Messages no longer clip, they also now - respond to TGUI input preferences (UI tab) and you can press ESC to close. - - bugfix: You should now be able to enter a blank text to succumb. - Stalkeros: - - balance: NPC HECU Grunts' caliber changed from .45 to .32, their gun also changed - from c20r to Wildcat respectively. - - bugfix: HECUs are now members of their own faction, as the God intended. - linnpap: - - rscadd: Added triple cat tail - tf-4: - - rscdel: Cortical stacks have been removed. - - code_imp: Collars are now coloured through GAGS rather than being polychromatic. - - bugfix: Cancelling renaming a collar will no longer give it a blank name. - - code_imp: The flat cap and flower pin now use GAGS - - rscdel: The turban, keffiyeh, and hijab have been removed - theOOZ: - - bugfix: Fixes some traitor objectives not awarding TC properly -2022-02-09: - Deek-Za: - - bugfix: Orderly/Engi Guard uniform sprites now work properly for Digi's. - Ebin-Halcyon: - - imageadd: Teshari now have properly fitting security clothing. - - imageadd: Elite and new Mining MODsuit digi sprites - - bugfix: Central command has tailored their new jumpsuits to fit on digitigrade - officers and officials. Along with their digitigrade official's suits not flickering - into two different variants. - ErdinyoBarboza: - - bugfix: Fixes the food prefs to enjoy eating (these) nuts and streamlines food - prefs. Please make sure to check your species tab to check your liked and disliked - foods. - Fikou, Imaginos, Azlan, Nerevar: - - bugfix: 'fixes modsuit speed potion being fucky qol: makes the gps module open - the gps tgui instead of putting a gps in your hand' - - balance: Reworks the mining MODsuit, the full suit is bought from the mining vendor. - Gandalf2k15: - - rscadd: Explosion effects have been improved. - - rscadd: Sexuality preference. - Goffy: - - rscadd: Makes it so that succubus milk and incubus draft chems change gender when - genderswapping is enabled upon OD. - GuiltyNeko: - - bugfix: Delta Station Air mix is now set to the correct ratios - - bugfix: Renamed the cycling on some doors to "entrance" from "entrence" - Iamgoofball: - - balance: The Galactic Gene Therapy Consortium would like to issue a PSA regarding - size gene mods and abnormally sized humanoids. It is not advised to use size - adjusting gene modifications while abnormally sized, as adverse side effects - can occur, up to and including a very painful death. - Melbert: - - bugfix: Fixes a runtime which causes game start to fail and revert occasionally - - bugfix: Obsessed hug objective functions again - Nari Harimoto: - - bugfix: Icebox medbay has had a slight change in the lobby and pharmacy to fix - some ugly spots - - bugfix: Icebox dept order consoles now work, both the computer and the wallmounted - ones -======= Watermelon914: - bugfix: Fixed how the diminishing returns of having too much progression scaled. It now properly scales exponentially. @@ -647,7 +361,6 @@ - refactor: Refactored the entire rotation component and all objects that use it. Remove a lot of deprecated code to make things cleaner. 2022-02-08: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Necromanceranne, quin: - rscadd: Adds the Inferno and Cryo Pistols. A hybrid energy/ballistic weapon, to cargo. It can be purchased in either a goodies pack or a normal crate order. @@ -662,14 +375,6 @@ - rscdel: Removes WT-550's from cargo and related content from the techweb/protolathes. - balance: Exotic Ammo is now much earlier in the tech web to take the place of Ballistic Weaponry. -<<<<<<< HEAD - RatFromTheJungle: - - tweak: modularizes the WT550's as upstream removed them. - SkyratBot: - - bugfix: fixed some hud items layering improperly - - bugfix: Fixed an issue where holopay range could be bypassed by handing the card - off. -======= OrionTheFox: - imageadd: The Suit Storage Units now have a Locked indicator on their lights! In exchange, decontamination above safe levels has a slightly different indicator @@ -775,14 +480,12 @@ - imageadd: On the mapping end, there is now a new area turf sprite for the definition of the area where you store all of the parts for telecommunications, or "Telecommunications Storage". How gorgeous. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Atmospheric Technicians can now take it easy, as the room that normally holds all of the canisters of highly flammable gas is now cleanly labelled "Gas Storage" instead of being another appendage of the absolute auditorium known as Atmospherics. spriteadd: The Atmospheric Storage Area Turf now has a new sprite. If you know what that means, I hope you enjoy it. If you don''t, that''s also fine.' -<<<<<<< HEAD - refactor: The environmental atmos scanning ability of the gas analyzer is now a component. - bugfix: Restores the lost sprites for the Centcom gas mask. @@ -874,7 +577,6 @@ - spellcheck: the kiosk scanner wand's description is now better. - bugfix: Being in the bar lounge makes extroverts happy once again! - bugfix: Unused Rubbershots are no longer invisible -======= 2022-02-10: ArcaneMusic: - bugfix: Some food can once again be exported through the cargo shuttle. @@ -888,19 +590,11 @@ JohnFulpWillard: - bugfix: Unused Rubbershots are no longer invisible Krysonism: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Clownanas are slower, but still faster than humans. - balance: 'Clownanas no longer passively drop bananas, but gain an action that lets them drop three peels with a cooldown of 10 seconds. balanance: Clown simple mobs now speak & understand monkey. balance Clowananas now get another new ability: Drop a monkey energy infused banana bunch, hit it to unleash a honkerblast!' -<<<<<<< HEAD - - imageadd: Gives rubbershot and rubbershot boxes a new sprite to differentiate - them from beanbags. - - spellcheck: Add a message when infinite pizza is generated. - - spellcheck: replaced mentions to toxins with ordnance in valentine cards in time - for the 14th -======= Kylerace: - bugfix: you can now set headset channels without them resetting themselves again Lyn505: @@ -913,13 +607,11 @@ carshalash: - bugfix: Being in the bar lounge makes extroverts happy once again! jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: TGUI now alerts the user when it is waiting on a refresh cooldown. In many cases, this will prevent screens from breaking that rely on static data. - bugfix: After a union dispute, shuttles can now leave the station in one piece. Fixes an issue where shuttles would just leave sections and players on the way out. -<<<<<<< HEAD - bugfix: Fix a freak occurrence where random job allocation would sometimes randomly assign players to roles that were full, fixing bugs like multiple QMs. - bugfix: Some food can once again be exported through the cargo shuttle. @@ -978,7 +670,6 @@ the final rituals have been changed a bit! qol: Using the Heretic''s Mansus Grasp on surfaces (EX: Rust Grasp) now works on right-click, instead of combat mode. qol: Used heretic influences can now be removed with a Anomaly Neutralizers.' -======= timothymtorres: - spellcheck: Add a message when infinite pizza is generated. tralezab: @@ -1028,7 +719,6 @@ - qol: 'Using the Heretic''s Mansus Grasp on surfaces (EX: Rust Grasp) now works on right-click, instead of combat mode.' - qol: Used heretic influences can now be removed with a Anomaly Neutralizers. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Some heretic rituals are now limited in the amount they can make. You can only have up to 2 heretic blades crafted at once (3 if you are Path of Flesh). - balance: The Lord of the Night has been buffed to be a little scarier. Did you @@ -1044,36 +734,17 @@ - refactor: Refactored and improved much of Heretic code. Improved the file structure dramatically. - admin: The heretic's traitor panel has been beefed up a bit. -<<<<<<< HEAD - SkyratBot: - - bugfix: you shouldn't get permanently locked by malf ai robofab now - - rscadd: Engineering Unions are planning strikes after their break rooms have been - slashed in half by Nanotrasen on DeltaStation and KiloStation. - - bugfix: Chaplain Sparring sect's soulstone now has their intended unique name - and description. - - bugfix: Hopefully fixes sparks just, sitting in the air sometimes. At the very - least it'll cause more visible complaints - - refactor: Timer subsystems can now recover from a deleted MC properly. - - bugfix: blast doors no longer give you a balloon alert about opening it first - when you crowbar them open while unpowered - - bugfix: Fixed active objectives spontaneously failing over time. - - rscadd: On IceBoxStation, the Transit Tube Room is no longer mislabelled as a - Storage Room. -======= OneAsianTortoise: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixes not being able to use tools on account registration device and it functioning without power - imageadd: gives account registration device a unique sprite instead of weapon recharger sprite -<<<<<<< HEAD - bugfix: Mime finger guns cannot be used while you have something in your hand. - bugfix: Dronespeak manuals now can actually only be used on silicons and drones. - bugfix: USB cables no longer allow you to bypass the gas pumps pressure limits of 0-4500 kPa. - bugfix: Hiding inside a container no longer allows you to bypass the tramstation perma gate. -======= RandomGamer123: - spellcheck: Fixes minor spelling error in the guide for synthesising omega soap bun235: @@ -1083,15 +754,12 @@ san7890: - rscadd: On IceBoxStation, the Transit Tube Room is no longer mislabelled as a Storage Room. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Nanotrasen has come out with a new way to define the loot-laden maintenance tunnels of KiloStation. This shouldn't affect anything more than just how they get their power, though. - rscadd: On KiloStation, there is now a door between Fore and Fore/Starboard Maintenance. I hope this helps you sleep better at night. -<<<<<<< HEAD - bugfix: Chameleon items now cover the correct slots of whatever they're mimicking -======= - bugfix: If you've been noticing some very-dark plating outside of Engineering, it has now been fixed. - rscadd: Engineering Unions are planning strikes after their break rooms have been @@ -1125,14 +793,12 @@ RandomGamer123: - bugfix: Dronespeak manuals now can actually only be used on silicons and drones. Watermelon914: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Added a lot more logging to admin circuits - admin: Admin circuits display names will now replace the entire name of the shell. - admin: Save Shell component will no longer load the variables that were saved for a shell. - bugfix: Fixed several things breaking with mobs whenever an integrated circuit was spawned with a shell. -<<<<<<< HEAD - bugfix: Role-restricted and species restricted items can be purchased again. - bugfix: Species-restricted items no longer appear in surplus. - bugfix: Cargo Officers on Delta have been given a locker @@ -1300,7 +966,6 @@ - rscadd: The Chaplain's office was split in two by maintenance on Kilostation, and Nanotrasen has finally bothered to install an APC in the part where all of the caskets were kept. -======= - expansion: Adds a trigger version of the current variable setter circuit component. - bugfix: Fixed active objectives spontaneously failing over time. cacogen: @@ -1321,7 +986,6 @@ - bugfix: Species without hearts can get Living Hearts now. RandomGamer123: - expansion: 'Kudzu now has a new mutation available: Cold-proofing' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Kudzu now stops spreading if the tile it is on is under 100K without the cold-proofing mutation. - balance: Kudzu now has a severity system for mutations. Different mutations cost @@ -1346,10 +1010,8 @@ - bugfix: Venus human traps' vines now get deleted after they die. - bugfix: Unsuitable cold and heat damage for simplemobs don't get overrided by unsuitable atmos damage anymore. -<<<<<<< HEAD - bugfix: Staff at Centcom are busy people! They are no longer allowed to go on valentines dates. -======= RaveRadbury: - qol: Added a day to the start of the Valentine's event. Watermelon914: @@ -1443,14 +1105,12 @@ san7890: - bugfix: The Lizard's Gas will no longer start out with Active Turfs at the start of a round. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Across all of Nanotrasen's active stations, the little cubby pocket colloquially known as "Security's Medical Ward" has now been standardized with it's own area name. Our little buddy is growing up! - rscadd: In order to give such an important area a much needed upgrade, Nanotrasen added an whole extra three cubic meters to the medical area of the Security division of the station. Feel free to kick out those legs. -<<<<<<< HEAD Zenitheevee: - balance: removes milk's healing and usage from breastmilk. jjpark-kb: @@ -1485,7 +1145,6 @@ - bugfix: Fixes an issue with the Ian respawning side of the "Ian Adventure" station trait. - soundadd: Brimdemons have a different laser firing sound. -======= - rscadd: The Chaplain's office was split in two by maintenance on Kilostation, and Nanotrasen has finally bothered to install an APC in the part where all of the caskets were kept. @@ -1530,14 +1189,11 @@ SmoSmoSmoSmok: - bugfix: Clown cyborg soaps will no longer bug out after running out of uses Timberpoes: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: SDQL2 commands that attempted to _new some very simple datums will no longer runtime. Wallem: - bugfix: Fixes sign language users not being able to sign in space. Fixes the visual indicator when attempting to sign while cuffed. -<<<<<<< HEAD -======= jlsnow301: - bugfix: Following numerous reports, CentCom has downloaded more RAM into the Orion Trail arcade machines, thus drastically reducing the occurrence of loading screens. @@ -1551,7 +1207,6 @@ - bugfix: Snow will now behave properly inside ruins on IceBox Station. - bugfix: On KiloStation, Atmospherics no longer owns a weird sliver of the Incinerator room. It didn't make sense, but now it is fixed. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tastyfish: - rscadd: Newscasters, request consoles, and status displays now have a backlight on their displays and emit a soft glow. @@ -1559,7 +1214,6 @@ to work with being emissive. - refactor: Internally refactored status display visual updating, so that it retains state across power loss, etc. -<<<<<<< HEAD 2022-02-20: SkyratBot: - admin: Facehuggers leaping onto people's faces is now logged in the facehugged's @@ -1577,7 +1231,6 @@ prompt sound SkyratBot: - bugfix: arm implants breaking the drop key -======= thestubborn: - balance: Gave the Saints Suit cold protection. timothymtorres: @@ -1597,13 +1250,11 @@ - admin: asay pings now have their own unique sound instead of sharing the vote prompt sound Timberpoes: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The CRAB-17/Nanotrasen Space-Coin Market is now indestructible. Attacking it repulses you back one tile instead. ID cards now instantly swipe on it instead of requiring a progress bar, and ID card holders like PDAs and wallets can also be directly used on it without having to remove IDs. It still blows up when all ID cards with bank accounts have been swiped on it or after 8 minutes. -<<<<<<< HEAD - balance: every modsuit theme can hold more stuff in suit storage - bugfix: Snow will now behave properly inside ruins on IceBox Station. - balance: Paramedics no longer have access to Auxiliary base, the Supermatter engine @@ -1719,7 +1370,6 @@ Melbert: - bugfix: Eldritch Amulet no longer gives thermal vision when it shouldn't SkyratBot: -======= Watermelon914: - bugfix: Fixed progression traitor uplinks suddenly changing owners when implanted with an uplink implant. @@ -1794,7 +1444,6 @@ - bugfix: Players are no longer able to create walls using sheets that arent linked to a material TiviPlus: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed gygax smash not logging the driver - bugfix: Fixed mechs being punched using power but punching as a mech not using power @@ -1805,7 +1454,6 @@ nothing - refactor: Mech punch code partly redone - admin: mech punches will now ALWAYS be logged, even against objects -<<<<<<< HEAD - code_imp: adds p_theirs() proc - code_imp: reshuffled some mech bay code please report issues on the github - bugfix: An odysseus' sleeper will now realize when a previously contained patient @@ -1819,14 +1467,11 @@ expanded from off-station blobs - bugfix: Fixes issue with cores and nodes having their color applied twice - rscadd: Ratfish can now be found in moisture traps. -======= - code_imp: reshuffled some mech bay code please report issues on the github ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed distortion effects cutting each other Wallem: - rscadd: Some prisoners have been complaining about the cold weather in the permabrig, so we've dug through disposals and found a couple hats for 'em. -<<<<<<< HEAD YakumoChen: - refactor: MCR lathe design stuff - bugfix: A bug in one of the material costs for one of the camos @@ -1915,7 +1560,6 @@ cutouts you might find lying around, these ones EXTRA "RR-REAL HELP M-". Whatever that means. 2022-02-27: -======= cacogen: - qol: RPED now swaps in cell with greatest charge (of highest tier) first - balance: Blobs can destroy mineral turfs like they can walls @@ -1950,14 +1594,12 @@ - code_imp: Moisture traps are coded a little better now - spellcheck: fixed some wording in the moisture trap bite feedback 2022-02-25: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ATHATH: - bugfix: Buckling yourself to and then unbuckling yourself from a stasis bed will no longer permanently halt the effects of any gravitum in your system. - bugfix: Liverless creatures can no longer retain the effects of gravitum indefinitely, as it will now decay in their bodies (just as it does in the bodies of livered creatures). -<<<<<<< HEAD Melbert: - bugfix: Fixes a few potential issues with heretic rituals. - code_imp: Adds proper stack support to heretic rituals. Also allows for more specific @@ -1987,7 +1629,6 @@ - bugfix: Examining cells won't say they have 0% charge when the overlay indicates they don't - code_imp: Fixes some code style issues for more free GBP -======= Christmas5: - bugfix: Added the missing variable "plane" to floor lights. JohnFulpWillard: @@ -2055,18 +1696,15 @@ max_integrity and integrity_failure values. Ryll/Shaps: - bugfix: Projectiles now respect armor again ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Wallem & Imaginos: - balance: Splits biobags into virology & science bags. Virology bags can't hold slime cores or cytology equipment, and science bags can't hold medipens & bloodbags. - imageadd: Changes all storage bag sprites -<<<<<<< HEAD Zonespace27: - bugfix: There is no longer a "generic" item in the OPFOR services tab. tastyfish: - bugfix: Opening an air alarm panel now renders the overlays correctly. - rscadd: Most status displays now have USB support for circuits. -======= cacogen: - bugfix: Examining cells won't say they have 0% charge when the overlay indicates they don't @@ -2151,4 +1789,3 @@ with their progressive nature cakexensen: - bugfix: Poly's death streak resets upon surviving ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-03.yml b/html/changelogs/archive/2022-03.yml index fa189e22c23..e9ee9eca778 100644 --- a/html/changelogs/archive/2022-03.yml +++ b/html/changelogs/archive/2022-03.yml @@ -1,56 +1,4 @@ 2022-03-01: -<<<<<<< HEAD - Axietheaxolotl, PositiveEntropy: - - imageadd: Nanotrasen has now tackled overhauling the visual aesthetic of the Chief - Medical Officer, changing their jumpsuits and labcoat, and altering their original - pastel blue color to turquoise! - - imageadd: Nitriles now look much more rubbery than before! - ErdinyoBarboza: - - bugfix: Fixes DeltaStation Service area AI pathfinding. Bots will no longer get - stuck on the railings. - Gandalf2k15: - - rscadd: Different objects now have different bullet impact sounds. - Melbert: - - balance: Raw Prophets have been adjusted slightly. They now have more max health, - a slightly lower sight range (but the ability to toggle it on or off), drop - all their component parts on death, and do more damage for every consecutive - attack on a target they do. - Ryll/Shaps: - - admin: You can now create links to a datum's VV window in asay by posting the - datum's memory reference. The reference is now printed in the VV menu right - below the fancytype, for copying purposes.. - - admin: Tagged datums will now show their tag index in VV - - bugfix: Projectiles now respect armor again - SkyratBot: - - spellcheck: fixes false info with vampires becoming bats - - bugfix: If you've ever walked through the maintenance tunnels near DeltaStation's - Atmospherics and spotted a very dark lattice, it has been fixed. - - admin: Going stealth mode now drops your orbiters and blocks you from being orbited. - - bugfix: fixes accounting's alert being cut in half - - bugfix: the description of traitor under antagonist preferences is now up to date - with their progressive nature - - admin: Since _pick doesn't accept lists, I've added _pick_list for you to use - in sdql. Please table everyone on the station kthnx - - bugfix: fixed vv checking if the client is a turf, and instead checked the thing - that might be a turf, properly updating the vv window - - bugfix: On TramStation, the Ordnance Burning Room (for your Tritium) no longer - owns that bit of space where noxious gases are meant to vent out into. - - bugfix: Poly's death streak resets upon surviving - - bugfix: fixes thieves not being able to complete the guns objective - - bugfix: You no longer need an entire wheel of cheese to make Moth Foods - - bugfix: In MetaStation Atmospherics, the floor light is no longer installed right - on top of a canister. - - rscadd: adds helianthus cocktail - - bugfix: Security can now once again lock down the brig front desk on Icebox - - bugfix: The AI no longer can start a full OSI investigation when the tips of your - combat boots hit Kilostation, thanks to the fact the firedoors that formerly - automatically triggered the fire alarm whenever you use the external airlocks - are gone. -2022-03-02: - SkyratBot: - - refactor: redid some savanna-ivanov mech code please report any new issues on - the github -======= Axietheaxolotl, TetraZeta, PositiveEntropy, FuryMcFlurry: - imageadd: The detective outfits, the blueshift uniform and the constable outfits have been redone! @@ -75,75 +23,11 @@ - expansion: Introduces new non-alcoholic beverages to be made at the bar! - imageadd: Sprites for these new beverages! Not just coloured glass san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: On Meta, Delta, and Tram Stations, expect to see the word "Funeral" dance across your eyes a few times as you enter the chapel. - rscadd: On IceBoxStation, the Chapel has undergone some new area definitions, and the wiring for the power to these areas have changed a bit from what you were accustomed to previously. -<<<<<<< HEAD - - bugfix: Fixed being able to push "off" something you're moving towards, allowing - for infinite movement in one direction in space, at your walk speed - - bugfix: Fixes a weird bug with spellbooks that may have been locking some spell - options when you did some specific actions - - imageadd: New fireaxe inhand, worn, and in cabinet sprites. - - bugfix: lobstrosities charge now - tf-4: - - tweak: '"Nanotrasen Representative" has been renamed to "Nanotrasen Consultant".' -2022-03-03: - OrionTheFox: - - bugfix: Nanotrasen has properly updated their databases with their rebranding - of Representatives to Consultants (Icons r fixd) - tastyfish: - - bugfix: NT's technicians have gone around and calibrated the horizontal align - on the air alarm screens. -2022-03-04: - GoldenAlpharex: - - imageadd: Nanotrasen's Fashion Department has released a brand-new fancy suit, - which can be easily recolored before sale in any ClothesMate, and offered as - an option for the employees that want to go to work in STYLE. - - bugfix: Fixed the greyscale gradient on the Tamamo Kitsune Tails and the inner - part of the Fox ears, to be easier to work with color-wise. - SkyratBot: - - code_imp: Fixes a minor code styling issue with atmos. - - refactor: Converts airlock controllers (ie incinerator access consoles) to use - TGUI. - - spellcheck: Fixes a spelling mistake in thief lore blurbs. - - bugfix: Prevents exploit allowing you to monitor Centcom and CTF frequencies. - - bugfix: Various cooking recipes that simply said they required 'food' now properly - use plain bread slices. - - bugfix: Fully eating a can of pine nuts no longer creates an error sprite. - - balance: 'Hand mining weak turfs (i.e. snow) is now affected by mining level (so - legendary would take 7.5 seconds instead of 15) qol: Multiple people can now - attempt to manually mine the same mineral turf qol: If you fail to manually - mine a turf you can try again immediately instead of having to wait for the - cooldown to end' - - bugfix: You can no longer mine a snow turf by hand if you're already doing it - - code_imp: Uses variables and time defines for mining speeds instead of deciseconds - and magic numbers - - bugfix: modsuit clamp can carry wrapped crates - - bugfix: modsuit activation is no longer affected by do after slowdowns - - imageadd: Congratulations, you now have a new Area Turf Sprite for Engineering's - Technical Storage. - - code_imp: minor change to TGUI button content to use flexboxes. This caused a - bug in the past, report if you notice anything weird. - - imageadd: Power cells and the cell charger have been resprited, the charger will - now look correct with a much wider variety of non-standard power cells - - rscdel: Removed the uncraftable 15k charge high-capacity power cell+, all instances - have been replaced with the regular 10k charge high-capacity cell - - bugfix: Erroneous power cell charge indicators have been removed from many non-standard - types of power cells - - bugfix: All varieties of marauder mech including the nuke ops mauler come with - a bluespace power cell, consistent with other nuke op mechs - - bugfix: Power cell charge indicators will now update while in a cell charger - - bugfix: Potato and other crop batteries will not have their wires disappear when - on cell chargers - - bugfix: Robotic basic and simple mobs are now damaged by EMPs. - - bugfix: Instant recall spell no longer recalls anchored objects, such as microwaves, - if the marked item is placed inside of one. - - bugfix: you can knock monkeys over by crossing them again. - Wallem: -======= tralezab: - bugfix: Fixes a weird bug with spellbooks that may have been locking some spell options when you did some specific actions @@ -185,150 +69,12 @@ - bugfix: We gave the wisdom cow its tongue back. We're sorry. - qol: Adds a minimum threshold to ingested ant screaming. - qol: Ants are no longer lavaproof. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Adds a minimum threshold to ant piles biting through shoes. - balance: Giant ants are now peaceful hostile mobs. This means they will attack anything that does not have the "neutral" factiontype. To compensate, the price to make one has been raised. - imageadd: It appears the invasive "space ant" has gotten into our formerly secret uranium reserves and as such have mutated slightly, gaining a slight bioluminescence. -<<<<<<< HEAD - tastyfish: - - bugfix: Papers and photos pinned to airlocks now actually animate. -2022-03-05: - Ebin-Halcyon: - - rscadd: A shipment of energy fire axes, portascrubbers, and porta pumps have been - sent to DS-2 - ErdinyoBarboza: - - refactor: Modularized vapes and vape carts in cigarette vendors. Ghost and Syndicate - Base roles can now get vape pens! - Jolly-66: - - bugfix: Multiple Active Turfs from our maps have been removed. - Melbert: - - bugfix: Minor fixes for the Heretic's Living Heart ritual. Cybernetic organs are - now properly detected. - - bugfix: Similarly, you cannot feed the mawed crucible cybernetic organs. - Merek2: - - rscadd: Added old Firefighter to Atmospherics Technician, Fixed Barber, new off-duty - title. - PositiveEntropy: - - imageadd: Nanotrasen has now officially updated all generic jumpsuits and the - prisoner one, marking the third rendition of jumpsuit styles being added into - station! - Reco201: - - bugfix: Cargo Zoombas can now wear hats correctly. fix:Cargo Zoomba lights while - moving north no longer leave the body. - SkyratBot: - - bugfix: The clown dagger null rod is visible again - - admin: player playtime is now sorted and links player panel - - bugfix: Sentient elites falling in chasms will no longer spam chests. - - balance: Lowered thieves cost from 6 to 4. - - balance: Disabled midround thieves. - - spellcheck: Doorjacks now use singular/plural for charges left correctly. - Wallem: - - bugfix: We gave the wisdom cow its tongue back. We're sorry. - Zonespace27: - - refactor: Refactored dildoes. - - balance: CFA Wildcat crate now costs 3000 instead of 11000 - - bugfix: Modular Laptop loadout item will now spawn again - - rscadd: Added Temperature gunkit to the goodies tab in cargo for 560 credits. - - bugfix: The shibari uniform no longer has suit sensors - ma44: - - refactor: Basic AI movement has been refactored to clean it up a bit - nikothedude: - - bugfix: fixed ashie bronze boots - softcerv: - - bugfix: the hyposray injection now counts as an injection. - tastyfish: - - imageadd: Solar panels and trackers have new sprites and a 2.5D effect. -2022-03-06: - Ebin-Halcyon: - - imageadd: A new shipment of sweaters with actual turtlenecks have been sent to - Nanotrasen and the Syndicate! - - imageadd: Nanotrasen have refitted their new generic jumpsuits to fit with digitigrade - legs! - Gandalf2k15: - - rscadd: Welding now displays a spark effect. - GoldenAlpharex: - - code_imp: Added a few more options for woman clothing auto-cropping, hopefully - to help making certain outfits look less scuffed. - - imageadd: Fixed the side views of the suits for woman, that previously looked - -very- scuffed, as a proof of concept for the new female auto-cropping masks. - Melbert: - - bugfix: Fixes summon magic and summon guns - - refactor: Refactored wizard rituals (events/ghosts/guns/magic/madness) to reduce - code copy+paste. - RatFromTheJungle: - - balance: Lowers block chance of double energy sword to 45, from 75. - SkyratBot: - - imageadd: new front and backfacing jackboot sprites - - bugfix: Fixes bug where batons without cells could turn on after being EMPd - - bugfix: Building walls with snow now take time to do, like every other type. - - code_imp: Defined turf environment types. - - imageadd: Sprites for these new beverages! Not just coloured glass - - spellcheck: Removed wrong text in esniffers saying ghosts using them sends the - signaller inside of it's, frequency. - Zonespace27: - - rscadd: Added MCR and Wildcat goody packs to cargo along with their associated - ammo. - - spellcheck: Corrects a plural to a singular in the WT-550 Single-Pack - axietheaxolotl: - - imageadd: New sprites for Lesbian and Intersex pins, and also re-does the already - existing pins. - axietheaxolotl, Imaginos16: - - imageadd: New sprites for the CMO's turtleneck/skirtleneck, paramedic jumpsuit/jumpskirt, - virologist jumpsuit/jumpskirt, and chemist jumpsuit/jumpskirt -2022-03-07: - Axietheaxolotl, TetraZeta, PositiveEntropy, FuryMcFlurry: - - imageadd: The detective outfits, the blueshift uniform and the constable outfits - have been redone! - - rscdel: Removes the pantyhose from the HoS Parade Skirt - Melbert: - - bugfix: Heretic Smugglers (latejoin heretics) actually spawn influences - SkyratBot: - - bugfix: Windoors created by the RCD are correctly named - - bugfix: Windoors created by the RCD work properly with require one access - - bugfix: 'Windoors with unrestricted directional access open properly when operated - from the same tile qol: Windoors have unrestricted directional access overlays - like airlocks now' - - bugfix: Fit viewport will properly well, fit your viewport now. Broke when we - removed the status bar. It'll also attempt to autofit if you change your pixel - scaling. Godspeed - - bugfix: Copying reagents will now also copy the temperature of those reagents. - - code_imp: A single letter variable has been expanded. - - balance: The Science Hub app can now be downloaded and launched by science employees. - - bugfix: Fixed vaccines not being able to be moved through chem buffers. - - bugfix: Fixed Roy Rogers and Sodium Thiopental not applying their effects. - - balance: Fake beer has been renamed from "Beer" to "Beer...?" - - spellcheck: you will no longer be asked to be wearing Wheelys when trying to activate - ski shoes and rollerskates - - bugfix: Blowguns no longer have a trigger guard - - rscadd: Added a usb port to fire alarms - - imageadd: On the mapping-end, the engraved cult floors will no longer show up - as base plating, but instead what they actually look like in game. - - imageadd: The poll button in the lobby has been changed to better represent its - functionality. - - bugfix: Fixed the inputs for the linear and exponential sustain settings of the - song editor (instruments UI). - - bugfix: Slappers and circlehands don't fit in storage bags anymore. - - bugfix: Mappers now no longer have to stare a green square and extrapolate the - position of an air alarm based on that. - Twaticus, PositiveEntropy, Axietheaxolotl: - - imageadd: 'Resprites the Warden''s Jackets and Jumpsuit, the HoS Jumpsuit, the - Formal Jackets, the Bulletproof and Regular Security Helmets and the Security - Jumpsuit! expansion: adds a red warden hat to match with the warden''s red uniform!' - - rscdel: Removes unused helmet camera sprites. -2022-03-08: - Ebin-Halcyon: - - bugfix: NT consultant clothing shows up for Teshari now - SkyratBot: - - bugfix: Fix the gas pump's icon not updating when turned on/off with circuits. - - bugfix: Alt-clicking plumbing IV drips now rotates them like other plumbing components. - - rscdel: Alt-clicking IV drips no longer sets the transfer rate to max. - - bugfix: Fixed bot trails and launchpad targeting being invisible. Made bot trails - look a bit nicer. - - bugfix: Bots will no longer attempt to infinitely move into railings -======= cacogen: - balance: Hand mining weak turfs (i.e. snow) is now affected by mining level (so legendary would take 7.5 seconds instead of 15) @@ -387,7 +133,6 @@ tastyfish: - bugfix: Papers and photos pinned to airlocks now actually animate. vincentiusvin: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Ordnance have been updated to enable the publication of papers - rscadd: Several new explosive and gas synthesis experiments have been added to ordnance @@ -397,37 +142,15 @@ exotic gases and complete experiments. - balance: Several techweb nodes are locked and require toxin experiments to complete. - balance: Toxins can purchase boosts for various techweb nodes. -<<<<<<< HEAD - - balance: 'You no longer need to anchor doppler arrays for it to work. qol: Doppler - array and implosion compressor now supports deconstruction, implosion compressor - construction added. qol: Doppler now emits a red light to denote it''s direction - and it being on. Doppler not malf.' -======= - balance: You no longer need to anchor doppler arrays for it to work. - qol: Doppler array and implosion compressor now supports deconstruction, implosion compressor construction added. - qol: Doppler now emits a red light to denote it's direction and it being on. Doppler not malf. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Implosion compressor renamed to anomaly refinery. - code_imp: Created a new program tab "Science" for the downloader app. Removed Robotics. - refactor: Reworked the code for bombspawner (used in the cuban pete arcade game) -<<<<<<< HEAD - - rscadd: Right-clicking to splash reagents requires combat mode - - rscadd: 'Remember the above qol: You now right-click the janitorial cart to wet - mops and left-click to put them away qol: You can right-click the janitorial - cart with an empty hand to quickly remove your mop qol: You now right-click - to put things in the trash bag qol: Left-clicking the cart with an empty hand - will skip the radial menu if there''s only one item in the cart' - - rscadd: Adds examine hints for these changes - - bugfix: Fixes overlays not immediately updating when filling janitorial cart - - bugfix: Fixes bludgeoning janitorial cart when filling it - - rscadd: You can right-click with "glass" reagent containers (e.g. buckets) to - fill from drainable containers like janitorial carts - - code_imp: Improvements to janitorial cart code -2022-03-09: -======= 2022-03-05: Fikou: - admin: player playtime is now sorted and links player panel @@ -545,216 +268,12 @@ Melbert: - expansion: 'Kilostation: Service and (slight) command remap! Service hall now included.' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert, sprites from NecromancerAnne: - balance: The Silverscale species are now pierce-immune and pressure-immune (NOT temperature immune though). - balance: Beefed up the Silverscale pirate gang. Their shuttle now has extra ammo and additional general supplies. They're also now equipped with "Prime Nagant"s, which don't jam and have a unique sprite. Regal, fancy! -<<<<<<< HEAD - SkyratBot: - - imageadd: Hey there, if you like mapping, just know that we added some more area - turf sprites to help clarity and contrast between different area for Atmospherics. - That should help someone, I know it. - - bugfix: debug modsuits now are insulated - - refactor: Moves more tool behavior out of attackby(). - Zonespace27: - - rscdel: Removed Block and Purge Malf AI objectives - jjpark-kb: - - rscadd: added skills for fishing and production (ceramics and glassblowing) - - rscdel: 'removed skill chips for fishing, ceramics, and glassblowing qol: clay - is now a stackable item qol: fishing rods are no longer force dual-wielded unless - you want to fish' - - code_imp: cleaned up some forging, fishing, ceramics, and glassblowing code -2022-03-10: - SkyratBot: - - bugfix: fixes mod plating being called armor in some places - - bugfix: Ollieing onto empty space makes you fall like it should. - - bugfix: abstract movement now checks for cordon turfs - - imageadd: You may now use the pensive emote in OOC chat, just like you would in - your favorite messaging app. - - balance: Nations can't roll other antags when it runs. - Tastyfish: - - imageadd: Added wheely, roller skate, and ski sprites for digigrade, vox, and - teshari legs. - Wallem: - - refactor: De-Hardcodes decomposition timers. The decomposition time can now either - be custom or use the existing automatic food flag system. -2022-03-11: - Gandalf2k15: - - rscadd: Boxes have been enhanced. - GoldenAlpharex: - - bugfix: Fixed vehicles being invisible outside of your field of view. Mechs are - not stealthy, nor are skateboards. Deal with it. - - bugfix: Fixed megafauna being invisible outside of your field of view. What a - terribly idea that was. - RatFromTheJungle: - - rscadd: Adds a deployable barricade crate to cargo lists. - SkyratBot: - - bugfix: The 2 types of weight machines now have unique in-game names. - - imageadd: New sprites for the weight machines. - - rscadd: A new intermediate tag for sec huds called "Suspected" that allows officers - to identify peoples of interest without raising their threat to where beepsky - will chase and attempt to apprehend them. Shows up as an orange '!'. - Zonespace27: - - balance: Thieving gloves now let you tie/untie shoe laces in half time. - - spellcheck: Fixed a pile of spelling errors with organic interface items - - refactor: Refactored yet more organic interface update code - - bugfix: You can no longer create blank messages with some organic interface items - - balance: Soulshards now require you to go through a five second actionbar to capture - a sould - - bugfix: Wooden Bows and blowguns no longer have a gun safety. - jjpark-kb: - - rscadd: 'added back the xenoarch digger qol: strange rock''s now have different - max depths depending on their reward' - - rscadd: added the seed mesh (craft-able through the forge workbench) - - rscadd: added a "kitchen" to the ashwalker nest (oven, microwave, etc.) - - balance: 'centrifuge is now craft-able through the forge workbench, no longer - in the crafting menu qol: centrifuge can now spin all chemicals besides the - one you choose' -2022-03-12: - BurgerBB: - - bugfix: Fixes abandoned crates exploding on empty-hand right click regardless - of intent. - GoldenAlpharex: - - refactor: A minor refactor was done to the persistent scars preference, allowing - it to finally be available in the preferences menu once again. - - bugfix: Fixed some overlay issues with certain *turf emotes related to tails, - to make them overlay properly over certain things such as chairs and sofas. - LemonInTheDark, MrStonedOne: - - code_imp: Adds a color blindness accessibility testing tool. Use it for testing - out your ui changes - MeyHaZah: - - imageadd: Resprites for every book - SkyratBot: - - bugfix: fixed an inconsistency where booze bottles and molotovs wouldn't splash - their contents when thrown at things while drinking and shot glasses do. - - bugfix: Fixes non-rustable turfs from becoming rusty. - - balance: Bump mining requires activehandedness - - code_imp: Bump click element for when bumping something should click it, like - mineral turfs - - bugfix: Fixes mobs able to move during charge delay after first charge - - balance: SM pluoxium production reduced by 500%, co2 consumed by the process decreased - by half - - bugfix: pAIs can be inserted into Vibebots again. - - bugfix: fixes Chili sin carne being uncraftable - - bugfix: HUD objects will no longer be hidden by things like blindness - - bugfix: The reality-correctioneers have removed the purple and black square that - shows up like 33% of the time in TramStation's Maintenance Tunnels. - - bugfix: fixes RCD not being able to be put in bags and belts by clicking. - - imageadd: For mappers, there is now a new icon that shows up when you place light - emitters down. It's a little bit more descript. - - bugfix: high frequency blade now works on mechs, metal gears and other vehicles - - admin: you can now varedit high frequency blade slash color - - bugfix: fixes tablet not updating appearance immediately after it is repaired - - bugfix: Female lizard's chests no longer poke out of their shirts. - - rscadd: Ghost darkness is now a game preference, and will persist between rounds - - balance: Ghost darkness defaults to a bit darker then currently. I think it looks - better - - bugfix: Fixes hitting snow turfs with a non-mining item to trigger hand mining - (which was something all cyborgs could do to mine) - - rscadd: Cyborgs can left-click with no active module to manually mine snow turfs - instead (takes 15 seconds per turf, good luck) - Wallem: - - code_imp: De-hardcodes random book icon state generation - axietheaxolotl: - - imageadd: New Archane Borg Sprites - capsaicinz: - - balance: shuttle 8532's syndicate modsuit is now locked in the bridge, and an - additional .38 speedloader is available. - - bugfix: ARBORLINK vault's lattices now fully enter the exterior grilles. - tastyfish: - - bugfix: Fixes clusterbuster segments working correctly/at all. -2022-03-13: - LeonY24: - - rscadd: P-90 SMG. Available at your local shitspawner. - Melbert: - - bugfix: Casters who sold their soul can no longer use Soul Tap - OrionTheFox: - - imageadd: Updated floor tile overrides to include all of TG's newer tiles, so - they now match ours - SkyratBot: - - bugfix: The barstools in the Nuclear Operative's Base now point the correct direction. - - code_imp: Because of the above, multitools can no longer be used to interact with - switches. Not like they did much, but well, so you know - - bugfix: On DeltaStation, certain wall appliances in the Telecommunications Office - no longer appear to be overlapping to those who are able to look at its walls - from both ends. - - bugfix: potentially fixed some admin features for mech equipment - - bugfix: being inside locker no longer protects you from a nuke - - balance: being inside the fridge guarantees you to survive nuclear bomb - - bugfix: Electric shocks now help against heart attacks. - - rscadd: Nanotrasen has decided to re-name the areas found on the mining station - bases of Lavaland and IceBox Station. - Stalkeros: - - rscadd: Adds PCV, a unique Black Mesa HECU-exclusive vest, available at your local - Gateway. - Stalkeros, LeonY24: - - rscdel: Deletes Scalamov in its entirety. - Zonespace27: - - bugfix: Spells now appear in the OPFOR list. - - code_imp: OFPOR item_type unit test added - nikothedude: - - bugfix: Wildcat rubbers now don't cause bleeding. -2022-03-14: - Ebin-Halcyon: - - bugfix: changed 'properly' in the energy axe's description to 'property' - - imageadd: 'Shorter Syndicate winter coat sprites expansion: Small DS-2 tweaks - to misc items and spawners' - Gandalf2k15: - - imageadd: Nihilanth has been updated spritewise. - - rscadd: Some spawners now have species restrictions. - - balance: Enclave pirates have been nerfed. - MMMiracles: - - bugfix: The chapel now has a mass driver for proper burial disposal. - - bugfix: The overhang in the dorm area no longer shows the walls below on the edges. - Melbert: - - code_imp: Made some species datums follow style guidelines slightly better (lists, - indentation, spacing, etc). - - refactor: Refactored how species pages are generated in the preferences menu. - Species themselves are untouched completely. Some species pages have been filled - our more (or less) as a result. - - bugfix: Monkeys how have a preference menu entry, as god intended. - Nari Harimoto: - - bugfix: Engineering borgs can now place wallmounts again - - imageadd: New thruster sprites to allow for in-wall designs - - bugfix: 'removed cycle helpers from 2 random tram maint airlocks that arent meant - to cycle (solo airlocks) and a duplicated APC in tram maint expansion: the tram - now has new walls! they are structures that function like walls so as to be - built on the tram, create and deconstruct via the new tram girder (screwdriver - on the girder to deconstruct, there is no displaced version ie wrench)' - OrionTheFox: - - bugfix: Trekkie Federation Caps object will no longer appear as giant ERROR Icons - SkyratBot: - - rscadd: Nanotrasen's new set of stations will all have different names for "the - rooms in which you did surgery in" (they're now called Operating Rooms" as well - as a new name, a Theatre (for surgeries). Isn't it great to have some guy poking - around your pizza-filled guts while a gaggle of people watch you through a window - of glass? - - rscadd: Instead of having four different corners on each floor, Nanotrasen has - decided to slap down full corners on each floor to keep that one floor looking - that masterful shade of beige. - - imageadd: Medkit sprites have now been updated to proper 3/4th perpsective. - - spellcheck: All instances of "firstaid" have been replaced with "medkit". - - refactor: Dehardcoded SSmapping ruin types. - - bugfix: Removed random wall from in front of the kitchen on Tramstation. - - bugfix: Kilostation will now generate a normal number of space ruin z-levels - - bugfix: Kilostation will now have the correct linkage between its space z-levels - - you can now easily go space exploring again. - - bugfix: Removed duplicate APC from Kilostation security office. - - bugfix: IceBox's Psychology office medical computer records console now faces - the right way. - - rscadd: On DeltaStation, Nanotrasen realized that the "Pumping Room" they elaborately - crafted for Atmospherics wasn't actually the part of that division that actually - moves gas to the rest of the station. They once again elaborately crafted a - new room (called the "Mixing Room") and shifted everything around. It probably - doesn't matter to YOU, though. - - bugfix: Fixed two firelocks being on the same tile in the derelict outpost space - ruin. - - bugfix: modsuit nominal sound no longer plays when youre deaf - - bugfix: Lattices removed from inside the walls of Icebox, Meta, Delta and Kilo. -======= cacogen: - rscadd: Right-clicking to splash reagents requires combat mode - rscadd: Remember the above @@ -791,12 +310,10 @@ - imageadd: Hey there, if you like mapping, just know that we added some more area turf sprites to help clarity and contrast between different area for Atmospherics. That should help someone, I know it. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The area where Atmospherics sends and receives gas from the entire station is now referred to as the "Pump Room". You can get some weights in there to train your trapezoids and deltoids (and a bit of bicep/tricep action), but that's up to you. -<<<<<<< HEAD SpaceVampire: - balance: Heretic sickle-sword now does 8 more damage, and has slight armor pen. - balance: Heretics are now able to have more of their weapons summoned at once. @@ -1082,7 +599,6 @@ How responsible! - bugfix: Nanotrasen realized that they should stop installing grilles right on top of the Air Flow Meters on IceBoxStation. -======= tralezab: - balance: Nations can't roll other antags when it runs. 2022-03-10: @@ -1131,7 +647,6 @@ - balance: SM pluoxium production reduced by 500%, co2 consumed by the process decreased by half Ghommie: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Becoming the patron of a painting now lets you select a different appearance for the frame it''s in. This appearance will persist between rounds (the ability to modify the frame won''t, though). The more credits have been spent on the @@ -1140,7 +655,6 @@ - bugfix: You can now sponsor a painting that hasn't been archived yet. Just make sure it's inserted in a frame with persistence on. - bugfix: fixed some mismatches between sprites and sizes for a few canvases. -<<<<<<< HEAD - admin: When you send people to Admin Prison for any number of reasons, please take joy in knowing they can't explode out the floors any more. - refactor: 'refactored the electrolyzer to use datumized reactions instead of hardcode @@ -1256,7 +770,6 @@ - rscadd: 'Newscasters have been moved over to TGUI, and with them several new features. expansion: Newscaster channels can now be given channel descriptions! expansion: Messages can now be censored by crew with brig access from any console.' -======= GoldenAlpharex: - refactor: A minor refactor was done to the persistent scars preference, allowing it to finally be available in the preferences menu once again. @@ -1811,29 +1324,10 @@ - rscadd: Newscasters have been moved over to TGUI, and with them several new features. - expansion: Newscaster channels can now be given channel descriptions! - expansion: Messages can now be censored by crew with brig access from any console. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Standalone bounty boards have been replaced with newscasters, as the two have been merged. - refactor: Bounty boards and newscaster code have been refactored in order to merge the two pieces of content. -<<<<<<< HEAD - Ebin-Halcyon: - - rscadd: Families WW3 reenactment gear have been added to the loadout. (Yuri, Allies, - and Soviet) - - rscadd: Crop top turtlenecks have been supplied to clothesmates as well. - Gandalf2k15: - - code_imp: Some mob spawners have been optimised. - - rscadd: A new(old) game mode! Assault operatives. - GuiltyNeko: - - bugfix: The matter manipulator is now ranged as is intended. - Helios7-1: - - bugfix: Fixes the Dark Medihound borg skin, allowing it to be selected again. - KathrinBailey: - - rscadd: Deltastation prison reverted to its old form, which is significantly better - suited for high population counts. - - rscadd: Deltastation security office reverted to its old form, a big single desk - instead of the weird whatever was. -======= GoblinBackwards: - bugfix: Fixed airlocks and windoors not being able to be attacked by melee weapons in combat mode. @@ -1913,7 +1407,6 @@ more charge than a regular high capacity power cell, didn't notice that right?) in Metastation engineering has been replaced with a regular high capacity power cell. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps and MrDoomBringer: - imageadd: Added new bleeding overlays for humans! People who are losing blood will now have overlays displayed on them that show which bodyparts are bleeding, @@ -1926,38 +1419,6 @@ for how much blood a slash can lose per tick has been raised slightly. - balance: Grabbing your own bleeding limb to staunch the bleeding is quicker and slows you down less -<<<<<<< HEAD - SkyratBot: - - bugfix: You can no longer create money out of thin air using bounty boards. - - bugfix: You can no longer offer things to yourself, choosing instead to take them - directly - - bugfix: 'Can no longer headpat mobs without heads expansion: Adds screentips for - headpatting, hugging and tail pulling' - - bugfix: fixes a bug that causes podpeople hair to crash the pref menu - - balance: Free Golems are now penalized for leaving their natural habitat - - spellcheck: made the reaction list on a few machines' ui (compressor, atmos control) - to be newlined. - - rscadd: Right-click with a MOD paint now lets you paint the suit's color! - - bugfix: charlie station dorms now only has one APC, as god intended - - bugfix: cleans up some force-feeding code indentation, and adds some headless - flavor - - bugfix: Bots blowing up can now be sorted under Info. - - bugfix: Gunpowder's reaction can now be sorted under Info. - - code_imp: boldnotice messages are now sorted under Info. - Tastyfish: - - bugfix: 'On Icebox: Medbay orders can now be opened in Medbay Central, the area - between the lobby and the treatment center.' -2022-03-30: - Cenrus: - - rscadd: Assault ops can now buy MODsuit modules at their vendor - - bugfix: Fixed assault ops not dispensing extra ammo for their weapons - - rscdel: Removed some useless armament entries - SkyratBot: - - bugfix: Some areas that were once pitch black are no longer - - bugfix: The thunderdome side rooms will now properly reset. - - admin: The thunderdome is now a placeable map template. - - bugfix: modsuit painting is fixed -======= Son-of-Space: - qol: Contractors lost some appliances in kitchen maintenance on MetaStation, BoxStation, and DeltaStation @@ -2006,14 +1467,12 @@ Son-of-Space: - rscadd: IceBox Station has a new Security Department TemporalOroboros: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Improvements in the smoke powder formula have resulted in a doubling of the maximum possible carry density for the resulting clouds. This brings it to par with the fluorosurfactant formula in this area. - balance: Fluorosurfactant no longer acts as an arbitrarily powerful accelerating catalyst in an emulsified state. Research into foam based thermobaric weaponry has begun. -<<<<<<< HEAD - bugfix: The Zeta emergency shuttle's brig now travels with the rest of the shuttle - bugfix: you can no longer push ash drake corpses into doors 2022-03-31: @@ -2053,7 +1512,6 @@ - rscadd: Adds in medical smardarts, non-harmful replacements for syringes in syringe guns that can only inject healing chemicals. - rscadd: Adds in Smartdart guns, syringe guns that can only use smartdarts. -======= san7890: - bugfix: On IceBoxStation, hopefully all (if not a good chunk) of the cameras have been moved to no longer be on windows, and on walls instead. @@ -2079,6 +1537,5 @@ - bugfix: Fix jumpsuits to drop accessories when destroyed - bugfix: Fix welders wasting fuel when clicking on tiles - bugfix: Fix plants to not hurt user while using telekinesis ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 timothymtorres, lewcc: - bugfix: Fix attack messages appearing when using tools on blast doors diff --git a/html/changelogs/archive/2022-04.yml b/html/changelogs/archive/2022-04.yml index d281dc9eea8..ed5ee6655d1 100644 --- a/html/changelogs/archive/2022-04.yml +++ b/html/changelogs/archive/2022-04.yml @@ -1,14 +1,9 @@ -<<<<<<< HEAD -2022-04-02: -======= 2022-04-01: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Arkatos: - spellcheck: Fixed several incorrect menu descriptions of some spider variants regarding their poison injection amount. Injection amount menu descriptions will now automatically update whenever their value changes by future code tweaks. Cenrus: -<<<<<<< HEAD - rscadd: Changed some armament vendor item costs - bugfix: Fixed assault op ship turrets not using ballistics Ebin-Halcyon: @@ -41,7 +36,6 @@ - code_imp: changed some mech FOV cone backend to work better - bugfix: Adds checks for packs on the departmental order console. - admin: revenants harvesting a mob now logs in the revenant's combat log. -======= - bugfix: removed stray pixel on the CQC manual CocaColaTastesGood: - bugfix: Adds checks for packs on the departmental order console. @@ -84,7 +78,6 @@ If this causes issues please bug me and I'll work out a solution - bugfix: Library consoles and a few other things will no longer look "on" even when their power is cut. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Expanded heavily on action buttons - rscadd: Adds an action button dropdown that sits just under the normal list in the top left. You can drag new buttons onto it to insert them. Click on it to @@ -96,7 +89,6 @@ - rscadd: When you start to drag an action button, docking ports will appear in places that it can be inserted into. (Outside of just floating somewhere on your screen of course) -<<<<<<< HEAD - rscdel: 'Removed action button locking, and the associated preference. I''m reasonably sure literally none uses this, but if you do hit me up qol: Dragging an action button will now give you an outline of its size around your cursor' @@ -117,7 +109,6 @@ qol: Move Help menu to the end of the menu bar.' - bugfix: 'Humans no longer "enter" mechs twice qol: as a side effect mech entering will cancel immediately instead of failing at the end only' -======= - rscdel: Removed action button locking, and the associated preference. I'm reasonably sure literally none uses this, but if you do hit me up - qol: Dragging an action button will now give you an outline of its size around @@ -167,12 +158,10 @@ that random parts of the library will no longer go completely missing. Enjoy. - bugfix: MetaStation's Abandoned Bar no longer has a floating poster just... floating there. It was weird, alright? ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Nanotrasen realized how much they were spending on newscasters that got buried under posters and the like, so the corporation decided to stock the crew with juuuuust enough. They have saved a lot of money from this venture, and the economy will promptly begin to skyrocket to new heights. -<<<<<<< HEAD - spellcheck: Voice and chemical analyzers now have more consistent names and spelling. - bugfix: Fixes an issue where reagent logging would incorrectly output "no reagents" when a reagent transfer had actually happened. @@ -369,7 +358,6 @@ - bugfix: finishing grenades no longer prints the error message when it shouldn't - bugfix: Fix an exploit where permanent invisibility can be gained from using shadowcloak stacked with other transparency effects. -======= - rscadd: Parts of MetaStation's Xenobiology Satellite have had some moderate re-arrangement, ultimately leading into an experience where you don't have to clamber over canisters to check the camera monitor. @@ -621,13 +609,11 @@ - bugfix: you can no longer create singularities by using soultap while in rod form - balance: wizards can no longer cast spells while in rod form ninjanomnom: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Stationary gas tanks now cost 12 material for the plating instead of 20 - balance: The base level of stationary gas tank pressure limits has been brought up to the base level of canisters. Higher quality materials still increase this further as before. -<<<<<<< HEAD - bugfix: Spacemen no longer can sculpt light effects from stone - bugfix: You should no longer fall through a specific spot in space in Tramstation's upper level. @@ -706,7 +692,6 @@ - bugfix: HEV no longer allows any helmet type. - bugfix: HEV no longer secures anything but oxygen tanks to your suit storage. SkyratBot: -======= robbertapir: - bugfix: Petri dish cultures no longer stay behind on the sprite like some sort of ghost after being washed out of it. Cells don't have souls. @@ -767,7 +752,6 @@ thgvr: - bugfix: Deltastation should once more have wrestling masks and athletic shorts. timothymtorres: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Refactor antimagic component to be more robust. - soundadd: Add different sound effects for when magic is blocked - bugfix: Equipping or dropping antimagic items now properly updates the magic buttons @@ -776,14 +760,11 @@ - bugfix: Remove bloodsplatter when fireball is blocked by antimagic - bugfix: Remove lockers when staff of locker projectiles blocked by antimagic - bugfix: Fire breath is no longer blocked by antimagic -<<<<<<< HEAD - bugfix: 'Spellcards are now blocked by antimagic qol: Add antimagic chat notification and animation effects. Mobs will now glow when they successfully block magic.' -======= - bugfix: Spellcards are now blocked by antimagic - qol: Add antimagic chat notification and animation effects. Mobs will now glow when they successfully block magic. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Foilhats prevent someone from casting mind magic (telepathy, mindswap, etc.) - balance: Bibles, ritual totems, nullrods, holymelons, and `TRAIT_HOLY` prevent @@ -797,7 +778,6 @@ - balance: Voice of god is now blocked with `MAGIC_RESISTANCE_HOLY` and `MAGIC_RESISTANCE_MIND` - rscdel: Cult blink and cult summon creature spells were never used in the code and have been removed. -<<<<<<< HEAD - bugfix: relocates the SMES terminal to not be in a wall in the lizard gas space ruin - bugfix: Golems can now exist in the rooms they themselves create, sorry about @@ -863,7 +843,6 @@ - spellcheck: fixed an error in the chilling black extract's description. - code_imp: the 'random' subtype of golems no longer exists, and is now effectively replaced by picking from all subtypes of the golem species. -======= - bugfix: Fix moonicorns not falling through openspace properly. 2022-04-11: Ebb-Real: @@ -924,12 +903,10 @@ MacBlaze1: - qol: firelocks now automatically reset upon the air temperature being returned to normal thresholds ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fire alarms now automatically update on atmos monitoring programs/consoles to show their real status. No more false positives! - code_imp: air alarms now have a variable referencing their area that is used - code_imp: added a new signal for when atmos adjacent turfs are calculated -<<<<<<< HEAD - rscadd: Limbgrower limbs are now a sickly green - refactor: Digitigrade legs should now behave consistently. - refactor: Limbs will no longer update appearance as owner is transferred, allowing @@ -1093,7 +1070,6 @@ - bugfix: Wizard immovable rod no longer deletes itself when travelling betwen z-levels - bugfix: Diggable turfs no longer get dug up by any item used on them - bugfix: easter baskets can now hold easter eggs -======= TheSmallBlue: - expansion: The Hygienebot can now be colored with a spraycan. - code_imp: Added a flag that allows mobs to be colored with the spraycan. @@ -1151,105 +1127,10 @@ - qol: you can take out PDA/ID from trimmer with right click SmArtKar: - bugfix: Water slime cookie no longer tastes like /datum/reagent/water ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 UnderARock: - bugfix: Fixes spraytan not tanning skin color. Wallem: - imageadd: Updates airlock cycling & mass driver buttons. -<<<<<<< HEAD - mcmeiler: - - bugfix: Xenobiological Slime Hybrid sprites are back to normal. - - bugfix: Limbs can now be see-through again. - tf-4: - - bugfix: Headshots can now properly be removed if you so wish. -2022-04-18: - GoldenAlpharex: - - code_imp: Added complete documentation and extra configurability to looping sounds, - allowing them to be stopped by walls, to ignore pressure or to be unaffected - by reverb! - Melbert: - - bugfix: Healium healing should be a little more responsive, now - - bugfix: Maintenance will now have wall engravings - RatFromTheJungle: - - bugfix: fixes the CMG multipak being in goodies, because goodies are for singles. - SkyratBot: - - bugfix: modsuits now retract if summoned through summon items or some other hijinx - - rscadd: Added 3 new Polish foods - - imageadd: Added sprites for the 3 new foods - - balance: the mining gas mask no longer protects against pepper spray - - bugfix: Fixed the Make AI button in admin player panel killing the client of whoever - it was used on. - - bugfix: The Russian revolver now works again - - bugfix: Corrected an error in the spicy donk pocket recipe which would permit - infinite donk pocket creation. - - balance: atmos holofans are now fireproof - - imageadd: Xenomorph maids have gotten a new shipment of clothing - - imageadd: Adds better implant icon sprites - - imagedel: Removes crooked implant icon sprites - - bugfix: Ripley MK2 mechs no longer have two cargo utility equipment items. - - bugfix: The Volaju hairstyle is now symmetrical on both facing sides - SnoopCooper#7310, Ghilker (for some minor parts): - - imageadd: better turbine sprites - Zonespace27: - - bugfix: M-90Gl's grenade launcher no longer has a safety - - bugfix: Conveyor sorter exploit fixed - cat348 for sprites, TheBonded for not being gitbanned: - - imageadd: Disposals Junctions have visible arrows -2022-04-19: - Fikou, EOBGames: - - rscadd: Redesign of Hilbert Research Facility - IgiariValkyr: - - rscadd: Added Donator Items for ultimarifox - Jolly: - - bugfix: The space turf in The Derelict should no longer render as a darkened space. - - bugfix: The Derelicts main AI chamber SMES power cables no longer run through - walls. However, as a trade off, its no longer wired up round start. - SkyratBot: - - bugfix: Fixed traitors being able to duplicate their TC - - bugfix: Statues can now once again be wrenched. - - bugfix: After two failed attempts at rectifying the issue, illegal tech is once - again unlockable. - - bugfix: fixes a stray pixel in library.dmi - - bugfix: Our finest chefs have further refined the art of cookery so grilling random - items that have been deep fried will no longer create grill marks on weird lettering - above the dish. - - bugfix: Learning about lavaland bone architecture no longer causes the "Tribal" - tab to undergo mitosis. - - rscdel: The on human examine species readout has been removed - - bugfix: Changeling HUDs now properly carry over through bodies. - - code_imp: Non carbon Changelings now respectively regenerate/lose/spend their - chems. - - bugfix: slimepeople's state will no longer be listed as "error" in the "swap body" - menu if their body is in crit - - bugfix: The minor dark blue luminescent ability now heals you properly instead - of killing you. - - bugfix: The dark blue burning extract now injects you with regenerative jelly - instead of useless cryoxadone, making it not (as) deadly for slimepeople. - Vladoricious: - - bugfix: The Paranormal Response team has successfully defeated the demon that - was putting medicines in food from nowhere. - - bugfix: The food processor no longer strips chemicals from the things you put - inside. Finally, meth in my carrot fries. - timothymtorres, TheBonded: - - code_imp: Improved nightvision code -2022-04-20: - Cenrus: - - bugfix: fixed multiple active turf errors - Deek-Za: - - bugfix: Robotic race heads are robotic again. - Ebin-Halcyon: - - bugfix: Teshari's berets no longer float off their heads - ErdinyoBarboza: - - bugfix: TramStation is now Skyrat Compatible! - - bugfix: Re-adds missing Department Guard Lockers to MetaStation - - bugfix: Re-expands the MetaStation Prison - - bugfix: Re-adds the secondary detective locker to MetaStation - - bugfix: Re-adds bouncer spawns to MetaStation - - bugfix: Re-adds missing Department Guard Lockers to DeltaStation - - bugfix: Re-adds the DeltaStation Prison - - bugfix: Re-adds the secondary detective locker to DeltaStation - - bugfix: Re-adds bouncer spawns to DeltaStation -======= apynnonen: - qol: Screentips are no longer hidden by action buttons. dragomagol: @@ -1263,14 +1144,12 @@ out with soap instead. Fikou: - bugfix: fixes access on the hilberts hotel vault door ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, Smartkar for sprites: - balance: the MODsuit clamp can no longer hold crates with human or larger sized mobs - balance: the MODsuit holster has been replaced with a magnetic harness (like tgmc) - balance: the MODsuit pepper mister has been replaced with pepper shoulders. They react to attacks with pepper spray -<<<<<<< HEAD OrionTheFox: - imageadd: While sorting through their plasmamen envirosuits, NT shipped a template out to Armadyne for the manufacture of Peacekeeper-branded Envirosuits! They've @@ -1309,7 +1188,6 @@ - balance: STG damage 40 -> 32 - spellcheck: Suppressor no longer mentions the syndicate 2022-04-27: -======= Ghilker: - expansion: freon burn reaction now produces coldspots and cold cyan fires GoblinBackwards: @@ -1799,7 +1677,6 @@ - rscadd: The accounting console has been added to the HOP's office, allowing them to track purchases, and bank balances of the crew on station. It's not illegal, it's the competitive advantage! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Arkatos: - qol: Civilian Bounty Console will now always bring up its UI when you insert the ID. @@ -1810,7 +1687,6 @@ BebeYoshi: - rscadd: Adds more health HUDs, nitrile gloves and medical belts to locker in Tramstation medbay -<<<<<<< HEAD Ducky-Momo: - rscadd: Freezer of racial and otherwise unobtainable ingredients to the back of the kitchen @@ -1854,7 +1730,6 @@ - bugfix: fixed a krokodil zombie transformation - bugfix: trying to store a plasma cutter while holding plasma should no longer blow you up. -======= EthanRockss: - bugfix: Prop atmos mask now uses the correct worn sprite - bugfix: Jumpsuit no longer able to burn while wearing nuke op mod suit @@ -1866,12 +1741,10 @@ - bugfix: Turning glasses colors on/off with AltClick now properly tells you that you turned it on or off. LemonInTheDark: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Getting your eardrums blown out will now properly have a low chance to make you go fully deaf, until you find some earmuffs or get a transplant - refactor: Cached some redundant operations in Life(), speeding it up by ~22%. I know that doesn't mean much to you, but cpu time go brrr ok? -<<<<<<< HEAD - bugfix: Prop atmos mask now uses the correct worn sprite - rscadd: N-Spects to the Security techfab (with Basic Security Equipment) - bugfix: RnD servers will no longer permanently stop working when depowered. @@ -1916,7 +1789,6 @@ - bugfix: Augmented limbs can once again have more styles than just the default cyborg one. SkyratBot: -======= OperativeLyn: - bugfix: The lit up rocks in the crashed ship space ruin are now dark like the others. @@ -1949,7 +1821,6 @@ - bugfix: Fixes prescription glasses not clearing blurry vison 2022-04-28: ArcaneMusic: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The values of nearly every item purchasable by players has been rebalanced. - balance: Players will now start with less starting money, but will receive a paycheck once every 5 minutes. @@ -1961,7 +1832,6 @@ item printed if it's from a lathe not under your department. - qol: The payment component has received additional handling for physical credits, as well as pulled credits/ID cards for those without hands. -<<<<<<< HEAD - bugfix: Cleaned up some pipes lying around in the Lavaland Syndicate base supermatter. - qol: On the mapping end, all of the Supply Departments (and Lavaland) have had their doors reprogrammed to use a mapping helper system, rather than manually @@ -1995,7 +1865,6 @@ - bugfix: Fixed the moth costumers for the restaurant venue not showing up. - bugfix: Fixed bar venue customer bots. - qol: Location names in Crew Monitor console now stretch if too long again -======= Cenrus: - bugfix: Fixed lionhunter ammo sidepath Ghilker: @@ -2061,4 +1930,3 @@ - qol: Rearrange Delta library gaming room to host D&D parties xyc: - bugfix: tram medbay maint won't sometimes get double stacked cables and piping ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-05.yml b/html/changelogs/archive/2022-05.yml index 89d12ae4b7a..4ef76c6c97d 100644 --- a/html/changelogs/archive/2022-05.yml +++ b/html/changelogs/archive/2022-05.yml @@ -1,5 +1,4 @@ 2022-05-01: -<<<<<<< HEAD Deek-Za: - bugfix: Meta Orderly's door control button is working once again. - bugfix: Repairs the photocopier. Copy away! @@ -38,7 +37,6 @@ - bugfix: Jobs who spawn with tablets not on the belt, have their name and job properly displayed on the tablet, like everyone else. - bugfix: Fix ghosts not being able to read in the dark -======= Crushtoe: - bugfix: Fixes Icebox Security's entrance airlock cyclers and the Interrogation shutters. @@ -68,13 +66,11 @@ timothymtorres: - bugfix: Fix ghosts not being able to read in the dark vincentiusvin: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Removed adding glass floors to plating - balance: Allows you to replace plating with glass floors instead. 3 second timer. - rscdel: Removed deconstructing the glass floors. No replacement for this one, use a rcd. - bugfix: Fixed metastation glassfloor spawning a weird turf when crowbarred. -<<<<<<< HEAD Spc-Dragonfruits: - imageadd: Resprited (almost) all of Skyrat's modular cargo clothes! - imageadd: Quartermaster and Cargo skirtlenecks! @@ -125,20 +121,13 @@ Nerev4r: - rscdel: Removes snail speech modifier. Try using a lot of ellipses instead! - rscdel: Lowers the amount of water that snails leave behind. -======= - bugfix: Fixed plasma sheets and it's derivatives exploding you for being shot at. 2022-05-02: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - balance: Armored bounty hunters are no longer being issued flamethrowers. Instead, they are now issued dual-tube shotguns filled with rubbershot and trailless incendiary slugs, as well as a 9mm Makarov loaded with fire bullets. -<<<<<<< HEAD - SkyratBot: - - qol: Adds radio messages to the delaminating HFR to let atmosians know what's - wrong with it. Unless the HFR has been emped -======= 2022-05-03: ArcaneMusic: - bugfix: Drones are exempt from the lathe tax, off and on station. @@ -170,366 +159,10 @@ - code_imp: changed some backend code for rendering, please report any layering issues on the github Y0SH1M4S73R: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Wizard casting clothes now use a bitflag instead of a typecache. This allows for nonstandard headwear and suits to be varedited into casting clothes. - balance: The enchanted modsuit's chestplate and helmet must now be deployed in order to cast robed spells. -<<<<<<< HEAD - - bugfix: Fixed being able to ride dead space carp. - - bugfix: Fixes an issue with service borg apparatuses getting multiple beakers - in it's contents. - - rscadd: adds the "how to charge your PDA" poster - - bugfix: Cryo cell overlay should properly display above mobs now - - bugfix: Drones can no longer give themselves access to machines/wires through - consoles. - - bugfix: H.E.C.K. suit now once again prevents your clothes from burning and your - hair from sticking out. - - bugfix: pAIs can now use Newscaster UIs, and all Silicon can now use Newscasters - in general (except the Bounty board, as they have no money to payout). - - bugfix: Cayenne can no longer use the nuke from anywhere. - - bugfix: Drones are exempt from the lathe tax, off and on station. - Tastyfish: - - refactor: Examine block HR section breaks are now handled such that they don't - repeat or show up at the bottom. - Zonespace27: - - rscdel: Removed Tommy Gun from Armadyne oldarms - - spellcheck: Fixed bluespace syringe box name - - balance: CFA weapons are cheaper - - rscadd: 4 permit huds can be bought from the cargodrobe - - rscadd: interdyne now sells more contraband-and-not chemicals - - balance: AMMO_BULK category now adds 4 interest instead of 3 - - bugfix: Serviettes now can be taken out of their packs - softcerv: - - bugfix: can now research scan like normal sci-goggles. - tf-4: - - balance: Scarborough Arms now needs an emagged supply console to purchase. -2022-05-04: - IsaacTheSharkWolf: - - bugfix: fixed (most of) the wrong facing cameras. - - bugfix: fixed the misplaced airlock button in the toxin incinerator. - - bugfix: fixed prison visitation shutters having no working button. - - bugfix: fixed some access issues with medbay maintenance doors. - - bugfix: fixed missing disposal pipe section in NTR's office. - - bugfix: fixed missing tank compressor in toxin lab. - SkyratBot: - - rscadd: Replaced secborg sprite - - rscadd: 'Mechs now have a weapons safety, which can be toggled with the Middle - Mouse button. Don''t worry, it defaults to off. expansion: All mechs now use - the mouse reticle, and the reticle is disabled when weapons safety is turned - on.' - - bugfix: AIs can use mech equipment again. With weapons safety off, equipment is - used. With weapons safety on, AI clicks are used. - - bugfix: MODsuit plasma stabilizers no longer protect plasmamen from self-combustion - if they aren't wearing an envirosuit or gloves. - - rscadd: Hey did you know you can charge your tablet by microwaving it? - - bugfix: fix oversight with prop gasmasks having some of the features of normal - ones but without fov - Tastyfish: - - imageadd: Teshari sprites for skill reward cloaks. - - bugfix: Fixes teshari again. - - qol: You can now identify what liquid a floor is covered in, if you have a reagent - scanner / reagent glasses. - Zonespace27: - - balance: Guncargo AKM removed and replaced with a worse version -2022-05-05: - Arctaisia: - - rscdel: Removes the Arc plushie and Ole plushie, as well as removing them from - the loadout selection. - - rscdel: Removes the nerd plushie from the ghost cafe. - - rscadd: Adds a note to the Ghost cafe where the Nerd plushie used to be. - Gandalf2k15: - - bugfix: You can now adjust jumpsuits correctly. - - rscadd: The events system now uses an internal voting system, where possible. - - rscadd: Fire doors now have a sound when they open/close again. - - soundadd: Alerts have been updated(retrospectively). - GoldenAlpharex: - - rscdel: Nanotrasen managed to stabilize its assets, so much so that market crashes - related to massive asset movements are no longer possible, even through crab-related - phones. - - bugfix: Synthetics being will finally be able to recolor their right leg properly. - - refactor: Refactored how snouts worked, ensuring that they are linked to an actual - external organ now, which allows for much more dynamic management of snouted - variants of articles of clothing. - - bugfix: Lizards, mammals and synthetics are no longer forced to use snouted sprites - for headgear 24/7, and will now only use them when necessary. - - code_imp: Improved slightly the code for MODsuit module snout detection, making - it slightly better. - KasparoVy: - - rscadd: You can now colour thigh-highs in the socks selection of the character - creator. - Paxilmaniac: - - bugfix: marines of the ert variety will now have 70% less missing clothing if - the soldier is not a baseline human - - balance: The marine response teams near the station have finally been given weapons - to replace their horribly outdated armory - - bugfix: Fixed the Norwind, Vintorez, and DTR rifles all missing inhand sprites - - bugfix: The skyrat custom versions of the mining shuttles have returned to stations - - qol: The assault ops shuttle has been retrofit, with many improvements over the - old design - Ryll/Shaps: - - spellcheck: Wound and combat messages will no longer mention the species of an - attacked bodypart when not appropriate - SingingSpock: - - rscadd: All Heads now have weapons permits. - SkyratBot: - - balance: The janiborg's drying spray bottle will now always clean a wet turf that's - been washed once - - balance: The further you are from a radiation pulse, and the more objects that - block it, the lower your odds are to get irradiated. - - balance: Most radiating emitting things have their radiation pulses functionality - changed. Being near them is more dangerous, and being far away is less dangerous. - - server: Admin ranks can now be combined with a plus sign (for example, Game Master+Coder). - Single admin ranks with a plus sign in their name are no longer supported. - - server: You can no longer edit rank permissions, temporarily or permanently, from - the permissions panel. Please use the admin_ranks database table or admin_ranks.txt - instead. - Zergspower: - - balance: Changes the point generation from 2 to 2.5 - Zonespace27: - - balance: Uzi, glock, saber SMGs are more expensive. - - balance: MCRs are cheaper - - balance: Long-arms and automatic weaponry now cannot be ordered from request consoles - and IRN tablets, you must use a regular cargo console or a head's ID in an IRN - tablet to do so. - - rscdel: Removed g11 from guncargo. - - bugfix: Companies can be ordered from IRN tablets again. - - bugfix: Chemical dispensers now add reagents for manipulators past tier 2 - theOOZ: - - qol: Raises the chat indicator's layer for better visual clarity -2022-05-06: - Gandalf2k15: - - rscadd: New briefcase sprites have been added! - GoldenAlpharex: - - bugfix: Lizards can now have snouts again. - ORCACommander: - - bugfix: Assault Operatives have now completed basic flight training and can dock - the shuttle. - Zonespace27: - - admin: Ashwalker tendril destruction is now logged -2022-05-07: - Deek-Za: - - bugfix: Moth's can color themselves again - Gandalf2k15: - - rscadd: The Makarov sprite has been updated. - - rscadd: A new engineering-type event has been added, the supermatter surge! - GoldenAlpharex: - - bugfix: Every species that doesn't have its own unique legs will now be able to - use digitigrade legs again, when Allow Mismatched Bodyparts is toggled. - Melbert: - - bugfix: Medical coagulants work as they are expected to now, but the difference - shouldn't be very noticeable, since their primarily function worked anyways - RatFromTheJungle: - - rscadd: DagothBot (God Complex) lawset - - rscadd: Texas Ranger (Frontier Ranger) lawset - - config: added them to the config laws aswell - SkyratBot: - - bugfix: demonic watchers will now drop their crusher trophy properly - - bugfix: Luminescents once again have proper bodyparts - - imageadd: Added new icons for the DNA injectors - - imageadd: Added new icons for the DNA implanters and their cases - - bugfix: The bluespace icon syringe is now more animated - - bugfix: Fixes Life(Friendly) reaction spawning hostile mobs - - code_imp: changed how the gas pressure calculation work very slightly, report - if things are bugged. - - bugfix: drones should be able to do stuff next to other drones - - rscadd: A number of new tiles are available for construction. Check out the small, - diagonal and herringbone variants of your favourite grey, dark and white tiles. - Also, check out the new terracotta and kitchen tiles- they're fancy! - - bugfix: fixed NT frontier being downloadble by non scientists. - - bugfix: The HoP is now considered part of Supply (Supply bans apply to HoP, they - get Supply deathrattle, cannot get smuggle objective, ect). - - bugfix: Admin Nation-creating event can now properly trigger and work. - - bugfix: Plants like Deathnettle will no longer use durability when clicking on - someone from a distance. - - qol: Made the tank compressor input pipe green color to be in line with the current - atmos machines color scheme, increased by 100 kPa the window for tank ejection - to allow more flexibility when filling up the tank - - code_imp: cleaned up some of the code for disconnecting pipes and removed repeated - code - - bugfix: Atmos techs now have general engineering access - - bugfix: Id cards, when having their job template changed, will change that job's - payment department as they used to. - - qol: mech construction now has balloon alerts! - - code_imp: mecha_construction_paths.dm is now has significantly less copy/paste - code - - bugfix: Department budgets can no longer be spent in roulette. Their ability to - act as the house is unaffected. - - bugfix: You no longer have to enter text to succumb. A blank value works. - Wallem: - - imageadd: The book binder has gotten a fresh coat of paint. - Zestybastard, Azlan and PositiveEntropy: - - imageadd: Resprites the old space suits! - - imageadd: Resprites the sleepers! - - rscdel: Removes unused orange and black engi light attachment helmet sprites. - itseasytosee: - - balance: You can now pull bulky things in zero gravity at full speed - - bugfix: The slowdown from neck grabs is now properly negated in zero gravity. - jjpark-kb: - - rscdel: removed the skyrat logo in the lobby -2022-05-08: - AtoriBirb: - - imageadd: 6 new beak sprites to snouts.dmi - Deek-Za: - - bugfix: Fixes glass_large door lighting. - Melbert: - - qol: Heretic ghoul recipes are more descriptive when failing - - bugfix: Fixes a missing span on heretic ghoul deconversion - - bugfix: Managing to escape the area of a blade heretic's mark will no longer constantly - burden you as if you never left. - - bugfix: There should be less ways of escaping the area of a blade heretic's mark - now. - - qol: Heretics can drag people marked by a blade heretic out of the area they are - trapped within. - - qol: Being thrown back by a blade heretic's mark will be slightly less awkward - now, and less dangerous. - SkyratBot: - - qol: Space Parallax will now smoothly animate between steps, based off your movement - speed. Please report any jitter. - - bugfix: Parallax will no longer "freeze" when you cross some area boundaries. - Looks better now. - - bugfix: Dragging objects diagonally will no longer cause them to visually "jump" - to catch up to you. Seriously how did none report this, are we just collectively - blind? - - imageadd: On the mapping end, we've removed some duplicate names for different - icons. - - balance: lowered overall max tesla coil power conversion at all parts tiers (at - t4 it went from 85% to 50%) - - code_imp: Some things that were hyper undeletable are now just normal undeletable. - Please report any unexpected behavior, mostly in away missions, or on lavaland. - - rscadd: Random Job button in Latejoin panel. - - bugfix: You can now recycle unused mutators and activators in dna console. - - bugfix: 'Genetic scanner now shows all mutations. expansion: Genetic scanner will - highlight active mutations.' - - qol: Deadchat control on anarchy mode will now alert you when you can enter another - command - - bugfix: Modular computers work again, allowing you to put your ID in to download/use - programs. - - qol: the gas analyzer now shows the heat capacity and thermal energy of a mix - - qol: the gas analyzer now shows the volume of empty pipe networks - - balance: Firelocks now take 3 seconds to auto-close after opening, rather then - 5 - - bugfix: Firelocks on top of normal doors will now no longer fail to re-close for - seemingly random reasons - Spc-Dragonfruits: - - spellcheck: 'Pan Slavic description changed to match the lore. tweak: Replaced - "Selenian" with "Sol Common", use ",sol" to speak. The directory is the same, - so you don''t need to re-select it.' - - spellcheck: Dwarf no longer has an odd chance to drop a syllable with a percentage - symbol in it. - - imageadd: Sol Common language icon, replaced red star with proposed NRI flag (thanks - Russian community), gave the Skrell icon a little uplifting - YakumoChen: - - bugfix: Fixes stray pixel on one of the utility uniforms - Zonespace27: - - rscadd: Ashwalkers can now appear on icebox - - bugfix: Freighter crew gun vendor no longer alert locked - - bugfix: Cargo freighter boss now gets the correct ammunition. - - bugfix: Elite modsuit on cargodise lost no longer requires hacking to use - jjpark-kb: - - bugfix: adds back the xenoarch base - theOOZ: - - imageadd: Adds a roomba model to the peacekeeper cyborg line -2022-05-09: - Fikou, sounds by Floyd: - - rscadd: Maintenance now contains an ancient altar. - Gandalf2k15 for porting, DarthSidiousPalpatine for their original contribution on TauCeti: - - imageadd: Mob fire sprites have been updated! - - refactor: The way mobs update fire has been refactored. If you spot any anomalies, - please report them. - Melbert: - - refactor: Refactored the wizard spell Charge - RandomGamer123, some ideas from the-orange-cow & cacogen: - - balance: The explosive mutation for kudzu is now classified as a severe instead - of just above average mutation - - balance: Venus human trap vine throw cooldown increased to 4 seconds - - balance: Kudzu's maximum mutation severity in general has been increased - - balance: Event-spawned kudzu's maximum mutation severity has been further increased - - balance: Kudzu now mutates twice as often in general - - balance: Event-spawned kudzu now has its minimum spread rate tripled - - balance: 'Newly spawned kudzu in general has its starting spread rate buffed expansion: - New temperature stabilisation mutation for kudzu as a semi-alternative to cold - proof and being a beneficial kudzu mutation in general, effectively functions - as a space heater with the target temperature being 20C' - SkyratBot: - - balance: Change how opening a hole in the chamber will affect the SM, increasing - the dangers it will have by having more damage dealt, increase the power of - the SM by 250 and stopping the SM healing from low moles/cold. - - balance: Increased the heat released by lowering the THERMAL_RELEASE_MODIFIER - from 5 to 4 - - balance: Increased the plasma released by lowering the PLASMA_RELEASE_MODIFIER - from 750 to 650 - - balance: Lowered the oxygen released by increasing the OXYGEN_RELEASE_MODIFIER from - 325 to 340 - - balance: Increased the REACTION_POWER_MODIFIER from 0.55 to 0.65 increasing the - power generated - - bugfix: Spamming the start compression test button will not make the anomaly refinery - eject a live TTV. - - rscadd: That's what the emag is for. - - bugfix: Briefcase launchpads now work again. - - bugfix: Briefcase launchpads now don't drain power from the station. - - balance: Printing surgery tools from the autolathe now requires silver - - balance: some items may protect more or less against diseases now - - qol: removes redundant access requirements from some airlocks - - refactor: changed how whether a mech equipment is attachable is determined, please - report if any previously attachable equipments are bugged - - bugfix: PDA/Tablets are now made from a realistic amount of iron. - - bugfix: fixed export prices of computer parts being overwritten by a "miscellaneous - computer part" - - bugfix: fixed missing export datums for various computer parts - - code_imp: improved code of computer part exports - - qol: supermatter zaps now change color based on the power generated, starting - from red and going toward blue the higher the power emitted - - bugfix: fixed extraneous wiring under a few windows in Kilo maint. - - balance: improved freon production with a ratio of 6 moles of plasma, 1 mole of - bz and 3 moles of co2. At 800 K there is a minor peak of production to have - a fast way to generate freon, but at over 5000 K the rate starts to increase - up to three times the rate at 800 K. - - bugfix: Changes the succumb screen to work for both tgui and standard inputs. - - rscadd: Adds 7 new foods! The power of chefs continues to grow. - - rscadd: Updated pierogi and stuffed cabbage sprites. - - spellcheck: Clarifies the explanation of the new turbine some, and fixes some - grammar for the parts too. - - bugfix: Fixed some door accesses being overridden on MetaStation - - rscadd: On the mapping end, mappers are now able to add a wide range of funky - new colors to maps. Keep an eye out, for they might just be coming to a station - near you sometime soon. - - rscadd: New clever mutation, allowing some mobs such as monkeys to use consoles. - - rscadd: adds the supermatter cascade round-ender, it can be triggered when the - SM chamber is filled with hypernoblium and antinoblium at over 40% each, when - the total moles are high enough to trigger a singulo and only when the SM integrity - is over 80% (if the gases don't reach the requirement during the delamination - for a moment, the whole thing will stop and need to restart) - - rscadd: Heterochromia Quirk, try it out! - - refactor: Eyes now support having two different colors for each eye; become your - own disco! - - bugfix: When holding plasma glass, the sprite of normal glass was shown in hand - since plasma glass in hand didn't exist. - - rscadd: Added titanium and plastitanium glass shards as well as spears and shivs - for their types, including plasma glass shivs. - - imageadd: Sprites for plasma, titanium and plastitanium glass shards when hold - in hand. - - qol: titanium and plastitanium glass having their own shards makes sense, and - is a quality feature. - - balance: The resulting changes to smoke and foam have effected their balance. - In which direction is currently unclear. - - code_imp: Minor code improvements to smoke, foam, and... _wizard spells?_. - - balance: Lower the amount of anomalies spawned from the SM delamination - - balance: Lower the probability of getting a flux anomaly from the SM delamination - - balance: Flux anomalies spawned by the SM in this way will have the explosion - size reduced by 4 - - balance: Off-station lathes no longer you pay a tax. - Wallem: - - imageadd: The food cart & ice cream cart have been given new coats of paint - softcerv: - - rscadd: Sabres are now order-able through cargo as a cargo goodie for 1.5k credits. - The cargo sabres feature a lower block chance compared to the standard sabre, - and come in a black sheath. - timothymtorres, TheBonded: - - balance: Decreased the amount of credits an approved manifest grants. (was +80, - it's now +70) - - code_imp: Improve nearsighted code to be more robust -======= capsaicinz: - rscadd: adds the "how to charge your PDA" poster castawaynont: @@ -538,7 +171,6 @@ thgvr: - bugfix: Shuffled around some pipes in KiloStation garden so they are no longer under tables/grass. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 timothymtorres, san7890, axietheaxolotl: - rscadd: Adds haunted tarot deck that allows the user the ability to see and communicate with the dead. Can be found in maint loot as a rare item. @@ -568,7 +200,6 @@ - imageadd: Add some new blank/scribble card icons. - imageadd: Add new clown and mime joker cards to standard decks curtesy of axietheaxolotl (Viro on discord) -<<<<<<< HEAD 2022-05-10: Cenrus: - bugfix: Syndicate command would like to apologize for the hole in the floor in @@ -585,7 +216,6 @@ SkyratBot: - rscadd: Adds Dungeon Master, The Painter and Their Canvas, and Nutimov lawsets. They aren't obtainable at the moment. -======= 2022-05-04: ArcaneDefence: - rscadd: Hey did you know you can charge your tablet by microwaving it? @@ -888,22 +518,10 @@ - spellcheck: Clarifies the explanation of the new turbine some, and fixes some grammar for the parts too. Watermelon914: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds a new 'Destroy Machinery' traitor objective that focuses on destroying various important pieces of machinery around the station. - rscadd: Traitor steal objectives can now have their timer skipped as soon as the bug is placed onto the target item. However, doing so will give reduced rewards. -<<<<<<< HEAD - - balance: Low risk steal objectives reward slightly less TC - - imageadd: On the mapping end, the "Tram" Area Icon Sprites have been re-standardized. - - imageadd: Regenerative core and wounded status effects now have different icons - - bugfix: Fixes freon fires being too efficient in oxygen deficient environments. - - bugfix: Fixes freon fires hotspots not working properly. - - rscadd: Freon can now react in any gasmixture, instead of just turfs, but can't - create hot ice if it's not in a turf. - - bugfix: Fixed several inconsistent or niche access requirements on IceBoxStation - - qol: Replaced all access requirement vars on doors with mapping helpers on IceBoxStation -======= - rscdel: Removes the smuggling traitor objective - balance: Low risk steal objectives reward slightly less TC Zonespace27: @@ -926,7 +544,6 @@ it's now +70) 2022-05-10: LemonInTheDark: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: When ventcrawling, rather then jumping between pipes, your view will "glide" - qol: When ventcrawling, holding two directions no longer locks you in place. Instead behaving as expected @@ -934,9 +551,6 @@ this looks slightly better then the fullbright of current. - code_imp: Ventcrawling code has had a 99% performance increase. I am not joking. Won't lag the server anymore. -<<<<<<< HEAD - - bugfix: The tank compressor on Deltastation is now correctly oriented -======= Melbert: - refactor: Refactored the Durathread golem's strangle status effect Pickle-Coding: @@ -947,17 +561,13 @@ RandomGamer123: - bugfix: The tank compressor on Deltastation is now correctly oriented Rhials: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The mindshock gland mind control has been changed from a single, six-minute command to two, two-minute long commands. Also, those who are mindshielded will resist the brainwashing effects and the brain-melting waves the gland passively emits. -<<<<<<< HEAD -======= Ryll/Shaps: - bugfix: Directional windows, firelocks, and other border objects will now properly block incoming ballistic fire ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SmArtKar, Rukofamicom: - balance: Hierophant crusher trophy now creates a hierophant chaser instead of a wall @@ -967,7 +577,6 @@ (Shotgun), "Lament" (Alternating cardinal and diagonal shots) and "Perish" (Final attack) - code_imp: Improved colossus' variable names and added spaces where required -<<<<<<< HEAD WatlerJe, PositiveEntropy: - imageadd: Resprites the Polaroid Camera and the Film Cartridge! YakumoChen: @@ -992,7 +601,6 @@ - bugfix: piles of stone bricks can now actually be used to make stone walls SkyratBot: - bugfix: Fixed misplaced sofa parts in the Icemoon abandoned village. -======= Son-of-Space: - bugfix: Fixed several inconsistent or niche access requirements on IceBoxStation - qol: Replaced all access requirement vars on doors with mapping helpers on IceBoxStation @@ -1013,7 +621,6 @@ Short Hair 5, Short Hair 6 and Pig Tails 2 hairstyle and brought them back to their previous glory. Ghilker: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: improved the speed of cascade wall spreading, made a better description for them - qol: 'I didn''t update the changelog in the initial PR so i''ll add this here: @@ -1022,7 +629,6 @@ to the SM will instantly cause it to start delaminating and sets the SM for a cascade. Once it delaminates it ensures the start of the cascade. NOTE that if the SM recovers you won''t be able to do it again.' -<<<<<<< HEAD - spellcheck: Recent re-evaluations of the underlying math have concluded that a supermatter cascade will not, in fact, destroy the entire universe - only an area several hundred kilometers in radius. @@ -1040,7 +646,6 @@ - qol: pipes and atmos components have better visual clarity and consistency between them - bugfix: You can no longer farm orbiting blades by using your mark on corpses -======= - bugfix: Fix being unable to refine the delimber anomaly raw core in the refinery - code_imp: cleaned and brought up to date the powerfist code - qol: added some more examine text on the powerfist @@ -1066,7 +671,6 @@ supermatter cascade will not, in fact, destroy the entire universe - only an area several hundred kilometers in radius. Zonespace27: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Dead mouse, sunglasses, and briefcase bounties removed from assistants - rscadd: Added more engineering & science bounties - rscadd: Flamethrower, pneumatic cannon, water tank, and improvised shotgun shell @@ -1075,14 +679,6 @@ - balance: Medical organ bounties have their reward reduced to 1k for a single organ, and 2k for bulk. - refactor: Refactored bounty cube selection back-end -<<<<<<< HEAD - - bugfix: Ripley mechs can no longer toggle to their nonexistant air tank. - - spellcheck: fixed the omega soap recipe not having bold on it's first line. - - bugfix: Fix mapped in cardhands not initializing properly - - bugfix: Cyborg drink glasses will nolonger automagically refill themselves when - not actually being held by the cyborg. - - bugfix: Fix being unable to refine the delimber anomaly raw core in the refinery -======= dragomagol: - qol: department signs have directional variants - code_imp: sign paths are now in snake_case @@ -1094,43 +690,10 @@ san7890: - bugfix: After a mixup in the Marker Beacon Factory with the "Default Glowing Texture" Factory, Marker Beacons should now have any actual sprite. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'After a recent earthquake, a good chunk of the exterior surrounding the Mining Base on IceBoxStation has undergone a drastic conformational change: the river has expanded. In response to this, more infrastructure in that part of the station has been re-done, and even added in some spots.' -<<<<<<< HEAD - - bugfix: You can now cook meals on the oldstation ruin again - - bugfix: Mulligan now properly randomizes ethereal color - - bugfix: Charged green crossbreeds no longer display species types instead of actual - names - YakumoChen: - - bugfix: Blacktar Heroin can be made into rocks again - dragomagol, unit0016: - - rscadd: Added lore terminals - for when leaving a scrap of paper on the ground - just won't cut it - softcerv: - - qol: SmartDart Pistols now show the inserted SmartDarts inside of them when examined. - theOOZ: - - code_imp: Flags bug snout not to use muzzled sprites - timothymtorres, TheBonded: - - bugfix: Fix books to only give mood bonus when read the first time -2022-05-12: - ErdinyoBarboza: - - rscadd: Vintorez, PCR-9, Pitbull and DTR-6 came back in ballistic flavor - - rscdel: Removed hardlight guns (modular_skyrat\modules\goofsec\code\projectiles.dm) - - balance: Dozer now uses 9x25mm for its namesake. - - balance: Zeta-6 now uses 10mm Magnum. - - bugfix: 9x19mm now is properly defined and cant be loaded to 9x25mm magazines - and vice versa. - - imageadd: Added AP and Incendiary magazines for "croon" and "g11" subtype at - mags.dmi - - imagedel: Removed a few duplicate icons from mags.dmi - - spellcheck: Gun descriptions clarify whether they use 9x19 or 9x25. - - refactor: Added support for AP and Incendiary Magazines to Multi-Sprite Magazines - Gandalf2k15: - - bugfix: Autotransfer votes now function again -======= timothymtorres: - bugfix: Fix mapped in cardhands not initializing properly timothymtorres, TheBonded: @@ -1144,12 +707,10 @@ 2022-05-12: GoblinBackwards: - balance: Fireball no longer has a 3 tile wide hitbox. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - refactor: Refactored how legs are rendered, using dynamically-generated masks to avoid left legs always displaying over right ones, or right legs above left ones. -<<<<<<< HEAD Melbert: - bugfix: The first stage of addiction now actually occurs. - code_imp: 'The confusion status effect is now based on duration (seconds) instead @@ -1258,7 +819,6 @@ - bugfix: Realigns the DeltaStation holodeck to fit universal templates - bugfix: It is no longer possible to access cargo through maintenance without appropriate access on MetaStation -======= JohnFulpWillard: - rscdel: 'The following job cartridges have been deleted: Detective, Lawyer, Janitor, Curator, Roboticist and Scientist (without sensor pack).' @@ -1314,7 +874,6 @@ dragomagol: - bugfix: non-cultists can now enter the pride ruin san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: On IceBoxStation, Ice Moon Ruins will no longer vent out all their atmospherics out the top of the map, since they magically now have ceilings. - rscadd: 'However, this dark magick to give Ice Moon Ruins ceilings come at a cost: @@ -1322,49 +881,6 @@ infrastructure. Nanotrasen has ensured that anything vital shouldn''t be impacted by this, but do expect to see certain "unmaintained" catwalk sections be swept up in an avalanche of sorts.' -<<<<<<< HEAD - - bugfix: Cult's antag UI now works from the start, rather than having to close - and reopen the tab to see your objectives. - - bugfix: KiloStation maintenance airlock in EVA is properly named - - bugfix: Fix wizard modsuit not having antimagic protection - - bugfix: The new cult altar can't be spammed anymore. - - bugfix: The Captain's PDA now works, and their cartridge now spawns in their locker. - - bugfix: 'fix delimber anomaly from round removing you and other griefs remove: - delimber anomaly doesn''t change your organs anymore' - - balance: Mini-fridges can now hold slightly more things. - - bugfix: You can no longer use staff of storms to cheese the hell out of lavaland - bosses - Zonespace27: - - refactor: Split Black Mesa area into many smaller ones - fippe: - - bugfix: Botany and Service firelocks in Icebox moved around to stop fire alarm - spam - tf-4: - - bugfix: Joining sec no longer overrides your loadout with the default jumpsuit - in some cases - - bugfix: '"Move job to backpack" preference now indeed moves your job jumpsuit - to your backpack rather than deleting it.' -2022-05-15: - SkyratBot: - - bugfix: Multiple orbiting blades will no longer be used to protect you from the - same attack in case you have multiple instances of the status effect - - balance: Hierophant trophy now deals damage that it was supposed to deal. - - qol: The bluespace gas sender can now be unwrenched in the same manner as a thermomachine. - - qol: The bluespace gas sender can now be turned on/off with ctrl-click. - - bugfix: suit_storage slot now shows the item it has equipped - - admin: Attack logs for stripping people and equipping items to them have been - reformatted to match all other attack logs, improving readability. - - bugfix: fixed the icon behaviour of the manual valve - - bugfix: If you ever chance upon Multi-Z Debug Station, rest assured that it now - uses the right kind of space. - - bugfix: Biogenerators don't take 1% of a power cell to grind a single melon - Zonespace27: - - bugfix: Readded baseturfs to black mesa -2022-05-16: - SkyratBot: - - spellcheck: Boritos flavours have more flavour! -2022-05-17: -======= timothymtorres: - qol: Add randomized lockers, reagent tanks, and atmospherics equipment to Meta maint. @@ -1461,30 +977,12 @@ - bugfix: Finally gave the Icebox kitchen a condimaster. OperativeLyn: - bugfix: Removed a windoor inside of a wall in IceBox. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PositiveEntropy, Azlan, Axietheaxolotl: - imageadd: Resprites all the Engineering Jumpsuits and Jumpskirts! - imageadd: Resprites the firesuit! - imageadd: Resprites all the hard hats! - imageadd: Resprites the insulated gloves and Chief Engineer gloves! - imageadd: Resprites the hazard vest! -<<<<<<< HEAD - SkyratBot: - - bugfix: fixes broken admin ticket links - - balance: CPU, Sensor and Identify hardwares have all been removed from modular - PCs, this means AtmoZphere can run regardless of hardware, and running programs/updating - your PDA info, is no longer tied to hardware either. - - bugfix: Trying to fireman carry someone you can't fireman carry now properly makes - you not carry them permanently - - bugfix: Fixed the two primary traitor objectives calculating reputation incorrectly - at round end - - bugfix: Fixed the reputation value of objectives having a misplaced decimal point - in the round end report - - bugfix: Lightning bolt spell will give tesla shock immunity when granted by an - admin - - spellcheck: fixed an outdated quip about buying scipapers in the experiment status -2022-05-18: -======= SmArtKar: - bugfix: Lightning bolt spell will give tesla shock immunity when granted by an admin @@ -1503,44 +1001,36 @@ 2022-05-17: Cheshify: - balance: Snowdin.dmm is now in line with the design doc ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Dorsidwarf: - rscadd: Replaced table-crafting fried eggs with good old-fashioned frying on the chef's griddle. - bugfix: Changed the double-yolk sprite that only the fried-egg (And not foods using it) had to a single. -<<<<<<< HEAD -======= DragonTrance: - refactor: Flora code is much more organized :) - rscadd: Flora (trees, plants, etc) can be uprooted with a shovel, which can then be dragged around. - code_imp: Moved "kirbyplants" into their own .dm file, instead of just finding a comfortable spot in flora code ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - code_imp: Adds radial support to stack crafting. - qol: Cult buildings are now made via radial, instead of stack window. - qol: Stack craftingnow uses balloon alerts. -<<<<<<< HEAD - bugfix: Fixes mind restoration causing dizziness instead of healing it SkyratBot: - balance: Sending PDA's to all is now configured by the WireCarp app, rather than being tied to Law office access. -======= RandomGamer123: - bugfix: Tank compressors' icons now visibly update when being rotated - bugfix: Tank compressors' rotation after reconstruction actually work properly - code_imp: '`/obj/machinery/atmospherics/components/proc/connect_nodes()` actually gets called on every node of the atmospheric component' Son-of-Space: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Security General access has been simplified - bugfix: Detectives ability to brig crew has been moved to skeleton crew access to fit the job function - bugfix: Detectives now have general access to all general areas of security consistently across all stations -<<<<<<< HEAD - code_imp: pod cloning logging is now in investigate botany - imageadd: Turned vapes into GAGS making them recolorable from vendors. - imagedel: Removed the massive ammount of old icons for vapes. @@ -1607,7 +1097,6 @@ tf-4: - bugfix: Tram and Icebox once again have gas miners. 2022-05-20: -======= SuperNovaa41: - refactor: Turned the forensics component into a datum. Tastyfish: @@ -1635,7 +1124,6 @@ - config: In case you were really keen on using Virtual Reality Hub stuff in your code, do keep in mind that we've removed references to it in config. 2022-05-19: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, Onule: - balance: Doubles the range of the MOD Pathfinder AI - bugfix: Fixes modules rendering below MODsuits @@ -1654,7 +1142,6 @@ size to normal while making it uncompatible with storage modules. - rscadd: Adds the chameleon MOD module from the uplink. It lets you disguise the suit as any back item while it's off. -<<<<<<< HEAD Nerev4r: - imageadd: Adds more horns. Upward, curly, lifted, horns from Sojourn, and a Dragon option from Virgo. @@ -1670,7 +1157,6 @@ - admin: Admins using the dsay verb will now have their rank(s) shown in a hoverable tooltip SkyratBot: -======= Guillaume Prata: - balance: RCDs can't deconstruct reinforced tiles directly anymore. Ivniinvi: @@ -1724,14 +1210,12 @@ - bugfix: added a missing tank dispenser to kilo toxins. 2022-05-20: Ghilker: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: supermatter cascade gas needed amount was broken and you'd needed around 200k Moles of antinob+hypernob (40% each at least) instead of "just" 20k Moles. - balance: 'changed how hypernob and antinob interact with the SM: heat capacity made similar (15 anti, -13 hyper), transmit modifier added (-5 anti, 3 hyper)' - rscadd: lights now break or set to emergency when the cascade starts, maintenance is set to emergency access -<<<<<<< HEAD - admin: AI malf/combat purchases are now logged in uplink.log - bugfix: Fixes solid plasma breaking into plasmaglass shards - bugfix: Radstorms now yield to the almighty GODMODE flag. Rejoice. @@ -1824,7 +1308,6 @@ - bugfix: Fixes some airlock cycle links in Blueshift. - bugfix: Fixed Tramstation's Supermatter Engine APC. - rscdel: Took NSS Journey out of its misery. -======= Mothblocks: - balance: Midround rolls will now happen more frequently, with their power scaling up over time. @@ -1868,12 +1351,10 @@ - bugfix: Standardizes some access reqs on varedited objects like windoors and shutter buttons - bugfix: Some missed doors with access reqs instead of mapping helpers were fixed ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vladin, Professional Cleaner Association Representative: - bugfix: Ceramic shards are no longer comically large, and can be fit inside trash bags for cleanup. YakumoChen: -<<<<<<< HEAD - bugfix: Microfusions can be stored on MODsuits with a magnetic harness again - qol: interdyne spawns with right id Zenitheevee: @@ -1905,7 +1386,6 @@ - spellcheck: There is now a space between the Staff's name and the thing that declares them to be Staff in deadsay. - admin: Added a new Puzzgrid smite -======= - bugfix: 'Tram: Engine room external airlock access corrected.' jlsnow301: - refactor: Converted the airlock controller to TypeScript, added some visual effects @@ -1948,12 +1428,10 @@ SmArtKar: - bugfix: Fixed ethereal revive crystal bugging out when buckled san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Nanotrasen realized that intern they left to do announcements accidentally obscured the location of where any potential blood cultists may be summoning their eldritch deity, this should no longer happen whenever they tack this intern on. -<<<<<<< HEAD - bugfix: fix sm shards dusting when wrenching - balance: Hitting someone in melee with the explosive lance now moves you to the same tile as them before it sets off the grenade. @@ -1974,7 +1452,6 @@ Ghommie: - bugfix: Replaces the space turfs under the resin walls at the ghost cafe with dirt. -======= - spellcheck: There is now a space between the Staff's name and the thing that declares them to be Staff in deadsay. - bugfix: There are no longer two turfs on one tile in Hilbert's Research Facility. @@ -1994,14 +1471,12 @@ portal has been eaten. MNarath1: - bugfix: fixes goliath not chasing people ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Fixes a rare hard-delete with queen bees. - bugfix: Nuke cinematics should show up again, more often. Hopefully. - bugfix: Malfunctioning AI's Doomsday cinematic also shows again. - code_imp: Sorted, doc'd, and minorly improved the code of nuclear bombs. - refactor: Refactored cinematics a teeny bit. -<<<<<<< HEAD PK_Sonikal: - rscadd: The Survivalist Bunker, occasionally found by space explorers, now has a pharmacy for chemistry. @@ -2017,21 +1492,18 @@ portal has been eaten. - refactor: 'Improved UI for personal crafting: has category groups, better full-sized UI, more space-efficient and readable compact mode.' -======= MidoriWroth: - bugfix: Removes the unnecessary light switch in Meta Station medbay central. PK_Sonikal: - rscadd: The Survivalist Bunker, occasionally found by space explorers, now has a pharmacy for chemistry. Rhials: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds a new random event -- Scrubber Clog! Scrubbers may now randomly be clogged by mobs, which will result in them crawling out and getting all over the place. This can be fixed by pumping the scrubber with a plunger, or by just welding the scrubber shut and leaving it for a while. - rscadd: The plunger has been integrated into the janitor's arsenal. You may now purchase them from the Janidrobe and equip them into janibelts. -<<<<<<< HEAD - rscadd: Smoke expands through newly opened airlocks if it hasn't finished spreading. - bugfix: Petting 10 animals no longer counts as individual mood bonuses, and will instead replace eachother. @@ -2105,7 +1577,6 @@ choose. - spellcheck: Fixed a few incorrect capitalisations 2022-05-25: -======= Son-of-Space: - qol: Moved around some overlapping wall objects in engineering on IceBox - qol: Removed a 2x2 wall in engineering on IceBox @@ -2135,13 +1606,11 @@ Fikou, unit0016: - rscadd: Chrono Legionnaire and Admin MODsuits now have the ability to hold mobs with kinesis. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: The PDA Messenger app is now undeletable, unavailable for download and also no longer takes space on the hardware, something something bluespace cloud storage. As a result, everyone should once again be spawning with the programs they were meant to spawn with in the first place. -<<<<<<< HEAD Melbert: - bugfix: Wags-His-Tail and Eats-The-Roaches have wiggled their way back from a deep space expedition to the janitorial closet of Deltastation. @@ -2166,7 +1635,6 @@ - bugfix: A few tails which were meant to be able to use the fluffy turf emote and couldn't, now can. - bugfix: ashwalkers can use quirks and not loadouts, as was intended -======= Iamgoofball: - bugfix: Fixes the price on SOUTH. BRONX. PARADIIIISE! Again. Maurukas: @@ -2177,7 +1645,6 @@ Pepsilawn: - bugfix: Fixed incorrect departmental signs on Delta and Meta, as well as the Caves Gateway mission. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 timothymtorres, TheBonded: - rscadd: Added illiterate quirk that prevents a mob from reading or writing. This prevents using books, paper, tablets, computers and some other objects. @@ -2186,7 +1653,6 @@ will still be able to bash the keyboard to send the ship. - rscadd: New severe brain trauma - Dyslexia. It just makes you illiterate until it's fixed. -<<<<<<< HEAD 2022-05-26: Cursor: - rscadd: The Ghost Cafe now has a skillsoft machine. Go on then. Learn about...Wine? @@ -2247,7 +1713,6 @@ - bugfix: Detectives no longer have access to gear lockers by default across all maps - rscadd: Lattices over chasms will now actually hold you up. -======= 2022-05-25: Melbert: - bugfix: Wags-His-Tail and Eats-The-Roaches have wiggled their way back from a @@ -2323,7 +1788,6 @@ - bugfix: Scientists should now be able to access the mass driver on Kilo once more. - bugfix: Kilo had some of its areas fixed. MTandi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Gravgen now can't be repaired when not broken. - bugfix: Airlocks now properly say that they're welded when examined. - qol: Oldstation some internal windows are not reinforced to allow easier breaking @@ -2343,7 +1807,6 @@ - rscadd: Oldstation medbay has bonsai skillchip in the box to provide a use for all the dead plant pots - bugfix: Oldstation minor fixes and visual tweaks like missing switches, etc -<<<<<<< HEAD - bugfix: Fix slime potions used on simple mobs to inherit all language abilities from the user - bugfix: The Chief Engineer and Station Engineers no longer spawn with a broken @@ -2402,7 +1865,6 @@ - bugfix: Fixes an obvious oversight resulting in stacking inventory items to violate the laws of physics. Belts are now Bulky and do not fit in bags. - bugfix: Hair dye spray now properly updates your sprite after being used -======= Melbert: - bugfix: Adds some minor sanity to the Lionhunter Rifle. Mooshimi: @@ -2431,13 +1893,11 @@ - bugfix: fixes missing smoothie sprites - imageadd: added smoothie sprites fippefi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: All request consoles on Icebox have been fixed to a new standard! No more Unknown request console sitting in the kitchen. - bugfix: Request consoles should more often default to a sane name instead of Unknown. - code_imp: Request console naming and subscription code has been redefined to work better with mapping. Auto-names, too! -<<<<<<< HEAD - bugfix: Fixed foam spreading through public airlocks and windoors - bugfix: Detectives can now use the brig on emergency shuttles properly again - bugfix: Access helpers were added to more shuttles @@ -2452,7 +1912,6 @@ new antagonist name. - spellcheck: blade heretic lore for how much silver it takes to make a blade is now correct -======= jlsnow301: - qol: The genetics console is a bit easier to use with scrolling mutations and tabs. @@ -2492,12 +1951,10 @@ - bugfix: Fixed most eye color effects not working - bugfix: Fixed foam spreading through public airlocks and windoors Thunder12345: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - imageadd: Medals have been resprited and should now look 126% more swag. Wallem: - rscadd: Bug-based food items have been given their own foodtype. Lizards, Slimes, and Felinids love bugs! Humans, Moths, and Podpeople don't. -<<<<<<< HEAD Zergspower: - qol: Returns Borg PDA messaging Zonespace27: @@ -2517,12 +1974,10 @@ range. 2022-05-29: SkyratBot: -======= private-tristan: - spellcheck: blade heretic lore for how much silver it takes to make a blade is now correct vincentiusvin: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Made adv engi tech node require bz shells as an experiment, organs no longer need it. - balance: Adv mining no longer requires adv engi. @@ -2536,8 +1991,6 @@ - balance: Added more options to purchase nodes in the paper partners. Your point gain stays the same though. - balance: Removed roundstart BZ can from xenobio. -<<<<<<< HEAD -======= 2022-05-29: LemonInTheDark: - balance: Smoke and foam can no longer continuously react their reagents @@ -2549,7 +2002,6 @@ requires it' - refactor: oldstation map size now 112x64 SmArtKar: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added eyesnatcher objective which requires you to pull out someone's eyes. You will be given an automatic eye extractor to assit you in that. - rscadd: Added kidnapping objective which works similarly to old contractors @@ -2560,7 +2012,6 @@ requirement but itsn't job-locked - balance: Default version of Sleeper Protocol now can be rolled by roboticists as well(since they have an operating table with a console) -<<<<<<< HEAD - balance: Smoke and foam can no longer continuously react their reagents - refactor: oldstation map size now 112x64 - rscadd: Brand new HoP coat! @@ -2583,7 +2034,6 @@ - bugfix: Map votes will now happen again once the shuttle departs, regardless of whether your server allows everyone to start a map vote or not, as intended. Melbert: -======= axietheaxolotl: - rscadd: Brand new HoP coat! - imageadd: New sprites for HoP's uniform, skirt, cap, and the ID Painter. @@ -2615,13 +2065,11 @@ - rscadd: Aurora Caelus is now localized entirely within your station's kitchen. Melbert: - rscadd: The science breakroom on Icebox is in a slightly nicer state again. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Chaplains no longer trigger their own anti-magic when they use Nullwave Vibrato. - code_imp: Reduced some copy+paste from sect music code. Meyhazah: - imageadd: Resprited chaplain's witch hunter set. -<<<<<<< HEAD SkyratBot: - bugfix: fixes crusher inhands being swapped - rscadd: Aurora Caelus is now localized entirely within your station's kitchen. @@ -2644,7 +2092,6 @@ from command and medical's icons. - imageadd: the Quartermaster has a more command-coloured secHUD icon. - balance: Reagent katana no longer has ridiculous wound bonuses -======= ReinaCoder: - qol: Head of Personnels rejoice! Their jumpsuit when adjusted no longer covers the chest. @@ -2666,4 +2113,3 @@ - balance: Unique AI trait now gets rid of the station's DIFFERENT lawset modules, and increases the research cost to unlocking them. - qol: AI is given a printout of their new laws ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-06.yml b/html/changelogs/archive/2022-06.yml index 05b074792c6..ec21873b01a 100644 --- a/html/changelogs/archive/2022-06.yml +++ b/html/changelogs/archive/2022-06.yml @@ -2,7 +2,6 @@ ATHATH: - bugfix: Podpeople can no longer circumvent their immunity to becoming fat by chowing down on some food and then hiding in a locker. -<<<<<<< HEAD Hardly: - rscadd: Added QM skirtleneck to command vendor Ryll/Shaps: @@ -63,7 +62,6 @@ Ghommie: - bugfix: Stops the mold foam effects from having a station-covering range of 200. It should be 4/5 now. -======= Fikou: - balance: The engilathe can now print plasma cutters. - rscadd: Adds a chance for ID cards to be tastefully thick @@ -132,13 +130,11 @@ - imageadd: Added new sprites for the airlock painter, tile & decal sprayer. Fikou: - bugfix: surplus prosthetics have correct sprites now ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: The stasis ripple effect will now play in a loop as intended, rather than only playing once. - bugfix: Buckling down someone to a stasis bed should no longer occasionally make them lie down veeeeery slowly. -<<<<<<< HEAD - bugfix: Chest markings should now all work again. Yes, this includes tattoos and body tonage. Jolly: @@ -147,9 +143,7 @@ Melbert: - rscadd: Cargorilla. - code_imp: Removed a locate() in world from the evil PunPun trait -======= Melbert: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'Heretic: The Amber Focus is now fireproof.' - balance: 'Heretic: The Eldritch Medallion (thermal vision necklace) is now fireproof, acid proof, and works as a focus.' @@ -158,7 +152,6 @@ and a singular sickly blade. It also functions as a focus while the hood is down.' - balance: 'Heretic: Mawed Crucible potions are now small sized (down from normal).' -<<<<<<< HEAD Ryll/Shaps: - bugfix: Fixed pellet clouds not being able to wound SkyratBot: @@ -196,7 +189,6 @@ - imageadd: added new Sol Police uniform sprites to fit better in the modern sprite era. SkyratBot: -======= - balance: Cremator button has no access requirements - bugfix: Light switches no longer cause anchored objects over conveyors to move. Pandarsenic: @@ -209,12 +201,10 @@ Son-of-Space: - bugfix: Some overlapping objects were adjusted on the walls in the firing range on MetaStation ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Adds some greps to check for commonly misplaced structures in closed turfs - bugfix: Some objects stacked within closed turfs have been removed from those turfs. -<<<<<<< HEAD - bugfix: Player-facing Traitor reputation numbers are now consistent when you view how much you have. - qol: breathedeep makes a return in the atmozphere tablet app. Right click to scan @@ -236,7 +226,6 @@ Melbert: - bugfix: Fixes some cinematics sticking around for longer than comfortable SkyratBot: -======= robbertapir: - bugfix: Made engraving not throw errors when everything works as expected. tralezab: @@ -275,93 +264,24 @@ - bugfix: A severe lack of plating under a window in the DeltaStation rec room was remedied dragomagol: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: cyborg wire pulses/cuts are now logged in silicon.log - admin: AIs being carded is now logged in silicon.log - admin: giving an AI a combat module is now logged in silicon.log - admin: trying to upload over the maximum number of laws is now logged in silicon.log - admin: ion storm law changes are now logged in silicon.log - admin: changing settings on a borg shell is now logged in silicon.log -<<<<<<< HEAD - - bugfix: departmental officers' access across departments has been standardized, - and previously lost accesses were added back - - balance: Departmental security officers have access to more areas in their departments, - including xenobiology or virology - - code_imp: replaces some slot names with proper names - - bugfix: Central Command no longer erroneously refers to the Ice Box planet as - a station in orbit. - - bugfix: fixed parallax blue stars showing through parallax asteroids. - - bugfix: Caught Molotovs no longer immolate the target. - - bugfix: right clicking the BEPIS no longer makes it invisible. -======= robbertapir: - bugfix: held memorizers are now visible 2022-06-06: Dragomagol, sprites by MistakeNot4892: - rscadd: 'Added a new pAI holoform: the crow!' EOBGames: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'A few new crates have made their way to cargo: buy yourself a Lizard or Moth food crate today!' - rscadd: Recipes for Yoghurt (10u cream, 2u virus food), Cornmeal (grind corn), and Quality Oil (1u quality oil, 2u cooking oil) have been added. Bon appetit! - balance: 'Species food (lizard and moth food) have received a sweep of balance changes: they''re now more filling and a bit easier to access.' -<<<<<<< HEAD - - bugfix: fixed a bigger dose of zombie powder permasleeping you - - bugfix: Durand shields no longer layer incorrectly or visually decouple from the - mech. - - bugfix: Under construction airlocks no longer have paper stuck to them. - - bugfix: Xenomorph larva cancelling their evolution no longer displays unnecessary - messages - - bugfix: held memorizers are now visible -2022-06-07: - ATHATH: - - rscadd: Bulky crowbars have been added to all fire-safety lockers. - - spellcheck: Large crowbars are now named "large crowbars" instead of just "crowbars". - Deek-Za: - - bugfix: Fixed vests for Science, Medical and Service guard roles for digitigrade - people. - Ebin-Halcyon: - - imageadd: Cargo clothing have new sprites for digitigrade legs - - imageadd: Engineering clothing have new sprites for digitigrade legs - ErdinyoBarboza: - - balance: Rebalances costs of all shotgun shells in techfabs and autolathes. - - balance: Rebalances buckshots damage. It now has more pellets and damage but is - weak against armor. - - rscadd: 'Magnum Buckshot: Has less pellets that deal more damage and is now weak - against armor.' - - rscadd: 'Express Buckshot: Has more and faster pellets and tighter spread but - each pellet is weaker then normal buckshot.' - - rscadd: 'Hunter Shot: A specialized buckshot that deals more damage to simpler - beings (Anything that is under /mob/living/simple_animal)' - - rscadd: 'Hollow Point Slug: Deals more damage then slugs and has higher wounding - potential on bare targets however it is weak against armor.' - - rscadd: 'Flechettes: Specialized buckshot that can penetrate armor and deals cut - damage but is weaker damage wise.' - - rscadd: 'PT-20 Armor Piercing Slug: A saboted plastitanium slug that can penetrate - armor but deals less pure damage then normal slugs.' - - rscadd: 'RIP Slug: Radically Invasive Projectile, is capable of embedding and - causing massive internal damage but is weak against armor.' - - rscadd: 'B3-HVE ''Beehive'' shell: Smart Nanite-Rubber pellets that ricochet with - a very high auto-aim angle.' - - rscadd: '4NT1-TD3 ''Suppressor'' shell: A shell filled with electrodes that embed - into targets and deal stamina damage if they move.' - - rscadd: 'Iceshot: Iceblox round in buckshot delivery.' - - rscadd: 'Confetti Rounds: Some clown decided filling the buckshot with confetti - instead of pellets was smart.' - - rscadd: Adds Shotshell Boxes to Guncargo Dynamics. You can now buy boxes of 35/15 - ammo boxes of shotgun shells and carry them neatly in their bulky box. You can - also directly feed your shotgun from the box. - - balance: Rebalances some of the shotgun prices in guncargo. - - rscdel: 14 Gauge and SAS14 have been fully removed. - Higgin: - - bugfix: Corrections Officers now actually have weapons permits allowing them to - have their job gear. - IsaacTheSharkWolf: - - refactor: Redid the upper part of toxins to include the oxygen storage tank, mix - pipelines, cooling room and some additional adjustments to fit it all. -======= Iamgoofball: - bugfix: Central Command no longer erroneously refers to the Ice Box planet as a station in orbit. @@ -409,13 +329,11 @@ - bugfix: Health Analyzers now properly flag robotic and prosthetic limbs again. Iatots: - imageadd: Hot Cocoa and Tea now come in mugs again. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly, sprites by Blueshirtguy: - rscadd: 'Jolly: Added the flower garland to the crafting tab under clothing! You''ll need 4 of these flowers to craft it: poppies, harebells and roses. It''ll also calm your nerves a bit, if you''re on edge.' - imageadd: 'Blueshirtguy: Sprites for the flower garland on-mob and icon sprites.' -<<<<<<< HEAD Moostard: - bugfix: Spent peacekeeper FMJ casings have a correct sprite now. OrionTheFox: @@ -512,7 +430,6 @@ - config: Add every AI lawset to game_options config - config: Rebalance AI lawsets in game_options config - bugfix: Lawsets overflow to behave correctly -======= Mooshimi: - bugfix: There is now air in the Deltastation security escape pod airlock. Mothblocks: @@ -545,13 +462,11 @@ - bugfix: Photon projector implants can no longer be used in assemblies. This means that they can no longer bilocate. san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Nanotrasen has finally tracked down an elusive signal that's been haunting them over all of their broadcasts... there appears to be a new Syndicate Listening Base commissioned. - balance: The odds for a Syndicate Communications Agent (the Space kind) is now at an 15% chance to spawn. -<<<<<<< HEAD - imageadd: Resprites the white costume found inside the costume vendor. - balance: Station equipment that holds materials (techfabs, ORMs) can't connect to ore silo's on a different Z level. @@ -610,7 +525,6 @@ - imageadd: New plumbing duct sprites. - bugfix: Fire hallucinations are no longer invisible - qol: Fuel and water tanks have examine hints now -======= - balance: Nanotrasen has now implemented a "buffer zone" on IceBoxStation between the wilderness portions of the moon and the parts where there is a station presence. Hopefully, you should see a lot less fauna try to make their way on station. @@ -640,7 +554,6 @@ removed. - bugfix: Multiplying production rates by splitting pipenets no longer possible. Son-of-Space: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Reorganizes some of the access and jobs access code for readability - balance: The minisat and tcomms are more accessible to engineering roles on skeleton crew, and engineers normally @@ -662,24 +575,6 @@ - bugfix: Minisats across all maps have proper access requirements to their contents - bugfix: Tech storage now uses its access properly and again requires both command and tech access to get to secure storage -<<<<<<< HEAD - - admin: Smoke now logs the last person to touch the source of the smoke as the - last person to touch the smoke itself. Gunpowder smoke should be less annoying - to log dive as a result as every explosion will log that person. - - bugfix: You can no longer create negative amounts of alloys in the ORM - - rscdel: you can't hold bread slices in your mouth (head) anymore. - - rscadd: you can hold griddled toast in your mouth (mask). - - rscadd: Solar panel assemblies and solar tracker electronics can now be made in - an autolathe - - balance: Traitor objectives have a significantly reduced reputation reduction, - making it more viable to gain reputation beyond the expected reputation. - - rscadd: Add hallucinogen poison to frog attacks - - bugfix: Fixes issue where lobby buttons were still visable and usable under panic - bunker x interview system and also allows use of fix chat verb for interviewees. - - rscadd: The Concealed Weapon Bay is available again for traitor Roboticists and - Research Directors. - - bugfix: Fixes bzformation not working. -======= Tastyfish: - bugfix: The ID access reader and access checker circuit components now work again with the new string-based access system. @@ -760,7 +655,6 @@ - bugfix: Fixes bzformation not working. SmArtKar: - bugfix: Fire hallucinations are no longer invisible ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TehZombehz for the sprites, san7890: - rscadd: For some reason, Donk Co. suddenly found a crate full of alien-themed plushies in their warehouse. They immediately started loading up their arcade @@ -769,7 +663,6 @@ - rscadd: For the brave smokers out there, legends tell of a new lighting technique involving molten stone from the planet's core. Only the brave are advised to attempt this. -<<<<<<< HEAD mel-byond: - rscadd: Added normal and Sec/Med/Meson HUD aviators - rscadd: Added Retinal Projector HUDs @@ -831,7 +724,6 @@ administration team of this change so they can diagnose it properly from there. - spellcheck: Asimov++ no longer includes "In the case of conflict, the majority order rules." -======= Watermelon914: - balance: Traitor objectives have a significantly reduced reputation reduction, making it more viable to gain reputation beyond the expected reputation. @@ -882,73 +774,11 @@ Watermelon914: - bugfix: Skip time button on the steal objective now has a fast forward icon. YakumoChen: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Changed the position of light tubes in certain surgery rooms to not be directly over a surgery bed. No more smashing lights with your saw by accident! - qol: Aspiring AIs can now listen in on patient talk in Meta's primary surgery room. Or you could listen to the soothing sounds of the the crew dying from the comfort of a surgery bed when comms are down too, I guess. -<<<<<<< HEAD - - bugfix: Skip time button on the steal objective now has a fast forward icon. - - bugfix: A manually edited APC in the deepstorage ruin has been replaced with an - APC of the appropriate type. - - rscadd: Weather effects will now be a bit more subtle in darkness, hopefully this - looks nicer - - imageadd: I've done some resprites to snow and non smoothing lava - - balance: Pre-loaded PACMAN generators now have 15 plasma sheets, instead of 50. - Tastyfish: - - bugfix: Engineering and mining RCD's now work again. - - imageadd: Teshari backpack fallback sprites for the few that don't have real sprites. - - imageadd: Teshari modsuit control unit sprites. - Zonespace27: - - bugfix: Iceblox 12g can no longer make you hotter than the surface of the sun - gummardgumphrey: - - rscadd: Added new *laughtrack emote for synthetics to play on a whim! - softcerv: - - bugfix: organ damage now carries over while using the SAD along with brain trauma. - - bugfix: the SAD no longer heals brute and burn damage. - - code_imp: cleans up SAD code. - - bugfix: Blueshift now uses stasis beds instead of stasis pods. -2022-06-12: - IsaacTheSharkWolf: - - bugfix: Hopefully fixed most of the issues that were notified to me about toxins. - - bugfix: Added stasis beds to medical. - - bugfix: Redid blob spawns so they don't spawn in the middle of maintenance. - Melbert: - - bugfix: Fixes Novaflowers not lighting targets on fire. - - code_imp: Reduces some copy+paste and cleans up some unique plant genes code. - OrionTheFox: - - bugfix: Nanotrasen has found the time and money to re-fit their ERT docks onto - arrivals. Now their response teams wont have to ram through the glass walkways - just to land! - - imagedel: deleted LOTS of hopefully unused uniform icons. Ping @orion_the_fox#1915 - in a public dev channel if any sprite issues occur. - SkyratBot: - - bugfix: Fixed a symmetry issue with the lava clown puzzle where a lone chasm tile - wasn't connected with its fellow chasms. - - bugfix: Abductors should now hopefully spawn in on their little alien pod rather - than on the station's arrivals shuttle. - - bugfix: Chaplains, CMOs, and Psychologists can now all rejoice that they start - in their offices in Tram now, rather than take the shuttle. - - bugfix: Fixed thieves/opportunists icon. - - bugfix: Several pairs of external airlocks without cycle link helpers have had - them added on TramStation - - bugfix: The Warp whistle can be used more than once again. - Zonespace27: - - rscdel: Triangulate Weakpoint is not available below 80 crewmembers. - tf-4: - - bugfix: Squashed some exploitables weirdness. -2022-06-13: - GoldenAlpharex for all the modular fixes, Kapulimbs for the original code: - - refactor: Organs have been refactored, especially external organs. Notify Golden - if there's any unexpected behavior. - Melbert: - - bugfix: Earthsblood makes you see colors again. - SkyratBot: - - bugfix: Fixed overlapping objects on a tile in the foyer of the IceBox bar. - - bugfix: A set of unpowered airlocks by the cooling loop on TramStation are now - powered. -======= msgerbs: - bugfix: There is no longer a random pipe in the wall in Metastation's Xenobiology department. @@ -1017,12 +847,10 @@ castawaynont: - balance: The Space Ninja's MODsuit has a storage module now. kawoppi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: removed JaniDrobe refill from the General Wardrobes Supply Crate and moved it to its own supply crate - balance: adjusted General Wardrobes Supply Crate price due to it containing one less refill -<<<<<<< HEAD - bugfix: stundprods and teleprods now stun again - bugfix: igniters now work again - bugfix: floating now stops slips just as well as flying @@ -1141,7 +969,6 @@ - qol: Conveyor switches now tell you the speed setting of belts when examined. You can change the speed with a multitool! 2022-06-17: -======= robbertapir: - bugfix: stundprods and teleprods now stun again - bugfix: igniters now work again @@ -1219,57 +1046,23 @@ - rscadd: Fishing technology and designs Fikou: - qol: gps and ore bag modsuit modules are now usable when suit is off ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - qol: APC construction/repairs/deconstruction uses balloon alerts now. - bugfix: The circuit board of the Book Inventory Management Console now use the correct name extension (Computer Board) instead of (Machine Board) -<<<<<<< HEAD Melbert: - bugfix: Some heretic focuses apply more consistently now. - bugfix: Furious Steel should go away more often than not now. - bugfix: Fixes the fireman carry "body stuck to you forever" curse -======= Iamgoofball: - soundadd: Energy and Magic gunfire sound pitch now varies based on how much ammo is left. - soundadd: Ballistic gunfire now has a low-ammo click sound. Melbert: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Items getting knocked off (glasses and cigars), bad omens, and spaghetti falling from pockets should trigger on most knockdowns again like they used to. - code_imp: Cleaned up the knockoff component a bit. Also unit tests it. -<<<<<<< HEAD - SkyratBot: - - imageadd: The chaplain's jumpsuit and skirt has been resprited. - - rscadd: Added fishing, fishing rods and other fishing equipment. - - rscadd: Fishing related cargo crates & private packs. - - rscadd: Fishing technology and designs - - bugfix: Fixes infiltrator toolbox not fitting all suit parts - - bugfix: Reagent dispensers will actually remove reagents upon leaking - - bugfix: icebox science has a scidrobe again! - - bugfix: fixed grav gen being overridable/overloadable - - bugfix: Fixes mothic garlic pizza not producing the correct slice on slicing - - bugfix: Fixed locate weakpoint do_after being 3 seconds instead of intended 30. - Also you can no longer roll locate weakpoint until you get at least 20 minutes - of progression via objectives - - qol: gps and ore bag modsuit modules are now usable when suit is off - Twaticus, Wallemations: - - rscadd: '4 new emojis added to the joy mask! Check the AutoDrobe tweak: You can - now use internals with the joy/emotion mask' - YakumoChen: - - bugfix: Security webbing can no longer be erroneously reskinned into sec belts. - Zonespace27: - - bugfix: Modules that work on inactive MODsuits now work properly - - bugfix: Circular saw should work as a weapon now - - bugfix: Borers can now leave their hosts again - - rscadd: Drifting Contractors are now a midround ruleset - atteria: - - imageadd: 3/4 sprites for MULEBots - theOOZ: - - bugfix: The xeno-tail can wag again, and does not get hidden when wearing a MODsuit -======= - bugfix: Some heretic focuses apply more consistently now. - bugfix: Furious Steel should go away more often than not now. - bugfix: Fixes the fireman carry "body stuck to you forever" curse @@ -1308,19 +1101,10 @@ - bugfix: Bluespace rifts pick a safe turf in CentCom dock now. - spellcheck: Improves almost all messages that play during a cascade. - admin: Better logging about resonance cascade-related actions. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-06-18: Melbert: - balance: AI Gorillas are now allied to AI monkeys, and AI Cargorillas won't try (and fail) to wail on crewmembers. -<<<<<<< HEAD - SkyratBot: - - bugfix: Fixes proto-nitrate tritium response requiring proto-nitrate bz response - radiation energy requirement amount of energy to emit radiation pulses, and - vice versa. - - imageadd: Adds an inhand sprite for the atmos gasmask - - imageadd: Updates the medical duffelbag inhand sprite -======= Pickle-Coding: - bugfix: Fixes proto-nitrate tritium response requiring proto-nitrate bz response radiation energy requirement amount of energy to emit radiation pulses, and @@ -1328,7 +1112,6 @@ ReinaCoder: - imageadd: The chef's hat, jumpsuit/skirt, and suit has been resprited distributivgesetz: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Shuttle hijack timeouts work now. jlsnow301 KubeRoot stylemistake Iamgoofball Kapu1178: - rscadd: Adds the TGUI say modal to replace speech input boxes. Many features! @@ -1353,7 +1136,6 @@ them. - refactor: Refactors admin centcom reports into typescript. You must send the report to save the text. -<<<<<<< HEAD 2022-06-19: SkyratBot: - bugfix: the randomize_human proc now gives non-humans a name that matches their @@ -1364,7 +1146,6 @@ - imageadd: The chef's hat, jumpsuit/skirt, and suit has been resprited - bugfix: the Chaplain's sparring sect now works on Kilostation again. - qol: Meta and Tram have autodrobes in dorms now. -======= theOOZ: - imageadd: Adds an inhand sprite for the atmos gasmask - imageadd: Updates the medical duffelbag inhand sprite @@ -1385,14 +1166,12 @@ - bugfix: Kilostation's Xenobiology is no longer roundstart on firelocks, and the security medical post now has a scrubber. Pickle-Coding: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Changes supermatter powerloss function. It will transition to linear powerloss function at 5.88076GeV, and the linear powerloss function has been offset so that the transition between the two functions is completely smooth. - balance: Changes powerloss inhibition (both CO2 and psychologist effect) to change the rate of powerloss instead of changing the rate of both functions then comparing them to which one should be used. -<<<<<<< HEAD 2022-06-20: Christmas5: - bugfix: Changeling transformations now update scream/laugh types, age, as well @@ -1413,7 +1192,6 @@ - qol: Health and Gene analyzers give a balloon alert on a successful scan. IsaacTheSharkWolf: - bugfix: Burn chamber air alarm(s) should work now. -======= - rscadd: Gas canisters and other portable atmospheric machinery can now be packaged with wrapping paper. - rscadd: Replaces chat messages with balloon alerts for package wrapping related @@ -1436,7 +1214,6 @@ enough space by removing recycle bins that reset its internal space from infinity to the level of matter bin part - qol: food now shows its type on examine ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - qol: The Cursed Dufflebag now tells nearby people when it takes a bite out of someone. @@ -1448,30 +1225,6 @@ dead, and doesn't heal if so. - bugfix: The Cursed Dufflebag no longer permanently makes you a pacifist and clumsy. - code_imp: Diggable component was changed to the Diggable element. -<<<<<<< HEAD - OrionTheFox: - - imageadd: rearranged all the security digitigrade uniforms into a security_digi.dmi - in a continued organization effort. Please report any relevant Uniform icon - issues to @Orion_The_Fox#1915. - - imageadd: Nanotrasen's finally permitted the use of non-replica Naval(Imperial) - Uniforms aboard their station, and has even supplied Heads of Staff with higher - quality ones as well, should they choose to wear them! (Also updates departmental - Utility uniforms - Please report any relevant Uniform icon issues to @Orion_The_Fox#1915.) - - imageadd: CentCom/Armadyne/etc uniform/digi icons have all been moved into clothing/under/centcom.dmi - files in a continued organization effort. Please report any relevant Uniform - icon issues to @Orion_The_Fox#1915. - - imageadd: With this moving, Armadyne in particular has been given a bit of a makeover, - mostly just to be cleaner and in-line with current sprites. Credit to Halcyon - for the trenchcoat - and for making me need to add this CL entry. - PositiveEntropy, WJohnston, Dragomagol, LemonInTheDark, Riggle: - - imageadd: Resprites most variety of tiles into a better shaded version! - - code_imp: Damaged floors are now damaged overlays, meaning that most tiles should - properly display a damaged state! - RimiNosha: - - bugfix: The engineering deliveries windoor on Blueshift now actually allows engineers - to open it. - SkyratBot: -======= Mothblocks: - bugfix: Fixed revolutions blaring alerts for a few seconds after winning. - balance: Hacking the command console and winning revs no longer adds midround @@ -1485,12 +1238,10 @@ SmArtKar: - bugfix: Locate weakpoint objective now works again. Watermelon914: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Added a way for administrators to globally disable circuit component sound emitters. - balance: Further limited the sound emitter component so that maximum volume is reduced and pitch is capped between -50 and 50 -<<<<<<< HEAD - rscadd: Gas canisters and other portable atmospheric machinery can now be packaged with wrapping paper. - rscadd: Replaces chat messages with balloon alerts for package wrapping related @@ -1542,32 +1293,26 @@ - rscadd: Famed collector items; Funko- Chunko Fops have arrived on station! They talk, and they're here for those who are willing to spend their money on useless, soulless pieces of cloth! -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-06-21: Cursor, sprites by Crumpaloo.: - imageadd: The Cargorilla has found clothing in their size. - rscadd: Updated the Cargorilla's description to match their new look. GoldenAlpharex: -<<<<<<< HEAD - bugfix: Shooting with ballistic weapons at point-blank should hopefully work again. SkyratBot: - bugfix: Fixed revolutions blaring alerts for a few seconds after winning. - bugfix: The Traitor eye snatching objective will now appear in-game. - bugfix: The Lavaland Mafia map now displays safer flooring over empty space. - bugfix: mulebots can be turned on/off -======= - bugfix: Fixed a runtime related to the TGUI white mode preference that would happen every time someone would connect to the server. JohnFulpWillard: - bugfix: The Traitor eye snatching objective will now appear in-game. MTandi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Oldstation: Added a lootbox for every role' - rscadd: 'Oldstation: Added 1 diamond ore spawn and 1 gibtonite spawn to asteroids' - rscdel: 'Oldstation: Removed redundant cable, pen, free pipe dispensers and the box of firing pins' -<<<<<<< HEAD nevimer: - bugfix: Fixes the path for the ninja jumpsuit. Still no digi version, has a TG bug with digi selected.. @@ -1598,7 +1343,6 @@ - bugfix: N-T armories has finally fixed an assembly line issue, the SMG SABR actually comes with it's firing pin now. SkyratBot: -======= Pepsilawn: - bugfix: The Lavaland Mafia map now displays safer flooring over empty space. SmoSmoSmoSmok: @@ -1621,14 +1365,12 @@ Cheshify: - bugfix: The pride and gluttony ruins have had some minor fixes MidoriWroth: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Botany can now grow olives, which can be ground into a paste and mixed with water to make quality oil. - rscadd: You can now make custom sushi by using an ingredient on a seaweed sheet. The sushi will be named after the first ingredient you use. - balance: Pierogis now need a dough slice instead of a bun - balance: Quality oil costs 50 credits to order instead of 120 -<<<<<<< HEAD - bugfix: The pride and gluttony ruins have had some minor fixes tf-4: - rscadd: Botanists can now use the "Florist" alternate title. @@ -1663,7 +1405,6 @@ (and having a total of 140 rep.) Jolly: - spellcheck: Fixed a few iMpRoPeR door names in Deltas Perma. -======= Mothblocks: - bugfix: Fixes laser pointer circuits crashing clients. san7890: @@ -1679,20 +1420,12 @@ 2022-06-24: CoffeeDragon16: - bugfix: getting your tongue removed will affect your speech again ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Language encryption keys now only work when you've equipped the headset - bugfix: Language encryption keys no longer forever-grant you the language in some circumstances - bugfix: Language encryption keys now update when they're installed if you're currently wearing the headset -<<<<<<< HEAD - - rscdel: Removed a tip suggesting being a drunk scientists boosts research point - gain. This was removed at some point, but the tip remained, despite being incorrect. - RatFromTheJungle: - - rscdel: The STG has been banished from guncargo, back into the void it came from. - SkyratBot: -======= Tastyfish: - bugfix: Opening wrapped crates now places them at the correct location. antropod: @@ -1722,7 +1455,6 @@ Hamcha: - bugfix: the message monitor console can now send admin messages again Kylerace: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'the tram is now twice as fast, pray it doesnt get any faster (it cant without raising world fps) performance: the tram is now about 10 times cheaper to move for the server' @@ -1730,13 +1462,11 @@ - code_imp: industrial_lift's now have more of their behavior pertaining to "the entire lift" being handled by their lift_master_datum as opposed to belonging to a random platform on the lift. -<<<<<<< HEAD - bugfix: Coffins' base sell price adjusted back to 100 credits as previously intended. - qol: the cyborg hypospray now has a TGUI menu - bugfix: White canes now examine objects properly and sound correct when hitting things. - refactor: Renamed "delimber" anomaly to "bioscrambler" anomaly -======= Melbert: - rscdel: Removed a tip suggesting being a drunk scientists boosts research point gain. This was removed at some point, but the tip remained, despite being incorrect. @@ -1751,13 +1481,11 @@ - balance: The AIs freeform and purge law boards have been returned as a static staple on all maps. jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Prettier is now recommended as an extension for UI development (or just in general!) - refactor: Many, many interfaces have been hit with the prettier stick so please report any issues. There should be zero noticeable differences in how UIs look or function. -<<<<<<< HEAD - bugfix: the message monitor console can now send admin messages again - spellcheck: silver golems text no longer states that they are immune to most magic - bugfix: Supermatter cascade final objective no longer generates when the engine @@ -1802,7 +1530,6 @@ Original code by SabreML: - bugfix: Items in the suit storage slot won't turn invisible anymore SkyratBot: -======= private-tristan: - spellcheck: silver golems text no longer states that they are immune to most magic skylord-a52: @@ -1839,12 +1566,10 @@ - bugfix: The decryption key to the Nanotrasen message network has been delivered to the Syndicate Listening Post IndieanaJones: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Gorillas now change speed when holding something vs. not holding something, as was always intended - balance: Made gorillas use their old speed value when they're holding something, and made them slightly faster when they're not holding something -<<<<<<< HEAD - bugfix: The decryption key to the Nanotrasen message network has been delivered to the Syndicate Listening Post - bugfix: People who gain or lose the monkified mutation no longer have invisible @@ -1900,7 +1625,6 @@ - bugfix: the hookshot bounty hunter, when summoned as an ert team member, is no longer identical to the armoured bounty hunter. - bugfix: bounty hunter IDs are no longer invisible save for the trim -======= - bugfix: People who gain or lose the monkified mutation no longer have invisible equipped items. MTandi: @@ -1924,12 +1648,10 @@ Pickle-Coding: - bugfix: Fix scrubbers not being able to be deconstructed when connected pipe disconnects. RandomGamer123: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixes nuke op reinforcements having no HUD icon when seen by other nukeops, nor being able to see the HUD icons of other nuke ops - code_imp: Fixed a runtime if update_sight is called on a mob whose client has no eye -<<<<<<< HEAD - spellcheck: Fixed a lack of line breaks in the operating computer when displaying surgeries with required chemicals - bugfix: Fix scrubbers not being able to be deconstructed when connected pipe disconnects. @@ -1937,7 +1659,6 @@ theselfish: - spellcheck: A certain cracked pocket watch's description ends better. 2022-06-29: -======= private-tristan: - balance: the meteor with engines strapped to it now has air in its rocks san7890: @@ -1948,12 +1669,10 @@ see any floating signs, or signs that appear to be positioned in incorrect locations, please contact your nearest reality manager. 2022-06-28: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 13spacemen, Gandalf2k15: - rscadd: Examining and other chat outputs now display in blocks to make them easier to see - bugfix: AI and borgs no longer have their name show twice upon being examined -<<<<<<< HEAD Guillaume Prata and Wallem: - rscadd: Botany starts with watering cans instead of buckets now. There is also a research locked advanced watering can which generates it's own water. @@ -1975,7 +1694,6 @@ - code_imp: times for food items are now in X SECONDS format, functionality is still the exact same - rscadd: Adds a special Medical ERT belt + gives it to medical ERT -======= CoffeeDragon16: - bugfix: plasma glass floor tiles will no longer sometimes be invisible - bugfix: pianos will now look broken when they are damaged @@ -2038,13 +1756,11 @@ - bugfix: Fixed a runtime that occurs when inflicting a blunt wound on an armless human. jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: TGUI Say now retains current messages / keying through history doesn't erase your current message. - bugfix: TextArea keydown prop has been renamed so as to not trigger double keydown events. - bugfix: TGUI say now properly expands when viewing recent messages -<<<<<<< HEAD - spellcheck: The Brand of Dance description is correct now - bugfix: Fixed a runtime that occurs when inflicting a blunt wound on an armless human. @@ -2061,7 +1777,6 @@ Melbert: - bugfix: Comms console hacking will be interrupted if the comms console itself is destroyed or depowered. -======= san7890: - rscadd: Ice Box Station's got a new look. Notably, the cold room is on the bottom floor with the kitchen all being up on the upper Z-Level @@ -2079,12 +1794,10 @@ spirits from - bugfix: You can no longer hypothetically capture yourself with a soulstone - code_imp: Some cleanup on aisle soulstone. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: The blood walk element has been changed from a bespoke element to a component. - code_imp: MULEs now use the blood walk component. - bugfix: MULEbots no longer track blood forever. -<<<<<<< HEAD Nerev4r: - rscadd: Adds a new Ashwalker-specific language, Ashtongue. Go roleplay with them if you wanna speak it too! @@ -2100,16 +1813,13 @@ - imageadd: The Makarov pistol has been resprited - imageadd: The Ghoulbot now has a new sprite matching the new 3/4 mulebot sprites - imageadd: Rootbread slice toppings have a sprite now. -======= Profakos: - imageadd: Rootbread slice toppings have a sprite now. RandomGamer123: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Removes a method that allows xenobiologists to produce slimes of every colour and bypassing the intended progression sequence by making the disease induced by advanced mutation toxin only produce grey slimes unless the infected person is a sentient non-monkey human -<<<<<<< HEAD - bugfix: headpikes can be made again. Zonespace27: - bugfix: Ash runes should no longer harddel @@ -2125,7 +1835,6 @@ - rscdel: removed the draconic necklace, skeletal key, and ashen staff recipes -- placed into rituals - bugfix: fixed icewalker nest named "ash walker nest" to "ice walker nest" -======= ReinaCoder: - imageadd: The Ghoulbot now has a new sprite matching the new 3/4 mulebot sprites - imageadd: The Makarov pistol has been resprited @@ -2136,4 +1845,3 @@ nichlas0010: - bugfix: The Orion Trail's Realism Mode works again, triggering negative events for the player ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-07.yml b/html/changelogs/archive/2022-07.yml index 675bf0171df..544eeea2740 100644 --- a/html/changelogs/archive/2022-07.yml +++ b/html/changelogs/archive/2022-07.yml @@ -1,5 +1,4 @@ 2022-07-01: -<<<<<<< HEAD Desminus: - rscadd: Jarnsmiour gun cargo company. They sell knives. - rscadd: You can now purchase the bowie knife through Jarnsmiour @@ -55,7 +54,6 @@ error sprites appearing - rscadd: Furry Pride Spraypaint added to spray cans - rscdel: Y##f In H##l Sprapaint removed from spray cans -======= Guillaume Prata: - qol: Hypernob Protection (given to plasmamen that are breathing Hypernob as gas) is a status effect now and gives better feedback to the user. @@ -64,43 +62,11 @@ - bugfix: The agent card now correctly allows you to take anyone's identity, even if their name contains numbers OrionTheFox: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Chainsaws can now actually cut wood! So can the giant axe that is the PKC, and other chainsaw items - but, alas, esword handles alone can not, and you must actually turn them on. Also, all mining implements can mine scattered stones as well! - bugfix: Chainsaws are now faster when they are on, and slower when they aren't. -<<<<<<< HEAD - - bugfix: The agent card now correctly allows you to take anyone's identity, even - if their name contains numbers - - bugfix: the Gravity Generator no longer plays several looping sounds. - - bugfix: Oldstation's gravity generator now properly spawns off. - - code_imp: Refactored a large number of TGUI interfaces into TypeScript. If something's - broken, report it! - - imageadd: Shutters and window shutters on all stations are now directional - StrangeWeirdKitten: - - qol: Indestructable Turf on the ordnance test range. This will stop bombs from - dropping to the second level. - - qol: Ordnance access added to the exterior airlock beneath ordnance. - - rscadd: High Heels are now added to GAGs - - rscadd: Black heels are added into the loadout - - rscadd: Latex bra, panties, and socks are added to the underwear menu. - - balance: Corset and Chaps are no longer ludicriously expensive - - bugfix: Colourable cloth wraps now show color on digigrade species. - - imageadd: New Various Latex Sprites - Tastyfish: - - bugfix: Fixed a few bar sign choices that were broken. - tf-4: - - spellcheck: Fixed a typo in the airbag element examine, as well as a tiny adjustment - to the sentence structure. - theOOZ: - - rscadd: Ghosts and antags can now view a character's background info -2022-07-02: - GoldenAlpharex, manually mirroring upstream PRs by carshalash, ShizCalev and jlsnow301: - - bugfix: Eldritch nightmares were incorrectly added to the gold slime pool. - - qol: Gas filtering cloth are now smaller and can fit inside boxes! - - bugfix: Fixed a bug that made the hacking status display not appear. -======= Salex08: - bugfix: blacklists placeholder food items in the random food generator which caused error sprites appearing @@ -115,7 +81,6 @@ private-tristan: - bugfix: metastation library no longer has 2 air alarms 2022-07-02: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - qol: Clown/Mime survival boxes won't have a mostly pointless breathing mask, as their basic mask can be used for internals. @@ -176,61 +141,6 @@ Meyhazah: - imageadd: new sprites for the Chaplain's crusader, ancient, profane and follower outfits. -<<<<<<< HEAD - Nerev4r: - - bugfix: Snail eyes are recolorable. For real this time. On God. - Paxilmaniac: - - bugfix: a few instances of funny (tm) and wacky (tm) roundstart loot spawns on - blueshift have been fixed - SkyratBot: - - qol: Consistency with the other bot's examination text. - - bugfix: fixed telekinesis teleporting gun shenanigan - - bugfix: Limb growing code now uses species_color instead of mutant_color for synthetic - limb coloration - Tastyfish: - - qol: The interlink shuttle now has status displays. - Zonespace27: - - refactor: Command pets, the command outfitting station, and secmed locker are - now called in through deployment beacons, found in their respective lockers - (pets and outfitting in head of staff lockers) or on their person (secmed's - locker). - tf-4: - - rscadd: You can now buy hunter buckshot in the mining vendor. - - bugfix: Hunter buckshot in cargo now reports the right amount per box. -2022-07-03: - GoldenAlpharex: - - bugfix: Fixed the "Return" spell for the Bluespace Technician (and all of the - quick IC spawned humans). - - bugfix: Fixed gun safeties and fire mode toggle being inaccessible. - Jolly: - - bugfix: Delta arrivals should be fixed. If you didn't notice anything, well, congratulations!! - tf-4: - - rscdel: Hunter buckshot is now inaccessible -2022-07-04: - Gandalf2k15: - - bugfix: Summon beacons now function again. - Ghommie: - - bugfix: fixed the augments tab in the character menu not working unless you had - "Allow Mismatched Parts" enabled. - Jolly: - - bugfix: On BlueShift, an external airlock near sec has had its all access define - fixed. - - bugfix: on BlueShift, the active turf generated from the indestructible file has - been fixed. - - bugfix: On BlueShift, Starboard Maintenance is no longer wedged in Atmos, its - been replaced with "Lesser Atmospherics Maintenance". - - bugfix: For Ice Ashwalkers, atmos related mishaps shouldn't be an issue anymore. - Or maybe you didn't notice the air is now always cold. - - bugfix: On BlueShift, the reported missing turnstiles have been replaced with - sec doors. They'll also cycle with the other doors in the small area. - Melbert: - - code_imp: Some traits which mistakenly were sourced from a hard reference are - no longer. - SkyratBot: - - rscadd: Furry Pride large spraypaint added to spraycans - - rscdel: removes movement and combat mode from the status tab - - bugfix: fixed crystalizer passing any item as the user and causing a runtime -======= NotZang: - qol: Consistency with the other bot's examination text. Salex08: @@ -258,14 +168,12 @@ chesse20: - rscadd: Furry Pride large spraypaint added to spraycans san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: There is now a new preference in Game Preferences, Suppress All Ghost Rolls. If you tick this preference, you will not get a singular window pop-up whenever a Ghost Role is available. Intended for the few who really do need it. - admin: Admins get another additional preference where Suppress All Ghost Roles only works while they are currently in an adminned state. They will still get ghost rolls normally when they are in a deadminned state. -<<<<<<< HEAD - balance: Pluoxium now heals oxygen damage when breathed - refactor: Orbit UI has been reworked. - bugfix: you start with the right amount of breathing mask again @@ -275,7 +183,6 @@ - code_imp: The urban coat now uses GAGS. - code_imp: The polychromic duster and peacoat have been converted to GAGS. 2022-07-05: -======= 2022-07-04: Melbert: - code_imp: Some traits which mistakenly were sourced from a hard reference are @@ -293,12 +200,10 @@ Fikou: - balance: The supermatter running into you is no longer just as deadly as you running into the supermatter. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - qol: Miners rejoice! A few of the mostly useless and spammy messages that get send to your chat were changed to balloon alerts or straight up removed. Hopefully, you will have an easier time listening to the radio chatter now. -<<<<<<< HEAD SkyratBot: - code_imp: removes a stray verb call from the status tab - balance: The supermatter running into you is no longer just as deadly as you running @@ -327,7 +232,6 @@ capsaicinz: - bugfix: corp. reg. manual is now readable. - config: set the skyrat wiki link to the most up-to-date one. -======= JohnFulpWillard: - bugfix: Thief's preference icon has been fixed, and now properly has hair. Mooshimi: @@ -374,13 +278,11 @@ - bugfix: Fix Confusion and Self-Respiration virus symptoms to appear at final stage. vincentiusvin: - admin: experiment completion are now logged in research.html ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-07-07: Crumpaloo, jlsnow301, JohnFulpWillard: - rscadd: Typing indicators now use your speech bubble type, rather than all being the same, so Cyborgs no longer look like a human when typing, and Lawyers have that cool speech bubble again. -<<<<<<< HEAD Deek-Za: - bugfix: Prevents a cryopod from breaking permanently through a particular exploit. Gandalf2k15: @@ -403,7 +305,6 @@ tf-4: - bugfix: Modular contraband seeds in the seed vendor are now contraband once again. 2022-07-08: -======= Mooshimi: - refactor: Reworked the wiring in AI Sats incorporating multiple layered wiring. dragomagol: @@ -419,7 +320,6 @@ CursedBirb: - bugfix: Qm coat can carry telebaton - refactor: Qm coat is a subtype of department coat like other heads clothes ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - qol: You fold roller beds and bodybags with a right click instead of click and dragging into you. @@ -434,7 +334,6 @@ one with 4 thin windows)' - bugfix: '[KC13] Fixed the stacked old AI turret in the AI upload hall.' - bugfix: '[KC13] Fixed some wall mount items not being directional (icky var edits).' -<<<<<<< HEAD SkyratBot: - bugfix: The changeling tentacle power now properly functions the way its description says it does. @@ -451,13 +350,10 @@ GoldenAlpharex: - bugfix: Fixed trapdoors freaking out when you destroy their floor tile without having a remote attached to said trapdoor. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles: - rscadd: The central service wing has been completely remapped to help put the chef and bartender front-and-center for crew interactions. Hydroponics was moved to the lower floor to accommodate this change. -<<<<<<< HEAD Melbert: - bugfix: Dashes such as the Heirophant staff and Ninja sword should no longer permanently break on rare occasions. @@ -476,7 +372,6 @@ - bugfix: Fixed scrolling the orbit ui - admin: Get-Current-Logs and Get-Server-Logs now let you download entire folders at once -======= Pepsilawn: - bugfix: Kilostation had a few areas in space around the ordnance test site fixed up. @@ -516,7 +411,6 @@ - bugfix: Fixes a stray pixel on female human sprites Toto5561: - imageadd: Added new bacon sprites. ~~Accidentally~~ added new mint sprite. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vladoricious: - qol: Tacticool turtlenecks and skirtlenecks now have suit sensors installed! No more excuses. Turn em up. @@ -524,45 +418,6 @@ - qol: Sign Language users now have a unique speech indicator as well as a visual indicator of the tone of their message, making it easier to communicate both with and as a sign language user. -<<<<<<< HEAD -2022-07-10: - Melbert: - - bugfix: Bolts of Necropotence works again. - Nerev4r: - - rscadd: Blind people can use analyzers again. - - rscadd: White canes have been added to the loadout. - - balance: Snails are now invertebrates. - Nuke: - - bugfix: Bubblegum will now beat your ass again. - SkyratBot: - - bugfix: Fix deafness virus symptom to be permanent if resistance threshold is - met. - - balance: pumps and scrubbers have their heat and pressure limit buffed to be the - same as unshielded cans. - - balance: cans have their release pressure buffed to 2533kpa. - - bugfix: trailers will actually trail their attached vehicles - - imageadd: The library computer now has four directional sprites instead of just - one. - - bugfix: The generic station name with the long number in words is rarer - - rscadd: The SBC Starfury has been ever-so-slightly tweaked! Two of the shuttles - are now where the gunnery bays used to be, and the rest of the differences are - largely cosmetic. Largely. - - code_imp: Survival pod fans have been split off into their own file. - - rscadd: Added a sorting disposals pipe for the Tramstation dormitory, allowing - packages to be sent there - - bugfix: Fixed two incorrect sorting disposals pipes on Tramstation that prevented - packages from reaching certain destinations - - bugfix: Added four missing names to sorting disposals pipes on Tramstation - - bugfix: fixed APC wiring - - bugfix: Fix simple mob deaths causing deadchat notifications. Special mobs still - cause deadchat notifications (brood spiders, elite lavaland mobs, morphs, revenants, - space dragons) - - balance: Syndicate no longer wants easily printed upload boards. - - bugfix: Thermomachines will properly have a dropshadow - - bugfix: Weather will be blurred as expected - - bugfix: Qm coat can carry telebaton - - refactor: Qm coat is a subtype of department coat like other heads clothes -======= Zonespace27: - admin: Get-Current-Logs and Get-Server-Logs now let you download entire folders at once @@ -571,13 +426,11 @@ jlsnow301: - bugfix: Fixed scrolling the orbit ui kawoppi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: rag cleaning speed is now influenced by your cleaning skill - bugfix: cleaning with a rag now gives you cleaning skill experience - bugfix: rags can now be used to wash bloodied windows - bugfix: soap is no longer restricted from washing worn clothing, as this doesn't seem to be causing issues anymore -<<<<<<< HEAD 2022-07-11: Jolly: - qol: On BlueShift, you shouldnt' have to (hopefully) fear frying your fingers @@ -586,7 +439,6 @@ heads may access them as well as engineers, they're located somewhere relative in maints. Melbert: -======= lizardqueenlexi: - rscadd: Added a sorting disposals pipe for the Tramstation dormitory, allowing packages to be sent there @@ -616,17 +468,14 @@ 2022-07-10: Melbert: - bugfix: Bolts of Necropotence works again. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Iceboxstation's EVA now comes kitted out with equipment that may actually help you out if you want to go outside. Including special winter coats that can carry big oxygen tanks and boots to prevent you from slipping on ice. - rscadd: Iceboxstation's arrivals hallway, and many of the rooms around it, have had their style and layouts updated slightly. -<<<<<<< HEAD - bugfix: Tonic Water heals dizziness instead of causing it SkyratBot: - code_imp: dehardcodes admin grantable objectives list -======= Nuke: - bugfix: Bubblegum will now beat your ass again. SmoSmoSmoSmok: @@ -654,12 +503,10 @@ san7890: - bugfix: On Tramstation, prisoners can now exit the labor shuttle without being trapped inside. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: On TramStation, the xenobiology pen disposals bins should no longer pop off the floor tile on the turf they reside on. They should also now like... actually work. Nanotrasen had to re-route the disposals a bit to accomodate, but that's alright. -<<<<<<< HEAD tf-4: - bugfix: The tile sprayer now has the correct colour for the security decal preset. - bugfix: The "steal the hypospray" antag objective is now possible. @@ -699,7 +546,6 @@ softcerv: - rscadd: ports over the anesthetic machine from beestation. 2022-07-14: -======= 2022-07-12: Couls: - bugfix: AI detector now correctly tells you when the AI is out of range @@ -776,7 +622,6 @@ human. CoffeeDragon16: - bugfix: ethereals will now properly spawn with tongues ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ebb: - rscadd: You can now rip pieces of tape off of tape rolls and use them to tape people's mouth closed by putting it on them as a mask. Either through the stripping @@ -788,7 +633,6 @@ Fikou, sprite by Mooster: - rscadd: Baseballs are now available in the Baseball Field on the Holodeck. - rscadd: Baseball Bats can now hit thrown objects mid-air to send them back. -<<<<<<< HEAD ShizCalev: - bugfix: EMP'd airlocks will now have the proper shocked door overlay. - bugfix: Fixed airlocks sometimes becoming permanently electrified after being @@ -862,7 +706,6 @@ - rscadd: The comedian suit and coat are now available in the AutoDrobe! Wearing them may make you feel like you need a psychiatrist. 2022-07-17: -======= JohnFulpWillard: - bugfix: The CE can now trim people's IDs to Atmospherics Technician - bugfix: The HoS can no longer trim people's IDs to Lawyers. @@ -898,14 +741,12 @@ - qol: AIs that are gibbed now drop MMIs/posibrains - rscadd: The comedian suit and coat are now available in the AutoDrobe! Wearing them may make you feel like you need a psychiatrist. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, NecromancerAnne: - balance: The Biohazard Sprayer, Power Fist, Flamethrower and Dart Pistol are no longer in the nukie uplink, instead being given as bonuses in the keycarded parts of the base. Guillaume Prata: - bugfix: Roller beds can actually fold when right clicked now. -<<<<<<< HEAD Jolly: - rscadd: The Central Command evac shuttle dock has been remapped. - qol: The Interlink outside areas are now properly lighted. No more florescent @@ -936,7 +777,6 @@ - bugfix: You can no longer remove the turbine's rotor if its on or if its panel is closed - imageadd: Unique sprite for the Hypernob crystal from atmos -======= Holoo-1: - bugfix: fixed canister ui being too small LordVollkorn / Gage Gaebler: @@ -992,7 +832,6 @@ - bugfix: Fixed some strengths on mineral walls, making them harder to break through via hulk and mechs. Y0SH1M4S73R: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: the igniter, mirv, and summoning components and the knockback, lifesteal, light_eater, and venomous elements are now compatible with projectile spells. - code_imp: the lifesteal, light_eater, and venomous elements are now compatible @@ -1005,7 +844,6 @@ it had to be an atom. - code_imp: projectile spells set their fired projectiles' `fired_from` var to themselves instead of the turf they were cast from -<<<<<<< HEAD - bugfix: modsuit flamethrower will no longer push objects SuperSlayer: - spellcheck: Traitor codewords are now given by their employer, rather then by @@ -1068,7 +906,6 @@ - bugfix: You can now recolor graffiti to dark colors. - admin: Admins can now cancel midround random events - bugfix: signalCommander now works without altering the default frequency -======= 2022-07-18: 13spacemen: - bugfix: Tramstation's shutters are directional once again @@ -1120,21 +957,16 @@ a normal one now - spellcheck: '"explorator''s duffel bag" is now called "explorer duffel bag"' Twaticus: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: centcom gasmask appears on mob again - bugfix: tile reskinner correctly shows new tiles - bugfix: plasmaman glove inhands no longer appear as a plasmaman suit - bugfix: wheelchairs gained their wheel back -<<<<<<< HEAD -======= celulamp: - bugfix: Candy Corn craftable with 5 Corn Oil 5 Sugar ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 itseasytosee: - bugfix: Holding people at gunpoint has been restored to its former glory, it can once again be used at range, and allows the person holding up to move within two tiles of the target. -<<<<<<< HEAD tf-4: - bugfix: the urban coat, colourable leather jacket, duster, and peacoat are now all colourable as intended. @@ -1155,7 +987,6 @@ Hardly3D: - balance: Two of secmed's firefly gun case's lethal magazines were replaced with a rubber variant. -======= kawoppi: - rscadd: added animation for cleaning things with soap, mops, rags or cleanbots - imageadd: added cleaning bubbles animation @@ -1191,64 +1022,15 @@ Guillaume Prata: - qol: Be polite! While on walk intent you won't bump, swap places or push other people now. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - bugfix: At Central Command, NanoTrasen's elite architects have noticed that they built a door inside a window outside the Thunderdome and have decided to remove it. -<<<<<<< HEAD - LordVollkorn / Gage Gaebler: - - rscadd: The toiletbong has been added to the game. Build it using the craftingmenu, - a wrench, a flamethrower and a nearby toilet. - - balance: Deconstructing a toiletbong will empty the flamethrower's plasma tank. - Engineers, you may build toiletbongs for anyone without feeling guilty. - - rscadd: The toiletbong can be emagged. But should you? - - rscadd: Plums have been added to Botany. Get your plum seeds today. *Click* Noice. - - rscadd: Plumcake and plumcake slices have been added. Find them in the craftingmenu. - - rscadd: Plumjuice and plumwine have been added. Pour yourself a glass. - - rscadd: A new drink called "The Hat" has been added. A hat is also where you drink - it from. - Melbert: - - bugfix: Fixes a runtime with seclite mounts being deconstructed. - ORCACommander: - - code_imp: NT is now sourcing distressed flooring through a lowest bidder program - RatFromTheJungle: - - bugfix: makes the majority of suits no longer have a phanton white-tie on the - front of a shirt, that very much does not have a white-tie - ShizCalev: - - spellcheck: Tweaked the stat panel for revenants to make their essence readout - a little more clear. - - bugfix: Jaunting/incorporeal mobs will no longer be inserted into morgue trays - / cremators when they close. - - bugfix: Cremators will no longer cremate jaunting / incorporeal mobs. - - bugfix: Jaunting out of a morgue tray / cremator will now properly update its - sprite. - - bugfix: Fixed the Eastern airlocks to the Space Hotel not being cyclelinked. - - bugfix: Added various missing air alarms, APCs, and cameras across all station - maps. - - bugfix: Snow golems will no longer be told to put on their wizard robes when trying - to throw snowballs! - - bugfix: Sloths loaded in ruins will no longer sometimes become Cargo's sloth! - SkyratBot: - - bugfix: ghosts can now view storage objects again - - bugfix: The supermatter engine can spawn bioscrambler anomalies when delaminating - again. - - bugfix: Admins will no longer get ADMIN LOG message spam when reproductive extracts - are fed. - - bugfix: fixed bioscrambler armor not having a cooldown when activated or emp'ed - - bugfix: fixed hallucination armor not having a cooldown when activated. - - bugfix: Airlocks made from custom materials are now properly colored instead of - being forced to use the color of the first material used. - - bugfix: you can no longer put undroppable items into storage - - bugfix: fixed ranged analyzer being able to scan out of view targets - - soundadd: Power is no longer required for ambience. -======= Kubisopplay: - qol: makes borg hypo behave slightly saner Melbert: - bugfix: Fixes a runtime with seclite mounts being deconstructed. MidoriWroth: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added growable peanuts! Grow them in botany for a snack, or grind them into peanut butter - rscadd: Added 4 different peanut and peanut butter-based recipes @@ -1259,7 +1041,6 @@ - rscadd: Added a customizable onigiri dish, let your dreams come true. - qol: Meatball noodle soup now requires grown peanuts instead of Gallery's peanuts - imageadd: New sprites for all the new foods! -<<<<<<< HEAD - qol: makes borg hypo behave slightly saner - spellcheck: Fixes typos in certain away mission items. - bugfix: mass transfer between storage no longer causes ear bleeds @@ -1292,7 +1073,6 @@ - bugfix: diagonal movement in space works again - bugfix: Fix a runtime when replying to PDA messages through chat. - code_imp: Small code improvements for modular computers and files. -======= PositiveEntropy, Triiodine: - imageadd: Resprites all backpacks and satchels in their entirety! ShizCalev: @@ -1312,14 +1092,12 @@ - balance: Baton resistance trait now prevents getting knockdowned by batons, instead of just shortening knockdown duration Tastyfish: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Shower and sink dismantling is now consistent. - bugfix: Hydroponics tray plumbing connections now accept water without clogging. - rscadd: Showers now have 3 selectable auto-shutoff modes. - qol: Sinks and showers are now constructed with the player facing the wall. - imageadd: Visuals improved on plumbing connections for offset appliances, like sinks and showers. -<<<<<<< HEAD - refactor: ID Card department colors are now greyscaled. Say whuh!? - bugfix: Fixed body_parts_covered on various suits to be consistent with their sprites @@ -1439,7 +1217,6 @@ 2022-07-25: Christmas5: - bugfix: Updates /update_body_size() to compensate for a player's rotation. -======= TheBoondock: - bugfix: fixed ranged analyzer being able to scan out of view targets VioletN: @@ -1512,7 +1289,6 @@ - rscadd: Proto-nitrate bz response can now emit nuclear particles. - balance: Proto-nitrate bz response radiation pulse intensity will get reduced based on how many particles it is creating. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 RandomGamer123, bug originally reported by Murmic#2120 on Discord: - qol: Makes it more clear that venus human traps can be possessed in the first place @@ -1523,7 +1299,6 @@ it by using the ghost role menu, the link in chat, or by clicking on the notification - admin: Venus human traps now respect role bans (for ROLE_LAVALAND as its the default for ghost roles) -<<<<<<< HEAD RimiNosha: - rscdel: Removed Beachbum, Pirate, Chimpanzee, Shadowtongue, Calcic, Buzzwords, Nekomimetic and Mushroom from the language screen. @@ -1608,7 +1383,6 @@ Wallem: - imageadd: Resprites the implant pad Zonespace27: -======= Salex08: - bugfix: parrots spawned from strange objects dont come with headsets anymore , like it was intented @@ -1703,7 +1477,6 @@ Mothblocks: - qol: Pointing at something on yourself now shows the item. Y0SH1M4S73R: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixes most, if not all harddels related to lua. - bugfix: Fixed lua signal handlers for COMSIG_PARENT_QDELETED. - qol: The lua editor UI will warn when a state's global table has been corrupted @@ -1732,25 +1505,6 @@ - qol: pAI requests no longer make the Byond window flash. - qol: The silicon text for "your laws have been updated" is now easier to see. - qol: Changed the text for camera and printer functions. -<<<<<<< HEAD -2022-07-29: - Higgin: - - balance: CI sounds no longer carry nearly so far and drop off much closer to a - screen's distance. - Jolly: - - qol: On Delta, the barber shop has moved! Its now above robotics. NT has also - reinstalled the Showroom thats under Tcomms. - - bugfix: On Delta, the cryopods room is now connected to the main power net again. - Sorry about that! - - bugfix: The Barber Shop and NT Consultant office are no longer hard-baked into - Tram. Oops! - - qol: On Kilo (when NT decides to ship crew to the station), NT Consultants now - have an office. Huzza! - RimiNosha: - - bugfix: Fixed invisible uninteractable languages on the prefs menu, as well as - being able to be assigned unobtainable languages because of said bug. - ShizCalev: -======= magatsuchi: - bugfix: dumping storage containers now works properly, and cigarette carts aren't janky anymore to open @@ -1826,15 +1580,12 @@ ShizCalev: - bugfix: Immortal anomalies (eg bioscramblers) will no longer have a death timer overlay. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed an exploit which would result in Mediborg's Amputation Adventure not amputating properly. Legendary gamers don't have to cheat. - bugfix: Clicking Mediborg's Amputation Adventure's with TK will no longer result in amputation. -<<<<<<< HEAD SkyratBot: - spellcheck: minor grammatical change to the golden wheelchair. -======= - bugfix: Cyborg flashes will no longer fail to drop from the heads of borgs. - bugfix: Butchering a bodypart for it's organs while inside a locker will no longer drop the organs /outside/ the locker. @@ -1859,7 +1610,6 @@ Fikou: - bugfix: you can no longer push puzzle doors Ghommie: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Ladders now take left/right clicks to go up or down. Radial menus for them should only show up when you reach the floor above or below but the ladder goes beyond it, so that you don't have to bother clicking a sprite covered by that @@ -1870,7 +1620,6 @@ now. - balance: Climbing up or down a ladder now takes 1 second by default. Less spammable, barely more immersive. -<<<<<<< HEAD - bugfix: fixes the stress experiment - balance: changes the stress experiment to allow values 2% below or above the target integrity @@ -1888,7 +1637,6 @@ 2022-07-30: Ebin-Halcyon: - imageadd: Synth lizards have had a few sprite issues addressed. -======= GoldenAlpharex: - bugfix: Security Records should no longer have to apply prefs to a random dummy to generate pictures for every character that joins the round. @@ -1902,12 +1650,10 @@ - bugfix: Fix slime potions used on simple mobs to inherit all language abilities from the user (for real this time) 2022-07-30: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, TeomanTheGreat: - rscadd: the nuke ops leader is now the highest nuke ops playtime player on the team - qol: the nuke ops leader now starts with their radio loud mode on -<<<<<<< HEAD GuiltyNeko: - rscdel: deleted unused, entirely commented out code, the neckleash Jolly: @@ -1931,7 +1677,6 @@ - bugfix: removed a way that you could send items into the void using just a windoor and a pal - qol: the NtOS messenger has a scrollbar now. -======= Jacquerel: - rscadd: Urban legend says that people have been hiding sharp glass behind posters to hurt anyone who tries to remove them. Who would do that? Make sure you're @@ -1970,14 +1715,12 @@ magatsuchi: - bugfix: organ boxes no longer freeze the box instead of the organs necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Toy guns are only available to clown operatives. - rscdel: 'Removes from both operative uplinks: Camera Bug, Combat Gloves Plus (already removed from leaders), Guerrilla Gloves, FRAME disc, Radioactive Microlaser, Blood-Red Magboots (the standalone ones, not the modules), Power Beacon, Bioterror everything (including the bundle), Stechkin APS machine pistol and ammo, AI Detector.' -<<<<<<< HEAD - balance: Air alarms USB now support controlling scrubbers, vents and operating mode as well as the alarm. - rscadd: Airlocks can now be made into shells by ticking the 'shell' option in @@ -2064,7 +1807,6 @@ - bugfix: admin-triggered xeno event now works! mcmeiler: - rscadd: Slimepeople can now change their hair color. -======= 2022-07-31: CPTANT: - balance: Regular Windows are now stronger and take about 10 toolbox hits to destroy @@ -2116,6 +1858,5 @@ - bugfix: makes the photo objective more specific san7890: - bugfix: Nanotrasen should no longer place single bedsheets on double beds. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 timothymtorres: - rscadd: Bubblegum now spawns demonic bubblegum candy when they devour corpses. diff --git a/html/changelogs/archive/2022-08.yml b/html/changelogs/archive/2022-08.yml index aa9d0d24e2b..d8adc3ad7e0 100644 --- a/html/changelogs/archive/2022-08.yml +++ b/html/changelogs/archive/2022-08.yml @@ -1,5 +1,4 @@ 2022-08-01: -<<<<<<< HEAD GoldenAlpharex: - bugfix: Security Records should no longer have to apply prefs to a random dummy to generate pictures for every character that joins the round. @@ -29,7 +28,6 @@ move more smoothly instead of jumping from tile to tile. - qol: Vault bank machine checks for access before alerting. - bugfix: fixed crates being able to store mechs -======= Armhulen/Armhulenn/Bazelart/Tralezab, san7890: - admin: Word filters incorrectly set up will now have their errors actually described. Please, tell your server ops when you see it so they may fix the configuration. @@ -41,7 +39,6 @@ Y0SH1M4S73R: - code_imp: Several projectiles, particularly magic missile and gauntlet echo, now move more smoothly instead of jumping from tile to tile. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Calling `print` from lua will no longer spontaneously cause a runtime. - bugfix: The lua editor UI now properly scales with the window, up to certain extremely small sizes. @@ -49,7 +46,6 @@ to facilitate improved performance on the DM side, the lua editor UI no longer displays the global table and the state log by default - instead, they can be enabled using a toggle-button to the right of the tabs. -<<<<<<< HEAD - admin: Admins can now put any human species on purrbation Zenitheevee: - balance: Made Ammo pouches and Telebatons not give illegal tech anymore. @@ -60,7 +56,6 @@ SkyratBot: - qol: nuke ops id trims have a sechud icon - bugfix: chameleon cards now fix their colors upon resetting -======= Zenitheevee: - balance: Bluespace crystals can now go in ITEM_MATERIAL capable material storage (like autolathes) @@ -71,12 +66,10 @@ - qol: nuke ops id trims have a sechud icon - bugfix: chameleon cards now fix their colors upon resetting Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Creatures which can't experience emotions will no longer attempt to do so upon seeing a traitorous poster. SuperSlayer: - bugfix: Aliens help/harm intent now works normally if used on other aliens -<<<<<<< HEAD Zenitheevee: - bugfix: Rolling papers spawn in the pack now 2022-08-03: @@ -107,7 +100,6 @@ - balance: NanoTrasen has updated their clothing contracts to stock five of every clothing available in AutoDrobe and ClothesMate vendors. - qol: Cryo Pods and Cryo Computers no longer require power to work. -======= 2022-08-03: Capsandi: - rscadd: The kilo whiteship has been remapped and can fly again @@ -121,12 +113,10 @@ Mooshimi: - code_imp: No more runtimes when someone interferes in a religious spar. - code_imp: No more runtimes when someone wearing cowboy boots is table slammed. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - bugfix: Camera assemblies can now be moved after being unwelded! (This was an 11 year old bug lol.) - qol: Camera assembly welding has been updated to balloon alerts! -<<<<<<< HEAD - bugfix: Trying to inject someone in the eyes/mouth/feet/hands will no longer result in you trying to inject their chest! - bugfix: Fixed the Stray Cargo Pod event failing to occur if it tried to send an @@ -239,7 +229,6 @@ - qol: most storage item chat messages have been replaced with balloon alerts - admin: Wooooo spoooky ADMIN HELP BACKEND HAS CHANGED. If you run into any strange behavior or dropped messages, REPORT THEM -======= - bugfix: Fixed the Stray Cargo Pod event failing to occur if it tried to send an empty cargo pod. - bugfix: Trying to inject someone in the eyes/mouth/feet/hands will no longer result @@ -247,7 +236,6 @@ SuperSlayer: - bugfix: fixes slimes attacking objects not getting logged Timberpoes: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Removed the integrated circuit paper printing mechanic as part of paper code rewrite. - rscdel: Removed the ability to scan paper directly into the modular computer notes @@ -258,7 +246,6 @@ - bugfix: Fixes signatures not working at all. Signatures now only work when %s or %sign is put into an [___] input field. - bugfix: Input fields are now fixed and also work again. -<<<<<<< HEAD - balance: Nanotrasen realized that the more access they had on their cards was costing them a pretty penny, so they trimmed back the number of accesses a certain departmental Security Guard might have. However, any given guard will get back @@ -267,7 +254,6 @@ - config: Hey server operators, listen! We've changed up how Departmental Security Officers get their accesses, so be sure to review the DEPSEC_ACCESS_LEVEL config number to see what you want to work best for your server. -======= Twaticus: - imageadd: Converts some families gear into recolorable items in the clothesvendor. Includes a hat, scarf, 3 jackets, football gear, and buttondown shirt with shorts/pants. @@ -313,7 +299,6 @@ - qol: Add chance for maintenance crate and closet spawners to be open to make the area look more messy. vincentiusvin: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: All four SM delams got recoded, no significant gameplay changes expected. - qol: SM healing is broadcasted on crew radio too now instead of just engi - qol: SM going singulo or tesla will be announced on common comms when the damage @@ -322,8 +307,6 @@ and trigger cascades. - bugfix: Fixed the sm not having a boxy overlay on normal delams when counting down. This is what the radio message was referring to as "causality field". -<<<<<<< HEAD -======= 2022-08-05: JohnFulpWillard: - balance: Ordnance data disks now have the Frontier app on them, and has entirely @@ -348,12 +331,10 @@ - admin: Added logging for bluespace launchpad x and y offset changes, which go to individual game logs. - admin: Attack logs will now be slightly shorter, one useless word was removed. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Added a test in Aurora Caelus event for if the station has the ability to show it. - bugfix: Stations without space should no longer receive station objectives that require space to be present. -<<<<<<< HEAD - bugfix: Fixed a typo in Metastation's service's camera tag - qol: Add chance for maintenance crate and closet spawners to be open to make the area look more messy. @@ -393,7 +374,6 @@ Mqiib, ToasterBiome: - balance: Explosion epicenters no longer explode mobs twice; Fireballs and other explosive projectiles are significantly less-damaging -======= - qol: Machines that require a minimum level of part now have it visible. Pepsilawn: - bugfix: Fixed a typo in Metastation's service's camera tag @@ -445,14 +425,12 @@ - bugfix: Mining flora can be harvested again RigglePrime: - bugfix: Purrbation now properly adds and removes tails ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - bugfix: Purchasing the Stationwide Blackout traitor event repeatedly will now only announce there is a power outage if the previous power outage has finished. - balance: Vehicles & Mecha now take 2.5 second to repair with a welder. - qol: Vehicles & mecha will automatically repair over time once clicked. - qol: Vehicles & Mecha now give balloon alerts when repairing. -<<<<<<< HEAD SkyratBot: - bugfix: Silicons can now interact with floodlights. - imageadd: Improved Unholy Pitchfork back and inhand sprites @@ -461,19 +439,16 @@ - bugfix: Things that are ventcrawling can no longer alt click tiles to see what is outside the pipes. - bugfix: Purrbation now properly adds and removes tails -======= X13-423: - imageadd: Improved Unholy Pitchfork back and inhand sprites XyzzyThePretender: - bugfix: Silicons can now interact with floodlights. tralezab: - rscadd: Bileworms have appeared on lavaland! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-08-07: Capybara Holly: - bugfix: Trying to remove rust from walls with a welding tool will now blind you like it should -<<<<<<< HEAD Paxilmaniac: - imageadd: the SEVA mining suit has been resprited - bugfix: SEVA is now once again actually going to protect you from fire @@ -519,7 +494,6 @@ - bugfix: removed unecessary bridge pipes from kilomos - bugfix: Fix audible emotes playing sounds while mob is gagged, mute, tongueless, or under a vow of silence. -======= CursedBirb: - bugfix: Banana now have correct right hand sprite Holoo-1: @@ -545,59 +519,12 @@ - rscadd: Kilo whiteship now has both the bar and crew quarters area to increase information hell Fikou: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: the mining modsuit now costs 3000 from 2500 - balance: the mining modsuit now still slows you down over lava, though you still resist it - qol: the plasma core now accepts plasma both in sheet form and ore form - bugfix: the plasma core should no longer buggily not refill you - bugfix: the mining modsuit bombs should now have enemies target you -<<<<<<< HEAD - - bugfix: Blind support added to some actions like stripping, being hit, and force-feeding. - - admin: A lot of game logs will now also be in individual game logs, for convenience - in log diving. - - admin: Added logging for bluespace launchpad x and y offset changes, which go - to individual game logs. - - admin: Attack logs will now be slightly shorter, one useless word was removed. - - code_imp: Radiation pulses will ask MC if they should continue processing for - every turf they iterate through, rather than just every pulse. - - rscadd: Revolution victories now call the shuttle when enough of the station is - revolutionaries. - - rscadd: Kilo whiteship now has shit so that it can actually maintain power now - - rscadd: Kilo whiteship now has both the bar and crew quarters area to increase - information hell - - refactor: The Force Event UI has been refactored - - refactor: Events now have categories and descriptions - - refactor: Admin triggered events happen immediately - - balance: Fake Virus and Electric Storms are shown to admins, making them cancelable - - bugfix: makes verb queuing work again - - rscadd: Pun Pun now gives stuff in their hand frequently and rings desk bells. - - rscadd: Pun Pun now has gentleman-like emotes, rather than screeching and roaring. - - balance: Pun Pun no longer looks for weapons in their off time. - - balance: Pun Pun is no longer vulnerable to stuns by being walked into. - - qol: Monkeys can now use desk bells. - Stalkeros, Lukaster42 for existing and screaming at me the whole time: - - rscadd: Adds a "weaker" version of a standard NRI backpack for all your LARPing - needs, available in hacked Cargo's Russian crate. - - balance: Szabo-Ivanek service pistol now has a 3-burst fire mode. As a result, - it's no longer available in Cargo, being replaced with a Makarov. - - bugfix: NRI turrets and viscerators now properly react to threats. - - spellcheck: Edits a bunch of miscellaneous weapon descriptions related to NRI. - Zonespace27: - - spellcheck: Baton holster module no longer tells you that you can remove the baton. - tf-4: - - bugfix: The corrections officer area is now a proper security area with all that - entails. - - bugfix: Your character will look at your mouse cursor once again when in combat - mode. Provided you haven't turned that off. - theselfish: - - rscdel: Removed the Icon for Common. - - imagedel: Removed the Icon for Common. -2022-08-09: - Hatterhat: - - bugfix: Loadouts with the option selected to place all items in a suitcase now - properly apply the GAGS/grayscaling system to applicable items. -======= GoldenAlpharex: - bugfix: Belts will now change appearance when items are inserted into them as well, instead of only doing so when an item was removed from them. @@ -606,17 +533,14 @@ the reply to a new ticket, rather then just dropping it and leaving you for dead with a runtime - admin: see above ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Paramedic PDAs now start with the Lifeline pinpointer app - rscadd: Replaced the "proximity crew pinpointer" in the paramedic's belt with a bottle of Calomel - rscdel: Removed the "proximity crew pinpointer" -<<<<<<< HEAD MortoSasye: - balance: Head roles and security cannot have the Illiterate quirk. Head roles also can't have the brain tumor quirk. -======= Pickle-Coding: - code_imp: Radiation pulses will ask MC if they should continue processing for every turf they iterate through, rather than just every pulse. @@ -633,7 +557,6 @@ Melbert: - bugfix: Heretic stalkers are able again to return back to their normal form after casting shapeshift. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PositiveEntropy, AxieTheAxolotl: - rscadd: Adds the Chief Medical Officer's Scrubs, making it the default clothing option when they spawn! @@ -644,45 +567,6 @@ - imageadd: Resprites every labcoat in the game, including the paramedic's. - imageadd: Resprites the entire medical department (again)! ShizCalev: -<<<<<<< HEAD - - bugfix: The eye of god will now send a provide a message when its scan is recharged. - SkyratBot: - - rscadd: Added new VOID stamp - - bugfix: Photocopier paperforms - - rscadd: Bileworms have appeared on lavaland! - - rscadd: Concentrated barbers aid will give hairless species hair after it has - remained in them for a number of cycles inversely proportional to the purity - (20 cycles at 100% purity). Additionally, at 100% purity, it removes the smooth-headed - quirk at the same time that it grants hairless species hair. - - bugfix: Most effects that change your hairstyle are no longer delayed until certain - effects occur. - - bugfix: You cannot bypass the smooth-headed quirk with the genetics console (even - if you were somehow able to figure out how to get a specific hairstyle) - - bugfix: The species and antagonist character icons in the preferences menu are - no longer all bald. - - bugfix: Fixes ash walker tendrils dropping typeless anomaly cores. - - bugfix: Labor camp Prisoners without a sentence can no longer send themselves - back up whenever they wanted by clicking the button fast enough. - - bugfix: Prisoners can no longer get infinite labor camp points by clicking the - stacking machine with ores. - - bugfix: All ore machines now properly change their direction when they dock a - shuttle in a separate direction, fixing Lavaland's labor camp stacking machine. - - qol: Labor camp's point checker now states all the information you need, rather - than being a paragraph of text that just appears in chat. - Vishenka0704: - - rscadd: Cum on face action in Climax verb - - bugfix: now you cum on chosen target, not on you. - - bugfix: now the choice of sheath in the menu is only available with those who - have sheath - YakumoChen: - - bugfix: Ring boxes now once again initially contain the rings they're supposed - to carry. -2022-08-10: - Melbert: - - bugfix: Heretic stalkers are able again to return back to their normal form after - casting shapeshift. - ShizCalev: -======= - bugfix: Security records in filing cabinets will now actually contain crimes! - bugfix: The eye of god will now send a provide a message when its scan is recharged. SuperNovaa41: @@ -708,7 +592,6 @@ - code_imp: Prettier should no longer be ran on files outside of the "tgui" folder. ShizCalev: - bugfix: Player controlled cleanbots can now actually kill cockroaches and mice! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Right-clicking a non-carbon based mob (humans, xeno, ect) will now bite them instead of doing nothing. - server: Added a configurable probability for nonhuman species to spawn in the @@ -718,27 +601,22 @@ (the bodies could get stuck inside them!) - bugfix: Morguetrays are now less likely to end up having multiple cadavers in them. -<<<<<<< HEAD SkyratBot: - code_imp: add proc create_atmos_zone which detect an isolated atmos zone while ignoring walls and non atmos_can_pass tiles (zas zone) Zonespace27: - bugfix: Ghosts can now flip -======= TheBoondock: - code_imp: add proc create_atmos_zone which detect an isolated atmos zone while ignoring walls and non atmos_can_pass tiles (zas zone) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-08-11: GoldenAlpharex: - spellcheck: The long-range gas analyzer's name is no longer capitalized, as it's not a proper name. -<<<<<<< HEAD Nano: - soundadd: 'Added 2 new sounds to the synthesizer''s ''fun'' category: MeowSynth and Spaceman' ShizCalev: -======= Jacquerel: - refactor: A lot of food which was 'gross' is now 'gore'. - balance: '''Gore'' is disliked by Humans and Moths, but liked by Lizards and Felinids. @@ -774,90 +652,11 @@ - bugfix: Fixed traitors not getting a new kidnapping objective if they previously failed to kidnap someone else. - bugfix: Cutting open someone's heart will now actually make them bleed properly! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The Quartermaster and his items will now trigger phobias related to command staff! - bugfix: Command rank bedsheets, jackets, cloaks, and headsets will now trigger phobias related to command staff. - bugfix: The QM's bedsheets will now make you dream of authority and silvery IDs! -<<<<<<< HEAD - - bugfix: Cutting open someone's heart will now actually make them bleed properly! - - bugfix: Fixed traitors not getting a new kidnapping objective if they previously - failed to kidnap someone else. - SkyratBot: - - balance: munchies now impact hunger at a rate similar to running nonstop - - bugfix: Butcher's meat hook no longer fails when the user has TRAIT_NOGUNS - - bugfix: Newly built turrets start unlocked. - - imageadd: new dead body spawner icons - - bugfix: emitter examine text now displays minimum maximum delay. - - spellcheck: changes the text on the emitter examine blurb. - - spellcheck: Calomel now properly states that it only purges toxins, rather than - all chemicals, like it already does. - - spellcheck: Fixes grammar for solar panel construction - Wallem: - - imageadd: Updates the sprite for the metal & homerun bat -2022-08-12: - GoldenAlpharex: - - bugfix: Conveyor belts now properly update their sprites when flipped or inverted - using a screwdriver, without the need to being turned on and off to take effect. - - bugfix: Food exports now follow export value elasticity, as intended. - Melbert: - - admin: Heretic starting research and ascending is logged in the Blackbox - ShizCalev: - - qol: You can now use wallets & PDAs with IDs in them to play roulette! - - bugfix: Fixed a runtime when hitting a roulette table with an ID that doesn't - have a linked bank account! - SkyratBot: - - bugfix: fixed an incorrect count down message if SM changed it's delam twice. - - balance: Made a pure BZ SM a tad stronger, made a mixed BZ + high power gas SM - a lot weaker. - - balance: Freon power nuking can be negated slightly by other high power gases. - Moved the power nuking threshold from 30% to 33.33% - - balance: Water vapor SM will only lower power transmission instead of dampening - it both ways. - - balance: CO2 power increase can also be modified by other gases. - - code_imp: Perish, individual logging runtime. - - bugfix: Kitchen sinks will now be functional if placed facing against a window - and some other closed structures, up-facing sinks also look somewhat better - as a result. - - bugfix: golden wheelchairs will now spawn - - bugfix: Fixes broken command report formatting for station goals. - - bugfix: Fixes markdown paragraphing not working in paper code. - SuperDrish: - - rscadd: Introducing new tails! Queen Bee and Queen Insect(totally not queen bee - without secondary colours). -2022-08-13: - AnywayFarus: - - bugfix: now female leaves decal when ends an organic action - - bugfix: male cannot end on somebody or something through clothes - Higgin: - - bugfix: Cryopods now display accurate time before you can cryo somebody who's - AFK/SSD. - Melbert: - - bugfix: Either ladders will no longer show screentips relating to "warping", or - fake teleportation runes will no longer show screentips related to "climbing". - Honestly not sure but one of them was wrong - OrionTheFox: - - imageadd: Biosuits, labcoats, scrubs, and medical gear have all been updated to - TG standard on humanoid AND digitigrade/muzzled crew! Robotics' labcoat has - kept its black and red colors, dont worry. Firesuits and Radiation suits have - been updated for digi/muzzled crew as well! - PositiveEntropy: - - imageadd: Holopads are now shinier and more elegant! - SkyratBot: - - qol: Made mime emotes more consistent - - admin: Added two new procs into the VV dropdown menu to add and remove mood events - from living mobs. - - bugfix: Fixes the formatting of the admin lua editor - - qol: In the admin lua editor, there will be a "jump to bottom" button in the log - viewer if the log is longer than can be shown in the window. - - qol: The lua editor log viewer is now split into pages of at most 50 log entries. - - imageadd: The Profane Scholar outfit has been resprited - - bugfix: Dorms rooms D and R on tramstation now bolt properly. - - rscadd: Species now have custom damage examines, so Androids now have denting - and charring, rather than bruising and burning. - - refactor: Blind stripping and feeding alerts are smaller than gigantic now. -======= - qol: Rightclicking someone you're holding up will now shoot at them. - bugfix: You can no longer hold someone up from across the station. - bugfix: Holding someone at gunpoint will now check if you can actually see the @@ -865,7 +664,6 @@ Timberpoes: - bugfix: Fixes broken command report formatting for station goals. - bugfix: Fixes markdown paragraphing not working in paper code. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Time-Green: - rscadd: You can now remove/add all those ugly species features with the power of surgery! A lizards frills, horns, snout and spines, a moths wings and antennae, @@ -876,87 +674,6 @@ - balance: Organ manipulation only works on internal organs now. Use 'feature manipulation' for external organs. - code_imp: cleans up magic numbers in surgery -<<<<<<< HEAD - Zonespace27: - - qol: Borer abilities use balloon alerts instead of chat messages - - refactor: Datumized borer focuses - jjpark-kb: - - bugfix: you can remove borers from bodies again -2022-08-14: - Any%, TetraZeta, PositiveEntropy: - - imageadd: Resprites all magboots! - - imageadd: Resprites Sneakers! - Higgin: - - balance: Major borer rebalance. Borer abilities now generally cause brain damage - up to and including traumas. Borers can no longer heal brain damage/traumas - on their own. Borers require living hosts to gain stats, chems, or heal. Hosts - must manage more significant costs even with passive borers. Borer objectives - are now much more realistically achievable, and willing hosts contribute to - much greater boosts for borers than unwilling hosts. Borer actionspeed/movespeed - buffs reduced. Borers have stamina damage and confusion on their Fear ability - as well as the ability to make Multiver (a chem purger) and Mindbreaker Toxin - (a hallucinogen that can be used to brainwash/incapacitate) without learning - from prior samples. - Jolly: - - bugfix: Somewhere in space, stairs were fixed. I don't know where, but they were - fixed. You're welcome. - - bugfix: Syndicate agents touring to the Ice Moon should no longer feel.. that - the air is off outside the Interdyne. Those damn NanoTrasen employees! - - qol: On Delta, the prison's cell airlocks had glass reinserted. Prisoners can - now no longer get their arms jammed in them when they open. - - bugfix: On Delta, the disposals launcher now no longer vomits right next to the - prison. - - bugfix: On Meta, outside the barber shop there should no longer be a spooky floating - bluespace gas vender. - - bugfix: On Meta, the inner side walls of the barber shop bordering EVA/Gateway - are now proper R-Walls. - PositiveEntropy, TetraZeta, Azlan: - - imageadd: Metal, Reinforced, Reinforced Glass, Plasmaglass, Reinforced Plasmaglass, - Titanium Glass, Plastitanium Glass, Wood and Poker tables have been updated! - ShizCalev: - - bugfix: Dentally implanted pills now actually work. - SkyratBot: - - bugfix: Fix an issue where exceptionally large tape recorder printed transcripts - could be generated. They now split across multiple pieces of paper. I sure hope - you have a filing cabinet handy! - - bugfix: Earmuffs now properly fix ear damage. - - rscadd: Adds bear hugs to the game. Squeeze your friends so they can't escape - your love! - - soundadd: Ambience no longer uses reverb, as the sound files for ambience already - has reverb as needed usually! - - bugfix: Modafinil Overdose now properly puts you to sleep. - - rscadd: Add keyboard shell. A shell that allows the user to input a string. Available - after researching the Advanced Shells tech node. - - imageadd: added 2 icons for the keyboard shell. One unassembled and one assembled. - - bugfix: fixes abstract food spawns - - code_imp: allowed food list is only generated once - - qol: blind forcefeeding and stripping is lorge again - - qol: ranged analyzer is now able to scan the tile of machines and tables without - clicking on the tile directly - - qol: ranged analyzer can now scan further upward to 15 tiles - - bugfix: Fix pirates to not be displayed on crew monitors - Zenitheevee: - - bugfix: removes a whole buncha active turfs on port tarkon - Zonespace27: - - refactor: Borer chem injection now has a custom UI - - spellcheck: '"Choose focus" borer ability renamed to "Learn focus"' - - bugfix: Borers can now have multiple focuses - - bugfix: Borer chest focus will no longer leave host hungry - - refactor: Refactored more borer code - tf-4: - - balance: Reflectors can now reflect nuclear particles. - - balance: Replaced the upgraded baton with a regular one for drifting contractors. - - balance: Replaced the drifting contractor's SWAT boots with combat boots. - - balance: Drifting contractors now get +3 starting TC. -2022-08-15: - Ghommie: - - bugfix: Features such as but not limited to Blastoff, the golden bikehorn and - voice of god should once again make spessmen flip. - Higgin: - - bugfix: Nerve Stapled no longer acts as a workaround to Security not hiring Pacifists. - - balance: Department Guards can no longer be Pacifists, Nerve Stapled, or Foreigners. - Melbert: -======= - bugfix: golden wheelchairs will now spawn VioletN: - balance: Instead of directly lowering body temperature by a small amount, the @@ -1034,13 +751,11 @@ - bugfix: Either ladders will no longer show screentips relating to "warping", or fake teleportation runes will no longer show screentips related to "climbing". Honestly not sure but one of them was wrong ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Revolution victory correctly removes lathe taxes - bugfix: Someone completing the weakpoint / hack traitor objectives correctly fails everyone else doing it - bugfix: Having a dog no longer be ai controlled doesn't keep it keen on playing fetch -<<<<<<< HEAD - rscadd: Added support for elevator doors. - rscadd: Elevators now have travel time, and make sound when moving. Emagging the elevator button will speed them up. @@ -1058,7 +773,6 @@ - code_imp: Removes an unused bible proc - bugfix: Normal items once again do not fit into bibles. - rscadd: Fax Machine -======= Mooshimi: - refactor: Blind stripping and feeding alerts are smaller than gigantic now. Onule, PositiveEntropy, TetraZeta, Axietheaxolotl, Thgvr, AdipemDragon: @@ -1146,7 +860,6 @@ - rscadd: Kobun the bread dog that helps people with low mood - rscadd: Adds crafting recipe for Kobun RandomGamer123: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: You can now make trapdoors. Craft a trapdoor kit and use it on an openspace tile to make one, then link and activate it with some trapdoor electronics (printable at an autolathe or the engineering lathe) and optionally a trapdoor remote (crafted @@ -1155,7 +868,6 @@ - balance: Trapdoors now won't break if you just crowbar them. You need to block them from closing, such as with a lattice, cover it up with a wall, or fully destroy the floor tile its on to get rid of them. -<<<<<<< HEAD Wallem: - imageadd: GAGSifies most of the radio encryption key sprites Zonespace27: @@ -1199,7 +911,6 @@ any plasma in these airs for now on. - bugfix: Also on Meta, firelocks were installed in the virology airlock to mimic the Xenobiology one. -======= ReinaCoder: - imageadd: The pirate captain hat and suit has been resprited lnGoror: @@ -1225,7 +936,6 @@ CSS rules. JohnFulpWillard: - bugfix: Clown cyborgs now repair their flash when recharging ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Kokonut/Thgvr: - imageadd: Updates Cigarette boxes and cigar case sprites to 3/4ths perspective. - imageadd: Updates matches (lit and burnt states) @@ -1233,7 +943,6 @@ - qol: Meta Medbay's fax is no longer in the hallway, it's in the office with the suit sensor computer now. I also added some paper, folders, pens, wallmounts and stuff while I was here. -<<<<<<< HEAD RimiNosha: - bugfix: The invisible languages bug is gone forever, provided something else doesn't break! @@ -1262,7 +971,6 @@ raider. - bugfix: fixes NRI ship's walls' diagonality. - balance: player-available deployable landmines nerfed significantly. -======= RandomGamer123: - spellcheck: Fix RCD deconstruction message for turfs being incorrect ShizCalev: @@ -1278,13 +986,11 @@ Vire: - bugfix: The cryopod on the Cere emergency shuttle can now be connected while the shuttle is docked. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Wallem: - imageadd: Updates the newscaster wallframe sprite Wallem, Imaginos: - imageadd: Improves the book scanner sprite - soundadd: Adds a sound when scanning a book -<<<<<<< HEAD 2022-08-18: Ebin-Halcyon: - imageadd: Tweaked the color palettes of a few GAGSified items, namely the winter @@ -1294,7 +1000,6 @@ clicking one of these items with a welder. It will craft one of the other two options depending on the Left/Right click. There is a contextual screen tip too so just hover over them with a welder for details on the results. -======= dragomagol: - admin: lavaland elite summoning is now logged in game.log necromanceranne: @@ -1312,12 +1017,10 @@ - rscadd: Having struck a deal with Piccionaia Home Appliances, Nanotrasen has now distributed coffeemakers to break rooms across the Spinward Sector. Get cartridges at cargo, and enjoy the ambrosia of the corporate masses on your station today! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - balance: Default heretic threat costs have been bumped down, and they can appear at slightly lower pop if the round is high threat. (Server configuration may differ from this) -<<<<<<< HEAD - bugfix: Fixes stuttered words with anxiety being capitalized OrionTheFox: - bugfix: The DNR trait now works properly, and medical will find they cannot revive @@ -1347,16 +1050,13 @@ - code_imp: changed exposing reagents - balance: The Bulldog Shotgun now has a second magazine. - balance: You can swap the magazine as you fire by shooting with rightclick. -======= Pickle-Coding: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Changes hydrogen and tritium gas reaction stoichiometry. 1 mol of hydrogen/tritium and 0.5 mols of oxygen getting consumed will produce 1 mol of water vapour. - balance: Hydrogen and tritium burn rate has been changed to be the minimum of half the hydrogen/tritium, or 1/20th of the oxygen, rather than a binary if check on whether there is more oxygen or not. - balance: Hydrogen and tritium energy release has been reduced by 90%. -<<<<<<< HEAD - bugfix: holopads look properly open when screwdrivered - bugfix: Gutlunch should now eat gibs as intended - bugfix: Long range Gas Analyzer now appears under "Tool Designs" as intended. @@ -1389,7 +1089,6 @@ friend brings more loot! jjpark-kb: - bugfix: tongs can pick up rods again -======= RandomGamer123: - bugfix: Kudzu that has been planted from a seed which already had mutations on it cannot gain duplicate copies of those mutations @@ -1434,7 +1133,6 @@ - bugfix: Fixes cpws moving and having AI while you don't pull them during riding - bugfix: Removed a heap of situations where dynamic rulesets could fail while executing, causing runtimes ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-08-20: Azlan, Wallem: - imageadd: Ports Azlan's portable atmos machines from Baystation @@ -1444,32 +1142,6 @@ be automatically stripped. This only applies to input boxes that start with the multiline view enabled, and will thus not work on input boxes that aren't meant to support it. -<<<<<<< HEAD - ShizCalev: - - bugfix: Icons will now actually update on mobs lol - - qol: Rightclicking someone you're holding up will now shoot at them. - - bugfix: You can no longer hold someone up from across the station. - - bugfix: Holding someone at gunpoint will now check if you can actually see the - person you're holding up more often. - - admin: Admin messages regarding gas canisters being opened now have the opener's - lookup / follow link. - SkyratBot: - - bugfix: Circuit view sensors should no longer display undertile objects or abstract - objects or other people's hallucinations etc. - - bugfix: The Tiziran Canned Goods Pack on the chef's console now gives you the - proper supply box. - - bugfix: The heretic Cleave spell no longer hits targets twice. - - bugfix: Pun Pun shouldn't save the name "Unknown" between rounds unless that is - actually their real name for some reason. - - spellcheck: reflavoured the path of blades - - bugfix: Fixes visual bugs related to cows and pulling. - - bugfix: Fixes cpws moving and having AI while you don't pull them during riding - - bugfix: This time correct banana side sprite - Zenitheevee: - - rscadd: shutters for the aft hall and comms room windows are now in Defcon 3 to - be more consistent with the others - - bugfix: shutter buttons on tarkon are now where they should be -======= Profakos: - spellcheck: reflavoured the path of blades RandomGamer123: @@ -1481,12 +1153,10 @@ lookup / follow link. VioletN: - bugfix: The heretic Cleave spell no longer hits targets twice. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 itseasytosee: - bugfix: riot darts no longer become invisible when you take the cap off with a screwdriver. 2022-08-21: -<<<<<<< HEAD Jolly: - bugfix: On Delta, in the abandoned kitchen, there is no longer four air alarms. Stop being greedy, sheesh. @@ -1695,7 +1365,6 @@ Melbert: - bugfix: Fixes some runtimes from loading maptemplates with random populated bookselves, who knows they might even spawn with books now. -======= FernandoJ8: - bugfix: changed the directions of the bottom decals on the nature emergency shuttle and the bottom gambling machine on the disco inferno shuttle from 3 (north+south) @@ -1727,19 +1396,16 @@ tralezab: - rscdel: Thieves are gone, and so are Opportunists, their midround counterpart. 2022-08-22: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - refactor: A bunch of things that used to not do anything (or just fall back on the chest) when targeting a limb that someone was missing will now be far more likely to attack another limb! -<<<<<<< HEAD - qol: APCs will now automatically set the lights in an area to low power mode when they are below 30% (same % as when equipment power turns off) to conserve additional power. SkyratBot: - bugfix: Fixed shove collisions logging incorrectly. - bugfix: A duplicate camera was removed from Meta AI sat -======= SuperDrish: - rscadd: Mortar now gives you an option. Do you want to grind or juice your thing? san7890: @@ -1825,7 +1491,6 @@ - rscadd: Added a new lift indicator for the public elevator. - imageadd: Added standalone sprites for the new lift indicator. Y0SH1M4S73R: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Returning a recursive table from lua will no longer crash the server. - bugfix: Running an empty string as lua code will no longer crash the server. - qol: '`args`, `contents`, `vis_contents`, and `vis_locs` lists are now directly @@ -1838,7 +1503,6 @@ - qol: In the lua UI, strings will be wrapped in double quotes and have their own double quotes escaped, to distinguish them from nulls, functions, threads, and DM resources. -<<<<<<< HEAD - bugfix: The wall engravings have returned to MetaStation's Central Medbay Maintenance (the corridor between the CMO's Office, Plumbing, and the Pharmacy). - balance: Fires no longer protect the floor from melting. @@ -1870,7 +1534,6 @@ Melbert: - bugfix: Fixes a runtime that occurred when bodyparts received damage while disconnected from a mob -======= dragomagol: - bugfix: cooked pig meat is no longer GROSS, raw pig meat is GORE instead of GROSS - code_imp: meat.dm has been split into several different files @@ -1906,12 +1569,10 @@ Melbert: - bugfix: Fixes some runtimes from loading maptemplates with random populated bookselves, who knows they might even spawn with books now. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Deltastation: The Locker Room and Dormitories have been flipped around and redone to better fit with the new layout.' - rscadd: 'Deltastation: Some rooms of Security have been widened and shifted around.' - rscadd: 'Deltastation: Added a fourth escape pod by the holodeck.' -<<<<<<< HEAD ORCACommander: - bugfix: The Bar on a certain centcom dock has been restocked RimiNosha: @@ -1971,9 +1632,7 @@ - bugfix: Fixed a bunch of things that would say "your human arm" instead of just "your arm". SkyratBot: -======= MidoriWroth: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added 7 new types of various salads. Vegetarians rejoice! - rscadd: Added a new ingredient order beacon box, 'Salads'. It contains many ingredients for the new salads. @@ -1986,7 +1645,6 @@ - rscadd: Cherry jelly can be ordered at a produce console - rscadd: Consuming jelly now actually nourishes you - imageadd: Added sprites for all the new tasty foods -<<<<<<< HEAD - bugfix: Coffeemaker boards can now be printed at the service, engineering and science board printers. - bugfix: Reagents like Strange Reagent, Sulfuric Acid, blob reagents, and many @@ -2010,7 +1668,6 @@ - bugfix: Anomalies will no longer spawn ontop of lava / plasma rivers. SkyratBot: - qol: Add logging when Protocol CRAB-17 is used. -======= - bugfix: Removed some stacked tables in the Icebox kitchen Mooshimi: - spellcheck: Removes the security MODsuit's description of being shockproof, as @@ -2161,12 +1818,10 @@ kawoppi: - admin: added logging for the rare Aurora Caelus oven ignition san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: When you examine or use an AI Law Module in-hand, it should look a lot nicer as you read the laws that you're about to subject that poor silicon to. - bugfix: When ghosts examine AI Law Modules, they are now able to see the actual laws on the board. -<<<<<<< HEAD - bugfix: Updated the right click vs alt click tip to refer to shift right clicking instead of right clicking - bugfix: some windoors are no longer invisible due to being hidden below shutters @@ -2193,7 +1848,6 @@ room, next to Cryo. Zonespace27: - bugfix: Local servers should no longer have streams of endless title errors -======= timothymtorres: - qol: Add logging when Protocol CRAB-17 is used. tralezab: @@ -2233,4 +1887,3 @@ twilightwanderer: - bugfix: Fax no longer blocks access to the card reader on the MetaStation in the QM's office. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-09.yml b/html/changelogs/archive/2022-09.yml index a66eb76ea9f..d55f37d32c0 100644 --- a/html/changelogs/archive/2022-09.yml +++ b/html/changelogs/archive/2022-09.yml @@ -1,82 +1,4 @@ 2022-09-01: -<<<<<<< HEAD - GoldenAlpharex: - - bugfix: Fixes the Dutch Jacket being invisible when selected in the loadout. - - spellcheck: Renames the Dutch Jacket's loadout entry to Western Jacket, as that's - the name of the item in-game. - Jolly: - - bugfix: Deltas armory is now correct. - Melbert: - - qol: The statue spawner mapping helper spawns its statues anchored - - code_imp: Remove some hardcoding from random loot spawners - SkyratBot: - - bugfix: Tramstation robotics gets its shutters button, but it's not on a desk - so you can't crush people what's the point? - - bugfix: Fax no longer blocks access to the card reader on the MetaStation in the - QM's office. - - qol: The Status Display app can now do everything the communications console status - display screen can do. - - bugfix: Increases PDA immersion - - balance: Space Dragons can no longer place rifts on open space - - bugfix: fixed High capacity inheritance structure - - bugfix: The aux base construction console is once again present on Tramstation - coldud13: - - qol: You can now use the Navigate verb to find cryo on most maps - itseasytosee: - - bugfix: Monkeys won't stay on combat mode forever after getting pissed off. - theOOZ: - - bugfix: Characters who are illiterate no longer need to depend on an admin or - random peer to call the Interlink shuttle -2022-09-02: - ShizCalev: - - bugfix: Supplypods can no longer be destroyed by explosions BEFORE they land. - - bugfix: Monkeys can now actually resist things! - SkyratBot: - - rscdel: There is no longer an air alarm in the central island of atmospherics - on MetaStation. - - balance: Regular windows now have 50 melee armor and take 3 deconstruction steps. - - balance: Metastation has new windows -2022-09-03: - SkyratBot: - - bugfix: Fix legion dead miners not spawning species - - qol: heretic sacrifices will drop their legcuffs before entering the minigame - (bolas, bear traps) - - balance: nerfs scipaper paper publication money across the board - - balance: nerfs scipaper ghost writing partner. - - balance: CO2 powerloss inhibition now works immediately based on gas composition - instead of slowly ramping up. - - refactor: refactored how the SM fetches it's gas info and data. No changes expected - except for the co2 thing. - - code_imp: The time between the round starting and the game like, actually starting - has been reduced by 66% - - refactor: I've slightly changed how ban caches are generated, admins please let - me know if anything goes fuckey - - server: I'm using the blocking_query_timeout config. Make sure it's up to date - and all. - - balance: Heads are no longer tasked to kill their own pets - - qol: Newly created Shades will be told much more clearly that they're supposed - to be bound to their master, if they have one. - - admin: The lua function `SS13.await` can now await non-sleeping, but extremely - expensive procs, such as `getFlatIcon` - - bugfix: Stray cargo event pods now don't runtime if a canister supply pack is - chosen, meaning that you should actually see them in the pods now - - spellcheck: Just to clarify, sonic jackhammers do NOT go through walls. Their - printing design text has been modified to reflect this. - - bugfix: Brought a portion of the admin deadsay command up to date. Revenants and - EOR players will now see admin deadchat messages in their chat tab. -2022-09-04: - Melbert: - - bugfix: Fixes storage to storage mass transfering not being instant - - bugfix: Fixes two do_afters for storage mass transfer - - bugfix: Dumping storage spreads its items around again - - bugfix: Drag-opening a storage won't try to dump inside you - - bugfix: Transferring a ton of things into a fridge won't deafen you anymore - - rscadd: You can now mass transfer onto griddles - itseasytosee: - - bugfix: Fixed balistic helmet sprites with flashlights looking weird -2022-09-05: -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, thgvr, Snakebitten: - balance: makes the standard quick carry modsuit module have nitrile level carrying speed instead of latex level @@ -94,7 +16,6 @@ - bugfix: fixes a bug where you can unwield defibrillator paddles just after starting the do_after to defib onehanded - bugfix: fixes a bug where the modsuit gps would have a broken name when renamed -<<<<<<< HEAD Guillaume Prata: - balance: 'The pluoxium reagent won''t heal suffocation damage and instead will slowly heals organ damage if the target is sleeping. Hint: Cryotubes.' @@ -105,7 +26,6 @@ - balance: Tramstation's tram now actually packs a punch when it hits you. It will hurt. Think twice before crossing on red! Melbert: -======= ORCACommander: - bugfix: fixed High capacity inheritance structure RandomGamer123: @@ -170,7 +90,6 @@ behavioral changes but should overall be the same. - refactor: Refactored Wabbajack (+ cursed pool). Overall a bit more clean / consistent behavior. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'Heretic: Curses have been reworked. You can now curse any member of the crew, granted they''re not too far away. If you additionally provide an item in the ritual containing a sample of the target''s blood or fingerprints, @@ -190,7 +109,6 @@ was a previously a Living Heart after being removed. - bugfix: If a heretic is fully healed by something (such as ahealed), they'll not lose their living heart -<<<<<<< HEAD - bugfix: Nightmares heal in darkness again ShizCalev: - bugfix: bodybags / crates will now be explicit about what is ontop of them if @@ -228,20 +146,17 @@ - rscadd: Status displays are now a bit more colorful and have gapless marquee text. - refactor: Brig door timers were massively refactored behind the scenes. Door control should still work as before but be mindful. -======= Mothblocks: - qol: Windows from outside the station now get the RCD reconstruction benefits, just like walls and floors. Profakos: - balance: Heads are no longer tasked to kill their own pets RandomGamer123: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Putting a budget card into NIRN now gives the proper error message if you are trying to buy something privately, and treat you as a normal cargo request order by someone without any permissions otherwise - bugfix: NIRN orders should now charge the department that bought it only if a head of staff ordered it -<<<<<<< HEAD - rscadd: Shadowpeople now heal from their brains! Their brain-tumor-thingy! - code_imp: split up surgery.dmi - admin: fax messages and book printings are now logged in paper.log @@ -306,7 +221,6 @@ - rscadd: vines now take damage when off vines / heal when on vines - rscdel: vines no longer heal while moving through vines tf-4: -======= Rhials: - code_imp: Removes erroneous code from bananium meteor. This should not affect players in any way. @@ -372,12 +286,10 @@ - bugfix: fixed plasma mat ignition spitting room temperature plasma. 2022-09-03: Fikou: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: the admin modsuit now has the advanced jetpack instead of the normal one - bugfix: fixes modsuit chestplate unequipping no longer retracting the suit storage item - bugfix: fixes modsuits breaking when going into gulag -<<<<<<< HEAD - balance: Instead of directly lowering body temperature by a small amount, the Grasp of Void and Mark of Void heretic abilities now inflict a status condition called void chill, which steadily lowers the victim's body temperature and also @@ -413,7 +325,6 @@ - rscadd: A new kind of anomaly which transforms the area into some other kind of material. - bugfix: Supermatter delaminations can spawn bioscramblers again. -======= Ghommie: - bugfix: Brought a portion of the admin deadsay command up to date. Revenants and EOR players will now see admin deadchat messages in their chat tab. @@ -459,20 +370,17 @@ - balance: 'The pluoxium reagent won''t heal suffocation damage and instead will slowly heals organ damage if the target is sleeping. Hint: Cryotubes.' Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: You can now send photos or trading cards through the fax machine. - rscadd: You can now hack the wires of a fax machine to have it throw items harder or accept additional flat input items such as material sheets, ID cards, and pizza slices. - qol: Screentips should tell you what using a particular item on a fax machine will do. -<<<<<<< HEAD - bugfix: Fixed runtime when using AmpCheck without connecting the console with a wire. - bugfix: Fixed a few runtimes that could occur when using APC controller consoles. - qol: Sucked soul out of APC controller code and UI. - rscdel: Removed "secret" power monitor console. -======= - bugfix: Creating shades with soulstones won't affect the chance of midround antagonist spawns. Melbert: @@ -519,12 +427,10 @@ vote, as well as set the number of times they may rock the vote during a given shift. scriptis: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: techfab tgui now supports old-school bulk sheet ejection - qol: techfab tgui no longer overflows its window if you have six million categories - qol: techfab tgui no longer consumes your screen's free real estate on an unprecedented scale -<<<<<<< HEAD - code_imp: Removes erroneous code from bananium meteor. This should not affect players in any way. - bugfix: An APC and a Television Monitor in MetaStation Engineering Hallway will @@ -569,7 +475,6 @@ - bugfix: Police hats no longer turn you bald while worn, and no longer act like helmets, since they're caps. - bugfix: scotch and chocolate eggs will no longer appear as errors -======= tralezab: - balance: Sleeping carp deflects hand spells, CQC reflects hand spells 2022-09-07: @@ -580,28 +485,10 @@ - bugfix: Kilo whiteship crew quarters air alarm now exists, meaning that vents won't be fucky - bugfix: Kilo whiteship engine APC is rewired ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Tram whiteship now has named airlocks - rscadd: Tram whiteship bridge and crew quarters areas are split, new APCs added - bugfix: no more shuttle engine rotation fuckery on tram whiteship - bugfix: no more firelock fuckery on tram whiteship -<<<<<<< HEAD - - code_imp: restrictedinput can now accept negative numbers - - bugfix: Xenomorphs can no longer hold any item in the game, - - admin: When admins start CTF they can now choose which map is played or choose - random as its always been - - admin: Admins can no-longer permanently break CTF by unloading the map accidentally - - spellcheck: Fixed a typo in the Map Description for CTF Cruiser - - bugfix: CTF can now be reloaded after being unloaded - Vishenka0704: - - bugfix: fix user of xenbio bag on reproductive extract - Wallem: - - qol: The ORM now has color-coded lights showing which side is the input and output. - Blue for input, red for output. - tf-4: - - bugfix: Operating tables are visible again. -2022-09-08: -======= Jackal-boop: - bugfix: fixed the cucumber seeds not being in the correct spot in the megaseed list @@ -612,7 +499,6 @@ - qol: Scrubber surge events now have cockroaches popping out of dangerous vents, rather than every vent possibly having them. - bugfix: More dangerous scrubbers now properly shoot out more foam. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: 'Delta: Engineering, Library Backroom, and Security Hall APCs are wired' - bugfix: 'Delta: Armory camera is no longer on a windoor, and outside armory camera @@ -620,7 +506,6 @@ - bugfix: 'Delta: Genetics has a corrected clothes vendor' - qol: 'Delta: Moved the engineering fax machine to a less in-the-way-place (break room)' -<<<<<<< HEAD SkyratBot: - rscadd: hilbert research facility airlocks have names now - rscadd: Kilo whiteship now has bangin donks, bolt button, and its bridge now has @@ -639,7 +524,6 @@ ShizCalev: - bugfix: Fixed a runtime when all alive players are converted to cultists that prevented them from getting their cool halo/eye effects. -======= - qol: Add an examine tip explaining how to fit an explorer gas mask into a box NamelessFairy: - admin: When admins start CTF they can now choose which map is played or choose @@ -676,13 +560,11 @@ - bugfix: Water vapour electrolysis and hypernoblium electrolysis now respects heat capacity changes. ShizCalev: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed a runtime preventing nonhuman cadavers from spawning properly. - config: Cadaver spawners will no longer yell at you when morgue_cadaver_other_species_probability is blank. - config: morgue_cadaver_disable_nonhumans will now properly disable nonhuman races! (It was reversed, woops.) -<<<<<<< HEAD SkyratBot: - bugfix: fixed a bug causing the process of slicing food to erase most of the food's reagents @@ -691,7 +573,6 @@ - balance: Neurotoxin spit can no longer be used if you're muzzled. - bugfix: Hey, we support byond version 514.1587 now. You can upgrade if you'd like. I hope. -======= - bugfix: Fixed a runtime when all alive players are converted to cultists that prevented them from getting their cool halo/eye effects. YakumoChen: @@ -700,13 +581,11 @@ itseasytosee: - spellcheck: Fixed a typo in monkey trip toggling. scriptis: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: techfabs, protolathes, circuit imprinters, and exosuit fabricators now automatically r&d sync - qol: the full window refresh time is now one second instead of five seconds - bugfix: refreshing windows ("please wait...") no longer hang for up to twice as long as they should -<<<<<<< HEAD Vishenka0704: - rscadd: add option to enable/disable ticket ping in server config - bugfix: oppfor and ticket ping now works @@ -734,7 +613,6 @@ - bugfix: Water vapour electrolysis and hypernoblium electrolysis now respects heat capacity changes. - bugfix: You can no longer adjust ethereal tunics, causing a missing icon error -======= tralezab: - rscadd: Mimes can now hold a baguette like a sword by right clicking it 2022-09-09: @@ -785,13 +663,11 @@ Dmeto: - qol: Reagent scanner circuit component now ouputs to a table list. JohnFulpWillard: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Mining station's access was reverted, and Curators once again can access it. Supply security officers also once again only have access to it during elevated access. - qol: '''Mining'' access is now named ''Mining Dock'' while ''Mining EVA'' is now named ''Mining Outpost'', to better reflect what they are.' -<<<<<<< HEAD - bugfix: The mining station now requires Mining access for proper access instead of Mining EVA, minus the one airlock leading to Mining EVA YakumoChen: @@ -817,7 +693,6 @@ GoldenAlpharex: - bugfix: Corporate sofa corners have been exorcised and will no longer engulf anyone that sits on them while they're in the L orientation. -======= - qol: Syndicate sleepers (the ones in the nukie base outpost) now drops their board on deconstruction. - bugfix: SaturnX now properly turns you invisible again. @@ -831,7 +706,6 @@ 2022-09-12: JohnFulpWillard: - bugfix: Pirate ships now work again. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Nari Harimoto: - bugfix: you can now rotate machines even when the room has no power again - bugfix: if you enable the AIs ability to interact with machines while in an AI-Card, @@ -839,7 +713,6 @@ - bugfix: you can no longer open the UI for a syndie bomb and walk away and activate it from range, it now checks if you actually can interact with it including range before letting you activate it -<<<<<<< HEAD ShizCalev: - admin: Silenced grav generator admin warnings / logging messages when the round is not currently in progress. @@ -872,14 +745,12 @@ should take a look! (fancy hat, infinity scarf, sweater jacket, oversized jacket, fancy coat) ShizCalev: -======= Rhials: - spellcheck: Fixes a typo in the cult heal spell feedback message. - spellcheck: fixes some internal typos related to the word "auxillary". ShizCalev: - admin: Silenced grav generator admin warnings / logging messages when the round is not currently in progress. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed an exploit allowing you to toggle suit sensors while dead/restrained. - bugfix: Projectiles fired by non-mob sources (IE turrets) now log reagents contained after hitting a target. @@ -892,7 +763,6 @@ properly after hitting a target (this logs for all people with control of the mecha which is a little messy with multi-seat mecha. Check the vehicle's logs or a user's combat logs for the person that actually SHOT the projectile.) -<<<<<<< HEAD SkyratBot: - bugfix: Fix book of babel not removing blocked languages properly - bugfix: Sleeping Carp bullet deflection works again @@ -1059,7 +929,6 @@ SkyratBot: - bugfix: Reconnects Meta Engineering to Distro. - bugfix: Places a missing wire under Meta's Starboard Aft Solars SMES. -======= Thunder12345: - bugfix: Purged pointless punctuation from probabalistic phenomenon publications 2022-09-13: @@ -1102,7 +971,6 @@ Sealed101: - bugfix: Mafia Snow map now has glass external airlocks for the two top players, allowing them to see the players directly oppoiste of them ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Icebox: added a camera to southern Cargo Bay' - rscdel: 'Icebox: removed several excess cameras (i.e. Courtroom, Primary Hallway, Prison Garden)' @@ -1115,7 +983,6 @@ - bugfix: 'Icebox: fixed several cameras lacking their respective network values' - bugfix: 'Icebox: restored a lost Interrogation Room Monitor outside of Interrogation Room' -<<<<<<< HEAD 2022-09-18: GoldenAlpharex: - bugfix: Molds can no longer spread their foam across the entirety of space, and @@ -1128,7 +995,6 @@ dealt with - bugfix: A completely unused c20 subtype, also called the CMG, was gotten rid of due to being completely unused -======= ShizCalev: - bugfix: Fixed a runtime when trying to injecting someone in a missing limb. - bugfix: Fixed tackling not working properly if you didn't have a tail. @@ -1186,14 +1052,12 @@ JohnFulpWillard: - bugfix: Pods should now properly know whether or not to send itself off, and won't break other pods at the same time. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Pizzie11: - rscadd: Added a unique service department version of the Plumbing Constructor, the Service Plumbing Constructor. This can be fabricated in the service protolate. - rscadd: 'New plumbing machines have been added for the Service Plumbing Constructor: Soda Synthesizer, Booze Synthesizer, Mixing Chamber, and Output Tap.' - rscadd: The Chemical Receiver board can now be printed at the service protolathe -<<<<<<< HEAD ShizCalev: - bugfix: Fixed voice of god breaking if someone resisted your command. - admin: Debugging / admin omnitool now stabs eyes when in screwdriver mode. @@ -1207,7 +1071,6 @@ - bugfix: USB ports for circuits now work again - bugfix: You can now pin medals to buttondown shirts. - code_imp: Fixes gas mixer node concentration logging. -======= RandomGamer123, idea by Pickle-Coding: - rscadd: You can now insert a hypernoblium crystal into portable atmospheric devices (ie. canisters, pumps, and scrubbers) to allow you to toggle reactions inside @@ -1249,12 +1112,10 @@ fulltile windows. Barricades can now be crowbarred to disassemble them quickly. - soundadd: Add hammering_wood.ogg from soundcloud public domain to barricade and wooden wall construction. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fix plasma cutter or guns that burn not being able to ignite plasma - balance: Change plasma cutters damage type to BURN and this will cause reduced damage to mining mobs - balance: Explodable stuff now detonates when hit by a BURN projectile. -<<<<<<< HEAD - admin: Prisoners returning from the gulag as well as reclaiming their items from the gulag item reclaimer are now both logged. - bugfix: Fixes water vapour not consuming water vapour when freezing turfs. @@ -1264,7 +1125,6 @@ - admin: Admins can now toggle CTF Instagib mode while CTF is not running - bugfix: ghost follow links no longer appear above binary messages using light theme -======= - qol: Add screentips for objects that use rotation (chairs, windows, pipes, etc.) - qol: Add Alt RMB and Ctrl RMB screentips options. Instead of Alt + Ctrl being one line, they are now split on separate lines. @@ -1303,23 +1163,18 @@ broader shorts clade, instead of a separate genus. 2022-09-18: Pickle-Coding: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Radiation range from tritium combustion and proto-nitrate tritium to hydrogen conversion increased by 3 times. - balance: Sets the radiation threshold for all gas reactions that release radiation to 0.3 -<<<<<<< HEAD Zergspower: - bugfix: XenoArch bags will now pickup on walk-over once again dopamiin: - bugfix: several foods now taste like what they should -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 itseasytosee: - code_imp: Being able to be flashed from all sides is now based on or not you have a negative flash resistance, rather than randomly applying to specific pairs of eyes. -<<<<<<< HEAD - bugfix: Skeletons can drink milk again, sorry about that. 2022-09-19: Crumpaloo, Nomare, theOOZ: @@ -1345,17 +1200,14 @@ ShizCalev: - bugfix: Fixed medibeams sometimes crossing themselves! SkyratBot: -======= 2022-09-19: Jackraxxus: - spellcheck: Updates liver failure examine text to make better use of pronoun helpers. LemonInTheDark: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The alt click tab (obj tab?) will no longer cause massive clientside lag (unless you alt click that 2000 obj large tofu pile) - bugfix: The alt click menu is snappier now, try usin it and let me know if anything blows up yeah? -<<<<<<< HEAD - rscadd: medical doctors and CMOs now have surgical tool heirlooms - spellcheck: Updates liver failure examine text to make better use of pronoun helpers. Stalkeros, Lukaster42: @@ -1382,14 +1234,12 @@ - bugfix: fixed cyborg energy saw lacking a sprite - bugfix: fixed debug omnitool lacking sprites for surgery tools - bugfix: fixed lacking sprite for taster -======= MMMiracles: - rscadd: Tramstation's maintenance has been completely overhauled with modular parts for more variety and differing routes between rounds. - qol: Tramstation's maintenance is now more antag-friendly when it comes to dark-dwelling roles and traversing. Sealed101: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed exosuit ammo boxes not updating their sprite/description properly when emptied - qol: adds an examine tip about folding & recycling on empty exosuit ammo boxes @@ -1398,7 +1248,6 @@ (flashbang 500 -> 4000; missiles 500 -> 8000) - bugfix: exosuit ammo boxes can be recycled in an autolathe, as they were apparently intended to be. Partially depleted ammo boxes will have less material in them. -<<<<<<< HEAD 2022-09-21: Melbert: - bugfix: Unequipping an internals tank will immediately unregister it as your internals @@ -1420,7 +1269,6 @@ lower decks. - bugfix: Items that rotate will no longer spam you with error messages when you hover your mouse over them. -======= ShizCalev: - bugfix: Fixed medibeams sometimes crossing themselves! TheBoondock: @@ -1460,14 +1308,12 @@ - bugfix: fixed cyborg energy saw lacking a sprite - bugfix: fixed debug omnitool lacking sprites for surgery tools - bugfix: fixed lacking sprite for taster ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 TheBoondock, Wallemations: - rscadd: Adds a new pair of goggles to atmospheric, the thermal imaging goggles help highlight the hot/cold and normal temperature for atmos tech to quickly identify the temp without having to use an analyzer. Hotter temperatures will have red colors while colder temperatures will have blue colors - rscadd: Add temperature imaging to the t-ray goggles as well. -<<<<<<< HEAD VexingRaven: - bugfix: Fixed a bug where it was possible to call the shuttle while buying a new one, resulting in a second shuttle that gibs everyone aboard. @@ -1482,7 +1328,6 @@ rules for the game sold separately. SkyratBot: - bugfix: Fixed bypassing gasmask FOV. -======= Watermelon914: - bugfix: Fixed map vote including maps that have already been played twice in the last 3 rounds. @@ -1514,12 +1359,10 @@ of 1000 degrees. Lightbulb tubes now hold 20 reagents to make this more usable. - rscadd: Lightbulbs will now splash their contents on whatever they're shattered by. Their contents are also now visible upon examination. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 VexingRaven: - bugfix: The Deltastation kitchen no longer has 2 newscasters. - bugfix: The Deltastation kitchen APC has been moved to the kitchen storage area to the north. -<<<<<<< HEAD 2022-09-23: ShizCalev: - bugfix: Fixed crowbars hitting ovens during deconstruction. @@ -1583,7 +1426,6 @@ - bugfix: owl masks and wizard hats now use their proper inhands! - bugfix: Would you believe me if I told you androids had functioning human stomachs in them for the past 5 years? No? Well anyways its fixed. -======= - bugfix: Fixed a bug where it was possible to call the shuttle while buying a new one, resulting in a second shuttle that gibs everyone aboard. Watermelon914: @@ -1640,12 +1482,10 @@ dalmationer: - bugfix: fixed two broken sprites for drinking and shot glasses. san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: When a voice analyzer is attached to a bomb or a chemical grenade, the respective logs to game as well as the message_admins will contain the recorded phrase on that voice analyzer. - bugfix: Voice analyzers should now properly trigger TTVs to blow up. -<<<<<<< HEAD - bugfix: You can construct doors and stuff on ash tiles again. My bad, broke that one a long time back. - balance: Airlocks with an unrestricted side no longer function as a light source. @@ -1733,7 +1573,6 @@ - spellcheck: Emag charge time will now be presented as (2 minutes and 31.1 seconds) instead of (152.95s) SkyratBot: -======= skylord-a52: - imageadd: Nanotrasen Grilling Jorts have received a cosmetic upgrade 2022-09-25: @@ -1782,7 +1621,6 @@ LemonInTheDark: - bugfix: Fixes mining shuttles being weird as hell Rhials: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: New achievement -- Preventing a heart attack with exercise now gives you a shiny new achievement badge. Show it to all of your gym buddies, be the coolest guy in the locker room. @@ -1792,7 +1630,6 @@ the exercise status effect check to the round_event. - admin: MULTI-HEART ATTACK COMBO functionality added (trigger the heart_attack event and select how many victims you want). -<<<<<<< HEAD - rscadd: Rotten zombie tongue has a new speech modifier that converts spoken language into zombie sentences. If the person speaking is a high-functioning zombie this is bypassed. @@ -1888,7 +1725,6 @@ - bugfix: You can no longer assume control of Regal Rats during preround. - bugfix: Properly makes Gin garden alcoholic and adds quality tag. Is also now made with lime juice to prevent triggering the lemonade recipe. -======= - bugfix: You can no longer assume control of Regal Rats during preround. ShizCalev: - bugfix: Scrubber events will no longer trigger if there are no valid scrubbers @@ -1912,65 +1748,10 @@ san7890: - admin: When a player renames (creates) an area from an existing area to a new one, it now logs to game.log (global and individual). ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'The developers of Space-Coin decided to renege on their exit scheme with a new advertisement: Space-coin is the mobile currency of the future! As such, you can not cash out of their famous space coin market machines until the machine starts moving. They immediately ran away after that though.' -<<<<<<< HEAD - - bugfix: removes duplicate paper bin with pen in caps office - - bugfix: Removes a duplicated fax machine from the tram cargo lobby which wasn't - supposed to be there. - - bugfix: The air vent outside RnD on Icebox is no longer hidden by the Experimental - Destructive Scanner - - refactor: Maploading has been optimized significantly, as has ruin generation - and other lavaland stuff. Let me know if anything goes fucky - - bugfix: moved an air vent out from underneath a disposals bin in the Meta incinerator - - bugfix: replaced a regular intercom with a prisoner intercom in the Icebox prisoner - transfer - - bugfix: replaced the window spawners in Meta departures (the ones in the middle - of the room) with plain windows so you can see the flowers - jjpark-kb: - - bugfix: re-added the water basin and forging work bench. - - qol: Species incompatible check on ghostrole allows you select random appearance, - rather than not allowing you to spawn. - - bugfix: You can now select your character for black market dealer. -2022-09-28: - Ebin-Halcyon: - - imageadd: Paramedic clothing has been refitted for digitigrade legs - - bugfix: Security medic's clothing now fit on digitigrade legs. - - bugfix: Security medic's mysterious error straight jackets are now actual straight - jackets. - - bugfix: HoS' trenchcoats are no longer missing textures for digitigrade legged - HoSes - GoldenAlpharex: - - bugfix: The Security Winter Coat now properly displays the Lopland logo, rather - than the Armadyne one. - - bugfix: Xenomorphs can now only spawn midround from dynamic, and not from random - events anymore, to allow finer control over said spawning. - Mahalia: - - bugfix: Void Raptor - Fixed some Area Issues, Borg GBJ Curtains, Minor Moving - of Things, Cargo Shuttle Works Again. - Melbert: - - spellcheck: Syndicate bomb uplink text is now accurate in that it tells you the - minimum timer is 90 seconds and not 60 seconds. - - code_imp: Changed some shocked flags into one shocked trait - ShizCalev: - - bugfix: Fixed a runtime when firing energy guns with infinite power cells. - SkyratBot: - - bugfix: Adds Missing GPSs to Icebox Public Mining. - - bugfix: The radio in icebox tool storage is no longer an implant - - balance: AI restorer app now requires RD access to download. - - bugfix: Nukie tablets now properly show when a nuke is going off in their examine. - - balance: Tablet's charge and AI holder parts have been removed entirely. Tablets - now only have a cell, and computers only use their area's APC. - - code_imp: Modular computer's power handling, the AI restorer app's functionality, - and modular computer's examining has been refactored, please report any bugs - you might find. - - bugfix: You'll be able to hear weather again. this was broken for a damn year - how did none of you report it - - bugfix: Fixed the rogue Medbay Maintenance area appearing inside Medbay Storage. -======= timothymtorres: - rscadd: Rotten zombie tongue has a new speech modifier that converts spoken language into zombie sentences. If the person speaking is a high-functioning zombie this @@ -2034,14 +1815,12 @@ - bugfix: Fixed the rogue Medbay Maintenance area appearing inside Medbay Storage. TerraGS: - bugfix: clown car should work again ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 VexingRaven: - rscdel: 'Tramstation: A few stray cables leading to the prison showers have been removed' - rscadd: 'Tramstation: The kitchen now starts with an Enzyme Bottle' - bugfix: 'Tramstation: Service staff can now access the Cold Room Maintenance airlocks' - bugfix: 'Tramstation: The Court Room Holding Cell now has proper access restrictions' -<<<<<<< HEAD dawsonkeyes: - rscadd: New Marked One reward alongside an updated moveset 2022-09-29: @@ -2117,32 +1896,10 @@ - bugfix: You no longer have a momentary stroke when trying to comprehend disabling window airbags. VexingRaven: -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - spellcheck: Gave the Eyepatch HUD a new description that doesn't imply it works without eyes. Wallem: - imageadd: Gives the microwave a fresh coat of paint -<<<<<<< HEAD - nevimer: - - bugfix: ash walkers now understand the marked one when addressed - timothymtorres, soapstain22: - - rscadd: Added red and blue nightcaps that spawn in pajama lockers -2022-09-30: - PositiveEntropy: - - imageadd: Resprites suits associated with the curator job! - QuacksQ: - - rscadd: Remaps Atmos and Engi on the NSS Void Raptor. - SkyratBot: - - rscadd: Nanotrasen has started tracking exactly how often you're blowing up the - supermatter engine. Surely they can't be sending as many new crystals over there - as their financial reports imply. - - bugfix: Wizard's anonymous event won't run near the start of a round anymore. - - bugfix: Tramstation's departments should all be connected to the powernet at the - start of a round now. - - admin: Admin's power check mapping verb now actually works. - - bugfix: Icemoon is no longer considered part of the station. -======= san7890: - admin: If you send a cultist to Admin Prison, their fellow cultists are no longer able to summon them out using the Summon Cultist rune. @@ -2170,7 +1927,6 @@ lose all your blood and die forever. - bugfix: Wizard's anonymous event won't run near the start of a round anymore. Profakos: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Various tramstation medbay disposal and air pipe issues have been fixed - bugfix: Medbay and Chemistry tagged packages will arrive properly to Tramstation's medical equipment storage, and the apothecary, respectively @@ -2178,43 +1934,5 @@ - bugfix: Errant fire alarm no longer hovers above the surgery door - bugfix: Trash flushed down HoS and the Security Meeting area's disposals no longer get ejected below the HoS's door -<<<<<<< HEAD - qol: The icebox atmospherics department has had a re-shuffling of its piping, colourising all the layer adapters and freeing up a little space. -======= - RandomGamer123: - - bugfix: Stops the export value for erroneous manifests from decreasing into the - deep negatives exponentially over time - Salex08: - - bugfix: adds missing blood filter in medborg - - balance: Removes the ghost check for the battlecruiser objective to appear - - bugfix: Same player cant reroll battlecruiser multiple times anymore - ShizCalev: - - bugfix: Fixed an exploit allowing non-alien mobs to move facehuggers without triggering - them. - - bugfix: Wanted/missing posters are no longer broken. - - bugfix: Missing posters no longer change text color after being taken down. - - bugfix: Posters no longer fail to get put up 4 seconds after you walk away while - placing them lol - SuperSayu: - - balance: Welding fuel tank explosions have been scaled slightly down and require - the fuel tanks to actually be full of welding fuel - - bugfix: You can detonate welding fuel tanks with an igniter-sensor assembly - - bugfix: You can reach your one-tank bomb's assembly controls by activating the - item in your hand. - - bugfix: Certain assemblies should no longer turn themselves off. - - bugfix: Clumsy fools handling a mousetrap-based multi-part assembly may set it - off by accident - Y0SH1M4S73R: - - bugfix: Fixed a runtime that happens when the MC invokes a varedited callback - synchronously. - san7890: - - admin: List Bombers, List Law Changes, List Manifest, List Signalers, List DNA, - List Fingerprints, and Show Law Changes have all been replicated to exist outside - of the Secrets panel. You may still access these verbs from the Secrets panel, - but they are able to be called as individual verbs. - timothymtorres: - - bugfix: Fix psicodine to suppress all phobias (including claustrophobia and nyctophobia) - tralezab: - - bugfix: baguette swords make that satisfying slash sound now ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-10.yml b/html/changelogs/archive/2022-10.yml index ba78c7a6400..702471e8db3 100644 --- a/html/changelogs/archive/2022-10.yml +++ b/html/changelogs/archive/2022-10.yml @@ -1,5 +1,4 @@ 2022-10-01: -<<<<<<< HEAD Ebin-Halcyon: - imageadd: A slimmer reskin variant of the secbelt, alt click your secbelt to select them @@ -57,16 +56,13 @@ List Fingerprints, and Show Law Changes have all been replicated to exist outside of the Secrets panel. You may still access these verbs from the Secrets panel, but they are able to be called as individual verbs. -======= Guillaume Prata: - bugfix: Fix an accidental revert on noblium's reagent effect on plasmamen JohnFulpWillard: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: '[ICEBOX] Arrivals now won''t depower from a single cable being bit.' - qol: '[ICEBOX] There''s now an ORM-locked windoor in front of the ORM.' - qol: '[ICEBOX] The maintenance door leading to Abandoned Kitchen & Bar, on the right side, now also has Service access tied to it.' -<<<<<<< HEAD - refactor: Cleanbots have been entirely reworked, please report any bugs you might find. - bugfix: Fix psicodine to suppress all phobias (including claustrophobia and nyctophobia) @@ -74,7 +70,6 @@ synchronously. - bugfix: You can manually pump your blood while asleep/in crit, rather than instantly lose all your blood and die forever. -======= Tramz: - imageadd: Adds new icons and a new animation for the Bloody blade. VexingRaven: @@ -84,12 +79,10 @@ - bugfix: When a Nuclear Operative makes a golem, they no longer immediately turn into a fully functioning reinforcement. tralezab: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Changelings once again have reestablished their changeling hivemind, and can secretly communicate between each other. - bugfix: Fixed up the Changeling UI a bit, like for example some dimmers would never render. -<<<<<<< HEAD - imageadd: Adds Moffra wing and antennae sprites - qol: you can now right click an electrolyzer to toggle it on & off Tramz: @@ -109,19 +102,16 @@ SkyratBot: - spellcheck: wall clocks no longer have a desc talking about bluespace - bugfix: Robotic limbs are once again style-able using a spraycan. -======= 2022-10-02: PKPenguin321: - balance: Railings take twice as many rods and twice as much time to make Shadyyy66: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added boxcutter to cargo. Vishenka0704: - bugfix: if payday free, don't send you extra message where "payday aborted" - code_imp: clarity to "account.dm" code Wallem: - qol: Anchoring a microwave on the same tile as a table will align it to the table -<<<<<<< HEAD 2022-10-03: Ebin-Halcyon: - imageadd: Head of staff mantles have been resprited @@ -175,7 +165,6 @@ upright, and at 100% size, for consistency. SkyratBot: - qol: janitor and clown erts have access to command radio -======= tralezab: - spellcheck: wall clocks no longer have a desc talking about bluespace 2022-10-03: @@ -185,7 +174,6 @@ Wallem: - imageadd: Resprites the Fulton Recovery Beacon vincentiusvin: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Removed the broken pressure power multiplier which always evaluates to 2. Multiplied base SM power production by 2. - rscdel: SM will no longer gain power when exposed to space. It actually used to @@ -216,7 +204,6 @@ expected except for the low mole temp limit multiplier thing. - refactor: Restructured SM pluox generation and miasma consumption. No changes expected though. -<<<<<<< HEAD - refactor: Refactored... well a lot really. Map views, anything to do with planes, multiz, a shit ton of rendering stuff. Basically if you see anything off visually report it @@ -361,7 +348,6 @@ SkyratBot: - bugfix: Rat King no longer attacks living lick targets after he finishes licking them. -======= 2022-10-04: Fikou: - qol: janitor and clown erts have access to command radio @@ -372,7 +358,6 @@ - bugfix: After a recent bureaucratic error, CentCom orbit labels are now correctly colored. scriptis: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: mechfabs, autolathes, component printers, and module duplicators now use techfab tgui components - refactor: every single design is now categorized and subcategorized @@ -387,7 +372,6 @@ - qol: numerous other techfab ui tweaks - balance: some designs that were formerly autolathe exclusive can now be printed at some departmental techfabs -<<<<<<< HEAD - rscadd: Adds a new kudzu mutation called timid - balance: lowers severity of the kudzu mutation temperature stabilisation from average to minor @@ -499,7 +483,6 @@ they've been putting your cameras on backwards! Give 'em a shout if any are still out of place, but you should see lots of improvement when it comes to where they're mounted. -======= timothymtorres: - bugfix: Spirits (Revenants), Robotic mobs (drones), and epic mobs (megafauna) are no longer affected by hallucinations @@ -550,7 +533,6 @@ its green to a newer, fresher one! Sealed101: - bugfix: fixed AI Jump To Network verb not functioning ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - bugfix: Fixed a bunch of missing inhand icons. - bugfix: Fixed cables in electrical toolboxes not randomizing their colors. @@ -570,18 +552,6 @@ - bugfix: The rainbow energy sword is now a little bit more rainbowy! - bugfix: Fixed an tk exploit with orange handcuffed shoes. - bugfix: The traitor outfit in the select equipment panel is now actually functional! -<<<<<<< HEAD - - bugfix: Fixed the papersack. - SkyratBot: - - balance: Abductors are now a light midround as opposed to a heavy midround. This - means they can spawn earlier in the round. - - rscdel: Golden wheelchairs in Tram maintenance and mail have been replaced by - T1 motorized wheelchairs - - bugfix: You can no longer steal shoes off of yourself. Just take them off normally. - - rscadd: 'Engines are now machines, not structures. If destroyed, they will drop - circuit boards so you can rebuild them. removal: In-wall engines have been remvoed. - The Tram now uses full-blown engines.' -======= SuperSayu: - bugfix: Guitars run on Linux servers again. Tastyfish: @@ -724,7 +694,6 @@ - qol: You can now put clothing, backpacks, and belts onto people by clicking on them with it in your hand and targeting the right area. vincentiusvin: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed sm space exposure damage going through walls - rscdel: got rid of the molar multiplier for sm heating damage. It will now only impact molar damage and temp limit. We apply the lowest value directly so this @@ -739,74 +708,6 @@ - balance: Halved SM power damage across the board. - balance: Changed sm space exposure damage to just check for the current tile and adjacent atmos connected tiles. -<<<<<<< HEAD - axietheaxolotl: - - imageadd: brand new sprites for the curator explorer jacket, and regular leather - jacket. - - rscdel: Non-HoS leather overcoat. - - rscadd: Biker leather jacket. - itseasytosee: - - qol: You can now put clothing, backpacks, and belts onto people by clicking on - them with it in your hand and targeting the right area. - jjpark-kb: - - rscadd: added a share damage ash ritual - - qol: ash rituals now have descriptions; examine the rune for more details -2022-10-11: - A.C.M.O.: - - rscadd: Added hidden quirks which can't be selected in TGUI. - - rscadd: Added pills and pill bottles for synthetic healing medications. - - balance: 'Re-balanced Blood Deficiency and Brain Tumor quirks for synthetics. - tweak: Re-labeled Brain Tumor as Brain Degeneration for roleplay-ability.' - - balance: For synthetic characters, the Blood Deficiency quirk swaps to Hydraulic - Leak, optimized for synths. - - balance: For synthetic characters, the Brain Degeneration quirk swaps to Positronic - Cascade Anomaly, optimized for synths. - - bugfix: Makes liquid solder actually a liquid. - - bugfix: Fixes synthetic healing medications to behave more deterministically. - Gandalf2k15: - - bugfix: Hats have been repathed accordingly and should no longer show up as errors. - Nerev4r: - - rscadd: 'Adds the biker jacket to the loadout from #16677' - OrionTheFox: - - bugfix: fixed the Sweater Jacket unintentionally using the Cableknit Sweater's - icons; the old 'sweater' uniform is now properly called Cableknit Sweater where - applicable to help distinguish the two - - imageadd: The Keyhole Sweater has been updated and Greyscaled! Recolor it to your - heart's content! - - imageadd: the updated Captains/Curators/Teal suit now have digi icons, as well - as the updated CC palette. The HoS's turtleneck and formal uniform have also - received some slight improvement visually. - - bugfix: Light Paramedic Uniforms now have proper Object icons - SkyratBot: - - bugfix: You should no longer receive "Your previous action was ignored..." messages - when you join a server - - bugfix: You can now remove objects embedded in yourself again - - balance: reduced shotgun dart reagent amount - - spellcheck: The compressed matter cartridge has been renamed to RCD matter cartridge, - since it's RCD matter... used to refill an RCD. - - bugfix: fixed holopad teleporting - - balance: 'The Infiltrator suit has been remade into an Infiltrator MODsuit. Has - all the original features, but now also has additional powers: total anonymity, - and a demoralization aura.' - SpaceVampire: - - balance: Jackboots now come with actual working laces! Make sure they don't get - tangled up. - - bugfix: Peacekeeper boots have bio armor again. Good news if you wanted to wear - the single pair in the correctional officer locker. - - code_imp: Removed non-modular tape code, as it wasn't even doing anything. - Tastyfish: - - bugfix: Baguettes can now be examined again. -2022-10-12: - Ebin-Halcyon: - - imageadd: Departmental coats have been resprited - - imageadd: A non-departmental coat crate has been shipped to Nanotrasen stations, - find it in the loadout - GoldenAlpharex: - - bugfix: Health scanners no longer show someone as missing lungs or a liver if - their species don't breathe or don't process chemicals, respectively. - Jureiia: - - bugfix: Makes most of the dresses and skirts no longer get cropped as a taur -======= 2022-10-11: Gamer025: - bugfix: You should no longer receive "Your previous action was ignored..." messages @@ -816,34 +717,12 @@ JohnFulpWillard: - spellcheck: The compressed matter cartridge has been renamed to RCD matter cartridge, since it's RCD matter... used to refill an RCD. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - qol: Spell buttons update every so slightly more accurately when they become unavailable or available. - refactor: Refactored temporary mute effects and sign language. - code_imp: Cleaned up vocal checks into "try_speak" and "can_speak". - admin: VV dropdown removing "Tongue Tied" quirk actually removes the quirk -<<<<<<< HEAD - - rscadd: Having very low sanity (insane or crazy, the last two sanity levels) will - cause you to experience hallucinations rarely. - - admin: Removing RDS via the VV menu will actually remove the associated effects. - OrionTheFox: - - qol: the Corset uniform is now instead an Underwear option! Now you can actually - wear it under the clothes of your choice! - - imagedel: Removed the Stripper uniforms (They're all underwear types(Even the - Mankini, on TG even)); the bunny ones have remained - - imageadd: after WAY too long sitting on the backburner, the generic Utility Uniform - is now up-to-par with the departmental variants. The classic prisoner uniform - has also been slightly touched up. - - imageadd: Resorted a few less important items, and the base jumpsuits themselves, - into different icon files. Keep an eye out for sprite bugs! If you see one, - make a bug report on github, and ping @OrionTheFox! - RimiNosha: - - rscadd: 'Two new IPC+Synthetic brain types: Circuit and MMI!' - - rscadd: 'One new Cyborg brain type: Circuit!' - - qol: Cyborgs, IPCs and Synthetics can now choose their preferred brain in the - lower prefs box! -======= arnociiroc: - balance: reduced shotgun dart reagent amount 2022-10-12: @@ -869,59 +748,10 @@ - bugfix: Fixed showcase microwaves lacking sprites - bugfix: Fixed RnD Servers not dropping their components & completely vanishing when deconstructed ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - bugfix: Fixed a minor runtime when a temporary transit tube exits a loop through a destroyed transit pipe. - bugfix: Boxcutters now have inhands again. -<<<<<<< HEAD - SkyratBot: - - imageadd: fixes previous sec resprite issues, replaces sec helmet and sec wintercoat - inhands, replaces sec helmet obj icon - - bugfix: Tramstation security/toxins now have their own EOD closets. Icebox toxins - now has an EOD closet as well, in the nearby maintenance area. - - spellcheck: replaced a death commando name - - bugfix: On RuntimeStation, should you chance upon it, the emergency shuttle should - no longer collide by the with the circuits lab. - - bugfix: Fixed a random crash at the power management console. - - bugfix: Fixed RnD Servers not dropping their components & completely vanishing - when deconstructed - - qol: Add contextual screentips to jumpsuits - - imageadd: fixed the holocarp guardian fishsticks icon - Tastyfish: - - bugfix: Opening Game Options and then spawning no longer makes you a random human. - Zergspower: - - qol: Crash ruin - Altered the crash appearance to look more 'natural', upgrade - the rocks to high value - - qol: smugglies - Added gigaspace beacon, made the rock it's stored in less perfect, - added tiny fan and runway lights - - bugfix: Prisonshuttle ruin - fixes ghost-blocks due to turret placement, changes - entire appearance, russians no longer drop APS's - - bugfix: shuttle8532 ruin - missing area assignments in main walkway corrected, - ruin shrunk 8x2 with no changes to loot or map - - bugfix: ancient_satellite - fixed depreciated areas causing it to never spawn - - qol: Black Market expands! New drug room hidden behind wall, 2 more RNG spawners - in the main room for material and tool. - - bugfix: Scrapheap ruin - is able to spawn without erroring now - - bugfix: Cargodiselost - Rogue Air Alarm removed - - bugfix: Derelictferry - Removed error'd items and replaced them with alternatives - that also work with digi legs. - - bugfix: Polychromaticfacility - re-added the missing 3rd items that disappeared - at some point and swapped the Sec statue for a science one. -2022-10-13: - GoldenAlpharex: - - bugfix: Blood no longer trail in anyone's bloodstream as a reagent after being - inserted in their body. - Melbert: - - bugfix: Fixes "absorb another changeling" objective - - qol: Completing "The Living Heart" ritual with a replacement heart will restart - a heart if it's not beating. - Paxilmaniac: - - imageadd: New sprites for stone floors! - RimiNosha: - - bugfix: Fixed targeted subtler not listing any valid targets. - ShizCalev: -======= Twaticus: - imageadd: fixes previous sec resprite issues, replaces sec helmet and sec wintercoat inhands, replaces sec helmet obj icon @@ -961,143 +791,11 @@ ShizCalev: - bugfix: Fixed a runtime when clicking an away mission gateway without the partner gateway being active. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - server: Added clarified downstream modularity support for the inhands unit test. - bugfix: Wall mounted & portable flashers now actually flash again! - admin: Flashers can now have their range and cooldown durations vareditted with flash_range and flash_cooldown_duration respectively. - qol: You can now change the color of toy energy swords with a screwdriver! -<<<<<<< HEAD - - bugfix: Fixed a runtime when clicking an away mission gateway without the partner - gateway being active. - - bugfix: Fixed a runtime preventing clientless mobs from mining minerals. - SkyratBot: - - bugfix: the cargo department is once again coloured in the crew manifest - - bugfix: Bodyparts (e.g. severed heads) stored in organ fridges now freeze the - organs stored inside them, if any are present. - - code_imp: Add chat notification for shoes & glove protection when mousetrap triggered - - qol: firelocks are now welded with RMB instead of LMB - - bugfix: Fixed AI Toggle Camera Lights not working properly - - bugfix: Ablative trenchcoat no longer gives a permanent sechud if toggled while - you already had a helmet on. - - balance: The Curator and Crystal PDA is now upgraded to have long-distance NTnet - connections, they are able to use their apps in space. - - bugfix: fixed the medical.dmi having 2 dupe frames for the medical jumpsuit mob - sprite. - - rscadd: After 30 minutes, Bileworms evolve into Vileworms, a more dangerous variant. - - balance: Bileworms are easier - - balance: Bileworms drop gold - - bugfix: fixes bileworms spawning too close to other mobs, causing very, VERY tough - fights - - bugfix: Fixed mail being able to change the stations nuke code when it had already - been generated. - - balance: You can put regal pipeguns into the suit storage of high-vis vests and - wet floor signs. - - bugfix: TGchat now supports hyperlinking... links... with curly braces. - - bugfix: Fixed showcase microwaves lacking sprites - - bugfix: Ethereals can now actually read the balloon alerts they get whenever they - try and recharge/discharge an APC. - - admin: Whenever a player uses a vial of blood/vial of tickles to bring forth a - Slaughter Demon or a Laughter Demon (respectively), it will now log to their - individual player log, as well as the global game.log. - Tastyfish: - - bugfix: Hands are no longer sometimes visible when the player is otherwise invisible - from FOV. - Zonespace27: - - spellcheck: Modularization readme now specifies .MD files, not .DM -2022-10-14: - GoldenAlpharex: - - bugfix: The Hemophage entry in the species selection menu has seen its perk display - updated, to properly reflect the pros and the cons of being an Hemophage. - - qol: Changing your PDA ringtone now has your current ringtone in your input box, - like the previous PDAs used to. - - bugfix: Fixed the incoming Messenger messages not being properly HTML decoded - in the Message History, making it display weird stuff instead of apostrophes. - - bugfix: Fixed the formatting of the Messenger's Message History tab. - - qol: The prompt to send a PDA message now shows you the person you're trying to - send a PDA message to. - Melbert: - - balance: Holy melons are now more melon like - they are now fruits (instead of - no food type), normal weight class, and can be juiced into holy water - - balance: Ninja and Traitors can no longer hack consoles located in maintenance - for their objectives. (Basically, it abides by the same rules that Space Dragons - have on where they can put their portal.) - - bugfix: Secure Data consoles abide by the same hacking rules as comms consoles - - getting de-powered mid-hack will stop hack progress. - Paxilmaniac: - - imageadd: custom material walls (glass walls, pizza, meat, etc) will now use a - lightened version of skyrat's wall sprites, rather than tg wall sprites - SkyratBot: - - bugfix: Changing z-level while jaunting will no longer reveal you. - - bugfix: If a shuttle lands on you while jaunting you will die rather than be stuck - in a weird purgatory state. - - bugfix: Mirror Walk will not appear tinted as if it can be cast when it can't, - and vice versa. - - qol: Blood Crawl and Shadow Walk will now display whether you can use them or - not in the same manner as Mirror Walk. - - refactor: Jaunt code which adds and removes temporary traits or effects should - hopefully be easier to work with in the future. - - bugfix: Circuitboards that require a minimum level of manipulators tiers no longer - display just "manipulator" when examining machine frames that contain them - - bugfix: Marked a few more admin only chem dispenser boards to display their proper - manipulator requirements - - rscadd: Added a new bounty to deliver a refined dimensional anomaly core. - - spellcheck: Fixed some typos and awkward grammar in bounty descriptions. - - bugfix: Cyborgs can now no longer untip vending machines that they are not directly - next to. - - bugfix: Those with the technoshy/technovert trait are now able to untip vending - machines. - - bugfix: If you exit out of the TGUI options menu when hitting the "Make AI" link - there, it will actually assume that you wanted to cancel out of the proc entirely, - rather than proceed without your knowledge. - - bugfix: Engineers now recieve welding helmets instead of errors when they order - an engineering supply pack. - - bugfix: Welding helmet inhand sprites now properly update when you flip the visor. - - bugfix: "T\xF6chta\xFCse berries are now juiceable. You no longer get T\xF6chta\xFC\ - se juice via grinding them." - - bugfix: Anchoring an object while pulling it will now make you stop pulling said - anchored object. - - qol: cargo crate descriptions now better describe what you'll be getting from - them - Tastyfish: - - bugfix: Vox N2 tanks are no longer cloaked. - Wallem: - - qol: The Biogen will show how full the container inside it is - Zonespace27: - - bugfix: Borers should no longer be able to reach exponential health -2022-10-15: - GoldenAlpharex: - - bugfix: You should no longer suddenly experience a station-wide mutism event (that - didn't affect radios), and will now properly be able to express yourself regardless - (hopefully). - Melbert: - - bugfix: Split personalities can commune again, probably - Paxilmaniac: - - bugfix: tiles with the decals sprited in (terrible) have been replaced with just - normal tiles with decals on top (good) - SkyratBot: - - bugfix: ERT and nuke ops players can no longer remove the power cell from a combat - defibrillator. - - qol: Crafting intelliTaters/intelliLanterns now carries over the AI from the card - used to craft it. - - bugfix: Crafting intelliLanterns with a card that contains an AI no longer deletes - the AI. - - qol: The Cargo Technician's jumpsuit and skirt no longer cover the chest when - adjusted. - - bugfix: Fix traitor PDA uplinks to be accessible by illiterate people - Tastyfish: - - bugfix: Armaments in both armament vendors and in gun cargo now have a more accurate - thumbnail, with complete overlays. - itseasytosee: - - code_imp: Changed the examine text on monkeized humans. -2022-10-16: - ShizCalev: - - bugfix: Fixed ear bounty not clarifying that it only accepts upgraded cybernetic - ears. - - bugfix: Fixed a runtime preventing mafia from starting if a player disconnected - during signups. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed some missing shield inhand icons. - bugfix: The strobe shield's inhand icon now plays the flashing animation when triggered again. @@ -1107,48 +805,6 @@ inventory slot. - bugfix: Fixed the east facing left-handed strobe shield sprite being misaligned by two pixels. -<<<<<<< HEAD - - bugfix: Fixed an unreachable tile in the CMO's office on Kilo - SkyratBot: - - bugfix: You can no longer pierce the veil between the living and the dead with - the power of circuitry. - - imageadd: New inhand sprites for the sabre sheath -2022-10-17: - A.C.M.O.: - - bugfix: Fixed a bug where knockdowns caused Poly's voice commands to stop working. - - bugfix: Fixed bug in Hydraulic Leak quirk which caused it to be lethal. - Ebin-Halcyon: - - imageadd: The RD's labcoat and turtleneck have been resprited - GoldenAlpharex: - - bugfix: The Medical Kiosk no longer bends the laws of physics and now properly - appears underneath mobs that would somehow end up atop of it, rather than above - them. - - balance: Hemophages now receive a status effect that reduces their blood drain - by half for twenty minutes when drinking blood from another player-controlled - non-monkey humanoid character. - - balance: Hemophages now have a maximum blood volume of 1000, rather than 2000. - - balance: Drinking blood from monkeys, or otherwise inserting monkey blood in your - body, will no longer allow you to go past the normal maximum blood volume of - 560 cL, much like all of the other blood-increasing reagents. - - bugfix: '' - - code_imp: Made some general improvements to the Hemophage code, bringing it closer - to the standards. - - qol: Added a preference for PDA ringtones, to save a custom ringtone that will - then be applied automatically to your character when spawned in the game. Gone - are the days of having to do it manually at the start of every round! - Melbert: - - bugfix: Fixed a plant backfire runtime when throwing plants - Paxilmaniac: - - bugfix: The path on the left side of the ash walker's ritual room on icebox now - actually lines up with the door - - imagedel: Removed a few entirely unused sprites from the modular suits icon file - QuacksQ: - - bugfix: Fixed various issues on NSS Voidraptor. - SkyratBot: - - bugfix: Choosing admin setup options on certain events will no longer retain the - chosen options for future events. - - bugfix: Sold bounty cubes now display properly in the NT pay app history. -======= - bugfix: Fixed a runtime preventing clientless mobs from mining minerals. dragomagol: - qol: cargo crate descriptions now better describe what you'll be getting from @@ -1267,16 +923,10 @@ - bugfix: You can no longer pierce the veil between the living and the dead with the power of circuitry. timothymtorres: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Add RMB hotkey to toggle lighting for flashlights. Add contextual screentips for flashlights. - soundadd: Reuse existing sounds for flares to use `sound/items/match_strike.ogg` and glowsticks to use `sound/effects/wounds/crack2.ogg` -<<<<<<< HEAD - - bugfix: Custom vendors now explode on deconstruct as opposed to delete, causing - no practical changes to gameplay but admins will notice slightly fewer ahelps - if they ever have to get rid of one. -======= 2022-10-17: ArcaneMusic: - bugfix: Custom vendors now explode on deconstruct as opposed to delete, causing @@ -1309,7 +959,6 @@ Wallem: - rscadd: A new scam artist has gotten your home address. jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The orbit UI now brings up tooltips to show health, job, and full name information. - rscadd: The orbit UI now puts disguised names in quotes. "John Doe". Hover to @@ -1317,7 +966,6 @@ - rscadd: Orbit UI now gives tooltips on SM crystal, nuke disk, and nuclear devices. - rscadd: You can now search by job in the orbit UI. - bugfix: Orbit UI buttons (should) no longer clip on extra long names. -<<<<<<< HEAD - bugfix: blob zombies created by the Distributed Neurons reagent and cyto no longer die instantly due to not having an associated factory - balance: Clever monkeys now use items the same way Humans do, meaning they can @@ -1338,64 +986,39 @@ - bugfix: EMP grenades now have an actual icon when activated. - bugfix: Fixes coloring issues with taur bodyparts - bugfix: Fixes layering issues with back-view taur bodyparts -======= lizardqueenlexi: - bugfix: Admin-spawned and changelings transformed into lizards will display the correct tails now ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-10-18: Dalmationer and Profakos: - imageadd: added icons for motorized wheelchairs (regular and fast) - bugfix: Wheelchairs can be upgraded more than once -<<<<<<< HEAD GoldenAlpharex: - bugfix: Oversized characters will no longer start being spammed with feeling "terribly bloated" because they're getting closer to their normal amount of blood within a round. -======= GoblinBackwards: - bugfix: Fixed being able to weld multiple disposal machines to the same pipe GoldenAlpharex: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The prompt to commend someone else for their good behavior will now properly be given out randomly, allowing those that late-join to give them out as well. Imaginos: - imageadd: Updates the station-bounced radio sprite -<<<<<<< HEAD -======= Jackraxxus: - bugfix: Deltastation's EVA now contains a real toolbelt, that can only hold tools. - bugfix: The Ashwalker Nest now contains a real toolbelt, that can only hold tools. - spellcheck: The base type of /belt is now more obviously NOT a toolbelt. MTandi: - imageadd: Added xenobio guide sign ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Fixed some things having inaccurate screentips while holding nothing (Elevators, heaters, bodybags / roller beds) - bugfix: Fixes runtime preventing revolution auto shuttle call Paxilmaniac: -<<<<<<< HEAD - - rscadd: A large version of the mortar that can hold five items at once, but it - must be secured (preferably on a table) before you can use it! - - rscadd: Stone can now be used to build stone stairs! - - balance: Xenos have lost the ability to devolve back into a larva - - balance: Runner damage has been lowered to 15-20 (From 20-25) - - balance: Runners cannot vent crawl for 48 seconds (80% of the ability cooldown - timer) starting from when they activate the evade ability, to prevent cheese - - balance: Sentinel spit now uses more plasma per spit (40 from 25) and does a bit - less damage (30 stamina from 40, or 20 burn from 25) - - balance: Warriors in agility mode will do 15-20 damage, which will return to normal - when they stop using agility - SkyratBot: - - imageadd: New and improved sprites for stone floors! -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Stairs can now be built out of iron, wood, or really any rigid material (stuff you can make carving blocks out of) - rscadd: Two new types of stairs, wood and stone (wood is buildable in round) for any mappers in the chat -<<<<<<< HEAD - bugfix: checking a pocket protector's insertable items list no longer lists the names of ALL possible objects. - bugfix: normal/cosmetology pocket protectors now work again. @@ -1433,7 +1056,6 @@ - imageadd: New icons for ceramic plates, cups, and bowls! - imageadd: The icon for custom material floor tiles has been lightened up to give things like glass and paper floors the look they were always meant to have -======= - imageadd: New and improved sprites for stone floors! Profakos: - bugfix: Goodie lockbox contents can no longer go missing @@ -1468,18 +1090,12 @@ Melbert: - bugfix: Viper spider venom actually causes hallucinations - qol: Tramstation kitchen dumbwaiter now uses an elevator control panel ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PositiveEntropy, Fikou: - rscadd: 'Adds a new HUD: The Trasen-Knox HUD! With a theming based on classic 1970s CRT screen computers!' - code_imp: Added behavior for unique icons for active hands. - code_imp: Added behavior that makes it so when you equip an item, the icon behind it defaults to the blank template type. -<<<<<<< HEAD - RatFromTheJungle: - - bugfix: bardrobes, oncemore, actually sell their moneybags - ShizCalev: -======= Pumpkinoe: - spellcheck: Statue descriptions now have full stops and capital letters. - spellcheck: Sleeper protocol grammar is better now. Wahoo! @@ -1491,13 +1107,11 @@ - bugfix: Freerange intercoms can no longer access the Syndicate frequency. ShizCalev: - bugfix: Fixed the Shadow Walk action button. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed a possible scenario which could result in ghosts not sending a chat message properly when pointing during high time dilation. - bugfix: Fixed a minor runtime keeping player controlled secbots from switching to arrest mode automatically after stunning someone. This also fixed the stun action being combat logged for an incorrect mob. -<<<<<<< HEAD SkyratBot: - bugfix: Fixed modular computers not being able to be deconstructed/repaired - spellcheck: Igniting an oil patch will display in first person for the user. @@ -1517,7 +1131,6 @@ step. Triiodine: - imageadd: resprites datadisks to be more floppy disk-y. -======= Triiodine: - imageadd: resprites datadisks to be more floppy disk-y. VexingRaven: @@ -1545,7 +1158,6 @@ the codebase default that you run the Generate Job Configuration verb (in Server tab) in order to import all of your already set variables from jobs.txt. Please check to ensure that all of your wanted settings are present in the new file.' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-10-20: ATHATH: - rscdel: Explosive holoparasites no longer have a 40% chance per punch to teleport @@ -1553,8 +1165,6 @@ types in partaking in the pastime of brutalizing the bleeding corpses of their victims without worrying about accidentally teleporting them into a primary hallway. -<<<<<<< HEAD -======= CCC23: - rscadd: Added New way to purchase the autorifle and ammo to cargo - balance: added more ballistics weapons to combat @@ -1585,12 +1195,10 @@ - bugfix: Curator and Mime PDAs are now silent roundstart again. LemonInTheDark: - rscadd: You can now choke on cigarettes. Careful, those suckers can be nasty ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Jellypeople (species) can consume food created by silver slimes - bugfix: Fixes Nightmare heart revival causing their other organs to not realize they're no longer dead on the same tick. -<<<<<<< HEAD OrionTheFox: - bugfix: SEVA hoods/masks no longer clip with muzzles Paxilmaniac: @@ -1610,7 +1218,6 @@ - balance: added more ballistics weapons to combat - spellcheck: Chitinous Armour's description reflects its protection values more accurately. -======= - bugfix: Attempting to move around while in a state of non-existence will not give you a message saying you're buckled to the concept of non-existence Mothblocks: @@ -1641,7 +1248,6 @@ - bugfix: made regenerate_organs() apply to external organs as well as internal ones san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The voting system will now prevent you (and give a short message via the tooltip) from starting a map vote when there are zero or one map choices available. - qol: If there is only one map choice available, the map vote will automatically @@ -1649,7 +1255,6 @@ been made so that you may not rock the vote after this point if it has been auto-rotated, since there was only ever once choice to begin with, making the whole purpose of a vote useless. -<<<<<<< HEAD - bugfix: stone stairs placed side by side will now actually line up in spriting - bugfix: I forgor to remove the ability to build material stairs without a stairs frame when I added the whole frame system, this has been fixed, use a stairs @@ -1664,9 +1269,7 @@ - qol: Air alerts now tell you that you've got a plasma tank in your survival box if you're a plasmaman and don't say you have a gas mask in there, it's a breath mask. -======= timothymtorres: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Add tower of babel wizard event that makes people lose all their languages and gain a randomized one. The wizard however gains the ability to speak all languages. Curators, chaplains, book of babel, and antimagic objects will prevent @@ -1685,7 +1288,6 @@ remove this effect. - rscdel: Remove staff of sapping and bolt of sapping. These effects have been replaced with staff of babel and bolt of babel. -<<<<<<< HEAD - imageadd: Added xenobio guide sign - bugfix: Curator and Mime PDAs are now silent roundstart again. - balance: You can no longer order new weakpoint locators/bombs if the originals @@ -1709,17 +1311,14 @@ hammer, and anvil to repair - bugfix: reagent hammers dont damage anvils and crafting bench 2022-10-21: -======= - bugfix: Fix item icons for action buttons to be center aligned 2022-10-21: Ebb-Real: - bugfix: Chairs get placed in the same direction as you face when you place a chair. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MSO, Dopamiin, Ryll: - bugfix: fixed an edge case where admins spawning ghosts in as mobs would sometimes give the wrong person control of the new mob. Melbert: -<<<<<<< HEAD - bugfix: Attempting to move around while in a state of non-existence will not give you a message saying you're buckled to the concept of non-existence - bugfix: Having a Changeling sting active will no longer block alt-clicking to @@ -1739,7 +1338,6 @@ - bugfix: Breast prefs are no longer reset and throw runtimes on savefile update. Woops. ShizCalev: -======= - bugfix: Fixes pressing a paper up to a camera while you are "Unknown". - bugfix: Fixes a runtime from deleting a mob with an eye of god equipped - bugfix: Having a Changeling sting active will no longer block alt-clicking to @@ -1761,13 +1359,11 @@ Robe available in the chaplain's wardrobe. ShizCalev: - spellcheck: Corrected formatting on the examine message for unarmed mines ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Modernized the janicart! - bugfix: Fixed janicart examine message not mentioning how to dump it when it was almost empty, but not completely empty. - bugfix: Fixed varedited janicarts having no caution signs visible when they went over 4 signs. -<<<<<<< HEAD - bugfix: Fixed broken/missing gibs on the nature shuttle. - spellcheck: Corrected formatting on the examine message for unarmed mines SkyratBot: @@ -1775,19 +1371,16 @@ present when moving past a certain point - rscdel: Removed the CO2 filters in Kilo/Icebox atmos that would pump CO2 back into the scrubbers pipes. -======= Tastyfish: - bugfix: Flashlights and similar directional light items no longer make you glow forever under certain circumstances. jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Orbit UI buttons now reflect health and show job icons - rscadd: ID trims now have an orbit icon variable for its display on the observer menu - code_imp: Orbit UI heatmap is now toggleable with health (top button) - bugfix: Sorting for disguised names should work better. - refactor: Refactored Orbit into a folder. -<<<<<<< HEAD - bugfix: You can now properly weld and use plasma cutters without the target of your actions being irrevocably FUCKED. - bugfix: People can now see when you begin reading the Guide to Dank Mimery @@ -1799,15 +1392,12 @@ Robe available in the chaplain's wardrobe. - qol: Added balloon alerts for securing emergency energy shields - rscadd: You can now choke on cigarettes. Careful, those suckers can be nasty -======= san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: When a human went through an emagged recycler, they would have literally everything on them chewed up in the recycler. However, they still appeared to have all of their stuff on them due to some faulty code. When you now punt that tider into the chewer-of-death, they should now appropriately reflect that all of their clothes have been deleted. -<<<<<<< HEAD - bugfix: Flashlights and similar directional light items no longer make you glow forever under certain circumstances. Tastyfish: @@ -1821,15 +1411,12 @@ components. nevimer: - code_imp: Use timers for the BSRPD a cooldown (and makes it work) -======= - bugfix: You can now properly weld and use plasma cutters without the target of your actions being irrevocably FUCKED. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2022-10-22: Boy: - balance: Flasks can now be stored in jackboots, clown shoes, and other shoes with pockets -<<<<<<< HEAD Melbert: - bugfix: Changing species will now carry over brain traumas, liver traits, cybernetic organs, organ damage, and the heretic living heart. @@ -1874,17 +1461,14 @@ - admin: '"Admin PM" verb can now be cancelled without an error message' GoldenAlpharex, Tastyfish: - bugfix: Fixes mentor-related messages not getting logged properly. -======= JohnFulpWillard: - bugfix: Computers without a saved job/ID are no longer called " ()" - bugfix: Clockwork's ruin should no longer have ungenerated turfs. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Tramstation's tram doors now work properly. - rscadd: The tram has a destination sign, and the call buttons have a status display for where the tram is and if it's operational or not. Melbert: -<<<<<<< HEAD - bugfix: Fixes a minor runtime with Fleshmend clearing scars. - bugfix: Fixes a runtime from non-cultists picking up cult daggers - bugfix: Nutriments and Peptides will no longer heal robotic limbs. @@ -1949,7 +1533,6 @@ - bugfix: sandals and colorable jackboots now actually work on digigrade individuals SkyratBot: - bugfix: The black market uplink now properly uses the correct item path and description. -======= - bugfix: Sechuds cannot pierce the sneak suit to see the wearer's ID trim. Pumpkinoe: - rscadd: A new movie's been making waves, and a poster about it has been seen once @@ -1997,13 +1580,11 @@ of only the parent gib - bugfix: Fixes an edge case runtime with heretic sacrificing Rhials: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: headpikes now drop their mounted head on destruction. Vishenka0704: - admin: separate antagonists from living player, and add another field with security info 2022-10-25: -<<<<<<< HEAD Ebin-Halcyon: - imageadd: Anthropomorphic mammal's digitigrade legs have had the weird black splotches removed from them, their chests have been tweaked slightly to fit the basic @@ -2040,7 +1621,6 @@ - bugfix: Void-raptor detective office now has their staple camera console - bugfix: Void-raptor Customs camera console is usable 2022-10-26: -======= ArcaneMusic: - bugfix: Paper hats now display properly when worn. GoblinBackwards: @@ -2067,7 +1647,6 @@ GoblinBackwards: - bugfix: Fixed getting stuck with blurry vision if your eyes were fixed while you were ghosting ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - config: The Generate Job Configuration verb now works as expected when there's at least one job in-game that doesn't exist in the new jobconfig.toml file already. @@ -2083,7 +1662,6 @@ - bugfix: Having the Nuke Disk relocate from your person will no longer keep a ghost image of the disk where it once was, a harrowing reminder of your failures - refactor: Refactored "secluded locations" into a trait -<<<<<<< HEAD MidoriWroth: - rscadd: Added shakiri, a sweet alcohol produced from fermenting kiri fruits, along with 3 cocktails using it. @@ -2099,9 +1677,7 @@ - qol: Humans spawned from a ghost by an admin have their quirks assigned - bugfix: The SpiderClan have resolved an issue where the Ninja Suit would terminate the AI inside during standard usage -======= Paxilmaniac: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: The dmi that reagent holders take fill icons from is no longer hard coded as reagent_fillings.dmi, and can be changed using the fill_icon variable Rhials: @@ -2115,66 +1691,6 @@ (BE CAREFUL WITH THESE). - code_imp: The disease outbreak event has been split into two different events -- "Classic" and "Advanced". The code should be a bit easier to read as well. -<<<<<<< HEAD - - code_imp: The dmi that reagent holders take fill icons from is no longer hard - coded as reagentfillings.dmi, and can be changed using the fill_icon variable - - bugfix: Ian once again celebrates his birthday on Kilo, and new year on Icebox - - qol: Add AltClick to remove pAIs for tablets. Added balloon alerts to tablets - for inserting/removing objects. - - rscadd: People wearing kitty ears can now have their tails pulled. - - bugfix: Fixed getting stuck with blurry vision if your eyes were fixed while you - were ghosting - Zergspower: - - qol: Space Hotel - remade all rooms, moved Solars and dock to the south and managers - office next to the entry for the hotel rooms - - qol: Space Hotel - Many many many many changes to the overall look and feel, - from carpets/walls/colors/rooms - - qol: Space Hotel - Staff now have a bit more control over the - - bugfix: Space Hotel - fixed couch direction bug in lobby - - bugfix: Space Hotel - broken clothing/spawners and decals - - rscadd: Space Hotel - New keyed doors specially made for the hotel! No key? No - Room! - - rscadd: Space Hotel - New Door Sprites/coloring and function - - rscadd: Space Hotel - New Permanent Portal creator for the manager to place a - static portal for easier transition from station to Hotel - - rscadd: '' - - qol: Mass redesign of the Interdynefob ruin aka DS-2 - focusing on shrinking down - unused areas and optimizing each rooms size. - - bugfix: interdyne fob - A lot of minor duplications and errors, mostly with cables - and piping -2022-10-27: - Guillaume Prata: - - balance: After a CentCom Quartermaster mistakenly filled a NT warehouse with thousands - of Forensics Scanners. CentCom has decided to remove the Forensic Scanner's - design from protolathes. If you need a new scanner please order it from cargo. - - balance: Arcade machines will dispense arcade tickets now instead of a direct - prize. Slap them back into the machine to trade for the prizes or collect as - many as you can to show of how much of a gamer you are! - Melbert: - - bugfix: Fixes some basic mobs being immune to damage from atmos effects - - code_imp: A few bespoke elements are now properly passed static lists to stop - them from creating tons of instances. - - balance: The chapel's confessional intercom is locked to its initial frequency, - but an emag could bypass it. - RimiNosha: - - rscadd: 'Added quirk sanitization. remove: Removed Foreigner. You are able to - recreate this quirk almost exactly via removing common, and optionally giving - yourself a recorder via loadout.' - ShizCalev: - - bugfix: pdas now use the pda worn icon again. - - bugfix: Pipecleaner coils are no longer invisible. - - bugfix: Pipecleaners will now how have correct color when split. - SkyratBot: - - bugfix: Blind people can see footsteps again when on lower station levels. - - bugfix: Fixed 2 unconnected pipes in Tramstation atmos - - bugfix: Carrying a null rod no longer disables the ability to use the traitor - chef's meat hook - - bugfix: fixed ai controlled monkeys causing runtimes when they attempt to give - items - - imageadd: BRAND SPANKING NEW SYNDICHAD OPERATIVE HUD RESPRITE. - - bugfix: Fix table contextual screentips for tools - - bugfix: Fix cyborgs dropping items when sent to the arena shuttle -======= SeigaSeiga: - bugfix: Carrying a null rod no longer disables the ability to use the traitor chef's meat hook @@ -2203,7 +1719,6 @@ - bugfix: fixed ai controlled monkeys causing runtimes when they attempt to give items JohnFulpWillard: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Tablet hard drives no longer exist. Applications are now stored directly onto the tablet. - balance: Building a modular computer with metal now should be a proper functioning @@ -2211,60 +1726,10 @@ - balance: The R&D's Master system hard drive is now a data disk, if ever you need one that desperately. - bugfix: Tablets (not Cyborg ones) now have pens again, like they had before. -<<<<<<< HEAD -2022-10-28: - Guillaume Prata: - - qol: Miners rejoice again!! A few of the mostly useless and spammy messages that - get send to your chat were changed to balloon alerts or straight up removed. - Hopefully, you will have an easier time listening to the radio chatter now. - ShizCalev: - - bugfix: fixed screwdriver pens not working properly when extended/retracted. - - code_imp: Added a unit test to catch items that can be equipped to suit slots - have missing textures. - SkyratBot: - - qol: Stabilizing serum (the item for stabilizing legion cores) now fit in explorer's - webbings. - - bugfix: On tramstation, the syndicate has returned the scrap thrusters they stole - after realizing they were broken anyway. - - qol: Nanotrasen realized they forget to implement the date function into the new - NTos tablets, so they doubled back and added those next to the time. - - rscadd: Adds the NTSS Shadow Emergency Shuttle - - rscadd: Adds the Emergency Shuttle Engine area - - spellcheck: Remove cloth golem antimagic description - - bugfix: fixed SM bricking when you dump gases without effects like halon into - it. -2022-10-29: - Iamgoofball: - - spellcheck: Renames Bouncer to Service Guard - - bugfix: Blueshields and Guards were erroneously added to Security OOC access despite - not being members of Security nor answering to Security in any fashion. This - has been resolved. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Heretics spawn with a new spell, Shadow Cloak. Using it will hide your identity for 3 minutes or until cancelled, but is fairly obvious otherwise, as it shrouds you in purple smoke. -<<<<<<< HEAD - OrionTheFox: - - bugfix: fixed a ton of broken digi sprites, sorry it took so long x-x - Paxilmaniac: - - balance: forged armor vests can now hold forged weapons - - imageadd: Minecarts, and some associated items, have been given a bit of a sprite - improvement - ShizCalev: - - qol: Converted buckets (and naturally cleanbots) over to GAGs. - - bugfix: Cleanbots built with a wooden bucket will now properly drop a wooden bucket - when destroyed. - SkyratBot: - - bugfix: Reagent containers playing attack animation when transferring reagents - to deep fryers - - imageadd: Centcomm has found the lost box of striped straws for ALL the milkshakes. - - bugfix: Nukies and roboticists access the correct missile types again. - - refactor: Cleans up the missile subtypes. - - balance: Renames the BRM-6 to the PEP-6, and makes it explode...a lot of the stuff - that it claims it should explode. -======= - balance: The chapel's confessional intercom is locked to its initial frequency, but an emag could bypass it. - bugfix: Fixes some basic mobs being immune to damage from atmos effects @@ -2276,39 +1741,10 @@ - bugfix: Pipecleaners will now how have correct color when split. Tastyfish: - bugfix: Blind people can see footsteps again when on lower station levels. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vladoricious: - bugfix: Airlock and decal painters no longer mysteriously float around you. - bugfix: The Science Team at [REDACTED] has untangled the quantum state of pizza and pasta. In short, ERROR custom spaghetti is no longer on the menu. -<<<<<<< HEAD - Zonespace27: - - bugfix: Fences no longer say they can have barbed wire put on them - softcerv: - - bugfix: 'alter form now properly accounts for oversized: users now have the option - to return back to being oversized after changing their sprite size.' - - bugfix: oversized is now removed from a user when they change their sprite size - via alter form, and is given back when they return to the oversized size. -2022-10-30: - Jolly: - - qol: There are now arrival shuttle monitors located at.. arrivals! - Melbert: - - bugfix: Fixes a runtime with Wendigo's slam - - bugfix: Roaches will actually eat ants - - bugfix: Rats can be multicolored now, like mice - - bugfix: Rats, when they die, become pick-up-able items like mice - - refactor: Refactored mice / rats into basicmobs. - Paxilmaniac: - - qol: The wargaming kits now spawn with a set of example rules, ships, and starting - scenarios for anyone trying to get into the game! - ShizCalev: - - bugfix: holding someone up at gunpoint will no longer allow you to fire automatic - weapons at double RPM. - - bugfix: you can no longer one-shot kill people with the russian revolver by holding - them up. - SkyratBot: - - bugfix: 'The #cargobus channel now has all the department consoles again.' -======= axietheaxolotl: - imageadd: BRAND SPANKING NEW SYNDICHAD OPERATIVE HUD RESPRITE. san7890: @@ -2323,15 +1759,10 @@ have missing textures. 2022-10-29: ArcaneMusic: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The Export Scanner, Sales Tagger, and Price Tagger have been merged together into the Universal Scanner. - qol: Using the Universal Scanner in-hand allows for switching between the three tools functionality on the fly. -<<<<<<< HEAD - - bugfix: Tramstation science now has the 20 glass instead of 1. - - balance: Limits how much of the heirloom objective you can get within 10 minutes. -======= Melbert: - bugfix: Roaches will actually eat ants - bugfix: Rats can be multicolored now, like mice @@ -2345,7 +1776,6 @@ - bugfix: Consciousness Transference potions now tame the target creature, just like Sentience potions. Watermelon914: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Refactored how duplicates are handled in traitor objective code. This will fix destroy heirloom and eyesnatching objectives from only ever being available once. @@ -2353,57 +1783,6 @@ - bugfix: Fixed eyesnatching objectives never generating. - balance: Kidnapping objective can only be taken a maximum of 3 times within 15 minutes. This puts it in line with the assassinate and eyesnatching objectives. -<<<<<<< HEAD - - bugfix: The infiltrator modsuit properly hides tails. - - refactor: Dueling pistols have been refactored to be less prone to runtimes. - - bugfix: wendigo ground slam no longer a global proc - SomeRandomOwl: - - admin: Fixed the Play Internet Sound Variable To now include the song name in - the chat box Now Playing Widget. - Vladoricious: - - bugfix: Consciousness Transference potions now tame the target creature, just - like Sentience potions. - dawsonkeyes: - - balance: kinetic crusher no longer spawns in the marked ones arena - - bugfix: the marked ones spin attack is no longer faulty, he is now a beyblade - again - softcerv: - - code_imp: cleans up dorm vendor code -2022-10-31: - Gladi-Writes: - - rscdel: Paperwork Error random event. - LovliestPlant: - - rscadd: VoidRaptor - adds cafe in off of departures hallway - - rscadd: VoidRaptor - moves russian bar to departures maints - - rscadd: VoidRaptor - moves drone bay to sit near mining office - - rscadd: VoidRaptor - adds mining office foyer - - rscdel: VoidRaptor - replaces external airlock in departures EVA room with maints - access - - qol: VoidRaptor - rearranges mining office - - bugfix: VoidRaptor - fixed sec deliveries - - bugfix: VoidRaptor - fixed cargo disposals - Melbert: - - bugfix: Fixes Latejoin Revolution from triggering very commonly - MidoriWroth: - - qol: Added a YouTool and Syndicate clothing vendor to the Cafe - - qol: Added the imported food vendors to the Cafe - - qol: Gave the Cafe back some minerals for special drinks - ShizCalev: - - bugfix: Microwaves are now less likely to break if things inside of it are deleted. - SkyratBot: - - qol: makes borg light range at least the minimum useful light range - - bugfix: The QM now has a statue, as all other heads have statues. - - rscadd: Powercreeps the CMO by giving them a laser pointer - Zonespace27: - - rscdel: The Vanguard job has been removed - - rscadd: Surplus (nerfed) Vanguard gear can be bought from a misc. crate in cargo - for 3600 credits. - jjpark-kb: - - rscadd: added banishment and revive animal ash rituals - - admin: completed rituals are now logged - - bugfix: ashwalkers can revive again from the tendril (works differently) - - rscdel: removed the corrupted-ash lantern (was for when lanterns had batteries) -======= timothymtorres: - bugfix: Reagent containers playing attack animation when transferring reagents to deep fryers @@ -2452,4 +1831,3 @@ - bugfix: Microwaves are now less likely to break if things inside of it are deleted. Vishenka0704: - admin: adds a PDA Message verb in Events ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-11.yml b/html/changelogs/archive/2022-11.yml index 014b76cfef0..ee8a9696154 100644 --- a/html/changelogs/archive/2022-11.yml +++ b/html/changelogs/archive/2022-11.yml @@ -1,5 +1,4 @@ 2022-11-01: -<<<<<<< HEAD Foxtrot (Funce): - bugfix: You can now select a recipient in the message monitor "admin send message" menu again @@ -116,9 +115,7 @@ mask was temporarily adjusted. - bugfix: Fixed a bug which caused the anesthetic machine to keep working if its mask was adjusted when the user had another breathing apparatus equipped. -======= A.C.M.O.: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Hermetically sealed and space-worthy helmets can now be used as breathing apparatuses! - rscadd: Internals air tanks can now be toggled via AltClick. @@ -131,8 +128,6 @@ if the mob only had a breathing tube. - bugfix: Fixed a bug that allowed two mobs to breathe from the same air tank after exchanging it between them. -<<<<<<< HEAD -======= ArcaneMusic: - bugfix: Berserker Suit helmet now has the correct sprite. - rscadd: Adds a new item that can be purchased from the black market uplink, the @@ -186,7 +181,6 @@ ATHATH: - spellcheck: Updated the reagent dartgun's uplink description to reflect its current reagent capacity (90u). ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou: - qol: the mech orbital pad now no longer deorgans you if you stand on it while it launches upward, now gibbing (!!!), but only when a mech falls on you @@ -197,7 +191,6 @@ as opposed to only being able to do it with weapons equipped - rscadd: you can now lock mech orbital pads with wirecutters, preventing mechs with pilots from launching, allowing only empty mechs -<<<<<<< HEAD Guillaume Prata: - qol: The forensic scanner uses balloon alerts for most of it's simple feedback messages, enjoy having an easier time hearing the radio chatter. @@ -331,7 +324,6 @@ Guillaume Prata: - qol: Ore bag balloon alerts have a 2 second cooldown now and a spammy message (hopefully the last) it send to your chat about being full was removed -======= - qol: sniper scopes and kinesis module should feel better to use Sealed101: - bugfix: removed misplaced unrestricted access from Lavaland Shuttle Airlocks @@ -386,7 +378,6 @@ - bugfix: makes beeping sounds work on mechpads when used by a mech GoblinBackwards: - qol: Space Ninja now has their MODsuit module buttons pinned by default ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Chefs can now make food with love. They can purchase a skillchip from their vendor which enhances their kiss emote. Using your kiss on food you create @@ -398,7 +389,6 @@ - refactor: Refactored how edible items inherit new edible statuses - code_imp: Removed some magic numbers from microwaves - code_imp: General code improvements for grillable / bakeable / etc -<<<<<<< HEAD - code_imp: Unremovable organs that are forcemoved out of a mob with an owner no longer self terminate RimiNosha: @@ -446,7 +436,6 @@ system. Pre-existing preferences should be safely migrated but players are advised to check. 2022-11-12: -======= ShizCalev: - code_imp: Riot helmets and justice helmets are now in a /toggeable subtype. Tastyfish: @@ -547,7 +536,6 @@ GoldenAlpharex: - bugfix: SpaceMessenger was now updated to 6.4.8, bringing you more responsiveness than ever (so long as ever is shorter than seven days ago)! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jacquerel: - qol: More actions should report why they are unavailable if pressed while they are unavailable. @@ -556,40 +544,6 @@ - bugfix: Spider broodmothers can now only lay one enriched egg per victim. - bugfix: Spider broodmothers can no longer feed multiple times from the same corpse, a bug they never previously needed to exploit because of the previous bug. -<<<<<<< HEAD - Tattle: - - admin: added investigate deaths to shed some more light on unusual demises, dustings, - and gibbings - itseasytosee: - - refactor: Elements of unarmed strikes are now limb dependent instead of species - dependent. Go rip off an ethereal arm, sew it onto yourself, and burn some people. -2022-11-15: - Iamgoofball: - - bugfix: You can no longer attach igniters to igniters. - SkyratBot: - - rscdel: You can no longer craft explosive lances. -2022-11-16: - Ebin-Halcyon: - - imageadd: A bunch of underwear has been resprited, take a look. - Ghommie: - - balance: Holocarps now cost as much as holoparasites. Basically the same, just - fishier. - GoldenAlpharex: - - bugfix: Ghost role spawners no longer spawn a naked human while waiting for you - to click "Yes" to the fact that you want it to use a character from your preferences. - - rscdel: The Syndicate has seen one of their supply lines in a more remote part - of the Frontier seized up by a local militant group, resulting in them no longer - being able to offer the thieving gloves in their uplink catalogue for the foreseeable - future. - - bugfix: Normal pillows can finally be fabricated using three pieces of cloth, - as intended. As a result, fancy pillows have been properly renamed to "fancy - pillow" in the cloth crafting menu. - Jolly: - - bugfix: Active turfs for the Space Hotel have been rectified. The solars shouldn't - smell like that contain oxygen anymore. - - bugfix: Space Hotel solars is now a defined area, as is customary with almost - every other map. -======= JohnFulpWillard: - bugfix: Detomatix cartridges are no longer called attacking items. Sealed101: @@ -693,61 +647,10 @@ under a window. You're welcome atmos techs. Kapu420: - bugfix: makes masks not render when something is supposed to obscure them ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MTandi: - bugfix: Cleanbots properly prioritize adjacent trash - qol: Cleanbots now clean floor under the tables - qol: Cleanbots now clean more types of trash -<<<<<<< HEAD - OrionTheFox: - - bugfix: fixed Pepperball ammo boxes being invisible when they had actual ammo - in them. Should be able to actually... uh, use them now. - Paxilmaniac: - - balance: After a multitude of industrial accidents, and resulting lawsuits against - Nanotrasen, the ripley mark 2 has had its in-atmosphere speed limiter re-added. - - balance: Recent job safety regulations have required that power limiters be placed - on plasma cutter equipment, as a result plasma cutters, hand held and mech mounted, - will cause significantly less harm when fired at anything that isn't rocks. - - rscadd: The ash walker den for lavaland has been remapped! - - balance: not really balance but if you somehow get your hands on raw stone, you'll - need to use a chisel or a mining tool to cut them into bricks, rather than smelting - them. - - imageadd: ore veins, raw stone, stone bricks, and stone walls all have new sprites - SkyratBot: - - imageadd: the advanced military tracksuit has been resprited. - - bugfix: Lobstrosity Rush Glands now correctly apply their action cooldown when - they trigger from low health. - SpaceLove, Edgar-Allen-Shitpoest: - - rscadd: CC has started to hire security cadets now! - Tastyfish: - - bugfix: A few clothing items work better with digi characters again. -2022-11-17: - GoldenAlpharex: - - bugfix: Plant-based cells will no longer show an error sprite if the plant it's - made out of has its sprite located in a different file than all of the other - plants. - - bugfix: Bubbles no longer re-appear when you change z-levels after getting cleaned. - Now they leave for good! - - bugfix: After a lot of troubles, Nanotrasen's scientists finally managed to make - it possible to grow arms and legs out of the limb grower once more, giving sense - back to the machine's name. - Kapu420: - - bugfix: makes masks not render when something is supposed to obscure them - ShizCalev: - - bugfix: Fixed anomalies not spawning when invoking the apocalypse rune - SkyratBot: - - admin: '"adminmoreinfo", or the read-out of a mob that you can get when you hit - the (?) button next to the name of a given mob has been cleaned up a bit to - make the data-at-a-glance much more presentable.' - - bugfix: Made clown and mime survival boxes contain the correct internals tank - for plasmamen. - - bugfix: Fixed disposals pipes qdel-ing their contents when their integrity hits - zero. - - bugfix: Clown PDA virus disk can once again be installed in machines, computers, - and airlocks. - - bugfix: You can no longer fold a glass pickle jar into cardboard. It will also - no longer recycle into cardboard as well. -======= Rhials: - spellcheck: the Organic Space Suit purchase text now informs the buyer that it regulates oxygen needs automatically. @@ -856,49 +759,11 @@ flowercuco: - bugfix: Boxcutter is only the knife tool when it is active - bugfix: Switchblade is now a knife tool when it is active ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: the punching bag, bench press, and chest press are all able to be crafted and unanchored. - rscadd: crafting recipes for the above - qol: changed a chat message into a balloon alert - qol: adds screentips to equipment (thanks for suggesting i do this mothblocks!) -<<<<<<< HEAD - - spellcheck: the Organic Space Suit purchase text now informs the buyer that it - regulates oxygen needs automatically. - - bugfix: Dead Black Space Rabbits should now properly have a sprite. - - bugfix: Fix pacifists being able to slice necks - - bugfix: Boxcutter is only the knife tool when it is active - - bugfix: Switchblade is now a knife tool when it is active - - refactor: defines a new global proc, pick_weight_recursive() - - code_imp: languages can weight syllables, and galactic common's definition is - easier to look at - - qol: giant chains now go above mobs - - bugfix: Microwaves no longer shit out their upgraded parts when cooking stuff. - - bugfix: togglebuildmode now properly logs when given to other players. - - balance: Tablets now use regular cells instead of computer cells. - - balance: Tablets no longer need a power cell component to hold power cells. - - admin: Whenever a simple_animal is forced to speak via handle_automated_speech, - their "FORCED" variable in logs should appropriately represent the proc it was - called from- instead of being "poly" for whatever reason. - VexingRaven: - - bugfix: Soul Scythes can no longer phase through the floor into Centcom. - tattle: - - bugfix: mimes no longer swear when using the *swear emote - - admin: death details of keyless mobs (like xenobio monkeys) are now omitted from - investigate deaths -2022-11-25: - Cenrus, ported by Hardly: - - rscadd: Added *snap emote - GoldenAlpharex: - - bugfix: Modular computers will now no longer all be called "processing unit", - and will all have their own unique names once again. - LT3: - - bugfix: Tram signs glow instead of being harsh blocky. - - rscadd: Engineers now have expanded airlock access during orange alert for responding - to emergencies. - - rscadd: New lights added to airlocks indicating engineers have expanded access - during orange alert. -======= lizardqueenlexi: - bugfix: Made clown and mime survival boxes contain the correct internals tank for plasmamen. @@ -1289,13 +1154,11 @@ - admin: Researching nodes and bepis unlocking stuff is now logged in research. LemonInTheDark: - bugfix: You can now see antag hud icons AND see through walls. WOW ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Fixed an exploit involving igniters attached to themselves. Assembly holders are now limited to 12 assemblies maximum, and you cannot attach multiple igniters to the same assembly. - refactor: Refactored some assembly jank, namely in how they pulse and are pulsed. -<<<<<<< HEAD PositiveEntropy: - imageadd: Updates the Military, Bomber and Letterman Jackets - bugfix: Fixes the centcom hat, cap and head intern cap, which were using the old @@ -1304,18 +1167,13 @@ - bugfix: Fixes a NTPay exploit. - imageadd: Resprited rice, sugar, and flour sacks - bugfix: Curd cheese can be microwaved again into cheese curds -======= Roryl-c: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Flypeople gain a comparable amount of nutrients from vomited food to other species (~70%, up from ~30%) - bugfix: Flypeople no longer vomit after drinking fluids - bugfix: Flypeople no longer vomit all contents of their stomach on spawn - code_imp: Stomachs can now react to foods entering them by overriding the `after_eat` proc -<<<<<<< HEAD - - admin: Researching nodes and bepis unlocking stuff is now logged in research. -======= disappointedButNotSuprised: - bugfix: Curd cheese can be microwaved again into cheese curds etherware-novice: @@ -1343,14 +1201,12 @@ - bugfix: Fixes the centcom hat, cap and head intern cap, which were using the old sprites. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: checks while inserting stack materials into an RPED and their amounts - code_imp: sorting of RPED part components to sort stack materials by their ratings - rscdel: 'old way of displaying parts when clicking on an machine frame with it add:new way of displaying part info which displays number of parts including for stack materials' -<<<<<<< HEAD - rscadd: Added two sets of coordinates to the checkers and chess modules for the holodeck. - qol: you get access to the next storage ui row 1 item earlier @@ -1363,7 +1219,6 @@ - bugfix: Delta's Port Bow Solar is now correctly labelled. - bugfix: Wall mounted vendors can no longer receive brand intelligence. - bugfix: limits how much you get alerted by icebox storms -======= ZephyrTFA: - bugfix: Strange Reagent is once again Strange! (it works at all) flowercuco: @@ -1416,7 +1271,6 @@ MTandi: - bugfix: biogenerator now properly gives non-stackable items - refactor: biogenerator backend optimization ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: You can stick IV drip into anything that is a reagent container (injection only) - qol: IV drip transfer rate can be zeroed to stop the flow without removing the @@ -1428,7 +1282,6 @@ max - qol: IV drip UI update - rscadd: You can craft IV drip with 2 rods, 1 plastic sheet and a syringe -<<<<<<< HEAD - bugfix: You can now see antag hud icons AND see through walls. WOW - bugfix: Wirecarp now lets you give people mass PDA perms again. - balance: Paramedics get to have mining station access @@ -1452,18 +1305,15 @@ Tastyfish: - qol: All skyrat leather belt and bandolier recipes are now in the belts category, as they should be. -======= Rhials: - bugfix: you get your keys upon removing them from a car now! - balance: the clown car now crashes upon ramming into a deer, like god intended. - bugfix: Wall mounted vendors can no longer receive brand intelligence. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 VexingRaven: - bugfix: Ashwalker Eggs and Battlecruiser spawners no longer give you a warning every time you open the spawn menu if you've already spawned as that role once. - spellcheck: Ashwalker Egg warning message for having already spawned once is no longer bolded for no reason. -<<<<<<< HEAD zydras: - rscadd: DS-2 has been fully retrofitted into a working spaceship and have had their ID trims fully updated. @@ -1538,7 +1388,6 @@ - imageadd: Added missing coin projectile sprite for the marksman revolver SkyratBot: - bugfix: Fixed being unable to open the necropolis gate when standing behind it -======= etherware-novice: - bugfix: limits how much you get alerted by icebox storms theOOZ: @@ -1565,21 +1414,17 @@ - bugfix: nanotrasen mug no longer becomes normal mug after you drink from it 2022-11-28: RikuTheKiller: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Nooartrium doesn't blind you anymore and keeps you conscious regardless of oxyloss. - bugfix: Being immune to hardcrit makes you able to hear while you should be in hardcrit. -<<<<<<< HEAD - bugfix: roundstart empty mugs now appear to be empty - bugfix: nanotrasen mug no longer becomes normal mug after you drink from it - qol: pdas have a wrench deconstruct screentip - bugfix: wrenching a pda no longer destroys all contents inside -======= Ryll/Shaps: - imageadd: Added missing coin projectile sprite for the marksman revolver necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'Splits the nuclear operative combat medical kit into two versions: basic and premium.' - balance: Basic contains additional amounts of basic c2 chem patches, some spare @@ -1596,7 +1441,6 @@ box. - rscadd: I'm not telling you to read the pamphlet, but you should probably read the pamphlet. -<<<<<<< HEAD - balance: Obsessed has been bumped up to a Deep-Rooted Brain Trauma - balance: Mind Restoration can't remove deep-rooted traumas, making Obsessed unremovable by virusses @@ -1610,20 +1454,17 @@ unit0016: - bugfix: Skyrat's ID trims are now recolorable, as they are upstream. XOXO. 2022-11-29: -======= supergrog2: - bugfix: fixes grilles dropping stack of 0 iron rods 2022-11-29: Auris456852: - bugfix: Makes Miner's Salve HUD screw not permanent. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Common fucking sense: - bugfix: The changes to Mafia and holopad say prefixes was reverted. - spellcheck: Mafia changeling say prefix has no longer been changed to .1, and has been returned to .j - spellcheck: AI Holopad say has no longer been changed to .2, and has been returned to .h -<<<<<<< HEAD Jolly: - bugfix: '[Void Raptor] There are now disposal units in the Law and Detectives offices. This means you can receive mail (unwillingly). Have a pipe bomb, detective.' @@ -1660,7 +1501,6 @@ - spellcheck: removed a reference to radiation collectors in tip of the round - refactor: Moves wall smashing out of simple mob code and into an element we can reuse for basic mobs later -======= Ghommie: - bugfix: pAIs and lightgeists can now correctly climb ladders. - bugfix: fixed a small issue with the radial menu for ladders that caused the user @@ -1677,17 +1517,14 @@ Thunder12345: - bugfix: TTV bombs can no longer be concealed inside food epicgamer545: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Nanotrashen made some top-of-the-line changes to their top-of-the-line prison by walling off their equipment area and removing some spare guns they somehow left on the tables. We also stole the security computers, so people with telekinesis can't access them. -<<<<<<< HEAD Tattle: - admin: removed message_admins message for tram malfunction failing to run on maps that aren't tram 2022-11-30: -======= etherware-novice: - qol: quantum keycards light up with the department theyre in (or grey as a fallback) - qol: quantum keycards are custom renamable w/ pen, to help keep em organized @@ -1712,7 +1549,6 @@ - rscadd: Psykers. Become a psyker through the path of the burdened, or a genetic breakdown. - rscadd: Echolocation Component. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - refactor: Went through and refactored a lot of the old code of the biogenerator, and made multiple improvements to its logic, which should hopefully make it @@ -1731,7 +1567,6 @@ recipes. - spellcheck: Fixed multiple inconsistencies between the messages sent to your chat by the biogenerator. -<<<<<<< HEAD Jolly: - bugfix: '[Void Raptor] Maintenance area defines now border maintenance doors. TLDR; if the power goes out in maint and you''re engulfed in a fire, better @@ -1753,7 +1588,6 @@ shuttle is heading towards the station no longer breaks space-time. Zonespace27: - rscdel: Abductors no longer have an objective to abduct a certain amount of people. -======= MTandi: - bugfix: IV drip can be zeroed via UI, not just alt-clicking Melbert: @@ -1793,4 +1627,3 @@ - bugfix: You no longer cut into mechs with wreckages with crowbars, you pry parts from them. Duh. - bugfix: Mech material salvage matches their construction materials. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2022-12.yml b/html/changelogs/archive/2022-12.yml index 7e5aff3e556..32c6aca023b 100644 --- a/html/changelogs/archive/2022-12.yml +++ b/html/changelogs/archive/2022-12.yml @@ -1,117 +1,14 @@ 2022-12-01: -<<<<<<< HEAD - Capybara Holly: - - refactor: Allows datum AI to create new plans while a plan is still executing - Capybara holly: - - bugfix: After rigorous training excercises monkeys now understand how to defend - themselves from vile greytiders again -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - refactor: Refactored the way the undertile component works, to allow it to have a bit more granularity as to when it's meant to be covered, but still visible, like for catwalks! - bugfix: Catwalks no longer are affected by ambient occlusion, and now properly feel like actual floor tiles. -<<<<<<< HEAD - SkyratBot: - - bugfix: normal toolboxes can't hold fishing rods anymore - Zenitheevee: - - balance: Smuggler Satchels contraband pool has been rejangled. - Zergspower: - - admin: new laws for silicon to match policy changes -2022-12-02: - Capybara Holly: - - refactor: Datum AI can now switch to different movement datums in their behavior. - GoldenAlpharex: - - bugfix: Cleaning will now once again show bubbles on what's being cleaned! - LT3: - - bugfix: All the tram platform tiles are now actually tram tiles. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Refactored deep fried foods. Deep fried foods are still ""usable"" as their normal item, but are just edible. - qol: Silver Slime stuff can spawn grilled as well as fried. -<<<<<<< HEAD - - code_imp: Cuts some uses of allowed list as a typecache. Allowed lists are not - typecaches, don't make them typecaches - - bugfix: VVing an edible comp's food flags pulls up the bitfield ui correctly - - bugfix: Fixes dragon despawn deleting all the people they consumed - OrionTheFox: - - bugfix: fixed the hi-vis labcoat and secmed labcoat having the wrong blood overlay, - and hospital gowns not properly hiding genitals - - imageadd: in a continued organization effort, all skyrat Labcoat sprites have - been moved to suits/labcoats.dmi files. Please report any relevant issues! - Paxilmaniac: - - rscadd: The tailored jacket now has a shorter variant that doesn't go as far down - as the original does. - ShizCalev: - - bugfix: Full mugs no longer appear empty in the map editor. - SkyratBot: - - bugfix: fixed lizard markings incorrectly displaying when strapped to a guillotine - - code_imp: guillotine's blade drop sound is now a variable - - bugfix: Bots no longer get stuck behind windoors and firedoors when they could - go through them in some way. - - rscadd: You can add grenades to food - - rscadd: Grenades explode when accidentally bitten into - - balance: Adding something large to custom food will make it, too, also large - - bugfix: Fixed reactions being broken in the EXPERIMENTOR or something I don't - actually know what this thing does - - bugfix: IV drip can be zeroed via UI, not just alt-clicking - - imageadd: Unique inhands for the ion carbines - - bugfix: Makes sure that the ion carbine has a defined worn sprite. No longer pink! - - rscadd: Shaft Miner's equipment vendor now orders their equipment through the - Cargo shuttle, though you can spend 1.5x the points to express it, making it - a Mining version of the Chef's produce console, with a weakened express tax. - - bugfix: TTVs can have an explosive reaction from deepfrying. - - rscadd: You can now reinforce plating to protect your department from the troublemakers - upstairs. Station builders might find these useful to put the stations most - secure locations on the lower floors. - - imageadd: added sprites for reinforced plating - - code_imp: RCD proofing has been variablized and can now be applied to any floor - type instead of just reinforced floors. - - bugfix: You no longer cut into mechs with wreckages with crowbars, you pry parts - from them. Duh. - - bugfix: Mech material salvage matches their construction materials. - - rscadd: 'New Station Trait: Cybernetic Revolution' - - rscadd: Body Purist Quirk - - bugfix: Fix unnecessary mole scaling with gas turbine gas thermal energy loss - from work done. - - bugfix: The gas turbine no longer creates power from thermal energy it can't take. - - bugfix: fixes using body purist with quadruple amputee - - rscadd: radios have overlays for showing broadcasting settings - - rscadd: plumbing constructor TGUI, just like Rapid Pipe Dispensers - - rscdel: plumbing constructor radials - - code_imp: categories for each item - - bugfix: pAIs and lightgeists can now correctly climb ladders. - - bugfix: fixed a small issue with the radial menu for ladders that caused the user - to travel down when abruptly closed. - YakumoChen: - - rscdel: Removed power cell req from megaphones - distributivgesetz: - - qol: The Chief Engineer's BSRPD now has a toggle feature for remote piping. - theOOZ: - - balance: DeForest company imports now features Vey-Medical's medigun upgrade kit. -2022-12-04: - Erol509: - - imageadd: New Digi version for berserker armor - - bugfix: Fixed the Error icon when trying to get SEVA from mining vendor - GuiltyNeko: - - bugfix: The normal meteor wave event has been de-duplicated - LT3: - - bugfix: 'Fixed an undefined variable in new tram code making the tram not work - as expected. fix: The tram will now again correctly kill you on impact if the - RNG Gods are not on your side.' - Paxilmaniac: - - qol: There is now once again only one type of 9mm, and one type of 10mm, no more - playing the does this ammo type go in my gun game with one of the several rounds - with the same exact naming scheme. - - balance: Coincidentally, all guns that use a 9mm now use the same ammo, similarly - with 10mm firearms, though the damage of the rounds they fire should be very - similar if not the exact same as it was per gun before this pr. - SkyratBot: -======= SyncIt21: - rscadd: plumbing constructor TGUI, just like Rapid Pipe Dispensers - rscdel: plumbing constructor radials @@ -147,15 +44,12 @@ - bugfix: TTVs can have an explosive reaction from deepfrying. 2022-12-03: Hardly3D: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Added griddles and ovens to ruins and away missions such as Deep Storage, Underground Outpost and Beach Biodome. - bugfix: Overhauled beach biodome bar, fixed stools facing the wrong direction, as well as making the bar less boxy. -<<<<<<< HEAD - bugfix: Automated IV drip transfer rate controls now unavailable on injection, since the transfer rate is managed by the plumbing network -======= JohnFulpWillard: - rscdel: Tablets are now removed, PDAs are now the base 'tablet'. Silicon and nukie tablets are now PDAs. @@ -182,7 +76,6 @@ bring the holy trait with them, and wings have new descriptions. should be the biggest parts of it vincentiusvin: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed supermatter rays glowing with an additional yellow ray on special delams. Will only glow blue or purple for tesla and singuloose respectively. - bugfix: got rid of the blue causality box thing from singulo delams. @@ -191,7 +84,6 @@ - code_imp: made the disable_gas var on supermatter preserve the current variables instead of zeroing them. - code_imp: registered the supermatter filters on the filter debug menu. -<<<<<<< HEAD - rscadd: robotics now has access to a mech camera add-on, which installs a security camera into the mech. bodycam footage from the big leagues! - qol: cyborg cameras should be more active with updating static when moving (ideally @@ -233,7 +125,6 @@ - bugfix: Fixed a runtime from alien larva processing after they've gibbed their host. SkyratBot: -======= 2022-12-04: Comxy: - rscadd: Frogs and cockroaches can now be converted to the regal rats army. @@ -253,12 +144,10 @@ via cargo for BIG MONEY. - rscadd: New shuttle loan event variant -- You get a bunch of paperwork! - rscadd: Ancient paperwork has appeared in the maintenance tunnels! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: new admin verb -- Command Report Footnote. Lets you attach a signed message to the roundstart command report. - admin: new admin verb -- Delay Command Report. Lets you delay the roundstart command report indefinitely. -<<<<<<< HEAD - rscadd: You can now cry when in crit - rscadd: Add brave bull now makes you fearless and you can ignore phobias while it's in your system. @@ -269,7 +158,6 @@ due to that. Hatterhat: - bugfix: health analyzer rmb works again -======= etherware-novice: - imageadd: indicator when a pda contains a pai itseasytosee: @@ -284,12 +172,10 @@ you remove modkits one at the time. KittyNoodle: - rscadd: You can now cry when in crit ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Tram turfs will now correctly show damage instead of reverting to a default icon. Melbert: -<<<<<<< HEAD - bugfix: Fixes a runtime when alien larva exploded their host that caused the larva organ to not be deleted afterwards. SkyratBot: @@ -307,9 +193,7 @@ - bugfix: Void Raptor - fixes solar console names 2022-12-07: Melbert: -======= - bugfix: Fixed a runtime from hovering over stuff like bread with an empty hand. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'Heretic: Furious Steel''s cooldown has been doubled (30s -> 60s), and abides by antimagic' - balance: 'Heretic: Cleave''s cooldown has increased by 5s, range has been decreased @@ -318,7 +202,6 @@ - balance: 'Heretic: Void Pull and Phase abide by antimagic' - balance: 'Heretic: Halved Void Blast''s cooldown to 30s' - qol: 'Heretic: Void Blast and Rust Formation now have distinct icons' -<<<<<<< HEAD SkyratBot: - bugfix: Ephedrine now rewards you instead of punishing you for making it pure. - bugfix: queuing clicks should work correctly now @@ -694,10 +577,8 @@ - code_imp: Stamina no longer affects individual limbs. 2022-12-17: Melbert: -======= - bugfix: Fixes a runtime when alien larva exploded their host that caused the larva organ to not be deleted afterwards. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Observers can now see what action buttons an observed mob has. No, you can't click them. And no it doesn't show EVERY action. - refactor: Refactored how action button icons are generated. Some actions will @@ -706,7 +587,6 @@ lookin' icons (namely their borders), let me know. - refactor: Bluespace Golem's teleport action is now a cooldown action. - bugfix: Construct actions go to the middle of the screen like expected. -<<<<<<< HEAD PositiveEntropy, AxieTheAxolotl: - imageadd: Resprites every revolver! - imageadd: Adds the Syndicate Revolver, a visually new, but mechanically identical @@ -786,7 +666,6 @@ - refactor: The logic of how we well, render things has changed. Make an issue report if anything looks funky, particularly layers. PLEASE USE YOUR EYES - imagedel: non parallax space is now black -======= - bugfix: Fixed a runtime from alien larva processing after they've gibbed their host. Mothblocks: @@ -1059,17 +938,14 @@ - bugfix: wearing earmuffs or being deaf while being asleep will increase the healing threshold like its supposed to be SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: RPED part display information - bugfix: RPED incorrectly exchanging parts with the wrong tier for datum stock parts - bugfix: RPED unable to install datum stock parts in incomplete machine frames - bugfix: RPED unable to exchange parts for newly constructed machines Tattle: -<<<<<<< HEAD - bugfix: lockboxes' and wrapped crates' invisibility spell has worn off 2022-12-21: -======= - balance: the foam used in the scrubber overflow has a lifetime of 1s instead of 8s - admin: investigate logs include ckey of source (if applicable) @@ -1243,46 +1119,21 @@ - qol: status panel updates three times as fast - bugfix: shipping containers go above mobs - bugfix: fixes hollow survival pod window spawners ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - qol: After 3 years of complaints at CentCom's uniform department. Paramedics have been given a jumpsuit/skirt that can be adjusted around their waist instead of just folding it's sleeves, making surgery easier for their fellow doctors. -<<<<<<< HEAD - SkyratBot: - - rscadd: The followers of Regal Rats will now respond to simple instructions, if - given by their rightful lord. Except frogs. They're too busy licking themselves - and watching the colours. - - bugfix: When you unwrench a flag, you should now no longer see the big flashy - red ERROR sign. -======= Holoo-1: - bugfix: Moves virology fridge on nukie base in to a wall LemonInTheDark: - code_imp: Roundstart "starting" should be much snappier now NamelessFairy: - admin: Stuffing people inside lockers is now logged. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - spellcheck: Admin fax report names now default to standard report rather than standart. - rscdel: Central Command can no longer be faxed directly from fax machines. - spellcheck: Replaced the ability to contact central command directly by being able to contact a randomly selected nanotrasen department. -<<<<<<< HEAD - - bugfix: Machine frames will no longer ask for "s" in place of some components -2022-12-22: - LT3: - - qol: Tramstation medbay treatment center now has a tram collision counter. - Paxilmaniac: - - rscdel: The cockpit on cargo shuttles has been removed, rejoice for you will no - longer have orders mysteriously lost under the chairs. - SkyratBot: - - bugfix: Made the external smartfridge in the Tramstation pharmacy accessible from - inside. - - rscadd: Add space vines prevent solar panels from working (except ones with the - transparent mutation) - - rscadd: Add new space ruin - Cyborg Mothership. All hail the master race! -======= PositiveEntropy, AxieTheAxolotl: - imageadd: Resprites every revolver! - imageadd: Adds the Syndicate Revolver, a visually new, but mechanically identical @@ -1309,7 +1160,6 @@ - balance: limits the power miners the dusty shard can summon to charger, protector, ranged, standard and support GoldenAlpharex: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added the *hand emote, which you can offer to someone standing up in order to give them the possibility to grab onto your hand and let you drag them away, or to someone lying down to help them back up, which always makes everyone involved @@ -1318,41 +1168,6 @@ alert code, to make it require a lot less copy-paste to handle new cases. - bugfix: Offering a kiss no longer requires the receiver to have free hands to accept said kiss! -<<<<<<< HEAD - - bugfix: Nanotrasen will now no longer mount the HoPline's Ticket Machines on windows - for Meta, IceBox, and Tram. - - bugfix: Moves virology fridge on nukie base in to a wall - Zergspower: - - bugfix: MetaStation - Removes stray pipe found under the courtroom door - - bugfix: Space Hotel - Mass Driver direction - - bugfix: Void Raptor - Virology lost the wall inside the doorway, sorry no more - extra privacy - - bugfix: Void Raptor - Multiple stray disposals pipes in Cargo/Departures/Arrivals/Security - are now gone - - bugfix: Void Raptor - Missing cargo mailer is now no longer missing - - bugfix: Tram Station - Fixes the stray Disposal pipes in Medbay -2022-12-23: - LovliestPlant: - - bugfix: '[Voidraptor] Resolves the missing christmas tree. Have a merry Spessmass - and a happy new year!' - ShizCalev: - - bugfix: Santa now spawns with the actual space capable hat again! - - bugfix: Fixed the claustrophobia trait not recognizing Santa's real hat. - SkyratBot: - - bugfix: After a recent mishap with a high-ranking Syndicate operative, the uplink's - unlock code and failsafe code (the one that makes it blow up if you say it) - should never turn out to be the same. -2022-12-24: - GoldenAlpharex: - - bugfix: Everything that goes on the tram should look a lot less flat now! - Jolly: - - bugfix: The recently added holiday posters will now spawn, if the given (few) - holiday criteria match. - Oxotnak: - - bugfix: fixed name of Featherful moth wings sprite. Now they actually have a sprite! - SkyratBot: - - qol: Improve NtOS notepad -======= Jacquerel: - bugfix: Rats will once again attempt to attack windows or other dense objects separating them from their targets. @@ -1390,7 +1205,6 @@ - bugfix: Rats won't continue attacking someone they've been ordered to kill past the point of death. MidoriWroth: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds 32 new foods! - rscadd: You can make vinegar from equal parts water/sugar/wine - rscadd: Tortillas can now be grilled to make hard-shell tacos, which can be used @@ -1398,28 +1212,6 @@ - balance: Uncooked rice is now made from mixing 10 units rice/water in any container, no longer requiring a bowl to do so. Recipes that previously used bowls of rice now need boiled rice and a bowl, instead. -<<<<<<< HEAD - - code_imp: Roundstart "starting" should be much snappier now - Tattle: - - bugfix: crafted foods are logged in the blackbox once more -2022-12-25: - SkyratBot: - - bugfix: Tinacusiate is now possible to make again. - Tattle: - - bugfix: all of the barstools on the Emergency escape shuttle are equipped with - a seatbelt -2022-12-26: - ATHATH: - - bugfix: Pillow smothering now checks to see if the SMOTHEREE has a head, not the - SMOTHERER. - Fat bugs bunny: - - rscadd: Added a glass jaw quirk, that leaves you prone to being knocked out when - hit on the head. - Guillaume Prata, Imaginos16: - - bugfix: You can now adjust medical scrubs for easier surgery on your fellow doctors. - Improvedname: - - bugfix: fixes deltastation vent at brig entrance -======= fikou: - rscdel: chaos holoparasite - rscadd: gaseous holoparasite, it can expel various gases from its body and stabilizes @@ -1470,103 +1262,20 @@ Command. Guillaume Prata, Imaginos16: - bugfix: You can now adjust medical scrubs for easier surgery on your fellow doctors. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Nar'Sie will no longer bring upon the construct apocalypse when they encounter a chicken after one of the invokers were destroyed - bugfix: The Singularity should no longer stop gibbing people when whoever created it was destroyed -<<<<<<< HEAD - - bugfix: Detective Scanner can scan stuff that contains blood again. - Rhials: - - qol: Shadow Jaunter users now receive a brief warning before walking into light - and being forcibly un-jaunted. - - admin: anomaly events now give the option to occur at your current location when - triggered with the Trigger Event admin verb - ShizCalev: - - bugfix: Deaf mobs will no longer see PDA ringtones when a PDA receives a message. - - spellcheck: Corrected some grammar issues with messages displayed when shoving - people into lockers. - - admin: Fixed shoving people into a locker not being combat logged properly. - SkyratBot: - - qol: The Traitor's Antagonist Panel's Unlock and Failsafe entries will only appear - if there is an Unlock/Failsafe Code to display. - - bugfix: Pacifists can now hit people with pillows and holographic weapons, as - well as participate in boxing. - - qol: added makeshift surgery screentip - - qol: you no longer have to go in and out of harm intent to do surgery with a bedsheet - - bugfix: Fixes access_view on goodies not being respected by anything other than - department budget orders - - rscadd: during holidays the spread syndicate propaganda through posters objective - has a chance of spawning evil holiday poster - - bugfix: framework for holiday posters is more functional and modular - - code_imp: contraband.dm file and contraband.dmi file are both now poster.dm and - poster.dmi - - rscadd: Pride pin quirk! Start the shift off with a pride pin in-hand. - - qol: Pride pins can be infinitely reskinned now. - - bugfix: added descriptions for holodeck floors and comp/mach frames - - bugfix: Dead people are no longer counted as crew when determining if 65% of the - station is revs for the auto-shuttle call - - bugfix: Fixed final objectives not displaying the UI buttons. - - bugfix: Using optimized multiz on > 2 z layer maps will no longer cause fucko - bungo - - bugfix: You can now add mutations to advanced injectors without having an occupant - inside - - bugfix: The briefcase in the MetaStation vault now contains the (surprisingly - good) spoils it's supposed to. - - qol: examine your uplink for code - - rscadd: Gas sensors recipe to RPD - - code_imp: linking all the stuff via multitool - - qol: make your own tank instead of moving around canisters - - qol: drones now start with engineering skillchip. - - qol: drones can now interract with light boxes, rack parts, light replacers and - stack of duct. - - qol: You can now reduce the range of View Sensor circuits. - - spellcheck: drastically improves grammar for inserting something during organ - manipulation - - rscadd: lawyer-based photocopier blanks - - admin: Admins can now enable a custom hostile environment that prevents the shuttle - from leaving. -======= NamelessFairy: - qol: You can now reduce the range of View Sensor circuits. Watermelon914: - bugfix: Fixed final objectives not displaying the UI buttons. Y0SH1M4S73R: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Adds a new function for admin lua scripting, "over_exec_time", for checking if lua code is running close to the execution limit. Details are available in the lua editor's help menu. - admin: The execution limit is described in detail in the lua editor's help menu. -<<<<<<< HEAD - - bugfix: fixed dice servants not receiving any indication of who their master is - Tattle: - - bugfix: Wrapping balloon alerts are shorter and no longer contain spans -2022-12-27: - Erol509: - - imageadd: Teshari M-42 helmet, and M40 Gas Mask sprites - Jolly: - - qol: MegaSeed vendors had their seeds distributed through 4 categories; Fruits, - Vegetables, Flower and Miscellaneous. - OrionTheFox: - - imageadd: Armadyne has released new Gunset Cases with soft foam inserts. They're - still struggling to find out how to fit items back into the case, though... - Rhials: - - bugfix: Racks now properly construct again - - rscadd: Sandstorm random event! A random side of the station is pummeled by an - onslaught of sand and dust. If you hear that one is approaching, grab a welder - and some iron to help with repairs! - - rscadd: Space sand! It's weak and doesn't hurt reinforced walls, but shouldn't - be underestimated in high quantities. - - code_imp: You can now pass a start direction to the spawn_meteors/spawn_meteor - global procs. - - bugfix: briefcases no longer disappear after being unlocked - ShizCalev: - - bugfix: Fixed secure briefcase and wall safes not sending icon update signals - properly - SkyratBot: - - bugfix: admins can now select pirate events correctly -======= ZephyrTFA: - admin: New mapping verb to load lazy templates as needed. In your admin tab under the Mapping category. @@ -1574,13 +1283,11 @@ - qol: The Traitor's Antagonist Panel's Unlock and Failsafe entries will only appear if there is an Unlock/Failsafe Code to display. timothymtorres: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Add language variety to machines that speak. You can also pulse the vendor language wire to make it switch languages or EMP a machine to get the same effect. - rscadd: Shambling cola vendors will now speak a different language each time they talk. Syndicate vendors will now speak codespeak. Beach vendors will now speak beachbum. -<<<<<<< HEAD - bugfix: fixed saline drip UI not having transfer rate controls visible - bugfix: xmas crackers are now tiny instead of normal sized - bugfix: fixed sm activation logging. @@ -1599,7 +1306,6 @@ Erol509: - imageadd: 'New Teshari winter coat sprites for: cargo, robotics, chemistry' - bugfix: Teshari satchels works again -======= 2022-12-23: Fikou: - bugfix: fixes kilo not having xmas trees @@ -1616,7 +1322,6 @@ until reminded otherwise by their rightful lord. - bugfix: Fixed a runtime preventing mice from acting correctly when trying to flee and also eat cheese at the same time. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Tram windows are now properly flush with the tram walls. - imageadd: Tram shuttle seats have been replaced with benches so people can sit @@ -1625,53 +1330,6 @@ of the map itself. - code_imp: The tram floor tiles are now in a tram floor subtype instead of the map itself. -<<<<<<< HEAD - OrionTheFox: - - bugfix: fixed missing sprite on monkey cube and donk boxes - SkyratBot: - - balance: fixed chameleon vest not being able to hold any kind of gun - StrangeWeirdKitten: - - bugfix: Communist cargo has been vanquished, and cargo orders are no longer free. -2022-12-29: - Melbert: - - bugfix: Did you know items have a 1.2x chance of getting fibers attached? Well - it's been broken, now it's fixed - - bugfix: Det's scanner sees fibers again - - bugfix: Silver foods correctly spawn things grilled and fried - - rscadd: You can now high five people with (non-cult) touch spells! Maybe be careful - high-fiving a wizard who knows Smite. - Paxilmaniac: - - balance: Traitor uplinks have had a number of their more powerful or pointless - skyrat added items removed - - code_imp: Most modular uplink items have been moved from the master files into - a module - ShizCalev, Golden for fixing the Skyrat icons: - - code_imp: We now unit test all /obj's for missing icons. :) - - bugfix: Fixed a lot of icons that were missing on Skyrat-only items. Like, a LOT. - SkyratBot: - - bugfix: Pride pin quirk works roundstart - - bugfix: replicapods no longer sometimes have infinite spawns - - bugfix: Adds missing christmas tree to tramstation - - bugfix: The burden level of Burdened Sect chaplains is now updated properly when - their negative mutations are healed with mutadone - - imageadd: tweaks the ninja modsuit helmet - - rscadd: WOULD YOU EAT THE TOILET SANDWICH (LOCATED IN DELTASTATION'S MEDBAY BREAKROOM - RESTROOM) FOR FIVE DOLLARS? TEST IT OUT NOW! - Wallem: - - qol: Smokers rejoice, you no longer need to mill through your cigarette packet - to get your lighter out. Alt-Click a cigarette packet to extract a lighter from - it, if you've put it in there. Right-Clicking will still take out a cigarette. -2022-12-30: - Oxotnak: - - rscadd: added security Meka - - imageadd: added sprites for security Meka - Paxilmaniac: - - rscadd: The blackmarket trader ruin itself has been given a significant improvement, - hopefully really nailing that shady little outpost tucked inside of an asteroid - theme I think it's been going for. - - rscadd: The alien tool lab ruin has been changed to be a bit more interesting - than a box full of a full set of alien level tools. -======= ShizCalev: - bugfix: There is now a message clarifying that you've been KICKED from the game when the keysend flood autokick triggers. @@ -1875,60 +1533,12 @@ - refactor: Refactored how tongues set up their languages lists - rscadd: You can now high five people with (non-cult) touch spells! Maybe be careful high-fiving a wizard who knows Smite. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Ryll/Shaps: - rscadd: 'Dogs will now occasionally bark at their two mortal enemies: felinids and mailmen' - bugfix: Dogs set to attack will now only close within 3 tiles of their target, and must be approached further by their target (or pushed next to their target) to actually attack -<<<<<<< HEAD - ShizCalev: - - bugfix: Camo deagles have the proper icons again. - - spellcheck: Fixed the thermomachine stating "You set the color" for everyone that - could see it. - SkyratBot: - - balance: Gatfruit seeds will no longer drop from ice portals. - - bugfix: transparent and timid kudzu mutations wont block light - - bugfix: ghosts cant mess with RCD & PLumbing RCD - - bugfix: using chemicals on botany wont have unrelated side effects - - admin: The "Reset Thunderdome" option in the Secrets Menu now respects you closing - out of the confirmation screen as a way of cancelling your potential thunderdome - reset, rather than proceeding immediately. It should also be easier to comprehend - as well. - - admin: adds an admin combat-ready miner outfit - SomeRandomOwl: - - bugfix: Fixed the rear door to the wardens office having the wrong access requirements - set - - bugfix: Fixed a detective spawn point which spawned the round-start detectives - trapped within security - Tastyfish: - - bugfix: The cortical borer section of the round end report now shows dead cortical - borers. - Zergspower: - - bugfix: Void Raptor - Fixes the AI's Powernet and isolates it from the station - grid - - qol: Void Raptor - Moves the Generator to be on top of a wire for easier quick-attach - - bugfix: Void Raptor - Gets rid of the accidental addition above the chapel -2022-12-31: - Paxilmaniac: - - bugfix: The goldeneye ops modsuit won't cause CI to fail anymore - - rscadd: Assault operatives have a few new unique equipment items, namely a MOD - and a few firearms - - rscadd: Assault operatives now also have a new, more covert style ship and base - - balance: Pretty much the entirety of the assault operative equipment roster has - been changed around - - balance: The maximum number of assault operatives has been lowered from 6 to 5 - RimiNosha: - - bugfix: Finally fixes the bugged Vox hairstyle that's been plaguing the character - creator for a while. - SkyratBot: - - spellcheck: fixed a bug where latejoin menu would display incorrect number of - open slots - - bugfix: fixes pod blood I swear - - admin: Integrated Circuits now have an admin only subtype, functionally the same - as VVed regular circuits. -======= Time-Green: - bugfix: Pride pin quirk works roundstart ZephyrTFA: @@ -2034,4 +1644,3 @@ - bugfix: fiesta skewers are now MEAT and VEGETABLES mc-oofert: - bugfix: Basicmobs can no longer shoot mobs inside indestructibles ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-01.yml b/html/changelogs/archive/2023-01.yml index 8be5b3dca9b..615670ec306 100644 --- a/html/changelogs/archive/2023-01.yml +++ b/html/changelogs/archive/2023-01.yml @@ -1,89 +1,4 @@ 2023-01-01: -<<<<<<< HEAD - Guillaume Prata: - - rscadd: Geneticists figured out how to infuse goliath DNA into humanoids! (Many - monkeys were harmed in the process!) - - rscadd: Goliath eyes for nightvision, lungs to breath at lavaland safely, heart - to protect you from ash storms and the brain which turns one of your arms into - a tendril hammer. - - rscadd: 'Tendril hammer: Your arm becomes a giant mass of plate and tendril but - it won''t fit on gloves anymore. While slow to swing around, you can obliterate - fauna/megafauna with it, 20 base dmg + 80 bonus damage to fauna/megafauna with - a bonus knockback.' - Jolly: - - balance: '[Void Raptor] Adjacent walls around science have been made into R-Walls. - The walls affect either border public maintenance, or a public hallway/area.' - - bugfix: '[Void Raptor] Sciences pet is now secured behind regular glass panes - instead of reinforced. Unless it genetically mutates and kills everyone, the - extreme containment procedure was deemed unnecessary.' - - bugfix: '[Void Raptor] The glass panes around the break area were made regular. - Science Guards, please stop using them to ricochet rubber bullets.' - - balance: '[Void Raptor] Adjusted some R-Walls in the Det and Lawyers offices, - as well as outside of sec adjacent to the main hall.' - - bugfix: '[Void Raptor] Head of Security''s office is properly encased in R-Walls.' - - bugfix: '[Void Raptor] Fixed what should''ve been R-Walls around security as well - as what should''ve been standard walls' - LT3, LemonInTheDark: - - bugfix: Fixes cyborg hats offsetting physically over their head - - bugfix: Fixes solar trackers offsetting wrong, and panels not using plane offsets - - bugfix: Fixes reflector parts Z fighting with their neighbours - - bugfix: Fixes burgers layering wrong - - bugfix: Fixes tram hit and delamination counters - - bugfix: Fixes paper bin rendering - Paxilmaniac: - - rscdel: The weapon token system, with associated vendor and tokens, has been removed - because we don't actually use it anymore. - SkyratBot: - - bugfix: fixed pellet clouds (buckshot, improv shells) dealing insane wounds to - armored people - - bugfix: Basicmobs can no longer shoot mobs inside indestructibles - - bugfix: indestructible windows cant be destroyed by ingame means anymore - - balance: Instant Summons will now violently tear out embedded objects as they - are summoned, and will drag embedee to you if nearby. - - bugfix: atmos control can detect distro & waste loop sensors - - rscadd: Starlight is more potent now, and slightly blue - - rscadd: The lights from fire alarms will be dimmer and lower range, with alarms - themselves being brighter. Hopefully it vibes - - bugfix: CTF downtown's red hat store's beret is now red again rather than green. - - qol: Ghosts are freely able to go between abductor ships now. - - qol: the metastation custodial closet can now be found using the navigate verb - - admin: Added a new chat category for prayers. Filter them out, move them to their - own pane, live your best life - - bugfix: There is no longer a floating camera on RuntimeStation - - bugfix: Rats will once again attempt to attack windows or other dense objects - separating them from their targets. - - rscadd: New station traits can vary how large and comfortable the station escape - pods are. - - refactor: Refractors the frog into a basic mob - - bugfix: The nuke ops base begins lazy loading as soon as the first hijack stage - is completed so as to avoid upwards of 30 second delays on the shuttle docking - after the timer hits 00:00 due to server lag. - - qol: you can see your combat mode status as a simple or basic mob, and you can - see your health as a basic mob - - qol: status panel updates three times as fast - - bugfix: Fixes missing hop ticket incremement button at icebox - - admin: New mapping verb to load lazy templates as needed. In your admin tab under - the Mapping category. - - imageadd: The wendigo has been resprited - - bugfix: throwing no longer gets canceled if theres a mob buckled to the thrown - thing - - bugfix: War can once again be declared - SomeRandomOwl: - - bugfix: Fixed the mapping helpers for department guards to require department - access - Zonespace27: - - bugfix: You can now make full-tile wooden barricades again - fikou: - - rscdel: chaos holoparasite - - rscadd: gaseous holoparasite, it can expel various gases from its body and stabilizes - the users temperature - theOOZ: - - rscadd: Adds a language category to the OPFOR loadout selection -2023-01-02: - ShizCalev: - - bugfix: Dual sabers will no longer get covered in blood when attacking someone. - SkyratBot: -======= ChungusGamer666: - bugfix: Static light sources update properly now when carried by a mob. Fikou: @@ -136,7 +51,6 @@ allowed to vending-machine-restock individual snacking items via their trusty tray. vincentiusvin: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: rescaled supermatter health from 900 to 100. - balance: we didn't do a 1:1 rescale of the damage though, atmos based damage should be slightly higher across the board but have lower caps. All external damage @@ -145,7 +59,6 @@ between different delams so we have an easier time changing the code. - qol: added a delta symbol to the SM UI on damage and energy breakdown to denote that they are actually changes instead of exact values. -<<<<<<< HEAD - qol: Improved Chem Dispenser Reagent Search - bugfix: smoke spell becomes robeless - bugfix: Researching now checks the techweb it's linked to for node availability, @@ -159,13 +72,11 @@ - rscadd: You can now bake croissants to add to your breakfast. - rscadd: Traitorous chefs can bake dangerous throwing croissants, Mimes can do this and gain the additional benefit of a deadly combat baguette. -======= 2023-01-03: FernandoJ8: - bugfix: Boxes created through the crafting menu no longer spawn with their contents full Fikou: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: adds more ammunition, and also signing on the psyker ship - qol: you can see other echolocation receivers as fully purple now, rather than just their outline @@ -173,7 +84,6 @@ able to see echolocated tiles - rscadd: psyker pirates have headsets that increase their echolocation range - bugfix: partially fixes the psyker ship shuttle docker -<<<<<<< HEAD - imageadd: Nukie tablets are now using PDA sprites w/ GAGS instead of tablets. - qol: some modsuits now have some modules pinned by default dawsonkeyes: @@ -597,9 +507,7 @@ allowed to vending-machine-restock individual snacking items via their trusty tray. - qol: Pinpointers now tell what they are tracking when examined -======= JohnFulpWillard: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Mining order consoles are now named 'order console'. - qol: Orders from said mining order consoles can now no longer be cancelled, and are listed as 'mp' (mining points) in the Cargo console instead of 'cr'. @@ -607,152 +515,6 @@ - bugfix: Departmental orders can no longer be cancelled through the NTos cargo application. - bugfix: Wearing an ID will no longer break order consoles. -<<<<<<< HEAD - - bugfix: You should now no longer get a confusing message whenever you try to add - flour from a flour sack into a bowl. - - bugfix: you can nolonger use a goldgrub as a shield to kill colossus - - spellcheck: Head-spears are now named properly when using alternate spear types. - - rscadd: 'Hope you saved for a rainy day: Added the ''Cursed'' quirk which causes - excessive slippage and... other difficulties.' - - bugfix: Boxes created through the crafting menu no longer spawn with their contents - full - Tastyfish: - - bugfix: Teshari uniform accessory rendering now works as expected again. - Tattle: - - bugfix: projectile hits on mobs are logged globally - YakumoChen: - - qol: Department guards now spawn with all the gear they need to police their department - - qol: Department guard lockers contain a full, spare set of gear, for people getting - a job change. - Zonespace27: - - balance: ERT smartgun now fires faster while doing less damage and having nearly - all wounding potential removed -2023-01-15: - Guillaume Prata: - - rscadd: Mothroach DNA infusion. For better or worse, anyone can get closer to - being a Moth person now! - Melbert: - - bugfix: Fixed not getting moodlet from freshly laundered clothing - - bugfix: Fixed durability tags not showing their ratings - RimiNosha: - - bugfix: Non-standard brained synths can now use ghost roles once again. Woops! - - bugfix: Items will now no longer be given twice to ghost roles. - - bugfix: Ghost cafe boxes no longer drop on spawn. - - imageadd: Ghost cafe costuming boxes no longer look like they've been bought from - the syndicate. We managed to at least repackage their products this time. - - qol: You can finally put stuff back into said ghost cafe costuming kit. Nice. - ShizCalev: - - bugfix: Drunk scientists & the RDs rejoice! You can now reach the Ballmer peak! - - admin: Fixed a bunch of liver traits not being assignable. - SkyratBot: - - refactor: Duplicating mobs now should now give properly functioning mobs, as duplications - in general have been reworked. Admins can feel free to use the pod feature on - people. - - bugfix: Fixes monkey heretics being unable to invoke their runes - - spellcheck: fixed grammar/typo in Nanotrasen Pay System add - - bugfix: Cyborgs turning their lights on and off can now be seen doing so. - - admin: Force Event no longer filters by tab when searching. - - bugfix: Syndicate mobs will no longer attempt to shoot you through walls, building - up massive piles of empty bullet casings in the process. - - qol: Bullet casings from "weapons" fired by certain mobs will clean themselves - up after 30 seconds. - - code_imp: Anomaly effects now have their own files, rather than being crammed - into a single, probably-too-large file. - - code_imp: Removes double CAN_BE_INTERN flag in chaplain and cargo tech job flags - - code_imp: Replaces a string in chemist departamental head variable with a job - define. - - bugfix: Fix blood overlays on energy daggers - - code_imp: Add `NO_BLOOD_ON_ITEM` bitfield for items - - bugfix: Fixes being able to place things on space tiles with a z-layer destination. - - bugfix: Fixes security stunbatons knockdowning you even if you have baton resistance - trait - - bugfix: Mice won't try to path through walls to escape from sight and constantly - squeak. - - bugfix: Mice will stop running away from you if they can't see you any more. - - bugfix: Rats won't bite racks and tables while passing over them. - - bugfix: Fixes clientside lavaland lag on long rounds - - qol: Spirits of possessed blades (Chaplain's Null Rod Option) will be able re-try - selecting their name if it ends up to be filtered for any reason. - - bugfix: Getting stuck or trapping someone else in the DNA infuser - - bugfix: fixed mob biotypes being ignored when applying toxin damage and oxyloss - - rscadd: Added atmos holofans to metastation's ordnance lab. - SovietWomble, dessysalta, dopamiin: - - soundadd: the hygienebots speak now - softcerv: - - bugfix: Alter Form now longer shows parts that it shouldn't - - bugfix: Cryopods now remove players from the global list of joined players, stopping - the persistent scars system from runtiming -2023-01-16: - GoldenAlpharex, with Halcyon for the amazing sprites: - - rscadd: Towels! Wear them on your chest, your waist or your head, use them to - dry up those that are wet or to dry up liquid puddles. - - rscadd: You can wash towels in sinks, or wring them, to remove the reagents from - them, but the best way to have clean towels will always be a washing machine! - Wringing towels leaves a mess behind, unless you do it in a bucket, which will - make it transfer a portion of the liquids into it, losing some on the way. - - bugfix: Fixed ears being displayed at all times if you're wearing something on - your head, but not on your mask slot. - - bugfix: Fixed the mood buff for when you wash clothes. - - code_imp: Improved some of the code related to interactions between mops/reagent_containers - and liquid turfs, hopefully fixing some bugs on the way too! - LT3: - - bugfix: Orange airlock lights and yellow firedoor lights now play nice with each - other - - bugfix: Orange airlock lights are properly aligned on external airlocks - Paxilmaniac: - - rscadd: Three new undershirt options have been added, a new non-cableknit version - of the turtleneck, as well as two varieties of buttondown shirt. - - balance: The HoP has had their PDH taken away, returning to them having an SC-2 - again. - - balance: The captain's PDH is no longer the suppressed version, if the captain - is shooting someone its gonna be loud as fuck as god intended. - - code_imp: Documents a skyrat change in command lockers that wasn't really documented - right :) - ShizCalev: - - bugfix: gorillas can now fuck people up again - - bugfix: Trading cards are no longer invisible when stacked. - - bugfix: You'll no longer constantly be spammed with messages if your fingers are - too big to interact with a computer's keyboard. - - bugfix: You can no longer interact with programs that were previously opened on - a computer if your fingers are too big to use the keyboard. - - bugfix: You can now look at computer screens even if your fingers are too big - to use the keyboard. - SkyratBot: - - qol: Removed the tech disk part of the ORM's UI as it was entirely unused, now - it's a little more compact with less scrolling needed. - - refactor: Autolathes, Limb growers, Biogenerators, ORMs and Smelters now share - techwebs with other machines of their types, rather than all make new techwebs - each time. This means they only build their nodes once, including hacked ones. - Instead of researching nodes on hacking the machine, they now show hacked ones - depending on if it's hacked. - - qol: miner console now displays the item's icons and has a minus button feature - to remove 1 item - - bugfix: Directional windows won't block construction of machine & compute frames - by the RCD - - rscdel: Atmospherics beret and black beret - - bugfix: The walls of the luxury shuttle no longer bend in strange directions. - SomeRandomOwl: - - bugfix: Fixed Bouncers/Service Guards not having access to Service. - - rscadd: Added a genetic infuser to genetics on Void Raptor - - rscadd: Added three Ordinance Data disks to Ordinance on Void Raptor - - bugfix: Moved the Disposals bin in the detectives office on Void Raptor - - rscadd: Added two detective access doors to security on Void Raptor, Detectives - now have access to evidence storage and interrogation - Tastyfish: - - bugfix: Liquid fires now visually respect the newly discovered third dimension - better. - YakumoChen: - - qol: Catnip bud contents changed so it can be made directly into tea from a ground - product, with water added. 50 potency bud, +25u water = 50u catnip tea. - Zonespace27: - - qol: Nukeops can now be any species instead of just human - nikothedude: - - rscadd: The medical labcoat has been added to the medidrobe and loadout. -2023-01-17: - LT3: - - soundadd: The Skyrat vote notification sound is back - - admin: Changed admin comm/fax notification sound to be less confusing -======= LT3: - qol: Tram controls unlock faster on arrival at a station - imageadd: Minor improvements to station wayfinding signage @@ -782,7 +544,6 @@ Improvedname: - bugfix: Adds missing contrabrand spawners to deltastation locker - bugfix: fixes being able to instantly build carving blocks/mineral doors ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Roundstart captains will now memorize the code to the spare ID safe. - rscadd: Traitors will now memorize the location and code to their uplink. @@ -795,7 +556,6 @@ - rscadd: Planting bombs now increase their memory quality depending on how cool the bomb is. - refactor: Memories have been refactored to be much easier to add. -<<<<<<< HEAD Paxilmaniac: - rscadd: A set of greyscale overalls has been added to the loadout menu in the suits section @@ -818,7 +578,6 @@ - qol: Rulebook for TGC has been added to the TGC arena. - bugfix: Holographic TGC coins are no longer legal tender and cannot be inserted into your ID. -======= NamelessFairy: - qol: Drone dispensers now tell you how much material they need per drone. ShizCalev: @@ -936,7 +695,6 @@ - bugfix: You should now no longer get a confusing message whenever you try to add flour from a flour sack into a bowl. timothymtorres: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - soundadd: Candles will now use the match lighting sound when lit - soundadd: Light sources that burn will now have a welding hitsound - bugfix: Fix candle light behaving erratically @@ -950,88 +708,6 @@ once fuel is used - qol: Add burnt flares and melted candles to trash spawners - refactor: Refactor lighting items that use fuel to be more robust -<<<<<<< HEAD - - bugfix: Removed some cheese strategies from burdened sect. - - bugfix: improved maintenance eyes light detection. - - qol: Extinguisher cabiners are now opened and closed with right click instead - of alt+click. - - rscadd: Service borgs have a chisel now, make some statues! - - bugfix: Swiping the Crab-17 checkout machine too early will no longer instantly - explode it and lock everyone out of their bank accounts. - YakumoChen: - - qol: Departmental Batons can now be ordered for each department via departmental - orders, or directly from cargo. Requires Security access to open. -2023-01-19: - ATHATH: - - bugfix: The hypnosis from hypnogoggles can't be cured "early" by something weaker - than a staff of healing bolt. It still can be cured by removing the goggles, - of course. - LT3: - - admin: Changing the station status displays now generates a log entry - Melbert: - - bugfix: People should be stuck in infinite stamcrit less often. - Paxilmaniac: - - imagedel: The skyrat sprite override for wall mounted medical vendors will no - longer be - SkyratBot: - - bugfix: Polls are fixed - - bugfix: Fix inconsistent runtime spam from baseturf on startup - - rscadd: Adds garden gnomes. - - imageadd: Adds garden gnome sprites. - - qol: made the threshold page of air alarm use colloquial terms instead of code - terms. Added reset and disable buttons. - - qol: Air alarm's gas breakdown now displays the moles, percentage, and partial - pressure. - - bugfix: operating mode selection in air alarm will be red if the selected mode - is dangerous. - - bugfix: fixed the area atmosphere alarm button on air alarm not working. - - code_imp: told the game that hyper nob isn't dangerous. - - refactor: refactored the threshold values and operating mode of air alarms in - the backend. No changes expected except the ones stated above. - Zenitheevee: - - bugfix: Hotel portal anchor placement fails from moving are now failing successfully. - Zergspower: - - rscadd: Added Prescription Science Glasses - nikothedude: - - rscadd: Temporary flavor text now adds a small overlay to your character. - oniondry: - - bugfix: The original turtleneck undershirt is back. - tralezab: - - bugfix: Fixes Honorbound Sect not granting the right spell - vinylspiders: - - bugfix: fixed catsuits not rendering breasts correctly on players with taur bodyparts - - bugfix: fixed a bug which allowed for the battered sausage to be used as a crafting - ingredient for itself, causing dangerous infinite sausage loops - - refactor: changed battered sausage recipe so that you batter the sausage before - grilling it & cleaned formatting within modular food files - - imageadd: added a sprite for the cooked version of the battered sausage - - code_imp: added extra nutriment to cooked battered sausage to represent the battered - version being slightly more filling than plain old sausages - - code_imp: made beer batter reagent weakly alchoholic, it's 1/3 as alchoholic as - the beer it contains. so if you have nothing else...you can get drunk off it - now I guess. -2023-01-20: - Guillaume Prata: - - qol: APCs have contextual screen tips now. - JohnFulpWillard, sprites by Tramzz: - - rscadd: Added Maintenance tablet applications, applications that can't be cloned - or downloaded from the store, instead you can find one app in maintenance. - - balance: The Analyzer tablet application is also a maintenance tablet application - now. - Nerev4r: - - bugfix: Snails no longer have bones, and their unarmed damage is back to its proper - state. - RatFromTheJungle: - - rscdel: removed the PDA worn icon; again - Rhials: - - code_imp: The ninja module folder is now stored in the antagonists folder. - SkyratBot: - - bugfix: fixed give_important_for_life proc in species.dm, which is supposed to - be used to help ensure plasmamen (and potentially other races) are always spawned - with internals and such - - bugfix: fixed issue where plasmamen who are spawned without a plasmaman-specific - job outfit could spawn without internals and a suit, and just start dying immediately -======= tralezab: - bugfix: Fixes Honorbound Sect not granting the right spell 2023-01-08: @@ -1234,14 +910,12 @@ Comxy: - bugfix: Fixes being able to place things on space tiles with a z-layer destination. FernandoJ8: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: the examine text for damage now properly uses the most common examine text out of all the mob's limbs - bugfix: all robotic limbs now have the robotic damage descriptions (charring, denting) - code_imp: improved the get_majority_bodypart_damage_desc() proc to reduce redundancies and add support for limb-based cellular damage -<<<<<<< HEAD - qol: A few recipes that were microwave only (like boiling rice, heating ready donk, so on) can now also be made in an oven - bugfix: The tables on the bridge of the NTSS Independence are now usable. Fancy! @@ -1406,7 +1080,6 @@ - bugfix: liquid pumps now show up in the RCD under the 'liquids' category instead of in a hidden blank one 2023-01-24: -======= Guillaume Prata: - rscadd: Mothroach DNA infusion. For better or worse, anyone can get closer to being a Moth person now! @@ -1471,7 +1144,6 @@ vinylspiders: - bugfix: fixed mob biotypes being ignored when applying toxin damage and oxyloss 2023-01-16: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 A.C.M.O.: - bugfix: Fixed the DNA Infuser's Goliath Infusion and its organ set bonus. The Goliath hammer will now apply bonus attack damage as expected. @@ -1481,10 +1153,8 @@ species. - bugfix: Fixed the DNA Infuser mutating organs which the occupant doesn't have. - bugfix: Fixed the DNA Infuser not allowing addition of dead creatures. -<<<<<<< HEAD - bugfix: Fixed buggy organ filtering code in the DNA Infuser which stopped it from infusing organs. -======= JohnFulpWillard: - bugfix: If there are several techwebs, sabotaging the master server of one of them will no longer cut research point generation of the rest. @@ -1758,12 +1428,10 @@ - bugfix: Tape recorders are not deaf anymore JohnFulpWillard: - bugfix: Hacked autolathes and Limbgrowers can now properly print things again. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - qol: Reduced volume of firedoor alarm sound loop - bugfix: Tram hit counter now only increments when actual players are hit. No more free points hitting the horrible goose -<<<<<<< HEAD OrionTheFox: - imagedel: deleted modular newscaster override, they've been reverted to new TG sprites @@ -1801,7 +1469,6 @@ - bugfix: fixed a bug where petri dish smartfridges could not be constructed from a circuit board - rscadd: Burn Medkit to Mining Vendor -======= Mey-Ha-Zah: - rscadd: Burn Medkit to Mining Vendor Mothblocks: @@ -1849,7 +1516,6 @@ timothymtorres: - bugfix: Fix ordance bomb site being a safe teleport area after surviving the heretic minigame ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - soundadd: Chisels now make sculpting sounds when used on carving blocks - qol: Chisels now give balloon alerts when selecting a target, cancelling, or sculpting - qol: Chisels used on carving blocks that were interrupted will now continue @@ -1859,7 +1525,6 @@ people use the radial menu to craft abstract statues properly. This does not work with custom mineral blocks. (pizza, glass, etc.) - code_imp: Change chisel and statue code to be more readable -<<<<<<< HEAD - rscadd: Some prisoner backgrounds have more or less tattoos. - rscadd: More Memories to collect involving fishing and getting converted - rscadd: Bartenders can now mix up the Mississippi Queen for those willing to take @@ -1914,7 +1579,6 @@ - bugfix: vibebot being invisible - qol: Inspecting a trading card or card hologram will now let you see the full enlarged card art. -======= vinylspiders: - bugfix: toilet bongs crafting recipes - bugfix: fixed crafting itself @@ -1953,132 +1617,11 @@ - qol: Writing crimes in the console sets players to arrest. - qol: You can now mark someone as a suspect through sec hud. san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'After over a year of continuous research, the Syndicate have finally managed to crack Nanotrasen''s Protocol for transferring AIs from an intelliCard into a MODsuit, and vice-versa in order to extract the valuable AI in a method fit-for-sale. In short: The "Steal a Functional AI" objective will work if the "captured" AI is in a MODsuit.' -<<<<<<< HEAD - - rscadd: The TGC arena on the holodeck now features display panels to track each - player's life shards and mana. - - qol: Slightly increased the amount of space on the TGC holodeck arena's tables - by removing the windows on either side of the player. - SomeRandomOwl: - - admin: Added EVENT_CATEGORY_ENGINEERING To the supermatter surge event so that - it can now show up in the trigger event panel for admins. - softcerv: - - rscadd: Adds in NIFs, see https://github.com/Skyrat-SS13/Skyrat-tg/pull/16865 - for more details - tf-4: - - bugfix: fixed megafauna crusher kills and crusher achievements depending on megafauna - having crusher loot. Legion Crusher should now be obtainable as a result. -2023-01-26: - GoldenAlpharex: - - rscadd: Added eight new dishes to Hemophages, most of which can be either crafted - via the Hemophage Food subcategory in the crafting menu, or through microwaving! - - rscadd: Added the Bloodshot drink, being the new racial drink for Hemophages! - It restores blood at the rate Bloody Mary used to restore blood before this - update. It's also the intended way to deal with bloodloss via drinks, which - means it'll also work on those that aren't full on blood! It might gross you - out if you don't need it, however. - - rscadd: Added the Taste Suppressor reagent, which allows you to eat food you might - not like by making you completely unable to taste anything. It's not a great - solution, but hey, it works, even for Hemophages! - - balance: Bloody Mary now restores blood at a third of its previous speed. - - balance: Hemophages can now only eat food and drink reagents (via ingestion) that - will help their body recovering some blood volume. They now need to use the - Taste Suppressor reagent to be able to eat everything else, at the cost of not - really tasting anything they eat while it's in their system. - - imageadd: Added some new sprites for the new Hemophage food and drinks! - LT3: - - imageadd: New jacket and jeans for a blue tajaran - Nerev4r: - - bugfix: The Round Shell for snails should no longer be invisible. - Useroth: - - rscadd: Added a donator check to the bonus character slots and upped their amount - to 50. -2023-01-27: - LT3: - - bugfix: Fixed the tram not exploding when it's supposed to - MMMiracles: - - bugfix: Regular asteroid turfs now dig up regular asteroid sand instead of the - basalt variant from Lavaland. - Nerev4r: - - rscadd: Snails can now clean floors they crawl over. - OrionTheFox: - - bugfix: fixed sports bra w/ boyshorts not using its digi variant - RatFromTheJungle: - - bugfix: the blueshield's have collectively remembered to pack ballistic plates - in their vests from now on. - SkyratBot: - - bugfix: You can print the new list pick and associative list pick components - - bugfix: Associative list pick works as intended now - - qol: Add shovel to cargo lathe - - qol: Mining points is now tied to bank accounts instead of individual IDs, so - they transfer over in cases of an ID replacement. - vinylspiders: - - bugfix: toilet bongs crafting recipes - - bugfix: fixed bug with crafting that led to unexpected behavior; e.g. recipe requirements - not being consumed, machinery being consumed when they shouldn't be - - refactor: cleaned up some old code in the recipes file, added support for structures - in recipes -2023-01-28: - Ebin-Halcyon: - - imageadd: The Syndicate has gotten a shipment of Maid outfits. - - bugfix: Teshari's eyepatches should work and be able to swap eyes now. - SkyratBot: - - rscadd: Atmospheric Gloves, thick gloves that are fully fireproof and fire protective - and let you fireman carry people faster. - - bugfix: fixes engine goggles starting with darkness vision - - qol: firefighter helmets can now enable a welding visor - - qol: welding hardhats change mode with right click instead of altclick - - balance: firesuits no longer protect your hands -2023-01-29: - Crumpaloo: - - imageadd: 20 new medium-long to short feminine hairstyles, check near the end - of the hairstyles list for more info! - GoldenAlpharex: - - qol: 'Added the round ID to the round starting message in the #game-alert channel.' - SkyratBot: - - bugfix: You can now set life and mana panels to 0 life/mana. - - bugfix: Mint Toxin(a toxin) has been changed to Mint Extract(a food). The chef's - mint can once again gib, fatties beware. - - imageadd: secborgs are red again - - imageadd: new inhand sprites for the holy flask - - bugfix: chaplains will no longer look like they are carrying a beer bottle when - holding their holy flask - Twaticus, sergeirocks100: - - rscadd: Boyshorts have been added to the underwear selection. - vinylspiders: - - bugfix: cortical borer hosts who have ageusia will no longer receive a "you get - a strange aftertaste of ..." message -2023-01-30: - SkyratBot: - - qol: The error message that shows up when APCs fail due to a Grid Check (powernet - failure) looks a little bit nicer now. - - bugfix: Basic Mobs are now able to deathgasp. - - balance: Hitting a vendor from inside a wall will cause it to fall away from you, - rather than crushing you without being able to move to your tile. - - spellcheck: After one false advertising lawsuit too many, Nanotrasen has changed - the sales pitch of the 'Exotic Seed Crate' to correctly reflect that it only - contains twelve seeds. - - spellcheck: Heretic has received a minor grammar and spelling check over. Wrong - kind of heresy, there. - - qol: Add advanced fire extinguisher to techweb - - bugfix: Operating computers can now display alternative steps during repeatable - surgery steps. - Zenitheevee: - - qol: Most ghost roles now have bank accounts + their account ID in memories - - qol: Freighter + BMD now have loadout enabled -2023-01-31: - Zonespace27: - - bugfix: Borgs should no longer be able to enter gateways under any circumstances - vinylspiders: - - bugfix: gets rid of some warnings on server start - - qol: new mapping helper for when you want a door that requires centcom or captain - access -======= 2023-01-26: Autisem: - bugfix: You can print the new list pick and associative list pick components @@ -2290,4 +1833,3 @@ notice much - admin: '... But you specifically may notice some minor differences. Raw inputs changed into tgui ones, minor soul removal, etc.' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-02.yml b/html/changelogs/archive/2023-02.yml index 1ea142d71d9..8a297f6ae16 100644 --- a/html/changelogs/archive/2023-02.yml +++ b/html/changelogs/archive/2023-02.yml @@ -1,6 +1,5 @@ 2023-02-01: A.C.M.O.: -<<<<<<< HEAD - refactor: Refactored breathing, mostly check_breath, for Carbons and lungs organ. - rscadd: Added the space-breathing trait for lungs. - bugfix: Fixed the Space Carp DNA infusion to apply the Spacewalk trait, allowing @@ -18,7 +17,6 @@ LT3: - bugfix: Tram platform no longer magically levitates objects when the tram walls are destroyed or dismantled -======= - bugfix: Fully fixed the DNA Infuser, which will now infuse organs as expected. - bugfix: Fixed flyperson species transformation and organ set bonus, which was throwing a runtime. @@ -26,13 +24,11 @@ JohnFulpWillard: - bugfix: the MODsuit control maint app now links up to MOdsuits. LT3: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - imageadd: Hilbert Research Facility's tram controls have finally been picked up off the floor and mounted to the wall - bugfix: Hilbert Research Facility's tram doors are no longer linked to the main station tram - code_imp: Hilbert Research Facility now has proper tram atmos barriers installed -<<<<<<< HEAD Melbert: - bugfix: Maybe fixes some issues with spirit holding, particularly relating to it being in-exorcism-able. @@ -66,7 +62,6 @@ - admin: When a player-owned mob is deleted from the game world, a stack trace is now dropped in the runtime logs. This allows admins and coders to investigate these issues easier. -======= LemonInTheDark: - bugfix: Fixes parallax showing up ABOVE the game if you moved z levels while disconnected - rscadd: Space now makes things in it starlight faintly blue @@ -97,14 +92,12 @@ - admin: Admins are now able to grief you by hitting you with a toolbox 10 times in one second. ophaq: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Axolotl lovers rejoice! I added axolotls to cytology and as such are now swabbable. - rscadd: Frog cells are now named "anura amphibian cells." This literally means "frog amphibian cells." - rscadd: Axolotl are "caudata amphibian cells." This literally means "salamander amphibian cells." -<<<<<<< HEAD - qol: Posters now tell that you can trap them with a glass shard when examined - bugfix: fixed fire cabinet examine text falsely saying to alt-click to open/close; it now has contextual screentips, and uses balloon alerts when relevant @@ -157,7 +150,6 @@ RimiNosha: - qol: Made off-station gravity generators shut the fuck up. SkyratBot: -======= san7890: - spellcheck: Whenever you offer your hand to someone in need, or just wanting to pull them around- the alert that shows up to them should be a bit more clear @@ -193,16 +185,11 @@ - bugfix: Rehydrated Carp should now properly recognise who is the boss and follow their instructions. Kepteyn: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: added greyscale json configs for witch hat and witch hat worn. - imageadd: Added new, greyscale states to head/wizard.dmi - imagedel: Removed Marisa hat states from head/wizard.dmi - code_imp: changed Marisa hat code in wiz_robes.dm to make them use greyscale. - config: changed greyscale configs to include the witch hat. -<<<<<<< HEAD - - bugfix: Rehydrated Carp should now properly recognise who is the boss and follow - their instructions. -======= NamelessFairy: - admin: Admins can now customize the crate type and landing zone of the stray drop pod event. @@ -212,15 +199,11 @@ - bugfix: RPD not highlight a single variant option in its UI - bugfix: heat exchange manifolds not displaying the right sprites for its layer - bugfix: stack components inside machines not getting garbage collected ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: distro & waste sensors not reading values from the actual pipes they are on - bugfix: losing distro & waste options from the drop-down box after connecting to a new sensor. - refactor: all occurrences of _sensor with a macro to avoid typos. -<<<<<<< HEAD - - spellcheck: Fixes a typo in the changeling alert stinger filename. -======= jlsnow301: - bugfix: Deleting a sec record removes it from the manifest again - qol: It's now easier to see security notes via HUD. @@ -234,38 +217,10 @@ - balance: EMP requires aluminum, but the aluminum doesn't contribute to a bigger EMP size. vinylspiders: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed getting incurable tox damage when fully transformed into a plasmaman via plasma rivers - bugfix: fixed rod of asclepius/medibeam etc not being able to heal tox damage despite not having biotype restrictions -<<<<<<< HEAD - - bugfix: pizza crates' pizza list applies the assigned weight on its pizza list - - imageadd: cargo's jumpskirt has been shortened to help fit in better with the - jumpsuit's shorts. - - bugfix: Objects that are not items can increase supermatter power on consumption. - - spellcheck: The word "modifications" is now spelled correctly in the Reload Configuration - confirmation dialog. - - spellcheck: Clarifies that TRAC bullets are not teleporter compatible - - bugfix: Toy crossbows have had their offset fixed and will now correctly display - in your hand. - - balance: EMP requires aluminum, but the aluminum doesn't contribute to a bigger - EMP size. - - bugfix: Water bottle cap overlays & missing opening sound - - bugfix: fixes fov removal f12 exploit - - bugfix: Mime's Vow of silence will no longer requiere wizard robes to be casted. - - bugfix: Bubblegum is once again capable of performing his 5 hallucination, one - real Bubblegum attack. - Tattle, Kryson: - - qol: light switches, request consoles, telescreens, and ticket machines can now - all be printed from lathes - itseasytosee: - - rscdel: You are less likely to see underwear in places it logically should not - be. -2023-02-04: - Cursor: - - rscdel: Removed swears from the Personal Space quirk. -======= - bugfix: fixes a runtime error caused by patrolling bots 2023-02-03: 1393F: @@ -280,7 +235,6 @@ Jolly: - bugfix: On IceBox, the library air vents are now connected to the main network again. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - imageadd: Nanotrasen's insurance provider finally sprung the cash for a new tram. Made with the latest in lightweight and mostly* non-flammable materials, travel @@ -297,51 +251,6 @@ - bugfix: Westbound travel shows the correct controls animation - rscadd: Tram doors take a chunk of flesh if you run at them last minute - qol: Reduced duration of amber stage on tram crossing signals -<<<<<<< HEAD - Melbert: - - refactor: Refactored blindness and nearsightedness. Important to note is that - all mobs are naturally blind until their eyes are actually created. - - refactor: Refactored "is covered" procs - - bugfix: Less sources of blindness now cause permanent blindness. Includes the - "Blind" Spell and "Blind Sting" from changelings. - - admin: Ahealing someone no longer flashes the blind overlay for 1 tick. - - admin: I removed an unused (sort of) inaccessible admin verb that allowed you - to toggle the tint from all welding helmets (and clothing) (and lack of eyes) - in existence, let me know if you want similar back - - balance: Changeling "Blind Sting" now causes eye damage (enough to blind) rather - than arbitrarily forcing blindness. - - balance: Visionloss virus symptom now causes eye damage (enough to blind) rather - than arbitrarily forcing blindness. - - balance: Oculine has been reworked slightly. Prior, Oculine arbitrarily healed - blindness and nearsightedness from eye damage reagrdless of how damaged the - eyes were, and applied blur on success. Now, Oculine just heals eye damage, - and blindness / nearsightedness is restored in the process. There is now a probability - every tick that eye blur is applied based on how pure the oculine is while healing - very damaged eyes. - - balance: Pacifists can no longer eyestab. - - balance: Any clothing item that covers your eyes contributes to getting the bonus - while sleeping, and to removing temporary blindness faster - Rhials: - - rscadd: Adds the Terrify spell and Terrified status effect. Terrified victims - will suffer increasingly detrimental effects until they're calmed down. - - balance: Nightmares can now cast the Terrify spell on victims to plague their - prey with. Attacking a Terrified human with your open hand will trip them up. - - imageadd: Adds status effect and spell icons for Terrify/Terrified. - - spellcheck: fixes a typo in the message for consuming a nightmare heart. - SkyratBot: - - bugfix: Made the northwest arrow icon in build mode actually point northwest - - bugfix: Nanotrasen Artificial Intelligence Department has repelled a Cybersun - attack on AI personalities and advanced camera frameworks that was based on - the last year's AI GRID OF DOOM ion law incident. Free-look camera consoles - and AIs should no longer have a grid of free vision that also prevents interacting - with stuff on the grid. - - bugfix: The wizard's magickal printing press has been corrected such that ye magickal - text describing what the semi-randomize option do is no longer printed _underneath_ - the semi-randomize button. - - refactor: renames datum parts above tier 1 accordingly to their tier - - balance: Gibs now provide a small amount of nutriment. - - spellcheck: changes the snake crate description from poisonous to venomous -======= NamelessFairy: - bugfix: Toy crossbows have had their offset fixed and will now correctly display in your hand. @@ -383,18 +292,15 @@ manually triggering the event NamelessFairy: - spellcheck: The instructions for the maintenance camera app are more descriptive. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: You can now mark TGC cards on the holodeck battle arena, useful for keeping track of effects such as hivemind. - rscadd: Right clicking a card holder on the TGC holodeck battle arena will allow you to generate a "blank card", useful for when using cards that summon other cards, such as the xenomorph hivelord. - spellcheck: Capitalized some descriptions for TGC machines -<<<<<<< HEAD - refactor: stack components no longer exist inside a machine's component_parts - refactor: move component printer & module duplicator circuitboards into machine_circuitboards.dm - spellcheck: The regenerative sepia crossbreed's usage description has been corrected -======= - bugfix: Smugglers satchels will no longer spawn inside the holodeck. Roryl-c: - bugfix: burn wounds going septic now properly paralyze the limb @@ -408,12 +314,10 @@ and AIs should no longer have a grid of free vision that also prevents interacting with stuff on the grid. cacogen: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Tape recorder actions (e.g. starting/stopping playback) now use balloon alerts instead of say() to reduce chat spam - bugfix: You can no longer get a tape stuck in the tape recorder by unspooling it before inserting -<<<<<<< HEAD - spellcheck: Whenever you offer your hand to someone in need, or just wanting to pull them around- the alert that shows up to them should be a bit more clear now with a 100% decrease in non-necessary pronouns and articles. @@ -489,7 +393,6 @@ - bugfix: donator item colorblockhoodie appears on digitigrade LT3: - bugfix: Cats can nuzzle people -======= lizardqueenlexi: - bugfix: Made the northwest arrow icon in build mode actually point northwest 2023-02-05: @@ -584,7 +487,6 @@ - balance: 'Tram Malfunction: Damage multiplier added to account for different base health levels' - balance: 'Tram Malfunction: Event collision lethality multiplier decreased' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed motion sensors on tram doors, they will now crush you much less often! - balance: Reduced damage from being crushed by tram doors @@ -598,7 +500,6 @@ power is lost - bugfix: Tram benches don't override standard benches - bugfix: Reduced saturation and brightness of standard bench -<<<<<<< HEAD OrionTheFox: - imageadd: in a continued organization effort, all skyrat Spacesuit sprites have been moved to suits/spacesuit.dmi files. Please report any relevant issues! @@ -660,7 +561,6 @@ - bugfix: Transferring objects from a belt to another storage object now removes those objects from the belts visuals. - qol: Adds screentips to both signs and plaque construction/modification. -======= NamelessFairy: - bugfix: Transferring objects from a belt to another storage object now removes those objects from the belts visuals. @@ -703,12 +603,10 @@ SyncIt21: - bugfix: Bibles can convert other bibles Thunder12345: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: CTF guns spawn in the default active hand - qol: CTF shields become transparent as they lose charge - qol: CTF King of the Hill scores are visible to players in-game - qol: CTF controllers can no longer be blocked by players standing on them -<<<<<<< HEAD - imageadd: 'Updated Regal Rat Sprites: Provided by Onule.' - balance: There's a second detonation wire on payload bombs now. - balance: Cutting the proceed wire no longer detonates the bomb but instead deactivates @@ -834,7 +732,6 @@ vinylspiders: - bugfix: hotfixes vox spawning with their internals closed 2023-02-14: -======= itseasytosee: - imageadd: Shotgun shell suit storage sprites tf-4: @@ -868,7 +765,6 @@ - bugfix: Fix kilo barsign spawning under windows - bugfix: Fix barsign updatePath being backwards 2023-02-10: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: 'Tramstation: Crossing signals updated to work on the new map' - bugfix: 'Tramstation: Fixes missing wiring in West Wing' @@ -877,7 +773,6 @@ - bugfix: 'Tramstation: Fixes part of medbay area being set as space' - bugfix: 'Tramstation: Medbay''s elevator buttons are now accessible' - bugfix: 'Tramstation: Elevator doors, buttons, and indicators are linked' -<<<<<<< HEAD MMMiracles: - rscadd: Tramstation has received a substantial overhaul! Please consult your local tour guide and station maps for changes. @@ -917,7 +812,6 @@ how fast you move I think it makes you slower - admin: Admins can now customize the crate type and landing zone of the stray drop pod event. -======= Time-Green: - bugfix: fixes issues with being walking against hyperspace locking you ZephyrTFA: @@ -982,24 +876,10 @@ tralezab: - rscadd: 'Added two new sanguine wizard spells: Exsanguinating Strike and Scream For Me' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Every tier of "Scrubber Overflow" can now choose a random single reagent mode - admin: '"Custom" overflow, which was kinda confusing and unintuitive, is now called "Every Vent", much more self-explanatory in what it does.' -<<<<<<< HEAD - - bugfix: Mechs no longer have zero armor when built. - coiax: - - bugfix: Tiziran canned goods no longer decompose into mush. - itseasytosee: - - imagedel: Android abductors and skeletons have lost all modesty and have stopped - wearing underwear. -2023-02-15: - A.C.M.O.: - - bugfix: Fixed Augments+ and Quirk points to interoperate as expected. You can - now use your points balance to select augments, and select augments to earn - points! -======= 2023-02-13: Jacquerel: - rscadd: Wizards can now perform a Grand Ritual to summon unpleasant events to @@ -1085,13 +965,11 @@ - bugfix: fixes a potential bug that can cause the detective scanner to get stuck in a scanning state indefinitely 2023-02-15: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: Sitting on benches no longer gives you a weird offset that makes you look like you're standing on them. - bugfix: Returns benches to their original light brown color, rather than the middle between brown and cyan that they were at for a bit. -<<<<<<< HEAD GoldenAlpharexx: - bugfix: Towels will now properly display on digitigrade characters. - imageadd: Towels now have a digitigrade worn sprite too! @@ -1150,7 +1028,6 @@ - bugfix: False alarm radiation leaks should be less obvious - bugfix: Fixes some traitor objectives from dropping in blacklisted areas, like security. -======= Jacquerel: - bugfix: Hacking the Comms Console or winning a Revolution can no longer spawn antagonists if there's not enough time left in the round for them to antagonise @@ -1167,21 +1044,11 @@ - config: ALL antags in the policy.json file will now get notified of any existing policy set by the admin team, rather than only a handful. - bugfix: Fixed a runtime with examining empty bomb frames ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed a FIVE YEAR OLD issue causing Time Stop to be a 3x3 instead of a 5x5. Really. - bugfix: The gravity generator correctly gives "forced gravity" to all adjacent mobs - bugfix: Fixed some runtimes with Time Stop, and other miscellaneous issues -<<<<<<< HEAD - - code_imp: Hostile Station Lockdown, from Malfunctioning AIs, will no longer halt - the server momentarily - SkyratBot: - - bugfix: You can no longer keep an AI trapped in their core by healing them with - a Rod of Asclepius - - bugfix: Bileworms which have been struck down but not butchered no longer return - in a more powerful form. -======= NamelessFairy: - spellcheck: Head of staff lockers and prison cell lockers have had their proper noun status returned. @@ -1216,7 +1083,6 @@ risen ghoul. - refactor: Refactored mutanthands for zombies and shattered risen. NamelessFairy: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Reinforced plasma windows will now drop plasma glass instead of regular glass when broken. - bugfix: Tram windows drop the correct number of rods and a shard when broken instead @@ -1225,12 +1091,10 @@ the file slightly. - refactor: spawnDebris has been un-hardcoded and all (but one) override of it has been removed. -<<<<<<< HEAD - code_imp: Added unit testing to force all ruins to spawn for CI build - bugfix: eyesnatchers that say that they haven been used up can't be used again - bugfix: Things dropped into a chasm should no longer occasionally become invisible and intangible. -======= Profakos: - bugfix: eyesnatchers that say that they haven been used up can't be used again ZephyrTFA: @@ -1291,7 +1155,6 @@ tralezab: - refactor: Monkey AI descriptions of "primal eyes" no longer show if the monkey is missing eyes. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-02-18: Chubbygummibear & JohnFulpWillard: - rscadd: A ton of new NtOS themes, which are accessible by the new Themify application @@ -1308,7 +1171,6 @@ - bugfix: Programs no longer download twice. - rscdel: Removes the Chemistry computer disk as it was empty due to chemistry app's removal -<<<<<<< HEAD LT3: - code_imp: 'Disease Outbreak: Disease max severity replaced with requested severity' - code_imp: 'Disease Outbreak: Generated disease now includes symptom based name' @@ -1387,7 +1249,6 @@ of downloading illegal ROMs if you change your theme to anything that isn't Syndicate. - bugfix: NtOS themes are now recognized by all windows. -======= Jacquerel: - bugfix: Cramped escape pod walls no longer appear to merge with those of the station, which will be a big relief to the single occupant. @@ -1435,14 +1296,12 @@ 2023-02-19: Jacquerel: - bugfix: You can no longer eat pizza floor tiles with your brain. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Lobstrosities and Tarantulas will once more vibrate to let you know they're about to charge at you. - bugfix: The Savannah Ivanov will once more vibrate to let you know it's about to jump into the air. - bugfix: The DNA infuser will now vibrate to let people know that it's busy blending someone with a dead animal. -<<<<<<< HEAD - bugfix: Guillotines can be unanchored again - bugfix: Fixes mending globule ability not having a cooldown - bugfix: fixed throwing description to always say "it was thrown very hard" even @@ -1619,7 +1478,6 @@ - imageadd: Almost all Mekas have been resprited in their entirety. Halcyon: - bugfix: The Paramedic cap is now the same color as their jumpsuit again. -======= LemonInTheDark: - rscadd: The darkness that glasses and hud goggles that impact your nightvision (think mesons, nightvision goggles, etc) lighten is now tinted to match the @@ -1657,7 +1515,6 @@ - bugfix: NtOS themes are now recognized by all windows. - spellcheck: Hallucinations where you see people put things away now tell you they put the right thing away. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JohnFulpWillard and itsmeow: - bugfix: Messenger now clears photos after you send it, so you don't send a photo repeatedly until you manually clear it. @@ -1665,11 +1522,9 @@ with old PDAs) - bugfix: AIs can now select photos in their Messenger app. - bugfix: Messenger no longer says you're sending outgoing messages to yourself. -<<<<<<< HEAD Melbert: - bugfix: Gaining nobreath in an N2O heavy environment doesn't make you forever aware of it -======= LT3: - imageadd: Wall mounted tram sign now has improved emissives and casing LemonInTheDark: @@ -1822,7 +1677,6 @@ - bugfix: Premade viruses (GBS, beesease, etc) now show up in the PANDEMIC again - bugfix: PANDEMICs should bluescreen less often. Maybe. - bugfix: Mecha speech indicators actually go away ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Scan gates correctly flick their alarm overlays, I think they already looked correct but now it's more correct - bugfix: If you are somehow a human without a species, the generic zap animation @@ -1830,7 +1684,6 @@ - bugfix: Nuke Ops Leaders midround don't spawn on Arrivals Shuttle late for work - bugfix: (Maybe) fixes some additional issues related to midround nukie / abductor spawns -<<<<<<< HEAD - bugfix: Premade viruses (GBS, beesease, etc) now show up in the PANDEMIC again - bugfix: PANDEMICs should bluescreen less often. Maybe. Motho: @@ -1874,7 +1727,6 @@ ATHATH: - spellcheck: Corrects the description of the transmission 4 threshold effect of the Narcolepsy symptom to more accurately reflect what the effect does. -======= NamelessFairy: - bugfix: The unanchored reinforced plasma-glass windows on snowdin have been anchored. - bugfix: Unregistered paywall firing pins wont vanish when you try to insert them @@ -1905,38 +1757,12 @@ - bugfix: Spiders will stop being on fire marginally faster, as they used to. - bugfix: Mob spawners will no longer break if instructed to spawn certain kinds of basic mob, or monkeys. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Disease Outbreak doesn't give up so easily when trying to start the event - balance: Disease Outbreak will not spawn on positive virus mobs, but can be transmitted if resistance is low - bugfix: Disease Outbreak creates an entry in the virus log like it should - admin: Admins can see Disease Outbreak virus stats when the event starts -<<<<<<< HEAD - - admin: Roundstart logout report is written to the admin log - - admin: Roundstart report threshold is now 10 minutes - Paxilmaniac: - - rscadd: Void raptor now has an abandoned pizzeria attached to the station where - the portal to moffuccis used to be. - - rscdel: the abandoned pizza place stuffed in some sand floating alongside void - raptor has been removed. - SkyratBot: - - bugfix: The unanchored reinforced plasma-glass windows on snowdin have been anchored. - - bugfix: Maintenance tunnels should no longer sometimes contain airlocks with walls - underneath them. - - bugfix: Using a teleport scroll will deplete a charge regardless of whether used - in-hand or by pressing the action button. - - bugfix: Added E.X.P.E.R.I.M.E.N.T.O.R - - bugfix: Un-aimed admin rods will now actually be un-aimed instead of aimed at - the previous aimed rods target. - - admin: Admin aimed rods will now log that they're aimed randomly when not aimed. - - bugfix: surplus crates and united surplus crates now properly show up as a purchase - in the round end screen - - rscadd: Adds privacy shutters for quartermaster. Shutters on Kilo/IceBox and blastdoors - on Meta/Delta/Tram. Also changed doors with glass to common ones. - vinylspiders: - - bugfix: fixed emergency shutters' bottom lights still blinking when door is opened -======= NamelessFairy: - bugfix: Any worn item that has its color changed will now have its color change reflected on the item's worn icon immediately. @@ -1994,4 +1820,3 @@ - admin: The Tallboy is here jlsnow301: - bugfix: Fixes NTOS records program receiving bad medical disability data ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-03.yml b/html/changelogs/archive/2023-03.yml index 7185373119b..0a75b6a939f 100644 --- a/html/changelogs/archive/2023-03.yml +++ b/html/changelogs/archive/2023-03.yml @@ -1,5 +1,4 @@ 2023-03-01: -<<<<<<< HEAD Melbert, That REALLY Good Soda Flavor, FatFat, AndreyGusev: - rscadd: 'Spacemen can now have varying height. (Admin only for now) add: Dwarfs are now slightly shorter, but look way better.' @@ -51,7 +50,6 @@ have stopped doing that. - bugfix: You can no longer trap yourself in north public mining maintenance if you enter it without maint access. -======= Jacquerel: - bugfix: Opening a surprise egg with your mind will no longer teleport the contents Maurukas: @@ -92,7 +90,6 @@ - bugfix: Nightmare revival acts less funky - stops it from re-creating the Light Eater. NamelessFairy: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The research directors monitor on tram has been correctly orientated - bugfix: The CE on tram no longer has two engineering department monitors, one has instead been swapped out for an engine monitor. @@ -100,7 +97,6 @@ or AI core networks, this means security cannot see the entire satellite from a standard camera console. - spellcheck: Some cameras on tram have been capitalized. -<<<<<<< HEAD - bugfix: fixes taking items from inventories glitching out in hyperspace - bugfix: Sec huds should properly label targets with the new record system - bugfix: Opening a surprise egg with your mind will no longer teleport the contents @@ -219,7 +215,6 @@ - bugfix: The HoS' PDA painter can no longer paint PDAs into Lawyer ones. - bugfix: You can no longer multiply banana peels, gatfruit and more by using sliceable custom food -======= - bugfix: You can no longer trap yourself in north public mining maintenance if you enter it without maint access. Profakos: @@ -247,29 +242,11 @@ Chlorotrifluoride: - imageadd: added prettier icons for the normal and absorbent galoshes Draggeru: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds the tape wizard costume, both a real and fake variant - rscadd: 'Adds the costume behind the autodrobe contraband wire, and the real variant in the wiz den :cl:' -<<<<<<< HEAD - - bugfix: frozen gas tanks now release their contents upon shattering - - bugfix: holodeck gas tanks can now be deconstructed - - balance: The pipegun's chance to misfire and shoot at you rather than the person - you're pointing it at has been removed - - bugfix: Papercode has been significantly improved and trivially filled paper forms - should no longer lag or crash players' game clients. - - imageadd: added prettier icons for the normal and absorbent galoshes - - rscadd: Introduces orderable rabbit crate to cargo livestock. - - bugfix: fixed missing inhand icon state for jaws of life - Vlada - VastKilleroOm: - - imageadd: added 1 hairstyle icon - tf-4: - - bugfix: Monkeys are no longer able to teleport out of the Interdyne xenobio slime - pens. -2023-03-06: -======= Jacquerel: - bugfix: Most spells can once again be cast even after someone stuns you with a baton. @@ -343,51 +320,12 @@ issued ones. Iamgoofball: - bugfix: You can no longer fortnite with glass sheets ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - rscadd: Added new multi-vote system - balance: Map votes are now calculated using multi-vote instead of the old single-vote system - admin: Admins can now use either multi-vote or single-vote for custom votes - code_imp: Map choice filtering uses active player count, not all connected clients -<<<<<<< HEAD - Melbert: - - bugfix: Jobs get "You are the" and policy text again on spawn - SkyratBot: - - bugfix: Atmosians have finally convinced the thermomachines to not self-destruct - when built on blocked ports. - - bugfix: Failing to wrench down a thermomachine no longer hits it with the wrench. - - rscadd: Added a traitor final objective to infect the station AI with a virus, - that turns it malf and fully loyal to the traitor - - balance: the syndicate realized Chief Engineer is important enough to kidnap - - bugfix: kidnap objectives will now properly be unavailable for you for 15 minutes - after you take three, instead of after you take three assassinations. - - bugfix: Bartender's fountain pen was omitted during the swap over to tablets, - this has been amended. - - balance: Latejoin dynamic rulesets have been rebalanced to reduce the frequency - of midround revolution spawns. - Vishenka0704: - - admin: Added a ticket into mentrohelp convertation. Better than say "write it - to mentors". -2023-03-07: - Iamgoofball: - - bugfix: You can no longer fortnite with glass sheets - LT3: - - bugfix: Admins can jump to/follow patient zero of a disease outbreak again - SkyratBot: - - bugfix: You can no longer have multiple copies of the same heirloom theft objective - - qol: made ORM easier to use - - rscadd: Updated the bus ruin - - spellcheck: fixed humanoid examine easter egg's pronoun usage - - qol: Regal Rats produce meat on butchering, reducing player confusion. - - bugfix: fixed butchering bread dog spawning error bread. - - balance: Cult can no longer draw runes in survival pods. - Zergspower: - - rscadd: 'Added missing job titles to SR specific ghost roles: BMD, DS2, Freighter, - Port Tarkon and Ghost Cafe!' - - qol: SR Specific ghost roles will now be itemized and tracked inside your hour - window -======= - bugfix: Admins can jump to/follow patient zero of a disease outbreak again OrionTheFox: - bugfix: fixed missing emissives on the Engivend, Pwr-Game Soda, and generic Soda @@ -443,7 +381,6 @@ - spellcheck: fixed humanoid examine easter egg's pronoun usage carshalash: - qol: Regal Rats produce meat on butchering, reducing player confusion. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 coiax: - refactor: Refactored how eggs growing into chicks is implemented, and how the number of chickens and chicks are tracked. It's now possible for admins to make @@ -452,7 +389,6 @@ - rscadd: Nanotrasen has added a martial artist gi to the AutoDrobe for those who want to go even further byond. - imageadd: Aforementioned gi sprites. -<<<<<<< HEAD tf-4: - bugfix: There's no longer a vendor that will sometimes block one of the doors to the interlink shuttle @@ -487,7 +423,6 @@ - bugfix: The party alarm now works again! - bugfix: Corgis show their ID on examine. 2023-03-10: -======= tralezab: - bugfix: changed gondola mutants to require gondola meat instead 2023-03-08: @@ -497,7 +432,6 @@ would actually be victimised by the crime. - rscadd: Traitors can sometimes be tasked with stealing and destroying the roboticist's big crowbar, if there is one ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - imageadd: New tram and elevator sprites - code_imp: Lighting capability for all buttons @@ -508,7 +442,6 @@ - bugfix: Science keycard auth can only be done from RD office - code_imp: More Tramstation mapping helpers - bugfix: Fixed Icebox pharmacy shutters lighting runtimes -<<<<<<< HEAD RatFromTheJungle: - bugfix: the CMG, which was previously full-auto, is once more full-auto SkyratBot: @@ -528,7 +461,6 @@ anymore, this has been moved to the non-abstract types. - balance: Rebalances rewards from repeatable traitor objectives to be more consistent with each other. -======= LemonInTheDark: - bugfix: Examining in the dark is less wonk now, sorry bout that Melbert: @@ -557,14 +489,12 @@ - bugfix: Some airlock access oversights on tramstation have been fixed. The service lathe cannot be accessed by jobs that shouldn't have access via maint and robo/engi's cant get into secure tech storage. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'Rapid lighting devices can now have their color set to #ffffff and the resulting lights will now function.' - bugfix: Rapid lighting devices will now default its set color to white when created instead of trying to produce colorless lights. - bugfix: The rapid lighting device can now be used in the dark when producing glow sticks or floor lights. -<<<<<<< HEAD - rscadd: Adds the rest of the lipsticks to the cosmetics.dm Zonespace27: - rscadd: Drifting Contractors start with an atropine pen to prevent your microbomb @@ -758,9 +688,7 @@ die of cold. - bugfix: Mime finger gun icon is no longer an error - admin: Logs when mimes break or make a vow of silence -======= - bugfix: The party alarm now works again! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Admin event setup's have been refactored to use lists. - bugfix: When admins customize the pirate event all options will be available rather than just options that have not been randomly rolled. @@ -769,7 +697,6 @@ event. - admin: Admins can now randomize the disease outbreak classic event to roll any disease type, including transformation diseases so have fun with that. -<<<<<<< HEAD - balance: Abductors' midround spawn weight has been increased. Expect to see them more often - bugfix: fixed chat offsets with the RPG Titles event @@ -891,7 +818,6 @@ - bugfix: fixed glass lens description - code_imp: code cleanup for the language fixes 2023-03-12: -======= Rhials: - spellcheck: Fixes the Russian/Bounty Hunter fugitive hunter spawn backstory messages. Sealed101: @@ -940,7 +866,6 @@ GoldenAlpharex: - bugfix: Fixed some potential future runtimes relatively to the new bodypart overlay system's coloring procs. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jacquerel, sprite by J(Clearly Lying): - balance: Traitor objectives which ask you to destroy lathes or the ORM provide an optional bonus if you _booby trap_ the machine using a provided tool. This @@ -948,8 +873,6 @@ - balance: Performing the objective without rigging the machine to explode awards no TC, using it awards more TC than it did previously. LT3: -<<<<<<< HEAD -======= - bugfix: Map filter works properly in the pre-round lobby - bugfix: Map vote doesn't log 'not enough players' if the vote starts in the pre-round lobby @@ -973,7 +896,6 @@ - bugfix: The Spell Cards spell now displays the correct icon instead of a big red "error" text. LT3: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Anomaly event parameters consolidated to defines - balance: Anomaly countdown timer reduced to 75 seconds Melbert: @@ -981,15 +903,6 @@ - bugfix: Fixes Juggernaut projectiles not doing bonus damage to nearby structures - code_imp: Removed projectile nodamage var, replaces it with just checking for damage -<<<<<<< HEAD - SkyratBot: - - bugfix: fixed missing disposal pipes (tramstation) - - bugfix: fixed missing zones (tramstation) - - bugfix: fixed wrongly placed zones (tramstation) - - bugfix: fixed wrongly placed tiles (tramstation) - - bugfix: Changed Quantum Hair Dye recipe from colourful reagent, space drugs and - radium to colourful reagent, space drugs and chlorine. So you can make it normally. -======= NamelessFairy: - bugfix: Firing pin swapping's 2 balloon alerts have been replaced with a single more readable one. @@ -1004,33 +917,11 @@ - code_imp: Made pirate groups' arrival messages editable and more importantly unique for each group. VladinXXV: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fake nuclear authentication disks have been updated to include the holographic security sticker found on the real disk, one again making them convincingly real to the average person. - code_imp: The keep_me_secured component will now only process if it has at least one callback argument passed. -<<<<<<< HEAD - - bugfix: The cultist ritual site locator and Nar'Sie summon message will no longer - use area names modified by the CE's blueprints. - - bugfix: Firing pin swapping's 2 balloon alerts have been replaced with a single - more readable one. - - admin: Admins can now edit a pin_removable var on firing pins to render them unremovable - from the weapons they're installed in. - - bugfix: Spell Cards from the Wizard spell will now home in somewhat on the target - nearest to your cursor. - - bugfix: The Spell Cards spell now displays the correct icon instead of a big red - "error" text. - - bugfix: Pods on Tramstation can be properly launched early - Stalkeros, san7890 for the announcement texts: - - code_imp: Made pirate groups' arrival messages editable and more importantly unique - for each group. - Syrox25: - - rscadd: 'Adds new Taur variant: "Goop"' -2023-03-13: - Baron: - - imageadd: Replaced Arachne borg sprite -======= spockye: - bugfix: fixed missing disposal pipes (tramstation) - bugfix: fixed missing zones (tramstation) @@ -1040,20 +931,11 @@ CRITAWAKETS: - config: All dynamic midround rulesets are now properly accounted for in the dynamic.json config. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MMMiracles (tramstation): - rscadd: Tramstation's Science department has received a substantial remodel! Please consult your local tour guide for more information. - rscadd: The Vacant Commissary office has been moved to the top floor near Departures, with a new Barber shop taking its place on the lower floor. -<<<<<<< HEAD - Zergspower: - - balance: Severely lowers the SEVA Suits temperature protection to 600 K down from - 35000 K - nikothedude: - - bugfix: CUCKS now properly shows the name of waht it will deploy, + fixes a runtime - associated with it -======= Nabski: - imageadd: Renault has a dopey walk animation now, god bless. Thunder12345: @@ -1065,13 +947,10 @@ - imageadd: Changed sprites for wooden chairs, comfy chairs, electric chairs, folding chair and shuttle seats! - imageadd: Resprites Donut Box, and all sprites for donuts in it. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-03-14: GoldenAlpharex: - bugfix: You should only be able to spawn as one ghost role at a time. Close the prompt if you want to spawn as another one. Begone soulless randomgen humans! -<<<<<<< HEAD -======= Jacquerel: - rscadd: A station trait which sometimes populates maintenance with small spiders. You can wear them as a hat if you wanted to have a spider on your head for some @@ -1080,7 +959,6 @@ JohnFulpWillard: - code_imp: The Server ending announcement is now sent to players once the game has properly ended. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - bugfix: On IceBox, there shouldn't be wires looping under the walls near the vault anymore. @@ -1093,7 +971,6 @@ both candy and explosives. Still fun at parties. - admin: Admins can now turn players, mobs and objects into pinata's with the new pinata component. -<<<<<<< HEAD Nabski: - imageadd: Renault has a dopey walk animation now, god bless. Paxilmaniac: @@ -1176,7 +1053,6 @@ keys in your keybindings menu, under game preferences. - qol: Clicking on the turf of a fire alarm/light switch with your hand will activate it. -======= NamelessFairy: - bugfix: When learning new cult spells their buttons will no longer stack on top of one another. @@ -1187,14 +1063,12 @@ Watermelon914: - bugfix: Fixed playmins having access to admin functions within normal integrated circuits. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Removed a lot of item targets from the temporary steal traitor objectives and replaced them with more useful items that don't intersect with the list of items that a traitor can be tasked with stealing for their permanent steal objective. - rscadd: Re-added permanent steal traitor objectives and maroon/hijack/die a glorious death objectives. -<<<<<<< HEAD - bugfix: The metallic hydrogen axe is no longer silent when using it as a crowbar. - bugfix: You are now capable of hitting standard windows with a crowbar when they're fully constructed. @@ -1215,7 +1089,6 @@ - bugfix: Re-implements changing a crewmember's physical/mental status via a Med-HUD. Zonespace27: - rscadd: Added a black dog plushie for a donator -======= coiax: - bugfix: "In order to make l\xF6rtonknusksolt, fl\xF6fr\xF6lenknusksolt and k\xE6\ niatknusksolt, bowls are required, to match the bowls in their sprites and left\ @@ -1282,12 +1155,10 @@ atosti: - bugfix: Re-implements physical and mental statuses in crewmember medical records. - bugfix: Re-implements changing a crewmember's physical/mental status via a Med-HUD. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 coiax: - rscadd: Chefs can sometimes get ketchup bottles in the mail. - bugfix: Ketchup in the crafting menu is now represented as the bottle, rather than an empty condiment pack. -<<<<<<< HEAD 2023-03-17: GoldenAlpharex: - rscdel: Removed the possibility to get slowly turned to ashes (and thus getting @@ -1322,7 +1193,6 @@ - bugfix: 'If you notice any bugs related to the rendering of your characters, please report them using the "Report Issue" button at the top-right corner of the screen, mentioning #19635 in it for ease of reference.' -======= mc-oofert: - rscadd: Added stickers, purchasable from cargo vinylspiders: @@ -1367,13 +1237,11 @@ DAKKA-WAAAGH: - bugfix: Removes duplicate decals and replaces them with new ones that are more efficient ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - bugfix: Light office chairs and Dark office chair colors are, now actually reflective of the name. - bugfix: Left/Right office chairs should be symmetrical and no longer be one pixel off when flipped. -<<<<<<< HEAD Melbert: - admin: Logs when forced events trigger Paxilmaniac: @@ -1394,7 +1262,6 @@ - qol: medical cyborg's surgical processor now lists downloaded surgeries on examine - balance: The janitor's trashbag now fits on his belt. In exchange, taking something out of it sends a visible message, and has a delay. -======= - bugfix: The directional states for the toppled wooden chair sprites are now consistent. You really can't tell visually, but its been fixed. - imageadd: Using the new wooden chair sprites, there's now new toppled wooden chair @@ -1407,24 +1274,10 @@ - bugfix: Your species will no longer get deleted if a changeling who copied you is deleted from existence SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: suit storage unit circuit boards to engineering & science department circuit printers. - rscadd: freezer cabinet as a craftable & destructible item. - qol: flood light can now be deconstructed rather than destroyed/thrown away. -<<<<<<< HEAD - - spellcheck: fixed a box of party_poppers and camera tag "tech_storage" - softcerv: - - bugfix: cryo now saves modular persistence - vinylspiders: - - bugfix: fixes the sadism perk causing unreasonable amounts of arousal when around - corpses--now only live mobs that are in pain count towards it. -2023-03-18: - Paxilmaniac: - - bugfix: The CIN armor vests from cargo will now rotate with the person wearing - them, rather than not at all -2023-03-19: -======= - bugfix: area machinery from breaking after creating & modifying areas via the station blueprints. - refactor: turfs are cannonized from areas during creation/editing operations & @@ -1451,12 +1304,10 @@ - bugfix: Turrets will now shoot basicmobs such as carp - bugfix: Explosive holoparasites no longer runtime if they plant bombs 2023-03-18: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ATHATH: - balance: The inorganic biology symptom now adds both MOB_MINERAL and MOB_ROBOTIC to a virus's list of infectable biotypes instead of only MOB_MINERAL. Currently, androids are the only species this change affects. -<<<<<<< HEAD GoldenAlpharex: - bugfix: Fixed some issues with podpeople hair and horns not being drawn under the right circumstances all the time. @@ -1496,7 +1347,6 @@ - bugfix: Stabilized gold extracts can now spawn basicmobs - rscadd: Adds the Snatcherprod. Like a teleprod, but it steals stuff from peoples hands instead. Made using a telecrystal, rather than a bluespace crystal. -======= DAKKA-WAAAGH: - bugfix: Fixed duplicate tile decals and made tile decal shapes more efficient Helg2: @@ -1507,7 +1357,6 @@ - bugfix: fixed that you can manipulate with pie gun as if it's a normal pneumatic cannon (adjust air tank, wrench it's output level's and etc.) Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Carp will once again be healed from being near carp rifts - bugfix: Sepia slime cores and the rewind camera now work on Ian - bugfix: Sapient ridden carp (or cows) can throw off their riders by shoving them, @@ -1532,7 +1381,6 @@ - rscadd: Petsplosion wizard event will now target farm animals and mothroaches - bugfix: The colossus possession crystal can now actually possess the cockroach it spawns, does not kill you instantly upon ending possession -<<<<<<< HEAD - bugfix: Player-controlled Regal Rats now lick or claw based on their combat mode. - bugfix: NPC Regal rats now properly claw at enemies, moving on to new targets after completing kills. @@ -1561,7 +1409,6 @@ CTF. - bugfix: Pubbystation, if run, will now have a working monastery pod shuttle again. - bugfix: Turrets will now shoot basicmobs such as carp -======= Jolly: - rscadd: 'CTF has a "new" map: ctf_turbine! I hope you like 24/7 TDM where the objective is secondary.' @@ -1585,12 +1432,10 @@ another area via station blueprints - refactor: merged` Initialize()` & `New()` of vents & scrubbers into just `Initialize()` ZephyrTFA: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Surgical Processor upgrade for medical cyborgs can now be used to start surgeries. - balance: You no longer need to use two module slots for starting surgeries with the surgical processor. -<<<<<<< HEAD - qol: Abductors chat and Lings/Xenomorphs hivemind chat type has been moved from unsorted to radio. - bugfix: Material tile floors now make noise when walked on by bare/claw/heavy @@ -1603,20 +1448,16 @@ - bugfix: fixed that you can manipulate with pie gun as if it's a normal pneumatic cannon (adjust air tank, wrench it's output level's and etc.) - balance: Bone gel now spawns in stacks of 4 in Paramedic and Medical ERT belts -======= atosti: - balance: Bone gel now spawns in stacks of 4 in Paramedic and Medical ERT belts - bugfix: Player-controlled Regal Rats now lick or claw based on their combat mode. - bugfix: NPC Regal rats now properly claw at enemies, moving on to new targets after completing kills. mc-oofert: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: You can no longer bypass recyclers indestructibility check by just putting it into something - bugfix: Recyclers can no longer recycle the insides of cyborgs - balance: You can no longer EMP defibrillators to make them combat-usable -<<<<<<< HEAD -======= vinylspiders: - bugfix: the 'target cyborgs' option for syndicate turrets is now functional again, and enabled by default. Station borgs will still be shot at on sight unless @@ -1645,13 +1486,11 @@ - admin: You can now optionally populate new lists created via vv. hit cancel to stop filling them up NamelessFairy: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Admins can now customize the outfit necrostone victims are equiped with. - admin: Admins can now customize the maximum number of thralls that can be created by a necrostone - qol: The necrostone's thrall counter is now a shown as a separate colored line of text when examining the stone rather than part of its description. -<<<<<<< HEAD - qol: Tramstation's kitchen has been completely refurbished! Vile Beggar: - rscadd: The Derelict Sulaco ruin was spruced up with a new look and some neat @@ -1679,19 +1518,15 @@ Melbert: - bugfix: Fixes rare human arm melting condition SkyratBot: -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: When inspecting syndicate bombs the text that tells you how long is on the timer stands out more. - qol: Inspecting an active syndicate bomb will give you a balloon alert on the bomb itself when inspected. -<<<<<<< HEAD - admin: You can now optionally populate new lists created via vv. hit cancel to stop filling them up - bugfix: removed two decals from a space ruin. - bugfix: Fix not being able to read in full bright areas 2023-03-21: -======= - qol: Abductors chat and Lings/Xenomorphs hivemind chat type has been moved from unsorted to radio. - admin: Admins can now customize the wisdom cow event. @@ -1737,7 +1572,6 @@ - bugfix: Wirecarp can no longer be used to see if Nukies exist through their networks. - rscdel: Removes Software downloading and communication Ntnet networks, as they were pretty worthless. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JohnFulpWillard, sprites by BalkyGoat: - rscadd: ' The Janitor Access key: Janitors can now be given departmental AA (one at a time) using the Keycard authentication device in Command offices. Use it @@ -1745,7 +1579,6 @@ - bugfix: HoP's trim is no longer set to edit Supply access. LT3: - code_imp: Tram crossing signal/platform logic improvements -<<<<<<< HEAD - fix: Fixed emergency maint access icon on keycard auth SkyratBot: - balance: 9mm, 10mm, and other stuff can cause wounds. @@ -1753,7 +1586,6 @@ - bugfix: Plasmamen and golems (and androids, if you ever find one) can be implanted again. - qol: adds service radio to jani/curator/chaplain/lawyer vendor -======= OneAsianTortoise: - qol: adds service radio to jani/curator/chaplain/lawyer vendor Pickle-Coding: @@ -1765,14 +1597,12 @@ - bugfix: midwife spider eggs can no longer generate in atmos-hazardous areas. atosti: - bugfix: Organ harvesters now open and abort harvesting when losing power ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 coiax: - bugfix: Coffee cups are now correctly immune to becoming frozen by low temperature water vapour. - bugfix: Holosigns, like the atmos holofan, can no longer be frozen by low temperature water vapour. 2023-03-22: -<<<<<<< HEAD LT3: - bugfix: Tramstation xenobio now has slimes because apparently you need them? idk i'm not a science nerd @@ -1846,7 +1676,6 @@ - bugfix: pod person hair can be once again styled by secateaurs - qol: Prosthesis organ manipulation now warns you if you are using the incorrect engineering tool -======= DATA-xPUNGED: - spellcheck: "Pacoca is now called \"Pa\xE7oca\", as it should" Helg2: @@ -1892,12 +1721,10 @@ - rscadd: Added Traveler's Rest, a tiny space structure for space travellers to relax and to prepare for the explorations ahead. Rhials: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Xenomorphs born in the room the roundstart delivery egg was spawned in will be part of a special "captive xenomorph" team, tasked with escaping and tracked in the roundend report. - bugfix: Regular Xenomorphs no longer receive a blank objectives popup on spawn. -<<<<<<< HEAD - bugfix: Androids now properly have robotic wings instead of moth wings. - bugfix: fixes deadly harvesting just taking harmless extorgans - code_imp: renames internal_organs to organs now that it can also contain external_organs @@ -2083,7 +1910,6 @@ teleports your brain to the mythical Gem Room. - balance: Changes the universal click cooldown of the tendril hammer from the goliath infusion into an internal cooldown just for the special heavy attack. -======= SmoSmoSmoSmok: - bugfix: the orm will no longer display weird decimals SyncIt21: @@ -2100,7 +1926,6 @@ - bugfix: drawing from an empty tarot card deck no longer causes runtimes vinylspiders: - bugfix: fixes gondola meatslab not being able to be placed into the DNA infuser ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: adjusted the blood deficiency quirk for slimepeople to not cause excessive hunger as long as blood volume is kept above 550 via an IV drip (or other means of getting welding fluid/some other toxin etc into the bloodstream, e.g. ingestion) @@ -2109,10 +1934,8 @@ - rscadd: 'adds new blood bag types: TOX (slimepeople), H2O (podpeople), S (snail)' - bugfix: fixed blood deficiency quirk causing wild fluctuations in blood volume on the analyzer, giving more accurate readings -<<<<<<< HEAD - bugfix: Moved the tank compressor and some tables and the anomaly refinery so that the tank compressor could actually be usable again on Tramstation. -======= 2023-03-25: 13spacemen: - qol: It is now obvious when examining volume pumps that you can multitool them @@ -2144,7 +1967,6 @@ cats4gold: - qol: adds the weight class 'tiny' to paper slips timothymtorres: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Add crafting recipe for basketballs (leather sheets) and basketball hoops (metal, rods, and durathread) - rscadd: Add new basketball minigame for 2-7 players. There are 4 different courts @@ -2159,11 +1981,9 @@ - soundadd: Added basketball bounce sound with credits attribution - imageadd: Added basketball icon to minigames. Move baseball and dodgeball icons to toy/balls.dmi -<<<<<<< HEAD - bugfix: DNA Scanners, Sleepers, Abductor Experimentors, Skill Stations and Mod Installers now appropriately release their contents when opened, fixing an issue where they could permanently absorb players and items until admins intervened. -======= 2023-03-26: Chlorotrifluoride: - imageadd: prettified all RTD icons @@ -2208,7 +2028,6 @@ - balance: Ones that are found cannot have anything uploaded/deleted off of them either, you can only upload them to the Web. - code_imp: Every individual Bepis disk no longer create an entire techweb ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Computers are now properly connected to Ethernet, and can use Ntos when Relays are down. - refactor: Removes Ntnet and Ntnet interfaces, which was only used by Ntnet circuits @@ -2220,7 +2039,6 @@ - qol: Wirecarp logs is now set to save 300 at once, instead of 100 and being increased to 300 by the RD during the round. This is pretty insignificant, since there's no reason to NOT want as many logs as possible. -<<<<<<< HEAD - balance: No-slip mod module and no slip shoes no longer have a reputation lock. Stalkeros: - bugfix: Fixes the lack of Pan-Slavic for the NRI cops midround. @@ -2260,7 +2078,6 @@ - rscdel: Revert elevator panel UI theme change OrionTheFox: - rscdel: Removed the obsolete Microfusion Cell Containers that spawned in the armory. -======= LT3: - imageadd: Fire alarm sprites are directional again - imageadd: Solo benches are no longer invisible when facing east/west @@ -2326,15 +2143,12 @@ that the tank compressor could actually be usable again on Tramstation. Profakos: - bugfix: the roboticist in the prey pod now has clothes as intended ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - rscadd: You can now vote to start a Mafia game early. If over half of the current signups vote (And you have three or more players) you will immediately start a game with a slightly adjusted set of roles. - admin: You can now force a mafia game to start in the admin options panel. -<<<<<<< HEAD SkyratBot: -======= SethLafuente: - balance: Increased Bonus Reward for kidnapping alive targets - balance: Changed Virologist and Scientist into Common objectives for kidnapping @@ -2353,7 +2167,6 @@ - rscadd: remakes the old escape pod shuttle 2023-03-29: IndieanaJones: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The pirate gangs have been split into two subcategories, one which can spawn earlier in a shift and one that spawns later as they currently do. While skeleton pirates will still be only seen later into the shift, expect to see @@ -2362,7 +2175,6 @@ were available. - bugfix: Pirates can no longer be selected by Dynamic if there are no more pirates gangs that can be used. -<<<<<<< HEAD - qol: you can choose your default paint color for the "Tagger" quirk from prefs. - bugfix: fixed disposals on the starfury - bugfix: fixed flooring on the starfury @@ -2394,16 +2206,13 @@ - balance: Increased Bonus Reward for kidnapping alive targets - balance: Changed Virologist and Scientist into Common objectives for kidnapping - balance: Changed Paramedic into Uncommon objectives for kidnapping -======= JohnFulpWillard: - bugfix: Experimentors can connect to techwebs that have at least one RD server on the level. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Curators/HoP can now manage Newscaster D-Notices (previously was Warden/HoS). - balance: Security Officers/Detectives can now issue Wanted notices on Newscasters. - balance: Ntos Newscaster now requires Library access only to download, not to run. -<<<<<<< HEAD - bugfix: Fixes a bunch of minor gravity bugs, report em if you see more yeah? - bugfix: Experimentors can connect to techwebs that have at least one RD server on the level. @@ -2465,7 +2274,6 @@ - qol: You can rename and change the description of nanite/thermal pistols. - bugfix: Fix Greytide Worldwide basketball stadium being able to explode from a fuel tank -======= LemonInTheDark: - server: The starlight config has been removed, as it is enabled by default Rex9001: @@ -2518,7 +2326,6 @@ - bugfix: fixed missing air alarm on the starfury - bugfix: fixed air turfs exposed to space on the starfury tralezab: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The dark matt-eor - rscadd: Summon a dark matt-eor final traitor objective - rscadd: Dark matter singularity variant, which can't grow as big as a regular @@ -2527,13 +2334,11 @@ - qol: added a lot of feedback to interacting with meteor shields - balance: emagging a lot of meteor shields warns the station, but emagging enough of them summons a Dark Matt-eor. -<<<<<<< HEAD - rscadd: "Ask your local bartender for the hottest drink of the year, the \"Pi\xF1\ a Olivada\"!" - rscadd: Adds a new space ruin, A Waystation under attack! - bugfix: The hermit of the Icemoon has decided to build their hut in some deeper caves for a bit more protection from the local fauna. -======= 2023-03-31: Capsandi: - rscadd: Added a new space ruin @@ -2574,6 +2379,5 @@ - bugfix: Fix Greytide Worldwide basketball stadium being able to explode from a fuel tank vinylspiders: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: cycler shotguns' inhand sprites will no longer float ominously by their wielder's side diff --git a/html/changelogs/archive/2023-04.yml b/html/changelogs/archive/2023-04.yml index e4cc5aef1f1..3ab0791ba8a 100644 --- a/html/changelogs/archive/2023-04.yml +++ b/html/changelogs/archive/2023-04.yml @@ -1,5 +1,4 @@ 2023-04-01: -<<<<<<< HEAD A.C.M.O.: - bugfix: Fixed lungs gas exchange implementation, so you always inhale and exhale the correct gases. @@ -14,7 +13,6 @@ Deranging: - bugfix: The graph in Power Monitor consoles is no longer under half its normal size. -======= Cheshify: - bugfix: The Lance goes deeper into the station when it docks. Deranging: @@ -26,14 +24,12 @@ in the head with their neck already slicen, instead of continuing killing them. - qol: you will no longer gain irritating messages, when trying to stab someone in the eye, instead of just stabbing them with screwdriver. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - balance: 'Random Disease: Fluids transmission frequency reduced' - balance: 'Random Disease: Respiration transmission frequency increased' - balance: 'Random Disease: Low severity frequency increased' - balance: 'Random Disease: Cures list removes dispenser reagents and food products' - balance: 'Random Disease: Minimum pop and minimum round timer added to event check' -<<<<<<< HEAD MMMiracles: - bugfix: The Bridge and Arrivals on Tramstation should now be firmly connected to the main distro loop once again. @@ -72,7 +68,6 @@ lpeapnni: - rscadd: Added chinchillas 2023-04-02: -======= LemonInTheDark: - bugfix: Lava and plasma rivers (openspace on icebox too) will generate now. This was broken for 2 years wtf man @@ -89,7 +84,6 @@ machines and devices :cl:' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DrDiasyl aka DrTuxedo#0931: - rscadd: Added 'biscuit' cards! They can contain documents and can only be accessed by cracking them open, you can't close them back. Nanotrasen now stores spare @@ -100,7 +94,6 @@ - bugfix: Now the paper slip is actually paper. - imageadd: The paper slips sprite was slightly tweaked to have text lay more logically, added the corporate paper slip. -<<<<<<< HEAD Gyran: - rscadd: Re-added the unused combat medkit to the Blueshield locker and changed the briefcase to a secure one @@ -141,18 +134,15 @@ gem room this time. For realsies. - qol: Bluespace tags are gone. The information contained within is still available in the same way, just in a more out-of-character format. -======= EOBGames: - qol: Bluespace tags are gone. The information contained within is still available in the same way, just in a more out-of-character format. Hatterhat: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Reagent containers that splash on people when thrown (e.g. molotovs) now spill their contents on both target and turf. (This means that throwing molotovs with enough fuel spills fuel puddles, throwing beakers with acid spills acid on the floor, etc. etc.) Unfortunately, molotovs still lack the ability to ignite their own spilled fuel, but we'll get there one day. -<<<<<<< HEAD - bugfix: Breathing pluoxium works again - rscadd: Sleeping with a pillow restores more health. - bugfix: fixes emissives blocker layering issue that was causing emissives on clothing @@ -290,7 +280,6 @@ SkyratBot: - bugfix: marisa shoes will now build its worn icon using the greyscale config like sneakers do -======= Helg2: - rscadd: Sleeping with a pillow restores more health. Jacquerel: @@ -364,13 +353,11 @@ - rscadd: Medical eyepatches 2023-04-05: Helg2: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: changed mech description to span_notices and just slightly comfier to use. - qol: added tooltips for mech's maintenance mode. - balance: added t4 parts for mauler and dark gygax. And t3 parts for dark honker. - bugfix: fixed that you can remove capacitor and scanmod from mech without proper maintenance steps. Now you can't -<<<<<<< HEAD - bugfix: The prey pod ruin no longer has two corpses, only one. - code_imp: The xeno_spawn landmark is now the generic_maintenance_landmark landmark. - bugfix: Certain midrounds will now check for atmos safety before spawning. @@ -421,7 +408,6 @@ in regular r-glass panes. LT3: - server: BYOND client compatibility check -======= - bugfix: West sided version of red alert fire alarm is now looks normally. JohnFulpWillard: - bugfix: QM's now get teleporter access on lowpop, like every other Command does. @@ -465,14 +451,12 @@ - rscadd: The tram now has a remote control for funny and/or nefarious purposes LemonInTheDark: - admin: All centcom ferries are now loadable. Yes this WASbroken ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Removes Rev code from core flash code - bugfix: Getting converted on April Fools now triggers the meme force say as always intended - rscdel: The meme force say can no longer trigger on any day (it didn't work before anyways) -<<<<<<< HEAD - bugfix: Fixed cult conversion Nerev4r: - bugfix: Synths no longer benefit from normal Tend Wounds. @@ -534,7 +518,6 @@ - code_imp: Adds a flag to send_clock_message, so the real notify_ghosts proc can be used instead 2023-04-09: -======= Mey-Ha-Zah: - imageadd: added new lavaland sprites, moved some sprites to a new location, adjusted pixel shift for the updated sprites, adjusted the name of some sprites. @@ -549,7 +532,6 @@ - imageadd: Split all icons in weapons_and_items.dmi to their own categories - imagedel: Removed some unused icons 2023-04-07: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - code_imp: Audits the placement of Generic events markers. Some departments which previously had none now have some, and maintenance largely no longer holds them. @@ -557,8 +539,6 @@ cascade portals are now placed in more commonly traversed and easy to identify areas. They will also now trigger in places like Icebox med and brig when they previously couldn't. -<<<<<<< HEAD -======= - bugfix: Fixed cult conversion NamelessFairy: - bugfix: Basketball and Thunderdome maps should not load with broken turfs are @@ -652,7 +632,6 @@ - balance: 2 More Cargo Tech slots Ical92: - bugfix: fixed duplicate pipe in Underground Outpost 45 Away Mission ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert, stove and pot sprites by Kryson, ladle sprite by Kinneb: - rscadd: Kitchens are now stocked with Ranges. - rscadd: You can now print (and create) Stoves. @@ -672,7 +651,6 @@ - rscdel: Soup is no longer food items, so can't appear in random food pools (at least not yet). - balance: Virus Food recipe now requires you cool it to 200k. -<<<<<<< HEAD SkyratBot: - bugfix: makes ai sat turrets actually able to fire upon silicons - bugfix: waystation cargo techs get shoes now @@ -707,14 +685,11 @@ - spellcheck: The examine text for the carp tongue and gondola heart is more correct. - qol: Activating arm implant items in hand now automatically retracts and opens the radial menu, unless it's a welding tool. -======= Paxilmaniac: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: The ability for objects to be loomed is now a component, with all of the looming behavior moved off of the structure and into said component. The actual behavior for looming cotton (clicking on a loom with cotton) is completely unchanged. -<<<<<<< HEAD - balance: 2 More Cargo Tech slots Wallem: - imageadd: Updates navbeacon sprite @@ -838,7 +813,6 @@ SkyratBot: - imageadd: Nanotransen has made uniform changes to the robotics lab, modernizing their wardrobe. -======= carlarctg: - qol: Activating arm implant items in hand now automatically retracts and opens the radial menu, unless it's a welding tool. @@ -846,7 +820,6 @@ - bugfix: waystation cargo techs get shoes now - bugfix: makes ai sat turrets actually able to fire upon silicons necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: A significant overhaul of various illicit and dubiously legal goods and gadgets available via cargo. - balance: Cargo now has an Import category for all non-departmental goods. (And @@ -857,12 +830,10 @@ - code_imp: Removes the brand new mosin subtype as it is now defunct. - bugfix: Fixes potentially exploitative code in the jamming proc. Cleans up that code while I'm at it. -<<<<<<< HEAD - imageadd: Recolours the Wirebrush (Again) - balance: Experimental syndicate teleporter's teleportation is no longer perfect, it will cause the user to bleed a little. Luckily the detective can scan the blood and find out who the big bad is, as long as he's quick. -======= 2023-04-10: ChungusGamer666: - rscadd: Being electrocuted will most of the time make you blurt out whatever you @@ -894,13 +865,11 @@ - bugfix: Admin spawned ghost portals no longer make all dead players considered also as observers (they're two different things) NamelessFairy: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: CTF has been entirely refactored. - bugfix: Respawn times for CTF now work. - qol: CTF players are alerted during control point games when one team is half way to winning. - admin: CTF instagib mode can now be toggled from the secrets panel. -<<<<<<< HEAD - imageadd: Split all icons in weapons_and_items.dmi to their own categories - imagedel: Removed some unused icons - bugfix: The Regal Condor's magazines are actually visible, and therefore useful @@ -986,7 +955,6 @@ - qol: NIFs can now be manually removed from a player file. - bugfix: NIFs now delete when broken for two shifts 2023-04-15: -======= - bugfix: TGC decks will no longer allow you to insert an illegal 31st card. Somepan: - rscadd: Added a message upon being hit by any spectral instruments @@ -1078,7 +1046,6 @@ - rscadd: New Lids for several crates. - imageadd: Several new Crate Visuals. 2023-04-14: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ? Cheshify, Fikou, Blue-Berry, Zytolg, InfiniteGalaxies, Striders, Sylphet, Riggle, Soal, Andry, Crit, Deranging, and Pumpkin0. : - rscadd: Nanotrasen's Newest Exploratory Vessel is now available! Meet the North @@ -1087,7 +1054,6 @@ - rscadd: energy barriers now have a regenerative subtype, fit for permanent installations. - code_imp: Raised the number of possible level render to 4, check your preferences if needed to be reduced. -<<<<<<< HEAD Gandalf2k15: - balance: Wall mushrooms will now spread more slowly. - admin: Wall mushroom planting is now logged. @@ -1120,7 +1086,6 @@ - bugfix: Omen Component vendors will no longer double dip (double tip) - bugfix: Fixed Hydrogen Peroxide and Acetone Oxide not dealing damage until you take damage again -======= LT3: - balance: Engineers can override elevator door safety - bugfix: emag action linked between elevator panel and doors @@ -1132,14 +1097,12 @@ NamelessFairy: - bugfix: Removing cards from TGC decks by pouring them on the floor/into binders should now function correctly. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - code_imp: Adds two new super-duper helpful helper procs for finding a maintenance/space spawn location, for all of your event/midround/whatever needs! - code_imp: Moves all midrounds/ghost_role events that hinged on maintenance/space carp spawns to the aforementioned helpers. - code_imp: The ghost_role event module file is now autodoced. -<<<<<<< HEAD SkyratBot: - bugfix: Removes the spectral trombone from the lavaland pizza party ruin. - balance: Returns the anomaly detonation timer from 75 seconds (40 seconds from @@ -1184,7 +1147,6 @@ - bugfix: spoon overlays will now update when you eat from them to reflect that food = gone. it really is gone, you can stop beating yourself with the spoon. oh god please stop-- -======= ShizCalev: - bugfix: Fixed an annoying gravity runtime that occurred if a player was connected before mapping finished initialization. @@ -1236,12 +1198,10 @@ Dawnseer: - rscadd: Goliath cloak can be worn as a cloak that doesn't provide any armor benefits SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: correctly type casts the turf into open type for the rcd mecha plating action - refactor: removes single letter variable names - refactor: uses datum/ui component to get user for to_chat() instead of usr -<<<<<<< HEAD - qol: Set default IV transfer rate to maximum (5) instead of 0. 2023-04-17: SkyratBot: @@ -1289,7 +1249,6 @@ - bugfix: The pathing for the "Mimes vs Clowns" space ruin should be fixed internally. Whether you see this or not is depended on your server operator(s). SkyratBot: -======= carlarctg: - qol: Set default IV transfer rate to maximum (5) instead of 0. flowercuco: @@ -1325,14 +1284,12 @@ - bugfix: The pathing for the "Mimes vs Clowns" space ruin should be fixed internally. Whether you see this or not is depended on your server operator(s). NamelessFairy: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Admins can now control the spawn location, potency, production and starting mutations of the space vines event. - bugfix: The space vine event will now correctly give vines mutations when they spawn rather than always being mutation free. - code_imp: Checkbox tgui inputs now support setting a minimum number of inputs rather than it being hardcoded to 1. -<<<<<<< HEAD - balance: Makes Black Market Uplinks more easily craftable, adds them to uncommon maint loot pool - bugfix: Eigenstasium lockers no longer bypass teleport protection @@ -1344,7 +1301,6 @@ they share stats and chems. Non-allergenic! Vect0r: - balance: The blowgun no longer takes time to windup before you can shoot it. -======= Rhials: - qol: Ghosts are now notified and given an orbit popup for the Stray Cargo Pod random event. @@ -1415,12 +1371,10 @@ zxaber: - balance: Cyborg Rechargers now restock with metal and glass from the ore silo, and no longer grant the materials for free. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-04-19: ATHATH: - bugfix: Laser pointers will no longer disable borgs that have somehow been made immune to flashes. -<<<<<<< HEAD LT3: - bugfix: Fixed general antag ban not applying to midrounds/ghosts - bugfix: ICES will no longer reschedule events due to an imaginary escape shuttle @@ -1436,7 +1390,6 @@ - imageadd: adds new inhand sprites for most flashlights in the game, including animated flares and candles - refactor: cleaned up flashlight.dm's unnecessary bits and made some slight improvements -======= BlueMemesauce: - bugfix: Fixed a bug where additonal receivers wouldn't work if the first one was on but disconnected @@ -1449,7 +1402,6 @@ - bugfix: PDA messaging is now more immersive based on age JohnFulpWillard: - bugfix: Plague doctor hats no longer give you an FOV. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: '[Mafia] All Mafia abilities have been overhauled in the backend, it''s now much easier to understand what each role''s ability can do and how it works.' - admin: '[Mafia] Admin setup of Mafia is now in TGUI' @@ -1460,7 +1412,6 @@ - qol: '[Mafia] Lawyers, Wardens, etc. now perform their night ability at night, instead of the day prior.' - qol: '[Mafia] Night time now lasts 40 seconds instead of 45.' -<<<<<<< HEAD - bugfix: PDA messaging is now more immersive based on age - qol: Shoe storage can now fit box cutters, pills, and toy pistol magazines. - rscadd: emagging the BSA explodes the next person to fire it. @@ -1502,7 +1453,6 @@ - code_imp: multiplier for all shipments made through cargo - refactor: 2 new procs retrive_points() & subtract_points() to dela with different types -======= - admin: Secret buttons for Engineering/Brig maint accesses should now work more consistently. Melbert: @@ -1542,7 +1492,6 @@ businesses in the nearby sector of space have been closed down. One of which being a themed old-style american diner. Can you find it? SmoSmoSmoSmok: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: refactors trees into basic mobs - refactor: refactors poles into basic mobs - rscadd: If trees now see you holding a chainsaw, hatchet, or some wood they will @@ -1551,7 +1500,6 @@ the way - bugfix: cells charged by the pole will now have their icon correctly updated to reflect their charge -<<<<<<< HEAD - rscadd: Added new berets to the vendor iain0: - bugfix: Fixes an error in health analyzers which would cut off the top of the @@ -1594,7 +1542,6 @@ random poster spawners. - rscadd: Burning items are now actually considered to be at a minimum, 150 degrees celsius by the game. -======= iain0: - bugfix: Fixes an error in health analyzers which would cut off the top of the health scan if the player was deaf. @@ -1607,15 +1554,12 @@ Chlorotrifluoride: - imageadd: flat satchel sprite re-palette ChungusGamer666: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'The following structures are now flammable: Picture frame, fermenting barrel, drying rack, sandals, painting frames, paintings, spirit board, notice board, dresser, displaycase chassis, wooden barricade' - balance: 'The following items are now flammable: Baseball bat, rolling pin, mortar, coffee condiments display, sandals, wooden hatchet, gohei, popsicle stick, rifle stock' -<<<<<<< HEAD -======= Helg2: - bugfix: generic air tank mounted onto pneumatic cannon now has working sprite. Jacquerel: @@ -1632,14 +1576,12 @@ - bugfix: AIs now get their proper lawset, and an objective related to said lawset, on Nations MrStonedOne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - config: database configs have been updated for better control over the connection pool - server: BSQL_THREAD_LIMIT has been renamed to POOLING_MAX_SQL_CONNECTIONS, old configs will whine but still work. - bugfix: fixed rare race condition that could lead to a sql query being ran twice during world shutdown. -<<<<<<< HEAD - imageadd: flat satchel sprite re-palette - code_imp: Cleanup 1 letter var names in martial arts files - qol: the rescue hook has a much greater chance at catching actual fallen player @@ -1668,7 +1610,6 @@ SkyratBot: - bugfix: Removed extra messaging server in North Star tcomms - bugfix: Things that block glow will now like, do that again -======= SyncIt21: - bugfix: order consoles cancelling order's less than 200 but still subtracting money, mining points from the player @@ -1708,12 +1649,10 @@ Melbert: - bugfix: Ingredients which fail to react in soup reactions drop when the reaction finishes as intended ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Tattle: - qol: basicmobs can now make sounds when their speech is triggered - qol: pigs will now make sounds and emote on their own - sound: cows, pigs, and sheep have new sound effects! -<<<<<<< HEAD vinylspiders: - bugfix: cafe roles will now retain their name after ghosting instead of just being called 'a cafe visitor' @@ -1747,7 +1686,6 @@ Wallem, Imaginos: - image: Updates the IV drip sprites 2023-04-25: -======= 2023-04-24: BlueMemesauce: - spellcheck: Fixes Explosive Holoparasite description mentioning a removed ability @@ -1773,7 +1711,6 @@ - bugfix: Anti-glow actually bringing some darkness instead of just a light glow. Fikou: - rscdel: prisoner spawns from the north star asylum ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex, ChatGPT for the first changelog entry (slightly edited): - qol: Zipped and unzipped through alt-click, winter coats can now be. Hmm, stylishly warm, you shall be. Feel like a Spaceman, you will. Use the Force, to zip and @@ -1782,27 +1719,15 @@ both in item form and when worn. - bugfix: Updated the Icebox EVA winter coats (the Endotherm winter coats) to use the same sprites as the regular winter coats. -<<<<<<< HEAD - Hatterhat: - - balance: The CIN surplus crate is now an import crate, meaning that it's no longer - buyable through Security's department order console and has no lock. - - bugfix: The Mosin/Sportiv ammo box that appears in the CIN surplus crate now comes - with actual clips suitable for the Sportiv. - - bugfix: The 7.62 ammo box was renamed to .244 Acia ammo box, because lore parity. - Melbert: -======= LT3: - code_imp: Added TGUI mobility check bypass - qol: You can now use your PDA while laying down Melbert: - refactor: Mob ai refactored once again ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Cameras can only see vertically upwards if the turf above them is transparent. But hey, the North Star (and other multi-z maps) will now perform wayyy better (less time dilation) Rhials: -<<<<<<< HEAD -======= - bugfix: The mafia early vote counter will now properly display. Ryll/Shaps: - bugfix: Yawning will now have a chance of making people near you yawn as well, @@ -1853,13 +1778,11 @@ - spellcheck: Fixes grammar issues located in Pirates and item descriptions related to the folder Rhials: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: New event weight station trait -- Dust Stormfront. - balance: Space Weather Forecast -- Expect more frequent Major Space Dust storms in the foreseeable future. - code_imp: The Major Space Dust event is once again returned to being a meteor_wave event instead of a Space Dust subtype. -<<<<<<< HEAD SkyratBot: - bugfix: Adds prisoner ID's inside the gen pop lockers on the Northstar. Also renames the holding cells to Gen Pop. @@ -1911,7 +1834,6 @@ - sound: Sound of lasers hitting a person now are giving more of a punch - rscadd: Say emote prefixes are no longer forced to be lowercase. This includes radio emotes! -======= SyncIt21: - bugfix: flood light now shines with their object color necromanceranne: @@ -1935,51 +1857,17 @@ Helg2: - balance: Heretic blades butcher speed is 3 seconds now. JohnFulpWillard: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: '[Mafia] Notes are no longer written out for you.' - qol: '[Mafia] You can now send your notes to chat whenever.' - qol: '[Mafia] Roundend has changed. Solos will win over others in a 1v1, but a HoP can keep a round going in case they can solo lynch.' -<<<<<<< HEAD - - refactor: removed duplicate `pre_attack()` & redundant `attackby()` procs which - did the same thing - - bugfix: unnecessary crash when unwrenching pipes/devices with the RPD - - rscadd: Added hostile spawn tag to rats - Zergspower: - - balance: Port Tarkon - Replaces the ARCD with the MM to get rid of the infinite - charges - - bugfix: Port Tarkon - Defcon 3 ruin now has proper door access markers that are - present in all other ones - vinylspiders: - - bugfix: the bluespace miner's machine board item now has the correct name -2023-04-27: - Ebin-Halcyon: - - image: Teshari have had (most) winter coats refitted for them - Gamer025: - - bugfix: Ingame ore silo logs should now log deposit actions correctly - - config: New config for silo logs - GoldenAlpharex: - - bugfix: Doing custom emotes (*me) no longer impacts your global emote cooldown. - Melbert: - - refactor: Mob ai refactored once again - RatFromTheJungle: - - balance: the AMR no longer has wound-chance to rival god, and also, no longer - goes through mobs - Rhials: -======= Rhials: - bugfix: Falling down one of the stage hazard chasms on the medisim shuttle will now properly kill you on Icebox, instead of dropping you into the z-level below. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Deadchat now gets more juicy details on what has triggered a non-randomly occurring random event. - code_imp: There are now helpers for forcing events in a variety of ways. More events! More events!!!!!!! -<<<<<<< HEAD - SkyratBot: - - balance: Heretic blades butcher speed is 3 seconds now. - - rscadd: Added a crashed prisoner transport space ruin. -======= SyncIt21: - refactor: removed duplicate `pre_attack()` & redundant `attackby()` procs which did the same thing @@ -1992,12 +1880,10 @@ Zonespace27: - rscadd: Added a crashed prisoner transport space ruin. carlarctg: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Adds support for ammunition 'bands', basically intended to be used rather than wholly new sprites for new ammotypes. Additionally, they're (meant to be) greyscale, which allows one overlay to be used for many ammo types. Only implemented on the detective revolver. -<<<<<<< HEAD - qol: Add mood events for basketball shooting and dunking - bugfix: Book's no longer take your formatting and throw it out the window. - refactor: Book display and rendering @@ -2017,7 +1903,6 @@ - bugfix: Changelogs entries for "sound" and "image" should now have icons associated with them, how neat. - qol: Lowered the atmos build, reprogram, and destroy delays on the RPD -======= vinylspiders: - bugfix: crafting lizard skin cowboy boots no longer places a spawner object over the created boot item @@ -2028,12 +1913,10 @@ Fikou: - bugfix: social anxiety is incompatible with mute JohnFulpWillard: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Health analyzers now show body temperature in red/blue if the temperature of the body can't sustain it's own life. - bugfix: Inverse technetium now properly gives advanced details in genetics/radiation analyzing. -<<<<<<< HEAD - bugfix: social anxiety is incompatible with mute Youtubeboy139: - rscadd: Adds in the new coffee based sprites in a dedicated .dmi file @@ -2093,7 +1976,6 @@ - bugfix: the anomaly refinery will no longer let you insert cores of insufficient quality to refine - rscadd: Craftable Material sniffers -======= Rex9001: - bugfix: Fixes the Tramstation CMO office lack of CMO stamp Watermelon914: @@ -2111,17 +1993,14 @@ also stun and reveal revenants briefly.' 2023-04-28: Comxy: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Star Gazer now explodes when it dies. - balance: Star Gazer will only die when the owner dies. - balance: Star Gazer will attack the most recent enemy that attacked him when on autopilot. - balance: Star Gazer has an aura that slowly damages people and heals the owner. - balance: Cosmic Ascension now buffs some spells. -<<<<<<< HEAD softcerv: - qol: NIFSofts now have associated Font Awesome icons that show up in UI. -======= Fikou: - bugfix: Fixes crafting tools not taking into account subtypes, i.e. you can craft a filet migrawr with any lighter. @@ -2205,15 +2084,11 @@ - bugfix: Economy class airlock on the Luxury Shuttle now aligns with dock tralezab: - rscadd: Craftable Material sniffers ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tralezab code, Drag for the commission and player project, cre#0484 for their spritework: - rscadd: Divine Archer Armor and Weapon - qol: Bows give more feedback when you're doing something wrong, like trying to draw without a nocked arrow - code_imp: Sorted files, cleaned bow code up to allow subtypes -<<<<<<< HEAD -======= vinylspiders: - bugfix: the anomaly refinery will no longer let you insert cores of insufficient quality to refine ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-05.yml b/html/changelogs/archive/2023-05.yml index 70e255b77e0..dd5cf69a901 100644 --- a/html/changelogs/archive/2023-05.yml +++ b/html/changelogs/archive/2023-05.yml @@ -1,11 +1,4 @@ 2023-05-01: -<<<<<<< HEAD - Rhials: - - bugfix: Replaces the purely decorative mining shuttle console on the Icebox bridge - with an ID console. - SkyratBot: - - bugfix: Bloody Mary flavor is now accurate to its description. -======= BlueMemesauce: - spellcheck: Deleted the extra line in combat information - spellcheck: Fixed Nanotrasen being miscapitalized in traitor posters, a drink, @@ -51,7 +44,6 @@ - bugfix: Shuttle Loan event's resupply and hijacking have been separated into two different datums san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Spiderlings are now basic mobs, report any complete weirdness/deviation from known behavior. They should be a lot more intelligent now though. - rscadd: AI Spiderlings are super fragile, but they're also super fast, especially @@ -59,36 +51,6 @@ Maybe in the armory, maybe in a locked closet in maintenance. Be sure to be vigilant and splat them whenever you can to save the station from a whole lotta heartache! -<<<<<<< HEAD - - bugfix: papers should count cyrillic and other non-ascii characters correctly - both server and client-side - - qol: Dirt pile is crafted from sand instead of sandstone and drops it on deconstruction - - bugfix: You can't have free water and nutriments by rebuilding hydrotray - - spellcheck: Deleted the extra line in combat information - - balance: Mimes can no longer write on paper without breaking their vow. - - bugfix: Deep Storage Space Ruin - Fixes atmos alarms never shutting off - - bugfix: Deep Storage Space Ruin - made the atmos pipenet sane - - bugfix: Shuttle Loan event's resupply and hijacking have been separated into two - different datums - - bugfix: The airlocks on the hug relaxation shuttle now align up properly - Zergspower: - - bugfix: Crashedship Ruin - You can now use the teleport -2023-05-02: - Hatterhat: - - bugfix: People with style meters affixed to their glasses can now do cool flips. - - spellcheck: Port Tarkon personnel now have their assignment on their IDs properly - checked. It truly was nothing personnel, kid. - SkyratBot: - - bugfix: Pirates summoned through hacking a comms console should actually spawn - now. - - bugfix: ' Drying rack spawning a matter bin and circuit board on deconstruction' - - bugfix: You can't spam open codex cicatrix now. - - qol: You can close codex cicatrix in your hand now! Also toy codex cicatrix has - proper animation now. - - code_imp: TGUI input datums can now accept custom ui_states - - rscadd: Crewmembers arriving very late will not always have time to finish their - breakfast. -======= 2023-05-02: MTandi: - image: extinguisher cabinet has new sprites @@ -97,13 +59,11 @@ - bugfix: Pirates summoned through hacking a comms console should actually spawn now. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: air alarms correctly spew out cable & electronics depending on their build stage when their integrity reaches 0 i.e. destroyed - bugfix: fire alarms correctly spew out cable & electronics depending on their build stage when their integrity reaches 0 i.e. destroyed - bugfix: balloon alerts runtiming when cutting terminals -<<<<<<< HEAD 2023-05-03: Hatterhat: - spellcheck: The gunsets and crate that hold CMG-2s are now actually labeled CMG-2, @@ -119,7 +79,6 @@ preview because it is buggy and hardly ever matches what you end up getting upon spawning - code_imp: removing the prosthetic limb quirk will restore your original limb -======= - bugfix: ' Drying rack spawning a matter bin and circuit board on deconstruction' Thedragmeme: - qol: 'Makes the Meta station kitchen not cramped anymore @@ -159,7 +118,6 @@ nikothedude: - bugfix: Number inputs work now san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The game now supports export of your preferences into a JSON file! The verb (export-preferences) should now be available in the OOC tab of your stat-panel if enabled by server operators. @@ -170,7 +128,6 @@ - config: Server operators are also able to set the cooldown between requests to download the JSON Preferences file via the 'SECONDS_COOLDOWN_FOR_PREFERENCES_EXPORT' config option. -<<<<<<< HEAD - bugfix: Electrolysis chemical reaction works with enriched liquid electricity Tattle: - sound: nerfed the police whistle volume @@ -190,7 +147,6 @@ - bugfix: the cargo orderable AMR should no longer fit in suit storage slots, only your back, as was originally intended SkyratBot: -======= vinylspiders: - bugfix: prosthetic limb quirk will no longer display a prosthetic on your character preview because it is buggy and hardly ever matches what you end up getting @@ -204,7 +160,6 @@ BlueMemesauce: - bugfix: Fixed the Chef not having CQC outside the kitchen on Tramstation Dawnseer: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Damp rag and Money bag to service borg - rscadd: Service borg upgrades, with accompanying tech web node - rscadd: Sprites for kitchen toolset, and service apparatus @@ -216,94 +171,6 @@ back around.' - balance: Adds blood and Carpotoxin to the emagged borgshaker. - bugfix: Money bag was missing a description, it now has one. -<<<<<<< HEAD - - bugfix: Holodisk recording gives the right vfx again. Bonus, the rays work with - it now too! - - refactor: Mineral costs have been reformatted to be scaled by the number of sheets, - darts, and small fractions they make up. - - qol: Foam darts no longer hold a fraction of a unit of iron within themselves. - - bugfix: Basic mobs will now be affected by explosions again. - - bugfix: fixed spiderlings speaking human instead of spider - - qol: 'Mapping: Air alarm variants replaced with corresponding helpers' - - spellcheck: Fixed Nanotrasen being miscapitalized in traitor posters, a drink, - the ethereal lore, and some photocopier paperwork - - bugfix: Fixed the Chef not having CQC outside the kitchen on Tramstation - - rscadd: North Star's captain's office has been expanded! It now includes a sitting - area as well as a photocopier and some cigars. - - bugfix: Various minor changes in North Star - - image: extinguisher cabinet has new sprites - - bugfix: Bows will no longer randomly stop taking new arrows. - - balance: 'EMPs on robotic limbs will now disable them for 10-20 seconds rather - than causing a 10-20 second full stun on the user. Additionally, they will damage - the limb for a little brute and some burn. - - EMPs on robotic limbs will now disable them for 10-20 seconds rather than causing - a 10-20 second full stun on the user. Additionally, they will damage the limb - for a little brute and some burn.' - - balance: Arm EMPs don't do anything special as the limb being disabled already - drops items. - - balance: Leg EMPs cause a 10-20 second knockdown, only really applicable if there's - only one robotic leg as two disabled legs KD you anyways. - - balance: Chest EMPs cause a 3-6 second standing-up paralyze, visible to the player - by a quite noticeable shaking of their body. - - balance: Head EMPs break the optical transponder circuits for 7.5-15 seconds, - effectively giving the user nightmare goggles vision with green instead of red - as the only remaining color. - - spellcheck: The hallucinatory anomaly announcement is no longer missing words. - - qol: Health Analyzers now show embeds in bodyparts on examine. - - rscadd: Stowaway Changelings will now appear as a late join form of Changeling. - - refactor: Russian mobs are now subtypes of Syndicate basic mobs. - - spellcheck: BLOX is the name and posibrain is the game. - - bugfix: Removes player references. - Tattle: - - sound: shutters have a unique sound effect - Thedragmeme: - - qol: 'Makes the Meta station kitchen not cramped anymore - - :cl:' - Wallem: - - rscadd: The ancient recipe for the Death Sandwich has been rediscovered buried - in the deepest depths of an erupting volcano. - Zergspower: - - qol: Dangerous Research Ruin - Area redefines - - bugfix: Port Tarkon - Window firelock issues resolved for all along with cleanup - Zytolg, LT3: - - rscadd: Birdshot station has been pulled out of Mothball. - - rscadd: New station areas and places to visit. A Mix of Kilo and Delta maints - with winding shortcutting paths. - - rscadd: A host of new shuttles to support this bold endeavor to reclaim something - that really shouldn't be reclaimed. - - rscadd: Two Trams, Two Trams. TWO TRAMS! - - rscadd: For the last time Bob, the gaping hole is a **feature.** Use the breach - shutters or have the virologist make starlight. - - rscadd: A smiling salute to stations past... - - rscadd: Secrets. - nikothedude: - - rscadd: '*exme now allows you to pick which layer of container the emote originates - from' - softcerv: - - code_imp: moves the SAD code for applying prefs, while keeping damage, to it's - own separate proc. - - refactor: refactors magical wand code, fixing several bugs. - - bugfix: glassblowing no longer works if the glass lacks heat - - bugfix: glassblowing is unable to be done on multiple objects at once. - - refactor: refactors organic interface status effects so that they no longer run - on every human. -2023-05-05: - Ebin-Halcyon: - - image: Teshari have been resprited in their entirety, set your colors if they - look off. - - image: One new Teshari ear style, a ponytail. - - image: Upright mane, and thin mane Teshari ear styles have been edited/removed, - add a mane through the fluff dropdown menu. Set your mismatched parts on. - LT3: - - code_imp: You can now exclude maps from ssDecay -2023-05-06: - Ebin-Halcyon: - - bugfix: Syndicate winter coats should no longer be masses of missing textures. - Helios7-1: - - rscadd: The new Adventurous Synth Plushie! It Beeps! -======= JohnFulpWillard: - qol: Health Analyzers now show embeds in bodyparts on examine. MTandi: @@ -364,7 +231,6 @@ - rscadd: ' Non-player references' RealityOverseer: - bugfix: fixed unrefined ectoplasm anomaly cores not appearing as unrefined ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - qol: Observers now recieve an alert when a powersink is activated/about to explode. - qol: His Grace being awoken now alerts observers, to give you a headstart on your @@ -387,75 +253,6 @@ not be any more powerful, but at least you have an audience. - qol: When beginning to delaminate, the Supermatter will alert observers and invite them to watch the fireworks. -<<<<<<< HEAD - RikuuTheRiolu: - - balance: Removed "Gore" from disliked food's for Teshari - larentoun: - - rscadd: Synth-Humanoids now have snout as a deafult bodypart -2023-05-07: - Anonymous: - - image: Updates Blastwave suits to be more taller and greener. Torso part is also - now closed/zipped up. - - bugfix: Fixes wrong reskin icon names for Blastwave helmet. - ChakatStormCloud: - - bugfix: BSA now properly faces East when built with the Bore facing east - - bugfix: BSA now properly checks that it has a bore and generator, space to deploy, - and proper alignment. - Hatterhat: - - balance: Thanks to further developments from Nanotrasen Arms' R&D Division, the - CMG-2's rounds now carry slightly more stopping power than before (0.5x -> 0.7x - damage multiplier). - - balance: Unfortunately, adjustments to the CMG's internals now make its folding - stock actually adjustable, and also matter for use. Ctrl-click to toggle its' - stock. Users are warned that improper handling will lead to decreased accuracy. - Jolly: - - bugfix: The area icon for the evidence room should be visible in the map editor - again. - Melbert: - - balance: Blind people don't get alerted when someone in a cardboard box pops out - nearby - - rscadd: ' Non-player references' - QuacksQ: - - bugfix: Fixes dead ends in arrival maints on Voidraptor. - Rhials: - - bugfix: Powersinks no longer always show as being very hot if you're too close. - Shadow-Quill: - - bugfix: The arrival shuttle's console can no longer have the "Shuttle departing..." - message spammed. - - bugfix: The welding fuel ammo indicator will now update whenever it's used or - refilled, not just when it's toggled. - SkyratBot: - - qol: The Ice Box pharmacy and Med Sec Outpost blast doors have been replaced with - shutters. - - bugfix: fixed unrefined ectoplasm anomaly cores not appearing as unrefined - - qol: Shuttles will no longer show their current destination as a choice while - in transit. - - rscadd: miners with style meter can now parry kisses - - qol: 'Mapping: Added broken machine map helper' - - qol: 'Mapping: Replaced damaged window spawner with a universal helper' - - bugfix: The hierophant club's sprite updates when it should - - bugfix: The hierophant club grants the blink action when summoned into hand - - balance: Psyker Pirates are now Psyker Shikari (bounty hunters). - - bugfix: Fixed math on cyborg restocking - - qol: borgs entering chargers now have the restocking feature enabled by default. - It can be disabled with a right-click while charging if you don't want to eat - the station's mats. - - balance: Borg restocking speed now scales with the charger's manipulator tier. - - bugfix: The North Star's cargo shuttle has working conveyors. - - bugfix: The North Star has had a slew of missing and improperly done content added - and reworked, see the PR for more! - - balance: Tonguespike is better, chemspike deals slightly less damage - - qol: Trees, rocks, grass and etc. now drop materials when destroyed. - - bugfix: a mob will now once again spill their organs when they are gibbed - - bugfix: Mech chargers on Tram (and possibly elsewhere) no longer sync oddly. - - rscadd: Added wedding cakes - colb: - - qol: You can now use the Navigate verb to find your way to cryo on Birdshot - - bugfix: Removed a doubled up cryo pod - larentoun: - - bugfix: icon names for 6.8 mag -2023-05-09: -======= - balance: Psyker Pirates are now Psyker Shikari (bounty hunters). Thlumyn: - rscadd: Added wedding cakes @@ -468,7 +265,6 @@ and reworked, see the PR for more! JohnFulpWillard: - bugfix: Tablets' minimize apps feature works again. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 JohnFulpWillard, sprites by McRamon, tattax, and Lamb: - rscadd: The Coroner, a new Medical role revolving around dead corpses and autopsies. - rscadd: The Coroner's Autopsy Scanner, used for discovering the cause for someone's @@ -479,7 +275,6 @@ - balance: Security Medical area and Robotics no longer have their own morgue trays. - balance: Dissected bodies now have faster surgery speed. Autopsies also count as dissections, however they're mutually exclusive. -<<<<<<< HEAD LT3: - bugfix: Fixed spawning meteors at double the intended rate - qol: Ghosts will now get a notification when someone is about to be hit by the @@ -532,7 +327,6 @@ - image: updated smart fridge sprites for all variants - bugfix: smart fridges no longer overlap with walls, but they can be welded down to a floor and mapspawn welded -======= Jolly: - bugfix: The area icon for the evidence room should be visible in the map editor again. @@ -544,12 +338,10 @@ 2023-05-08: Helg2: - bugfix: deleted unused airlock helper from syn-c brutus. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jacquerel with new icons mostly by INFRARED_BARON: - balance: Golems have been reworked into a hunger-based species who gain temporary transformations when eating different kinds of mineral. - rscdel: The previous golem subtypes no longer exist. -<<<<<<< HEAD Jolly: - bugfix: On maps that have their spawners, Bouncers will now spawn on maps. KoJIT2009: @@ -585,7 +377,6 @@ I'd call that a fair trade. - rscadd: Ruins are now available in the region around the Northstar, Curators are now no longer jobless! -======= LT3: - qol: Ghosts will now get a notification when someone is about to be hit by the tram @@ -626,7 +417,6 @@ - bugfix: smart fridges no longer overlap with walls, but they can be welded down to a floor and mapspawn welded CoiledLamb: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: adds coroner's jumpsuit and jumpskirt to the mortidrobe - rscadd: black scrub cap to the mortidrobe - rscadd: adds coroner medkit, and it's compact variant, for storing coroner job @@ -638,18 +428,6 @@ - image: fixed weird transparency on the autopsy scanner sprite - image: fixed weird shading on the black scrubs object - spellcheck: fixed a punctuation error in the surgical medkit description -<<<<<<< HEAD - - bugfix: runtime when toggling engineering meson scanners - - bugfix: Organ harvester board drops on deconstruct. - - bugfix: Bluespace sender and vendor should display colors correctly now - - bugfix: Gas filter should show labels properly now - - bugfix: Nitrium now has its own gas color in the UI - - qol: Added switch buttons to few dropdown in character preferences - - image: added single tank bomb guide contraband poster - - bugfix: new hotkeys unbound by default (like emotes) no longer scream at you when - added - - bugfix: adds orm access to the chaplain, curator, clown, mime, lawyer, and psychologist -======= DaydreamIQ: - bugfix: Northstar HoP can no longer commit fraud - qol: Northstar brig now has genpop instructions @@ -703,14 +481,12 @@ - rscadd: Ruins are now available in the region around the Northstar, Curators are now no longer jobless! Helg2: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Indusrial Gold and Regenerative Gold extracts now spawn random coins and not just list of 6 coins. But no mythril as it has miserable chance to have summoning effect which have even more miserable chance to spawn something dangerous and not just mice. - rscadd: Chococoin now has a chance to spawn wherever the coins are used to spawn (wallets, greed ruins, deltastation bar) -<<<<<<< HEAD Zergspower: - qol: Space Ruin Whiteship - Total redesign with some loot tweaks colbb: @@ -734,7 +510,6 @@ - image: removed a whole lot of unused hat icons. Make any reports for broken icons on the github! SkyratBot: -======= JohnFulpWillard: - balance: Default Syndicate and Russian gunners now fire every 2.5 seconds instead of every 0.2 @@ -752,7 +527,6 @@ - qol: Space Ruin Whiteship - Total redesign with some loot tweaks vinylspiders: - bugfix: fixes emissive blockers sometimes being put in an atom's contents ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: high luminosity eyes light overlays now follow the user correctly - qol: high luminosity eyes now have a tgui menu so you no longer have to go through the color picker every time you want to change the range. they also have a new @@ -762,16 +536,6 @@ light direction correctly no matter what dir you are facing - refactor: refactors high luminosity eye code to better make use of the atom lighting system, adding a new light type 'MOVABLE_LIGHT_BEAM' -<<<<<<< HEAD -2023-05-12: - KoJIT2009: - - bugfix: fixed crash augment page in preferences - MTandi: - - balance: 25 bottles of saltpetre can now be bought in hacked NutriMax - Nerev4r: - - rscadd: New (old) Glitched Digicoat for donators. - - image: Nedilla plushie donator reward. -======= 2023-05-11: BlueMemesauce: - bugfix: Fixes not being able to rebuild the MortiDrobe (Coroner Wardrobe) @@ -803,7 +567,6 @@ MTandi: - image: New sprite for syringes - balance: 25 bottles of saltpetre can now be bought in hacked NutriMax ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - bugfix: Outfit changes will now properly change your ID trim if wearing a non-ID item in your ID slot. @@ -813,7 +576,6 @@ ShizCalev: - bugfix: Fixed a bunch of log spam related to null.can_use() when AIs move their cameras around with toggle camera lights enabled Honk. -<<<<<<< HEAD - bugfix: Lighting inside of a Hilbert Hotel storage room no longer constantly fails to update, clearing up some log spam and getting back some free lag. - code_imp: The update_icon_updates_onmob element will now automatically update @@ -911,11 +673,9 @@ tralezab: - bugfix: Chuuni wizards no longer get robeless casting issues. 2023-05-16: -======= tralezab: - bugfix: Chuuni wizards no longer get robeless casting issues. 2023-05-12: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DrDiasyl aka DrTuxedo#0931: - qol: Now blocking an attack will play a sound and display a spark effect, giving back feedback @@ -923,7 +683,6 @@ - sound: shieldbash.ogg no longer has noise and unnecessary silence - sound: New block_shield.ogg and block_blade.ogg for shields and energy swords - code_imp: Cultists items no longer have their own code for playing parrying sounds -<<<<<<< HEAD Hatterhat: - rscadd: 'The R3T3N-T1VE skillchip is now available in Cargo''s goodies tab for the price of 1750 credits, and allows you a brief glimpse into the wonderful @@ -1034,7 +793,6 @@ have a space to archive more art! Swiftcore: - qol: Dish drives now collect empty plates and plate fragments -======= Jolly: - image: Mappers rejoice! PDAs now have mapping icons. ShizCalev: @@ -1129,13 +887,11 @@ - code_imp: cleaned up cargo export code a bit Singul0: - bugfix: HoP on northstar can now disperse troublemakers with ease. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Sylvette: - bugfix: Fixed sign language so you can't sign when cuffed or emotemute as initially intended - balance: Allows signers to cast spells using sign language as long as both hands are free -<<<<<<< HEAD SyncIt21: - bugfix: Bibles can convert other bibles Unit2E: @@ -1174,7 +930,6 @@ - bugfix: Fixed an issue where objects on something that loaded dynamically, like shuttles, would not be smoothed. - rscadd: Add new White Dwarf and Pulsar Star reports. -======= Thunder12345: - bugfix: "Dueling pistols found in deep space now come in linked pairs for \u221E\ % greater usability." @@ -1289,12 +1044,10 @@ Fikou: - rscadd: You can emag morgue trays to disable their life alerts. Hatterhat: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Bolt-action rifles (the Mosin-Nagant) will no longer spam "can't jam!" when attempting to smack it with just about anything. - bugfix: Anti-materiel rifles (the .50 BMG ones) can now have their magazines manipulated independent of bolt status. -<<<<<<< HEAD - rscadd: Metastation's recreation area has been outfitted with a new fitness room containing a set of gym equipment. - bugfix: Metastation's recreation area shower is now attached to plumbing. @@ -1317,7 +1070,6 @@ 2023-05-18: Melbert: - bugfix: Latejoins triggering before the minimum time set -======= Helg2: - rscadd: Fire Blossoms are now glowy. Jacquerel: @@ -1329,7 +1081,6 @@ - qol: 'Mapping: Added air alarm helper to link air alarm with certain chamber_id on map load' Melbert: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: When you are drunk, the strength of your slurring now varies based on how drunk you are. Being "a little drunk" only rarely slurs your words, being average drunk is the same as the old effect, while being very drunk now slurs @@ -1339,7 +1090,6 @@ no burping). - rscadd: Mind restoration now heals ALL slurring, rather than only drunk slurring (which includes cult / heretic slurring). -<<<<<<< HEAD SkyratBot: - rscadd: You can emag morgue trays to disable their life alerts. 2023-05-19: @@ -1455,7 +1205,6 @@ - balance: Security Plasmamen now have Security armor. No bullying them with bottlesmashes anymore. - bugfix: fixed Tramstation genetics pen chasms -======= SethLafuente: - bugfix: fixes spiderlings having density ShizCalev: @@ -1484,14 +1233,12 @@ - sound: Revolutionaries now have their own stinger that plays upon becoming that antagonist. jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Tgui Say is rewritten, becoming "much more performant". Hey, that's what it says on the tin! I'm not from marketing! - bugfix: Tguisay drag zones are now ever so slightly larger around the corner of the window - bugfix: Pressing one of the chat open keys (T/Y/M/O) will no longer change channels if it's already open -<<<<<<< HEAD - bugfix: fixed possible issues with apc, airalarm and damaged machinery/windows helpers - qol: Double clicking your corpse or something containing it as a ghost will now @@ -1513,7 +1260,6 @@ - rscadd: Snails can now slap their shells with a bluespace core to turn them into shells of holding. SkyratBot: -======= 2023-05-19: Fikou: - bugfix: fixes clown planet report @@ -1558,23 +1304,18 @@ orthography: - bugfix: fixed Tramstation genetics pen chasms san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Lizards (the animal (not the species of people)) are now a bit smarter. Expect to see them avidly hunt down their prey, rather than languish around and wait for it to come to them. Hungry buggers. - image: We now actually implement the previously unused lizard gib animation for those little buggers! -<<<<<<< HEAD - bugfix: wire cutter's can carve out book's again. - bugfix: bibles can convert other bibles - qol: TTS no longer chokes on large amounts of one letter -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Expect to see Killer Tomatoes be a bit smarter as they now are able to juggle multiple targets, lock onto you, and barrel towards you. They're much the same as before, but just a little bit more intelligent, which is especially scary considering they're a fucking plant. -<<<<<<< HEAD Zonespace27: - rscadd: Added the Technologist's Lectern, allowing clockwork cultists to research new, stronger equipment. @@ -1595,20 +1336,17 @@ - bugfix: fixed medical kiosk showing you that you have blood if you don't have one. - image: Added new Maintenance Drone Dispenser sprite -======= timothymtorres: - code_imp: Add extra clothing options to equip mob outfits. Replaced many one-letter vars in file with better descriptions. 2023-05-21: MTandi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: made it impossible to change tram/elevator button styles that couldn't be reverted back - image: changed button styles, added tram/elevator button overlays - refactor: refactored the way button sprites are applied, updated sprite names to make more sense - rscdel: removed unused button sprites -<<<<<<< HEAD - bugfix: Removes spiderling from hostile gold spawns. - bugfix: Borgs can be tipped over while flashed. - bugfix: fixes the guide to mimery radial menu. @@ -1617,7 +1355,6 @@ and feel faster. SomeRandomOwl: - bugfix: Added descriptions to events which where missing descriptions. -======= Thunder12345: - image: Space lizard, carp, slime and snake plushies have been resprited and set up to support GAGS. @@ -1649,13 +1386,11 @@ - bugfix: Fixed an item duplication bug involving snow tiles. Singul0: - bugfix: The buttons in HoP office of Icebox now actually works ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Treach: - bugfix: The Lavaland Syndicate base now has the correct plumbing constructor. Watermelon914, Iamgoofball: - bugfix: Fixed message garbling. TTS messages won't play in the wrong order anymore. - qol: Added a way for players to change the volume of TTS. -<<<<<<< HEAD softcerv: - code_imp: Mediguns now have the TURRET_INCOMPATIBLE flag. - rscadd: adds in an overweight quirk that makes the owner overweight. @@ -1708,7 +1443,6 @@ - config: added config string to set minimum alert level for pods to work. Jolly: - rscdel: Removed a player reference from one of North Stars Automapper templates. -======= Youtubeboy139: - image: Added new Maintenance Drone Dispenser sprite ZephyrTFA: @@ -1749,37 +1483,20 @@ - code_imp: RPD and Pipe Dispenser UI now on TS - bugfix: You receive damage from tritium only when there are enough moles to make it visible ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MTandi, coiledlamb: - rscadd: Added test tubes and racks for them - balance: All 30u bottles now have 50u volume and chem master/pandemic spawn tubes instead of bottles -<<<<<<< HEAD RatFromTheJungle: - balance: changelings regenerate their chems slow, and have 25 less in total. Ryll/Shaps: - bugfix: Godmode now prevents people from suffering forced wounds SkyratBot: -======= Peliex: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: honeycomb is now edible - bugfix: all-in-one grinder now notifies the user when trying to dump an empty bag - bugfix: all-in-one grinder now accepts honeycomb from plant bags -<<<<<<< HEAD - - bugfix: Capturing CTF control points no longer requires the active hand to be - empty. - - admin: 'If you are on a downstream server using non-Latin fonts (e.g. Cyrillic) - for character/job names: The player panel encoding has been fixed so it should - show up properly for you now.' - - balance: You can no longer augment golems - - balance: You can no longer amputate undismemberable traits - - bugfix: Shaft Miners are now alerted of Icemoon storms, Clowns are naive, and - Curators are immune to the Tower of Babel again. - - qol: RPD and Pipe Pispenser UI tweaks for better navigation - - code_imp: RPD and Pipe Dispenser UI now on TS -======= Rhials: - bugfix: The windows on the waystation ruin now only have one grille underneath, rather than two. @@ -1798,28 +1515,10 @@ - balance: You can no longer augment golems - balance: You can no longer amputate undismemberable traits orthography: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Interdyne has released a new medication to treat those who are in the wrong timeline! - rscadd: Interdyne has also realized this is VERY profitable! They've begun arming their operatives with an autoinjector. -<<<<<<< HEAD - - bugfix: You receive damage from tritium only when there are enough moles to make - it visible - - bugfix: Fixes the sparring contract. You can now spar with no stakes and just - for fun. - - balance: Hulk damage to portals lowered to 30 (Was 150) -2023-05-26: - Melbert: - - bugfix: Fix being unable to wound people who are wounded - - balance: Milk no longer harms the potency of mushrooms. Apparently it's good for - them? - - balance: Radium now does slightly more tox damage than Uranium - - code_imp: Removed a ton of boilerplate from chem hydro interactions - SkyratBot: - - qol: Apc covers can now be repaired with a welder and replaced with an apc frame. - - bugfix: Plumbing RCD UI fixed -======= - bugfix: fixed northstar tcomms to use proper rather than birdshot - bugfix: adds more fire alarms to birdshot. timothymtorres: @@ -1834,7 +1533,6 @@ drawing them. - balance: Trying to suicide with an empty spraycan will now fail, because it's empty. It's just that simple. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Adds a eye-dropper-like right-click function to the painting canvas UI. Right-Click a pixel on the canvas while holding a painting tool to have it copy its color. - qol: Also adds a right-click function to the color palette at the bottom of the @@ -1842,107 +1540,6 @@ game window and the UI. - qol: Lastly, a tooltip has been added near the top-left corner of the same UI to let players know of these features. -<<<<<<< HEAD - - rscadd: Nanotrasen has uncovered a unique use for plasteel allowing the construction - of new machines capable of fabricating and distributing hardlight into a modular - barrier. These new machines are available via the advanced power manipulation - techweb. - - code_imp: Cat Surgeons are a bit more smarter about attacking threats to the world - around them on their endless pursuit for those felinid tails. - - bugfix: out of bounds when updating lights in lighting subsystem - - refactor: Refactors snipping cuffs into a bespoke cuffsnapping element, adding - support for delayed cuffsnipping. Adds this element to box cutters! Effectively - speaking everything is the same as usual. - - balance: Drawing small graffiti like paw/foot/claw prints, small brush dots and - short lines should cost half as many charges off your spraycan or crayon. - - balance: The cost of recoloring graffiti decals is now consistent with that of - drawing them. - - balance: Trying to suicide with an empty spraycan will now fail, because it's - empty. It's just that simple. - - bugfix: Spacesuits won't show 'you turn off x' if it's turned off automatically, - either from removing the power cell or it losing power. - TheSmallBlue and cats4gold: - - sound: Recent research concluded that the new elevator music was upping crewmate's - morale a bit too much, this has now been corrected via the replacement of said - music. - - code_imp: Added a new "in_order" variable to the looping sound datum, for when - you need sounds to play in order -2023-05-27: - KathrinBailey: - - bugfix: Voidraptor smoke machine room in the chemistry lab can now be opened by - chemists/CMO. - - qol: Voidraptor chemlab reorganised for better accessibility and reduced roundstart - chores, so chemists can get to doing chemistry faster. - Melbert: - - bugfix: Fixed being unable to spraypaint things - - bugfix: Fixes being unable to amputate - - admin: Getting dusted by HMS gives a death log - Paxilmaniac: - - bugfix: Forging can only be done with metals, and not bone/wood/meat/paper/diamonds/whatever - else - SkyratBot: - - bugfix: runtime when sm processes gases in vacuum - - qol: sm will now get activated for the very first time only if there is more than - 0.01 moles of a reactive gas present, so you can now safely install it in near - vacuum - - qol: sm will continue to process gasses only when there is above 0.01 moles of - the gas present else it just ignores it - - bugfix: Species that have longer arms than normal can now properly set their glove - offset to go low and meet their hand. - - bugfix: Test tubes can now be stored in chemistry smart fridges - - bugfix: graves can be closed again, but only with a shovel and not by hand. - - qol: you can put items in graves normally without throwing them in - - qol: examines & screentips for graves - - bugfix: rolling pin icon show's up correctly under the tools section in the crafting - menu i.e. for those recipes that require it - - bugfix: basketball hoop icon and other sprites that are not the standard `32 x - 32` now show's up correctly in the crafting menu - YakumoChen: - - bugfix: Booze-O-Mats contain alcohol for synths again - - bugfix: Ghost Cafe dorms with fireplace contain usable wood now - - qol: Ghost Cafe now with Icecat clothing vendor. Consult your local tribal vending - station. - - qol: Ghost Cafe minerals for mixed drinks now are in the Booze-O-Mat. Now with - uranium! -2023-05-28: - SkyratBot: - - bugfix: Fixed virus food being unsynthesizable by making it a hot reaction instead. - Now requires 600K to synthesize. - - bugfix: Coroner envirohelm (plasmaman helmet of coroner) now doesn't show as errors - when using flashlight mode. - - balance: Very small items like tape recorders now use 10 mat points instead of - 5. - - bugfix: soap suicide - Stalkeros: - - sound: Rubber duck now quacks. -2023-05-29: - LT3: - - qol: Being connected to an IV now has a visual indicator - SkyratBot: - - refactor: Chickens have been refactored into basic mobs, expect them to be a tad - bit smarter. - - rscadd: Made disposals outlets launch with more range depending on the setting - used - - rscadd: Made disposals outlets emag effect irreversible without reconstruction - - qol: Objects have a variable to adjust them visually when they're wrenched or - spawned on a table - - refactor: Removed redundant code that had similar purpose, moved `obj` wrenching - logic into the `objs.dm` - - qol: food/slime processor can be moved on table and adjusts to it when wrenched - - server: All logs are now formatted in json, excluding perf and investigations - - image: New air alarm sprite - - bugfix: Air alarm properly updates status when powered - - rscadd: Elevator music now cuts off instantly when exiting the elevator and is - inaudible from the corridor outside. - - rscadd: Elevator music can be disabled via a preference. - - bugfix: Several elevators which should not have played music now do not. - axietheaxolotl / viro: - - image: new medkit sprites, again. -2023-05-30: - Guillaume Prata: - - rscadd: Air alarms will now talk about their atmospheric problems (low/high pressure/temperature) - so players can understand what is the room's issue easier. -======= LemonInTheDark: - server: qdel statistics are once again logged in qdel.log, instead of the otherwise typical json logging system @@ -1971,7 +1568,6 @@ 5. - bugfix: Species that have longer arms than normal can now properly set their glove offset to go low and meet their hand. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - bugfix: '[MetaStation] - One of the chem heaters in the pharmacy is no longer nudged and awkwardly four pixels to the right.' @@ -1979,10 +1575,6 @@ the proper one that every other station uses.' - image: The chem heater sprite was nudged a SINGLE pixel to the right. This should, hopefully, make them appear more centered. -<<<<<<< HEAD - - code_imp: The code for posters internally has been tweaked slightly. If you see - posters floating in hallways, please report them ASAP!! -======= LemonInTheDark: - server: del logging is now done by outputting to a json file again, but this time we're using ACTUAL json and not just a big text string with newlines and shit @@ -2139,7 +1731,6 @@ - rscadd: Added more spider abilities - balance: Rebalanced spiders - bugfix: Fixes spiderlings having density ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Seven: - bugfix: Fixes epipens, pillbottles, and test tubes missing texture when put into suit storage @@ -2148,7 +1739,6 @@ - rscadd: The paper hat is now a craftable item - image: Pills and patches are no longer visible on a person when put into suit storage -<<<<<<< HEAD SkyratBot: - balance: Newly created areas in Icemoon and Space are no longer valid Cult areas for Runes and such. @@ -2172,7 +1762,6 @@ SomeRandomOwl: - sound: reduced the file size as well as shortened the length for the suppressed Mp5 firing sound -======= SyncIt21: - bugfix: stabilized metal slime extract properly increments stacks so that it's appearance & weight are updated correctly & is picked up by material sniffers. @@ -2262,4 +1851,3 @@ - code_imp: Nobreath and Nogenes now accounted for in species trait code - rscadd: Podpeople now have species traits - rscadd: Plasmamen genelessness is now displayed in their species panel ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-06.yml b/html/changelogs/archive/2023-06.yml index b7db48816be..a4cb8bc9948 100644 --- a/html/changelogs/archive/2023-06.yml +++ b/html/changelogs/archive/2023-06.yml @@ -1,5 +1,4 @@ 2023-06-01: -<<<<<<< HEAD Epoc: - bugfix: Speaking in sign language no longer reveals your identity JohnDWolfe: @@ -216,7 +215,6 @@ softcerv: - bugfix: NIFs shouldn't hard delete as much now. 2023-06-07: -======= FlufflesTheDog: - bugfix: Radios tuned to things other than common respond properly to turning on the speaker @@ -231,7 +229,6 @@ - spellcheck: Plate Gauntlets and Plate Boots now have proper looking names. - bugfix: Syndicate Holster now works as intended (You can finally put both revolver and speedloaders in it at the same time). ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 IndieanaJones, Melbert: - balance: Space Dragon can no longer choose its rift locations freely, and instead is given 5 pre-determined locations to pick from instead @@ -250,7 +247,6 @@ - qol: The roundend report for space dragons now collates all players who played a carp into one entry, rather than one per carp spawned. - qol: Space Dragon sounds are much less ear piercingly loud. -<<<<<<< HEAD NotDhu: - bugfix: Void Raptor's CMO office is now properly wired to the station's power grid. @@ -276,7 +272,6 @@ in the techfab/protolathe menus. - code_imp: Xenoarch tools/machines/equipment designs now use base types for inheritance purposes, and have less copy-paste involved. -======= LemonInTheDark: - rscadd: You can now filter by book id in library consoles - bugfix: The visitor console now actually has categories to select. Shows how many @@ -318,13 +313,11 @@ JohnFulpWillard: - bugfix: Metastation departures now has an APC and Air alarm again. - bugfix: Metastation and Birdshot's Coroner offices are now called Coroner office. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - code_imp: The code for posters has been split among three files. If you see something weird, please report it. - bugfix: Fixed the single tank poster using the wrong typepath for its mapping dir. -<<<<<<< HEAD - config: Flavor text requirements to join the round are now config based. Contributors rejoice. Kepteyn: @@ -360,7 +353,6 @@ - bugfix: The peanut butter banana sandwich is no longer presented as grilled when it doesn't require a griddle to make. - refactor: Giant ants are now more capable of distinguishing friend and foe. -======= - bugfix: '[MetaStation] - Secured some walls in science that weren''t secured properly (reinforced).' MTandi: @@ -420,7 +412,6 @@ - bugfix: Removes the misplaced extra chem dispenser from NorthStar pharmacy. - bugfix: NorthStar medbay now has lightswitches in some rooms as opposed to none. TheVekter: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Replaced one of the mini energy guns on the Caravan Ambush space ruin with a survival knife. - balance: Replaced the red-and-black softsuit on the Old Infiltrator space ruin @@ -431,7 +422,6 @@ variants of the explorer. - rscadd: Added a Syndicate variant of the explorer suit. The armor is identical to the Goliath cloak with slightly more bomb and ballistic resistance. -<<<<<<< HEAD - qol: Nanotrasen has issued a new wallet model, which lets you put biscuit papers in them! - bugfix: fixed cult veil shifter not teleporting the thing/the loser you're pulling @@ -457,15 +447,11 @@ - rscadd: Podpeople now have species traits - rscadd: Plasmamen genelessness is now displayed in their species panel - image: modified crate sprites -======= YehnBeep: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: After a thorough dressing down and threats of fines from the Fire Marshal, Nanotrasen has reluctantly installed several missing fire alarms and other safety equipment in the North Star's Cargo Bay and a few other lower deck areas. - bugfix: Fixed minor area definition errors in North Star's cargo area. -<<<<<<< HEAD -======= 2023-06-06: DATA-xPUNGED: - qol: Nanotrasen has issued a new wallet model, which lets you put biscuit papers @@ -540,14 +526,12 @@ - rscadd: Igniter's can be crafted - rscadd: Spraker's can be printed in the autolathe - rscadd: ignition controller can be printed in the autolathe ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: light replacer displaying error message after it finished replacing the light - refactor: merged the `can_use()` proc with the `Use()` proc to perform both actions at once - refactor: '`/obj/item/lightreplacer/attackby()` returns TRUE to prevent calling it''s `after_attack()` code and calls it''s parent proc' -<<<<<<< HEAD - bugfix: '[Metastation] [Birdshot] Test Site Materials Crates now contain targets instead of existing near them purposelessly and empty.' - bugfix: gibbing colossus possessor crystal possessed animals will no longer stick @@ -633,7 +617,6 @@ to lobby while dead. - bugfix: Fixes AIize not working - bugfix: xeno resin floor layer -======= ZephyrTFA: - admin: Player Ticket History - view a player's ticket history without the need to use external tooling. @@ -654,7 +637,6 @@ Rhials: - bugfix: Alexander now properly purges itself when you drop your shield. Sealed101: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed mecha plasma generator not accepting fuel - bugfix: fixed mecha ui incorrectly displaying fuel remaining when using an energy module @@ -664,10 +646,6 @@ like fixing other damage does - rscdel: did you know that for 4 years now mecha plasma generators did not, in fact, pollute the environment when in use? removed that bit from its description -<<<<<<< HEAD - - bugfix: waddling, squeaky shoes and swivel chair sound effects no longer run when - moved by conveyor belt. -======= - bugfix: fixed Lavaland Labour Camp Shuttle prisoner-side airlocks having unrestricted access from the side of a wall Seven: @@ -735,12 +713,10 @@ rageguy505: - bugfix: O2 crates have blue stripes when opened san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Shooting a welding fuel tank (big or small) with a projectile will now accurately post to list_bombers with the name of the person who shot the projectile from the gun. If you don't know how to list-bombers, it will also be present in game.log for your viewing pleasure. -<<<<<<< HEAD - rscadd: Assistants get a new liver trait, maintenance metabolism. This trait only lets them process maintenance drugs, grey bull, and pump-up for 20% more time and gives them a probably-positive 2 minute moodlet when ingesting these. @@ -750,7 +726,6 @@ - bugfix: Nanotrasen Cookery Command has ended the plague of staff complaining that their tomato dishes are just complicated forms of soup by redefining "tomato soup" to include a dash of cream. -======= 2023-06-11: Ghommie: - qol: Basketball (the mini-game) player mobs have a chance to be taller than the @@ -768,12 +743,10 @@ - code_imp: Spaceman simple mobs have been converted to basic mobs. - qol: Ventcrawling mobs have a 1 second delay/warning before exiting the ventilation. Roryl-c: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed TTS tripping over stuttered text when other speech modifiers are in effect - bugfix: fixed tedious TTS "ess-ess-speech" for lizards and other species with repeated consonants -<<<<<<< HEAD larentoun: - bugfix: Remove Lewd Items verb is config dependant 2023-06-13: @@ -804,7 +777,6 @@ - rscdel: Vending machines no longer flatten your sprite - rscdel: Vending machines won't RR you via gibbing/destroying your head SkyratBot: -======= ShizCalev: - bugfix: The RD's plant will no longer say that it's not very healthy after being restored with seeds. @@ -834,7 +806,6 @@ Pickle-Coding: - balance: Field generators can parry explosions. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: light replacer accepts glass sheets & light tubes when you attack them with a light replacer - bugfix: only glass shards can fill the light replacer not other shard types @@ -848,8 +819,6 @@ time - refactor: removed redundant` Initialize()` proc from `obj/item/light` - refactor: VV editing var's works properly -<<<<<<< HEAD -======= carlarctg: - rscadd: Assistants get a new liver trait, maintenance metabolism. This trait only lets them process maintenance drugs, grey bull, and pump-up for 20% more time @@ -858,7 +827,6 @@ - bugfix: Fixed liver masters being unable to inspect the liver of scientists. 2023-06-13: ArcaneMusic: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: In general, mineral recipe costs for items in larger amounts has been decreased by 2x. - balance: One sheet now contains a total of 100 units of material, down from 2000. @@ -866,95 +834,6 @@ costs of certain recipes. - code_imp: Added a python script to the tools folder, letting you see a mineral breakdown of one/several rounds using silo logs. -<<<<<<< HEAD - axietheaxolotl / viro: - - image: removes dogborg walking animations - - image: brand new arachne sprites! - - code_imp: old arachne renamed to slipper - jjpark-kb: - - rscdel: removed the red sec skirt from labor camp - - rscdel: removed cursed spring functionality - - bugfix: prevents certain organs from dropping on gib - nikothedude: - - spellcheck: Nanotrasen replaced the faulty measuring devices for certain bodyparts. - Sorry to all the crew who thought they were actually 10 inches - - rscadd: Synths now have their mechanical quirks listed in their species page - - rscadd: Slimepeople now have their alter form action documented in their species - page -2023-06-14: - Hatterhat: - - bugfix: Anesthetic machine parts kits probably won't cost an exorbitant amount - of iron after the material balance update. -2023-06-15: - ATHATH: - - bugfix: The destabilization of your eigenstate can no longer be paused by stripping - naked. - Cobby: - - bugfix: Droppers/Beakers will now go to 1u/15u on the FIRST leftclick. - Foxtrot (Funce): - - bugfix: Most tgui interfaces that use job icons should now correctly show alt-jobs - KathrinBailey: - - qol: Voidraptor kitchen re-organised to make all of the service mains out there - shed a tear of happiness. - LT3: - - bugfix: Tram controls no longer randomly go blank on Birdshot - - qol: ID card linking now preloads your bank account number - MTandi, Borbop: - - bugfix: Dust now has dust icon, instead of dirt icon. Dust on all maps replaced - with dirt - - image: Flat dirt now picks from 4 new sprites - - refactor: Made broken tiling work more like tiling and have corresponding visuals. - Added directional mapping variants. - - bugfix: Cleanables now use FLOOR_CLEAN_LAYER to make sure that trash is visible - above catwalks - SkyratBot: - - balance: Bone gel standart amount has been increased to 5. - - bugfix: You can no longer duplicate iron by turning sheets into rods and putting - the rods back into the protolathe - - rscadd: Added two new pirate types Ex-interdyne Pharmacists and The Grey Tide-6 - - spellcheck: corrects a typo in most ethereal drinks. - - qol: Plastic sheets chemist tip is more in-depth and clear - - qol: Added holy explosion chemist tip - - refactor: don't send gas name to gas filter UI as the name is already decoded - there from it's ID - dawsonkeyes: - - balance: rebalanced marked one attack cooldowns - - balance: dragonslayer semi-reworked to do less direct damage and have a more useful - dodge roll - - bugfix: hitting the marked one no longer spams bubble alerts - vinylspiders: - - qol: in the opfor application ui; doubled the opfor char limit for the backstory, - justification, and description fields. also added tooltips to show the character - limit so it is more obvious that the limit exists in the first place. -2023-06-16: - GoldenAlpharex: - - bugfix: Fixes the usage of vv'd windows not setting the id of their polarization - controller when mapped in when they were supposed to. - Gyran: - - balance: rebalanced and standardized the armor values of all security caps to - be the same, even those that previously had no armor at all. - Hatterhat: - - spellcheck: Some erroneous bullet casings were brought in line with the "[caliber] - [ammotype] bullet casing" name format. - Iamgoofball: - - bugfix: You can no longer eat adult organs. - LovliestPlant: - - qol: Records consoles and printed rapsheets now support basic formatting. - - qol: Rapsheets can now be printed out without having crimes on file. - Melbert: - - bugfix: Fix hungover people never spawning stuck in closets - - bugfix: Maybe fixes minor bugs in disease cure, revolution, hooded suit code - ORCACommander: - - code_imp: Do to a paperwork error, Dust has been repalced with Dirt. - ShizCalev: - - bugfix: The RD's plant will no longer say that it's not very healthy after being - restored with seeds. - - bugfix: Potted plants no longer randomly swap icons after being thrown. - - bugfix: Plants that started the round dead are no longer all the same kind once - revived. - - bugfix: Admins can now varedit plants to be alive / dead! - SkyratBot: -======= EricZilla: - image: Someone broke their ankle using the jumpboots in the vendor so we had to buy new ones @@ -1060,101 +939,11 @@ Tattle: - image: removed a stray gray pixel from the milk containers carlarctg: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Heretic runes no longer have every single transparent pixel set to 1 alpha, to make it easier to click on objects. - qol: Clearing heretic runes with mansus grasp takes 0.4 seconds of standing still, to prevent you from accidentally clearing it in combat. - code_imp: Added code for effect remover element to use a windup if set. -<<<<<<< HEAD - - qol: You can name barrels with a pen now, changing its icon - - bugfix: siliconnect log tab updates correctly - - bugfix: VERY small amounts of a gas (<0.0001 mol) in pipenets will once again - be fully removed - - spellcheck: adjusted font size from 30px to 15px - Tattle: - - image: removed a stray gray pixel from the milk containers - nikothedude: - - bugfix: Updates synthetic species quirk desc to better reflect their ACTUAL characteristics - softcerv: - - spellcheck: fixes the repair NIF surgery step name to be `(multitool)` instead - of `(hemostat)` - tf4: - - refactor: Mold has been refactored! Mold-type structures are now named appropriate - to their type. - - image: Toxic mold is now purple, to better differentiate it from radiation and - disease. - vinylspiders: - - bugfix: moth wings can now be hidden, and fixes a potential issue with not being - able to hide functional or open wings as well. - - bugfix: elevated, lowered, and pool tiles now craft 4x per sheet like the other - tile types, and give back their materials in the proper ratio when melting them - back into iron with the welding tool -2023-06-17: - LT3: - - bugfix: Sansufentanyl won't roll as a potential extreme allergy for Hereditary - Manifold Sickness - Melbert: - - sound: Welding Gas Masks make the same sound effect as Welding Hard Hats when - they toggle - - bugfix: Ghosts can click on active gateways to teleport to the destination set. - Doesn't work for secret gateways. - - bugfix: Runtimes from wingless humans using *wing - SkyratBot: - - bugfix: positronic brains now correctly reject the ghosts of people who have used - the suicide verb - - bugfix: The divine archer coat's hood now has armor like it's supposed to - - bugfix: You can no longer make extra cloth when looming cotton by spamming do - afters. -2023-06-18: - GoldenAlpharex, SQNZTB: - - rscadd: Added a donator item for SQNZTB. - LT3: - - bugfix: LOOC no longer displays a typing indicator - Melbert: - - bugfix: Fixed a cheeky way RDS revealed you were an antag before you actually - got antag. Sorry, you know who you are. - - config: RDS now has policy.json support, to allow customization of the roundstart - "anti-grief" message. - SkyratBot: - - rscadd: Updated the Patch of Eden lavaland ruin with a new item - - rscadd: Added the Plasma flower item, which can be used as an upgraded plasma - MOD core - - bugfix: MOD plasma cores' improved recharging from sheets (2000 charge up from - 1500) is back again. - tf-4: - - refactor: Mold-spawned mobs have been refactored. Expect improved AI behaviours. - - bugfix: Oil shamblers will now actually set you on fire rather than just infinitely - stacking fire stacks without igniting them. -2023-06-19: - GoldenAlpharex: - - bugfix: Fixed the density of the hardlight wheelchair donator item. - Hatterhat: - - bugfix: There is no longer a bunch of random floating stuff in the Equipment tab - of the techfab, as they've been moved to appropriate places. - - bugfix: Timeclock frame now shows up in the Frames & Mounts section of the Construction - tab in techfabs. - - qol: Cargo-relevant tools (the conveyor sorters, cargo teleporter, appraisal NIFsoft - disk) have been moved to the Cargo Tools subsection of the Tools tab. - - qol: The scythes (both tiers) now appear in the Botany Tools subsection of the - tools tab. - - qol: Gun permit HUDglasses moved to Misc. Equipment section of Equipment tab. - - spellcheck: Added some punctuation to the NIFsoft removal tools' balloon alerts - and visible messages. - - qol: The Marked One now displays a funny little parry indicator and sound instead - of a big floating "damage blocked!" balloon alert. - - qol: MCRs and associated components have been given their own lathe category. - - bugfix: The superheated MCR emitter thing now actually sets people on fire. - - bugfix: Recoil and spread on MCRs can no longer go into the negatives. This is - why gripped MCRs had spread, by the way. - - code_imp: MCR components now use inheritance where applicable. - Melbert: - - bugfix: Runtime from ejecting beakers from a chem-master - - code_imp: Adds some runtime safety to Cinematic code - - bugfix: Fix hard delete in traitor trap tool objective - - bugfix: Fixed a maint loot spawner located inside a wall in North Star Chemistry - Lab Maintenance -======= mc-oofert: - bugfix: siliconnect log tab updates correctly 2023-06-17: @@ -1182,23 +971,10 @@ - code_imp: Removed boilerplate from transforming component - bugfix: Ghosts can click on active gateways to teleport to the destination set. Doesn't work for secret gateways. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Refactored Stun Absorptions (Bastard Sword, His Grace) - refactor: Refactored Stun Immunity. Note this means that some mobs which, prior, were immune to all forms of incapacitation are now vulnerable to some. Notably, adult non-queen xenomorphs are now vulnerable to falling unconscious. -<<<<<<< HEAD - - bugfix: Fix Hard Delete from the captain's spare ID code paper - - bugfix: Fixed hard delete with Kinetic Crusher causing the projectile function - to brick - Rhials: - - qol: Basic spider eggs no longer flash the byond window when ready to hatch. - - qol: Toy hot potatoes no longer give a ghost notification. - - qol: Deadchat will be notified in the event of an imminent macrobomb detonation, - HFR meltdown, organ harvesting, - - qol: Deadchat will be notified when a nuclear/doomsday device is activated, as - well as when a blob-infection bursts. -======= - bugfix: Runtimes from wingless humans using *wing - bugfix: Fixed a cheeky way RDS revealed you were an antag before you actually got antag. Sorry, you know who you are. @@ -1211,7 +987,6 @@ - bugfix: After destroying unfathomable quantities of excess coins, their value is back to what it's supposed to be! - bugfix: The divine archer coat's hood now has armor like it's supposed to ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials :): - qol: The Russian and Bounty Hunter fugitive hunter shuttles now come with enough oxygen for everyone. @@ -1222,7 +997,6 @@ - balance: Every fugitive hunter shuttle now has a shuttle pinpointer present. - code_imp: Fixes the spawner menu text for psyker hunter spawners. - image: Blue and Orange mapping helper for Hunter Access. -<<<<<<< HEAD SkyratBot: - qol: The CC pod bay now has proper morgue facilities that don't clip through a glass window @@ -1300,7 +1074,6 @@ duration. Outputs 1 container or up to 2 pills/patches per cycle by default. Can be upgraded to output up to 4 and 8 with t4 servos. - bugfix: copying nodes from a techweb to another no longer reveals hidden nodes -======= SethLafuente: - bugfix: fixes meatballs not having inhand sprites SuperDrish: @@ -1334,7 +1107,6 @@ - qol: Deadchat will be notified when a nuclear/doomsday device is activated, as well as when a blob-infection bursts. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: finishing & closing the turbine core rotor part will now connect itself to the cable beneath it allowing it to share its produced power with everyone. - bugfix: turbine's now give detailed balloon alerts if you have a missing component, @@ -1342,64 +1114,6 @@ - bugfix: turbine's will not produce power in vaccume - bugfix: turbine's won't function if any of it's components are damaged or misaligned after linking or during processing -<<<<<<< HEAD - - bugfix: Birdshot now has an (oddly placed) atmosdrobe. - - bugfix: fixes the areas of the_faceoff - - admin: fix combat logs for tabling and disposal shoving - - bugfix: Glass joes will no longer appear to get knocked out, while already knocked - out. - - image: Updated Eastern Monk, Nun, Holiday Priest Chaplain Suits. EricZilla helped. - - bugfix: you don't hit the windoor after it has finished opening/closing. - - bugfix: Made some decals on north star look a little nicer. - - bugfix: you cannot use departmental budget cards as withdrawal sources for NT - Pay anymore - - bugfix: shipping manifests labelled as erroneous due to missing contents are now - guaranteed to be missing contents - - spellcheck: shipping manifests now display repeated items on a single line - - qol: Chemical burner can be crafted from any open container, not just beakers - - rscadd: Things affected by acid now get cool particles! - bobbahbrown: - - server: Fix log categories being erroneously excluded from log files. - jjpark-kb: - - rscdel: removed harmful skyrat spacevine mutations - - code_imp: consolidated skyrat spacevine content into a single module - softcerv: - - qol: introduces verbs for doing Says and Mes with the soulcatcher NIFSoft. - - qol: entering and leaving soulcatchers now have dedicated action buttons. - - spellcheck: The soulcatcher default room now uses the properly intended default - text. - stonetear: - - bugfix: jetpack signals now pass a user argument. This fixes an error when automatically - stowing a captain jetpack into your modsuit. -2023-06-20: - GoldenAlpharex: - - bugfix: Wheelchairs now make noises when they're meant to again, and don't make - noises on the tram nor on conveyor belts - Hatterhat: - - qol: Medigun cells have been given their own section in the weaponry tab, under - "Medical Ammuniton" and "Medical Ammunition (Utility)". - - qol: The medigun upgrade kit now tells you to remove cells from your medigun, - so as to prevent accidentally banishing them to the shadow realm. - - spellcheck: Some medigun cell typos have been resolved. Also, some medigun cells - have slightly revised descriptions. - - code_imp: Medigun cell designs now use inheritance, so as to reduce the amount - of copy-pasting in the file. - - code_imp: Also, medigun cell typepaths now use a tier_[number] nomenclature, so - a brute III cell would be under the brute/tier_3 typepath. - Melbert: - - bugfix: Fixed e-cutlasses and bananium swords having invisible inhands - - code_imp: Removed boilerplate from transforming component - RegJackson: - - balance: Most sec hats have had their armors standardized with the security helmet. - Now your only punishment for your sins of fashion will be a lack of immunity - to the inevitable pepper spraying from that woman who doesn't want your advances. - SkyratBot: - - rscadd: Food now gets stink lines when going bad. Uh oh, stinky. - - bugfix: fixed the context tips on papercutters - - bugfix: fixes papercutters not properly updating their icons, removing their stored - papers/blades, and eating papers when one is already stored - - qol: Abductor organ surgery steps shifted around to match other surgeries -======= - bugfix: you need to be in proximity of the airlock painter to eject its cartridge. - bugfix: you don't hit the windoor after it has finished opening/closing. YehnBeep: @@ -1410,15 +1124,10 @@ - qol: Papercutters now have contextual tips 2023-06-19: ATH1909: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: In addition to the beakers and bottles they could already hold, mediborg beaker apparatuses can now hold test tubes. - spellcheck: The descriptions of beaker and drink apparatuses have been updated to more accurately reflect what they can and can't hold. -<<<<<<< HEAD - SuperDrish: - - rscadd: Minimal Job Age requirments added. Disabled by default. -======= ChungusGamer666: - bugfix: Exotic blood types no longer persist through species change if the new species does not have an exotic blood type @@ -1461,7 +1170,6 @@ SethLafuente: - bugfix: Fixes a few Interdyne Pirates map flaws - bugfix: fixes holymelons not having inhand sprites ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 distributivgesetz: - rscadd: Photocopiers now use actual paper instead of materializing it out of thin air. @@ -1471,7 +1179,6 @@ form. - qol: Nanotrasen's bureaucracy division has ""improved"" the quality of their printer toner after many complaints from furious customers. -<<<<<<< HEAD softcerv: - qol: Evokers can now be renamed with a pen. - qol: Evokers now come with randomized names @@ -1503,7 +1210,6 @@ - bugfix: Fixes a few Interdyne Pirates map flaws - bugfix: somehow, somewhere, a ship's engine has been changed. 2023-06-22: -======= 2023-06-21: Addust: - bugfix: somehow, somewhere, a ship's engine has been changed. @@ -1539,12 +1245,10 @@ - bugfix: autolathe, protolathe, mech fabricator and component printers material capacity are now in 20 times less, as intended. - bugfix: protolathe material menu now should display material ejecting correctly. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - qol: The potted plants have been changed slightly behind the scenes. Mappers may enjoy being able to pick a wider selection of plants to put in maps now, because they've all been made into their own items. -<<<<<<< HEAD KathrinBailey: - rscdel: Removes force-borging nanite pizza from shuttle loan (host request). SkyratBot: @@ -1558,7 +1262,6 @@ - rscadd: Adds a shark plush, obtainable from Cargo for a nominal fee. - rscdel: Removed plush cucumber by popular request. Cucumber has been replaced by the shark plushie in arcade machines. -======= LemonInTheDark: - bugfix: Maps loaded post init will no longer randomly enter a failed state. Hopefully. Melbert: @@ -1612,7 +1315,6 @@ - image: added space lizard inhand- and onhead sprites - bugfix: changed held weight class of lizards from normal to tiny necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The Vorpal Scythe, a special null rod variant that gains power from beheading people! But it is fickle about when and how you use its power. Replaces the Reaper Scythe. @@ -1627,7 +1329,6 @@ - rscadd: '...unless you get to do it while screaming ''IT LIVES!'' via Revival surgery. Screw conventional medicine and science, you know the true way to bring back the dead!' -<<<<<<< HEAD - image: 'Updated several Null Rod Graphics. Also updated: the supermatter sword.' - bugfix: Virology disposals now route directly to space, rather than sending their nasty tubes to cargo. @@ -1645,7 +1346,6 @@ - bugfix: Inflatable barrier box can now only contain inflatables, and should be able to hold as many as they spawn with. They also hold a nicer amount of items (7 doors and 14 walls, instead of 8 doors and 16 walls, which looked stupid). -======= 2023-06-23: Cheshify: - bugfix: Virology disposals now route directly to space, rather than sending their @@ -1669,30 +1369,25 @@ - bugfix: Science department hallways now have unrestricted one-way exits on Delta, Birdshot, and Icebox, to make these maps consistent with the others. 2023-06-24: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - rscadd: 'New Wizard spell branch: Vendormacy! Summon runic vending machines with your Vending Scepter, force push them on your enemies to squish them or blow them up while they are busy buying from the machines.' Hatterhat: -<<<<<<< HEAD - rscadd: The Free Trade Union has reported losing small stocks of their "Archangel" rifle furniture sets. Coincidentally, in-sector black markets (accessible, as always, via appropriate black market uplinks) now report an uptick in availability of the very same parts. Prospective crazed gunmen are advised to bring a screwdriver. -======= - rscadd: Baseballs can now be crafted with 3 leather. Helg2: - qol: pill press' max volume for bottles are 50, as the volume of bottles itself. Improvedname: - balance: Weakens summoned stickmen to be 1 or 2 hit ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - image: Delam and tram flipsigns have been replaced with information displays - bugfix: Tram hit count is centrally managed instead of independently on each sign, so they won't get out of sync Melbert: -<<<<<<< HEAD - qol: Categorizes chef vendor - bugfix: The colossus's finale attack is now 100x more lethal, because it was firing 100x fewer projectiles than intended @@ -1838,7 +1533,6 @@ - bugfix: Fixed special chat bubbles for yelling, clown, redtext, greentext - bugfix: Fixed alignment of status display text - code_imp: Status displays now synchronize their message lines when scrolling -======= - bugfix: The Syndicate Assault Cyborg can autofire their LMG SyncIt21: - code_imp: makes sure cargo computer doesn't use `usr` var inside `ui_act()` which @@ -1869,7 +1563,6 @@ - bugfix: arrows can now be actually coated with reagents. - admin: The Debug and Admin MODsuits now take a lot less time to (de)activate. 2 and 0.5 seconds respectively, compared to the default of 10s. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: 'Wizarditis Improved. Those infected will now randomly cast one of the following (weakened) spells at max stage: Teleport, Disable Tech, Mutate, Knock, @@ -1877,16 +1570,6 @@ Bolt, or Swap' - rscadd: A source of antimagic will prevent Wizarditis's ill effects, but won't cure you. -<<<<<<< HEAD - Nerev4r: - - refactor: Podperson hair is now colorable, properly layered, and able to be emissive. - SkyratBot: - - sound: Adds unique sounds to library barcode scanner - - image: Removes soul from library - - sound: One (1) new space ambience track has been added. Good luck and godspeed. - - bugfix: Brand intelligence can no longer affect off-station vendors in some specific - circumstances. -======= Pickle-Coding: - bugfix: Fix atoms not applying proper armour penetration logic. - bugfix: Fix silenced living armour penetration not using proper armour penetration @@ -1901,23 +1584,10 @@ suit storage - qol: stamps are now allowed suit storage items in the hop, qm, and cargo wintercoats SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: glass bottles with reagents can be used for crafting, empty glass bottles will be used as tools(e.g. empty glass bottle as rolling pin) - bugfix: glass bottle with welding fuel can be used for crafting improvised shotgun shells -<<<<<<< HEAD - - bugfix: The lavaproof tracks cyborg upgrade now protects against liquid plasma, - the Icebox equivalent of lava. - - bugfix: fixed hostile mobs trying to attack supermatter discharge bolts - - image: the mosin and prime nagants' mob sprites have been updated - - bugfix: Items that shouldn't have been stacking should no longer stack. - - balance: Syndicate simplemob fire-rate raised to one shot per second. - - bugfix: Symbols display correctly when sending messages via mind link - axietheaxolotl / viro: - - image: resprited surgery tables, and stasis beds -2023-06-30: -======= - bugfix: bubble gum crate actually looks correct - bugfix: fixes balloon alert runtime when spider webs are destroyed. Tattle: @@ -2030,7 +1700,6 @@ - bugfix: Clarke ore box now has a less confusing dump contents button. Funnytoilet: - bugfix: Plasmamen can now get HMS ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Iamgoofball, Nadare, ddPn08, Mangio621, the rest of the RVC dev team: - rscadd: Improves the audio quality and speaker fidelity by implementing Retrieval Voice Conversion as an intermediary layer, utilizing the repository at https://github.com/ddPn08/rvc-webui. @@ -2044,8 +1713,6 @@ - rscadd: Reworks the silicon voice effect to be a special effect done on the TTS server level instead of via normal filters. - rscadd: Reworks the vending machine effect to use the new robotic voicebox effect. -<<<<<<< HEAD -======= Jolly: - spellcheck: Changeling hallucination sting will now tell you it costs 10 chemicals. It always did, but now its there. Cheers? @@ -2119,4 +1786,3 @@ - image: Added new Police Whistle sprites oranges: - balance: Ashlizards can no longer use the shuttle console to go on station ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-07.yml b/html/changelogs/archive/2023-07.yml index 61e7c79065c..615cd75b1ef 100644 --- a/html/changelogs/archive/2023-07.yml +++ b/html/changelogs/archive/2023-07.yml @@ -1,5 +1,4 @@ 2023-07-01: -<<<<<<< HEAD LT3: - qol: Context tooltip size increased - bugfix: Fixed remnants of old maptext code on various things @@ -63,7 +62,6 @@ - qol: people now lie down when buckled to surgery tables, and you no longer need cuffs to buckle someone to a surgery table - bugfix: Names for Interdyne pirates are now less bizzare -======= Cheshify, Kinnebian, and RedSentry27: - rscadd: Maintenance engineers have sent out blueprints across the sector for a new laser musket. @@ -74,7 +72,6 @@ - qol: Context tooltip size increased - bugfix: Fixed remnants of old maptext code on various things MTandi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Food and pills have a 10% chance to infect with one of three new diseases on consumption when left for more than 5 seconds on the floor. You can wash it to avoid disease. ChemMaster and Pill Press are added to the list of elevated @@ -88,7 +85,6 @@ rule too. - qol: Crafted food items spawns on nearby tables (except the one behind you) instead of dropping on floor when hands are full. -<<<<<<< HEAD - rscadd: You can now revive dead fishes, bees and (mindless) mice with a lazarus injector. - balance: Tom, the mouse, no longer counts toward the mice population cap. @@ -121,234 +117,16 @@ Tattle: - admin: build mode help text is in an examine block - admin: adv build mode and fill now have item previews -======= SyncIt21: - bugfix: jetpack modules work on mod suits again - bugfix: jetpack cyber implants also work - refactor: removed `get_mover` callback, user is retrieved during activation - refactor: timestop module on `on_module_triggered()` accepts user as 2nd param ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vekter: - balance: Increased armor penetration on xenos' neurotoxin spit. Well-protected crew members should still take more than a few hits to down but shouldn't be immune to it. -<<<<<<< HEAD - - bugfix: Fixed the ORM not granting mining points if you added ore by hand instead - of dumping it on the floor. - larentoun: - - refactor: Changed some .proc to PROC_REF() - oranges: - - balance: Ashlizards can no longer use the shuttle console to go on station - softcerv: - - qol: The NIFSoft Catalog PDA app now automatically downloads itself roundstart - if you have a NIF installed. - vinylspiders: - - bugfix: opaque public airlocks will now have proper fill sprites instead of empty - glass frames - - image: new fill sprites for non-glass public airlock sprites -2023-07-04: - MMMiracles: - - bugfix: Tramstation lower Science is now less prone to cave-ins from their surrounding - maintenance corridors. - Melbert: - - bugfix: Fixes a runtime from people with aphasia trauma getting deleted - Seven: - - bugfix: toys, stamps, and spacecash no longer has a missing texture when put into - suit storage - - qol: stamps are now allowed suit storage items in the hop, qm, and cargo wintercoats - SkyratBot: - - rscadd: Budget cuts can sometimes effect the station's supply of Emergency Bluespace - Shelters. - - qol: The health analyzer will now be more clear about how to treat burn wounds, - especially seriously infected ones. - - bugfix: Fixes oversight with the voice disable config not working right for situations - in which a player re-enters their mob. - - bugfix: Lesser Form monkeys no longer maintain the name of the form you had prior - to transformation. - - rscdel: Removed language encryption keys from cargo, s bad for species talking - among each other, a thing we want them to do - - bugfix: Crayon suicide now properly colors you. - - bugfix: You can't put spraycans in crayon box via opening it and putting directly - in slot as intended, but balloon alerts for mime's and rainbow crayons are gone. - - qol: '"empty" balloon alert no longer appears on crayons.' - - qol: You can make crayon burgers now. - - bugfix: Horrid organics will no longer be made happy when mechanical chaplains - fail to heal them with a bible. - - qol: Box with throwing weapons now can hold the items it spawns with. Incredible! - - admin: Boxex of materials, debugtools and stabilized extracts now 99 of total - storage because they are meant to be debug. - - bugfix: Tips now mention telekenesis dusting you when used on the SM, not telepathy. - - bugfix: urinal cakes wont decay anymore - - bugfix: Fix hypernoblium formation gas reaction rate sanity clamping not accounting - for the reduction factor. - - bugfix: Fix N2O formation gas reaction rate clamping clamping for incorrect consumption - rates. - - bugfix: Fix BZ formation reaction rate sanity clamping not accounting for N2O - decomposition factor. - - bugfix: fixed shotguns not clearing their "mag" correctly - - balance: Jousting now works on anything you're buckled to, not just Cyborgs. - - balance: Brooms, Pitchforks, the Captain's Sabre, and Energy swords can now be - used for jousting. - - balance: Spears need to travel a longer distance to joust now. - - balance: Jousting's knockdown and damage now only gets stronger after you've traveled - the minimum tiles needed to joust. - - bugfix: Placing a mouse inside your chef hat will once more allow it to pilot - you around. - - rscadd: A player-controlled mouse inside your chef hat can compel you to perform - complex actions, such as flipping and spinning. You will obey because the mouse - knows better than you do. - Vekter: - - rscdel: Plasma objects (statues, toilets, etc.) no longer explode when ignited. - They just release plasma like everything else plasma. (This doesn't impact injecting - plasma into cells or dipping cigars in plasma, those still explode.) - - balance: Increased blob tiles' resistance to lasers to compensate for the recent - buff to laser damage. - - bugfix: Removed nebula vomiting from the normal symptom pool. It should no longer - appear on regular viruses. - - spellcheck: Fixed a typo on the Interdyne shuttle. - itseasytosee: - - spellcheck: You should see a lot less "you can not move while bucked too X" messages - where they don't make sense. - - admin: Added a petrify smite. Try it out on your least favorite player! -2023-07-05: - LT3: - - bugfix: MetaStation's bridge incident counter and clock no longer overlap - - bugfix: Deltastation's missing incident counter has been found. Does that count - as an incident? - - qol: Tramstation bridge and medbay now have a clock where the tram hit counter - used to be - Melbert: - - qol: Prettied up the morgue of Deltastation - Seven: - - rscadd: Surgical caps now actually hide your hair - SkyratBot: - - image: Added new Police Whistle sprites - - bugfix: Tom will now always be a brown rat, instead of a random colour, as intended. - - rscadd: Prisoners can now be jaywalkers - - qol: reordered a crime so it appears on the choice list alphabetically. - - balance: Tcomms now works across connected (vertically) zlevels. No more hunting - in maint for the relay. - - rscadd: You can use cable on TTVs to make them wearable on the back - - bugfix: Had to destroy a lot more of em, but the value of iron coins are now back - to normal - - bugfix: hardcore random now gives you a species specific name - - bugfix: Clarke ore box now has a less confusing dump contents button. - - bugfix: Plant bags now properly harvest items when you click on hydrotray with - it, and don't pick up anything except the harvest - - bugfix: Carpellosis gnashing checks owner's teeth availability instead of the - target's teeth - - bugfix: Patches don't have a message saying that they're dirty - - rscadd: Added new Pirate Boots - - image: Added new Pirate Bandana sprites - - image: Added new Pirate Hat sprites - - image: Added new Pirate Uniform sprites - - image: Added new Sailor Uniform sprites - - image: Added new Pirate Coat sprites - - image: Added new Pirate EVA gear sprites - - image: Added new Cutlass sprites - - image: Added new Energy Cutlass sprites - - image: Added new `hgpirate` suit and hat sprites - Stalkeros: - - rscadd: Borg languages are back. - sergeirocks100: - - bugfix: Lizardpeople can now eat emperor rolls from the Tiziran Imported Delicacies - vendors without getting sick. - - spellcheck: Every instance where Tizira was misspelled as "Tiziria" in the Tiziran - Imported Delicacies vendor, as well as in the food inside, has been corrected. - vinylspiders: - - bugfix: visor mods now retract as well when retracting the modsuit helmet. - - bugfix: hemophages will no longer become stuck with permanent negative movespeed - modifiers when they undergo a species change while in the dormant state - - bugfix: any damage dealt by Ashwalkers to non-megafauna mobs will now have a chance - to drop crusher loot trophies. Ashwalker damage is equally likely to drop loot - as crusher damage is. An Ashwalker who is using a kinetic crusher will have - a bonus chance at getting a trophy. -2023-07-06: - Jolly: - - bugfix: '[MetaStation] There is no longer a random nondescript "item" outside - Xenobiology. No, it was NOT a Xenomorph.' - Lunar248: - - qol: Remapped the barbershop on tramstation to make it a bit more RP-friendly, - and visually appealing. - SkyratBot: - - rscadd: People who cannot read can interact with the tram console to send it to - a random station. - - bugfix: Replaced the security PDA painter in the CMO's office on Birdshot with - a medical PDA painter. - softcerv: - - rscadd: Adds in the size collar, an item obtainable from the dorm vendor that - allows the user to change their size while inside of dorm rooms. - vinylspiders: - - bugfix: digitigrade variant of the Assistant's Formal Winter Coat will no longer - show up as broken checkerboard sprites when worn. -2023-07-07: - Gyran: - - bugfix: The Blueshield can now select prescription and other securityHUDs from - the loadout menu. - Iamgoofball: - - bugfix: Buffs spacemen refractory period to reduce audio spam problems for players - walking past dorms - SkyratBot: - - balance: Traitorous Coroners can now purchase the Evil MMI and Brainwashing Surgery - Chip. - - balance: Traitorous Chief Engineers can now purchase the Deployable Sentry. - - bugfix: Fixes the lights from Tinea Luxor being stackable to the point of crashing - the game for others. - - qol: Request Internet Sound now has the option to credit the person who requested - the Sound. Defaults to anonymous. - - qol: Allows you to craft plastitanium shards. - - balance: Improved spacepol jumpsuit wound armor from 5 to 10 - - bugfix: A nuclear operative who is a slime will now correctly drop the disk upon - death. - vinylspiders: - - bugfix: the colourable winter coat will no longer display as a broken checkerboard - icon when the hood is down -2023-07-08: - LT3: - - image: More maptext and font tweaks - - spellcheck: Context tooltips too small, too big... just right? - vinylspiders: - - bugfix: Miner's Salve will no longer cause permanent numbness - - refactor: cleans up medicine.dm and removes some Skyrat edits in medicine_reagents.dm - - bugfix: slimes who use the Alter Form action to get taur bodies will now properly - hide shoes like they're supposed to - - qol: slimes who use Alter Form will automatically have their clothing icons updated - with the appropriate versions (for things like snouted masks, digitigrade legs, - taur shoes) without having to remove and re-equip their gear -2023-07-09: - SkyratBot: - - balance: Reduced the complexity cost of a lot of MODules. - - balance: Pathfinder 2 -> 1 - - balance: Tether 3 -> 2 - - balance: Temperature Regulator 2 -> 1 - - balance: DNA lock 2 -> 1 - - balance: Health analyzer 2 -> 1 - - balance: Sonar 2 -> 1 - - balance: Microwave beam 2 -> 1 - - balance: Drill 2 -> 1 - - balance: All visors (including NV and thermals) 2 -> 1 - - balance: Circuit Adapter 2 -> 1 - - balance: The Mining MODsuit has had its complexity increased to 13 and now starts - with the eating apparatus module, with a total base complexity of 10/13 now. - - balance: The Prototype MODsuit's active slowdown has been decreased from 1.5 (!) - to 1. - - spellcheck: Fixed a type on the energy net module. -2023-07-10: - Fikou: - - bugfix: service borg apparatus now works on stoves and griddles and ovens - - qol: borgs can now activate stoves and griddles - - rscadd: rnd can research a cookbook for service borgs - Imaginos: - - image: A new sprite for oeprating tables - LT3: - - bugfix: That new maptext mentioned below actually works - - image: A courier synth ready to deliver hugs and beeps straight to the heart! - Melbert: - - rscadd: The Atrocinator will now flip you even more. - SkyratBot: -======= necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Coroners are now Morbid! - rscadd: Coroners come with a series of special tools that are especially good at performing certain surgeries if used by a Morbid individual (which the coroner @@ -365,7 +143,6 @@ The rewards from the graveyard are now also slightly more lucrative...if you don't care about being cursed, that is. - balance: Roboticists get secure morgue access during skeleton shifts -<<<<<<< HEAD - bugfix: arrows can now be actually coated with reagents. - bugfix: jetpack modules work on mod suits again - bugfix: jetpack cyber implants also work @@ -375,7 +152,6 @@ - bugfix: You can once again directly place patients on operating tables - bugfix: Creampies no longer float above the heads of monkeys - rscadd: You can now put sandstone bricks in pillows to... make them deadlier? -======= timothymtorres: - qol: Add hotkeys to APCs for AIs and borgs. Toggle environmental (ctrl + shift), toggle lighting (shift), toggle equipment (alt), and toggle breaker (ctrl). @@ -523,7 +299,6 @@ - rscadd: You can use cable on TTVs to make them wearable on the back 2023-07-05: Archimus12: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds coloured large scarfs and winter coats to ClothesMate and black shoes to ChefDrobe - rscadd: Adds latex gloves to SciDrobe, ChemDrobe and GeneDrobe and nitrile gloves @@ -533,81 +308,6 @@ - rscadd: Adds grey backpack, grey satchel, leather satchel and grey duffel bag to CargoDrobe - rscadd: Organises Drobes -<<<<<<< HEAD - Vishenka0704: - - bugfix: fixed age restriction reason - - bugfix: Added a forgotten reason for not being allowed to work if the age is low. - vinylspiders: - - sound: reduced the size of a few large audio files - - bugfix: fixes a bug that was causing forge-crafted arrows to turn into bullet - casings upon crafting completion - - refactor: converts modular caseless ammo subtypes to use the caseless element - instead - - bugfix: ash headdress, ash winged headdress, ash robes, ash combat plates, & decorated - ash combat plates now provide a slight armor protection, equal to that of 'bone - bracers'. - - bugfix: fixes some layout issues with the milking machine ui that was causing - elements to overlap one another and be unreadable - - qol: items stored in pockets now fall out and get sent flying when gibbed (instead - of just being deleted) - - bugfix: you may now interact with lewd slots when the appropriate genitals are - exposed (using the Expose/Hide genitals verb -> set to Always Show) regardless - of whether or not you are clothed. -2023-07-12: - KathrinBailey: - - rscadd: Three skirts, one dress. - Melbert: - - bugfix: Fixes Aphasia being removed - Seven: - - balance: Acid on a turf no longer immediately applies acid to its contents - - bugfix: Acid applied on a tile will no longer damage pipes below that tile - - bugfix: Xeno's corrosive acid no longer instakills mobs - - bugfix: Xenos can now touch acid - - qol: Mops, some cleaning items, and light replacers now use balloon alerts - - bugfix: Fixes changelings not being put into their headslug when using last resort - - bugfix: Fixes changeling headslugs not putting their eggs into dead bodies - SkyratBot: - - bugfix: The military surplus trader encountered by explorer drones will now correctly - ask for armor rather than "suit" - - qol: Matches command envirosuit helms' armor value with their hat counterparts. - - bugfix: Destroying the fabled "green text" now properly releases its victims from - their curse. - - code_imp: Jousting now registers/unregisters properly on two-handed items. - - bugfix: You can now correctly Tend Wounds on most non-human animals. - - rscadd: You can now Remove Implants from non-human animals, just in case Ian swallowed - a macrobomb. - - bugfix: sliding puzzles can no longer have their icons erased by the hand labeler - - bugfix: the fortunate cookie dont dropped a empty paper anymore. - - bugfix: Fix atoms not applying proper armour penetration logic. - - bugfix: Fix silenced living armour penetration not using proper armour penetration - logic. - - code_imp: Added macro for calculating armour penetration. - - bugfix: Fixes venomous projectiles for real, and invisible arrow sprites. - - balance: The Regal Condor's base spread has been reduced to 0, like damn near - every other gun that exists. - - admin: If a circuit component outputs a radio signal, it should now be logged - in list-signalers. - - spellcheck: Fixed typos in the descriptions of the mRLD and RTD as seen from protolathes. - - bugfix: Cake cats/butter bear now grab the ghost of the brain used in their making - - bugfix: Autorifle magazines are now visible in the security techfab's ammunition - category. - Tattle: - - qol: changed mouth blocked message to a balloon alert - vinylspiders: - - bugfix: fixes a common CI failure that was caused by misplaced items on Voidraptor - occasionally getting eaten by randomized maintenance crates. - - bugfix: fixes a potential issue with gigantism/dwarfism trait not actually getting - removed alongside the mutation if your body size is too big or small - - bugfix: fixed an issue that was causing climaxes to not complete if you possessed - testicles, leading to being permanently horny in some cases - - bugfix: fixes some runtimes with the milking machine - - bugfix: Sadism quirk will now wait until the climax moodlet is gone before starting - to add more arousal -2023-07-13: - ATHATH: - - qol: Emagged organ harvesters will no longer refuse a victim that has items on - their person, such as the handcuffs they've been bound with. -======= ChungusGamer666: - bugfix: Bodyparts that should slow you down, will slow you down. Ghommie: @@ -701,14 +401,12 @@ ChungusGamer666: - rscadd: Added Alcoholic as a negative quirk. - rscadd: Added Hemiplegic quirk. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Hatterhat: - rscadd: A really old data disk with the MOD module designs for the status readout was recovered, and has been haphazardly hotpatched into the research networks. - rscadd: Also, the status readout module now plays a sound on death. - qol: The MODsuit health analyzer's info tab health readout can now be disabled in its settings. -<<<<<<< HEAD LT3: - bugfix: Security records no longer accept negative values for citation payment - image: Roller bed now has an inhand sprite @@ -764,7 +462,6 @@ - bugfix: Quantum relays now process, meaning DOS attacks actually function - bugfix: Music Request Credit shows CKEY instead of character name - bugfix: androids now have proper robotic organs and no appendix. -======= Jacquerel: - balance: Guard spider web statues despawn as the ability comes back off cooldown. - balance: Spiderlings now only move at light speed if they're on webs, stay safe @@ -865,7 +562,6 @@ - rscadd: Increased the force, throwforce, and wound bonus of inert ritual knives and scythes. - rscadd: Coroner gloves can quickly apply medicine like nitrile gloves. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: Heavily reworks and resprites first aid analyzers. They now display if they're happy, sad, angry, or warning you! Also a 'pricking' animation. - rscadd: First aid analyzers are now found in all basic and specialized medkits. @@ -881,7 +577,6 @@ - bugfix: Fixed a dummy parent feature of the health analyzer (Verbose mode) showing up, uselessly, on the disease and first aid subtypes. - image: Surgical processors and slime scanners have recieved a similar resprite. -<<<<<<< HEAD - server: job_config.toml should now comply with reload-configuration verb, meaning you can hot-reload the configuration from disk and have it apply ingame automatically. - config: The documentation for setting Minimum Character Age on a per-Job basis @@ -1125,7 +820,6 @@ jukebox songs included in their config. SkyratBot: - bugfix: roundstart exodrone consoles are now unscrewable. -======= 2023-07-09: DATA-xPUNGED: - qol: It has been issued brand new mini-fridges for our active stations, Featuring @@ -1180,12 +874,10 @@ - bugfix: Creampies will no longer irreparably stain your face Ghommie: - bugfix: Fixes venomous projectiles for real, and invisible arrow sprites. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added cardboard IDs to the game. They can be crafted with a cardboard sheet and wirecutters and modified with a writing tool. While worn, these will modify the visible name of the wearer just like actual IDs, though they aren't real IDs and won't work as such. -<<<<<<< HEAD - bugfix: Frontier Militia only have one general now, and have headsets. - balance: Frontier Militia no longer have energy pistols. - qol: CTF has more reminders of how to capture flags. @@ -1193,7 +885,6 @@ - bugfix: Ventilation clog no longer spawns mobs in inappropriate places - bugfix: Fixes holy arrows being invisible. - rscdel: The Head of Personnel no longer spawns with an ID box. -======= Helg2: - bugfix: androids now have proper robotic organs and no appendix. - bugfix: snakes, security, spiders and skeletons phobias now properly react on @@ -1240,7 +931,6 @@ Jacquerel: - bugfix: Guard spiders can now only make one scary duplicate of themselves at a time, rather than as many as they can click on the button. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: PAIs can no longer be inserted into Bots - rscadd: Bots can now have their sapience toggled by anyone with access to their settings panel @@ -1249,9 +939,7 @@ - qol: Bots, Regal Rats, and Cargorilla now appear in the Spawners menu if you are dead - qol: Bots can be renamed from their maintenance panel -<<<<<<< HEAD - bugfix: Intern returns misplaced droppers back to deltastation's xenobiology lab. -======= - bugfix: Bile/Vileworms now have the same projectile and thrown weapon resistances of other mining mobs. Melbert: @@ -1259,13 +947,11 @@ with your body - bugfix: Fixes Aphasia being removed Singul0: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: IRS jacket is now back in the clothesvend - rscadd: Ports breaching shells from beestation - rscadd: Space IRS has been added into the heavy weight pirates spawn pool - code_imp: Mosin nagant ammo boxes is now a subtype of regular ammo boxes (the toolbox subtype) -<<<<<<< HEAD - bugfix: Metalgen recipe generation works again - rscadd: 'New malf ability: Remote safety overrides. Allows the AI to remotely emag things it has access to.' @@ -1325,7 +1011,6 @@ - bugfix: Punpun has gotten properly fitting clothes for his little chimp body - code_imp: AI cards should react more snap-ily to having their occupant perish SkyratBot: -======= StaringGasMask: - qol: Now plasmamen can use the infiltrator MODsuit without having their species revealed. The helmet's still not sealed, so remember your mask. @@ -1444,12 +1129,10 @@ Helg2: - bugfix: roundstart exodrone consoles are now unscrewable. Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Personal AI holograms are now limited to an area around their PAI card. The size of this are can be configured via the PAI card. - rscadd: pAI cards can now be placed inside bots in order to grant them control of the bot. -<<<<<<< HEAD - qol: in the event the Gravity Generator becomes damaged, examining the main part will now give repair hints! - balance: Pyre Sect can now heal with their bible as normal. @@ -1476,7 +1159,6 @@ of additive - qol: laser muskets' inhand sprites will show now whether or not they are charged - image: new inhand sprites for the laser muskets -======= JohnFulpWillard: - rscadd: The 'Sent from my PDA' message is different for Clear PDAs now (specifying they are crystal). @@ -1496,7 +1178,6 @@ carshalash: - bugfix: Intern returns misplaced droppers back to deltastation's xenobiology lab. necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Stops manifest generation runtiming when a cargo crate is empty. - rscadd: Abandoned crates are now available via cargo imports. - rscadd: Dumpsters full of maintenance trash are now available via cargo imports. @@ -1512,7 +1193,6 @@ - balance: Buffed both the shocktrooper and special op crate. Shocktrooper now has an armored helmet and vest, and special op now has 5 mirage grenades and a chameleon belt. The survival knife in the special op crate is now a switchblade. -<<<<<<< HEAD - bugfix: The AI can no longer untip vendors remotely/spam sparks from shocked vendors - bugfix: Emotes now respect word filters. - bugfix: Fixed the AI vox announcement interrupting every other sound being played. @@ -1652,7 +1332,6 @@ - rscadd: 'New air alarm mode: Vent siphon, which disables scrubbers and forces vents to siphon air with no pressure regulation' - bugfix: Cryo cells no longer appear on when off. -======= - bugfix: Fixes holy arrows being invisible. nikothedude: - bugfix: Ventilation clog no longer spawns mobs in inappropriate places @@ -1710,12 +1389,10 @@ - bugfix: Abductor posters can no longer randomly spawn - spellcheck: Fix duplicate sentence in space comms agent flavor text CRITAWAKETS: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added the smoothbore disabler and it's prime variant. You can now craft a disabler with only one shot and terrible accuracy. - code_imp: Gun cranking has been made a component and could theoretically be used on more than guns. -<<<<<<< HEAD - image: .50 incendiary magazine now has sprite. Tattle: - spellcheck: Fixed the grammar on a few revenant messages @@ -1745,12 +1422,10 @@ Improvedname: - bugfix: Brings security berets down to softcap armor values also softcaps get wound armor -======= Jacquerel: - bugfix: Megafauna can be consumed by the singularity. JohnFulpWillard: - bugfix: Multi-z maps should now work again. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Adds a new 7 point positive quirk, "Spacer Born". You were born in space, and as a result your body's adapted to life in artificial gravity, making you @@ -1758,7 +1433,6 @@ is quite a chore, especially if you're assigned to work there. - rscadd: 'Adds a chemical: Ondansetron, created by Oil + Nitrogen + Oxygen + Ethanol catalyst. A powerful Antiemetic (lowers disgust).' -<<<<<<< HEAD - bugfix: Once again you can award people medals. Sapphoqueer: - bugfix: fixes a bug where borgs and TK users could effectively break ID's by removing @@ -1786,7 +1460,6 @@ - rscadd: Added angle lighting, applies it to most wall lights! - rscadd: Adds a lighting prototyping tool, mappers go try it out (it's locked behind the mapping verb) -======= - refactor: Refactored display-ing of antag objectives in their UIs Rhials: - spellcheck: removes an errant period from the flux anomaly announcement. @@ -1877,7 +1550,6 @@ - bugfix: Bank machine now doesn't yell about unauthorized credit withdrawal when its authorized. Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: You can't possess a MULE as soon as the round starts, someone will have to give you permission. - balance: MULEbots no longer crush prone characters unless they have been hacked @@ -1885,7 +1557,6 @@ - bugfix: Bots can put numbers in their names, what with being robots. - admin: 'Adds attack logging when certain wires are cut (for instance: MULEbot safeties)' -<<<<<<< HEAD softcerv: - balance: Duffelbags will now only make you slow while they are unzipped. As a tradeoff, you now need to stand still and zip/unzip them to access their contents/not @@ -1922,7 +1593,6 @@ leaning while facing the wrong direction Thebleh: - bugfix: Fixed several APC related issues. -======= JohnFulpWillard: - bugfix: Cult spells, bloodsense, and pylon healing now follow cultists through mind transfer (such as body swapping) @@ -1985,7 +1655,6 @@ - rscadd: MetaStation Chemical Storage now has its own APC - rscadd: MetaStation Chemical Storage is slightly larger than before - rscadd: Ice Box Station Chemical Storage now has its own APC ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 itseasytosee: - rscadd: You can now lean against walls! Simply turn your back to the wall and clickdrag yourself onto it. @@ -1993,7 +1662,6 @@ straight through eachother as if they weren't even there. - spellcheck: Added more variance to item throwing text. - refactor: Mob density has been refactored -<<<<<<< HEAD 2023-07-25: Hatterhat: - balance: Base material costs for ammunition have been sharply reduced across the @@ -2024,7 +1692,6 @@ \ competing reactions while preparing or cooking" - spellcheck: Chicken nugget will have a description in the craft menu, and fiesta skewers will have a description in general -======= jughu: - bugfix: removed a false silly tip about blob taking damage from flashbangs scriptis: @@ -2047,7 +1714,6 @@ leaning while facing the wrong direction 2023-07-24: GPeckman: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Bounty pads can now be upgraded, to reduce the time until you can pick a new bounty - rscadd: Sunglasses can now be bought from cargo if you have security access. @@ -2055,9 +1721,6 @@ - rscdel: Removed shady jims bounty - qol: Bounty pads can now be screwdrivered/crowbarred with left click like every other machine -<<<<<<< HEAD - - balance: Changes some cooldowns and upgrades of spells. -======= Sealed101: - bugfix: fixed third person throw verbs displaying as just an s Singul0: @@ -2066,7 +1729,6 @@ ArcaneMusic: - qol: ID cards tooltips now show how to assign a new account. Ben10Omintrix: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: the bee now can fly over the machines so its easy for him to go to the hydroponics machine - bugfix: player bees now will not be stuck inside the hive if he entered it, they @@ -2076,7 +1738,6 @@ - bugfix: now when a player interacted with the bee hive the bees will now leave the hive to defend the hive (it was glitched) - refactor: the bees now are a basic insect. -<<<<<<< HEAD Thebleh: - bugfix: South Bronx Paradise Bars are once again the best weight loss aid on station vinylspiders: @@ -2116,7 +1777,6 @@ Senefi: - rscadd: Some Metastation Medbay lights have been moved and adjusted. SkyratBot: -======= Cheshify: - image: Railing ends now exist. Comxy: @@ -2142,7 +1802,6 @@ Senefi: - rscadd: Some Metastation Medbay lights have been moved and adjusted. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: items can be printed from autolathe & protolathe when the exact material amounts are present in them after upgrading - bugfix: max printable amount now shows the correct value & updates when items @@ -2163,12 +1822,6 @@ - refactor: inserting an item into the material container will display the units consumed as sheets not absolute units - refactor: removed x25 & x50 print buttons from the autolathe -<<<<<<< HEAD - - bugfix: Plasmaman DNA can no longer be stolen by changelings. - - spellcheck: Phobia warnings have the same glowy text now as they would in messages. - - bugfix: Crates no longer stun you when you climb onto them. - - balance: Mmmh, butter on a stick. Now for americanbots. -======= Thebleh: - bugfix: South Bronx Paradise Bars are once again the best weight loss aid on station YakumoChen: @@ -2187,46 +1840,26 @@ Mooshimi: - bugfix: Plasmaman DNA can no longer be stolen by changelings. Paxilmaniac: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: The mag_type variable on guns has been split between accepted_magazine_type and spawn_magazine_type, allowing weapons to safely spawn with subtypes of their normal magazines without breaking the weapon - bugfix: Several weapons that spawned with special magazines, the riot dart pre-loaded donk pistol for example, will now be able to accept normal donksoft magazines that don't spawn loaded with riot darts. -<<<<<<< HEAD - bugfix: some fixes to spess IRS pirates. - balance: IRS armor is now bulky -======= Rhials: - qol: Modifies the contents of some Mafia lockers. Go check 'em out! Singul0: - bugfix: some fixes to spess IRS pirates. - balance: IRS armor is now bulky Time-Green: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Makes radiation nebula space work on high-pop by applying the radiation more directly - balance: Internal nebula storm no longer gives 10 seconds of immunity and has a very, very small chance to apply mutations - balance: Rudes nebula rad immunity from 10 seconds to 6 seconds (shouldn't differ too much since we use a different system now) -<<<<<<< HEAD - - spellcheck: Head of Personnel's roundstart text now says that they should answer - to the captain now instead of themselves. - jjpark-kb: - - balance: Reagent Imbuing (from forging) is strictly for ashwalkers & icecats - - balance: Forges can only be fully upgraded (legendary smiths) by ashwalkers & - icecats - - balance: Some of the forge upgrades have been moved around to accommodate reagent - imbuing being ashwalker/icecat only - oranges: - - balance: holodeck spawned banners no longer give the inspiration effects - vinylspiders: - - bugfix: fixes the nitrogen breather quirk not giving the correct lungs or spawning - the breathing dogtag -2023-07-27: -======= carshalash: - balance: Mmmh, butter on a stick. Now for americanbots. distributivgesetz: @@ -2254,13 +1887,11 @@ - balance: Flashed borgs can speak - balance: Remote lockdown on cyborgs lasts 180 seconds - balance: Cyborg stun arm works like normal baton, and costs less energy ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Consumables like bone gel will first be used for surgery before wounds Licks-The-Crystal: - qol: The "Kidnap" progression traitor objective now displays the number of telecrystals awarded for a successful live kidnapping. -<<<<<<< HEAD Lunar248: - rscadd: Completely revamps Freighter ghostrole, adding a new map, while trying to keep the spirit of the original. @@ -2285,7 +1916,6 @@ - bugfix: Nukie Medical Bundle now spawns with premium tactical medkit as it should. - bugfix: the height of runechat messages should now scale correctly with the current size variable of living mob. -======= Melbert: - bugfix: Fixes some occasions which result in TTS messages not playing Rhials: @@ -2298,7 +1928,6 @@ - admin: Changing shuttle events now alerts admins carlarctg: - bugfix: Hulks cannot be aggressive grabbed by strong grabbers anymore ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Syndicate duffelbags can fit 2 extra bulky items, down from three. - balance: Reduced syndicate duffelbag's unzipped slowdown from '1' to '0.3', and set its zipping-up sped to 0.5, same as unzipping. @@ -2312,12 +1941,6 @@ what it can hold now. - bugfix: The parent crayon's name is 'crayon' to prevent any weirdness with things that show the parent type's name. -<<<<<<< HEAD -2023-07-28: - Melbert: - - bugfix: Fixes some occasions which result in TTS messages not playing - SkyratBot: -======= distributivgesetz: - bugfix: Fixed a rare bug that let you spam bluespace bodybags everywhere. - bugfix: Mafia chaplains can now only use their seances on dead people now. @@ -2350,7 +1973,6 @@ - qol: Added options to hide detailed vitals and DNA data to the MOD status module - qol: Made MOD Ion Jetpack Module have stabilizers enabled by default Sealed101: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: dog with a butter on 'em - rscadd: dead dog with da butter on 'em (dogs feigning death are so good at it, they appear dead to medical HUDs and other things) @@ -2361,31 +1983,6 @@ - bugfix: fixes pets not dropping their collar when gibbed - bugfix: butter don't go on Lisa and corgi puppies (Lisa won't wear hats and corgi puppies can't wear hats and back slot items) -<<<<<<< HEAD - - bugfix: Some explosions should be more flashy and fiery, probably. - - bugfix: Determination can now actually overcome your adrenal glands, making adrenal - crisis a curable condition! - - bugfix: Clown cars now properly collide with deer. - - sound: Violent, slightly glassy car impact sound. - - bugfix: guillotines no longer runtime when logging after decapping someone if - they buckle AFTER the blade starts to drop - - bugfix: shoving a crystal down a hole no longer makes it dust itself - - rscadd: Uncollected sand and snow will be blown away by the wind when storms happen - (but don't worry, storms also allow those turfs to be freshly dug up again). - - bugfix: Removes the ability to screwdriver springlock modules to make them not - deadly because that defeats the point of the springlock module - - balance: Flashing borgs requires two consecutive flashes to fully immobilize - - balance: Flashed borgs can speak - - balance: Remote lockdown on cyborgs lasts 180 seconds - - balance: Cyborg stun arm works like normal baton, and costs less energy - - refactor: Refactored MOD Suit UI - - qol: Added options to hide detailed vitals and DNA data to the MOD status module - - qol: Made MOD Ion Jetpack Module have stabilizers enabled by default - - bugfix: Fixed a floating light in Delta's bar - - refactor: Crabs refactored into basic mobs. They now hunt tiny critters and flee - from attackers. - - bugfix: Fixed crabs not crab-walking. -======= Time-Green: - qol: The virologist is warned when radioactive resonance cannot be obtained YehnBeep: @@ -2395,7 +1992,6 @@ they buckle AFTER the blade starts to drop - bugfix: shoving a crystal down a hole no longer makes it dust itself nikothedude: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'New malf module: Remote vendor tipping. Allows you to remotely tip a vendor in any of the 8 directions. Goofy and okay for assassinations on unaware enemies!' @@ -2407,7 +2003,6 @@ - image: turf_analysis.dmi's red_arrow now has orthogonal directions - balance: Vendors now are far less likely to gib your head or make you parapalegic - balance: Vendors now respect armor when they crush you -<<<<<<< HEAD - bugfix: New lights have been issued to the Head of Personnel's office. - bugfix: We've instructed our intern to no longer place the HoP's stamps UNDER the carbon paper bin, making many think there was no stamp at all. @@ -2423,7 +2018,6 @@ Motho: - bugfix: Nanotrasen-Brand System Cleaner has had its formula improved! Now with 100% less disgust! -======= san7890: - code_imp: The currently operating rust-g version on a live server is posted to places like the runtime.log, in the same place where the revision information @@ -2452,72 +2046,11 @@ Sealed101: - bugfix: fixed gibtonite countdown animation interrupting clicks with the mining scanner ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Senefi: - bugfix: Replaced 5 space tiles in the wall of the anomaly research ruin with rocks. - bugfix: Replaced the tile under the window in the mimes vs clowns ruin with plating. - bugfix: Replaced space tile in the emergency fish shuttle with plastitanium flooring. - bugfix: Removed space tiles from the exterior of some ruins templates. -<<<<<<< HEAD - SkyratBot: - - bugfix: fixed gibtonite countdown animation interrupting clicks with the mining - scanner - - rscadd: Adds cliffs to the north of icebox. Try not to fall of of them! - - bugfix: you can no longer fireman carry to bypass puzzle doors - - rscadd: Added a 'Vending products shortage' station trait, that randomly lowers - the availability of all vending products from vending machines on the station, - with a 1/20 chance of the vending machine itself being tilted. - - bugfix: Birdshot AI sat now has unrestricted exit instead of entrance - - bugfix: non-opaque curtains will no longer block emissives - YakumoChen: - - balance: Local pirates have scrounged up the funds to reinforce their vital ship - consoles, making them extremely difficult to destroy. -2023-07-30: - GoldenAlpharex: - - refactor: There is no longer a preference for not having a voice, the option was - moved to be the very first entry in the dropdown, called "None". - Hatterhat: - - rscadd: Proto-kinetic crushers can now be reskinned via alt-click; the only other - skin is the proto-kinetic glaive. It has a neat desc and inhand. - Juniper & Sheets: - - image: Adds a Lopland-compliant skirt for Security Officers. - Juniper & Zydras: - - rscadd: Purchasable gravity harness in the Cargo goodies section. - Jureiia: - - rscadd: Recolourable Flannel Shirt! - - rscadd: A new thinner choker variation, now available in the loadout and lustwish - vendor. - LT3: - - bugfix: Escape menu items should be positioned properly again - - bugfix: Fixed unintentional nerf to electrocution damage when reverting to TG - Melbert: - - balance: The "Long Shift" achievement is now feasibly obtainable, and admins can - no longer trigger it unknowingly - - bugfix: Fixes runtime from trying to put two pots on one stove. - SkyratBot: - - bugfix: Carbons with tails (felinids, lizards) who have that tail removed will - now have that tail actually look like it came from the person in question, rather - than just be a grey thing of sadness. - - rscadd: Starlight will color with space gas parallax - - code_imp: Cleans up random parallax code / radioactive nebula parallax code - - refactor: the bear is a basic now. please report any bugs - - rscadd: the bear will climb trees and search honey - - rscadd: You can now earn an achievement for completing the Grand Ritual. - - bugfix: Summon Magic and Summon Guns work again - - bugfix: Fixes revolvers losing ammo capacity when you reload them. - - bugfix: Staff of laval no longer works on space - - bugfix: some things not connecting to the ore silo round start - - bugfix: Fixing some jank with the a greyscale modify menu, like inputs not being - sanitized. - - rscadd: Adds a Forested planetary station trait! Icebox exterior is now a forest! - - rscadd: Adds a Forever Storm planetary station trait! Sometimes, the storm never - stops. Stay inside or get some coffee and warm clothes - - bugfix: fixes stuff spawning in rivers and above chasms - - bugfix: emissive blockers on random flora not updating - - code_imp: Splits terrain generation and terrain population in SSmapping - - bugfix: Put a cap to the amount of stickers that can be sticked to an atom (12) - to prevent icon-related issues. -======= Time-Green: - rscadd: Adds cliffs to the north of icebox. Try not to fall of of them! mc-oofert: @@ -2547,12 +2080,10 @@ players. - rscadd: You can now earn an achievement for completing the Grand Ritual. - bugfix: Summon Magic and Summon Guns work again ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Player-controlled bots can now play the prerecorded lines associated with that bot. - rscadd: Placing a pAI into a bot temporarily teaches that bot all the langauges the pAI could speak. -<<<<<<< HEAD - bugfix: Dismounting from a piggyback no longer allows you to phase through other players. SpaceVampire: @@ -2582,8 +2113,6 @@ no longer get bloody when you walk over blood if you are also wearing shoes. Your kilt won't be getting bloody instantly anymore, it only will if you take your shoes off! -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Refactored chameleon actions a fair bit - rscadd: Adds outfit saving to chameleon clothes. RMB the "chameleon outfit" action @@ -2594,7 +2123,6 @@ to stealthily save their current outfit as a custom outfit to use later. And of course, it's chameleon too. - bugfix: Ethereals, the DNA lock mod, GPSs, and storage items now respect EMP protection -<<<<<<< HEAD SkyratBot: - bugfix: Using the timeline jumper MOD module updates stamina after resetting it, no more infinite stamcrits @@ -2617,7 +2145,6 @@ - bugfix: Module duplicator has cheaper costs for circuit duplication vinylspiders: - bugfix: Wings for fly persons from flight potion -======= - balance: The "Long Shift" achievement is now feasibly obtainable, and admins can no longer trigger it unknowingly - bugfix: Fixes runtime from trying to put two pots on one stove. @@ -2659,4 +2186,3 @@ no more infinite stamcrits vinylspiders: - bugfix: fixed a bug that would cause pAIs to be able to break their leash ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-08.yml b/html/changelogs/archive/2023-08.yml index 0c08e708f78..e8e5890ccc8 100644 --- a/html/changelogs/archive/2023-08.yml +++ b/html/changelogs/archive/2023-08.yml @@ -1,45 +1,4 @@ 2023-08-01: -<<<<<<< HEAD - Licks-The-Crystal: - - spellcheck: Corrected a large quantity of spelling, grammatical and phrasing errors - with Exploration Drone content. - SkyratBot: - - rscadd: Expanded the RPG loot wizard event by giving various different items their - own statistic boost. - - bugfix: ghost notification icons are now centered properly - - image: Wall and floor lights have been resprited to be a lot less dated looking, - and a lot less yellow - - refactor: Slaughter and Laughter Demons have been refactored, please place an - issue report for any unexpected things/hitches. - - bugfix: Laughter Demons should now actually drop a kitten. - - bugfix: fixes a runtime in SSstation setup - - bugfix: fixes parallax not rendering correctly for latejoins - - bugfix: fixes wizard loadouts - - spellcheck: fixed the interdyne modsuit's typoes - - bugfix: Photophobia should work now. - - bugfix: Eyes should return to their normal flash sensitivity when the quirk is - removed. - distributivgesetz: - - bugfix: Fixes pAI mind transfer from a bot to their card runtiming when the bot - gets broken. -2023-08-02: - Divibee: - - rscadd: Crutch sprites and item. - GuiltyNeko: - - spellcheck: fixed the spelling of the hand dryer's description - Jolly: - - bugfix: '[Shuttles] Kilo''s Emergency Shuttle no longer has a stacked light in - its brig.' - LT3: - - config: Dynamic gamemode rolls midrounds as expected - Melbert: - - bugfix: Fixed BB admin add - SkyratBot: - - bugfix: broken icons in RCD UI - - rscadd: Add a new 'Hall of Fame' emergency shuttle. It even comes with it's own - nifty photo album. - - qol: When Space Dragons devour people they get extinguished, removing flames. -======= Fikou: - bugfix: ghost notification icons are now centered properly - bugfix: coroner has an implant during cybernetic revolution @@ -87,7 +46,6 @@ DaydreamIQ: - bugfix: Birdshot's morgue has surgical tools and a laptop for the coroner to use Derpguy3: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The Syndicate battlecruiser's fighters have received external cameras to aid its pilots. - qol: Warning lights have been added to the landing pad of the battlecruiser to @@ -99,7 +57,6 @@ has had it added. - bugfix: The Syndicate medibot on the battlecruiser can now be unlocked by its crew. -<<<<<<< HEAD - rscadd: Added couple new signs to the game (med, medbay, morgue, chapel, viro, gene, botany) - rscadd: Way-signs now have additional states, showing vertical directions. @@ -108,7 +65,6 @@ - bugfix: coroner has an implant during cybernetic revolution - bugfix: Several places on Birdshot which were missing an APC now aren't. - bugfix: Several places on Birdshot which were missing an air alarm now aren't. -======= Jacquerel: - bugfix: Several places on Birdshot which were missing an APC now aren't. - bugfix: Several places on Birdshot which were missing an air alarm now aren't. @@ -120,12 +76,10 @@ - bugfix: Traitors using the sneak suit and heretics under the effects of cloak no longer leak their identity via Text to Speech OrionTheFox: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: resprited a lot of formal undersuits, enjoy! - rscadd: Added a pre-colored type of buttondown slacks for some service roles, to replace the "black suit" and "amish suit" - rscdel: Removed the "amish suit", "black suit", and one of the two "white suit"s -<<<<<<< HEAD - bugfix: Birdshot's morgue has surgical tools and a laptop for the coroner to use - bugfix: The blood-drunk miner has remembered how to swing their cleaving saw quickly without having to flick it out first. @@ -184,7 +138,6 @@ - balance: Xenomorph neurotoxin has been buffed (50 -> 65 stamina damage) - rscadd: Adds boss music functionality. - sound: Adds hierophants boss track, tweaks hierophant boss noises. -======= Senefi: - bugfix: NorthStar's Supermatter Waste Chamber guide no longer contains inaccurate information @@ -193,12 +146,10 @@ SyncIt21: - bugfix: broken icons in RCD UI Thunder12345: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: CentCom can no longer be raided by teleporting out of the Super Secret Room - bugfix: The Administrative Storage and ERT Armoury blast doors can no longer be opened by building a door button. -<<<<<<< HEAD SpaceVampire: - bugfix: 'VoidRaptor security made more accessible to the inquisitively inclined on their staff. @@ -233,7 +184,6 @@ - image: resprited the entirety of RnD! Genetics, Robotics, the RD, and the Science Team themselves will enjoy the fresh new looks but same great taste! No, wait, great STYLE! Don't eat these, they're covered in chemicals. -======= carlarctg: - qol: When Space Dragons devour people they get extinguished, removing flames. honkpocket: @@ -281,7 +231,6 @@ - sound: Adds hierophants boss track, tweaks hierophant boss noises. 2023-08-04: GPeckman: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added whisper-sensitive cybernetic ears, which make it much easier for the user to hear whispers at the cost of being more vulnerable to loud noises - rscadd: Added wall-penetrating cybernetic ears, which allow you to hear speech @@ -290,7 +239,6 @@ the other basic/normal cybernetics - balance: The welding shield and luminiscent cybernetic eyes are now unlocked with the other upgraded cybernetics -<<<<<<< HEAD - bugfix: deleted trash in the walls from whiteship ruin box. - bugfix: Guard Spiders are no longer unable to attack after using Web Effigy - balance: hat stabilizer module can now hold what plasmaman helmets can hold @@ -308,7 +256,6 @@ bar sprites. - rscadd: Remapped the Metastation kitchen for about the tenth time. distributivgesetz: -======= - bugfix: radio should no longer be broken for everyone Helg2: - bugfix: deleted trash in the walls from whiteship ruin box. @@ -332,13 +279,11 @@ - bugfix: Spell burger now has only one recipe distributivgesetz: - qol: Made reading text with the PDA retro theme a bit more accessible. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Updated Direct Messenger to v6.5.3. Now including brand new individual chat rooms, proper image attachments and a revolutionary message input field! - rscadd: Added a "Reset Imprint" option to the PDA painter. - refactor: Refactored PDA imprinting code just a bit. - bugfix: PDAs should now properly respond to rigged messages. -<<<<<<< HEAD - qol: Made reading text with the PDA retro theme a bit more accessible. vinylspiders: - bugfix: fixes .38 revolvers losing ammo capacity with each reload (for real this @@ -353,7 +298,6 @@ by the void. Hatterhat: - bugfix: MCRs can now fit camo again. -======= - bugfix: Fixes an extremely rare bug where a /mob/living/brain with a client would not be moved out of nullspace correctly, causing admin log spam. peptron1: @@ -374,14 +318,12 @@ - admin: The imaginary friend smite now allows selecting "offer to ghosts" instead of having to perform that poll yourself manually. When offering to ghosts you can also offer for several ghosts to volunteer at the same time. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Fixed disease outbreak viruses sometimes getting stuck invisible from medHUDs - admin: Added more admin features to create/manange disease outbreaks - admin: Pressing 'cancel' on disease outbreak setup dialogs will actually cancel the event instead of running it with default settings -<<<<<<< HEAD RatFromTheJungle: - bugfix: Makes the m45a5 come from one of the actually-legal companies. SkyratBot: @@ -438,7 +380,6 @@ Nerev4r: - balance: The armor of contractors has been lowered, and their baton holster costs another point to get. -======= MTandi: - qol: You can fill microwave with stuff by hitting it with a box full of stuff. Sealed101: @@ -456,13 +397,11 @@ - bugfix: Boss music cuts out when you die. Kryson, MTandi, Zeckle (Mike): - image: New bottles and holy grenade sprites ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - qol: Most of the colored oval-shaped portals faintly glow now. Cool! Senefi: - code_imp: Autowiki module for stock parts - bugfix: Emergency lights no longer runtime when created in nullspace -<<<<<<< HEAD SkyratBot: - bugfix: Areas created with the "land claim" blueprints are no longer hazardous to free golems. @@ -474,7 +413,6 @@ - qol: Mechs universally have diagonal movement as to avoid unresponsive movement, as block diagonal movement was having unintended side effects and was actually intended for pivot step mechs. -======= Vekter: - bugfix: Fixed the DNA Infuser's circuit board missing from the techfab and tech storage. @@ -482,14 +420,12 @@ - bugfix: Fixed being unable to purchase regular-priced uplink items if you bought the discounted variant of it. carlarctg: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Cursed crewmembers can randomly, extremely rarely, spontaneously combust for no reason. - rscadd: Cursed crewmembers can get zapped by nearby light tubes. - rscadd: Cursed crewmembers can freak out when passing by mirrors. - rscadd: To make up for these, triggering a cursed effect is slightly less than half as likely now when walking around now. -<<<<<<< HEAD - bugfix: sniper scope and kinesis should work without widescreen Vekter: - bugfix: Fixed the DNA Infuser's circuit board missing from the techfab and tech @@ -503,7 +439,6 @@ - qol: Bluespace Artillery Cargo Crate includes a guide paper for how to assemble it. SkyratBot: -======= necromanceranne: - bugfix: Restores a lost feature, Clarkes and Odysseus mechs once again can pivot on a dime and step in the same button press. @@ -511,13 +446,10 @@ as block diagonal movement was having unintended side effects and was actually intended for pivot step mechs. timothymtorres: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Add pAI movement freedom when emagged. - qol: The "Malicious Software Detected" button has been appropriately renamed to "Reset Software" for when pAIs are emagged - qol: Add a new law notification popup and flavor texts when pAI is emagged -<<<<<<< HEAD -======= 2023-08-07: EuSouAFazer: - bugfix: Removed a doubled filing cabnet in Northstar's Library Book Return room @@ -526,12 +458,10 @@ - bugfix: Fixed a logic mistake for chasm fishing that resulted in only generic items being spawned. SandPoot: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: Changed screentips icons to something a lot fancier unified with the LMB / RMB text. - qol: There are accessibility preferences to disable this! Look for "Screentip context with images" beside the other screentip preferences. -<<<<<<< HEAD - bugfix: Fixed a logic mistake for chasm fishing that resulted in only generic items being spawned. - bugfix: Fixed particles sometimes being left behind when an object drops all of @@ -544,7 +474,6 @@ - bugfix: fixed missing froth sprites - image: Re-sprites some of the oldest hairstyles 2023-08-08: -======= Sealed101: - bugfix: fixed missing froth sprites - image: bubblegum's blood smack and blood grab use new bubblegum sprites @@ -587,12 +516,10 @@ - balance: Coroner's medkit is now premium in the vendor. - balance: All Coroner medkits are the same, there is no 'large' variant. - balance: Coroners no longer get a folder. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Advanced viruses that are supposed to be stealth will again actually be stealth to analyzers - code_imp: Virus visibility flags can now be toggled in view variables -<<<<<<< HEAD SkyratBot: - bugfix: Exorcised uneeded variables from windoors in Meta's Xenobio - image: Mirrors now display a reflection of the mobs next to them... except for @@ -604,13 +531,11 @@ - qol: in case u miscliked the bee queen with a seringe 2 times, the raegent will not be transfered to the quen if he alredy have this raegent - rscadd: 4 New skin tones, hooray! -======= Melbert: - code_imp: Updated some status effect tick code to be more clear of how long is elapsing between ticks. Some effects that were inadvertently weakened are now stronger as a result (fire and some heretic effects). Sealed101: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixed goliaths digging sand that they can't actually reach (behind windows or inbetween closed turfs) - bugfix: fixed goliaths melee attacking their target despite the target running @@ -620,7 +545,6 @@ but stayed in their targeting range. this applies for most basic mobs, really, so if any basic mob was targeting you despite you hauling ass behind cover, they shouldn't anymore -<<<<<<< HEAD - image: fixes weird inconsistency on the neck and butt of the female base sprite - qol: Add sounds and flashing effects to slot machines - sound: Add new ding sound to slot machines from https://freesound.org/people/Natty23/sounds/411747/ @@ -632,26 +556,22 @@ - bugfix: Creatures with nobreath trait will now regenerate oxyloss. Androids, skeletons and such will no longer be stuck with un-healable damage after being revived. - bugfix: Fix parasitic infection to cure upon liver removal -======= Sheits: - image: fixes weird inconsistency on the neck and butt of the female base sprite Watermelon914: - bugfix: Fixed a hard delete that would occur with lua-created atoms. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 YakumoChen, Thalpy: - rscadd: Chen And Garry's Ice Cream is proud to debut a wide selection of cool new frozen treat flavours on a space station near you! - rscadd: Chen And Garry's Ice Cream revolutionary Korta Cones allow our ice cream vendors to profit off the lizard demographic like never before! - code_imp: Ice cream flavours now are all greyscaled similarly to GAGs -<<<<<<< HEAD softcerv: - qol: Organic Interface sounds now have prefs associated with them. vinylspiders: - bugfix: greyscale color selection menu is now working again in the loadout prefs menu 2023-08-09: -======= goobliner: - rscadd: 4 New skin tones, hooray! itsmeow: @@ -674,7 +594,6 @@ CliffracerX: - image: resprited all duffelbags, including worn and inhand variants to match modern storage. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fazzie: - qol: 'Many changes in Birdshot''s Library. @@ -687,7 +606,6 @@ moved bookcase there Makes a wire no longer go through a wall to reach the library APC' -<<<<<<< HEAD GoldenAlpharex: - config: Space vines are now going to be a bit more common, since they now require less living players in order to be eligible to roll. @@ -697,7 +615,6 @@ - code_imp: Updated some status effect tick code to be more clear of how long is elapsing between ticks. Some effects that were inadvertently weakened are now stronger as a result (fire and some heretic effects). -======= Ghommie: - bugfix: Fixed certain aquarium fish eating other fish when not hungry. - rscadd: Added a score award that counts how many achievements you've unlocked @@ -710,7 +627,6 @@ bait anymore. - balance: The Bepis fishing rod will now ignore fish's bait preferences. Melbert: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: PAIs can now cast wizard spells should they have any. - rscadd: AIs located in intellicards can now cast wizard spells should they have any. @@ -718,10 +634,8 @@ Mechas or Clown Cars. To varying degrees of success. - rscadd: Knock will now unlock and open closets you are hiding within. - rscadd: Repulse will now throw open closets you are hiding within. -<<<<<<< HEAD SkyratBot: - refactor: the hivebot is now a basic please report any bugs -======= - qol: Abductor Baton Recall now starts linked to their baton, and you can no longer unlink your baton - qol: Instant Summons now shows what item is marked over the icon @@ -742,7 +656,6 @@ As a result, the dissection surgery has been removed as it is now redundant. - qol: A coroner knows whether someone has been autopsied and recently dissected (and thus hasn't been revived) by examining them. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Standardizes some of the nuclear operative entries to have more consistent pricing within their respective categories. - rscadd: Adds some new categories so that players have an easier time navigating @@ -760,7 +673,6 @@ - rscadd: Added 40 new cosmetic items to the Syndicate Store. Buy them now from the Hat Crate, only 5 TC! - code_imp: Updated the nuclear operative uplink files. -<<<<<<< HEAD - bugfix: fixed basic mobs freezing up when in melee range of a target - rscadd: Adds the Coroner surgery duffelbag; This replaces Coroner's surgery tools in their medkit and current duffel, and has the cruel surgery tools instead @@ -848,16 +760,13 @@ - balance: Removes standard vest from all security lockers and adds 3 of them to the security wardrobe. - bugfix: fixed gibtonite explosions having flames and flash ranges -======= siliconOpossum: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added greyscale suitskirt, available in clothesmates - rscadd: You can now roll up the sleeves of greyscale buttondown shirts - qol: Re-added previously removed black suitskirt and the RD's tan suitskirt, as pre-colored variants of the above - bugfix: Fixed only one buttondown with slacks being available in clothesmates - image: Slightly adjusted greyscale buttondown sprite, you look less fat now! -<<<<<<< HEAD vinylspiders: - bugfix: quirks list will now be displayed normally in examine text again instead of duplicating itself @@ -919,7 +828,6 @@ - qol: Uncle Pete's Rollerdome has had its price increased, and the disco machine is no longer unbreakable. - bugfix: fixes kinesis not actually immobilizing or blocking hands of grabbed mobs -======= 2023-08-10: Boopideedoo: - bugfix: fixed a Camera in atmos @@ -959,7 +867,6 @@ - spellcheck: fixes one of the virus thresholds saying "scrathing" instead of scratching carlarctg: - qol: Biogenerators can be unwrenched ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds Summon Simians, a spell that summons four monkeys or lesser gorillas, with the amount increasing per upgrade. The monkeys have various fun gear depending on how lucky you get and how leveled the spell is. If the spell is maximum level, @@ -973,11 +880,9 @@ drones can all now cast robed spells as long as they''re wearing a wizardly hat as well.' - balance: Made monkeys able to wield two-handed things again. -<<<<<<< HEAD - spellcheck: improvised fire extinguishers aren't full of typoes now Wallem: - rscadd: T -======= improvedname: - balance: Removes standard vest from all security lockers and adds 3 of them to the security wardrobe. @@ -1033,12 +938,10 @@ SS13.type and SS13.qdel' carlarctg: - qol: Drill module automatically disables if it's about to drill into gibtonite ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 iain0: - bugfix: A small clerical error fixed which will cause the Ukrainian station naming prefix to be properly applied to the Independence Day of Ukraine holiday on 24th August, rather than overwriting the Indigenous People's Day station prefixes. -<<<<<<< HEAD vinylspiders: - bugfix: Fixed fired foam darts, gumballs and (harmless) lollipops being embeddable. - bugfix: 'Projectiles that should embed while being reusable will now do so correctly, @@ -1056,18 +959,15 @@ SkyratBot: - balance: Change mousetraps to kill mice instead of damaging them (except regal rats) -======= timothymtorres: - rscadd: Add admin blackhole shuttle event with a normal version and suicidal version. - bugfix: Fix several shuttle event runtimes 2023-08-12: Cheshify: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: North Star's Cytology and Xenobiology are now significantly more usable. - rscadd: North Star's Genetics has been tweaked. - bugfix: The North Star's AI SAT has a working vent and it's service hall has a working lightswitch -<<<<<<< HEAD - rscadd: you can upgrade laser pointers with a bluespace crystal to let them shine through walls at double the power cost, if the laser in the pointer is of tier 3 or higher. @@ -1081,7 +981,6 @@ - rscadd: Lets you grind things into a hauntium reagent which works similarly to the solid form but is versatile and has some unique effects. - bugfix: X'ing out of the podpeople no soul prompt will no longer harvest the seeds. -======= Derpguy3: - bugfix: The metastation law office's shutters now function again. EuSouAFazer: @@ -1091,7 +990,6 @@ Melbert: - bugfix: Fix antimagic effect not expiring Paxilmaniac: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Gigabeacons no longer need to be constructed like standard machines, instead being printed as items that can be deployed quickly inhand without tools. - qol: Gigabeacons are no longer their own research node, instead being a part of @@ -1101,13 +999,11 @@ found a nav beacon! - code_imp: The deployable component now gives you an option to disable the examine blurb it adds to its parent -<<<<<<< HEAD - bugfix: rabbits are now small-sized rather than human-sized, as well as capable of being picked up - bugfix: baseballs are now small sized rather than large - bugfix: fixed missing departments and names in request consoles - qol: Gateway access no longer requires a Silver ID. -======= Wallem: - rscadd: T carlarctg: @@ -1161,13 +1057,11 @@ - bugfix: fixed laser pointers luring dead cats when shone upon - code_imp: laser pointer code cleaned up a tad TheBoondock: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added Pulse of Entropy, a new ritual for rust heretic unlocked after leeching walk. This ritual can be completed with 20 iron sheets, 2 garbage items to rust in a 4 tiles radius round the rune. Useful for establishing bases and fighting area. - bugfix: fixed detect_room not running correctly when break_if_found is not passed -<<<<<<< HEAD - bugfix: Growing spiders will now retaliate against you like they were always meant to. - bugfix: After a collective brain fart lasting for 6 months, monkeys and xenomorphs @@ -1183,20 +1077,17 @@ of. - qol: Emergency shuttle now gracefully display occupancy limits and prerequisites in the communication console. -======= dieamond13: - rscadd: Lets you grind things into a hauntium reagent which works similarly to the solid form but is versatile and has some unique effects. lizardqueenlexi: - bugfix: The Nuke Op/Lone Op sniper briefcase now properly contains a sniper rifle. san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Morphs are now basic mobs with a nice new ability to help you change forms rather than the old shift-click method, much more intuitive. - admin: With the morph rework comes a new ability you can add to mobs, "Assume Form". Feel free to add that to any simple or basic mob for le funnies as Runtime turns into a pen or something. -<<<<<<< HEAD - bugfix: The metastation law office's shutters now function again. - bugfix: Fixed wheelchairs being silent. - bugfix: Labor Camp Sustenance vendor is no longer free; instead, it takes your @@ -1217,7 +1108,6 @@ vent and scrubber on the configuration panel. /:cl:' SkyratBot: - bugfix: You can no longer stand up without legs. -======= - bugfix: Growing spiders will now retaliate against you like they were always meant to. 2023-08-14: @@ -1232,13 +1122,11 @@ added or removed, and none left their original room (except the captain's electric razor, which went to the bathroom). Hatterhat: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Projectile damage multipliers on guns are now reflected in their combat information. - admin: Admins can now make a gun's fired projectiles better or worse at wounding by changing the gun's projectile_wound_bonus. Surely this will not have any repercussions. -<<<<<<< HEAD - qol: xenos rest verb now is a hud button instead - qol: The icebox bridge had its items moved to better positions. No items were added or removed, and none left their original room (except the captain's electric @@ -1253,7 +1141,6 @@ - bugfix: The modular receiver is now only printable from a hacked autolathe. - bugfix: The chef can no longer close the shutters in Meta's HoP office. 2023-08-15: -======= Helg2: - bugfix: Inquisitor Commander now has just 1 box. Jacquerel: @@ -1277,29 +1164,23 @@ - bugfix: you can no longer tactially stealth-hide donuts in your right hand FernandoJ8: - bugfix: mob holders no longer bug out and harddel when put into evidence bags. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: The formatting on PDA messages displayed to observers is now back to what it used to be, rather than being all bold. - bugfix: PDA messages are now displayed to observers from dead players, and not just dedicated observers. -<<<<<<< HEAD - admin: The banning panel is now set to have all bans be global by default. -======= Kapu1178: - rscadd: Lockers, crates, and machines no longer block click attempts in adjacency checks. Basically, you can reach tables cornered between lockers/machines. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - qol: Minor mapping work to Metastation. Wallmounts, decal changes, etc - especially around Medbay. - qol: Remapped Meta's Morgue slightly. -<<<<<<< HEAD ShizCalev: - bugfix: Medbots made with tactical medical kits now have the correct skin SkyratBot: - bugfix: fixed the Tram Pod Bay having no lights -======= OrionTheFox: - bugfix: fixed the Tram Pod Bay having no lights ShizCalev: @@ -1318,12 +1199,10 @@ ship, renamed) - bugfix: Fixed an issue that made mapload medibots unable to load custom skins. vinylspiders: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixes a bug that can cause emotes to stop working if a client is being created or deleted - bugfix: fixes immerse overlays not being added the first time a mob enters a water turf -<<<<<<< HEAD - rscadd: Added big slappy - image: Added big slappy parts and big slappy sprites - rscadd: Lockers, crates, and machines no longer block click attempts in adjacency @@ -1339,14 +1218,12 @@ Onule: - image: modified light fixtures' sprites and overlays to be more pronounced SkyratBot: -======= 2023-08-16: DeerJesus: - bugfix: removes bodybag welding tooltip FernandoJ8: - bugfix: items no longer stay in your hands after their respective arm is dismembered MTandi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Refactored Mech UI - refactor: Refactored mech radio into a utility module, adding extra slot to all mechs @@ -1384,7 +1261,6 @@ - balance: Made mech RCS pack consume reasonable amount of gas - code_imp: Fixed some other minor bugs and made some minor changes in the mech code -<<<<<<< HEAD - bugfix: items no longer stay in your hands after their respective arm is dismembered - bugfix: mob holders no longer bug out and harddel when put into evidence bags. - bugfix: removes bodybag welding tooltip @@ -1413,11 +1289,9 @@ - balance: Tangle spider's acid injection per bite reduced from 5 to 2.5. - bugfix: Colored ammo bands, such as those on .357 and .38 speedloaders, no longer permanently disappear upon icon update. -======= Onule: - image: modified light fixtures' sprites and overlays to be more pronounced OrionTheFox: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added the Bowtie! Bartenders start with one on, but they can also be found in the Bardrobe, Autodrobe, and Clothesmate. No need to tie it either, it's just a clip-on. @@ -1428,12 +1302,10 @@ - image: updated the majority of Lawyer suit sprites, along with the Cook's Apron-Jacket and Hat, and updated/greyscaled Botany's Overalls! Also the Overalls are available in the clothesmate, and the Cook Jorts' shirt is less crusty. -<<<<<<< HEAD - balance: Ascending as an Ash Heretic now reduces the cooldown of Nightwatchers Rebirth to ten seconds, additionally Ash ascension has Bomb immunity added to the resistances it offers (no stun immunity though) - qol: the chemistry heater can now be unwrenched. -======= Paxilmaniac: - image: The Mosin-Nagant has been given new sprites and a reflavor, looking for the old rifle? Look for the Sakhno Precision Rifle. @@ -1449,7 +1321,6 @@ - bugfix: fixed a disconnected APC in Delta's tech storage. 2023-08-17: BlueMemesauce: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Add policy for sentient mobs that were revived by lazarus injector (depends on config) @@ -1457,7 +1328,6 @@ get enslaved to whoever revived them.' - bugfix: Servant golems get their master's real name (Won't be serving "Unknown" if their master is wearing a mask) -<<<<<<< HEAD - bugfix: Skeletons now heal burn damage with milk once again. - balance: metal bat damage changed from 12 -> 20 - bugfix: Gravitational Anomalies will now correctly clean up after themselves, @@ -1485,7 +1355,6 @@ - rscadd: Added 28 new food recipes! - bugfix: Goliaths will try to attack mechs with their tentacles. - spellcheck: fixed the rat king text saying that they're summoning rats -======= DaydreamIQ: - balance: Ascending as an Ash Heretic now reduces the cooldown of Nightwatchers Rebirth to ten seconds, additionally Ash ascension has Bomb immunity added to @@ -1495,12 +1364,10 @@ control it - balance: metal bat damage changed from 12 -> 20 FernandoJ8: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: dismemberment moodlets are replaced by a lesser mood debuff when you recover the limb in question. - balance: dismemberment moodlets can now stack for each limb you lose, and are cleared separately. Their descriptions have been updated to reflect this. -<<<<<<< HEAD - bugfix: Spaceacillin will once again provide antiviral effects for the deceased 2023-08-18: AnywayFarus: @@ -1512,7 +1379,6 @@ Iajret: - bugfix: Mapped or spawned in rusted walls (such as on Birdstation or on charlie ghost role) can now be fully cleaned without needing to deconstruct them. -======= - bugfix: items implanted on arms no longer become permanently stuck in-hand when their limb is dismembered - bugfix: quickly sheathing and unsheathing the vorpal scythe can no longer bug @@ -1532,12 +1398,10 @@ instead of leaving an area of the station permanently heavy or with no gravity at all. - bugfix: Goliaths will try to attack mechs with their tentacles. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Base large airlock subtype no longer spawns a normal sized airlock - image: Added mapping icons for large airlocks - code_imp: Repathed all public airlocks to consistent naming -<<<<<<< HEAD Melbert: - balance: Red toolboxes go faster Paxilmaniac: @@ -1565,7 +1429,6 @@ the ability's name, so you can much more quickly see what the ability is. - bugfix: formal closet will no longer spawn with two 'error' icon suits inside of it -======= LemonInTheDark: - balance: De-escalates terry powergaming by reducing the strength of sec Melbert: @@ -1609,15 +1472,12 @@ - rscadd: Add a Self Seethrough ability, given to most large mobs and all mobs affected by a fugu gland - bugfix: Space Dragon's overlay will no longer vanish at times ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Xenomorph Sentinel and Ambusher Spider's sneak ability now has a transition to a lower alpha as opposed to being immediate. - qol: The sneak ability now uses balloon alerts as opposed to chat alerts. - bugfix: Fixed the Xenomorph Sentinel's Sneak ability icon being an error. -<<<<<<< HEAD - spellcheck: Fixed a lack of plurality when ejecting multiple casings from a revolver. - bugfix: fixes all the martian drinks having 20 boozepower -======= Jacquerel: - admin: Adds Spider, Goliath, and Meteor Heart actions to the "Grant Mob Action" menu. @@ -1629,7 +1489,6 @@ - admin: The Add Mob Ability menu now prefixes the typepath of the ability with the ability's name, so you can much more quickly see what the ability is. Mothblocks: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Engineers now have an RCD round start. - balance: RCD construction/deconstruction effects can now be attacked in order to cancel them. You can get the anti-disruption upgrade disk to prevent this. @@ -1637,7 +1496,6 @@ effect up. This does not effect reconstruction. - balance: Both of the above effects do not effect the CE's roundstart RCD, nor any other RCDs such as combat RCDs. -<<<<<<< HEAD - image: bowtie sprite has been tweaked slightly to look a little bit more bowtie-ish - bugfix: Turning into a space dragon with the polymorphic inverter will no longer leave you existing in two places @@ -1677,7 +1535,6 @@ SkyratBot: - bugfix: No more stacked items in Meta's custodial closet - bugfix: you can actually tell what hand a reagent dartgun is in now -======= mc-oofert: - rscadd: cybernetic moth eyes and their variants - bugfix: luminescent eyes no longer make you look like a cyclops in the dark @@ -1725,14 +1582,12 @@ necromanceranne: - bugfix: Makes sure settlers are SHORTEST. san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Regal Rats have been refactored into basic mobs. They should be a bit smarter and retain their docility (until attacked, in which case you should prepare to get rekt by summoned rats), and properly flee when they can instead of just sit there as you beat them to death. The framework for them interacting with stuff (i.e. opening doors while slobbering on food) is a bit more unified too, now. They also have cooler names too! -<<<<<<< HEAD - bugfix: the goliath and watcher mating season has ended and population has returned to normal levels - admin: Four players can ride the speedwagon @@ -1745,11 +1600,9 @@ - bugfix: '[Waystation] Deleted a window on the same place as windoor so it won''t block your path to secret documents.' 2023-08-20: -======= 2023-08-20: EuSouAFazer: - qol: Made the cytology lab in many maps much more convenient. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fikou, Armhulen, Sheets (+rep for Mothblocks and Potato): - bugfix: RD MODsuit outfit (admin only) no longer has a beret that blocks the activation of the suit @@ -1760,19 +1613,15 @@ tool for editing transforms. - rscadd: MODLink system, available through scryers (from RnD and Charlie Station) and through MODsuits. Lets you call people with holographs! -<<<<<<< HEAD -======= Jacquerel: - qol: Added some textual feedback to new watcher abilities - balance: Watchers will not attack for a short period following their gaze attack - bugfix: Watchers won't interrupt one ability to use the other one ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Rotated multi-tile airlocks display correctly and won't create an invisible box next to itself Melbert: - bugfix: Reactive stealth armor decoys are half as healthy, as originally intended -<<<<<<< HEAD SkyratBot: - bugfix: Incompatible quirks in existing savefiles shouldn't be possible anymore. - bugfix: ripley MK2 upgrade now properly transfers servos @@ -1804,7 +1653,6 @@ - qol: Made the cytology lab in many maps much more convenient. 2023-08-21: SkyratBot: -======= Striders13: - admin: admins can now upload files to the server up to 5mb (used to be 2.5mb) - config: file upload restriction is now config @@ -1825,12 +1673,10 @@ Ghommie: - bugfix: Fixed embedding for projectiles. Jackal-boop: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: the lion hunters rifle has been pegged down the knowledge tree. to make sure the tree is kept happy, the rust path and blade path can access rust charge - rscadd: rust charge - balance: the lion hunter ammo knowledge is free -<<<<<<< HEAD tf-4: - bugfix: Ass slapping now puts an overlay on the right person 2023-08-22: @@ -1838,7 +1684,6 @@ - code_imp: HUMAN_MAXHEALTH was made into a more formal define. - bugfix: Combat info readouts (the ones you get from examining ammo/melee weapons/etc) should now be more accurate to the increased health people have. -======= 2023-08-22: CoiledLamb: - bugfix: wellcheers is now based on sanity rather than mood @@ -1891,7 +1736,6 @@ Profakos: - bugfix: Mobs whose human appearance is set dynamically will once again have their bespoke names and descriptions, instead of Unknown, with a blank description. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - rscadd: Ninjas can now temporarily disable cameras with the Ninja MOD right-click hacking ability. @@ -1910,7 +1754,6 @@ - rscadd: Ninjas can now hack open firelocks (temporarily) with right-click. - balance: Hacking open doors with the Ninja Hacking MODule will subtract a paltry amount of energy from your suit. -<<<<<<< HEAD SkyratBot: - bugfix: '[Birdshot] Morgue now has coroner''s surgery duffel bag instead of regular surgery duffel.' @@ -1921,7 +1764,6 @@ - qol: aquarium now uses balloon alerts when feeding fish. - bugfix: The wary and shiny lover no longer incorrectly remove difficulty from the minigame if conditions aren't met. -======= SyncIt21: - code_imp: removed unused procs in ore silo - code_imp: merged repeated code segments when using materials from the ore silo @@ -1933,7 +1775,6 @@ - bugfix: you can detach signaller from wires without the machine deconstructing itself Timberpoes: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Traitor objectives to place posters and graffiti the station have been removed. - rscadd: The items associated with the poster and graffiti objectives can now be @@ -1949,7 +1790,6 @@ engineering to grab some insulated gloves or the psych office to kidnap their moth plush. - bugfix: Fixes an issue where the steal clown shoes objective would never be valid. -<<<<<<< HEAD - qol: Satchels can now be crafted using the same recipe (4 cloth) as backpacks. - bugfix: Fixed a light inside a wall on Delta Station. - refactor: AI's player-tracking eyes received an unwanted obligatory update, and @@ -1979,13 +1819,11 @@ - image: adds inhands for martian cans and wellcheers - image: minor tweaks to other cans - spellcheck: updates wellcheers mood text -======= YehnBeep: - qol: Satchels can now be crafted using the same recipe (4 cloth) as backpacks. - bugfix: Fixed a light inside a wall on Delta Station. dieamond13: - image: adds new sprites for opened fireaxe/mech crowbar cabinets. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 distributivgesetz: - rscadd: Replaced slime clone damage with a "Covered in Slime" status effect that deals brute damage over time and can be washed off by standing under a shower. @@ -1993,7 +1831,6 @@ - code_imp: Replaced the magic strings in slime code with macros. Also included some warnings to anyone daring to touch the macros. 2023-08-23: -<<<<<<< HEAD Melbert: - bugfix: Fixed some tooltips in the sec records UI showing "false"s where they shouldn't. @@ -2083,7 +1920,6 @@ as the tram moves - code_imp: Tram landmarks are now all subtyped instead of map varedits SkyratBot: -======= Ben10Omintrix: - refactor: the goldgrub has been refactored please report any bugs - rscadd: the goldgrub can now be tamed and he can have babys @@ -2149,7 +1985,6 @@ - bugfix: modlinks printed from rnd no longer start with a frequency (remember to copy it from another one with a multitool buffer, robotics starts with 2 NT frequency linked ones) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: ninja's stealth module gives silent footsteps when active - balance: all ninjas now have the light step and freerunning quirks - balance: ninja's hacker module shove no longer stuns in 1 hit. first shove knocks @@ -2159,7 +1994,6 @@ sprite is now an underlay, so you can click the person inside the net pretty easily and if you wanna hit the net you click the green part or the darker sides that the human sprite doesnt cover -<<<<<<< HEAD - bugfix: Rotated a water tank in icebox's lower service hall, connecting the plumbing to the water source. - qol: Adds air supply for cycling airlocks in ordnance and atmos incinerator on @@ -2208,7 +2042,6 @@ - balance: removes the access restrictions from all animals found under the livestocks tab of the cargo order console, now assistants can private order animals for their farms without access hunting -======= Guillaume Prata: - qol: QM jumpsuit/skirt expose the torso when adjusted. Helg2: @@ -2236,12 +2069,10 @@ and have a few of its chat messages turned into balloon alerts. YehnBeep: - qol: Messenger bags can be crafted with 4 cloth. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 distributivgesetz: - rscadd: Replaces decloning clone damage with a strike system that you can replenish with Mutadone. - bugfix: The decloning virus is curable with rezadone again. -<<<<<<< HEAD tf-4: - spellcheck: Fixed examine text for gemital. 2023-08-27: @@ -2255,7 +2086,6 @@ can now be destroyed much easier and cut with wirecutters without unwrenching. - bugfix: Borgs no longer get permastunned by emotes - bugfix: Borg hud should not fuck up in few situations -======= iwishforducks: - bugfix: You should no longer attack RCD effects when they're done constructing. san7890: @@ -2299,7 +2129,6 @@ - rscadd: 'Gave snow legions a separate corpse-drop pool: ash walkers excluded, but eskimos included.' carlarctg: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds a syndicate AI card for nuke ops. Costs 12 TC, can be refunded. Activating it in-hand opens up a ghost poll like normal reinforcements. Base interaction range for syndicate AIs is one, which means they can handle electronics only @@ -2308,7 +2137,6 @@ and can be applied onto a syndicate AI (inside any container) to increase its interaction range by two per. (Three purchases are recommended for seven tiles of range!) -<<<<<<< HEAD - bugfix: greyscale colors will now update on the mob when modifying them via the VV menu - bugfix: the coroner medkit can now hold every item it spawns with @@ -2336,7 +2164,6 @@ - bugfix: fixed a bug that could cause the altar's religion selection ui to bug out if a previous chaplain left via cryo without selecting a religion themselves. 2023-08-28: -======= iwishforducks: - balance: Railings now only cost 2 rods and are much easier to construct. But they can now be destroyed much easier and cut with wirecutters without unwrenching. @@ -2362,12 +2189,10 @@ Ghommie: - bugfix: Fixed an issue with the "recolor from string" option in the greyscale modify menu that resulted in invisible icons. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - bugfix: Unary vents have a pressure cap on both their pressuring and siphoning mode now, preventing the bypass trick of putting "infinite" pressure on tiles/pipelines. - balance: Overclocked Volume Pumps do not have a pressure cap anymore. -<<<<<<< HEAD LT3: - bugfix: Using an airlock painter on a GAGS airlock works properly - bugfix: Tram will no longer fly off into space when admins try to reset the contents @@ -2404,7 +2229,6 @@ - rscadd: Proto-NRI/CIN food (and not only food) replicator - rscdel: Green IRP-B (or whatever it was idk idc) NRI MRE, replaced with a new unique one. -======= Jacquerel: - bugfix: You can't use the bioscrambler belt to turn yourself into a changeling. JohnFulpWillard: @@ -2422,12 +2246,10 @@ - rscadd: Added associative list variables and associative list variable manipulation for finer data manipulation and storage. - rscadd: List Find components will now return the index of the element it has found. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 distributivgesetz: - rscadd: Add an achievement for saving a cascading engine from the final countdown. - balance: Damaging synchronous mesh blobs now incorporates damage resistance of other blob structures when dealing shared damage to those nearby. -<<<<<<< HEAD 2023-08-29: Iajret: - bugfix: changed contractor's modlink frequency to syndicate @@ -2439,7 +2261,6 @@ - bugfix: Quartermaster's Overcoat and Cargo's gorka can now hold stamps in their suit slots, just like their winter coat counterpart - bugfix: Made it easier to place tiles on multi z level holes -======= mc-oofert: - rscadd: clickdragging an autolathe changes its output direction nikothedude: @@ -2490,13 +2311,11 @@ iwishforducks: - bugfix: Railings no longer give more metal than they take san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The Lavaland Cursed Slot Machine of Greed suddenly seems a lot more sinister... - refactor: Instead of taking clone damage from the cursed slot machine, you now get a status effect with a number of curses associated with it. There's some interesting florid language associated with the status effect as a nicety until your eventual gibbing from chasing that prize. -<<<<<<< HEAD - bugfix: Non-surgically debraining someone no longer makes their brain unusuable - bugfix: Items worn on a void cloak's suit storage are no longer visible on the stripping menu. @@ -2534,7 +2353,6 @@ - rscadd: Added a set of new donator items - rscdel: Removed older, unused (and broken) donator items 2023-08-31: -======= 2023-08-30: Ghommie: - sound: Unlocking an achievement now plays a sound by default. You can change it @@ -2572,12 +2390,10 @@ GoldenAlpharex: - bugfix: Fixes a rare issue that could lead to players entering an infinite disconnection loop from having a null view. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Guillaume Prata: - qol: The "You can't move while buckled to X" is now a balloon alert instead of a to_chat message. Hopefully we all get buckle stuck processing why our inputs are not working less often for now on. -<<<<<<< HEAD Ldip999: - qol: Space hotel and Tarkon now comes with range ovens Motho: @@ -2605,7 +2421,6 @@ Shadow-Quill: - spellcheck: Fixed the ] appearing in cryopod action text. SkyratBot: -======= LukasBeedellCodestuff: - bugfix: Changed icebox permabrig door type to be correct Momo8289: @@ -2614,25 +2429,20 @@ - qol: Cryotubes will now automatically turn on when a patient enters it if auto is on, but you can no longer close the cryotube on yourself. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: autolathe prints the correct amount of stacks and merges it with existing stacks on the turf - bugfix: autolathe takes constant time when printing stacks - code_imp: autolathe will attempt to award you the "getting an upgrade" award only once when printing multiple items & updates UI immediately -<<<<<<< HEAD - sound: Unlocking an achievement now plays a sound by default. You can change it in the Sound category of the game preferences. -======= iwishforducks: - bugfix: Space heaters no longer give extra cells when deconstructed necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Compact fishing toolboxes no longer break space and time to contain any normal-sized object. Instead, they only break space and time to contain fishing rods. Settlers migrating to Nanotrasen space have no reasonable explanation for this phenomenon. -<<<<<<< HEAD - refactor: sheets are merged in a better way when ejected from machines & material related stuff - bugfix: Probital overdose no longer causes plasmamen and other inorganics to receive @@ -2662,7 +2472,6 @@ master_files olirant: - rscadd: 1 donator plush -======= nikothedude: - balance: Prosthetics and slimepeople can now have limbs dismembered - balance: Slimepeople can now receive slash wounds, but cannot bleed @@ -2671,4 +2480,3 @@ format san7890: - bugfix: The Cursed Slot Machine should now actually give you more than one pull. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml index 7a2deb66183..8d6eeefdd2f 100644 --- a/html/changelogs/archive/2023-09.yml +++ b/html/changelogs/archive/2023-09.yml @@ -1,5 +1,4 @@ 2023-09-01: -<<<<<<< HEAD GoldenAlpharex: - bugfix: Fixes a rare issue that could lead to players entering an infinite disconnection loop from having a null view. @@ -37,16 +36,13 @@ - qol: Metastation has had more navigate landmarks added, namely for areas like Medbay, Cargo, Engineering, department heads offices and a few more. - qol: Adds accessibility to breasts for service members -======= 1393F: - balance: megafauna will now gut instead of dusting or gibbing FernandoJ8: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: containers can no longer add more water to hydroponic trays than they actually contain. - bugfix: watering a hydroponic tray with amounts of water lesser than 1 will no longer be added to nutrients rather than water -<<<<<<< HEAD - rscadd: Cargo now once again has access to a "Cargo Shortskirt", a skirt variant of their shorts! - image: tweaks and adjustments to the Cargo resprite have been made, as well as @@ -60,13 +56,10 @@ - image: Resprited geraniums, poppies, and lilys, along with changing their worn icon. 2023-09-02: -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: Fixed the crafting menu being able to get stuck if your crafting recipe somehow goes missing. - code_imp: Improves the quality of the item crafting code slightly. -<<<<<<< HEAD Sealed101, EBAT_BASUHA for spritework: - rscadd: Wizard's Den now has a book of Summon Cheese in the Studies Room SkyratBot: @@ -198,12 +191,10 @@ meats for the purposes of reagent purity' - bugfix: It's now humanly possible to reach the legendary fisherman rank, get the achievement and the hat. -======= Guillaume Prata: - balance: Fanny packs are now silent, no one will get a chat message about what you put in or take out. MTandi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Mood buff power and duration depends on the ingredient quality and recipe complexity of the food. - rscadd: Hand-crafted food also gives a non-mood buff. The buff type depends on @@ -228,7 +219,6 @@ - qol: 'Seed Extractor now shows additional seed data: possible mutations, juicing result, grinding result, fermentation result' - bugfix: Reverts the unintended change of monkey cube biomass cost back to 50 -<<<<<<< HEAD - bugfix: kinesis plus properly lets you move again when grabbed once - rscadd: Adds the medbeam module for nukies, don't cross the damn beams. (Also removes the handheld one from the uplink) @@ -281,7 +271,6 @@ - qol: Adds cables under birdshot xeno containment shielding. - bugfix: Machine frames in NorthStar Cyto are now functional. - qol: Minor cable/pipe changes to NorthStar the xeno containment. -======= Momo8289: - bugfix: Meth will no longer explode when reacting in a body Rhials: @@ -490,12 +479,10 @@ dieamond13: - image: adds special sprites for lungs when you use the smoker quirk norsvenska: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: NorthStar's departmental head offices have had their respective PDA & ID imprinters added! - qol: The NorthStar Head of Security office has gotten a small expansion. vinylspiders: -<<<<<<< HEAD - bugfix: mold on multi-z maps will no longer spawn in or spread resin to openspace turfs 2023-09-08: @@ -517,7 +504,6 @@ - image: adds special sprites for lungs when you use the smoker quirk - bugfix: basic mobs can now use ranged burst attacks - balance: gas mixer output now accurate to set ratio regardless of input temperatures -======= - bugfix: leash unit test will time out less often and increases the timer until it is considered 'timed out', to reduce false CI failures 2023-09-08: @@ -529,7 +515,6 @@ - spellcheck: Corrected the name of the telescopic fishing rod to "telescopic fishing rod" from the more generic "fishing rod" Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Traitors, Changelings, Heretics, Wizards, Malfunctioning AIs, and Ninjas can now all reject their original objectives and provide one of their own in its place. A Heretic doing this will no longer be able to ascend. @@ -537,7 +522,6 @@ report success or failure upon round end.' - qol: Space Ninja spider charges will now display where they can be detonated when examined, if you are a ninja. -<<<<<<< HEAD 2023-09-09: LT3: - qol: Supermatter common channel alerts are less frequent if the crystal's integrity @@ -552,9 +536,7 @@ - bugfix: The messenger app can now be used when laying down. - bugfix: Cauteries now have 'heat', like lighters, welders, etc. - qol: You can smoke with a space helmet as long as you have internals on. -======= JohnFulpWillard: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Getting a node researched now properly makes it no longer hidden. - bugfix: Ninjas draining RD servers now drains it from the connected techweb, rather than sniping Science. @@ -562,7 +544,6 @@ z-level, with the Science techweb remaining as fallback. - rscadd: Oldstation RND, comes with their own Techweb and special surgery to gain research points through dissecting Xenomorphs. -<<<<<<< HEAD - balance: Traitors who are activated as sleeper agents or arrive late on the arrivals shuttle will begin with more reputation and likely be able to immediately access most of the uplink catalogue. @@ -577,7 +558,6 @@ - code_imp: Removed extra calls to nightshift subsystem during delam - bugfix: Votes play an alert sound again SkyratBot: -======= LT3: - bugfix: Meteors no longer take damage from crossing certain unoccupied turfs Sealed101: @@ -611,12 +591,10 @@ Jacquerel: - bugfix: It is now possible to smoke cigarettes even if you aren't wearing a safety helmet ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Golems can eat - bugfix: Cooked and crafted food should be edible - bugfix: Medborgs can now spawn vanilla ice cream instead of nothing ice cream - bugfix: Ghosts can examine food -<<<<<<< HEAD - bugfix: Exploration drones can't be used to reach Centcom anymore. - admin: Admins can add/remove the spawner component from arbitrary items again. - qol: adds some more traitor objective brainwashing default objectives. @@ -638,7 +616,6 @@ hand teleporters, citing a new "stand and deliver" doctrine established by more violent, militant arms of the organization. Melbert: -======= - admin: Admins can add/remove the spawner component from arbitrary items again. Rhials: - qol: adds some more traitor objective brainwashing default objectives. @@ -665,7 +642,6 @@ Melbert: - rscdel: Spacers are slightly shorter. They're still taller than other people, just not as much. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Haunted 8-ball no longer requires the ghost orbit the petitioner to submit votes - qol: Haunted 8-ball ghosts can now change their vote after submitting it @@ -673,11 +649,6 @@ - bugfix: Haunted 8-ball no longer always reports default "yes", "no", or "maybe" and now gives a proper eight ball response - bugfix: Haunted 8-ball can be picked up via the stat panel -<<<<<<< HEAD - RatFromTheJungle: - - rscdel: Guns, collectively, can no longer right-click holdup people - SkyratBot: -======= Profakos: - bugfix: Mortar and pestle can grind stuff again Sealed101: @@ -690,62 +661,10 @@ - bugfix: fixed headslug description mentioning its movement despite the slug being dead Vincent983: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Added the service borg "drink apparatus" upgrade, which adds an extra drinking apparatus to the borg, up to a maximum of 5 extra. :cl:' -<<<<<<< HEAD - - bugfix: Changeling tentacle and bloodchiller from xenobio will no longer stop - working if you have antimagic - - qol: Rice Dough may be made in beaker instead of being crafted, but the rice and - flour must be added first - - rscadd: humpback emergency shuttle - - image: Hivelords have a new sprite. - - image: Hivelord and Legion brood have a death animation. - - bugfix: Mortar and pestle can grind stuff again - Wallem, MTandi: - - image: Updates chem factory tank sprites - jjpark-kb: - - bugfix: revive mob ritual works on basic mobs now - - bugfix: ashwalkers have the ashwalker faction - softcerv: - - bugfix: ghost cafe NIFs no longer have access to hivemind -2023-09-12: - Adelphon: - - rscadd: new underwear - GoldenAlpharex: - - bugfix: All potted plants should now be visible again. - - admin: Player ranks are now displayed in the Player Panel of each user. - - code_imp: Player ranks can now be checked without taking into account the admin - bypass while in-game. - - bugfix: Fixed the rounding errors that caused decimals to wrongly appear when - hitting the Shift Layer Upwards or the Shift Layer Downwards verbs. - - bugfix: The message sent to admins when a new admin has been added via the Permissions - Panel will now properly show the new admin's ckey. - - qol: Character Previews are now always displayed in the Examine panel, rather - than disappearing when the flavor text would otherwise be hidden. - LT3: - - code_imp: Status display shuttle timer no longer scrolls - - bugfix: Fixed Void Raptor cargo door labels and IDs - - bugfix: Singularities are no longer invisible. You can again see your impending - doom - Melbert: - - rscdel: Spacers are slightly shorter. They're still taller than other people, - just not as much. - OrionTheFox: - - bugfix: fixed being unable to re-select the "Quartermaster" title in job prefs - after selecting an alt-title - - image: updated the greyscale Cattleman Hat to be not-bad. It now isn't 1px too - low, and actually looks like a cattleman rather than a lump of butter on a plate! - SkyratBot: - - bugfix: The vorpal scythe is no longer as greedy about you murdering people, and - will once again accept striking any living creature to be sated. - - bugfix: Fix capture devices allowing mob actions while inside - - bugfix: Your clothes and such should correctly reposition themselves if a black - charged slime extract turns you into a monkey. - - bugfix: Ninjas should be correctly credited for using their spider bombs -======= Wallem, MTandi: - image: Updates chem factory tank sprites blueDev2: @@ -767,7 +686,6 @@ LT3: - code_imp: Status display shuttle timer no longer scrolls Pickle-Coding: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Supermatter zap power generation scales with the delta time between its last zaps, preventing faster zapping from scaling power generation to extreme levels. @@ -779,7 +697,6 @@ rate independent of subsystem lag. - qol: Xenomorph plasma generation and resin healing scales with the world's delta time, making their rates independent of subsystem lag. -<<<<<<< HEAD - balance: polymorph belt now blacklists mobs that are undead, humanoid, robotic or spiritual (in nature, not religiously), as well as megafauna - balance: however, this means that it works with more mobs that it should logically @@ -1081,9 +998,7 @@ Thebleh: - bugfix: Bluespace RPEDs can now be rigged again nikothedude: -======= carlarctg: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Several common 'household' reagents can be used as improvised medicine treatment. - rscadd: Drinking tea will help mend (non-bone) wounds over time. @@ -1105,7 +1020,6 @@ the specific recommended treatments bolded in the analysis text. They also have a 'unique' extra bit of info, telling you about improvised ways to remedy your wound. -<<<<<<< HEAD tf-4: - bugfix: fixes being able to eat, use pills etc through gas masks and such 2023-09-19: @@ -1123,7 +1037,6 @@ with planks of wood" being spammed on objects. - bugfix: basic mobs retaliate targetting now selects targets they can attack - bugfix: Makes ethanol and sugar pure by default. -======= necromanceranne: - bugfix: The vorpal scythe is no longer as greedy about you murdering people, and will once again accept striking any living creature to be sated. @@ -1397,7 +1310,6 @@ Jacquerel: - rscadd: Many kinds of mobs can now be brought back to life through revival surgery. - rscadd: Dogs can wear eyepatches. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Player-controlled basic mobs attack as fast as those mobs can when controlled by the AI - balance: Player-controlled Faithless can paralyse people they attack, like the @@ -1405,7 +1317,6 @@ - balance: Player-controlled Star Gazers (if an admin felt like making one) apply the star mark on attack and deal damage to everything around them, like the AI does -<<<<<<< HEAD - rscadd: Many kinds of mobs can now be brought back to life through revival surgery. - rscadd: Dogs can wear eyepatches. - code_imp: Scars now stack trace if they fail to get a valid description @@ -1428,7 +1339,6 @@ and the upper section of chapel - bugfix: normal ethereal blood now works for electrolysis, the hydrogen and oxygen output of the electrolysis recipe has been increased. -======= Momo8289: - bugfix: The Nightmare's Light Eater can no longer suck the light out of space tiles. @@ -1442,7 +1352,6 @@ - qol: Surgery trays can now be crafted via the crafting menu (two rods, one silver), and deconstructed via secondary click with a screwdriver! Time-Green: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Only traitor, changeling, heretic, blood brother, headrev, wizard, obsessed, magic/gun survivalists and greentext book holders can now double their hardcore random score @@ -1450,7 +1359,6 @@ instead of none (normal survival rules) - bugfix: End report screen will properly report hardcore random survival in case of station destruction -<<<<<<< HEAD 2023-09-20: LT3: - rscadd: 'New random event: Supermatter Surge' @@ -1477,7 +1385,6 @@ - bugfix: Lava can no longer occasionally generate inside of previously loaded templates and breach and/or destroy shit - qol: mice and rats now are visually spaced out from eachother for visual clarity -======= Vincent983: - rscadd: mass drivers are now buildable, you activate them by attaching a signaler to their launch wire, and can increase their power by pulsing the safeties wire, @@ -1514,14 +1421,12 @@ - code_imp: Individual supermatter crystals can have custom gas properties RikuTheKiller: - spellcheck: Unreverted and improved resonance cascade message. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Supermatter now takes 15 seconds to delaminate normally and 5 if a sliver has been taken from it. Gives a little more time to escape in the case of the sliver and also evens out the times to please perfectionists. - bugfix: Supermatter now accurately reports it's detonation time. - spellcheck: Supermatter mood descriptions have been reverted back to their old, more flavorful selves. -<<<<<<< HEAD Zergspower: - qol: reworks the verb panel to be less of a CVS receipt vinylspiders: @@ -1546,7 +1451,6 @@ - balance: Improvised shotgun shells now deal half as much damage to humans and cause less wounds, but do 50% more damage to structures and machines. They also require a glass shard for crafting. -======= Thunder12345: - balance: Improvised shotgun shells now deal half as much damage to humans and cause less wounds, but do 50% more damage to structures and machines. They also @@ -1568,13 +1472,11 @@ - rscadd: heretic knock path and its respective items and award - qol: mice and rats now are visually spaced out from eachother for visual clarity nikothedude: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'EMP damage on augs: 2/1.5 from 3/2' - balance: Augs now only get paralyzed by EMP for 3/6 seconds if they are damaged below 70% HP, - balance: Aug EMP knockdown reduced to 3 seconds - balance: Synthetic ears now take far less EMP damage -<<<<<<< HEAD - bugfix: rescue hooks will once again drop the mob next to the fisherman instead of just displaying a balloon alert and doing nothing - bugfix: Recipe that converts Vegetable Oil into Olive Oil works properly @@ -1635,7 +1537,6 @@ modes. - qol: Flashlights no longer pointlessly require power cells to function SkyratBot: -======= vinylspiders: - bugfix: fixes inedible grown items (such as tower caps) becoming unclickable when harvested, fixes their seeds disappearing when inserted into the seed machine @@ -1682,20 +1583,11 @@ - bugfix: Conveyor belts now properly show their new screentips on mouseover with tools. Ben10Omintrix: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: seedlings have been refactored into basic mobs please report any bugs - rscadd: seedlings now can have different colored petals and can look after botanys plants - rscadd: seedlings are re-added to the game! they grow out of seedling seeds obtainable from exotic seed crates or traitor uplink -<<<<<<< HEAD - - rscadd: The Message Monitor console's board can now be obtained via the telecoms - research node. - - bugfix: Conveyor belts now properly show their new screentips on mouseover with - tools. - - bugfix: clown bomb payload is no longer named badmin payload and no longer disperses - clowns in cardinal directions only -======= GPeckman: - admin: Boneless smite should work properly again. LT3: @@ -1710,13 +1602,11 @@ Services Award" and the "Atmospheric Mastery Award". CEs get 3 Emergency Services Awards and 1 Atmospheric Mastery Award and CMOs get 3 Emergency Services Awards.' lizardqueenlexi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Foods that have special conditions for liking/disliking them (such as donuts for sec officers) have these conditions again. - bugfix: Characters with ageusia properly ignore non-toxic food types that they eat. - bugfix: If you examine toxic food, it can no longer appear to you as edible. -<<<<<<< HEAD - admin: Boneless smite should work properly again. distributivgesetz, CoiledLamb: - rscadd: 'Added two new awards specifically for engineering and medical: The "Emergency @@ -1736,7 +1626,6 @@ over tables when you shouldn't, and visa versa SkyratBot: - bugfix: Epinephrine will now update health properly. -======= mc-oofert: - bugfix: clown bomb payload is no longer named badmin payload and no longer disperses clowns in cardinal directions only @@ -1744,68 +1633,12 @@ GPeckman: - bugfix: Epinephrine will now update health properly. Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Brimdemon corpses release an explosion shortly after death, just to keep you on your toes. - refactor: Brimdemons now use the basic mob framework which (should) improve their pathfinding somewhat. Please bug report any unusual behaviour. - admin: The brimdemon's beam ability can be given to any mob, for your Binding of Isaac event -<<<<<<< HEAD - - refactor: clowns are basicmobs now - - admin: Admins can now reset or modify the chaplain's sect from a UI panel - lukevale: - - rscadd: Adds bras as a selectable preference in the same vein as underwear. Separates - all tops from undershirts. -2023-09-25: - Iamgoofball: - - bugfix: Fixes a bug with the steampunk goggles that deletes items that aren't - welding goggles when hit by it. - Melbert: - - rscadd: Changelings can now speak through their decoy brain if it is placed in - an MMI, to maintain the illusion they are actually dead and have been debrained. - SkyratBot: - - bugfix: Fix secret documents steal objective failing while inside folder. - - rscadd: Added the Hippocrates bust to medbay heirlooms. Paramedics don't get one. - - rscadd: You can now swear the Hippocratic oath with these busts! It'll give you - pacifism but nothing else. The process is reversible. - - rscadd: There's a very small chance that the Hippocrates bust was once wielded - by a certain German doctor. This chance is increased for coroner heirlooms. - - bugfix: Fixed players being able to roll antagonist without ever being eligible - to play any role. Players who have their preferences set up so that they're - likely to return to lobby when the round starts have a lowered chance of becoming - antagonist. - - bugfix: Fixed beams rendering below mobs by default. - - bugfix: The fishing line beam is no longer emissive (it doesn't glow in the dark). - - bugfix: Fixed the overflow role having less slots than it actually should. - - code_imp: New flags/args to electrocute_act() - - balance: Makes it so Ephedrine spasms have a 10 * (1.5 - purity)% chance per second - to happen, Adding a downside to pure Ephedrine - - bugfix: Syndicate Modsuit AI's now downloads the current codespeak book upon being - downloaded. - Vekter: - - bugfix: Fixes Birdshot's recycler being turned the wrong direction. - distributivgesetz: - - bugfix: Clamping/closing a wound should now heal the bodypart that was damaged - instead of a random one. - honkpocket: - - rscdel: Removed wall-mushroom outbreak event -2023-09-26: - LT3: - - spellcheck: Improved wording in greyscale JSON error message - - admin: Successful restart votes will now restart on the current map - - code_imp: End round and persistence data will be saved before executing successful - restart vote - Rhials: - - bugfix: '"Spooky" meteors will now properly spawn during halloween.' - SkyratBot: - - image: the security records suspected status is now teal instead of orange - - bugfix: Intellicards in computers are no longer deleted when the computer is destroyed. - - bugfix: Modular consoles can now be deconstructed by right clicking with a wrench. - - bugfix: cigarettes no longer smoke themselves from inside your pockets or on your - hands. - - admin: First time user connections are now logged -======= - admin: Admins can now reset or modify the chaplain's sect from a UI panel LT3: - bugfix: Fixed supermatter surges always being the lowest severity @@ -1834,7 +1667,6 @@ - rscadd: Changelings can now speak through their decoy brain if it is placed in an MMI, to maintain the illusion they are actually dead and have been debrained. Pickle-Coding: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: NT CIMs shows how much power the supermatter is releasing. - qol: NT CIMs internal energy will adjust its prefix. - qol: Energy displays (such as multitooling grid) will use the full range of SI @@ -1845,8 +1677,6 @@ - bugfix: Fixes grounding rods lying about potential power you can generate. - code_imp: Convert supermatter_zap() and tesla_zap() zap_str argument unit to be in joules, and scales everything that uses that argument. -<<<<<<< HEAD -======= Singul0: - bugfix: Syndicate Modsuit AI's now downloads the current codespeak book upon being downloaded. @@ -1901,7 +1731,6 @@ - bugfix: you can no longer push watchers (and any other lavaland basic mob) around by running into them Singul0: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds an advanced plastic surgery procedure, allowing you to imitate people in pictures. Simply hold a picture in your offhand of the person you wish to imitate as while conducting the surgery! Remember, it's not foolproof, it only @@ -1909,7 +1738,6 @@ - rscadd: You can obtain the disk containing the afromentioned surgery. as a role-restricted item to doctors and roboticists for 1TC, as a rare maint loot and BEPIS technode reward -<<<<<<< HEAD - bugfix: Centcom now rejects contraband that somehow makes it way onto the cargo shuttle mid-transit and returns it. - bugfix: you can no longer push watchers (and any other lavaland basic mob) around @@ -2009,7 +1837,6 @@ - balance: exodrone point scan and deep scan are faster - spellcheck: fixes several typos related to exodrones and gives scanner control console a description -======= Thunder12345: - bugfix: Metalgen can no longer be used to transmute indestructible turfs. Timberpoes: @@ -2069,13 +1896,11 @@ - bugfix: The flight potion wings will no longer fail to work on lavaland/icemoon on rare occasions. Iamgoofball: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Gas masks now muffle your voice with TTS. - qol: Security Hailer masks now disguise your voice to protect your right to brutalize greytiders. - qol: Lizards, Ethereals, and Xenomorphs now have a vocal effect. - qol: Security Records now show someone's voice name. -<<<<<<< HEAD - bugfix: fixed geysers spawning on turfs with plants Tattle: - qol: drones now have individual names, instead of just "drone" @@ -2112,13 +1937,11 @@ - code_imp: adds a gas connector component that allows connection to the atmos piping system without the need of repathing - refactor: changes the cryo machine to use this new system -======= Jacquerel: - bugfix: Throwing things at cyborgs will now slow them down, as intended - balance: Adjusted the calculation of throwforce -> slowdown for cyborgs such that it is simply a flat duration for anything above a certain damage threshold (the value of throwing iron rods) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Hivelords and Legions now use the basic mob framework. Please report any unusual behaviour. - rscadd: Hivelords shed more spawn when they are attacked. @@ -2133,9 +1956,6 @@ on your current health. - qol: You won't continue burning to a husk if consumed by a snow legion after being set on fire by an ice drake. -<<<<<<< HEAD - - bugfix: removes incorrect stack traces when using some admin secrets -======= Melbert: - rscadd: Doctors can now get head mirrors from their clothes vendor, to complete the doctor outfit @@ -2264,15 +2084,12 @@ - bugfix: the parole status and discharged status are now green and blue respectively in the security record interface Watermelon914: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Head revolutionaries and heads of staff are no longer immediately considered disqualified when going AFK or disconnecting and are given a 2 minute grace period. - admin: Admins now get a log when a head revolutionary or head of staff disconnects or goes AFK during a revolution. They also get the same log 1 minute after to give them a chance to act on the information. -<<<<<<< HEAD -======= necromanceranne: - bugfix: Splattercasting resets your blood to normal values when you transsform into a vampire. @@ -2281,7 +2098,6 @@ san7890: - code_imp: Robot Customers have recently been touched codewise, please report any bugs or unexpected behavior as there really should not be any. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Snakes have been refactored into basic mobs. This means that they are a bit more intelligent than previous snakes, making them more docile and averse to harming people (unless otherwise provoked). They do chomp all sorts of mice @@ -2289,7 +2105,6 @@ that. - sound: If you listen closely to snakes, you might be able to hear a small hissing sound... -<<<<<<< HEAD - bugfix: fixed lobstrosities becoming unmovable when killed during their charge windup - bugfix: Splattercasting resets your blood to normal values when you transsform @@ -2309,7 +2124,6 @@ differs from the gender default. softcerv: - rscadd: Adds in the ability for certain NIFSofts to be kept between rounds. -======= timothymtorres: - bugfix: Fix water puddle runtime when washing items - rscadd: Add drinking water causes drunk mobs to become sober @@ -2317,12 +2131,10 @@ yorii: - bugfix: dead bodies now cool down to room temperature over time - qol: allowed names to start with a number if AI/Borg ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-09-30: DrDiasyl aka DrTuxedo: - balance: Holsters can now be clipped to any suit, and house Captain antique gun and HoS gun. You now can buy holsters from the SecTech premium section. -<<<<<<< HEAD Paxilmaniac: - qol: The half mask respirator can have its TTS voice muffling properties toggled with control click @@ -2335,11 +2147,9 @@ way to spells. - bugfix: Lavaland syndicate operatives can no longer trivially use the jetpack on their modsuit to fly over the lava. -======= Helg2: - rscadd: SM crystal can now dust someone or something if it falls on it. Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: If two cosmic heretics ascend in the same round, their star gazer survival will be linked to each individual heretic and not shared by just one of them. - bugfix: You can't click the Knock heretic portal to join as a mob while already @@ -2348,7 +2158,6 @@ - balance: The Knock Heretic portal cannot summon Flesh Worms, but can summon Fire Sharks. - balance: The Knock Heretic portal will disperse if its creator is killed. -<<<<<<< HEAD - rscadd: SM crystal can now dust someone or something if it falls on it. - bugfix: The reverse revolver now looks like a normal Syndicate revolver on inspection. - bugfix: fixed the stamp in the metastation CMO office always spawning on the floor @@ -2361,7 +2170,6 @@ - rscadd: A waterbreathing quirk - qol: Waterbreathing is now documented on species pages of the species that have it -======= - admin: Mob abilities can be granted to arbitrary mobs via the VV menu in a similar way to spells. - bugfix: Lavaland syndicate operatives can no longer trivially use the jetpack @@ -2391,4 +2199,3 @@ - code_imp: Gauze removal is now handled by the gauze's destroy instead of seep_gauze xPokee: - bugfix: fixed the stamp in the metastation CMO office always spawning on the floor ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml index 5332a1da41a..611e2e9c112 100644 --- a/html/changelogs/archive/2023-10.yml +++ b/html/changelogs/archive/2023-10.yml @@ -1,28 +1,5 @@ 2023-10-01: -<<<<<<< HEAD - Hatterhat: - - balance: Bullets have had their base type's wound bonus reduced back to 0, down - from 20, because wounds are actually quite punishing. Funnily enough, most bullets - already have modified wound bonuses - except c9mm, c10mm, and most incendiaries, - so this probably doesn't change much. - - balance: .50 (used in the snipers and renamed to .416 or whatever) is now back - to TG balance standards. Knockdown on hit, 60 instead of 110 damage, etc. etc. - - bugfix: .50 Soporific was removed because disruptor ammo was right there and nobody - realized it existed. - - bugfix: After review of a missing equipment complaint, Nanotrasen remembered to - pay Lopland's quartermasters to put the customary flashbang and teargas grenade - boxes into the Void Raptor's armory. - Melbert: - - qol: Examine blocked out roundstart / latejoin job information. - - qol: Captain gets a little bit more information about how their radio works roundstart. - - bugfix: Fixed roundstart players not getting radio information. - Paxilmaniac: - - image: The buttondown shirts (underwear) have been updated with a better look - and more contrasted palette - SkyratBot: -======= ArcaneMusic: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: A new export has arrived in the imports section, the Galactic Materials Market! You can use this to buy and sell minerals for profit or cost, as well as stock your station when you don't have any miners. @@ -33,7 +10,6 @@ budget by cargo crew, or privately by everyone else. - rscdel: Any material stacks that can be bought and sold on the market before have been removed from the cargo catalog. -<<<<<<< HEAD - rscadd: Adds Bitrunning to supply department- a semi-offstation role that rewards teamwork. - rscadd: Adds new machines to complement the job- net pod, quantum server, quantum @@ -68,7 +44,6 @@ domains. - bugfix: Changed quantum console UI to display "no bandwidth" rather than "none" - bugfix: Actually fixed the hooked item exploit. -======= GPeckman: - bugfix: Security officers can now download the crew manifest PDA app that they start with. @@ -82,7 +57,6 @@ - bugfix: Aloe and other baked foods that don't have reagents can be baked again without turning to ash carlarctg: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Heretic Rebalance - balance: Researching the Main Knowledge paths that unlock Side Paths will grant one Side Point that can be used only on those side paths. You can still spend @@ -97,7 +71,6 @@ 'snowflake check' rituals can utilize. - balance: The first non-path knowledge, the Mansus Hand Mark, has had its cost reduced from 2->1 points. -<<<<<<< HEAD - bugfix: Aloe and other baked foods that don't have reagents can be baked again without turning to ash Vekter: @@ -107,30 +80,25 @@ - bugfix: the round end report will accurately report ashwalker sacrifices nikothedude: - code_imp: Gauze removal is now handled by the gauze's destroy instead of seep_gauze -======= distributivgesetz: - qol: Font settings in the chat panel applies to all text now. nikothedude: - balance: Sci now has access to the materials & canisters section in their departmental order console ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ninjanomnom: - rscdel: An easter egg plushie that was spawning where it shouldn't has been brought back home. - rscadd: The secure closet can now spawn live gibtonite, enjoy your free bomb. -<<<<<<< HEAD 2023-10-02: SkyratBot: - balance: Sci now has access to the materials & canisters section in their departmental order console -======= san7890: - refactor: Supermatter Spiders have been refactored into basic mobs, on the extremely off chance you spot one and also notice any weird bugs regarding it, please report it. 2023-10-02: Ghommie: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Expanded the fishing portal generator. It now comes with several portal options that can be unlocked by performing fish scanning experiments, which also award a modest amount of techweb points. @@ -144,17 +112,13 @@ the minigame UI to less generic ones. Reaching master level in fishing also does that. - qol: The experiment handler UI no longer shows unselectable experiments. -<<<<<<< HEAD - bugfix: Security officers can now download the crew manifest PDA app that they start with. -======= Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Wizards who complete the grand ritual can now gift everyone with eternal life distributivgesetz: - bugfix: Font scaling in TGUI chat has been reverted to its original implementation. -<<<<<<< HEAD softcerv: - rscadd: Adds the mini-soulcatcher, a more lightweight soulcatcher that can be attached to objects @@ -180,18 +144,15 @@ Coded by Jacquerel, Sprited by Dalmationer: - rscadd: Added tongs to the kitchen, which you can use to manipulate food from further away -======= 2023-10-03: ArcaneMusic: - image: Railings have had a visual update. CoiledLamb: - rscadd: adds boxes of bandages, a quick healing item ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fazzie: - rscadd: Added a budget solar crate to the derelict teleporter room - rscadd: Added a solar panel control to the north derelict solar - qol: The derelict's AI coridoor is now shorter and prettier -<<<<<<< HEAD - rscadd: A lot of new content has been added to the beach away mission - qol: It also looks substantially better, too! Motho: @@ -231,7 +192,6 @@ ninjanomnom: - admin: Appearance vars in VV now display instead of being left blank 2023-10-05: -======= Ical92: - bugfix: fixed misplaced door on syndicate listening post Jacquerel: @@ -247,15 +207,12 @@ further away Cruix: - bugfix: Some icons for selecting character preferences are no longer scaled incorrectly. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 FIoppie: - sound: '*flap now makes a fluttering noise for moth wings' - sound: Moths now have a death sound - qol: '*tremble emote now is just "trembles!" instead of "trembles in fear!"' -<<<<<<< HEAD LT3: - image: Added colourable arm and leg wraps -======= Fazzie: - rscadd: A lot of new content has been added to the beach away mission - qol: It also looks substantially better, too! @@ -264,12 +221,10 @@ behaviour. - admin: Admins can turn off dynamic rulesets (or force them on despite not meeting the qualification criteria) on a per-round basis. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - qol: Moved a lot of maintenance spawnpoints out of non-maintenance rooms. Some antags (paradox clone, fugitives, nightmares, spiders) are now less likely to spawn in obvious places like the morgue, tech storage, or dorms rooms. -<<<<<<< HEAD Motho: - image: Sector 13's station air alarms and fire alarms have been updated to be more in line with other frontier station models. @@ -282,7 +237,6 @@ - balance: CQC legsweeps now cause knockdown instead of paralysis. - balance: CQC kicks now knockout a target on the floor for ten seconds if they reach stam crit. Helmet protection shortens the knockout length. -======= TheBoondock: - rscadd: Added blackout, happens when you drink...ALOT Wallem: @@ -291,12 +245,10 @@ - bugfix: The Syndicate have fired their previous construction company after poor results in recent outposts. lizardqueenlexi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Your heart will no longer be deleted if an admin heals you while you have corazargh in your system. - refactor: The cursed heart has been streamlined a bit, and now gives you a visual cooldown for when you can beat your heart again. -<<<<<<< HEAD Wallem: - rscadd: Adds The Hand of Midas, an ancient Egyptian matchlock pistol. honkpocket: @@ -327,7 +279,6 @@ - code_imp: converted plumbing reaction chamber & mixing chamber UI files to Typescript - refactor: plumbing mixing chamber now also accepts an TGUI input list to input it's chemicals -======= - bugfix: Cutting open a hand-pressed paper bundle no longer deletes all of the paper. nikothedude: @@ -357,14 +308,12 @@ reach stam crit. Helmet protection shortens the knockout length. 2023-10-06: EricZilla: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: We have received a new shipment of IDs, as the old ones were found out to be haunted. - image: Laser tag red team ID has received a massive nerf - image: Station budget cards have gotten a facelift - image: Emags and Doorjacks - bugfix: Numbered prisoner IDs will now be legible -<<<<<<< HEAD Wallem: - rscadd: Buffs the Active Sonar module with a radial scan, and makes the power costs more in-line with other modules. @@ -384,7 +333,6 @@ - balance: Hypovial capacity now matches bottle capacity - bugfix: Broken and placeholder hypovials can no longer be printed in the ChemMaster Melbert: -======= SyncIt21: - bugfix: plumbing reaction chamber now balances the ph of it's solution correctly to the best of it's ability so no guarantees @@ -432,13 +380,11 @@ - rscadd: Fake moustaches are now poorly slapped on top of what you're wearing Melbert: - refactor: Refactors how ethereals update their color when damaged. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: AI, cyborg, and PAI camera (photo taking) behavior now uses balloon alerts and has sound effects associated - refactor: Refactored AI, cyborg, and PAI camera (photo taking) code - bugfix: fixed being unable to print photos as a cyborg when below 50% toner, even though photos only take 5% -<<<<<<< HEAD SkyratBot: - bugfix: Engineering borgs can no longer grab and drop their own iron/glass sheet module. @@ -514,7 +460,6 @@ - refactor: Refactored goats into basic mobs! Not much should have changed beyond their endless desire to retaliate should you attack them, they're still just as good as chomping away plant life as ever. -======= ReezeBL: - bugfix: fixed a PDA's messenger TGUI issue with handling of destroyed recipients. Sealed101: @@ -541,24 +486,10 @@ Ghommie: - bugfix: People who are irremediably bald can still grow a beard with barber aid. Hatterhat: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Miners can now tag monster spawners (necropolis tendrils, animal dens, demonic portals, and netherworld links) by using their mining scanner on it, which updates their GPS tag (and/or gives them one) to give it a numerical designation and a short identifier for what it's spawning. -<<<<<<< HEAD - oranges: - - rscadd: Dogs now react to centrist grillers more realistically -2023-10-09: - Nerev4r: - - image: The crew's knowledge of origami and papercrafting has been extended to - making paper masks. Find them in the loadout, or just make them! - SkyratBot: - - qol: Supermatter shards can now be fastened with right click too. Now, just don't - forget to use a wrench. - - bugfix: Slaughter/Laughter demon melee cooldowns have been fixed and now attack - at the regular player character attack speed -======= Jacquerel: - bugfix: Flesh Worms will move smoothly more consistently. LT3: @@ -584,42 +515,23 @@ - bugfix: Slaughter/Laughter demon melee cooldowns have been fixed and now attack at the regular player character attack speed Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The chemical gun and PKA pressure mod traitor items are now purchasable within 15 minutes of the round starting rather than 20/30. - balance: All preset bundle kits, the cash briefcase, the makarov, the revolver, the throwing weapon kit, c4, the detomatix cartridge, the large EMP bomb, gorillas, advanced mimery tome, pie cannon, clown car, His Grace, and the origami kit are now all purchasable at the start of a round. -<<<<<<< HEAD - - refactor: ice demons have been refactored into basic mbos. please report any bugs - - rscadd: ice demons now have a unique trophy - - bugfix: Spider types get properly checked again. - nikothedude: - - bugfix: Borers work now -2023-10-10: -======= distributivgesetz: - qol: Supermatter shards can now be fastened with right click too. Now, just don't forget to use a wrench. 2023-10-10: BlueMemesauce: - bugfix: fixed gibbing from having too much blood not working in some cases ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fazzie: - qol: NT's logo on Centcom's landing pad looks better - qol: Centcom's Cargo and other rooms had their items rearanged to look marginally better. Like you're every gonna see them! - bugfix: The Thunderdome on Centcom now has up-to-date cooking machinery -<<<<<<< HEAD - GoldenAlpharex: - - qol: "You can now bind the Shift Layer Up/Down verbs to keybinds! Look for \"\ - shiftlayerup\" and \"shiftlayerdown\" respectively in your Game Preferences\ - \ >\_Keybindings to bind them, as they aren't bound by default (for now)!" - Hatterhat: - - qol: Internal health analyzer no longer displays both health and chem scans at - the same time; LMB for health, RMB for chems. -======= FlufflesTheDog: - bugfix: Virtual domain gondola meat will no longer have a small chance to turn you into a weaker gondola variant @@ -633,7 +545,6 @@ Jacquerel: - bugfix: Cowardly mobs will consistently run away from you instead of getting tired and just sort of standing there after an initial burst of movement. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melber: - bugfix: Wearing bread (or roses, or other non-mask things) no longer prevents you from TTS speaking. @@ -641,40 +552,6 @@ - bugfix: Robotic bodyparts not attached to people are now properly affected by EMPs. - bugfix: Virtual Drink Glasses now look correct. -<<<<<<< HEAD - Motho: - - rscadd: Bitrunners can now have alternative job titles. FTU urges that these titles - are purely cosmetic and not representative of bitrunning ability. - - rscadd: Barbers, Botanists, Warehouse Techs, Coroners, Curators, Cyborgs, Geneticists, - Mimes, Nanotrasen Consultants, Roboticists, and Virologists enjoy new alternative - job titles. - - rscadd: Certain jobs now have Trainee/Newbie alternative job titles ordered at - the very bottom of the title selection dialog. If you or your character are - new to the job/department, set your title so your colleagues are aware! - - rscdel: Removed Engineering Trainee. - - qol: Alphabetized alt-titles excluding two key areas. The base title, and the - newbie title. - Nerev4r: - - image: One new long ring tail! - SkyratBot: - - bugfix: Warm donk-pockets should now have omnizine in them again. - - code_imp: COMSIG_GLOB_LIGHT_MECHANISM_COMPLETED is now COMSIG_GLOB_PUZZLE_COMPLETED - - qol: The autopsy tray (and surgery trays) can now hold the autopsy scanner - - bugfix: Metastation disposals will no longer infinitely loop garbage around the - station. - - bugfix: fixed gibbing from having too much blood not working in some cases - - refactor: Heavily refactored mirrors to be less ass cancer 1998 code. Player facing - changes are that mirrors now use a radial menu, women can get beards in magic - mirrors, made the magic mirror 'change sex' option Woke (it supports the 4 official - genders and physique as well) - - bugfix: Fixed Pride Mirror teleporting you into the space on the first use. Now - it waits until you officially cancel and say 'I am Done' so you can customize - yourself to your liking. - - bugfix: Cowardly mobs will consistently run away from you instead of getting tired - and just sort of standing there after an initial burst of movement. - - bugfix: Virtual domain gondola meat will no longer have a small chance to turn - you into a weaker gondola variant -======= SyncIt21: - code_imp: moved some global procs and vars related to reagents to its own dedicated file. removed some unused procs and macros @@ -690,7 +567,6 @@ admeeer: - code_imp: made an eensy teensie weensie change to some supermatter boilerplate jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Added extra checks to bitrunning domain cleanup so avatars are deleted properly. - rscadd: Quantum servers now look for a new machine called a byteforge to spawn @@ -698,66 +574,6 @@ after disasters. - rscadd: '*Most* bitrunning machinery is now researchable and buildable via circuits in the engineering protolathe.' -<<<<<<< HEAD - - refactor: Refactor gib code to be more robust. - - qol: Gibbing a mob will result in all items being dropped instead of getting deleted. - There are a few exceptions (like admin gib self) where this will not take place. - - code_imp: made an eensy teensie weensie change to some supermatter boilerplate - - code_imp: moved some global procs and vars related to reagents to its own dedicated - file. removed some unused procs and macros - - code_imp: heavy auto docs for a lot of procs - - refactor: adds reagent sanity and bound check code - - refactor: multiple reagents are more uniformly distributed when transferring them - between beakers or dropper & in every other reagent dependent operation - - code_imp: exploration drone adventures are now file-based and not database-based - - bugfix: Images are once more displayed as images in vv instead of as an appearance - TheSS13Melon: - - bugfix: Bitrunner now shows up with other cargo jobs on the suit sensors menu. - Wallem: - - rscadd: Nuclear Operatives now have ready access to ancient cowboy technology - in the form of the Outlaw Bundle. Now you too can roll into town on your horse. - honkpocket: - - bugfix: the OPFOR loadout 'Syndicate insurgent bundle' MODsuit is subtyped correctly - - bugfix: the OPFOR loadout 'Blood-Red MODsuit' is subtyped correctly - - balance: changes the mask in the 'Syndicate insurgent bundle' from SWAT to Syndicate - nikothedude: - - qol: SAD patients can now reject the treatment at the last step, preventing any - changes from being made - - balance: Synth tend wounds repeatable step now takes 2.5 seconds from 1 - - balance: 2 new synth tend wounds upgrades available to research - - bugfix: Synth tend wounds now gives proper feedback - - bugfix: Flipped tables now properly block movement - - balance: Defibrilators now EMP synths and apply a temporary brain trauma for 90 - seconds to them - - balance: Synth revival surgery time and steps vastly reduced/streamlined - ninjanomnom: - - rscadd: Pipes now have a colored visual display that shows their contents at a - glance. - softcerv: - - spellcheck: renames the purpura NIFSofts to libidine -2023-10-11: - GoldenAlpharex: - - bugfix: Frogs no longer make obnoxious sounds anymore (again). - Melbert: - - bugfix: Miner's Salve, Sterilizine, and Space Cleaner now all properly affect - burn wounds - Paxilmaniac: - - bugfix: The quartermaster's Rengo rifle will no longer have floating bayonets - SkyratBot: - - bugfix: moved a garbage spawner on Tramstation that was causing random runtimes - due to sometimes spawning in space depending on which module got loaded - - bugfix: fixes a runtime in organ on_death() - - bugfix: fixed some faulty research connections in between heretic's blade and - rust paths. - - bugfix: Heretic mobs will not be summoned with AI enabled, and won't turn into - small animals instead of summoning a flesh stalker. - - bugfix: Fixed some issues in the security camera UI - pressing next or back will - now loop through the cameras - - bugfix: Fixed some style issues in the camera console where selected cams weren't - showing as selected - - bugfix: Camera console search works again - - bugfix: you can no longer polymorph belt into a holoparasite -======= lizardqueenlexi: - bugfix: Metastation disposals will no longer infinitely loop garbage around the station. @@ -768,7 +584,6 @@ - rscadd: Pipes now have a colored visual display that shows their contents at a glance. san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Revenants, the mob that's split between planes of Life and Death, have been refactored into a basic mob. While this alone shouldn't touch behavior, a lot of the backend code has been gutted and refactored to try and furnish @@ -782,22 +597,16 @@ (by holy weapons) should be tweaked a bit to allow better management. This should mean that getting unstunned and such should be a bit more precise now. - qol: Revenant instructions are now relayed in a neat little examine block. -<<<<<<< HEAD - - bugfix: Wound promotion and demotion no longer removes gauze from the limb -======= 2023-10-11: GPeckman: - bugfix: Borg modules can no longer be sold by pirates. Iamgoofball: - bugfix: Fixes a few runtimes with TTS and skips some code if TTS isn't enabled. Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The Changeling Space Suit has been replaced by a new ability which makes you passively spaceproof without replacing your clothing. - admin: Editing the atmos sensitivity variables on a basic mob during the game will now actually do something. -<<<<<<< HEAD -======= - qol: You can now see what drones and gorillas are holding by examining them. - admin: It's now easier to give handless mobs hands by applying the "dextrous" element. @@ -817,51 +626,12 @@ rust paths. carlarctg: - rscadd: Adds practice carbines to all firing ranges. They don't deal damage. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Adds a base physical description proc to gameplay species, displays it on magic mirrors. It will give a description of not the lore of the species but in what way they differ from base species. - bugfix: Fixes a bad subtype on magical mirrors. - bugfix: Magical mirrors now give the user ADVANCEDTOOLUSER and LITERACY if they lack either of them, so monkey wizards aren't softlocked. -<<<<<<< HEAD - - bugfix: Borg modules can no longer be sold by pirates. - - balance: Unholy water acts as a coagulant for cultists. - - bugfix: bitrunners will no longer be lumped in with assistants on the crew monitor - console's display - - bugfix: count station food verb now counts food only onstation - - bugfix: Antiglow now probably has negative glow power. - - refactor: Harvester constructs have been updated to the basic mob framework. This - should have very little impact on their behavior, but please report any issues. - - bugfix: Fixes a few runtimes with TTS and skips some code if TTS isn't enabled. - - sound: Add burning sound loop to bonfires and fireplaces - - code_imp: Improved fireplaces to only process when lit - - bugfix: using a magic mirror to change gender or skintone will now update your - icon properly to match your selection - - rscadd: Adds practice carbines to all firing ranges. They don't deal damage. - - balance: Reviver Implant now able to revive dead people. - nikothedude: - - bugfix: Chest/Heads can now be augmented in the augment menu - - bugfix: Augments menu color wheels now properly recognize existing color - - rscadd: Science can now print advanced tools - - rscadd: Robotics can now print advanced medical tools and health analyzers - - rscadd: Roboticists can now randomly get advanced engi/medical tools in the mail - - rscadd: Table flipping now throws everything on the table -2023-10-12: - GoldenAlpharex: - - bugfix: Bitrunners and Coroners now have Akula outfits. - - bugfix: Shaft Miners now have the Cargo Akula outfit, rather than the default - one. - Hatterhat: - - balance: Blueshield's armor is now on par with a regular security vest's, with - comparatively improved fire/acid and barely improved bomb armor. (None of their - equipment covers their legs.) - - image: Blueshield's vest is now reskinnable, with three variants; the old slim - variant, a sec-vest variant, and a marine variant. - - image: Blueshield's earpiece is no longer a bright blue tumor on the side of their - head. - LT3: -======= jlsnow301: - bugfix: Fixed some issues in the security camera UI - pressing next or back will now loop through the cameras @@ -922,20 +692,12 @@ donk pockets. Some microwaves come pre-equipped with wireless charging and an upgraded cell. - bugfix: The microwave in the snowdin ruin is now real, not a fluff prop ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: After the untimely loss of too many novice HoPs, the Icebox "New IDs and You" instructions have been moved from the icemoon wastes to the HoP's office, ending this rite of passage - bugfix: Added some missing firelocks in the pharmacy area. Icebox pharmacy now has a shower -<<<<<<< HEAD - OrionTheFox: - - image: returns Lopland Security's blue ID trims, and updated a few modular ID - trims for DS2/NRI - SkyratBot: -======= SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: removed round robin method of transferring reagents which would result in some missing reagents after transferring. - code_imp: added some more rounding for reagent operations. @@ -950,20 +712,6 @@ to 4 decimal places for accuracy. - qol: droppers & beakers round the amount of reagents transferred before displaying them to chat for easy readibility -<<<<<<< HEAD - - sound: the blood cult's rise to power is now accompanied by several new sound - effects - - rscadd: Adds a new lavaland ruin where you can find a unique egg. - - image: you can now change the style of lipstick to be higher or lower on the face - by alt-clicking the lipstick tube - - balance: Flesh Spiders heal automatically over time if they go a short time without - taking damage, instead of healing large chunks by clicking themselves and waiting - two seconds. - - qol: Spider egg clusters which only hatch into one kind of spider don't ask you - to select that one type from a radial menu with one option on it. - - qol: As a Flesh Spider, the game now tells you how you can heal yourself. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: You cannot order with cargo budget if you don't have cargo access in the Galactic Market - bugfix: Private & Cargo orders no longer get mixed together in the same crate @@ -974,18 +722,10 @@ budget only after the order has been confirmed in the cargo request console & after the shuttle arrives with your order. This way you drain the budget only after your orders were successfully delivered and not before hand itself -<<<<<<< HEAD - - qol: You can now see what drones and gorillas are holding by examining them. - - admin: It's now easier to give handless mobs hands by applying the "dextrous" - element. - - balance: Spiders and Bears can now climb railings (you know if... they'd rather - do that than destroy them). -======= ViktorKoL: - sound: the blood cult's rise to power is now accompanied by several new sound effects mc-oofert: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: venus human traps are basicmobs now - balance: venus human traps have 100 health - balance: venus human traps take damage out of range of kudzu, heal near kudzu, @@ -993,51 +733,6 @@ random - balance: also venus human trap tangle ability now needs you to actually move backwards to pull victims -<<<<<<< HEAD - - admin: Gondola supplypods are functional again. - - bugfix: Examining twice experiment handlers with an active fish-related experiment - now gives a comprehensible, correctly spaced list of scanned species rather - than something like "pufferfishguppyslimefishchasmchrab". - - bugfix: No more "line snapped" balloon messages everytime the fishing minigame - is over - - bugfix: Getting to the Master level of the fishing skill now correctly gives you - that slight helping hand to identify yet-to-be-caught fishes. - nikothedude: - - qol: Table flipping feedback is now in the form of balloon alerts - - rscadd: Robo can now print standard and alien surgical tools - - bugfix: Defibs now dont screw over organics if the user was robotic -2023-10-13: - Hatterhat: - - bugfix: The CIN replicator medipen pouch and pocket first-aid kit no longer have - bag-like functionality (scooping/the action button), which they didn't need - to fit in your pockets anyway. - - balance: First-aid pouches (the ones through Cargo for 300 cr) now have five slots; - one up from four. - - rscadd: Ammo pouches can now be reskinned into casing pouches, which let them - hold ten individual shell casings in your pocket. Yes, this includes shotgun - shells. This is also primarily intended for shotgun users. - - spellcheck: .50 BMG surplus, incendiary, and marksman have now been given more - SR-lore-accurate names. - - bugfix: 10mm Reaper can't be printed in ammo benches like it was intended. If - you don't know what this means, don't worry about it. - LT3: - - rscadd: Introducing Nanotrasen Wave! A Nanotrasen exclusive, Waveallows your PDA - to be charged wirelessly through microwave frequencies. You can Wave-charge - your device by placing it inside a compatible microwave and selecting the charge - mode. - - rscadd: Microwaves can be upgraded to add wireless charging - - rscadd: Cell-swappable microwave for the engineer on-the-go - - rscadd: Microwave now has a wire to swap charge/cook modes - - rscadd: Furnishings RCD upgrade now includes wireless microwave - - rscadd: Tramstation and Birdshot engineering break rooms now have microwave and - donk pockets. Some microwaves come pre-equipped with wireless charging and an - upgraded cell. - - bugfix: The microwave in the snowdin ruin is now real, not a fluff prop - - qol: Canisters can now be built in one step, no upgrading required - Paxilmaniac: - - image: The sprites for forge structures have been vastly improved - SkyratBot: -======= vinylspiders: - image: you can now change the style of lipstick to be higher or lower on the face by alt-clicking the lipstick tube @@ -1064,38 +759,11 @@ mc-oofert: - code_imp: basicmobs that delete on death, ghost before dying san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The Holy Hand Grenade's effect on revealing a revenant had its duration accidentally nerfed, it is now back to 10 seconds. - bugfix: Revenant midrounds should now properly run. - bugfix: Revenant harvesting should now let you actually pass the final do_after so you can harvest that sweet essence. -<<<<<<< HEAD - - refactor: Gorillas now use the basic mob framework. Please report any unusual - side effects. - - bugfix: Fixed the errant bluescreen in the camera console. - - code_imp: basicmobs that delete on death, ghost before dying - - qol: The rollerdome is now better - the dance floor works now, and the bar is - groovier. - - bugfix: Dullahans can read, strip people, and utilise tools. - - bugfix: Dullahan brains and eyes will not decay while inside their living severed - head. - - image: Inhands for the Sakhno and related rifles will no longer be way too high - or big - burgerenergy: - - qol: Both versions of Interdyne received some map touch ups. Standouts include; - a fax machine, dorm locks, a make shift brig area, a revamped bathroom, botany, - and kitchen, as well as backporting Icemoon improvements to the Lavaland version. - nikothedude: - - rscadd: Sec/Medhuds can now see a small ! if a person has the DNR quick, as well - as see a blurb in examine about it - - rscadd: You can now buckle yourself to washing machines! This serves no practical - purpose except for FUN TIMES. -2023-10-14: - LT3: - - image: Nitrogen canisters are now yellow, antinob are grey/yellow, empty are grey, - hydrogen are red/white -======= 2023-10-14: BlueMemesauce: - bugfix: Modsuits can no longer be deepfried @@ -1120,7 +788,6 @@ MTandi: - bugfix: The crew is instructed to place fax machines properly in the center of a table without hanging. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Fixes Mauna Loa, Monover, Silibinin, Granibitaluri not exiting your system on metabolism @@ -1128,26 +795,11 @@ - bugfix: Holy Water no longer spams cultists with big text every time, it's much more tame now Rhials: -<<<<<<< HEAD - - rscadd: Two new psyker-oriented virtual domains -- Crate Chaos and Infected Domain. - - rscadd: Map helper for cyber-police corpse spawn. - - rscadd: Map helper for swapping the encrypted crate in an area with a random crate - from that same area. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: You can now return to your old body after being summoned by a manifest rune. - qol: You can now return to your old body after dying in CTF. - qol: You can now return to your old body after dying in the Medisim Shuttle battle area. - qol: You can no longer suicide in CTF areas, for integrity purposes. -<<<<<<< HEAD - SkyratBot: - - bugfix: Space Dragons can now, once again, tear down walls and eat corpses. They - also have regained their special damage modifier when attacking mechs. - - bugfix: Pete's anger management training has worn off, and he will once again - sometimes pick a fight with you for absolutely no reason. - - qol: Attacking a goat will not spam messages so frequently. -======= bun235: - rscadd: targetting someone's arm with *slap now has a unique message dragomagol: @@ -1155,37 +807,10 @@ mc-oofert: - bugfix: sqdl2 query readout displays location of turfs properly ninjanomnom: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: VV can now display the contents of special byond lists like filters, or client.images - admin: VV on images now displays the image in the header - admin: VV can now display filters and includes their type -<<<<<<< HEAD - - qol: apples can now be sliced - - bugfix: sqdl2 query readout displays location of turfs properly - - sound: laser2.ogg sound has been changed. Now laser carbine uses it. - - image: Laser carbine and orange laser sprite have been improved. - - bugfix: '"Mirror Walk" is once more the domain of the Maid in the Mirror rather - than "every heretic summon"' - - bugfix: Heretic mobs can once again survive space - - rscadd: targetting someone's arm with *slap now has a unique message - - bugfix: The crew is instructed to place fax machines properly in the center of - a table without hanging. - - bugfix: Modsuits can no longer be deepfried - - bugfix: Space Dragon can break walls, eat corpses and destroy mechs more efficiently - again - - bugfix: Player-controlled lavaland elites can once again return to their tumor - after winning their fight - TheSS13Melon: - - rscadd: Adds the Security Patrol Cap and Sol Police Helmet to the security vendor - - rscadd: Adds the Sol Police Helmet to /datum/supply_pack/security/helmets_skyrat - - rscdel: Removes redsec helmets from /datum/supply_pack/security/helmets_skyrat - nikothedude: - - bugfix: Experimental robotic tend wounds now actually shows up -2023-10-15: - LT3: - - bugfix: Fixed moldies event default weight overriding the configured event weight -======= san7890: - bugfix: Space Dragons can now, once again, tear down walls and eat corpses. They also have regained their special damage modifier when attacking mechs. @@ -1202,43 +827,17 @@ - balance: You can now see that a space dragon is destroying a wall with a visual indicator of the wall being damaged. - balance: Space Dragons can pry open airlocks. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - qol: Leaning now has a small animation associated. - qol: Cyborgs can now lean against walls. - bugfix: Fixed some runtimes associated with leaning. - bugfix: Fixed being able to lean while dead or in otherwise invalid states. -<<<<<<< HEAD - SkyratBot: - - bugfix: Fixes Monkey's Delight recipe - - refactor: Space Dragons are now basic mobs, please report any unexpected behaviour. - - balance: You can now see that a space dragon is destroying a wall with a visual - indicator of the wall being damaged. - - balance: Space Dragons can pry open airlocks. - - bugfix: makes the riot helmet hide hair like other sec helmets -======= ZephyrTFA: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Vent Pumps can now be overclocked, do some light reading in the air alarm to figure out what this means. - balance: Vent Pumps now have fan integrity, the damaging of which reduces their ability to move air. - sound: Overclocking sounds, including spool, stop, and loop -<<<<<<< HEAD - - balance: Allows spacemen to use age-appropriate drugs by making it so you can - now huff N2O to get high. - honkpocket: - - bugfix: fixed ghost bedsheet wearable being an error sprite on digitigrade legged - characters - vinylspiders: - - bugfix: fixed an issue that could cause the hair the layering option to reset - itself upon unequipping a paper mask - - qol: paper masks have an action button for adjusting the mask drawing + hair layering, - as well as the ability to hide the strap with ctrl click. changing the drawings - on the mask now require a pen. -2023-10-16: - SkyratBot: -======= carlarctg: - qol: Bladists can now use silver *or* titanium while creating their blades - bugfix: Fixes Monkey's Delight recipe @@ -1252,7 +851,6 @@ Melbert: - code_imp: Removed species death and species hitby, replaced any uses with signals. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: plumbing setups should(hopefully) no longer grind to a halt nor will overflow with excess volume of reagents. - code_imp: created defines for min & max ph. Improved some reaction_reagent code. @@ -1261,33 +859,6 @@ Optimized it's code overall - refactor: examining each individual reagent will display their results back to 2 decimal places again and not 4 for easy readability. -<<<<<<< HEAD - - qol: Bladists can now use silver *or* titanium while creating their blades - - spellcheck: Broken canisters now have a description - - rscadd: Added Afro (Huge) hairstyle - Wallem: - - bugfix: The active sonar module won't attempt to create 6000000 new pings per - process cycle anymore - nikothedude: - - rscadd: The nobility dresscoat, donator reward for NikoTheGuyDude -2023-10-17: - Fazzie: - - bugfix: Fixed the doors on the Beach away mission - - bugfix: Fixed the railings on the Beach away mission - - rscadd: The free golem ship has been swapped for a much better one, with fishing - equipment. - GoldenAlpharex: - - code_imp: Documented a huge part of telecommunications machinery and signal code, - and did some minor code improvements to said code. - - code_imp: Got rid of a few more single-letter variables. Only over six thousand - left to go, woo! - - bugfix: Hands of cards will now properly display the last card added to the hand - all the time, even when there's more than five cards in that hand. - LT3: - - bugfix: Fixed font scaling for announcements - - bugfix: The remaining survival pod bed on Icebox is now a medical bed - - bugfix: Announcement text now uses the intended CSS -======= Wallem: - bugfix: The active sonar module won't attempt to create 6000000 new pings per process cycle anymore @@ -1319,61 +890,16 @@ LT3: - bugfix: The remaining survival pod bed on Icebox is now a medical bed - bugfix: Fixed font scaling for announcements ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Microwave will no longer get stuck turned on if a PDA has no cell - bugfix: Silicons can no longer silently change the microwave between cook and charge Melbert: -<<<<<<< HEAD -======= - rscdel: Deleted a mapped in wrestling belt ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Refactored unarmed attacking mechanisms, this means dis-coordinated humans will now bite people like monkeys (like how coordinated monkeys punch people like humans?) - refactor: Dis-coordinated humans smashing up machines now use their hands, rather than their paws -<<<<<<< HEAD - Motho: - - sound: Plasmamen all across the sector have begun to announce their fright or - pain in a new way. - Paxilmaniac: - - image: A large number of security's clothing has been unified in color palette - and updated in style. - - rscdel: Some really old or unfitting security outfits, like the correction's officer's - weird hat and the unusued tactical peacekeeper jumpsuit have been removed. - RatFromTheJungle: - - qol: moves the self authentication device's bulky desc to an examine more, and - puts a shorter on in it's place. - SkyratBot: - - bugfix: Fixes a bug with the plasma flower core MODsuit that would cause a butterfly - murder scene wherever there were turrets - - sound: added sounds for scanning valued items with an export scanner - - bugfix: Delta's cargo bay has been connected to the atmos pipe networks - - bugfix: TGC Mana and Health bars are correctly offset on the holodeck. - - qol: Icebox Visitation now has a door connected to brig - - bugfix: Having all augmented limbs will make you properly spaceproof once again. - - bugfix: Androids are immune to crit damage again. - - bugfix: Surgery on robotic limbs can be canceled. - - code_imp: removed unnecessary calls to `update_total()` - - bugfix: Megafauna, lavaland elites, and abstract mobs now correctly cannot be - spawned by a toolbox of ash drake summoning - - bugfix: Fuel tanks are explosive again - - bugfix: TGUI Say should no longer flash during initialization - - bugfix: Fixes respiration-transmission advanced viruses to no longer have an always-guaranteed - infection chance per tick. - honkpocket: - - balance: The Bolt Pepperball AHG is now small sized instead of normal sized - jjpark-kb: - - rscadd: added the worm/ant farm - - balance: ash farming can be worm fertilized (same as regen core), but now only - does one harvest - - image: added the worm/ant farm, worm fertilizer - vinylspiders: - - bugfix: air alarm and mass driver controller in Voidraptor disposals room will - no longer overlap -2023-10-18: -======= NamelessFairy: - bugfix: TGC Mana and Health bars are correctly offset on the holodeck. - bugfix: Players without bodies to return to can play CTF again. @@ -1402,7 +928,6 @@ 2023-10-18: Ghommie: - bugfix: Fish analyzers can now be actually used for experiments. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - refactor: Tram process/industrial lift refactored into transport subsystem - refactor: Nanotrasen has traded in last year's tram for a new 2563 model! @@ -1435,61 +960,16 @@ - image: Removed all unused/duplicate tram icons from .dmis - image: Colors are now consistent between status, tram, incident displays - admin: Reset tram commands available to admins in the debug panel -<<<<<<< HEAD Melbert: - bugfix: You can punch yourself again - rscdel: Deleted a mapped in wrestling belt -======= MTandi: - bugfix: Distilled drink quality is fixed - can't give a mood debuff anymore Melbert: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Revenants can now use Ouija Boards - rscadd: Ouija Boards now have more options to select from by default (and admins can VV it to even more options) - bugfix: Blind people are now worse at using Ouija Boards -<<<<<<< HEAD - Paxilmaniac: - - rscadd: The newly resprited peacekeeper uniforms for security can now be gotten - in the loadout and in the clothing vendor. - Rhials: - - balance: Random event frequency has been adjusted to fire events more often. - - code_imp: The event subsystem has been prettied up with comments and longer variable - names. - SkyratBot: - - rscadd: added a new hallucination, your mother - - bugfix: Fish analyzers can now be actually used for experiments. - - bugfix: Players without bodies to return to can play CTF again. - - bugfix: Distilled drink quality is fixed - can't give a mood debuff anymore - - bugfix: fixed runtime caused by simple mobs AttackingTarget() missing an arg - - bugfix: ghost sheets will now have the correct flags for digi sprites - - bugfix: being killed or ghosting while being scoped will no longer cause the cursor - offset to persist in a bugged state - - bugfix: basic mobs will no longer runtime when trying to check the faction of - a porta turret - - refactor: faction checking is now done at the atom/movable level - dawsonkeyes: - - balance: random roll contractors now start with zero telecrystals instead of thirteen - sqnztb: - - bugfix: NIF Starter Kits (for ghost roles) correctly come with the Polymorph disk - again. -2023-10-19: - Fazzie: - - rscadd: The wizard's den now has a book with the guide to wizard. Hope that helps - their winrate! - - qol: The wizard's den no longer looks like a flying cucumber and has received - a major overhaul. Hooray! - Hatterhat: - - qol: Interdyne miners now spawn with a point transfer card in their backpacks. - - qol: Sansufentanyl now spawns in the Interdyne base, since it's something they - make in-lore. It can be found in a freezer crate next to their blood freezer. - LT3: - - spellcheck: More announcement CSS fixes, now including light mode - - refactor: There are a massive bunch of tram changes, SR edits applied - - refactor: Find all the new stuff down on the October 17 changelog - - image: Akula wetsuit now has a tail-less version - SkyratBot: -======= - bugfix: You can punch yourself again ninjanomnom: - admin: Invisimin can now be used on mobs that are already invisible, whether through @@ -1509,7 +989,6 @@ - qol: As an observer, clicking on a bitrunning pod will let you orbit it's bitrunning avatar. Cool! carlarctg: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: 'Added slapcraft recipes for: Pillow suits, pillow helmets, bone and sinew tailoring/weaponry, pipeguns, ghetto jetpacks, and pneumatic cannons.' - code_imp: The base type of cowboy hats no longer looks and is named like a bounty @@ -1518,71 +997,6 @@ - bugfix: Fixed an issue where if a slapcraft recipe required more than one instance of its 'primary' slapcrafting item, it wouldn't show the additional instance when examining its recipes. -<<<<<<< HEAD - - bugfix: '"line snapped" and "rod dropped" balloon alerts will now display when - they are supposed to while fishing' - - admin: Invisimin can now be used on mobs that are already invisible, whether through - temporary or permanent effects. - - bugfix: Monkeyize/Humanize mob transformations no longer permanently reveal invisible - mobs if they had effects making them invisible otherwise. - - bugfix: Objects with the undertile element that have been made invisible through - other means are no longer revealed by being uncovered. - - bugfix: fixes a tgui bluescreen bug with the bank account console that can occur - when there is bad bank account data -2023-10-20: - Iamgoofball: - - qol: You can now rename and describe any loadout item, not just plushies. - LT3: - - bugfix: Maploaded medical beds now have correct brake lights - Melbert: - - bugfix: Spasms won't trigger in stasis, incapacitated, if your hands are blocked, - or you are immobilized. - - bugfix: Magic Mirrors can change your race again (?) - - bugfix: Magic Mirrors properly prevent you from being soft locked - - bugfix: Robo customers are as robust as before - Rhials: - - qol: Ghosts will now be prompted to orbit when someone loses control due to being - blackout drunk. - - qol: Ghosts will now be prompted to orbit when a cultist begins inscribing a Nar'Sie - rune. - - qol: As an observer, clicking on a bitrunning pod will let you orbit it's bitrunning - avatar. Cool! - SkyratBot: - - bugfix: automatic breathers rejoice. oxyloss now knocks people out again. - - rscadd: Screen is now more grungy for halloween - - bugfix: People should be crawling into welded vents a lot less now. - - bugfix: Heretic summons should now display the correct name when polling ghosts - to play as them. - - bugfix: Fixes a bug where your mother would delete your species after calling - you a disappointment, rendering you a broken husk of a mob - - qol: Birdshot ordnance is now equipped with a second RPD and two holofan projectors. - - qol: Ordnance mishaps on Birdshot are significantly less likely to slam you into - an electrified window until you die. - - bugfix: B.O.R.I.S. modules can once again be properly applied to the unformatted - borg created when you reset an AI shell. - - code_imp: Adds 'Bloody Spreader' component that bloodies everything it touches! - - code_imp: For example inserting an item into it if it is a storage item. Or entering - it if it's a turf, or bumping onto it, or... you get the point, hopefully. - - rscadd: Added this component to the MEAT backpack, meat slabs, bouncy castles, - meateor fluff, meateor heart, and the heretic sanguine blade. - - rscadd: Gave most of these the blood walk component as well, which spreads blood - if it's dragged around. - - rscadd: Meat slabs contain a limited amount of both components, eventually they - will 'dry out'. - - code_imp: Added a signal for when an item is entered into storage. - - bugfix: Airtank suicides will now drop items and organs again. - - balance: reduces cellulose fibers required for advanced regenerative mesh creation - from 20u to 10u - dtfe3: - - rscadd: donator item for dtfe -2023-10-21: - LT3: - - image: Player dragon maid uniform - LT3, san7890: - - rscadd: Announcements have gotten a fresh coat of paint! They should be popping - with splendid new colors and should have a lot less ugly linebreaks, while still - managing to keep your attention at the screen. -======= lizardqueenlexi: - qol: Birdshot ordnance is now equipped with a second RPD and two holofan projectors. - qol: Ordnance mishaps on Birdshot are significantly less likely to slam you into @@ -1602,7 +1016,6 @@ - bugfix: Maploaded medical beds now have correct brake lights LemonInTheDark: - rscadd: Screen is now more grungy for halloween ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Silicons don't spark when shot by disablers - bugfix: Changelings who fail to catch something with a tencacle will have throw @@ -1614,18 +1027,6 @@ - refactor: Refactored bullet-mob interactions - refactor: Nightmare "shadow dodge" projectile ability is now sourced from their brain -<<<<<<< HEAD - SkyratBot: - - bugfix: Scream for me, the spell, now works - - bugfix: Non-random puncture wounds can now be applied - - rscadd: Add new fitness skill and mechanics for weight machines and punching bags. Working - out with a proper diet and good sleep will result in massive fitness gains. As - your fitness increases, so does your mass. - - rscadd: added a new syndicate item - the bee smoker - - code_imp: Bitrunner domains can now have spells or items from disks disabled if - the domain maker wants such a thing - - bugfix: '[Tramstation] fixed an unlinked Disposals Bin in the Pod Bay' -======= - bugfix: Magic Mirrors can change your race again (?) - bugfix: Magic Mirrors properly prevent you from being soft locked - bugfix: Robo customers are as robust as before @@ -1688,7 +1089,6 @@ Pickle-Coding: - bugfix: Fixed tesla coil zaps cutting off too early. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: plumbing pill press & bottler won't stop when processing 50 unit bottles - code_imp: 'made a lot of variables defines and lists static to save memory for plumbing pill press. Moved global lists to it''s rightful @@ -1696,10 +1096,6 @@ place' - code_imp: copied over chem master pill & patch designs over to plumbing pill press and removed the old designs. resized UI -<<<<<<< HEAD - - bugfix: making assembly activated bombs works again - - bugfix: Fixed tesla coil zaps cutting off too early. -======= - bugfix: RCD & RTD ui updates when switching between root categories Watermelon914: - admin: Added SS13.get_runner_ckey() and SS13.get_runner_client() which stores @@ -1708,13 +1104,10 @@ - admin: Added timer loop helpers to the SS13.lua module, check the docs - admin: The SS13.lua module can now be made local without causing any errors. lizardqueenlexi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Artificer constructs have been converted to the basic mob framework. This should change very little about them, but please report any bugs. NPC artificers are now smarter, and will focus on healing nearby wounded constructs - if you see them, take them out first! -<<<<<<< HEAD -======= mc-oofert: - bugfix: making assembly activated bombs works again nikothedude: @@ -1723,77 +1116,12 @@ ninjanomnom: - balance: It damages your eyes to look at the supermatter singularity san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Holodeck monkeys have been moved to the same system as old monkeys, and should retain the similar "ephermeal" behavior, while being a whole lot smarter by leveraging new AI. Please report anything that is completely wack about this. - balance: Slimes can't eat holodeck monkeys anymore, because apparently they could and that is wack. -<<<<<<< HEAD - - bugfix: Blobbernauts will once again take damage when not on blob tiles. - - qol: Nonhuman autopsy, Tier Two Lasers, and several other experiments can now - be completed earlier. - - balance: Advanced robotics techweb node no longer requires neural programming - node. - - bugfix: RCD & RTD ui updates when switching between root categories - - admin: Added SS13.get_runner_ckey() and SS13.get_runner_client() which stores - the ckey and returns the client of the user who ran the lua script. Can be unreliable - if accessed after sleeping. - - admin: Added timer loop helpers to the SS13.lua module, check the docs - - admin: The SS13.lua module can now be made local without causing any errors. - - bugfix: Fix husks fire decay rate to be slower. Pyre chaplains can now use husked - bodies (only caused by burns) to complete their burning sacrifice rite. - - bugfix: connected Meta's Cytology equipment properly - jjpark-kb: - - bugfix: ant farms produce the unprocessed ore now instead of the smelted/completed - ore - - rscadd: added stone to the ore list of ant farms - - rscadd: you can change arrows into different types by hitting them with the conversion - item (bronze tile for bronze, bone for bone, and sinew for ash) - - rscdel: removes the forged arrow subtype - - bugfix: fixes arrow icons being different again - nikothedude: - - bugfix: Unlinked RCDs now function on T3 synth blunt wounds - - qol: Synthetic blunt wounds now show their current step along with instructions - on wound scans - - qol: Synthetic blunt wounds now warn you if crowbarring open the limb can shock - you - ninjanomnom: - - balance: It damages your eyes to look at the supermatter singularity -2023-10-22: - JohnFulpWillard, sprites by CoiledLamb: - - rscadd: You can now play Mafia on your PDA. - - balance: Mafia changelings can now only talk to eachother during the night. - - bugfix: Mafia abilities can't be repeatedly used on people. - LT3: - - image: Added Halloween themed floor/tram tiles - - spellcheck: Centcom message headers are no longer hot pink - - bugfix: Fixed tram cabinet LMB/RMB actions being reversed - - bugfix: Tram cabinet can now read IDs inside PDAs and wallets - - bugfix: Crossing signals now correctly indicate broken/no power - - bugfix: Trying to repair tram (weld) without welding fuel fails - - bugfix: You can actually unbolt the tram controller from the wall - - qol: Tram spoilers now have visual and examine hints about being malfunctioning/emagged - - qol: Improved some tram error messages - Melbert: - - rscadd: Adds Food Allergies as a -2 quirk. You can select which food you're allergic - to or rock a random option. - Nerev4r: - - bugfix: Demonic Watchers now drop the proper trophy. - SkyratBot: - - bugfix: You should be revived properly when entering the mansus realm following - a heretic sacrifice - - bugfix: The buff which is supposed to heal you in the mansus realm will now do - that instead of unavoidably damaging you - - balance: The mansus realm's healing buff heals for 25% as much as it did before - it was broken - - bugfix: Fix holodeck items from being eaten, crafted, recycled, juiced, or grinded. - - rscadd: Adds a subtle ghost poll. This pings in dead chat and gives a screen alert, - but no TGUI popup. Orbit the point of interest to be selected for the role. - - refactor: A number of ghost spawns now feature this alert. Write an issue report - if anything breaks. -======= timothymtorres: - rscadd: Add new fitness skill and mechanics for weight machines and punching bags. Working out with a proper diet and good sleep will result in massive fitness gains. As @@ -1802,7 +1130,6 @@ Ben10Omintrix: - bugfix: fixes not being able to walk over or pull mook corpses BlueMemesauce: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Export scanner no longer shows value of shipping manifests, now you actually have to read them. - balance: Shipping manifest penalty is now only half crate cost as well as capped @@ -1810,50 +1137,6 @@ - balance: Shipping manifests for private orders or locked crates can no longer have the incorrect contents error. Shipping manifests for departmental orders can n longer have any error. -<<<<<<< HEAD - - qol: changed wording of a popup in the admin dressing menu - - bugfix: fixes not being able to walk over or pull mook corpses - - rscadd: Most pies can now be sliced rather than being consumed whole. - - rscadd: Rootdough can be crafted using soy milk in place of eggs. - - rscadd: Two new lizard-safe rootbread sandwiches can be crafted. - - bugfix: admin triggering the Revenant event now works again - - rscadd: Demonic-Frost Miner's ruin gets an aesthetic refresh - - qol: signalers now tell you their cooldown and also use balloon alerts - - bugfix: Meatwheat Clumps, Bungo Pits, and Eggplant Eggs should once again inherit - reagent purity from the grown item which produces them. - - bugfix: Kisses and emitters no longer make the SM crystal scream so much. - - rscadd: Gygax type mechs now have an option to disable overclock when overheated. - - bugfix: Fixed overclocking having no effect on Ripley. - - bugfix: cryo and stuff that transfers reagents with a multiplier should transfer - correct volumes as expected. - - bugfix: Fix cqc kicks to only cause staminaloss when target is on the floor - - rscadd: New dream that plays sound at you - - rscadd: Starlight should be a bit more intense, and flow better onto non space - tiles - - bugfix: Cooked meat no longer spreads blood around as if it weren't cooked. - Treach: - - bugfix: Skeleton Keys now fit in the Explorer's Webbing. -2023-10-23: - Paxilmaniac: - - rscadd: The icewalker camp has been completely remade to be less of a single house - in the middle of hell, to a location befitting our viking felines. As a side - effect, the spawn of the camp is now static and in the corner of the map, because - the ruin loader really did not enjoy the size of the templates. - - image: Sprites for all of the forging related structures have been redone because - I REALLY hated what I did with them before - - image: Several new sprites for things like wooden shelves, barrels, and so on, - all made by yours truly - - rscadd: Nakamura engineering tools in company imports has been reworked into a - new company offering new specialized engineering equipment that the station - can't normally make, rather than just tools everyone could make if they felt - like it. - SkyratBot: - - rscadd: Just in time for Halloween- ghost notifications have been upgraded to - their own announcements. Boo! - - bugfix: items that require reagent containers & the reagents inside it for crafting(e.g. - molotov) now crafts properly. - - bugfix: most crafting recipes should work now -======= FlufflesTheDog: - bugfix: Kisses and emitters no longer make the SM crystal scream so much. Ghommie: @@ -1909,7 +1192,6 @@ - refactor: A number of ghost spawns now feature this alert. Write an issue report if anything breaks. lizardqueenlexi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Maintenance Drones now use the basic mob framework. This shouldn't come with any noticeable gameplay changes, but please report any bugs. - bugfix: Drones can now interact normally with electrified doors. @@ -1919,41 +1201,6 @@ reinforced windows. - bugfix: Drones can now reboot or cannibalize other drones without being in combat mode. -<<<<<<< HEAD - - qol: Adminwho messages are now in an examine block for heightened clarity. - Vishenka0704: - - qol: In OOC Notes/Flavor Text/Species lore url now are clickable - jjpark-kb: - - rscadd: worm barrels will queue food now and create fertilizer on a cycle - - rscadd: fertilizer will now upgrade crops instead of producing crops - - qol: 'increased clarity on examine text for ash crops: it will no longer display - the message to upgrade if it is fully upgraded' - - rscdel: removed regen cores from being usable on ash farms - - balance: it is faster to insert food into the worm barrel - - code_imp: removed a meaningless var from ash farming components - - code_imp: moved some code to become procs for easier use for ash farming -2023-10-24: - CandleJaxx: - - rscadd: roboticists can now wear more clothing? yeah - GoldenAlpharex: - - rscdel: Yawns no longer spread to other people. We gave it a honest try, it just - wasn't working well for us. - Hatterhat: - - balance: Medicells no longer require reagents to print because reagent costs for - lathe designs got depreciated. Rejoice. - - balance: Oppressive force relocation cell is made like the body teleporter cell - (with a bluespace slime extract or something). - RatFromTheJungle: - - qol: most neck items are now small-sized - SkyratBot: - - bugfix: Entering a virtual domain should no longer give you a message that it - doesn't forbid items - - rscdel: Protolathe/circuit imprinter/techfab designs costing reagents is now totally - deprecated. - - bugfix: Food created by mixing chemicals once again has a reagent purity based - on the component chemicals. - - bugfix: Replaced error spaghetti in thunderdome kitchen with regular cooked spaghetti -======= ninjanomnom: - rscadd: New dream that plays sound at you timothymtorres: @@ -1977,25 +1224,12 @@ - qol: Adminwho messages are now in an examine block for heightened clarity. 2023-10-24: DrDiasyl: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The Command intercom now has a High-Volume setting like command headsets - qol: A memo telling frequencies of station radio channels are now present near the Command intercom and T-Comms room - image: Station, Command, and Prison intercoms have received new sprites - spellcheck: Station and Command intercom descriptions have been changed to tell about their functionality -<<<<<<< HEAD - - bugfix: The polymorphic belt shouldn't work on animated objects. Logically wouldn't - have DNA. - nikothedude: - - bugfix: Synth puncture wounds now properly appear when manually generated (IV - drips) -2023-10-25: - GoldenAlpharex: - - bugfix: Pollution (smoke et al.) will no longer be added to turfs when the subsystem - is offline. Basically, you can now turn off pollution properly. - - qol: Only player-made bonfires will produce smoke. -======= Fikou: - bugfix: surgical trays no longer animate when opened Ghommie: @@ -2032,30 +1266,11 @@ Jacquerel: - bugfix: You will no longer be asked to construct meteor shields on stations which cannot be hit by meteors. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Refactored zombies to use the regenerator component. Now they'll have a slight glow/animation when the regeneration actually kicks in. - qol: Monkey cubes have a slight animation associated now. - bugfix: Cooking Deserts 101 grants all intended recipes -<<<<<<< HEAD - RatFromTheJungle: - - balance: made the colony fabricator's tools actually slower, removed the RCD per - request - SkyratBot: - - rscadd: Anomaly-locked MODsuit modules can now be varedited to have unremovable - cores, or can be spawned with this functionality by using the /prebuilt/locked - subtype. - - bugfix: The Infected Domain should no longer fill up with smelly, poisonous gas - over time. - - bugfix: plastic sheet produces 4 tiles via the tiles option without using the - crafting menu - - image: resprites air alarms - - bugfix: The nanites inside of thermal pistols are once again angry, and aggressively - want to burn/puncture people. - - image: Muzzle flashes got a new sprite, each direction included! - - image: Temperature Gun "BAKE" beams are now lava colored -======= OrionTheFox: - qol: Railings now have Examine hints for how to deconstruct them - bugfix: '[Tramstation] fixed a missing Scrubber in the Civilian Radiation Shelter' @@ -2063,22 +1278,17 @@ - bugfix: The Infected Domain should no longer fill up with smelly, poisonous gas over time. TheBoondock: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: improves blackout drunk character gameplay - bugfix: fixed improper prob() placement that caused blackout character to be forced sleep - sound: added hiccup sound -<<<<<<< HEAD -======= jlsnow301: - bugfix: Ghost alerts have been tuned down a bit. lizardqueenlexi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Hostile skeleton NPCs now use the basic mob framework. They're a little smarter, and they also have a slightly improved set of attack effects and sounds. They love to drink milk, but will be harmed greatly if any heartless spaceman tricks them into drinking soymilk instead. Please report any bugs. -<<<<<<< HEAD - refactor: Juggernaut constructs now use the basic mob framework. Please report any bugs. - qol: Universal scanners are now capable of recognizing the account owners and @@ -2114,7 +1324,6 @@ make them a little smarter and more dangerous. Please report any bugs. - bugfix: Russian mobs will now actually use those knives they're holding. - bugfix: fixed hair gradients not applying correctly to huge afros -======= - refactor: Hostile Nanotrasen mobs now use the basic mob framework. This should make them a little smarter and more dangerous. Please report any bugs. - bugfix: Russian mobs will now actually use those knives they're holding. @@ -2134,14 +1343,12 @@ - bugfix: Fixed gorilla attack cooldown. Now attacking speed to mobs is the same as attacking speed to objects. carlarctg: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Adds charges to omens and omen smiting rather than only being permanent or one-use. Mirrors now grant seven bad luckers. - qol: Reduces omen bad luck if nobody's nearby to witness the funny. (Ghosts are included in the check!) - bugfix: Fixed an issue where a monkey check in doorcrushing was never actually able to pass. Also they screech now. -<<<<<<< HEAD - qol: Add smoke particles to burning fireplace - bugfix: Fixed gorilla attack cooldown. Now attacking speed to mobs is the same as attacking speed to objects. @@ -2194,21 +1401,18 @@ - bugfix: Damage will now be accurately carried between forms rather than being slightly reduced upon each transformation. - bugfix: venus human traps no longer die when on weeds -======= timothymtorres: - qol: Add smoke particles to burning fireplace 2023-10-27: FlufflesTheDog: - bugfix: Wigs now properly follow your head when you're any non-standard height Hatterhat: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Examining an ammo box (incl. magazines) now tells you the top loaded round, so if you have different ammo types in different magazines, you can at least try to figure out which one is which. - spellcheck: Ammo boxes (incl. magazines) can now be set to use different phrasing for their ammunition (e.g. cartridges, shells, etc. instead of just mixing "rounds" and "shells"). -<<<<<<< HEAD sqnztb: - rscadd: Adds Vexcint's donation item. 2023-10-28: @@ -2230,7 +1434,6 @@ - rscadd: Adds the Praetorian modsuit to blueshield lockers. - code_imp: Added the Praetorian modsuit to list of items removed from cryo, in case a sleepy blueshield forgets to take off their suit. -======= Jacquerel: - bugfix: Dying when using (most) shapeshift spells will now kill you rather than having you pop out of the corpse of your previous form. @@ -2251,7 +1454,6 @@ Jacquerel: - bugfix: If a mob you are shapeshifted into attempts to grow up into a different kind of mob then you will stop being shapeshifted ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Disablers and Lasers now show their on-impact effects on hit mobs again. - bugfix: People held at gunpoint can now flinch when being hit. @@ -2260,7 +1462,6 @@ - bugfix: Fixes some occasions which some effects (glass jaw, explodable worn items) won't respond to hits. - refactor: Refactored core code related to mobs sustaining damage. -<<<<<<< HEAD Nerev4r: - image: The Naga taur option has been replaced with a new sprite, with two Naga variants. @@ -2287,7 +1488,6 @@ projectkepler-ru: - image: gave the sindano proper inhand icon for both variant 2023-10-29: -======= Xackii: - balance: Sutures now heal a percentage of basic/animal max health instead of a flat amount. @@ -2307,22 +1507,11 @@ - rscadd: Added a few fish related bounties. - rscadd: Fish cases to store and preserve life fish within can be now printed from the service techfab and the autolathe. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - code_imp: Added support to the wet_floor component to make it so the wet overlay could not be applied to certain turfs if desired. - bugfix: Ice turfs no longer look tiled, and instead look smooth when placed next to one-another. -<<<<<<< HEAD - Iajret: - - bugfix: fixed new disabler smg having 20x more shots - Kyo: - - bugfix: Digitigrade sprites for Praetorian modsuit will now work as intended. - Melbert: - - bugfix: Fixes being unable to open airlocks with telekinesis - SkyratBot: - - bugfix: Gnomes no longer runtime if they explode while sinking into the ground -======= Melbert: - bugfix: Fixes being unable to open airlocks with telekinesis Paxilmaniac: @@ -2331,53 +1520,25 @@ Profakos: - bugfix: Gnomes no longer runtime if they explode while sinking into the ground necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Every person on the station now no longer has the Tranquility Evades the Shield Pinky Finger Shovegrab unarmed combat technique, an ancient and forbidden strike that allows anyone (literally anyone) to bypass all forms of blocking defense by simply not being in combat mode when they shove or grab their target. As a direct result, the chakra energy of the Spinward Sector has become severely misaligned. Oh well. -<<<<<<< HEAD - - rscadd: Added a few fish related bounties. - - rscadd: Fish cases to store and preserve life fish within can be now printed from - the service techfab and the autolathe. - - sound: Dying with a SecHailer on your face will make a unique death sound - - code_imp: the deployable component has been tweaked and improved with some new - options to it - Zergspower: - - qol: Service Borg reagent mixers alphabetized - - bugfix: Fixes the oversight that prevented RP borgs from being able to use the - Hilbert Hotel ball in the Cafe -2023-10-30: - LT3: - - bugfix: Blueshift now has PDA charging microwaves available similar to other maps - SkyratBot: -======= 2023-10-30: GPeckman: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Light-Eaten objects can no longer emit light after being turned off and then back on. - code_imp: Flashlights now use light_on instead of defining their own variable. Please report buggy behavior. -<<<<<<< HEAD -2023-10-31: - SkyratBot: - - bugfix: Removed rare hard delete involving telecomms machines. - - spellcheck: Changed candy description to read better - - bugfix: Fixed an invisibility exploit on large mobs. Probably better this way -======= - bugfix: Removed rare hard delete involving telecomms machines. 2023-10-31: CRITAWAKETS: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Corn oil is now produced from corn instead of regular vegetable oil. - balance: Glycerol now uses corn oil instead of vegetable oil in it's recipe. - bugfix: Grinding corn now produces oil when it previously only made cornmeal despite having oil in it's reagents. -<<<<<<< HEAD -======= Mothblocks: - spellcheck: Changed candy description to read better Toastgoats: @@ -2404,4 +1565,3 @@ - bugfix: Bitrunners can no longer get mass-mindswapped out of their avatar when the wizard does the event. Something about machinery and magic not going well together. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml index ce2f6b50b1b..c81172ce5e0 100644 --- a/html/changelogs/archive/2023-11.yml +++ b/html/changelogs/archive/2023-11.yml @@ -1,8 +1,6 @@ 2023-11-01: Data_: - bugfix: The detective's curtains can be closed again in Birdshot. -<<<<<<< HEAD -======= EEASAS: - rscadd: Added a new ruin to Ice Box Station, Lizard Gas Station GPeckman: @@ -23,7 +21,6 @@ Jacquerel: - bugfix: Non-human mobs can hallucinate their mothers without causing a runtime error ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - code_imp: Changing security levels will only trigger the nightshift subsystem if lighting changes are required @@ -33,19 +30,6 @@ clean bloodied windows, as the janitor gods intended. It also means you can fill a spray bottle with Napalm, I guess. - refactor: Any cleaning object can now clean a microwave. -<<<<<<< HEAD - NotDhu: - - bugfix: Blueshift's white ship docking port should now work correctly. - OrionTheFox: - - bugfix: fixed the Medium/Long Skirts incorrectly being Toggleable, and falsely - covering the Chest - SkyratBot: - - bugfix: Obsessed's moodlets (Both positive and negative) go away when the trauma - is cured or the antag status is removed. - - bugfix: The Syndicate Revolver now has a Syndicate Firing Pin on the Nuke Ops - uplink. - - bugfix: Bluespace launchpads no longer work on shuttles -======= Pickle-Coding: - bugfix: Fixes tesla zaps being weird. - admin: Logs explosions from explosive zaps. @@ -54,26 +38,16 @@ - code_imp: If there is only one option, radial lists will autopick it. This behaviour can be turned off via a new argument. SethLafuente: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added Abnormal Eggs - rscadd: Added Two new spiders - rscdel: Some Tarantula abilities - balance: Spiders speed are now connected to health - balance: Spiders now take more brute damage - balance: All egg laying now has a cooldown -<<<<<<< HEAD - - rscdel: Removed extra consoles from birdshot's bitrunners - - bugfix: Fixes tesla zaps being weird. - - admin: Logs explosions from explosive zaps. - - rscadd: The Ethereal Vintner's Union has been "convinced" to trade their signature - Lanternfruit with Nanotrasen! - - image: Sprites for the aforementioned fruit. -======= SyncIt21: - bugfix: Plumbing IV Drip has full control over its injection/draining rate. No longer displays the message controlled by plumbing system - bugfix: Plumbing IV Drip can be plunged by plunger again ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Cargo will remove/cancel orders from its cart if that order exceeds the available budget (both private or cargo) and the player cannot cancel this order manually. All order costs are rounded up to integer values @@ -81,12 +55,6 @@ if it exceeds the available (private or cargo depending on the mode of ordering) budget & if it exceeds the available materials on the market. Galactic material market UI is overall improved. -<<<<<<< HEAD - - rscdel: Remove duplicate light in battlecruiser starfury - - refactor: Pirate NPCs now use the basic mob framework. They'll be a little smarter - in combat, and if you're wearing your ID they'll siphon your bank account with - every melee attack! Beware! Please report any bugs. -======= Xackii: - bugfix: chameleon projector now can copy icon for storage items(backpacks, box, holsters etc) using right-click on it. @@ -110,7 +78,6 @@ was updated to advertise this behavior. necromanceranne: - bugfix: Lethal ballistic pellet-based shotgun shells no longer instantly delete. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Operatives can once again read about the basics of CQC at a reasonable price of 14 TC. - qol: All Syndicate MODsuits come with the potent ability to wear hats on their @@ -122,72 +89,6 @@ success as an operative. This is right at the top of the uplink, you can't miss it! Great for those operatives just starting out, or operatives who need all their baseline equipment NOW. -<<<<<<< HEAD - - refactor: Traders are basic mobs now. Please alert us of any strange behaviours! - - code_imp: If there is only one option, radial lists will autopick it. This behaviour - can be turned off via a new argument. - - bugfix: The fire visual on mobs should no longer persist after the fire has been - extinguished. - - bugfix: Plumbing IV Drip has full control over its injection/draining rate. No - longer displays the message controlled by plumbing system - - bugfix: Plumbing IV Drip can be plunged by plunger again - - bugfix: chameleon projector now can copy icon for storage items(backpacks, box, - holsters etc) using right-click on it. - - qol: To avoid poor magazine discipline, most combat-ready personnel have instructed - _not_ to put magazines into the gun loops on their armor vests. - - rscadd: ctrlclicking the knock path eldritch id card will toggle whether it creates - inverted portals or not - - balance: Malf Ability "Robotics Factory" can now be purchased multiple times. - - code_imp: mod reskins now properly shows their icon when skins loaded from different - .dmi - - rscdel: Remove duplicate pipe on pirate ship - - rscadd: living floor, living flesh, and other stuff for the bioresearch outpost - ruin - - rscadd: bioresearch outpost ruin - - bugfix: you may not defeat indestructible grilles and windows with mere tools - - refactor: Wraith constructs have been converted to the basic mob framework. NPC - wraiths are now extra cruel and will attack the lowest-health mob they can see - at any given time. Make sure this isn't you! Please report any bugs. - - bugfix: Artificers and juggernauts no longer attack significantly more slowly - than intended. - - rscadd: Added a new ruin to Ice Box Station, Lizard Gas Station - - rscdel: Remove duplicate power computer on oldstation ruin - - bugfix: Paraplegics can now enter netpods. - - bugfix: Fixes an exploit caused by teleporting out of a netpod. - - bugfix: Outfit selection at netpods shouldn't give armor bonuses any longer. - - refactor: The wings you get from a flight potion (if any) are now determined by - your chest bodypart, not your species. - - qol: Functional wings can now be ground up to get the flight potion back, if you - want to get a different wing variant. - - rscdel: Remove duplicate space heater from snowcabin ruin - - bugfix: Bitrunners can no longer get mass-mindswapped out of their avatar when - the wizard does the event. Something about machinery and magic not going well - together. - - bugfix: signals in circuits now actually function - - bugfix: Lethal ballistic pellet-based shotgun shells no longer instantly delete. - - bugfix: Practice laser carbines can no longer be used to rapidly fire regular - laser guns. - - bugfix: Modular shield generator modules no longer lose linkage when riding a - shuttle - - bugfix: Modular shield generators now gracefully turn off when being moved by - a shuttle rather than leaving their projections behind, the generator's description - was updated to advertise this behavior. - honkpocket: - - code_imp: Changes the syndicate neck gaiter to not have sec-hailer sfx and TTS - filtering - - code_imp: The xeno hybrid tongue now actually looks and sounds like the alien - tongue - - bugfix: Removes the dixel from the new medium and long skirts - sqnztb: - - bugfix: ships can now properly dock at Meta's whiteship dock again. -2023-11-02: - Iajret: - - bugfix: fixed blueshift ordnance chambers and, probably, doppler array - SkyratBot: - - qol: The RPD now accepts upgrade disks inserted by hand, as well as their original - method of hitting the disk with the RPD - - rscdel: Remove duplicate HoP shutter from birdshot -======= - qol: To avoid poor magazine discipline, most combat-ready personnel have instructed _not_ to put magazines into the gun loops on their armor vests. rageguy505: @@ -206,7 +107,6 @@ ArcaneMusic: - qol: Steam vents in maintenance now have tooltips. DrDiasyl: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: There is now a more convenient way to prompt surrender to emote - the Security Pen. Each officer is equipped with one in their PDA. Simply click someone with it to prompt a 30-second surrender. They are printable at Security Techfab as @@ -214,12 +114,6 @@ - qol: Penlights now are printable at Medical Techfab. - image: Penlights got a new cleaner sprite to replace its ancient one - code_imp: The code for Penlight's holographic sign has been improved. -<<<<<<< HEAD - - bugfix: Non-human mobs can hallucinate their mothers without causing a runtime - error - - rscdel: Removed duplicate northstar message monitor computer - - spellcheck: basic mobs getting shoved by humans now display the mob's disarm response -======= OrionTheFox: - qol: The RPD now accepts upgrade disks inserted by hand, as well as their original method of hitting the disk with the RPD @@ -233,26 +127,10 @@ kawoppi: - spellcheck: basic mobs getting shoved by humans now display the mob's disarm response lizardqueenlexi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Proteon constructs now use the basic mob framework. The ones encountered in ruins are a bit flightier now, and will briefly flee combat if attacked - only so that they can return and menace you again soon after. Please report any bugs. -<<<<<<< HEAD - - bugfix: plumbing reaction chamber will attempt to balance the ph of the solution - a maximum of 5 times before giving up and thus preventing infinite loops, high - tick usage - - rscdel: Remove duplicate syndi turret on waystation ruin - - rscdel: Remove duplicate machinery from russian derelict - - rscdel: Remove duplicate atmos fire alarm, cargo air alarm, and chemistry shutter - from icebox. - - bugfix: plumbing bottler now only deals with bottles, beakers similar stuff but - not pills, patches, syringes or anything than can hold reagents. That & slime - extracts, slime industrial extract & shotgun shell - - qol: Steam vents in maintenance now have tooltips. - deathrobotpunch1: - - rscdel: Removed the biometric scanning toggle from the PENLITE holobarrier -======= timothymtorres: - rscdel: Removed duplicate northstar message monitor computer - rscdel: Remove duplicate syndi turret on waystation ruin @@ -260,60 +138,10 @@ - rscdel: Remove duplicate atmos fire alarm, cargo air alarm, and chemistry shutter from icebox. - rscdel: Remove duplicate machinery from russian derelict ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-11-03: Melbert: - balance: Changelings gutted by Megafauna now take 8x as long to finalize revival stasis (~5 minutes). -<<<<<<< HEAD - SkyratBot: - - bugfix: Basic mobs will no longer randomly walk into terrain that harms or kills - them. - - bugfix: Space carp that arrive via rifts are no longer stricken with rift travel - related sickness that causes them to become weaker. - - bugfix: Possessed blades can attempt to channel spirits again - - bugfix: venus human traps heal in kudzu again - - spellcheck: The Mothic Rations Chart poster description now mentions Sparkweed - Cigarettes rather than Windgrass - - bugfix: You can no longer eavesdrop on nearby borgs' radio comms if they're using - encryption keys - - bugfix: Fix fireplace smoke particles to work properly with all directions - - bugfix: Gorilla and dexterity holoparasite can now take things out of the backpack - while holding it in his hand. - - code_imp: creatures in cowboy boots will retaliate properly - - rscadd: Added some clarity to the range of netpods (4 tiles) in their exam text. - - bugfix: Bubblegum should no longer teleport out of the simulation when threatened - - rscdel: Chamber of Echoes map removed as it conflicts with the actual Legion - - bugfix: Heretics won't lose their living heart while bitrunning anymore. - ninjanomnom: - - bugfix: Fixes turrets being invisible when they shouldn't be -2023-11-04: - Melbert: - - admin: Admins without `R_POLL` no longer have access to "Server Poll Management", - not that they could have used it anyways. - SkyratBot: - - rscadd: Added a new fishing map to bitrunning. - - rscadd: You are no longer limited to pina coladas on the beach bar domain. Cheers! - - rscdel: Removed a extra coffee pot in birdshot's security breakroom - - bugfix: Added feedback for both extractor and extractee while using fulton extraction - packs. - - qol: Extraction packs now have better exam text. - - refactor: Shades now use the basic mob framework. Please report any bugs. - - qol: Character preferences now have descriptions as tooltips - hover over their - names to see them - - balance: Gorillas, Seedlings, Gold Grubs, Mooks, Constructs, Ascended Knock Heretics, - Fugu and mobs subject to a Fugu Gland now rip up walls in a slightly slower - but more cinematic way. - - bugfix: Softspoken quirk will no longer be applied to sign language - - rscdel: 'Remove duplicate machinery from Metastation: morgue disposal bin, medical - break room air alarm, and IV drip in permabrig medroom' - - bugfix: Fixes midround selection for observers - - refactor: The way mobs get specialized actions (like revenants shocking lights - or regal rats summoning rats to their side when you slap them) have been modified, - please report any bugs. - Syrox25: - - bugfix: Cargo loaders are once again disposal and dishwasher safe -======= Mickyan: - spellcheck: The Mothic Rations Chart poster description now mentions Sparkweed Cigarettes rather than Windgrass @@ -352,59 +180,11 @@ Melbert: - admin: Admins without `R_POLL` no longer have access to "Server Poll Management", not that they could have used it anyways. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Tattle: - bugfix: you should now be able to scrub through the library without lagging the server Zergspower: - bugfix: Bounties - Virus bounties work once more -<<<<<<< HEAD - jjpark-kb: - - balance: seed meshes now cost 1 plate, 2 chains instead of 1 plate, 4 chains - - balance: seed meshes now will take 5 seconds to uncover any potential seeds instead - of 10 seconds - - balance: seed meshes will now have a 30% chance to produce a seed instead of 15% - - qol: seed meshes will now loop your sand until you do not have enough sand/basalt - vinylspiders: - - bugfix: Empowered borer eggs and cybernetic eyes can no longer be given as a result - of bioscrambling a mob. -2023-11-05: - Melbert: - - code_imp: Removed species death and species hitby, replaced any uses with signals. - SkyratBot: - - bugfix: Fugu can correctly destroy walls when they get big. - - bugfix: The HFR will not print out a piece of paper every time you multitool it, - saving any desired energy to use for more useful processes. - - admin: Holobarrier creation now adds player fingerprint data - Tattle: - - bugfix: paintings can once again be filtered - timothymtorres, Rahlzel: - - sound: Port salute emote sound from Colonial Marines SS13 attributed to Rahlzel -2023-11-06: - LT3: - - code_imp: Emergency shuttle announcements no longer use hardcoded values - - code_imp: Central Command announcements now correctly use its new name when changed - - spellcheck: Consistency pass on event announcements - - qol: Holobarriers will match the spray paint colour of their projector - SkyratBot: - - bugfix: Mafia games can now start properly. - - bugfix: reagent volumes should be consistent & non breaking across plumbing & - chemistry as a whole - - bugfix: plumbing reaction chambers are more proactive. Will attempt to take in - reagents more frequently - - rscdel: Remove duplicate lighting from beach bar domain - - bugfix: Basic mobs using JPS can move again - jjpark-kb: - - qol: worm fertilizer is now a stackable item - - balance: worm farms produce faster - - balance: you can now feed worms single pieces of food in the same time as plant - bag feeding - nikothedude: - - bugfix: Synthetic slash wounds now mangle exterior instead of interior -2023-11-07: - Melbert: - - rscadd: Fishers can now try their luck at fishing out of hydroponics basins. -======= jlsnow301: - bugfix: Added feedback for both extractor and extractee while using fulton extraction packs. @@ -454,39 +234,11 @@ - code_imp: Emergency shuttle announcements no longer use hardcoded values - code_imp: Central Command announcements now correctly use its new name when changed - spellcheck: Consistency pass on event announcements ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - code_imp: The notify_ghosts proc has been cleaned up. Please report any abnormal changes in deadchat notification behavior. - qol: The on-screen deadchat popups now contain the notification blurb when hovered with your mouse again. -<<<<<<< HEAD - SkyratBot: - - bugfix: fixed a couple missing and misplaced disposals pipes on metastation - - qol: Improve the emote help verb to be more user friendly - - bugfix: You will now only become blackout drunk if you've actually been drinking. - - bugfix: Observers should stop being notified that a nameless entity is blacking - out. - - balance: paraplegic is no longer exclusive with spacer or settler or spacer. Broken - legs don't discriminate! - - bugfix: walls built next to firelocks no longer hold onto their alarms - - code_imp: added some trailing commas in lists that were missing them, fixed a - typo in comments - - bugfix: Reagent lookup in chem dispensers now shows correct reagent metabolization - rates - - bugfix: tails will no longer keep wagging even in death - - qol: Make notepad available for everyone, who has only laptop or console. - SpaceLove: - - rscadd: Nanotrasen has removed combat restrictions over Nightvision Cybernetic - Eyes and it is now readily available in advanced cybernetic implants for all - your nightly adventurers! - - rscdel: Nanotrasen medical ethics boards has deemed the militarygrade implants - such as Thermal eyes implant too risky to keep around in medical techfab, therefore - they have been handed over to Robotics only. - nikothedude: - - qol: Rewrote most preference entry descriptions to be more useful -2023-11-08: -======= SyncIt21: - bugfix: reagent volumes should be consistent & non breaking across plumbing & chemistry as a whole @@ -512,50 +264,10 @@ - balance: Golems and plasmamen cannot become husked. - image: Robotic and Skeletal parts will remain distinct while the rest of the body is husked. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Maximum smoothing turf groups now includes cliffs - bugfix: Tramstation floor tiles will correctly get custom station colors when they exist -<<<<<<< HEAD - SkyratBot: - - bugfix: The screen alert should no longer break ghost UI when it's huge - - rscadd: Added a user type to integrated circuits - - bugfix: Both magic mirrors and regular mirrors are far better at respecting the - choice of the beard you wish to wear (within reason, of course). - - bugfix: fixes synthflesh not dealing and in fact healing toxin damage. - - bugfix: Fix light eater affecting lava, space, openspace, and transparent turfs - - bugfix: Nuclear operative induction implants now work correctly on antagonists - and fail on non-antagonists - - config: The bitrunner job now has a default config for server owners. - - image: Several holidays now have themed floor and tram tiling. - - qol: Light switches have tooltips, and may now be deconstructed with right click - using a screwdriver. - - rscadd: Being sufficiently drunk now has a chance to cause working out to fail - and harm you - - balance: sets the leaper move and pull forces to strong - - rscadd: Maltroach bar sign! - - bugfix: All vehicles (such as VIMs operated by a mouse or a lizard) will no longer - be able to phase through containment fields. - - bugfix: Slimes now need to be on an open turf to reproduce and split into more - slimy slimes, instead of getting away with using phasing powers in pipes. - jjpark-kb: - - rscadd: you can place torches on walls (closed turfs) now -2023-11-09: - Bumtickley00: - - spellcheck: You no longer hear weaponelding when deconstructing a closet. - LovliestPlant: - - rscadd: Adds links to any special rules or metaprotections to antag's objective - panels. - Majkl-J: - - bugfix: Flavor text should no longer bluescreen - Melbert: - - rscadd: Anomalies, portals, and bluespace rifts will now wibble a bit. - Nerev4r: - - rscadd: The holocigar is now public. - SkyratBot: - - balance: Flightpotion wings will no longer make health analyzers list you as nonhuman. -======= Melbert: - rscadd: Fishers can now try their luck at fishing out of hydroponics basins. MoffNyan: @@ -601,7 +313,6 @@ lizardqueenlexi: - config: The bitrunner job now has a default config for server owners. necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Harnessing Shoreline Quay (bluespace energy, probably), a mystical energy (total bullshit) that permeates the Astral Waterways (bluespace quantum dimensions, probably), Sleeping Carp users can now once against deflect projectiles with @@ -613,35 +324,6 @@ grabs and shoves. If the target of their grab has enough Stamina damage (80), they are knocked unconscious from a well placed nerve pinch. - balance: Sleeping carp users find it very hard to wake up once they fall asleep.... -<<<<<<< HEAD - - bugfix: Material market buy buttons greys out correctly and thus prevent you from - placing orders that exceeds the available budget. -2023-11-10: - CacheAtWork: - - rscdel: Removed a modular fermentation recipe from soybean; preventing override. - Nerev4r: - - bugfix: Snails now properly don't have any bones. - - qol: Snail limbs and tongue are now available in the limb grower. - Paxilmaniac: - - rscadd: A new quirk has been added, called "Ration Ticket Receiver" for zero points. - What does it do? In exchange for half of your paycheck, you'll get a ticket - every few paychecks that'll let you exchange it for your 1855 Passenger Act - mandated rations! - SkyratBot: - - spellcheck: Renamed Knock to Locks, and changed most of the flavor text of knowledge - gain, and renamed some items and knowledges from the path. - - bugfix: plumbing factories should not rarely/randomly brick at volumes like 0.9999(when - in fact it should have been 1) - - qol: Adds the capability for some player-controlled mobs with ranged attacks to - repeatedly fire their natural weapons by holding down the mouse button. - - rscadd: Three new plants; Peppercorn, Saltcane and Butterbeans. - - rscadd: Soysauce fermentation to soybeans. - - rscadd: Saltcane can be dried into a replacement seaweedsheet for sushi. - - balance: Venus human traps now take 12.5 damage per second instead of 20 while - off kudzu. - - bugfix: Nanotrasen has clarified an issue with their manual publishers, and these - guides should now contain actual user-pertinent content. -======= san7890: - bugfix: Slimes now need to be on an open turf to reproduce and split into more slimy slimes, instead of getting away with using phasing powers in pipes. @@ -659,147 +341,16 @@ SyncIt21: - bugfix: Material market buy buttons greys out correctly and thus prevent you from placing orders that exceeds the available budget. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: machines/devices that ask you to pick a reagent name from an input list have their names sorted alphabetically & preserves white space between words making them more readable. - qol: improves performance of plumbing reaction chamber furthur - code_imp: cleaned up code for portable chem mixer & chem dispenser. converted their ui to typescript -<<<<<<< HEAD - - rscdel: Removed duplicate shutter from HoP office in birdboat, air alarm in northstar - maint, and portable air pump in northstar maint. - - bugfix: Fix holodeck items from being juiced or grinded with a biogenerator or - pestle and mortar - - rscadd: Enginenering rebar crossbows + tot kit - - rscadd: Added a bunch of ammos and crafting junk to make the ammo exist - - image: added icond for all the above - - code_imp: removed order history, import & export value from cargo & economy subsystems. - Allow supply packs to be properly deleted. In general memory savings - - qol: Bandolier can quick gather items now. - - balance: Bandolier capacity increased to 24 and can carry .357 ammo now. - - bugfix: Examining circuit boards now displays their detailed names(tier included) - correctly if required. - SomeRandomOwl: - - qol: Department Heads REJOICE! You now start with departmental budget cards in - your locker! And just so the captain doesn't feel lonely they get one too for - all the assistants that run around. - TiberianEuan: - - image: added blank white ipc screen - TwistedSilicon: - - bugfix: Cryo cells now use their direction to orient their initial connection - instead of defaulting to South. - Zxaber, DrDiasyl, Maurukas: - - rscadd: A new security-focused combat mech, the Paddy, has been added, intended - to be particularly helpful for lone sec officers. You will find one in the Security - main office, and a replacement can be built with late-game mech research. - - bugfix: Ripley MK-I and MK-II mechs no longer qdel their stored items when destroyed. - honkpocket: - - rscadd: The reagent weapons made with the forging stations can be renamed and - redescribed. - - bugfix: Fixes more unintended taur clothing cropping. - projectkepler-ru: - - rscadd: a gun beacon option for the NTC to pick between two of his magnum pistol - choices, fully modular and can be messed with by anyone in the future if more - guns are added. - sqnztb: - - bugfix: soulcatchers' edit name button correctly displays the host name - vinylspiders: - - bugfix: zippo sound effect now only plays for zippo lighters - - bugfix: big mortar can no longer grind/juice holograms - - bugfix: Hearthkin/primitive demihumans will now spawn with their quirks when using - a character loadout - - bugfix: in the loadout manager, trying to name a loadout item that has not been - checked will now inform user that they need to select the item first - - bugfix: the TG barsigns will now use emissives (aka, they will glow in the dark) - - bugfix: skyrat signs will give off small amounts of neon colored neon light like - TG signs do - - image: cyberslyph barsign (the only 96x96 sign) is now useable in the game, and - uses emissives. - - image: added some emissive light masks for a few of the skyrat barsigns - - refactor: converted the modular barsigns file to 64x32, and added a separate file - for 96x96 signs along with modular support for large signs - zergspower: - - balance: NPC Syndicate Shotgunners range requirement returned -2023-11-11: - Iajret: - - qol: SM airalarms on VoidRaptor and Blueshift now actually reads atmos from SM - chamber. - Plum-but-gayer: - - rscadd: Added a new oversized synthetic stomach, for oversized synths. - - bugfix: Fixed oversized synths spawning with organic stomachs. - - image: added a sprite for the oversized synth stomach. It's a lil jank, sorry! - SkyratBot: - - image: Adds yet another bar sign, this one mining themed - - balance: Snails no longer receive blunt wounds, meaning sharp weapons can dismember - them more easily - - balance: Slimes can no longer receive dislocations - - bugfix: Fix mapping linter not identifying duplicate blacklisted objects on a - turf - - code_imp: Add a mapping linter to check for stacked machinery - - rscadd: New Oranges' Juicery bar sign for the OJ connoisseurs. - - bugfix: fixed engi crossbow being able to be used onehanded + ability to craft - with sci inducers - - qol: Ordnance burn, freezing and supermatter chamber air alarms now show the air - contents on the tile of the connected sensor inside the chamber. - Zergspower: - - bugfix: Interdyne Medbay no longer has to worry about a mask that wont go away - if you touch it -2023-11-12: - Melbert: - - bugfix: Split persons can talk to their host once again - - rscdel: The Stethoscope no longer tells you if the target is missing a heart or - lungs. Now, it will simply say the target is lacking a pulse or not breathing. - - bugfix: AI controlled mobs which are immobilized are now properly immobilized - - bugfix: People with copied memories can modify their bank account ID as normal. - Motho: - - bugfix: NanoTrasen remembered to equip the NSV Blueshift with an APLU Paddy. - SkyratBot: - - spellcheck: Fixed typos in the examine text for the lead pipe & lead-acid battery. - - rscdel: Remove duplicate windows from birdshot, delta, and anomaly research ruin. - - refactor: Guardians/Powerminers/Holoparasites now use the basic mob framework. - Please report any unexpected changes or behaviour. - - qol: The verbs used to communicate with, recall, or banish your Guardian are now - action buttons. - - balance: If (as a Guardian) your host moves slightly out of range you will now - be dragged back into range if possible, rather than being instantly teleported - to them. - - balance: Protectors now have a shorter leash range rather than a longer one, in - order to more easily take advantage of their ability to drag their charge out - of danger. - - balance: Ranged Guardians can now hold down the mouse button to fire automatically. - - balance: People riding vehicles or other mobs now inherit all of their movement - traits, so riding a flying mob (or vehicle, if we have any of those) will allow - you to cross chasms and lava safely. - - rscadd: 4 new space ruins - jjpark-kb: - - rscadd: you can farm plants and ants on dug snow - - balance: you must now dig the basalt to farm plants and ants -2023-11-13: - DATA_: - - spellcheck: The examine message for a carbon with an empty golem stomach now properly - matches said carbon's gender. - Iajret: - - bugfix: fixed delta's ntrep office flying light and disposals - Melbert: - - bugfix: Fix being unable to resist out of ice cubes - Plum-but-gayer: - - rscadd: Bureaucrats rejoice! Clipboards and folders are now available in the loadout - menu, under the 'Other' tab. - SSensum: - - admin: Admin opfor panel now requires a R_ADMIN flag instead of R_AUTOADMIN flag. - SkyratBot: - - bugfix: Ashwalker Tendril Revives no longer ghost the player being revived. - - bugfix: Replaces the jetpack in Interdyne pirates' suit storage with air tanks. - They need to breath, and already got the suit for speed. - - bugfix: '[Mafia] Obsessed now knows who their target is in their role description, - and people playing on PDA are told in their chat.' -======= Toastgoats: - balance: Venus human traps now take 12.5 damage per second instead of 20 while off kudzu. necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: With the flood of Chi within the Spinward Sector receding, various masters of The Tunnel Arts, colloquially known as 'Maint-fu Masters', have started to refine the basics of their martial techniques. New forms have started to develop @@ -815,14 +366,6 @@ - refactor: Significantly changed how punching accuracy and knockdowns are calculated. - balance: Golem and mushroom limbs are a lot more effective at punching as a result of these various changes. As they should be. -<<<<<<< HEAD - - bugfix: emped bar signs will now display the correct sprite - - image: added a more detailed lightmask for the emp bar sign sprite - - bugfix: Goats will now calm down after getting grumpy without causing a runtime - error. - - bugfix: fixes holodeck missing medical tools - - spellcheck: Made the remembrance day greeting message more tasteful. -======= xXPawnStarrXx: - rscadd: Three new plants; Peppercorn, Saltcane and Butterbeans. - rscadd: Soysauce fermentation to soybeans. @@ -932,31 +475,11 @@ - bugfix: Replaces the jetpack in Interdyne pirates' suit storage with air tanks. They need to breath, and already got the suit for speed. necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The Dread Disciples of Maint Khan, notorious Tunnel Arts practitioner and maintenance warlord, have been driven from Nanotrasen stations within the Spinward Sector. The average punch accuracy has been increased as a direct result, with the most exhausted puncher now having a max potential inaccuracy of 80%, rather than the absurd 20% of the Disciples. -<<<<<<< HEAD - chemistrymain2: - - qol: Mold mobs now delete on death. - - bugfix: Toxic molds now correctly use a toxic spider instead of a guard spider - as their mob - delingar: - - balance: cortical borer's sprite is much smaller - - balance: cortical borers are squashable now - - bugfix: fixed cortical borer's chemicals from blood objective - honkpocket: - - rscadd: Adds the Syndicate Rebar Crossbow to the OPFOR loadout. - - rscadd: Adds the Sawn-off Hook Shotgun to the OPFOR loadout. - - bugfix: The recharger kit supplied along with various laser-guns in the OPFOR - menu now actually contains items. - - rscdel: Removes unusable Cultist melee weapons from the OPFOR loadout. - vinylspiders: - - bugfix: legally purchased suppressors no longer give illegal tech when deconstructed -2023-11-14: -======= nikothedude: - code_imp: Quirks are now customizable on the quirks page instead of on the character prefs page @@ -974,13 +497,10 @@ - bugfix: wall tearer compnent wont runtime when interacting with mineral walls BlueMemesauce: - bugfix: Fixed tcomms relays being weird, they should be sabotagable again ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Danny Boy: - bugfix: Fixed Signer eyebrow raising/lowering indicators and emotes - bugfix: Fixed Signer RuneChat punctuation - bugfix: Signers no longer sign with their species' tongue -<<<<<<< HEAD -======= GPeckman: - qol: Fixed/improved feedback when failing to apply a direct law change to a cyborg. - bugfix: Borgs who are unsynced from a malf AI now lose the zeroth law as intended. @@ -1002,34 +522,11 @@ - image: Added more crate styles Majkl-J: - bugfix: You can now eject blank IDs from modular computers ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - balance: Body temperature from being lit on fire will soft cap at 1,200 K. It will still increase beyond this, but with diminishing returns. For example, at 5,000 K, fire will heat 67x weaker. - bugfix: Fixes some potential exploits and issues involving shielded equipment. -<<<<<<< HEAD - Rhials: - - bugfix: The full mining lockers in the Lavaland Mafia map have been replaced with - (empty) mining carts. - SkyratBot: - - bugfix: tramstation cargo disposals outlet has been repositioned to not softlock - whoever cannot lay down - - bugfix: fixes half-covering glassware protecting eyes from chemicals - - bugfix: suite storage units can be locked again. Remember to install a card reader - or set the access levels in the airlock electronics inside its stock parts & - finally swipe your ID to properly enforce access control. - - bugfix: You can now eject blank IDs from modular computers - - refactor: gutlunches have been refactored into basic mobs. please report any bugs - - rscadd: ashwalkers have a small ranch they can manage - - bugfix: wall tearer compnent wont runtime when interacting with mineral walls - - qol: Fixed/improved feedback when failing to apply a direct law change to a cyborg. - - bugfix: Borgs who are unsynced from a malf AI now lose the zeroth law as intended. - - code_imp: Atoms no longer break again after they are hit when broken, making them - hopefully more stable in the future. - - bugfix: The Sleeping Carp scroll no longer says deflect using throw mode. - - bugfix: Fixed tcomms relays being weird, they should be sabotagable again -======= OrionTheFox: - image: Resprites the Reactive Anomaly Armor Rhials: @@ -1047,7 +544,6 @@ - code_imp: Atoms no longer break again after they are hit when broken, making them hopefully more stable in the future. larentoun: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: 'Gunpoint: Examining the target will show who is holding them at gunpoint' - qol: 'Gunpoint: Examining the shooter will show who they are holding at gunpoint' - balance: 'Gunpoint: If the target tries to grab, they will trigger the shot' @@ -1057,33 +553,6 @@ - balance: Both the target and the shooter can't be bumped anymore to avoid cheesing charged shot or removing the gunpoint by just moving around - bugfix: Clicking the alert button of the shooter will now correctly remove gunpoint -<<<<<<< HEAD - - bugfix: fixed pipe painter not applying pipe color properly - - qol: made spraycans work also as pipe painters - - qol: spraycans now have basic color presets for quick selection - - rscadd: Add bamboo seeds to ash walker den. This lets them craft blowguns, crude - syringes, bamboo spears, punji stick traps, and more! - - code_imp: Quirks are now customizable on the quirks page instead of on the character - prefs page - - bugfix: Kronkaine's action speed buff now stops when metabolized out. - - bugfix: Drug-related moodlets should now time out properly. They still linger - after metabolization ends, but they no longer last forever. - - bugfix: The PDA painter and the emergency shield generator can now be destroyed. - - rscadd: Green Beer has an overdose effect now. It will permeate your skin. - - balance: Mech overclock coefficient is down to 1.25 from the default 1.5 for Ripley - and Clarke. - - balance: Mech overclock heating now scales with movespeed, higher speed - faster - overheat. - - bugfix: Removes some roundstart active turfs. - - image: Resprites the Reactive Anomaly Armor - - bugfix: Gorillas and Regal Rats will no longer show up in the ghost-control menu - if they died without anyone ever taking control of them. - Vishenka0704: - - bugfix: Now you can refuse the pirates request. - honkpocket: - - bugfix: The SC/FISHER side-arm is now available in the OPFOR loadout. -2023-11-15: -======= mc-oofert: - bugfix: tramstation cargo disposals outlet has been repositioned to not softlock whoever cannot lay down @@ -1108,14 +577,12 @@ - bugfix: PDAs now log that they've been emagged, but will no longer log any further programs they open beyond that. This means Nukies don't sell themselves out by opening their disk tracking app. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Bad luck omen again raises your chance of getting shocked by the tram plate - bugfix: Tram plate checks and energizes when the tram is moving - code_imp: Omen component now applies the cursed trait Melbert: -<<<<<<< HEAD - bugfix: Fixes hallucination and encrypted announcements printing to the Newscaster. Nerev4r: - bugfix: Kicks are no longer supercharged by the dark energies of the Satsui no @@ -1172,8 +639,6 @@ - image: Added lights to the bluespace miner - refactor: Refactored bluespace miner code Melbert: -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: General heart code cleanup. - bugfix: Heartbeat sound effects are no longer sourced to the exact tile you fell into crit at @@ -1181,49 +646,12 @@ - bugfix: Ethereal hearts are less likely to become invisible or look wrong, and now properly spawn with their shine overlay - image: Adds heartbeat animation to beating Ethereal Hearts -<<<<<<< HEAD - Motho: - - image: The FTU has replaced their aging fleet of advanced shipping containers. - Sector 13 is among the first few localities to enjoy them. - SkyratBot: - - qol: Dead human examines count as "soul departed" when the client is disconnected - or the human doesn't have a brain anymore. -======= - bugfix: Fixes hallucination and encrypted announcements printing to the Newscaster. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: drying rack now shows correct examines & screen tips. - code_imp: tone of code organization for smart fridges overall. changed ui to typescript. - qol: added more detailed examines & screen tips for smart fridges. drying racks can be dismantled with a crowbar and not simply pried open with it. -<<<<<<< HEAD - - bugfix: Molotovs now splash before burning, not after - - bugfix: The Galactic Material Market now respects quantity of materials purchased, - removing them from the market when bought and preventing you from ordering more - than are available at a given time. - - qol: the donksoft vendor refill cartridge is now available at the service lathe - - bugfix: Fixed a small issue with disposal outlets leaving contents about to be - ejected stuck inside the pipe beneath it if deleted. - - rscadd: Emote Panel TGUI added in IC category. - - image: Crates got new sprites - - image: Added more crate styles - - balance: Male Goats should no longer spawn with an udder, instead of it just being - Pete. - Zergspower: - - bugfix: fixes the mass-decal and VV's in Blueshift - additionally repipes the - entire map to reduce its size - falconignite: - - bugfix: Lizard tail wagging graphics - jjpark-kb: - - bugfix: updated the drones backpack to include items that the /tg/ nodrop drone - toolbox has - - bugfix: drones can craft again - vinylspiders: - - rscdel: pipe gas visuals have been disabled for the time being -2023-11-17: - Dalm: - - image: A tea room sign for the bar -======= TwistedSilicon: - bugfix: invisimin verb now makes you invisible to all HUDs too! No more floating healthbars or job identifiers giving you away while you sneak around. @@ -1275,7 +703,6 @@ Ghommie: - bugfix: Fixed catwalks over open space not making a sound when walked over. - rscadd: The mother hallucination has more possible one-liners now. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - balance: Stop, drop, and roll no longer instantly clears 5 fire stacks off of you - Instead, it will clear 1 fire stack off of you every time you roll, with @@ -1285,11 +712,6 @@ cancel the roll, and you cannot use items while rolling around. - balance: Stop, drop, and roll will now repeat until the fire is put out or you get up. -<<<<<<< HEAD - SkyratBot: - - image: light tube inhand sprites are now grey, as are the icons for the light - bulb/tube/mixed boxes -======= RedBaronFlyer: - image: light tube inhand sprites are now grey, as are the icons for the light bulb/tube/mixed boxes @@ -1299,7 +721,6 @@ :cl:' SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: removed redundant procs `get_master_reagent_id()` & `get_master_reagent_name()` - code_imp: merged `remove_all_type()` proc with `remove_reagent()` now this proc can perform both functions. `remove_reagent()` now returns the total volume @@ -1310,8 +731,6 @@ ph of a solution making it less efficient but more faster. Just make the reaction chamber wait for longer periods of time to accurately balance ph - refactor: reagent holder code has been condensed. Report any bugs on GitHub -<<<<<<< HEAD -======= Vekter (on behalf of Constellado): - image: 'Added a new bar sign as one of the winners of our Bar Sign Contest: "The Assembly Line".' @@ -1322,7 +741,6 @@ - bugfix: Space Ruin - All American Diner - Soda Machine now is scooted out of the way jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Bitrunning Patch 1 features a host of changes! - rscadd: Added randomized mobs to virtual domains, which will be indicated with a unique icon. @@ -1344,7 +762,6 @@ new types. Check your preferences! - bugfix: The quantum server will now show its balloon alerts to all observers. - bugfix: Random domains should be fully random again. -<<<<<<< HEAD - rscadd: Adds a chance that, when sharpened, a sufficiently potent carrot will turn into a sword instead of a shiv. - qol: if you die in a mech you automatically eject @@ -1354,20 +771,17 @@ gas comes out. - bugfix: Space Ruin - All American Diner - Soda Machine now is scooted out of the way -======= mc-oofert: - qol: if you die in a mech you automatically eject mogeoko: - bugfix: Turbine parts will now use an amount of materials no greater than needed for the upgrade san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Bar Bots (and several other mobs) will no longer aggro on you if you click on them with a "forceful" item from halfway across the room. - balance: After a string of unfortunate incidents, persons with telekinesis have been strongly warned against playing Russian Roulette, as they tend to hyperfixate on the gun a bit too much and end up firing it directly at their head. -<<<<<<< HEAD - bugfix: grabs no longer trigger krav maga - rscadd: Androids now have robotic brains instead of organic brains. - bugfix: 'The CRAB-17 will now only take whole credits, as fractional credits were @@ -1384,18 +798,15 @@ for the upgrade 2023-11-18: SkyratBot: -======= 2023-11-18: Ben10Omintrix: - bugfix: gutlunches will stop having too many children - balance: gutlunches are no longer in the mining faction JohnFulpWillard: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Secure briefcases are now actual briefcases. - refactor: Wall safes are now structures, rather than items that can't be picked up. - refactor: Lockable items (Wall safes & Secure Briefcases) now use TGUI. -<<<<<<< HEAD - bugfix: gutlunches will stop having too many children - balance: gutlunches are no longer in the mining faction - bugfix: After correcting a slight miscalculation, Bit Avatars now have hands again. @@ -1405,7 +816,6 @@ 2023-11-19: Deek-Za: - image: New Digitigrade icons for red sec officer and HoS uniforms. -======= ZephyrTFA: - rscadd: Chat Reliability Layer - code_imp: TGUI chat messages now track their sequence and will be resent if the @@ -1425,7 +835,6 @@ - rscadd: Infiltrators (Latejoin/Midround traitors) can now buy and use Contract kits again. - rscdel: Contractor baton can now only be purchased once. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Tram will no longer electrocute innocent, law abiding crew trying to use the crosswalk when there's no tram in sight @@ -1438,30 +847,6 @@ - bugfix: Fried items now respect existing volume cap. - bugfix: Smartfridges now don't accept bulky food items, good thing we have none of those right guys? -<<<<<<< HEAD - SkyratBot: - - bugfix: ' Attaching a circuit to the air alarm now reads from the correct turf.' - - bugfix: '"Old Chat" (AKA: The old-styled non-TGUI raw-HTMLesque chat that you - might see when it prods you with the "Failed to load fancy chat!" issue) should - now get all text messages as expected.' - - bugfix: you can climb over more stuff with a climbing hook - - rscadd: Abductors have bigger brains. - - bugfix: You can once again use alt to turn while strafing in a mech - - balance: Paint cans hold 20x more paint than before, painters rejoice! (Janitors - cry more) - - qol: Implanted HUDs can now be toggled on and off with an action. - - bugfix: Fixes a runtime when the radioactive nebula trait runs with a map that - has no virology area. - Thlumyn: - - rscadd: Telekinesis now lets you subtler at range. - yooriss: - - balance: Gravity suspension harnesses now arrive in crates instead of goody cases, - meaning that they can be ordered via departmental budgets AND privately purchased - if needed. Rizz your local cargotech to defeat gravity, as the universe intended. -2023-11-20: - LT3: - - bugfix: Delam counter will correctly show 0 the shift after a delam -======= Rhials: - spellcheck: The Grey ID Cargo Crate is now spelled properly. SapphicOverload: @@ -1503,7 +888,6 @@ MTandi: - bugfix: Hydrotrays consume nutrients according to their proportion in the mix, instead of randomly picking reagents to consume every cycle. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - admin: Adds a button to check-antagonists that allows admins to send Nuke Op reinforcements with a single button @@ -1511,45 +895,17 @@ declared) - bugfix: Fixes multiple nuke teams (or an admin) being able to declare war at once - rscdel: Heretic side path points are gone -<<<<<<< HEAD - Nerev4r: - - balance: Hemophages now have higher healing numbers, and liquid blood helps non-bone - wounds like tea does. - OrionTheFox: - - bugfix: fixed the Face Scarf not changing the icon correctly when toggled - - bugfix: fixed Vapes checking for digitigrade legs, rather than muzzles - - image: added muzzle compatibility to the Face Scarf - Paxilmaniac: - - rscadd: Adds a new weapon given to blueshields and available through cargo if - you REALLY wanted, the Bogseo submachinegun, firing .585 and able to give both - you and your target an equally bad day! - - image: Sprites for the Bogseo done by me :333 Rhials: - - spellcheck: The Grey ID Cargo Crate is now spelled properly. -======= - Rhials: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Nuclear Operatives, in an attempt to appeal to the more "tacticool" members of their cause, have begun using callsigns to designate themselves. Check your preferences to set your Operative Alias! - qol: At the request of the more vain members of the cause, hair dye has been added to the Operative Firebase dorms. -<<<<<<< HEAD - SkyratBot: - - bugfix: fixes bug that was preventing high luminosity eyes' light from turning - on - - bugfix: fixes eyes being on the wrong side of the head when facing east/west - - bugfix: Fixed the infinite growth serum exploit. - - bugfix: Fixed generic nutriment processing even when dead. - - rscadd: The mother hallucination has more possible one-liners now. -======= SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: debug chem synthesizer works again. cleaned up chem dispenser, portable chem dispenser & debug chem synthesizer ui code - qol: ui for displaying beaker reagents for debug chem synthesizer has been improved. Now displays input list for adding reagents -<<<<<<< HEAD - bugfix: Hydrotrays consume nutrients according to their proportion in the mix, instead of randomly picking reagents to consume every cycle. - bugfix: The aquarium auto-feeding feature now works correctly. @@ -1563,8 +919,6 @@ - bugfix: runtime when adjusting material market after buying - spellcheck: Some roundstart tips have been made clearer regarding "suits" vs. "exosuits". -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Removes & merges `get_multiple_reagent_amounts()` proc with `get_reagent_amount()` inside reagent holder - code_imp: Removes & merges `get_reagent()` proc with `has_reagent()` inside reagent @@ -1572,17 +926,13 @@ - code_imp: Removes & merges `has_chemical_flag()` proc with `has_reagent()` inside reagent holder - refactor: Reagent holder code has been further compressed. Report bugs on github -<<<<<<< HEAD -======= Tattle: - bugfix: admin painting manager works again jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Nearly every ghost alert should now feature a "VIEW" button, even those with click interaction. - rscdel: Ghost alerts no longer show the entire message in the tooltip, instead have been replaced with titles. -<<<<<<< HEAD - spellcheck: Nukie and ERT defibrillators now reference combat mode instead of intents. Tattle: @@ -1598,7 +948,6 @@ - rscadd: Added a seed shelf & produce bin - rscadd: Crafting recipes for stone cooking structures. - rscadd: Crafting recipes for Paxil's fences. -======= - bugfix: Chat shouldn't bluescreen at the start of the round - bugfix: Admins can spawn bitrunning events (again!) lizardqueenlexi: @@ -1615,7 +964,6 @@ - bugfix: fixes bug that was preventing high luminosity eyes' light from turning on - bugfix: fixes eyes being on the wrong side of the head when facing east/west ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 yooriss: - refactor: Icemoon wolves now use the basic mob framework and should act more intelligently, defending their pack. @@ -1624,8 +972,6 @@ pet commands you'd expect, such as fetching things, and violently mauling people their owners point at. 2023-11-21: -<<<<<<< HEAD -======= 00-Steven: - balance: signers no longer suffer from social anxiety's speech changes when they go non-verbal. Other effects are maintained. @@ -1639,7 +985,6 @@ market uplinks. - balance: The SC/FISHER now has more range (21 tiles up from 14), and is usable by pacifists. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Atrocinating mobs will now behave more as you'd expect. Meaning they don't slip on wet patches, can't trigger bear traps / landmines / mouse traps, ignore @@ -1648,11 +993,9 @@ glass tables - bugfix: Floating mobs won't squish stuff like roaches anymore - bugfix: Fixes bear traps triggering on floating / flying mobs -<<<<<<< HEAD SkyratBot: - balance: signers no longer suffer from social anxiety's speech changes when they go non-verbal. Other effects are maintained. -======= OrionTheFox: - qol: Allergy Dogtags (and any other dogtags, really) are now Tiny items and can fit into wallets. @@ -1668,7 +1011,6 @@ necromanceranne: - bugfix: When you successfully block a body collision, it does something rather than nothing at all. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The battle against Maint Khan's forces rages on in the periphery stations of the Spinward Sector. And with it, a new breed of unarmed warrior has emerged; the cybernetic martial artist. Nanotrasen, rather than quell the minor maintenance @@ -1685,69 +1027,10 @@ - balance: Surplus prosthetic limbs contribute more of their carried damage to overall health (AKA they make you actively more vulnerable to damage), and deal less damage with unarmed attacks. Take Quadruple Amputee at your own risk. -<<<<<<< HEAD - - bugfix: When you successfully block a body collision, it does something rather - than nothing at all. - - qol: Allergy Dogtags (and any other dogtags, really) are now Tiny items and can - fit into wallets. - - image: 'Following now have unique item sprites: syndicate war declaration radio, - curator and chief beacon''s, chaplain beacon.' - - image: 'Following now have unique inhand sprites: radio, export scanner, walkie-talkie, - syndicate war declaration radio, curator and chief beacon''s, chaplain beacon.' - - bugfix: healing viruses can no longer have floor virus side effects - - balance: The SC/FISHER disruptor pistol is now more likely to show up in black - market uplinks. - - balance: The SC/FISHER now has more range (21 tiles up from 14), and is usable - by pacifists. - san7890 and Ben10Omintrix/Kobsamobsa: - - refactor: Parrots (including Poly) have undergone a massive refactor, please report - any bugs or unexpected behavior that you may encounter. - - qol: Left-clicking a parrot with a cracker will tame it, right-clicking a parrot - with a cracker will now feed it the cracker. - yooriss: - - rscadd: Examining tamed companions of any type with shift double-click now gives - a brief indication as to their overall health. This also includes a handy reminder - on how to heal pets if they get injured. - - rscadd: A new recipe for anointing bloodresin is now available exclusively for - Primitive Demihumans, made from 80u liquid gibs and 20u of blood. Bloodresin - invokes traditional rites of the Hearth to give names to worthy creatures. Using - this in poor ways may displease the Gods. Woe upon your lineage. - - rscadd: A single pack of glowshroom mycelium has been added to the Hearth's starting - seed stores for the benefit of creative healers, shamans, and radiation enthusiasts. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-11-22: Bumtickley00: - balance: The CMO's hypospray now holds 60u, and can be set to inject smaller amounts of reagents -<<<<<<< HEAD - Jane: - - rscadd: Bargonia Bar Sign for Cargo Bar Enjoyers - LT3: - - bugfix: Cursed/bad luck omen will now stick with the player for more than 1 incident - Melbert: - - refactor: Refactors how ethereals update their color when damaged. - - balance: Transformation sting now lasts 8 minutes, down from permanent. However, - the effect is paused for dead and stasis mobs, making it permanent SO LONG AS - they stay dead or in stasis. The effect is also permanent if used on a monkey. - - balance: Transformation sting now costs 33 chemicals, down from 50. - - balance: Transformation sting now costs 2 dna points, down from 3. - - bugfix: Transformation sting works on monkeys again. - - refactor: Refactored a bit of human randomization. - OrionTheFox: - - bugfix: fixed a few missing/outdated HUD icons, including the Bitrunner's SecHUD - icon, and switching the "Suspected" tag to match the color used on consoles - SkyratBot: - - bugfix: '[Icebox] Atmos techs have access to the Engineering front desk windoor.' - - qol: '[Icebox] Security''s lower floor is not as easily cut off from the powernet - anymore.' - - bugfix: removes a duplicate bookcase in icebox permabrig library - - bugfix: Androids cannot have overdose effect by any chems. - - spellcheck: Examining a human mob as an observer displays "Quirks", not "Traits" - - bugfix: adds back one way exits to Tramstation science's entrance - - bugfix: Removed a duplicate grille from the abandoned mime outpost space ruin, - and replaced the 'energy weapon lenses' with spent revolver rounds. -======= Ghommie: - spellcheck: Examining a human mob as an observer displays "Quirks", not "Traits" Jane: @@ -1770,12 +1053,10 @@ - bugfix: Skillsoft's skillchip stations are now ADA-compliant (Astronauts with Disabilities Act). Paraplegic characters can now implant themselves with skillchips, the same as anyone else. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Heads impaled on spears now render in the correct place on the tip, instead of halfway down the shaft. - bugfix: Blind personnel are no longer able to magically see heads impaled on spears from a distance. -<<<<<<< HEAD - bugfix: Meta's recycler works again - qol: Slightly moved the universal enzyme on meta's kitchen to a prettier spot. - bugfix: The universal enzyme on meta's kitchen is no longer unecessarely varedited. @@ -1799,20 +1080,15 @@ Disabilities Act). Paraplegic characters can now implant themselves with skillchips, the same as anyone else. - qol: adds pixel perfect 4x, 4.5x, and 5x -======= 2023-11-23: OrionTheFox: - qol: Allergy Dogtags (and any other dogtags, really) are now actually whitelisted to fit into wallets. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: autolathe does not diminish materials from custom material items like toolboxes when printing them in bulk. Also does not gray out that item in the UI - bugfix: autloathe correctly updates UI after inserting items into it -<<<<<<< HEAD - - bugfix: fullupgrade chem dispensers will now spawn with all their chems -======= Y0SH1M4S73R: - rscadd: Certain types of pens now function like you expect they would when inserted into a foam dart @@ -1821,7 +1097,6 @@ aaaa1023: - qol: adds pixel perfect 4x, 4.5x, and 5x necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Judo Joe, archnemesis of Maint Khan, has begun re-airing his midnight infomercials shilling his extremely expensive Tackle Supreme Judo Karate Training video tapes. Unable to pass up a 'bargain', Nanotrasen has purchased these tapes @@ -1848,7 +1123,6 @@ likely to eat shit on a whiff. DO OR DIE, BITCH. - refactor: Shoving slowdown and all its implementations now use a status effect, Staggered. -<<<<<<< HEAD - bugfix: Fix refresh button in log viewer - qol: Allergy Dogtags (and any other dogtags, really) are now actually whitelisted to fit into wallets. @@ -1878,7 +1152,6 @@ them. - bugfix: gutlunches now produce miner salve instead of milk, as well as the other reagents if fed the correct ore -======= vinylspiders: - bugfix: fullupgrade chem dispensers will now spawn with all their chems 2023-11-24: @@ -1887,89 +1160,22 @@ - balance: The borg RPED can hold as many part as the BSRPED now - balance: Cyborg chargers now draw from the power net as cell chargers do Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: A new skill chip can be found in maintenance or purchased from the vendor, allowing you to experience food in new and exciting ways. - rscadd: Abductors also have access to this incredible power, simply using their genius level brains. -<<<<<<< HEAD -======= JohnFulpWillard: - qol: Mafia panel no longer shows vote buttons if you're on stand, shows the roles of revealed players, and list out who is on the stand, if any. SyncIt21: - bugfix: RCD can build directional windows on top of existing grills & without them. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: removes & merges `expose_multiple()` proc into `expose()` proc inside reagent holder - code_imp: removes `conditonal_update()` proc & `on_update()` proc inside reagent holder and reagent - refactor: Reagent code has been trimmed and split into multiple files. report bugs on github -<<<<<<< HEAD - - qol: Mafia panel no longer shows vote buttons if you're on stand, shows the roles - of revealed players, and list out who is on the stand, if any. - - qol: gives roundstart prisoners a key memory of what their crime is - - admin: Remove "Make AI" from VV dropdown - Smol42: - - rscadd: Added four acrador snouts. - The Sharkening: - - refactor: Removes unused Kilostation Automapper templates - TwistedSilicon: - - bugfix: Window damage overlays have been fixed. - jjpark-kb: - - rscadd: you can craft the gutlunch trough - - qol: you can fill the gutlunch trough with a mining bag - - rscadd: you can hammer glass shards to get back sand -2023-11-25: - SkyratBot: - - rscadd: Adds an arctangent2 component to circuitry! - - image: SM shard sprite updated - - bugfix: Emag overlay on lockers fixed - - image: New locker sprites - - image: Added new lockers - vinylspiders: - - server: Added a preventative measure to prevent calling both TGSHardRestart and - TGSReboot, as well as potentially invoking sensitive procs that are only meant - to be called once. - - bugfix: Fixes a bug where the computer ui wouldn't open up when using a pda on - a synth's eyes -2023-11-26: - Rhials: - - qol: The area preceding Metastation Cargo's front door is now denoted as being - the "cargo lobby". - - qol: Gives Cargo areas its own wire layout, instead of having it use the same - wires as Service areas. - - code_imp: Bitrunning/Bitrunning Den areas are now cargo area subtypes, rather - than station area subtypes. - SkyratBot: - - bugfix: Rebar crossbow bolts are now reuseable again, without risking crashing - clients when fired at point-blank range. - - bugfix: Fixes cyborged heretics seeing influences. - - bugfix: fixes a runtime in footstep code that would prevent the fov effect from - playing to nearby mobs - - code_imp: HUDs no longer use their own trait variable - - bugfix: MOD quick carry modules now give the correct carry speed bonus - - qol: Bitrunning glitches will not show up in the roundend report unless they escape - the virtual domain. - - bugfix: Fixes nebula killing everyone when forced by an admin on icebox - - qol: Mothuchi's pizzeria has been improved slightly! Order yourself a fresh mothic - pizza today! - nikothedude: - - bugfix: Radios can be used in mechs - sqnztb: - - bugfix: bitrunners can now drop off their caches properly on blueshift - vinylspiders: - - bugfix: Fixed a minor runtime when hallucinations are ending. -2023-11-27: - Paxilmaniac: - - rscadd: A whole host of new and unique items has been added to deforest medical - in cargo to spice up their admittedly quite lame selection! Have a look when - you get the chance why don't you? - - image: So, so many sprites for new stuff made by me. - SkyratBot: -======= TwistedSilicon: - bugfix: Window damage overlays have been fixed. Xander3359: @@ -1996,7 +1202,6 @@ Momo8289: - bugfix: MOD quick carry modules now give the correct carry speed bonus Profakos: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Slimes's colour, core type and mutation list is now held in a slime type datum - code_imp: Slime's variables have been documented, and renamed a bit to add clarity. @@ -2006,28 +1211,6 @@ of hiding it if a slime doesn't mutate further, or tweaking it if it might mutate back into itself. This will make it easier to parse which slime to breed further to get a rainbow slime. -<<<<<<< HEAD - - bugfix: You can once again repaint robotic limbs to use alternate skins - - bugfix: Poly should now remember phrases between shifts. - - code_imp: removes unused proc `generate_possible_reactions()` from reagent holder - - bugfix: the dismemberment moodlet will now properly clear for ethereals who regrew - a limb in their resurrection crystals - - qol: Oculine now tastes bitter, and not like toxin. - Stalkeros: - - rscadd: '"Ancient Milsim" bitrunning domain that lets you shoot guns at CIN people - as SolFed people.' - - code_imp: Added a way to add Skyrat-exclusive virual domain safehouses. - jjpark-kb: - - rscadd: added a new derelict station (for drones)-- Babylon Station 13 - nikothedude: - - rscdel: Removes a irrelevant quirk restriction of a nonexistant quirk - - rscadd: Resonance degradation disorder, a highly customizable quirk that acts - as a far more in-depth version of DNR -2023-11-28: - GoldenAlpharex: - - rscdel: The Radioactive Nebula station trait will no longer cause radiation storms, - but all of its other effects remain. -======= Rhials: - code_imp: Bitrunning/Bitrunning Den areas are now cargo area subtypes, rather than station area subtypes. @@ -2065,17 +1248,14 @@ - code_imp: Removed currency value for free products Kylerace: - code_imp: verb callbacks will no longer execute if the original client disconnected ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - qol: Bar signs can now be purchased from cargo. Neat! - qol: Bar signs can now be deconstructed with a screwdriver and wrench. - qol: Bar signs can now be smashed to pieces, rather than just disabled. -<<<<<<< HEAD SkyratBot: - code_imp: Removed currency value for free products - bugfix: Ranged Guardians (Holoparasites/Power Miners/etc.) can no longer use ranged attacks in scouting (incorporeal) mode. -======= Y0SH1M4S73R: - bugfix: People exposed to romerol while alive will once again revive as zombies on death. @@ -2083,12 +1263,10 @@ - bugfix: Ranged Guardians (Holoparasites/Power Miners/etc.) can no longer use ranged attacks in scouting (incorporeal) mode. vinylspiders: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fixes an overlay lighting hard del - bugfix: flashlights placed inside of backpacks and other storage items that were on the floor will no longer allow light to shine through - bugfix: fixed a null client runtime in advanced camera console -<<<<<<< HEAD - bugfix: People exposed to romerol while alive will once again revive as zombies on death. - bugfix: fixed a runtime in handle_dead_metabolism() @@ -2142,7 +1320,6 @@ rarytech: - bugfix: fixed the displaying of tacticool clothing for digi legs 2023-11-30: -======= - bugfix: fixed a runtime in handle_dead_metabolism() 2023-11-29: Ghommie: @@ -2190,12 +1367,10 @@ Ben10Omintrix: - refactor: cats are now basic pets. please report any bugs. - rscadd: the cake cat and bread cat can now help the chef around in the kitchen ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - bugfix: The Radioactive Nebula station trait will now respect its upper intensity cap set at one hour and forty minutes, no longer scaling past that, as was initially intended. -<<<<<<< HEAD Majkl-J: - bugfix: Synth eyes now inhabit the correct body zone slot SkyratBot: @@ -2207,7 +1382,6 @@ - bugfix: Fixed warm coat, sweaters for digi sprites. capsaicinz: - spellcheck: your fiscal image is no longer actualized. -======= Mothblocks: - rscadd: Instead of teaming up random people together, blood brothers will now start out with one player and let them convert a single other person over to @@ -2216,4 +1390,3 @@ - bugfix: Cyber cops are now equipped with the correct outfit. timothymtorres: - bugfix: Fix bitrunning triggering claustrophobia ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml index c069d52c6c0..a27f3a5328b 100644 --- a/html/changelogs/archive/2023-12.yml +++ b/html/changelogs/archive/2023-12.yml @@ -1,64 +1,13 @@ 2023-12-01: -<<<<<<< HEAD - SkyratBot: - - rscadd: turns triple ai mode into a station trait -2023-12-02: - MidoriWroth: - - bugfix: Icebox chemistry lab shutters are controlled by the button in the chemistry - lab and not in the pharmacy again. - Paxilmaniac: - - rscadd: All AK-whatever guns, the NRI pistol, and the nri smg, have been replaced - with a new selection of weapons now also for sale in the nearest cargo console. - - rscadd: The CIN clothing in company imports will now spawn with random colors, - rather than always being grey. - - sound: New Lanca firing sound from TGMC - - image: Resprites and sprites for the new weapons by me, Paxilmaniac - SkyratBot: - - rscadd: Instead of punished sect healing people like the normal bibble- you take - their burdens on instead! - - bugfix: Cyber cops are now equipped with the correct outfit. - - bugfix: Changelings will no longer get an objective to impersonate crew without - absorbable DNA. - - bugfix: Changelings will no longer start without an escape objective. - - bugfix: fix parrots not appearing dead sometimes - - spellcheck: fixed typo in one of spacer's moodlets - - bugfix: shield wall gens actually use power now - - qol: shield wall gens may now be rebuilt and use some balloon alerts, and have - wiring - - code_imp: The singularity processing is a bit more important than the other subsystems. - - admin: A new debug verb to turn yourself into an MMI(almost the funniest thing) - - bugfix: MMI's inside mechs can now properly open doors like there posibrain counterparts - Vekter: - - rscdel: Replaced the "monkey cube" in Birdshot's tool storage with a different - "monkey cube". - - rscadd: Added a fun surprise item to Birdshot's tool storage to compensate for - the above change. -2023-12-03: - Hatterhat: - - bugfix: The toxin damage from overdosing on TWitch now respects server tickrate/REM. - Paxilmaniac: - - rscadd: A whole host of new armors for protecting yourself from being turned into - red mist by a psycho with a rifle are for sale at relatively low cost from Sol - Defense in cargo! - - image: Sprites for every piece of new armor done by yours truly. - SkyratBot: - - qol: psyker echolocation cooldown time has been reduced from 2 to 1.8 seconds - - bugfix: psyker heads no longer render an overlay of not having eyes - - bugfix: Sign Language action properly toggles between an active/inactive background - again. -======= Fikou: - rscadd: turns triple ai mode into a station trait Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Agent IDs once more trick Beepsky into treating you more leniently. - rscadd: Prisoner IDs make Beepsky treat you somewhat more suspiciously, as do Syndicate IDs. Wearing a Centcomm ID means that Beepsky is aware that you are above the law. - rscadd: Player-controlled security bots can view someone's assessed threat level by examining them. -<<<<<<< HEAD -======= MidoriWroth: - bugfix: Icebox chemistry lab shutters are controlled by the button in the chemistry lab and not in the pharmacy again. @@ -150,26 +99,11 @@ spawning that exact gift type, this has been patched to reflect the mapper's intent. tralezab: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Honorbound no longer cares about innocence when it comes to lesser creatures. They can still be considered unready in some cases. - balance: Attacking a cultist with a halo or a nuclear operative first instantly makes THEM guilty, allowing further attacks. - balance: More favor for converting someone to the honorbound rules -<<<<<<< HEAD - - bugfix: Mod links are now disabled in the virtual realm. - - bugfix: Fixed an issue with the offsets of ridden vehicles on tables, and another - when buckled to a bed. - - bugfix: crafting food or any other items that require reagents will not leave - behind blank reagents. That and properly updates the holder those reagents are - stored in -2023-12-04: - Cursor, Delbert Grady: - - rscadd: The Overlook- Err 'Twin'- Whatever the Space Hotel is called has had some - minor additions. - HoodMilk: - - rscdel: Removed the holiday restriction on red-colored Christmas clothing. -======= 2023-12-04: Ghommie: - rscadd: Added the daily (roundstart) message server key to the Chief Engineer's @@ -181,7 +115,6 @@ and not Generic restocking units. KittyNoodle: - bugfix: Heretics can no longer cast all of their spells while in jaunt ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Falling down a z-level while standing now damages your legs rather than your entire body. This also means falling down multiple z-s may rarely break @@ -190,80 +123,27 @@ This replaces the knockdown with a short slowdown, and also has the trade-off of causing more leg damage. - rscadd: Cats can now fall z-levels without sustaining damage. -<<<<<<< HEAD - MrDerpi: - - bugfix: "synth livers not emp-able\n/\U0001F191\n\n\ - " - MrMelbert: - - bugfix: smartfridges no longer show false overlays - Nerev4r: - - bugfix: Lopland Security has finally negotiated an order of blue tackle gloves - with the FTU, abandoning the red NanoTrasen models. - Rhials: - - qol: Bar signs ordered from cargo will no longer be access-restricted. - - spellcheck: Fixes a typo in the Factory Quartermaster outfit name. - SkyratBot: - - bugfix: SecTech restocking units are now actually named SecTech restocking units, - and not Generic restocking units. - - admin: Removed the "Turn Target into MMI" right click context menu verb entirely, - and instead added the same command as a VV dropdown on human mobs. - - rscadd: Added the daily (roundstart) message server key to the Chief Engineer's - memories. - - rscadd: Added new roast dinners, able to be cut into smaller portions hopefully - in time for the Christmas season. - - rscadd: Instead of teaming up random people together, blood brothers will now - start out with one player and let them convert a single other person over to - blood brother using a flash. - - rscadd: 'Festival Sect has 3 new rites: Cogitandi Fidis, Portable Song Tuning, - and Illuminating Solo.' - - balance: lowers threshold for triggering a final effect. Consult your Cogitandi - Fidis for more information - - bugfix: Some mapped-in gifts that were supposed to guarantee a certain gift weren't - spawning that exact gift type, this has been patched to reflect the mapper's - intent. - - admin: The Player Panel should now contain the unique mob tag associated to a - certain mob that a player might inhabit at one time, which is stored on their - player details datum on their client (which is guaranteed to always exist). - - admin: The "Old Names" details of a player is now visible in their own personal - per-player player panel. - - server: Minimum compile version has been bumped to 515. clients still support - 514 but we're gonna start using 515 restricted features for serverside now. - - bugfix: Fixed some oopsie whoopsie with elevation, trams and beds causing people - to visually ascend or descend to heaven or hell. - - bugfix: Blocking a tackler no longer causes things to go haywire and stun the - tackler/the tackle victim. -======= Profakos: - rscdel: Removes the slime's reagent holder. This will make them not slow down from somehow imbibing morphine or frostoil. Rhials: - qol: Bar signs ordered from cargo will no longer be access-restricted. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: soups and other reactions where large quantities of reagents are required/present should not have a random chance of reacting forever. - bugfix: reactions which are overheated should diminish all the way to 0 - code_imp: cleaned up code in `datam/equilibrium` in general. Slightly optimized soup reaction code -<<<<<<< HEAD - refactor: medbots are now basic bots. please report any bugs - rscadd: medbots can wear hats! -======= Timberpoes: - admin: Removed the "Turn Target into MMI" right click context menu verb entirely, and instead added the same command as a VV dropdown on human mobs. distributivgesetz: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Clone damage dealt by the cosmic blade has been replaced with organ damage and increased burn damage. Clone damage dealt by the cosmic beam has been removed. The star gazer now deals burn damage instead of clone damage. - bugfix: The health of mobs combo'd by a cosmic blade will now update correctly. -<<<<<<< HEAD - rscadd: Added sprites for bone spears to match the other bone items. - rscdel: Removes the slime's reagent holder. This will make them not slow down from somehow imbibing morphine or frostoil. @@ -312,7 +192,6 @@ - qol: Converting someone will now give a chat message. - bugfix: Blood brothers can no longer get other antagonists, I hope. - rscadd: adds propeller hats, rainbow bowties, and swirl lollipops -======= necromanceranne: - bugfix: Blocking a tackler no longer causes things to go haywire and stun the tackler/the tackle victim. @@ -331,7 +210,6 @@ Autisem: - bugfix: Rebirthing from headslug properly reapplys void adaptation distributivgesetz: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Removed clone damage. - rscdel: Removed the decloner gun. - rscdel: "Removed clonexadone.\n/\U0001F191\n" -<<<<<<< HEAD vorpal-void: - bugfix: yeah here we go, APC recharging, mission accomplished. - code_imp: power_cord.dm, whooping 4 lines of code. @@ -512,7 +389,6 @@ - refactor: 'TGUI V5: The UI has had its entire engine replaced with React v18.2. This might cause obvious or laughably broken UIs in places you wouldn''t expect. Please report any issues you find to the repo!' -======= san7890: - bugfix: 'Janitors rejoice (or lament): Floors should now be dirty shift-start. @@ -556,7 +432,6 @@ - bugfix: The typing indicator has overcome its shyness and is now back to its usual form. Higgin: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: most diseases can now be slowed, mitigated, and eventually cured through being well-fed, resting, and using spaceacillin. Curing diseases through this way will give you immunity if you experience them at their peak/maximum and @@ -583,8 +458,6 @@ max your virus has. Experiment with different combinations using less than six symptoms to make viruses that are deceptively less-obvious and less quick to self-cure at the tradeoff of stats. -<<<<<<< HEAD -======= LemonInTheDark: - refactor: (Almost) all smoothed icons can now be edited in their pre cut forms Melbert: @@ -687,13 +560,11 @@ :cl:' san7890: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: Object Possession has been reworked, please report any potential bugs. - qol: Object Possession should now throw a screen alert for you to unpossess the object instead of you having to search the stat-panel for the "release obj" verb. You can still use the verb but it's a lot nicer now. Aghosting will also work now. -<<<<<<< HEAD - bugfix: fixed big rice pans getting worse with cooking. - qol: Add RMB hotkey and screentip UI to tracking beacons to toggle them on/off. - bugfix: 'The air_alarm_circuit to gets the environment from the proper turf. @@ -706,7 +577,6 @@ - bugfix: randomized spawned mobs will now have their species' random mutant colors and features applied properly 2023-12-12: -======= timothymtorres: - qol: Add RMB hotkey and screentip UI to tracking beacons to toggle them on/off. 2023-12-11: @@ -719,13 +589,11 @@ 2023-12-12: Ghommie: - bugfix: Goldgrubs no longer block death bolts, even while alive. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: When using an item on a mob, you will always attempt to fix wounds AFTER surgery, BUT BEFORE the item's own interactions. As an example, this means using a mesh on a mob will attempt to progress surgery first, then attempt to fix any burn wounds, then heal burn damage. -<<<<<<< HEAD Rhials: - bugfix: Sunset Saloon virtual domain should no longer sometimes spawn with holes in the floor. @@ -749,16 +617,13 @@ and Medbay.' - bugfix: '[Blueshift] The forgotten exosuit fabricator will no longer attempt to output directly into the wall.' -======= OrionTheFox: - image: The Head of Security's "Sturdy Shako" hat now uses the same gold color as his other hat ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - qol: Blackout drunkard personalities will now recieve a "you are about to sober up" warning at the 60/40/20 second mark, instead of repeatedly at the 50 second mark. -<<<<<<< HEAD Ryll/Shaps: - bugfix: You can no longer stack more than one applications of a burn wound at once @@ -773,7 +638,6 @@ - bugfix: fixed outdated item description - bugfix: You should be able to move stamps on paper again. - bugfix: climbing or being shoved into a glass table won't cause elevation issues. -======= - bugfix: Sunset Saloon virtual domain should no longer sometimes spawn with holes in the floor. SyncIt21: @@ -789,12 +653,10 @@ - bugfix: fixed outdated item description 2023-12-13: Ben10Omintrix: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: AIs can summon bots again - bugfix: cleanbots can clean floors directly underneath them and prioritize floors nearest to them - bugfix: medbots drop empty medkits now -<<<<<<< HEAD - bugfix: Bird Phobia now triggers on geese - bugfix: Dropdowns should show what you've selected again. - bugfix: no runtime when unwrenching Atmos components @@ -825,7 +687,6 @@ - server: The TGS -> Discord Relay Warning that detects if a cliented mob has a null loc should now be plaintext instead of being fully screwed up with useless codestuffs. -======= Buyrcsp2: - bugfix: Bird Phobia now triggers on geese Ghommie: @@ -852,15 +713,12 @@ Time-Green: - bugfix: Highlander wont gib every person anymore Watermelon914: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Organs can now be preserved by putting them in freezing temperatures. - balance: Morgue trays and freezers will now cool down the contents placed inside of them. - balance: Morgue trays will now properly display if someone stored within them is revivable and make periodic beeps every minute. -<<<<<<< HEAD - qol: The asteroid on Tramstation can now have areas expanded into or created within. -======= jlsnow301: - bugfix: You should be able to edit your character using the feature buttons again. - bugfix: You should be able to move stamps on paper again. @@ -888,12 +746,10 @@ the `BASIC` tag instead (like with carbons, reagent containers, turfs, etc.). So, instead of having to scroll through and try and figure out what that weird subtype of Poly is, it should now be easier to read in that smaller screen. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-12-15: ATHATH: - rscadd: If your bitrunning avatar somehow acquires and consumes a red pill, they will be disconnected from the Matrix. -<<<<<<< HEAD Jonnatonne: - rscadd: Adds new palmated antler horn type. SkyratBot: @@ -911,7 +767,6 @@ - bugfix: items that are rejected by the mat container will display the chat message saying that. - bugfix: Away lathes can now print robot navigational beacons -======= Higgin: - bugfix: Chemicals are now no longer less effective at curing advanced viruses than they used to be. @@ -929,7 +784,6 @@ there is a slight chance it does not happen - bugfix: items that are rejected by the mat container will display the chat message saying that. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: ORM will generate points regardless of how the ore enters it. - bugfix: Machines like autolathe, techfab etc can now be hit with iron sheets (or any other material item type those machines accept) when in combat mode rather @@ -939,7 +793,6 @@ - refactor: Machines like autolathe, techfab etc now display summed up material inserts to chats rather than each item individually. Also, will skip items & its contents if it cannot be processed thus saving time -<<<<<<< HEAD - bugfix: mobs that have the `TRAIT_PERMANENTLY_ONFIRE` trait cannot be extinguished by anything. - bugfix: stuff thrown into lava should not runtime. it currently does not but if @@ -953,7 +806,6 @@ - qol: Anesthetics tank description now mentions a rare quirk of anesthetic. - bugfix: fixes a bug which was causing certain mutations to only get partially removed -======= Time-Green: - bugfix: fixes zombie tumor not reviving jlsnow301: @@ -992,12 +844,10 @@ - balance: Delamination variants no longer change once the explosion point has been reached. jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Keybindings in prefs are able to be set again. - bugfix: Fixed the weird spacing on buttons. - bugfix: Confirmation buttons should be usable again. Bitrunning domains, command reports, etc. -<<<<<<< HEAD - balance: Emagged and Hacked APCs now occasionally flicker a blue effect, and the effect is not visible with cameras. - bugfix: Admin interview panel should feel snappier. @@ -1027,7 +877,6 @@ and no longer permanent. - balance: Mimes are back to being able to write while under a vow of silence. - bugfix: character setup screen no longer runtimes with all_nighter quirk -======= tralezab: - qol: Anesthetics tank description now mentions a rare quirk of anesthetic. 2023-12-17: @@ -1056,13 +905,11 @@ - rscadd: Adds a new shuttle event, where space shuttles can experience minor turbulance. Keep your belt on while the appropriate cabin light is lit. lizardqueenlexi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Motorized wheelchairs will no longer spawn in a bugged state where they have no parts and can't be upgraded. - bugfix: Motorized wheelchairs will drop their power cell when destroyed or deconstructed. - qol: Power cells are now inserted into motorized wheelchairs as part of the crafting recipe, instead of as an extra step afterwards. -<<<<<<< HEAD - bugfix: Fixed a rare false positive with morgue tray alarms. - bugfix: fixed the oversight with martian food complexity. - balance: Exosuit Materials 1 now only requires one mech. @@ -1144,7 +991,6 @@ 2023-12-19: GreytideSkye: - bugfix: AI Announcement Help Is Now Not A Malfunction For The Not Black Mesa VOX -======= tralezab: - qol: Added a confirmation prompt to breaking your vow of silence. - balance: Mimes can no longer repair the vow of silence once broken. @@ -1225,13 +1071,11 @@ RedBaronFlyer: - rscadd: Added orange hardhats, hazard vests, and pocket protectors to the cargo drobe ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Seven: - bugfix: Ashwalkers can respawn fellow ashwalkers by bringing them back to their tendril again. - bugfix: Ashwalker tendrils no longer break hooded suits and modsuits. - bugfix: Ashwalkers can sacrifice silicons, it wont give anything though. -<<<<<<< HEAD SkyratBot: - qol: Assistants with <10h of playtime are now "Interns" - admin: Delete painting button is once again visible. @@ -1246,26 +1090,11 @@ - rscdel: Removed Herobrine from the game - bugfix: The bitrunner domain completion screen alert is once again properly clickable - rscadd: Added 2 pocket quick equip keybinds -======= SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: crafting now transfers reagents from ingredients to final product making previously inedible foods (toasted seeds, kasei dango & snow cones) edible. Other crafted food products/items now differ in reagents based on the ingredients required. -<<<<<<< HEAD - - bugfix: Observers observing themselves no longer floods admins' logs. - Thlumyn: - - image: added inhand sprites for towels - zeroisthebiggay: - - rscadd: face scarves for icewalkers -2023-12-20: - Hatterhat: - - balance: Rough stones and stone bricks now have 10 force, up from 0, and 15 throwforce, - up from 0/10, respectively. - LT3: - - admin: Server wide admin announcements now use an alert box like other announcements -======= Timberpoes: - admin: Delete painting button is once again visible. Time-Green: @@ -1287,7 +1116,6 @@ - balance: Disallows siphoning credits outside of station MelokGleb: - image: cyborg tools became animated ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MrMelbert, Ghommie: - bugfix: Alien nests, and some other stuff, can be physically attacked again. - balance: x-mas trees (the ones with presents), are indestructibles. Truly protected @@ -1295,61 +1123,6 @@ Rhials: - bugfix: Icebox escape pods will now land randomly on the surface, instead of only in certain ruins. -<<<<<<< HEAD - SkyratBot: - - bugfix: Fixes runtime from augments not unregistering a signal. - - bugfix: qm's intern id is now "quartermaster-in-training" - - image: qm's id and hud icons now use the cargo tech icons (but blue) to be consistent - with the other heads of staff - - balance: Disallows siphoning credits outside of station - - bugfix: Made Syndicate Stormtrooper and Nuclear Operative TGC card holograms visible - again - - bugfix: Fixed a bluescreen while inputting a global variable in the circuit UI. - - image: cyborg tools became animated - - image: the SpacePol bounty hunters have finally had a new run of Uniforms made, - bringing them back to the forefront of enforcement fashion! Wardens will find - their Police Jackets/Hats have been updated match SpacePol's new look as well. - - bugfix: fixed the Mafia Warden having a hat that didn't match his jacket, and - fixed SpacePol masks not covering the nose - - bugfix: Emojipedia should copy the text on click properly, now -2023-12-21: - KannaLisvern: - - rscadd: Added a new ERP emote. *lewdmoan - Nerev4r: - - rscadd: Due to increased availability of calcium supplements in Sector 13 due - to Deep Spacer lobbying, snailpeople have found their shells to be more suited - towards protection of themselves and their recently-discovered-to-be-binary - hearts in a combat scenario. - - rscadd: Snailpeople have been invited to recent EVA training sessions, and have - learned to attach themselves to the floors if gravity generators go out; who'd - have thunk it? - - bugfix: Snailpeople no longer benefit from Settler's equipment load reduction - while crawling. I could not think of a funny caption for this. - Paxilmaniac: - - balance: Shotgun shells, ESPECIALLY skyrat's shotgun shells, have been rebalanced - to not either be useless or insane in every situation, see pr for details. - - image: New sprites for some projectiles, like flechettes and whatnot - - sound: The sound effect that the arc welder uses has been changed to be less quiet - and more noticable - - balance: SolFed response team equipment has been changed around a bit with the - new armor and whatnot. - - image: SolFed response teams (and cargo imports) can now see a new set of SolFed - uniforms, one for peacekeepers and one for EMTs. No longer do they have to dress - as wild west larpers, or half life HECU. - - qol: The sol rifles have had their names changed so that they suck less to refer - to as characters that don't speak french-afrikaans (coming 2023) - RaShCat: - - bugfix: offsets of items in teshari's paws and worn head - - image: simple redraw of teshari's sabres. - SkyratBot: - - bugfix: fixes some dropdowns not displaying the right text after selecting something - nikothedude: - - bugfix: Unspillable organs no longer spill - vinylspiders: - - bugfix: fixes company imports bluescreen - - bugfix: fixed a bug where certain loadout menu items would duplicate themselves - across tabs -======= jlsnow301: - bugfix: Fixed a bluescreen while inputting a global variable in the circuit UI. - bugfix: Emojipedia should copy the text on click properly, now @@ -1361,32 +1134,11 @@ - bugfix: Examine text on disconnected players is no longer accidentally subtle vinylspiders: - bugfix: fixes some dropdowns not displaying the right text after selecting something ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-12-22: LT3: - qol: Roundstart intercept report and security level announcements are combined into a single announcement Melbert: -<<<<<<< HEAD - - qol: When you place a beaker in a chem-master, you no longer thwack it. - - bugfix: Crewmembers immune to viruses won't be picked by the fake virus event. - Paxilmaniac: - - rscadd: A small series of items have been added to the construction section of - the rapid construction fabricator to allow users to actually... Rapidly construct - things. - - image: Sprites for all of the new things made by me. - Rhials: - - bugfix: Disease Outbreak events will only select players on the station/lavaland - as patient zero. - SkyratBot: - - qol: The bitrunning equipment vending machine now has a unique description for - each of the bitrunning disks - - rscadd: 'Added new quirk: Cyborg Lover!' - - bugfix: Name input in character setup should work properly now. - - bugfix: Many inputs should feel more responsive. - - bugfix: Examine text on disconnected players is no longer accidentally subtle -2023-12-23: -======= - bugfix: Crewmembers immune to viruses won't be picked by the fake virus event. - qol: When you place a beaker in a chem-master, you no longer thwack it. Profakos: @@ -1417,55 +1169,11 @@ after leaving a dark area, meaning it is now possible to dodge lasers. - qol: Nightmares and Shadow People now receive a screen alert when they are in a sufficiently dark location that their abilities are active. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: Gibbing a bot will no longer spawn bloody gibs. Rhials: - qol: Wizard apprentices now spawn on the same tile as the contract that summoned them. -<<<<<<< HEAD - SkyratBot: - - balance: Doing experiments AFTER their tech is researched now gives full 100% - points instead of 66%. - - bugfix: Fixes Holy Water giving you more blood and making you less drunk than - water normally does. - - bugfix: '''A whole bunch of spiders in a SWAT suit'' to ''A whole bunch of spiders - in a MODsuit''' - sqnztb: - - bugfix: blueshift - corrects some request console names, virology's outlet now - sends to space, and R&D now has a proper R&D console instead of a civilian one. -2023-12-24: - BurgerBB: - - balance: Miasma is now filtered through gas mask filters, at medium strength. - ChakatStormCloud: - - bugfix: Synths now properly regenerate blood volume with oil - GreytideSkye: - - refactor: LustWish interns, fed up with 5e Grappling Rules, explicitly clarified - what is a restraint and what is a structure. - Jolly: - - image: Colored labcoats have been GAGSed! Please report any weird oddities on - Github. - - bugfix: The coroners lab coat is no longer offset by one pixel. - LemonInTheDark, Donglesplonge: - - image: Redoes fov "mask" sprites. They're clean, have a very pleasant dithering - effect, and look real fuckin good! - - rscdel: Changed FOV, it no longer hides mobs, instead it blurs the hidden area, - and makes it a bit darker/oversaturated - SkyratBot: - - bugfix: the boozeomat ui will stop duplicating space beer bottles - - refactor: refactored vending machine backend to have unique keys for their data - structures. should fix bugs related to items that happen to have the same name. - - balance: Ai's using the mech domination ability can now eject from the mech - - qol: Head of Security beret added to their garmet bag - - qol: Head of Security bowman added to their locker - - rscadd: Nightmares retain their ability to dodge projectiles for a brief period - after leaving a dark area, meaning it is now possible to dodge lasers. - - qol: Nightmares and Shadow People now receive a screen alert when they are in - a sufficiently dark location that their abilities are active. - - bugfix: Reactions whose temps/ph values fall way below their optimal values no - longer restart & prevents infinite loops. Made reaction code slightly faster - - rscadd: Added new GaGs santahats. -======= SyncIt21: - bugfix: Reactions whose temps/ph values fall way below their optimal values no longer restart & prevents infinite loops. Made reaction code slightly faster @@ -1481,12 +1189,10 @@ - qol: Head of Security beret added to their garmet bag - qol: Head of Security bowman added to their locker Diamond-74: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Injecting yourself twice with a luxury medipen in pressure doesn't runtime and mechs with a cell with no max charge won't runtime. - refactor: Gives hyposprays a var to check if they're fully used up rather than setting total_volume to 0. -<<<<<<< HEAD StrangeWeirdKitten: - config: The headshot is no longer vetted or donor locked vinylspiders: @@ -1539,7 +1245,6 @@ - rscadd: An easier, lazier version of the Arcade app, also found in maintenance. - rscadd: Black market computer disks, which contains programs not readily available to the average assistant. -======= KannaLisvern: - qol: Removed Bluespace Crystals and Diamonds from medical emergency bed's recipe. Rex9001: @@ -1550,75 +1255,11 @@ SSensum: - rscadd: Added weapon recharger boards to designs available to print on sec techfab. Y0SH1M4S73R: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: MOD wearers and internal AIs can pin the individual actions in a MOD circuit module in a similar way to how they can pin modules. Circuit module actions can be pinned from the configuration menu of the circuit - refactor: The MOD action and BCI action components have been merged into one component - the Equipment Action component. -<<<<<<< HEAD - - code_imp: removed excess calls to `update_total()` making reaction code slightly - faster. - - code_imp: removed excessive use of chemical constants (quantisation & rounding - constants) in places where they were not needed i.e. plumbing buffer, reaction - chamber, pyrotechnics & the liver. - - rscadd: You can now look up and down through the IC menu - - rscadd: Adds a mint condition clear PDA to the Goodies menu for 100,000 credits. - - rscadd: Added weapon recharger boards to designs available to print on sec techfab. - - bugfix: Camera console search should update automatically - - bugfix: Autolathe search should now properly show designs - - bugfix: polymorphing into drone no longer gibs - jjpark-kb: - - balance: (dec) ash combat plates are now to be equipped in the under slot rather - than the suit slot - theselfish: - - rscadd: Multiple titles have been added. - - bugfix: You can select Cargo Tech and Shaft Miner, again. - zeroisthebiggay: - - image: bluesec MODsuits. finally goddamn -2023-12-26: - A.C.M.O.: - - rscadd: Added the forked cybernetic tongue to Augments+. - - rscadd: Added the robotic lizard voicebox to Augments+ and the RoboDrobe vendor. - - bugfix: Fixed Personal AI cards, allowing them to wake up from sleep. - Gandalf2k15: - - rscadd: Epsilon alert level. - JungleRat: - - image: Adds a buzzed effect to the left side of half shaved instead of leaving - it bald. - LT3: - - code_imp: Announcement CSS is reverted to TG default - Lutowski: - - rscadd: Void Raptor pharmacy and lab is slightly more spacious and prettier. - - qol: Chem vendor moved from pharmacy to chemistry lab on Void Raptor. - MelokGleb and KREKS: - - image: modified wizard weapon textures - Nikothedude: - - rscadd: Pet owners can now name and describe their pet - SkyratBot: - - refactor: Ghost roles now offer ghosts a clickable poll button. Ghosts can select - a role, deselect it, alt-click it for "Never For This Round", can cancel "Never", - can see the countdown, and can see how many other people are signed up for the - role poll. - - rscadd: Added the 'Coupon Master' program for the PDA. Install it to receive periodical, - redeemable coupons for several cargo packs. Requires NTnet connection and the - messenger enabled to work. - - rscadd: Coupons are no longer only limited to goodies, but may also apply discount - to some other packs as well. - - bugfix: Regal rats (and others), won't be punished by the automute system for - repeating the same command several times. - - bugfix: LUA editor should be usable again - - bugfix: fixing damaged sandy dirt lacking an icon - - bugfix: plumbing rcd ui no longer has any graphical glitches - - bugfix: fixes a potential mob hard del with cardboard boxes - - qol: You can now build multiple pipe layers with the RPD, with just 1 click! - - bugfix: mat container displays correct number of sheets inserted for alloy materials. - - bugfix: remote materials now properly respect the `MATCONTAINER_NO_INSERT` flag. - - code_imp: removes material breakdown flags and related traits. - - code_imp: adds helper proc to insert materials via the remote material component - with proper context. - - spellcheck: changes mutiline text to multiline text in vv -======= jlsnow301: - bugfix: Camera console search should update automatically - bugfix: Autolathe search should now properly show designs @@ -1628,15 +1269,12 @@ structures. should fix bugs related to items that happen to have the same name. 2023-12-25: 00-Steven: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Camera circuits actually print pictures again! - qol: Camera circuits can now take pictures while on a carbon, whether held, hung around the neck, or sneakily hidden in either pocket. When held they try to deposit their pictures into the holder's hands if possible. - bugfix: Camera circuits should now actually use the camera's x axis picture size, rather than using the camera's y axis picture size setting for both axis. -<<<<<<< HEAD -======= A.C.M.O.: - bugfix: Fixed Personal AI cards, allowing them to wake up from sleep. Iamgoofball: @@ -1668,27 +1306,21 @@ to taking this quirk. The cost for this quirk has been reduced from 2 to 0. - bugfix: Fixed integrated circuit UI breaking. jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: AI voice changer UI should show defaults properly - bugfix: NTOS Software Hub should focus on the input immediately now - bugfix: Ore container UI should autofocus on the search bar now - bugfix: Vend-a-tray registration text should display as intended -<<<<<<< HEAD - qol: Wendigo Cave ruin gets an aesthetic refresh - bugfix: Wendigos (Wendigi?) no longer attack corpses - bugfix: fixes a hard del with thrown items - bugfix: Fixed integrated circuit UI breaking. -======= 2023-12-26: 13spacemen: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Canisters now have wires! You can pulse wires to do various canister functions like opening/closing the valve. Make sure it has a cell though. - rscadd: You can rig assembly combos (igniter-timer, prox-signaler, etc.) onto canisters - qol: Canisters now have screentips -<<<<<<< HEAD -======= - qol: You can now build multiple pipe layers with the RPD, with just 1 click! Fikou: - spellcheck: changes mutiline text to multiline text in vv @@ -1712,7 +1344,6 @@ :cl:' SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: debug chem heater now withdraws more than 100 units from its inserted beaker. - bugfix: chem heater has correct overlay when its panel is closed with a screwdriver @@ -1722,7 +1353,6 @@ ui tracking code. Added auto doc for everything. - refactor: removed chem heater tutorial help button & its related reward, chem heater code has been optimized as a whole. -<<<<<<< HEAD Thlumyn: - rscadd: Added and moved some areas in the ghost cafe. - rscadd: Added an icewalker section to the ghost cafe. @@ -1737,7 +1367,6 @@ - rscadd: icecats(?) can now respawn, similarly to ashwalkers zeroisthebiggay: - rscadd: icewalkers can be digitigrade -======= - bugfix: plumbing rcd ui no longer has any graphical glitches - bugfix: mat container displays correct number of sheets inserted for alloy materials. - bugfix: remote materials now properly respect the `MATCONTAINER_NO_INSERT` flag. @@ -1749,12 +1378,10 @@ vinylspiders: - bugfix: fixes a potential mob hard del with cardboard boxes - bugfix: fixes a hard del with thrown items ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2023-12-27: Melbert: - bugfix: Fixed some occasions in which heartbeat SFX will continue on revival for longer than expected -<<<<<<< HEAD Ryll/Shaps: - balance: Yawns are less likely to propagate SkyratBot: @@ -1776,7 +1403,6 @@ SkyratBot: - bugfix: mercury & lithium will no longer make you randomly move outside of cryotubes or in ground less turfs (space, water, lava etc) -======= Mothblocks: - bugfix: Fixed the surgery menu spamming chat messages when on the eyes section of a player with no eyes. @@ -1800,12 +1426,10 @@ - bugfix: mercury & lithium will no longer make you randomly move outside of cryotubes or in ground less turfs (space, water, lava etc) necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - spellcheck: Fixes a typo in chat message when starting a Death Knell with the Vorpal Scythe - admin: Adds logging for the death knell, both when starts and when it is completed successfully. -<<<<<<< HEAD - qol: Add UI screentips to spraycans - rscadd: basic bots can now display their paths on huds - bugfix: medbots can research healing again @@ -1822,7 +1446,6 @@ - bugfix: Off station ORM's can redeem points again. - rscadd: Add 50% graffiti speed boost to tagger quirk - bugfix: Fix time duration of large graffiti not applying properly -======= 2023-12-29: Diamond-74: - bugfix: ai can now tell if it is in a do_after for resisting and will not interrupt @@ -1840,14 +1463,12 @@ when a server crashes. - bugfix: Fixed "was shocked by /datum/component/energized" message. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: reaction chamber open its UI when inserting/removing beakers from it - bugfix: reaction chamber triggers new reactions & updates UI more often during heating - bugfix: instant and normal reactions now get triggered more often so for e.g. more plastic sheets from polymer reactions or more reactions occur when there are multiple reagents present -<<<<<<< HEAD - bugfix: Dear mappers, the light debugger tool no longer deletes dragged wall lights - bugfix: NTOS Messenger should clear on enter now - bugfix: ai can now tell if it is in a do_after for resisting and will not interrupt @@ -1866,7 +1487,6 @@ - bugfix: Poll alert buttons candidate number should be more responsive Useroth: - rscadd: Added a config entry for bypassing the veteran locks on jobs and quirks -======= - bugfix: Off station ORM's can redeem points again. jlsnow301: - bugfix: NTOS Messenger should clear on enter now @@ -1888,7 +1508,6 @@ - spellcheck: Clarified the message when failling to recall a bot. mc-oofert: - rscadd: 69(roughly?) new vox phrases ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 mogeoko: - bugfix: Atmospherics components will now move air into connected pipeline on deconstruction if possible. Otherwise, air will be released to the outside from open nodes. @@ -1898,7 +1517,6 @@ - bugfix: Atmospherics machinery will now share air from nodes after being rotated and reconnected to pipenet. 2023-12-31: -<<<<<<< HEAD Echomori: - bugfix: trying to move up or down while controlling an advanced camera console now properly moves the camera up or down, not your body @@ -1906,7 +1524,6 @@ - bugfix: Fixed BYOND membership status being available to non-BYOND members Melbert: - bugfix: Lizards now show a proper description in the magic mirror -======= 13spacemen: - bugfix: Dimensional anomlies converting airlocks preserves the old name Echomori: @@ -1917,23 +1534,18 @@ GoldenAlpharex: - bugfix: Vending machines now display the proper color customization options and item quantities again! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PapaMichael: - sound: added *gaspshock emote sound effect to felinids Rhials: - code_imp: Unholy water no longer calls parent twice in on_mob_life(). -<<<<<<< HEAD SkyratBot: - bugfix: Dimensional anomlies converting airlocks preserves the old name - bugfix: The transhumanist quirk now should work as intended. -======= SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: chem heater now shows the new value of its buffer dispense volume immediately when it gets changed. - bugfix: debug chem synthesizer now shows the new values of amount & purity immediately when it gets changed. -<<<<<<< HEAD - bugfix: Bot launchpads can deploy cleanbots and medibots again. - spellcheck: Clarified the message when failling to recall a bot. - bugfix: Fixes borg polymorph @@ -1941,22 +1553,17 @@ - rscadd: 69(roughly?) new vox phrases - bugfix: Holodeck monkeys are properly cleaned up now - bugfix: Holodeck monkeys have organs now -======= Time-Green: - bugfix: Fixes borg polymorph - bugfix: Holodeck monkeys are properly cleaned up now - bugfix: Holodeck monkeys have organs now vinylspiders: - qol: makes modal list uis autofocus ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: fishing up a spawner will now give you the spawned item instead of a broken, undeletable spawner object - code_imp: adds a warning to the stack trace when something tries to forceMove() a qdeleted spawner -<<<<<<< HEAD softcerv: - bugfix: fixes the NIF settings menu -======= - bugfix: fixes textarea input boxes not updating on prop change (such as changing tabs) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-01.yml b/html/changelogs/archive/2024-01.yml index 16b55730d2c..2944cfd1420 100644 --- a/html/changelogs/archive/2024-01.yml +++ b/html/changelogs/archive/2024-01.yml @@ -1,5 +1,4 @@ 2024-01-01: -<<<<<<< HEAD A.C.M.O.: - bugfix: Fixed the Automatic Robotic Factory, making its cooldown timers visible to ghosts. @@ -10,7 +9,6 @@ GoldenAlpharex: - bugfix: Vending machines now display the proper color customization options and item quantities again! -======= 13spacemen: - rscadd: Atmos Holofan projectors can be right-clicked inhand to make their holograms more transparent @@ -18,13 +16,11 @@ - refactor: hygeinebots are now basic bots. please report all the bugs - bugfix: fixes hygenebots not being able to patrol - rscadd: hygeinebots can now be controlled by Players ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Refactored the area transformation colossus crystal effect to use the same system dimensional anomalies use. That means the colossus crystal now has access to some dimensional themes (bamboo, plasma, glass) and the dimensional anomaly now has access to some colossus themes (jungle, alien). -<<<<<<< HEAD Nova Sector: - qol: The names and descriptions of every paxilmaniac weapon have been improved to be shorter (names) and mention at least what bullet the weapon fires (description) @@ -88,7 +84,6 @@ your burn mix. - rscadd: Added new lizard variants of existing foods for equality of edibility. - qol: made pickle jars reusable and vinegar craftable. -======= Time-Green: - rscadd: Adds a geared assistant station trait! Spawn with a skateboard, toolbelt or in your favorite bee suit! @@ -126,13 +121,11 @@ the moon opens and the lie shall be slain in pursuit of ultimate truth! - bugfix: Fixes the syndicate delusion not working SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: you can set the chemical reaction chamber temps to 0k again - bugfix: used higher rounding value for reactions thus you get full volumes especially for endothermic reactions(no more 99.99 but 100 units). - bugfix: chem heater now applies heat per reaction step and sends updates to UI more frequently -<<<<<<< HEAD - bugfix: slamming through a glass table while previously on a table no longer gives you a negative offset. - rscadd: A new heretic path opens up! Gaze up at the great sky for the path of @@ -151,7 +144,6 @@ - code_imp: removed unused vars, auto doc procs and cleans up some code in turbine - image: Improved sprites for sailor school uniform - bugfix: Fixed integrated circuit speech logging -======= YakumoChen: - qol: Toggling an armour booster module on a MODsuit now gives a balloon alert making the tradeoffs more clear. @@ -173,7 +165,6 @@ away now, so that you won't slip out of the game screen and close the game tab by accident. Profakos: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: attack_slime is completely gone - refactor: slime lifestate changes now have less boilerplate code - balance: baby slimes do a bit of a less damage on the low end, but all slime damage @@ -185,7 +176,6 @@ - bugfix: slimes can now properly drain basic mobs and simple animals that they can damage - bugfix: slimes can drift in zero gravity -<<<<<<< HEAD Vishenka0704: - admin: The ability to export a part(or z-level) of the map has been added. xXPawnStarrXx: @@ -262,7 +252,6 @@ - bugfix: the eZ-13 MK2 heavy pulse rifle does damage again - spellcheck: Corrects every misspelled 'kenetic' in the codebase. - spellcheck: Fixed punctuation in Luini Amaretto's description. -======= SyncIt21: - bugfix: turbine now shuts itself off when the room apc loses power or if it gets damaged. Also uses a small amount of power for operation of internal electronics, @@ -271,12 +260,10 @@ - qol: adds screentips & examines for turbine - code_imp: removed unused vars, auto doc procs and cleans up some code in turbine Tristrian: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: Throwing things has now a sprite animation forward your target. - sound: Throwing things also has a sound accompagnying it. - spellcheck: Dwarves don't throw things hard like hulks. Instead their throws are described as "flimsily". -<<<<<<< HEAD - bugfix: Having a netpod destroyed will no longer grant you permanent healing. - bugfix: After a raid on the local drug mafia in the sector by TerraGov, the Russian Mobsters no longer have access to easy drugs and as a result are no longer 24/7 @@ -290,7 +277,6 @@ - bugfix: Morgue trays and freezing temperatures will no longer husk bodies - bugfix: Organs outside bodies will properly receive cold damage SkyratBot: -======= Vishenka0704: - admin: The ability to export a part(or z-level) of the map has been added. Watermelon914: @@ -391,7 +377,6 @@ - bugfix: Morgue trays and freezing temperatures will no longer husk bodies - bugfix: Organs outside bodies will properly receive cold damage Mothblocks: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Instead of too much damage to the head beheading someone, it will now split their skull in half. While their skull is open, you can rip out their eyes with your hands. and they will spill their brain out of their head if they @@ -399,7 +384,6 @@ - balance: The Path of Blades ascension will accept either a beheaded person, or someone with their skull split open. - rscdel: Removed the beheading objectives from traitor. -<<<<<<< HEAD - bugfix: Hub shuttle time works correctly - bugfix: Papers no longer crash tgui - bugfix: Biogenerator no longer crash tgui @@ -460,7 +444,6 @@ theselfish: - rscadd: Skyrat races now produce butcher results closer to their ancestors. Cannibals rejoice. -======= exdal: - bugfix: Papers no longer crash tgui - bugfix: Biogenerator no longer crash tgui @@ -491,12 +474,10 @@ scriptis: - refactor: some very large tgui lists (air alarms, all recipes techfab view, techweb view) are loaded on-demand as you scroll, making them not lag so hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2024-01-09: Melbert: - bugfix: '"The sister and He Who Wept" Heretic painting will no longer cause big lag' -<<<<<<< HEAD SkyratBot: - bugfix: Spamming the weld on a robotic part no longer drains the fuel - qol: Ghosts can now view Wanted Status and Sec Records by examining people @@ -509,7 +490,6 @@ SkyratBot: - bugfix: The HoP's cartridge vending machine now sells regular PDAs instead of base command ones. -======= 2024-01-10: 13spacemen: - qol: If you can't heal a body part, you won't get a healing time delay. No more @@ -526,7 +506,6 @@ Ghommie: - bugfix: Fixed misfiring for firearms like tinkered detective revolvers. IndieanaJones: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Dynamic midround rolls will properly consider roundstart players as part of the living population again, allowing antagonists with a minimum population value to spawn when they should be able to. @@ -534,7 +513,6 @@ roles again. - bugfix: Some antagonists which had elements that scale with living station population now function properly again. -<<<<<<< HEAD - bugfix: Ripley MK-Is and Paddys now correctly make incoming projectiles hit the pilot again. - bugfix: Medical records console should be useable again @@ -545,7 +523,6 @@ rather than kill them. 2024-01-11: Melbert: -======= JohnFulpWillard: - bugfix: Refried beans and Spanish rice now lets you take the bowl back after eating it. @@ -559,7 +536,6 @@ - admin: Several types are now more accessible via the "spawn" verb (and friends), meaning you can type 'Spawn" Modsuit' or 'Spawn "Jumpsuit' in the command bar and it'll just give you a list of modsuits or jumpsuits to pick from. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Lionhunter Rifle is now available at the same point as Mawed Crucible, making it available to all paths again. - bugfix: Lock knowledge now goes the correct order. Mark -> Ritual -> Unique item, @@ -571,7 +547,6 @@ it after they are gibbed. - balance: Heretics no longer produce a Bastard Sword upon cult conversion. They are still immune to cult stun and cannot be converted by blood cultists. -<<<<<<< HEAD SkyratBot: - bugfix: Certain areas are now properly protected against grid check. Namely the supermatter should consistently be protected. @@ -606,7 +581,6 @@ - qol: ID cards now set their accounts with Alt-Right click. - bugfix: ID cards now once again have contextual screen tips showing what buttons do what actions. -======= - bugfix: Carps now migrate slightly better, probably. - bugfix: And Poly now talks better, probably. OrionTheFox: @@ -627,13 +601,11 @@ Thunder12345: - bugfix: Pipeguns no longer have floating bayonets vinylspiders: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: if your voice changes (e.g. through a voice changer or changeling mimicry) your runechat will now appear as the mob you are speaking in the voice of - bugfix: when doing emotes with your face obscured, your runechat color will now appear as either that of Unknown or the mob you are wearing the id of (if you are wearing a mask with someone else's id) -<<<<<<< HEAD - admin: Made logging for BSA targeting and firing easier to find for admins. - bugfix: Healing simplemobs with sutures and other stacks works again - spellcheck: Healing mobs with medical stacks like suture and mesh give better @@ -647,7 +619,6 @@ - qol: If you can't heal a body part, you won't get a healing time delay. No more spending 5 seconds healing a body part only to get a "can't heal that" message. - bugfix: Fixed being able to download the contractor program on the syndie store. -======= 2024-01-12: 13spacemen: - bugfix: Healing simplemobs with sutures and other stacks works again @@ -689,85 +660,12 @@ Melbert: - bugfix: Lunar Parade has the potential to break less. Paxilmaniac: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The heat-proof catwalk made by heat-proof rods will go away when a tile is placed on it, rather than sticking around and needing to be removed manually - bugfix: The lighting will not irreparably break on tiles where plating was placed on lava-proof catwalks - code_imp: Some single letter variables and the structure of the code around placing tiles on lava-proof catwalks has been improved -<<<<<<< HEAD - - admin: Added a new admin verb that ends all active weather within the weather - subsystem. - - bugfix: Fixed misfiring for firearms like tinkered detective revolvers. - - bugfix: Dropdowns should be more performant - - code_imp: removed a dupe trait entry in the traits_by_type list - - bugfix: The deployable component will now actually stop rotating things when the - variable to not do that is set - - balance: Nightmare's Light Eater can now stun targets under certain conditions. - - image: New liquid plasma sprites from SS14! - aKromatopzia: - - rscadd: dept armband sprites for teshari - - rscadd: allergy dogtag sprites for teshari - thegrb93: - - rscadd: Borg dominatrix module to lustwish that gives them some dominatrix toys -2024-01-14: - LT3: - - bugfix: Tramstation east APC will no longer be destroyed when the tram crashes - - qol: Tramstation central power and disposals moved out of the wall - thegrb93: - - rscadd: Blood filter to medical borg - - rscadd: Added cherry jelly and vineger to service borg shakers - - rscdel: Remove redundant service borgshaker -2024-01-15: - Melbert: - - bugfix: Anomalies spawned by grand ritual runes sound act more like anomalies - SkyratBot: - - bugfix: Rat King's abilities no longer require the user to click twice in order - to activate them. - - admin: Confirming that you have read an admin message now uh, works. it's been - 2 years bros - - bugfix: Animals enlargened by the fugu gland are now visually aligned with the - turf they're standing on. - - qol: The combat mode toggle button is now present on the HUD for simple and basic - mobs. - - bugfix: chem heater with empty buffers can be refilled again - - bugfix: Changeling eggs laid by headslugs work again - - bugfix: Changeling egg incubation times should feel much more consistent, hatching - after 4 minutes - - bugfix: Borg tools that hold and use specific items now work correctly again. - - bugfix: Fixed round event controller pirate spawns. -2024-01-16: - Gandalf2k15: - - qol: For all the mappers out there, stationary batteries come with pre-charged - variants now for mapping use - - bugfix: SMES can now be deconstructed normally again - - code_imp: The flatpacked stationary batteries have much more readable power amounts - now - - qol: Much like their non-powertool counterpart, powered drivers on wirecutter - mode can now snip cablecuffs. - - bugfix: Deployable thermomachines now correctly put their pipe's visual direction - the right way - - bugfix: Silicon temp ftext overlay now works - - bugfix: Silicon temp ftext popout window now works - LT3: - - bugfix: Fixed missing power cable outside Tramstation medbay - Melbert: - - bugfix: Fixes some eldritch painting messages having no chat span - - bugfix: Fixes eldritch painting messages triggering before the examine, making - it hard to see - - bugfix: Fix beauty eldritch painting doing nothing to heretics who examine it - SkyratBot: - - bugfix: Poppers (like the prefs menu options) shouldn't be hidden beneath the - character preview anymore. - - bugfix: Sections will be more polite by not stealing focus from Input boxes in - TGUI -2024-01-17: - SkyratBot: - - qol: Using a Lawyer badge in your hand now shows a thought bubble with the badge, - rather than giving a lousy message in your chat. - - image: the plumbing chemical splitter no longer has a wrongly rotated direction -======= - bugfix: The deployable component will now actually stop rotating things when the variable to not do that is set - bugfix: The "required_container_accepts_subtypes" variable on chemical reactions @@ -806,39 +704,11 @@ - bugfix: chem heater with empty buffers can be refilled again 2024-01-16: 00-Steven: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Signers no longer use the wrong verb when speaking directly into a radio for the first message after toggling sign language. - refactor: Moved the updating of verb variables into a new method which is called earlier in living's say, which should avoid this happening for other things which updated their verbs the same way. -<<<<<<< HEAD - jjpark-kb: - - rscadd: the bluespace miner will now produce more sheets depending on the matter - bins' tier - - rscadd: the bluespace miner is now also found through bepis-tech - - rscadd: the bluespace miner is now wrenchable, it won't work unanchored though -2024-01-18: - SkyratBot: - - refactor: Refactored Ore Silo Ui. - - bugfix: Immobile shells no longer work regardless of anchor state if you put the - circuit in while it's unanchored. - - bugfix: Immobile shells properly propagate their on/off state after wrenching - to inner modules. - - refactor: Implant pads now use TGUI - - bugfix: Radiation shelters (wherever they are) will protect against nebula storms - - image: Resprited several fishes, and the aquarium. - - refactor: Ice cream vats now use a radial menu instead of an HTML one. - - bugfix: fix bileworm ai going insane after eating someone - - bugfix: Lock heretics may once again access 'the relentless heartbeat' after purchasing - 'burglars fineness'. - - bugfix: Bystanders will no longer think they've pulled out a victim's eyes after - seeing someone else do it. - - qol: They will also be able to tell when someone starts pulling out a victim's - eyes. - - code_imp: slightly cleans up dance machine code - - bugfix: disco dances are less comparable to having a seizure -======= 13spacemen: - code_imp: Hub status shows if server is restarting, starting, time to start. The "Time" is more accurate and based on roundstart now @@ -858,14 +728,11 @@ Time-Green: - bugfix: Radiation shelters (wherever they are) will protect against nebula storms Voudez: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Players are now able to see in chat when they are being hit by obj/machinery, got crushed into dense turf or get hit by thrown non carbon mob. - admin: Scenarios like mob hits dense turf, obj/machinery hits mob, item without "living thrower" hitting mob, mob gets hit by thrown non carbon mob now appear in logs. -<<<<<<< HEAD -======= ZephyrTFA: - bugfix: Autolathes no longer allow you to duplicate materials at higher levels of stock parts @@ -917,7 +784,6 @@ - qol: They will also be able to tell when someone starts pulling out a victim's eyes. Ghommie: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Most fishing rods come with a hook and line preinstalled. Fishing toolboxes come with separate reel and lines as usual. - balance: Fishing hooks are now required to fish. @@ -936,31 +802,7 @@ - bugfix: Reeling in items (and mobs) now respects movement resistance and anchorage. - bugfix: Fixed the fishing rod equipment UI being too small to fit its components. - sound: Reeling in something now plays a sound. -<<<<<<< HEAD -2024-01-19: - SkyratBot: - - code_imp: removed the timeout_mod arg from add_mood_event, which was only used - for one thing and causes more issues than it's worth - - bugfix: Moodlets with parameters/effects e.g. limb reattachment moodlets should - probably disappear more appropriately. - - code_imp: Hub status shows if server is restarting, starting, time to start. The - "Time" is more accurate and based on roundstart now - - bugfix: Autolathes no longer allow you to duplicate materials at higher levels - of stock parts - - qol: Autolathes now show name instead of typepath when selecting a custom material - - qol: Autolathe now print out items one by one instead of waiting for all of them - to print at once - YakumoChen: - - rscadd: New cannibal "chicken" sandwich made from vox and teshari - - bugfix: Gave birdman and aquatic meat proper food types - theselfish: - - rscadd: Paper ERPers rejoice. You can now stamp stuff in the Cafe. -2024-01-20: - SkyratBot: - - bugfix: fix a runtime when loading ghosts to a mulebot -======= - image: Resprited several fishes, and the aquarium. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Shields (and pillows) can be used to shove people around the same way barehanded right-clicking does. Xenos and borgs can actually be moved this way. - rscadd: Added a new MODsuit module, the bulwark module, which prevents knockdown @@ -974,7 +816,6 @@ - balance: Riot shields can tank a lot more damage against melee weapons, but less against bullets. - qol: strobe shields can now be used to bash people while combat mode is on. -<<<<<<< HEAD - bugfix: Hub time should be correct again - image: The "One Lean, Mean, Cleaning Machine" achievement now has its own icon. 2024-01-21: @@ -1031,7 +872,6 @@ - bugfix: Nanotrasen is now stocking proper french Cognac instead of discount Irish Cognac. It will now taste Smooth and French - bugfix: fixed some visual artifacts from achievement icons. -======= JohnFulpWillard: - refactor: Implant pads now use TGUI - refactor: Ice cream vats now use a radial menu instead of an HTML one. @@ -1056,13 +896,11 @@ Ben10Omintrix: - bugfix: fixes megafauna AI getting stuck attacking some corpses Ghommie: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Modular Computers now support integrated circuits. What can be done with them depends on the programs installed and whether they're running (open or background). - rscadd: Modular Consoles (the machinery) now have a small backup cell they draw power from if the power goes out. -<<<<<<< HEAD - bugfix: Wagging tail spines now sync up properly with the tails they're attached to. 2024-01-24: @@ -1083,7 +921,6 @@ - bugfix: Losing control of a limb now sounds less weird in chat - bugfix: Fixed AIs who shunt to APCs causing their laws to be deleted. SkyratBot: -======= - image: The honkbot now looks up to date. - bugfix: Fixes how the aquarium looks. JohnFulpWillard: @@ -1146,13 +983,11 @@ - bugfix: pAI cards can now be ejected from a PDA when there is no pAI inhabiting it. - bugfix: Moved the curator's treasure hunter fedora up by a single pixel. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Contractor support units now don't have flavortext telling them they work for someone else but their agent. - bugfix: Contractor support units now comes in an antag spawner (like syndicate monkey, nukie borgs/reinforcements). - bugfix: Syndicate monkeys now get their monkey antag datum. -<<<<<<< HEAD - bugfix: pAIs downloaded while in a PDA now gets the action button to control said PDA. - bugfix: pAI cards can now be ejected from a PDA when there is no pAI inhabiting @@ -1164,7 +999,6 @@ - bugfix: fixes a spurious CI failure from do_charge() signal overrides - bugfix: Moved the curator's treasure hunter fedora up by a single pixel. - bugfix: Missing fire alarms added to several rooms on Birdshot -======= LT3: - bugfix: Server announcements again no longer escape HTML by default Melbert: @@ -1232,7 +1066,6 @@ cost rather than being nullified, meaning they are now recyclable. - code_imp: all custom materials are now integer values. Improved code for how materials are used in techfab & auto lathe for printing ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: added more screen tips & examines for ore silo, made UI wider, attach location name to each machine & grey out paused machines to make it more noticeable. - code_imp: auto docs proc & vars for silo log entry. Fixed return values of all @@ -1240,7 +1073,6 @@ - bugfix: ore silo UI now functions correctly after removing an entry from the UI - bugfix: no runtimes when connecting a machine to silo that was previously disconnected via the ore silo UI -<<<<<<< HEAD - bugfix: reactions that create multiple reagents now terminate without looping endlessly. - bugfix: oatmeal reactions now terminate & produce the right quantity of results @@ -1298,7 +1130,6 @@ any mob. - bugfix: Oppenheimer, the nukie medbot, has been reprogrammed to use Airplane Mode as a factory default. The station AI is no longer immediately aware of his presence! -======= - refactor: chemical reaction tester in runtime station has been remastered from ground up. intercepti0n: @@ -1326,12 +1157,10 @@ LT3: - bugfix: Emergency shuttle console now only works while on the emergency shuttle SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - spellcheck: shortened description for the PCM and capitalized some text for its examines. - code_imp: adds sanity checks and removed deprecated `content` tag from PCM UI. Stops hologram items from being inserted. -<<<<<<< HEAD - spellcheck: You no longer fail to find "a anything" when swabbing something for cytology that doesn't have swabbing results. - bugfix: Cats can be swabbed for feliform cells again. @@ -1385,7 +1214,6 @@ - bugfix: Port Director now spawns with Port Director ID card - bugfix: Port Tarkon Residents spawn with Crowbars to fix lack of them in map, and it makes sense. -======= VladinXXV: - bugfix: Oppenheimer, the nukie medbot, has been reprogrammed to use Airplane Mode as a factory default. The station AI is no longer immediately aware of his presence! @@ -1466,4 +1294,3 @@ distributivgesetz: - bugfix: All Within Theoretical Limits should properly unlock now when the crystal comes back from the countdown. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-02.yml b/html/changelogs/archive/2024-02.yml index 39223b1fd57..1cbd80818f5 100644 --- a/html/changelogs/archive/2024-02.yml +++ b/html/changelogs/archive/2024-02.yml @@ -1,47 +1,15 @@ 2024-02-01: -<<<<<<< HEAD - LT3: - - bugfix: ID card examine text shows how to set your linked bank account - - bugfix: ID card withdrawal from an unassigned account will ask if you want to - link an account - - bugfix: Tram power consumption will no longer will randomly drain APCs - - bugfix: Tram power moved to area based rectifiers - Melbert: - - bugfix: Fixed ore vent descriptions looking weird sometimes - - bugfix: Fixed being able to scan an ore vent multiple times at once - - bugfix: Fixed gaining scan points from scannning an ore vent without finishing - the scan - SkyratBot: - - bugfix: Cult pylons will no longer cover up "open space" (or water) with cult - floors - - bugfix: fixed ore vent's well being drawn over ash storm. - - bugfix: makes the experiment chamber in syndicate lavaland base no longer explode - when testing grenades - - code_imp: added the code that allows the image overlays to work for the circulator - (teg) - - image: changed circulator's (teg) fast/slow turbine sprite - - image: added an anchor, panel, and flow overlay for the circulator (teg) - - bugfix: Cultists can now vote for a Cult leader again. -======= Donglesplonge: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: the top and top righthand doors of northstars cargo mail sorting room now use any supply general, mining, and bitden access, and the top righthand door no longer says its mining decontamination and uses the proper mail sorting room airlock instead. -<<<<<<< HEAD - bugfix: All Within Theoretical Limits should properly unlock now when the crystal comes back from the countdown. -======= - JohnFulpWillard: - - balance: Pirate suits can now hold the laser musket and smoothbore disabler. - - bugfix: Cultists can now vote for a Cult leader again. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Slimes using Feed while buckled now stops feeding. - bugfix: Slimes are no longer prompted to feed off of dead people. - bugfix: Slimes that can only feed onto one person now immediately feeds off of them. -<<<<<<< HEAD - balance: Pirate suits can now hold the laser musket and smoothbore disabler. - rscadd: '[IceBox] Botany now has a service accessible bio generator' - qol: '[IceBox] Kitchen and service hall rearranged' @@ -102,21 +70,13 @@ 2024-02-05: LT3: - bugfix: Fixed alt-click validation for tram interactions -======= K4rlox: - bugfix: makes the experiment chamber in syndicate lavaland base no longer explode when testing grenades ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - refactor: Jukebox has been refactored. Jukebox music now updates as the player moves, mutes when the player is deafened, and overall sounds wayyy better. You can also now toggle song repeat on jukeboxes. -<<<<<<< HEAD - SkyratBot: - - sound: The Guide to Advanced Mimery book series now only make a very faint noise - when turning their pages, in order to match their description - - bugfix: burning a bible no longer gives you INFINITY curses -======= ZephyrTFA: - bugfix: Meteor Satellites no longer erroneously count every piece of paper as a protected turf. @@ -174,40 +134,11 @@ Swiftfeather: - qol: Increased threshold of trace n2o required to make euphoria and giggles happen. Xander3359: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Contractor baton costs 7 TC (down from 12 TC) - balance: Midroll/Latejoin traitors can no longer buy the baton, they must buy the whole kit - bugfix: Midroll/Latejoin traitors no longer have access to roundstart traitor exclusive items -<<<<<<< HEAD - - qol: Increased threshold of trace n2o required to make euphoria and giggles happen. -2024-02-06: - Melbert: - - bugfix: Tinacusiate should break less, and break less things - - bugfix: Speaking to a Sign Languager with Tinacusiate in your system doesn't mess - with their text, because they're not speaking. - SkyratBot: - - rscadd: Reading a newspaper will conceal your identity. - - qol: portable air pumps, scrubbers, heaters, canisters, liquid tanks, and racks - are now climbable. - - bugfix: you may no longer altclick ethereal disco balls while unconscious to anchor/unanchor - - bugfix: you may not toggle health assemblies from any range, even while crit - - bugfix: fixes contractor abduction RRing people in the offmap hideout without - any feedback. You might not like how it turns out, but your body will get back - to the station now. - - bugfix: you may no longer altclick tape recorders at range to play them - - bugfix: you may no longer rip pillow tags at range without telekinesis or crit - or any other time you shouldnt be capable of it - - bugfix: Making a mob sentient no longer gives you all of their factions. - - bugfix: fixes a runtime in AI search_tactic - xXPawnStarrXx: - - qol: changed robotic repairs to use crowbar/wirecutters instead of welder/wire -2024-02-07: - xXPawnStarrXx: - - rscadd: Added Alien toolset implants. -2024-02-08: -======= 2024-02-05: Xander3359: - bugfix: burning a bible no longer gives you INFINITY curses @@ -223,15 +154,12 @@ - bugfix: Making a mob sentient no longer gives you all of their factions. - rscadd: Mothic Fleet Rations now no longer get dirty or decompose if left on the floor, due to their wrappers. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - bugfix: When placing an item into storage (such as backpacks), all nearby mobs now get a message, rather than just the first mob. - bugfix: TGC decks of cards should act a bit less odd when looking inside. - refactor: Refactored a bit of storage, cleaned up a fair bit of its code. Let me know if you notice anything funky about storage (like backpacks). -<<<<<<< HEAD -======= - bugfix: Tinacusiate should break less, and break less things - bugfix: Speaking to a Sign Languager with Tinacusiate in your system doesn't mess with their text, because they're not speaking. @@ -289,85 +217,11 @@ - bugfix: The object overlay circuit component will no longer take things with it. OrionTheFox: - image: fixed some minor icon inconsistencies on the White Suit and Tan Suit ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PapaMichael: - bugfix: tramstation isolation cells now properly open on their timer. Rhials: - balance: Wallmounts now respect cameranets, and cannot be accessed from a view of the adjacent wall. -<<<<<<< HEAD - - bugfix: You can no longer convert assassination targets to your blood brother - team. - SkyratBot: - - bugfix: Science Xenos no longer turn the entire roundend report into bold letters. - - bugfix: Automated IV drips will now be on the layer set by the plumbing constructor - when created. - - balance: RD and QM coats can hold telebatons now - - qol: Quartermaster's coat can hold items that a normal jacket can hold, such as - small oxygen tanks - - bugfix: Being consumed by the flesh of the necropolis while inside a cryo tube - will no longer convert the tube into a legion spawn point until the tube is - destroyed - - rscadd: Mothic Fleet Rations now no longer get dirty or decompose if left on the - floor, due to their wrappers. - - bugfix: smoothed out a few asymmetries in the heretic research tree - - image: fixed some minor icon inconsistencies on the White Suit and Tan Suit - - bugfix: removed ability to buckle megafauna, constructs, blob minions, dragons, - and slimes. - - qol: You no longer need to manually set the CC Commander's Headset to high-volume. - - spellcheck: Mechs that have been renamed now are proper names, so are not described - as 'the' mech. - - bugfix: you may no longer reset autolathe drop direction at times when you shouldnt - be able to - - rscadd: Paradox clones now have a bluespace stream instead of a syndicate poster - as their ghost poll icon. - - bugfix: deleting objects with local material storage(autolathe, drone dispenser - etc) no longer drops sheets, they only drop materials when deconstructed - - bugfix: Icebox should have it's ore distribution and it's ore vents fixed, so - that vents should now produce ore. - - spellcheck: Boulder processing machines now don't mention things they don't do. - - bugfix: reactions now compute purity of reagents based on their volume, meaning - larger amounts of reagents created will have more significant effects on the - final purity of the solution - - bugfix: Regenerative Materia blobs can no longer drug non-carbons. - nikothedude: - - balance: Coagulants now work on electrical damage -2024-02-09: - LT3: - - bugfix: SM cascade delam messages no longer display to clients not in game - Lutowski: - - rscadd: Void Raptor's Kitchen is renovated and more spacious. - - bugfix: Void Raptor Mining Dock should have air again. - - rscadd: The barbers have been hard at work! Emo Long & Gloomy Bangs hairstyles - are updated to modern standards. - Majkl-J: - - qol: Synths now use their ID slot as their internal computer's slot - - code_imp: Added COMSIG_HUMAN_UNEQUIPPED_ITEM for handling human unequipping - Melbert: - - bugfix: Krav Maga users can shove again - - bugfix: The object overlay circuit component will no longer take things with it. - - bugfix: Fixed Puncture Repair surgery not having surgical sounds - - bugfix: Fixed Surgery Initiator potentially showing invalid surgeries - SkyratBot: - - qol: Added a new head-only target hotkey, unbound by default. - - bugfix: fix heretic's rust mark failing to damage any items if the victim has - any container on them with another item inside, and maybe other bugs of similar - nature - - bugfix: Fixed text effects for runechat messages (the stuff enclosed in +, | and - _ characters). - - spellcheck: Improved the tip for say/text effects. - - bugfix: blood brothers should now properly succeed in converting non-targets - - bugfix: ash mark now properly lowers the cooldown of mansus grasp when triggered - - bugfix: Meteor Satellites no longer erroneously count every piece of paper as - a protected turf. - - bugfix: As a result the station goal is slightly more difficult - - bugfix: Xenomorphs now have legcuffs applied to them properly. - - rscadd: Ghost hair looks better now. Insert nerd shit about RGB vs HSL color space - here, go watch a youtube video or whatever. - - bugfix: Fixed some things in Ice Box's gas station ruin - - rscadd: Adds some things in Ice Box's gas station ruin - - bugfix: icebox ore generation underground is normal again -======= SyncIt21: - bugfix: reactions now compute purity of reagents based on their volume, meaning larger amounts of reagents created will have more significant effects on the @@ -377,49 +231,12 @@ - bugfix: smoothed out a few asymmetries in the heretic research tree - bugfix: ash mark now properly lowers the cooldown of mansus grasp when triggered Zargoar: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'Adds in the Red Mons, The Wizard, The Rune and MOTHS-MOTHS-MOTHS bar signs from the bar sign contest. Congratulations to the winners!' - image: Adds in the Red Mons, The Wizard, The Rune and MOTHS-MOTHS-MOTHS bar signs from the bar sign contest. -<<<<<<< HEAD - - qol: The barcode scanner is now part of computer tech and can be printed at the - service techfab. - - bugfix: Instant reactions yield reagent results again - - bugfix: fixes ghetto surgery by gently adjusting time sensitivity cap and making - the cleaver not unintuitively bad at bone-sawing. - - qol: Service personnel now show up in green in the crew monitor console. - - bugfix: you may no longer altclick unanchored toiletbongs from any range in any - condition to rotate them - - bugfix: Alien Hunter's pounce ability no longer has any weird offset issues once - the pounce is completed. - Wallem: - - rscadd: Adds a new suicide_act() to the smite spell - nikothedude: - - bugfix: Synth wound oscillations will no longer cause you to reel from impacts - if there were no impacts - - balance: Synth blunt wounds are now faster to treat - - balance: Wirecutters on electrical damage have been streamlined and are always - fix 4x more than suturing - - balance: Synth wound oscillations now have a minimum of 3 seconds between each - oscillation - - bugfix: Synth burn wounds now apply scars - - spellcheck: Certain synth wounds have been rewritten - optimumtact, whomst didn't write this CL entry.: - - bugfix: Fixed the colorful lights of the ethereal disco ball. -2024-02-10: - Majkl-J: - - bugfix: Fixed oversight forcing people to use 200u of rezadone on linghusks - Melbert: - - bugfix: You know that one bug that makes the cryo cells on Deltastation unusuable? - Well it's not fixed but at least those cryo cells are usuable again, maybe at - the cost of another station's cryo cells. Who knows! - - bugfix: Fixed Finger Guns giving a misleading chat message - - bugfix: Fixed some situations in which you couldn't interact with heretic runes - SkyratBot: -======= cnleth: - balance: RD and QM coats can hold telebatons now - qol: Quartermaster's coat can hold items that a normal jacket can hold, such as @@ -457,7 +274,6 @@ Swiftfeather: - qol: Added a new head-only target hotkey, unbound by default. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: adds screentips & examines for screwdriver & crowbar acts & alt click. - qol: techfabs can now use the mouse drop functionality to set drop target. - qol: lathe printing animation plays on loop while printing rather than flicking @@ -471,37 +287,6 @@ each time. - code_imp: autodoc for some vars & procs, merges procs. - refactor: Optimized code for autolathe & techfabs in general. Report bugs on github -<<<<<<< HEAD - - bugfix: Species that can eat mice don't get disgusted from seeing one in the toilet - bong. - - rscadd: Grabbing an unwrenched statue/mannequin/skeleton model will now move its - direction as you move yours, and you can talk through it. - - bugfix: The HFR now provides the max temperature for recipes - - bugfix: the crystallizer now provides the dangerous object created instead of - itself in admin logging - jjpark-kb: - - qol: lowpop ss will only modify default smes settings - nikothedude: - - rscadd: Dinitrogen Plasmide, a chem used to cool synthetic burns. Does not have - the side effects of hercuri, making it safer to use. - softcerv: - - rscadd: Adds mechanical vore preferences - - rscadd: Adds taste/smell character preferences along with verbs to taste/smell - others that have text set. -2024-02-11: - LT3: - - qol: Health analyzer will now display blood alcohol content - Melbert: - - balance: Rats are now 5x less likely to decide to eat a cable when idling. (1%, - down from 5%) - SkyratBot: - - admin: remade everyone is traitor into everyone is antag in secrets panel - - bugfix: Now falsewalls visually don't close when they shouldn't. - - rscadd: Changeling's reviving stasis ability now puts you in stasis. - - bugfix: Bolas in your pockets no longer slow you down. - - rscdel: Removes halloween screen tint, we're taking him to retire by the seaside - (he was alone and unloved) -======= ViktorKoL: - bugfix: fix heretic's rust mark failing to damage any items if the victim has any container on them with another item inside, and maybe other bugs of similar @@ -512,23 +297,10 @@ - bugfix: icebox ore generation underground is normal again 2024-02-10: 00-Steven: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: As they should've for a while, screwdrivers (cocktail) actually work as screwdrivers (tool). - sound: The screwdriver cocktail also actually plays the screwdriver sound when used. -<<<<<<< HEAD - - rscadd: settlers can rename their pets -2024-02-12: - Atlasle, JohnFulpWillard: - - rscadd: Adds the Touchy quirk, you need to be next to something to examine it, - for 2 extra quirk points. - Melbert: - - bugfix: Lipoplasty is An Option again - - qol: Glasses colors should be a lot less harsh, and being blind no longer also - blinds your hud. - - bugfix: Lavaland Beech Bartender's clothing storage is named the right thing now -======= 1393F: - bugfix: The HFR now provides the max temperature for recipes - bugfix: the crystallizer now provides the dangerous object created instead of @@ -575,19 +347,14 @@ down from 5%) - refactor: Fire effects get added to mobs in a different way now. Maybe it will get stuck less. Report any oddities. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Freedom Implants and Biodegrade can you free you of the shackles of knotted shoes. - rscadd: Shaft Miner's Bluespace Survival Capsules will now throw people away from it when it deploys. Be sure to heed the warning to "Stand back". -<<<<<<< HEAD - Rhials: -======= Momo8289: - rscadd: Fire ants can now be scooped up and used as a chem like normal space ants Rhials: - bugfix: You can now refine ectoplasmic raw cores at the implosion machine thing. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Beacon and Teleport Blocker implants have been moved from cargo to the security lathe. - balance: A new research node has been created, requiring Subdermal Implants and @@ -596,53 +363,6 @@ basic cybernetic implants. - bugfix: The Energy Cake slice now does its on-eat effect AFTER being eaten, instead of before. -<<<<<<< HEAD - - bugfix: You can now refine ectoplasmic raw cores at the implosion machine thing. - - bugfix: The beach bar virtual domain's bar closets no longer have default locker - doors. - SkyratBot: - - bugfix: lathes now use moderate power for printing operations - - bugfix: The wizard's pets Jimmy and Jommy no longer fight to the death. - - rscadd: Shakers can now pour drinks with custom names and descriptions! Alt-click - the shaker to enable this. - - rscadd: Fire ants can now be scooped up and used as a chem like normal space ants - - bugfix: You can now click things as an alien larva again. - - bugfix: Bar bots asking for Cucumber Lemonade now gives you money for completing - it. - - bugfix: deathtrap recycler can now be moved. - - refactor: moved check for NO_DECONSTRUCTION flag to be inside can_be_unfasten_wrench, - allowing us to set specific machines to be movable but not deconstructable. - - bugfix: Space Dragon's carp allies no longer turn the entire roundend report into - bold. - - bugfix: Uplinks now update their UI when you add telecrystals in them, so you - don't need to close and reopen it. - - code_imp: added an IS_CHANGELING() helper and used it where applicable - - balance: Contractor kit no longer gets RNG items, it's a specific pool now - - bugfix: Fix succumb last words being double-encoded (i.e `i'm` becoming `i'lm`) - - bugfix: The shove blocker module parent type now has the correct typepath. - - bugfix: Sculpted statues stop including light layers. -2024-02-13: - Melbert: - - bugfix: You can once again see love on Valentines Day - Rhials: - - qol: Map hazard anomalies are no longer treated as points-of-interest in the orbit - menu. - - qol: Venus Human Traps are now visible in the orbit menu. Cool! - - bugfix: Spawning as a Venus Human Trap now properly gives you an antag datum/objective. - - bugfix: Venus human trap flowers no longer have a second, identical flower under - themselves. - SkyratBot: - - bugfix: Fixes backwards engines in a few of centcom's ferries! - - rscadd: 3 new masks for your characters (thanks to Kovac for the scarf sprites) - - bugfix: Fixes fancy lights not updating their source location when picked up and - moved - - bugfix: You can now use bluespace launchpads from shuttles (except cargo and ferry - shuttles) - - bugfix: Separated logs list into pages in ore silo UI, thus fixing lag when logs - list grows too long. - - bugfix: Paperwork should actually use the writing utensil's font, colour, and - boldness outside of input fields again. -======= - bugfix: The beach bar virtual domain's bar closets no longer have default locker doors. SyncIt21: @@ -696,7 +416,6 @@ MelokGleb and KREKS, McRamon, Ghommie: - image: New sprites for changeling powers and items. Woooh. Rex9001: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Smile of the moon's effects now last for longer and have a longer minimum active time - balance: Mark of moon detonations now do sanity damage @@ -704,8 +423,6 @@ a lunatic. - qol: People inside the ascended moon heretics sanity draining aura now gain an effect under their tile. -<<<<<<< HEAD -======= Rhials: - qol: Venus Human Traps are now visible in the orbit menu. Cool! - bugfix: Spawning as a Venus Human Trap now properly gives you an antag datum/objective. @@ -724,105 +441,11 @@ - bugfix: Separated logs list into pages in ore silo UI, thus fixing lag when logs list grows too long. siliconOpossum: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Getting blood on your hand when you only have one no longer makes your hands visually permanently bloody - bugfix: Holding bloodied gloves no longer makes your hands look bloody, bloodied gloves now look bloody when worn, and damaged gloves now look damaged when worn - bugfix: Gaining or losing an arm now correctly updates your hand overlays -<<<<<<< HEAD - - bugfix: Fixed stamps not accounting for scroll offset. You can actually stamp - paperwork properly without using accursed knowledge again. - - bugfix: Fixed PDA messenger not scrolling to the bottom when a new message gets - sent. - - balance: Brainwashed individuals can no longer be debrainwashed through a mindshield - implant, they still protect you from brainwashing though! You just need to get - medical to fix them up. -2024-02-15: - Rhials: - - spellcheck: Some space ruin area names have been made more distinct. - SkyratBot: - - bugfix: Revenants (and other flying mobs) will not make noise when walking into - pools of gibs, - - bugfix: knit flesh now heals organs as intended, and does not cause its victims - to be red forever if interrupted - - spellcheck: knit flesh chat messages are no longer gramatically incorrect -2024-02-16: - CandleJaxx and Iamgoofball: - - bugfix: Fixes Krav Maga allowing pacifism bypasses. - Melbert: - - bugfix: Valentines no longer see themselves covered in hearts. They only see their - Valentine covered in hearts. - Rhials: - - bugfix: Ghost role polls should spam you less when multiple of the same roll occur - in succession. - SkyratBot: - - rscadd: AI's acceleration now smoothly decays, instead of just falling back down - to 0 after 0.5 seconds - - bugfix: AI's standard movement (non accelerated) is smooth now, instead of constantly - jumping around - - bugfix: AIs will now follow their targets more closely, shouldn't have any issues - with them lagging behind anymore - - admin: admins/maintainers can now make the profiler focus on specific subsystems - by setting the subsystem var profile_focused to TRUE - - rscadd: In an attempt to stop the greytide, NanoTrasen has increased security's - baton energy output. This has, through testing, done nothing but make the device - spark more than it used to. - - balance: Nightmare's Light Eater takes less time in jaunt to gain a critical strike, - being reduced to 7 seconds from 15 seconds. - - refactor: Fucks with how movement keys are handled. Please report any bugs - - balance: Maintenance drones now can use RPED, RCD, Holosign, and Spray bottles - - bugfix: heretics no longer lose their spells when returning from a shapeshift -2024-02-17: - Majkl-J: - - bugfix: Welding self no longer fires an extra delay of 1 second that shouldn't - be applied - Melbert: - - rscadd: Wizards have a new mobility option available, the Telegram Scepter. The - ability to travel anywhere you can see at the point of a wand... but at a price? - SkyratBot: - - rscadd: Your mouth now fits combat or survival knives(it's totally safe) - - qol: The bitrunning quantum console UI now lists domains in tabs by difficulty. - - qol: adds examines & screentips for ore box - - code_imp: cleans up some procs for ore box - - spellcheck: corrected description & ui notice of ore box to specify it can hold - boulders too - - bugfix: Tank spider corpses should no longer be conditionally invisible - - balance: Oxandrolone now scales with purity. Its default purity is 100% - - balance: Salicylic acid now scales with purity. Its default purity is 100% - - bugfix: cargo lockboxes update iconstates correctly now - - bugfix: Space cats CAN into space. (They're back to surviving being in unsuitable - atmos.) - - bugfix: Blob Zombies now render their blob heads correctly again. - - bugfix: Indestructible items like the pai card don't teleport to the ore silo - when you insert them into silo linked machine & also displays a message saying - it was rejected. - - bugfix: Restorative Nanites now heal Slimepeople just as well as they do other - people. - - balance: assemblybombs are bulky - mogeoko: - - bugfix: Thermomachines now reconnect to pipes on multitool's act. - - bugfix: Multi-deck connectors won't connect pipes not located in front/top/bottom - of it. -2024-02-18: - GoldenAlpharex: - - bugfix: The Spawners menu now accurately displays the amount of uses left in each - spawner option, taking into account individual spawners that either allow more - than one use, or an infinite amount of uses. - Melbert: - - bugfix: Lifeline can no longer track mobs with suit sensors off - SkyratBot: - - rscadd: Players holding cardboard cutouts will now assume their appearance, just - like for potted plants. - - qol: you may altclick action buttons to bind them to a key - - bugfix: Crafting Bulgogi no longer makes Bibimbap. It instead makes Bulgogi. -2024-02-19: - SkyratBot: - - bugfix: Maps loaded in after roundstart will no longer have broken smoothing - - bugfix: The crystallizer screentip for rotating it has been updated with the correct - button -2024-02-20: -======= 2024-02-14: Absolucy: - rscadd: Painkillers (i.e morphine, miner's salve) now actually induce analgesic @@ -830,28 +453,12 @@ and also provides a speed bonus during surgery. - rscadd: The tenacity trauma (traumatic neuropathy) also applies analgesic effects. - refactor: Simplified code related to reagents adding traits. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Aylong: - rscadd: Added `Mute` button into `Chat Tabs` settings, it disables tab unread counter - rscadd: Added `Clear chat` button into `General` settings, you can clear your dirty chat like you did it before TGchat - bugfix: Case-sensitive highlighting now works properly -<<<<<<< HEAD - Cursor: - - rscadd: Security Officers are now Haram. - LT3: - - qol: Airlocks don't flash constantly on engineering override, override/overlay - added for fire alarm - - bugfix: Airlock lighting should no longer render on top of player characters - - bugfix: Airlock emissives no longer overlap firedoors - - bugfix: Fixed missing overlays on various airlock types - - bugfix: Fixed status display for epsilon alert - - bugfix: Fixed fire alarm for epsilon alert - - bugfix: MULEbot will correctly display its loaded cargo on BotKeeper - - bugfix: MULEbot home beacon can be set from control panel - - code_imp: MULEbot home location is automatically set on init -======= JohnFulpWillard: - bugfix: Revenants (and other flying mobs) will not make noise when walking into pools of gibs, @@ -973,7 +580,6 @@ of crew injuries LemonInTheDark: - bugfix: Maps loaded in after roundstart will no longer have broken smoothing ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: Valentines Day now polls all players for candidates when it triggers rather than forcing all players to be a Valentine. Consent is important. @@ -982,15 +588,11 @@ burn them. - qol: Valentine's roundend report no longer takes up a massive amount of space and also no longer sound so, so weird. -<<<<<<< HEAD -======= - bugfix: Fixes AI double-click tracking ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: You can only vote for 1 map at a time again - admin: You can now set someone's TC to 0 - admin: Removing Traitor from automatically removes the uplink from them - admin: Removing Uplink from someone no longer wipes ALL of their memories -<<<<<<< HEAD - bugfix: Fixes AI double-click tracking MelokGleb and KREKS, McRamon, Ghommie: - image: New sprites for changeling powers and items. Woooh. @@ -1107,11 +709,9 @@ - spellcheck: Removed a double space in health analyzer's message telling you someone is deaf. - bugfix: ForceEvent tgui panel search is more reliable. -======= Rhials: - bugfix: Removes the double-newscaster from the arrivals sec post. SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: adds examines & screentips for crowbar, screwdriver acts to BRM & refinery machines - qol: adds examines about the number of boulders stored & processed to BRM & refinery @@ -1140,7 +740,6 @@ a 3 second cooldown is applied to stop the conveyer belt from clogging up, With this BRM wires are removed as there is no need for timers to be attached to wires which intefers without our batch processing timings. -<<<<<<< HEAD - bugfix: Feature manipulation surgery will now properly update the patient's appearance. - refactor: The tail portion of lizard spines will no longer draw on people who do not have a tail. @@ -1196,7 +795,6 @@ SkyratBot: - balance: Adds a 1 second delay to moving up and down with the verb/keybinds to disable z-level combat cheese -======= - bugfix: mecha drill won't use power & do other checks if the target cannot be drilled. - bugfix: mecha drill will stop drilling if the mech moves even without changing @@ -1336,12 +934,10 @@ and sometimes being meat and sometimes being both. - bugfix: The North Star finally has a bluespace gas sender system. Derpguy3: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Three stationary water tanks on Birdshot which supplied a sink in the bar, a sink in the medical storage and a sink in the perma-brig's kitchen are now properly rotated and connected with the plumbing. - bugfix: The unisex showers on Birdshot have been given a water tank for its plumbing. -<<<<<<< HEAD - bugfix: Chef and department security have the assignment on their ID imprinted onto their PDA by default, instead of defaulting to Cook/Security Officer and requiring you to do so manually. @@ -1408,7 +1004,6 @@ - bugfix: The North Star finally has a bluespace gas sender system. - bugfix: Lobby manifest shows the head/captain symbols next to heads and captains with custom titles, as long as they're registered with a head/captain trim. -======= EEASAS: - balance: buffs corporate modsuit(centcom only) Higgin: @@ -1417,7 +1012,6 @@ MrDas: - spellcheck: The tier of servo in mech construction is no longer explicitly stated. necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Nanotrasen, in direct response to the increasing danger posed by wannabe martial artists and rioters in the fringes of the Spinward Sector, have upgraded the impact dampeners found in their riot armor. Staff have also started to rediscover @@ -1434,11 +1028,9 @@ - rscadd: A new module, the Safety-First Head Protection module, protects you from head trauma! Available in most modsuits expected to take hits to the head often. And from roundstart exofabricators. -<<<<<<< HEAD - qol: The chapel has been slightly overhauled on Birdshot, with the chaplain now having a place to preach sermons. - bugfix: Sparring chaplains are now able to operate on Birdshot! -======= 2024-02-27: 00-Steven: - bugfix: Newscasters no longer say "No wanted issue posted. Have a secure day." @@ -1521,12 +1113,10 @@ - balance: '"Freshness Jars full of Natural Bait" is now a goodie and costs 200 credits instead of 2000' Iamgoofball: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: xenomorph stomachs will no longer destroy items directly, refactored it to use acid_act() - bugfix: fixes xenomorph vore accidentally destroying mobs it wasn't supposed to destroy, im thinking this was modified list in place shenanigans -<<<<<<< HEAD - image: New sprites for plant grafts! - bugfix: fixes cardboard cutouts not updating when held and using the crayon on them to change their appearance, and fixes the alt_appearance being added to @@ -1538,7 +1128,6 @@ - rscadd: a list of items called vendor_nocrush that vendors dont deal integrity damage to upon hitting them. - bugfix: Makes vending machines no longer crush chairs and conveyors. -======= IndieanaJones: - rscadd: 'New Changeling Ability: Hive Head' - bugfix: Fixed bees having an improper sprite offset @@ -1587,4 +1176,3 @@ - bugfix: Being in a Swat Suit appropriately protects you from collisions with a body, rather than the body thrown at you having these protections protecting YOU, the victim of the collision. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml index 561b4ea990e..dec50243377 100644 --- a/html/changelogs/archive/2024-03.yml +++ b/html/changelogs/archive/2024-03.yml @@ -1,5 +1,4 @@ 2024-03-01: -<<<<<<< HEAD A.C.M.O.: - bugfix: Fixed the AI hologram's ability to copy the appearance of crew members. Majkl-J: @@ -46,7 +45,6 @@ - bugfix: Elder atmosian armor appears properly on digis. 2024-03-02: SkyratBot: -======= Ben10Omintrix: - rscadd: new virtual pet app on the pda Cheshify: @@ -96,36 +94,11 @@ - qol: Examining a fishing spot twice with sufficiently high fishing skill (or the skillchip) will get you a list of fishes that can be caught. Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: Bubblegum Hallucination Surround Charge, Wendigo Shockwave Scream, and Ice Demon Floor Freeze all have more appropriate action icons. - qol: Adds a tooltip to Ice Demon Afterimages ability. - image: Cyborg view items now use the same sprites as their corresponding goggles instead of old versions of those sprites. -<<<<<<< HEAD - - rscadd: Adds 2 new shields to the game! Ballistic Shield - researched by Science, - and Improvised Shield - made out of iron and sticky tape - - image: Riot, Strobe, Telescopic, Energy shields got new less flat sprites! - - rscadd: box with a set of floortile camo, which can be ordered in black market - uplink - - rscadd: also adds a backpack to camouflage - - bugfix: i had the crate under emagged console, should be fixed now. - - bugfix: Buying the advanced plastic surgery disk from the uplink now gives you - advanced plastic surgery instead of brainwashing. - - rscadd: new virtual pet app on the pda - - rscadd: floortile camouflage suit, boots, gloves and crate containing the former - items - - rscadd: Displaying the voting statistics is now optional on a per-poll basis, - and is disabled for map voting. -2024-03-04: - SkyratBot: - - bugfix: Pete can no longer eat vines while dead. - - bugfix: makes custom pizzas dairy and vegetable free, unless you choose to add - them. - - rscadd: Fishes love kronkaine. - - qol: Examining a fishing spot twice with sufficiently high fishing skill (or the - skillchip) will get you a list of fishes that can be caught. -======= JohnFulpWillard: - bugfix: Buying the advanced plastic surgery disk from the uplink now gives you advanced plastic surgery instead of brainwashing. @@ -150,13 +123,11 @@ - qol: Ethereal charging now loops when they're charging (from) APCs or from power cells! Singul0: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Adds a new changeling ability, "Darkness Adaptation". Making you more translucent, especially in darkness and allowing you to see slightly better in the dark - balance: The changeling power "Chameleon Skin" has been buffed, Reduces the cost to 1 and sped up the time it takes to turn invisible -<<<<<<< HEAD 2024-03-05: LT3: - image: medical and improvised gauze are visibly different from cloth @@ -211,7 +182,6 @@ the usual expected danger. - balance: Tweaked the cost of various restock modules up and down. - qol: Restock modules can now be sold for 50 credits. -======= ViktorKoL: - bugfix: made some heretic descriptions more accurate - spellcheck: improved english of the heretical eldritch patrons @@ -265,14 +235,11 @@ - bugfix: The cursed coupon now only triggers a cursed event once, rather than infinite times. intercepti0n: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Pipe connector no longer appears on a hidden connector. - bugfix: Re-wrenched atmospherics pipes no longer get extra offset. - bugfix: All unary devices like injectors, passive vents etc. are centered while hidden. - image: Added smooth transition between hidden and visible pipes. -<<<<<<< HEAD -======= 2024-03-07: 00-Steven: - bugfix: Alternate job titles such as chef and department security actually get @@ -288,7 +255,6 @@ - qol: Slime intelligence potions ask the user for a reason, this will be shown to ghosts ArcaneMusic: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The stock market now fires slower, has stock market events occur more often, and the stock market has fewer minerals that are available to buy in a single purchase before restocking. @@ -301,7 +267,6 @@ their rarity and a timer to show how long until it updates. - rscadd: New Stock market events, one locks a material from being purchased, the other maximizes the value and quantity of a material for sale. -<<<<<<< HEAD - bugfix: Tackle and wellcheers code for sanity values now function. - image: The minigames icon now has an icon for the deathmatch minigamee - admin: Made it easier for admins to adjust blood brother teams using admin tools. @@ -341,7 +306,6 @@ - rscadd: The ghost of Poly can no longer be shuttle-crushed, nor can anything incorporeal. - rscdel: Removed a nanomachine pizza from the deathmatch meat tower map that allowed you to become a borg -======= Hatterhat: - bugfix: Basic mobs no longer have the (unintended) ability to shoot out of containers, like bluespace body bags. @@ -415,12 +379,10 @@ Drag: - rscadd: Adds the Shark and Shork costume. Blahaj lovers rejoice! Ghommie: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed the tgui text input trimming the last character of the input if it hits the maximum length. - bugfix: This also fixes the PIN pad leading to the right wing of the museum away mission. -<<<<<<< HEAD - qol: EVA can be given now in common access slots for non-command crewmembers. - balance: Adjusts the values and contents of the Contraband Crate's item loot table. - code_imp: Use a common list for acceptable silo materials for some stuff. Renamed @@ -462,7 +424,6 @@ like hypnoflash - bugfix: Silicons can use asterisks in binary without fear of saying something interesting. -======= Pickle-Coding: - qol: Extended the metric prefixes. mc-oofert: @@ -526,7 +487,6 @@ - rscadd: Glowsticks no longer leave an unusable action button sitting around then they're lit - bugfix: Glowsticks actually burn down now (The code was broken) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Pickle-Coding and Rhials: - admin: RCD construction and deconstruction are logged. - admin: Hallucinated projectiles no longer log. @@ -535,9 +495,6 @@ - admin: Frozen object shattering is logged. Rhials: - bugfix: Fugitive hunters no longer spawn after 1 minute of the fugitives' arrival. -<<<<<<< HEAD - SkyratBot: -======= SyncIt21: - qol: adds examines & screentips for HPLC - qol: HPLC will now display the status of each reagent if it can be purified or @@ -562,7 +519,6 @@ out. 2024-03-12: SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: adds examines & screentips for grill (the machine for grilling food), converts some chats to balloon alerts - qol: foods that can be re-grilled any number of times @@ -577,87 +533,6 @@ - code_imp: autodoc procs & vars for the grill (the machine for grilling food) - refactor: grills (the machine for grilling food) has been refactored. report bugs on github, also they only start processing after putting food/fuel into them. -<<<<<<< HEAD - - rscadd: Tweaked the saturation, color and intensity of a bunch of lights - - qol: added an HUD button to go up and down floors - - balance: Nerfs the burn times of flares and glowsticks, from 25/35 to 10/15 and - 50/60! to 20/25. - - balance: Glowsticks now dim as they burn - - rscadd: Glowsticks no longer leave an unusable action button sitting around then - they're lit - - bugfix: Glowsticks actually burn down now (The code was broken) - - bugfix: AI-controlled spiders can correctly recognise where they can place webs. - - image: New sprites for most kinds of spider web - - bugfix: The black market illegal fish case now correctly initializes. - - qol: adds examines & screentips for HPLC - - qol: HPLC will now display the status of each reagent if it can be purified or - not before starting the refining process. - - bugfix: HPLC won't accept hologram items. - - bugfix: HPLC uses the correct off icon state & pauses processing when opened, - powered off, unanchored or broken - - bugfix: HPLC will ignore reagents that are either already at max purity or are - inverse thus lowering eta & work done to purify your remaining reagents - - code_imp: merged procs to reduce code size. auto Doc procs for HPLC - - refactor: converted UI to typescript. - - balance: Reinforced sections of station hull have gotten better at mitigating - explosive shockwaves. - - bugfix: fixes a spurious CI runtime caused by explosive mines quite literally - blowing up the unit test area - - rscadd: New Lizard's Gas ruin, this time in lavaland - projectkepler-ru: - - rscadd: Sol .40 .35 and all 12 gauge shotgun ammo (excluding some) can now be - obtained from the console due to a special deal made with Trappiste and Cawil. Alongside - a deal with Aussec made combat shotgun purchasable once again! hoorah -2024-03-14: - JohnFulpWillard, Atlasle: - - balance: You no longer feel cold if you're drunk. You still take damage, but get - no warning or slowdown. - SkyratBot: - - image: Your station's standard issue E-219 laser turrets within the AI upload - and AI satellite have been updated to a newer, shinier model. - - rscadd: Added Moffers as a crafting recipe in the entertainment section. - - rscadd: 'NEW TRAIT JOB: Veteran Security Advisor! Advise HoS and Captain on Security - matters, mentor Security Officers. Note that they are paraplegic and are suffering - PTSD due to their past experience.' - - bugfix: As a borg you shouldn't be able to resist from grab while locked down - - balance: Ephedrine spasms won't affect small or tiny items - - balance: Ephedrine's movement speed bonus now scales with purity. - - spellcheck: Fixed grammar and formatting on the description of friendly elite - mining mobs. - - bugfix: inserting a material sheet into an lathes should show the correct animation - color - - bugfix: All basic mobs are able to get wet. This means, among other things, that - you can clear the "slimed" status effect off your holoparasite or dog or whatever. - - bugfix: The museum piggy bank now spawns with at least 400 creds in it. - - refactor: Butt sprites are based on the chest bodypart for humans, instead of - the species - - image: Moths have their own special butt sprites - - bugfix: Ore vents have to be scanned while standing next to them. - - bugfix: Menacing ore vents now correctly only spawn in a node drone after the - boss is defeated, instead of before. - - bugfix: Doors with ID scan disabled will no longer open when an ID is thrown at - them - YakumoChen: - - rscdel: Removed recipe to artificially create male genetic reproductive fluid - mekyses: - - rscadd: new ai module base around ai being emperor - - code_imp: added code for it -2024-03-15: - SkyratBot: - - image: Resprited T-ray & Geiger counter. - - bugfix: Buttons let you take out their electronics again, hooray. - - bugfix: search bars don't swallow characters or lag behind your typing speed - - balance: Buffed the duration of the SC/FISHER Saboteur Handgun's disruption effects. - It's also stealthier and it won't conspiciously alert living mobs hit by it. - - rscadd: Added saboteur interactions with radios, pAIs, turrets, secbots and APCs. - - balance: Max level Summon Simians now grants the wizard a free gorilla transformation - spell as opposed to allowing the wizard to summon fully-grown gorillas. - - bugfix: Clicking sub sections in the design menu of lathe's UIs will auto scroll - to them. - - bugfix: Fuck you coupons ACTUALLY trigger only once again. As a consequence, they - also burn up when expended for their one-time fuck you. - - bugfix: Fuck you coupons work regardless of whether you had a free hand or not. -======= 2024-03-13: ArcaneMusic: - bugfix: The black market illegal fish case now correctly initializes. @@ -749,12 +624,10 @@ intercepti0n: - image: Resprited T-ray & Geiger counter. necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Thermal pistols can now be 'cranked' to recharge shots. You must have a holster equipped in order to utilize this feature. Also, they have a tighter dual-wield cone. - balance: Thermal pistol crates are now 2000 credits, up from 1400 credits. -<<<<<<< HEAD - bugfix: Fixed the larva "hide" ability not properly hiding larvas under tables. - bugfix: Prevent runtime from humans with biowares gettingn deleted. - balance: All materials except glass are now worth more gulag points than before. @@ -765,7 +638,6 @@ - balance: Irradiated meteors now hit harder and leave behind radioactive goop. SkyratBot: - qol: Tramstation botany now has roundstart watering cans and syringes -======= starrm4nn: - balance: Ephedrine spasms won't affect small or tiny items - balance: Ephedrine's movement speed bonus now scales with purity. @@ -784,7 +656,6 @@ - image: Updated button icon for Summon Simians and Gorilla Transformation. JohnFulpWillard: - refactor: Instruments now use TGUI. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Crusher marks no longer overwrite eachother, fauna can have one from each crusher. - balance: Ash drake's crusher trophy no longer affects people the same faction @@ -793,7 +664,6 @@ having to worry about friendly fire with this, for 750 mining points at your mining vendor.' - bugfix: Minebot passthrough upgrade now properly makes PKAs pass through minebots. -<<<<<<< HEAD - bugfix: fixed some errors with the prepackaged tts - bugfix: A missing recharger has been added into science's testing range on Birdshot station. @@ -822,7 +692,6 @@ SkyratBot: - bugfix: now spiders get extra damage by fly swatter - bugfix: Modsuit Pathfinder module is significantly better at finding it's destination. -======= 2024-03-16: 00-Steven: - sound: Placing paper in a paperbin is no longer silent. @@ -876,7 +745,6 @@ - rscadd: You can add a scoop of ice cream on waffles. - balance: added an action speed modifier to the generic food haste effect (you do things, and not just run, an itsy bitsy faster) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The pro skateboard and hoverboard are now faster. - balance: The improvised skateboard is a nick more unstable than the standard, so the two aren't exactly the same. @@ -886,7 +754,6 @@ are a caveat to it: It cannot be ridden on open space gaps deeper than one level or actual space, unless there''re objects that prevent falls, like lattice or catwalks.' -<<<<<<< HEAD - bugfix: NumberInput(used in chem heater, plumbing reaction chamber etc) highlighting & editing requires only single click like before - refactor: Typescript conversion for NumberInput TGUI Component @@ -959,7 +826,6 @@ - image: modified gi sprites, making them more customisable. - qol: Can now use wirecutters when performing Tend Wounds. - code_imp: Mineral logging now collects ore names more cleanly. -======= Jacquerel: - balance: If you work out under heavier-than-earth gravity, you will get gains faster. @@ -1065,48 +931,10 @@ Singul0: - bugfix: You can't complete a genetic makeup scan when the targets moves out of target anymore using a genetic sequencer ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SomeRandomOwl: - admin: Deathmatch Bombs, Smoke, and Liquid floods are now suppressed in the logs and will not actively spam admin logs. - code_imp: adds a area flag to suppress logging for floods and bombs -<<<<<<< HEAD -2024-03-23: - SkyratBot: - - rscadd: Added secondary objectives to bitrunning! - - rscadd: Pick up encrypted curiosities and return them to the safehouse to claim - their contents. - - rscadd: Glacier Grind has been given a secondary objective, look out for the limited - edition hat. - - rscadd: Bitrunning domains can now be modified during the round by admins. - - qol: ID cards in modular computers can now be swapped. - SpaceLoveSs13: - - balance: By default machines will print items faster now. - - refactor: variable to keep machines slowed or fastened up in print speed added. - Zergspower: - - admin: renames ruin names to have an identifier in front of it - - refactor: converts map plate and jump to ruin to tguilist -2024-03-24: - 00-Steven: - - bugfix: Fixed patronizing paintings not giving a cut to the curators. - Melbert: - - rscadd: Spies may now roam the halls of Space Station 13. Watch your belongings - closely. - Rhials: - - bugfix: Removes some dirt tiles on the Sunrise deathmatch map, which would fill - the map with lavaland atmos. - SkyratBot: - - image: fixed Fulton balloon having its smallest sprite copy pasted over itself - - bugfix: basic mob pirates no longer drop fake energy weapon lenses when shooting - you to death with lasers. - - bugfix: Painting patronage works again when there's no curator present during - the round. - - bugfix: Clients joining a round twice as a crewmember (via admins or otherwise) - no longer break security/medical record consoles permanently. - - bugfix: reagent containers like cup & syringe only update target appearance if - action was successful. - - bugfix: envelops don't stack overlays when interacting with cup & syringes. -======= TheVekter: - rscadd: Added 5 new Felinid ear options, ported from Orbstation! (Sprites by Or-Fi-S) Thlumyn: @@ -1123,24 +951,11 @@ - rscadd: To celebrate it, a skillchip is now available from the bitrunning order console, which lets you dodge projectiles for the duration of your flips, at the cost of stamina. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Removed the (non-working) "Perma-Flipping" and "Echolocation" deathmatch modifiers. - rscadd: Added "No Slowdown", "Random Teleports", "Snail Crawl", "Forcefield Trail" and "Manual Blinking/Breathing" modifiers. - bugfix: Fixed deathmatch cruise missiles looking like standard pods. -<<<<<<< HEAD - - rscadd: Added corner filled warning decals - - bugfix: Alternate job titles such as chef and department security actually get - injected to the manifest as their respective ID trims, instead of being assigned - the job they're based off. - - bugfix: Alternate job titles such as chef and department security actually show - up under the right department on the manifest, instead of no department. - - bugfix: Vending machines will update its UI if ID is lost at any point - - bugfix: Vending machines won't brick if the payment fails (like due to lose of - ID) for any reason - - bugfix: pet carrier unfriending pets put in it. -======= Melbert: - rscadd: 'Adds 3 Traumas: Primal Instincts (special), Kleptomania (severe), and Possessive (mild)' @@ -1159,25 +974,10 @@ Watermelon914: - refactor: Auxlua no longer uses the timer subsystem to get stuff done, lua scripts shouldn't slow down timers anymore. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 myraowo: - rscadd: Added the Chief Engineer's turtleneck and turtleneck skirt to the game. - rscadd: Added the Chief Engineer and Chief Medical Officer's turtlenecks to their respectives garment bags. -<<<<<<< HEAD -2024-03-26: - Melbert: - - qol: A few species (such as Jellypeople) now have proper(ish) preference menu - setups - - config: The in-repo species config has been updated. Well it's still the same - by default, but it's now updated for newer species. - Rhials: - - bugfix: Venus Human Traps can once again entangle victims and drag them into their - web. - SkyratBot: - - qol: Fishfood is now more easily acquired through cargo - - qol: Smoke machines can actually be rotated with alt-click when unwrenched. -======= 2024-03-23: Ben10Omintrix: - rscadd: cultists can now convert pets to their side @@ -1271,7 +1071,6 @@ - bugfix: the virgin mary picture no longer makes its initiates harddelete 2024-03-26: 00-Steven: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Touched most of the code for racks. It should function almost entirely the same save for what's noted here, please report any issues. - code_imp: Wrenching moved to wrenching procs. Side-effect, rack items are only @@ -1287,20 +1086,6 @@ - rscdel: Killed ancient rack code for dragging your active item onto a rack. Just click it does the same thing. This allows you to actually dump items onto racks, though currently disorderly. -<<<<<<< HEAD - - bugfix: Changelings with a flesh ID now properly show the icon of the disguised - ID in examine. - - qol: Gold and silver crates now accurately reflects NT's greed - - bugfix: Driving a vehicle into the supermatter will kill everyone riding the vehicle - - bugfix: RCD logs are more human readable & stores the player name behind the action. - - bugfix: Musiver, Godblood, Synaphydramine, Hollow water and unholy water will - no longer show up in secret recipes - - bugfix: Fixes flamethrower runtime preventing them from working. - - bugfix: text fields which should save their value after hitting enter/closing - the UI now actually does that - - bugfix: lathe search bar now saves its previous search query after the UI is closed - and also reloads search results correctly -======= LT3: - bugfix: "Fixes Schr\xF6dinger's space heater, where a space heater both consumes\ \ a power cell instantly while also not consuming power when heating adjacent\ @@ -1324,83 +1109,10 @@ - bugfix: Fixed more energy usages for cells(Part 2). See PR 82198 for details - bugfix: Fixed more energy usages for cells(Part 3). See PR 82204 for details necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Crank weapons now can actually be charged using their crank. - bugfix: Stun batons and their variants now actually meaningfully consume charge when used. 2024-03-27: -<<<<<<< HEAD - Melbert: - - rscadd: You can talk via plushies, action figures, and toy mechs via `.l` or `.r`, - same as a ventriloquist dummy or decapitated dead - - rscdel: Talking via a plushie, action figure, toy mech, ventriloqiest dummy, decapitated - head, or marionette won't transmit over open mic comms - - refactor: Some say refactor and code cleanup. Vending machines now properly respect - being shut up. Report any oddities. - - refactor: Food hunger bar has been refactored, and moved. Now it sits next to - the moodlet face. - - refactor: Food moodlets now update a lot more snappily. There is now a moodlet - tier between "being fat" and "being normal", to reduce accidentally gorging - yourself to "fatness" tier. - - rscdel: You can't hallucinate being hungry... for now. - Rhials: - - code_imp: Splits up the nuclear operative antagonist datum folder. - SkyratBot: - - rscdel: Removed Orbit Polling component, all orbit polls now use the Poll Alerts - system - - code_imp: Poll alerts support small border pictures in the chat message - - code_imp: Poll alert alert picture and jump target do not have to be the same - - qol: Slime intelligence potions ask the user for a reason, this will be shown - to ghosts -2024-03-28: - Melbert: - - refactor: Infrared emitters now function better (or at least more how you would - expect them) (hopefully). Report any oddities - - bugfix: Fixes polling for things causing said things to have their planes and - layers screwed up (causing random objects or mobs to appear above runechat and - blindness, for example) - Rhials: - - code_imp: Players now receive antag datums specific for reinforcements/support - borgs. - SkyratBot: - - bugfix: A recent glitch within the Syndicate-coded uplinks resulted in a number - of Cybersun-branded cybernetics being distributed for absolutely no cost at - all, except to the company itself. This embarrassment has resulted in increased - tensions within the Syndicate as a culprit for this costly mistake is sought - out. - - bugfix: You can't complete a genetic makeup scan when the targets moves out of - target anymore using a genetic sequencer - - rscadd: Hemiplegic now lets you pick which side is disabled. - - rscadd: The medical records text for hemiplegics now shows which side is disabled. - - bugfix: failing to equip a dual handed item should properly clear out all status - effects related to equipping it, for e.g. remove the action button from chainsaw - - bugfix: A broken item was removed from the mimesvsclowns ruin. In its place is - a spent revolver round. - - qol: Vending machines now have contextual tooltips for interactions with tools/objects/restocking/returns. - - qol: Vending machines can now be examined to see what type of restock module they - need to be refilled. - - bugfix: Fix hack comms console/locate weakpoint objective showing up multiple - times -2024-03-30: - IgiariValkyr: - - rscadd: Akhter Frontier Technologies has imported more goods to the sector, allowing - many more homemade creations! - SkyratBot: - - code_imp: Borgo rightclick ranged code - - bugfix: Fixed some poll alerts runtiming - - bugfix: Botanists will be given dank pizza when consuming the infinite pizza - - bugfix: Fixed the "Fenced Goods" black market category. - - balance: Removed the LTSRBT from cargo and added it to the blackmarket, reduced - the price from 4000 to 625 on average. - - balance: The time it takes for captured mobs to be automatically sent back to - the station from the holding facility has been increased from 3-4 minutes to - 6. - - rscadd: You can buy mobs captured by contractors, traitors and pirates from the - black market and have them sent back to the station in advance. For safety, - they'll also be handcuffed (not always) upon delivery. - - rscadd: Human mobs sold by pirates are not deleted anymore. Instead, they're now - captured and sent to the holding facility. -======= 13spacemen: - bugfix: the follow link upon poll completion should work properly now Alecksohs: @@ -1606,4 +1318,3 @@ - image: Pinpointers have been resprited mc-oofert: - bugfix: elevators may no longer pick up things from under the floor during movement ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index 25ad1bf8ac2..b31100788ee 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -1,153 +1,7 @@ 2024-04-01: -<<<<<<< HEAD - SkyratBot: - - balance: Your heart stops beating when you die now. -2024-04-02: - JohnFulpWillard, Tattax: - - rscadd: 'Adds a new station trait job: The Human AI.' - Melberet: - - bugfix: Jellyperson, Luminescent, and Stargazer hair no longer look bad. All jellyperson - types no longer have eyesockets. - Melbert: - - qol: Hand labels now have a visual effect associated, and are also affected by - heat / can be cleaned off like stickers. - - refactor: Refactored hand labels. They're objects now! - SkyratBot: - - qol: Adds contextual screentips to air alarms - - bugfix: Importing songs into instruments no longer cuts the first line of the - song. - - bugfix: Fixes ghosts being able to change a lathes output direction. - - bugfix: Vending machines now show the correct vending refill name when examine - and not full. - - bugfix: Vending machine no longer shocks you twice when you pulse high voltage - wire. - - bugfix: Airlock wires window closes when you get shocked - - rscadd: Active skillchips are now copied on bitrunning avatars. - - rscadd: To celebrate it, a skillchip is now available from the bitrunning order - console, which lets you dodge projectiles for the duration of your flips, at - the cost of stamina. - - rscadd: Crowbars/wirecutters now deconstruct wooden/cardboard crates/boxes -2024-04-03: - LT3: - - spellcheck: Minor improvements to examine panel CSS - SkyratBot: - - bugfix: Tramstation now has a pepperspray dispenser in it's science security outpost, - as with other security outposts. - - bugfix: Fixes the conveyor belts found on north star's boulder processing room - to all work when the lever is thrown. - - refactor: Auxlua no longer uses the timer subsystem to get stuff done, lua scripts - shouldn't slow down timers anymore. - - balance: Smoke Machines, Showers, Vapes, etc will no longer arbitrarily delete - a random amount of the chems they are processing - tmyqlfpir: - - rscadd: Add vents/scrubbers to dorms on Interlink - - rscadd: Added new techweb exclusive to DS-2 -2024-04-04: - Majkl-J: - - qol: The character pref menu is now split in two - Melbert: - - rscadd: 'Adds 3 Traumas: Primal Instincts (special), Kleptomania (severe), and - Possessive (mild)' - SkyratBot: - - bugfix: lua scripting should work on BYOND 515.1633 - - rscadd: Disposal bins can now hold destination taggers using right click, and - can be removed the same way. Some disposal bins should have some pre-loaded - as well. - - bugfix: The captain's safe is no longer on the wall, therefore cannot be cheesed - by breaking the wall it sits on. - - bugfix: Tearing down a wall that a safe is on now drops the safe with its contents, - rather than dropping the contents onto the floor. The safe's contents cannot - be interacted with while it's not on a wall. - - bugfix: Fixed the LTSRBT. - - bugfix: Selling stuff in cargo gives us money again. - - bugfix: Fixed lua error logging. - - bugfix: Fixed the SS13.start_loop function not working properly. - - bugfix: FIXED CARGO EXPORTS! - - rscadd: cultists can now convert pets to their side - - bugfix: number input dragging will only send payload to backend when its value - changes, Same applies when you hit enter or click outside the field, the value - must have changed to trigger the back end - - bugfix: You can once again drag your mouse anywhere in the window outside the - number input field to vary the value by large amounts - - code_imp: removed unnecessary variables(suppressFlickering, updateRate & event - object param for handlers) from Number Input - - rscadd: Added a persistent piggy bank to the vault, which can carry up to a modest - 2000 credits worth of dosh between rounds. - xXPawnStarrXx: - - rscadd: Added trauma team items and more deforest goodies. -2024-04-05: - Bisar: - - bugfix: Adjusted the code for changeling reviving stasis to only make them spend - chemicals once. - BurgerBB: - - balance: 'You can no longer visually track something (See: AI tracking) if that - object is inside something. You are also considered invisible by tracking if - your alpha level is less than 50.' - LT3: - - bugfix: Fixed being unable to start self surgery - Majkl-J: - - bugfix: Service guard can now use a baton in the service hall - Melbert: - - bugfix: Non-PKA kinetic blasts should work better - - bugfix: Stabilized Red extracts no longer bypass Immutably Slow items - - bugfix: Settler equipment speed modifier no longer applied to Immutably Slow items - - bugfix: Immutably Slow items no longer block construction of certain items - - bugfix: '"Mind Gate" does self brain damage as intended' - - refactor: Blood deficiency and slimepeople now handle blood a tiny bit differently, - report any oddities. - - refactor: Blood deficiency now handles its mail goods a tiny bit different, report - any oddities. - - bugfix: Puzzlegrids now report their answers properly - - rscadd: Bitrunners can now broadcast their Bitruns to the station's Entertainment - Monitors. - - bugfix: Blocks mobs from trying to "physically" interact with some of their hud - elements, such as using Telekinesis or point a gun at your mood meter. - - bugfix: Clown PDAs slip people when not worn - - qol: Socially Anxious people should be able to talk a bit more clearer while still - maintaining the stuttering "charm" - - refactor: Refactored bioware slightly (the stuff experimental surgeries gives - you). Report any weirdness - - bugfix: Heretic sac restarts your heart - Melbret: - - bugfix: Revival Surgery, Strange Reagent, and the Reviver Implant will restart - your heart when you are revived - SkyratBot: - - balance: The polymorph belt will no longer register space dragons as acceptable - DNA. - - qol: makes surgery cap small - - rscadd: Wise cows produce surprising milk. - - spellcheck: You now milk the owner of an udder, not the udder. - - bugfix: abstract(like the dual hand thingy on your hand) & hologram things can't - be put inside storage items - - bugfix: Detective revolvers can no longer exist in a quantum state of both being - chambered in .38 and .357, without risk of misfire. Detectives, cowboy enthusiasts - and reckless federal agents across the Spinward Sector mourn the loss. - - rscadd: The PML-9's name has been changed to something that's a little less boring - random numbers and letters, and something that TTS can likely pronounce much - nicer than before. Get blown up by a Dardo rocket launcher today. - - image: Sprites for rocket launchers, rockets, and rocket projectiles have been - changed to something fresher looking. - - balance: Rocket launchers can be worn on your back or armor vest. - - bugfix: turret id panel checks the access of the attacking item instead - - code_imp: Made the easter rabbits spawn on a more curated list. - - bugfix: the virgin mary picture no longer makes its initiates harddelete - - config: mech logging is now on by default. Existing config setups will not mirror - this change. - - bugfix: You can actually hit racks with objects when in combat mode again. Importantly, - painting them with spraycans like that works again. - - bugfix: the follow link upon poll completion should work properly now - - bugfix: after 9 years, adds a single dot to the dragnet code, making it deal stamina - damage as intended - - image: Updated the Advanced Surgical Tool's sprites - - code_imp: Updated the Advanced Surgical Tool's light code - - rscadd: Added a new Neutral Quirk to indicate to Medical you're willing to be - borged - - rscadd: You can now fax painted canvases in order to send memes to each other. -======= 00-Steven: - bugfix: Ethereal starvation has been updated to the new joules/watts standard. Congratulations Ethereals! You can starve again! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Whether something counts as a stimulant to All Nighter is now handled by the reagent itself when metabolized, for everyone's sanity. Side-effect, you need a liver to process stimulants for All Nighter. @@ -155,32 +9,6 @@ Nighter. This includes all coffee/tea variants, a few other drinks that would have a high enough caffeine level, kronkaine, ephedrine, and in case you're insane you can straight up eat coffee or tea grounds. -<<<<<<< HEAD - - bugfix: buying & selling huge quantities of materials on the market won't cause - their prices & quantities to go beyond bounds. - - spellcheck: fixed grammatical error in chemical splashing - - balance: Traitors can no longer turn themselves into dragons. - - rscadd: Added a 'kaching' sound to the game, and made uplinks play this sound - locally to the user whenever a purchase is made. - - spellcheck: however, he burn`s` his finger in the process. - - bugfix: Holographic energy swords have undergone some more rigorous safety inspections, - and should no longer be a danger to clumsy crew members. - - balance: secbots no longer can be buckled - - bugfix: aheal no longer turns monkies into humans - - qol: Player panel "make monkey" turns humans into monkeys through mutation instead - of making a new mob - - bugfix: elevators may no longer pick up things from under the floor during movement - - balance: You can now adjust the suit sensors of another player in the strip menu. - No longer must you first take it off. - - bugfix: fixes reagent production selection overwrite updating during selection - - code_imp: updates reagent menu for Odysseus - - bugfix: Fixed the "Random" deathmatch modifier. Also turned the "Heightened Hearing" - option into a modifier as well. - - bugfix: Certain weather types that arent supposed to be glowing no longer glow - - image: Snow storms no longer glow - - bugfix: Circuit multitools can now correctly scan carbons who are wearing clothes - or holding objects again. -======= KingkumaArt: - bugfix: ' Hatsune mi-go now is a friendly gold slime mob, and doesn''t hurt your ears.' @@ -207,7 +35,6 @@ moocowswag: - bugfix: anchored circuits no longer blow up after 2 components are used. necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The eye of god now protects from the madness inducing effects of supermatter crystals and singularities. This trait is shared by the meson night vision goggles (which this is a better version of) @@ -220,18 +47,6 @@ - code_imp: The status effect that was called Stagger (not Staggered, which is separate) is now called Rebuked. - balance: Rebuked applies a x2 action delay cooldown, rather than x1.5. -<<<<<<< HEAD - - qol: Makes it easier for heretics to click on influences without accidentally - drawing a rune with their codex cicatrix because the animation shifted and made - you click on the floor instead. - - admin: Advanced Debug Cards will still provide a whole lot of access, but the - way the money on those cards work is now a bit different. Players shouldn't - be able to use the money on those cards in any context though, don't fret about - that. Just know that the money printer goes wrrrr - - balance: evil seedlings can no longer be mass produced - - qol: some experiments now give you more helpful hints at why your failing - - code_imp: changes around some experiment code to make it more understandable -======= 2024-04-02: SyncIt21,Pickle-Coding: - bugfix: space heater(including improvised) turns off when cell is drained @@ -276,7 +91,6 @@ - bugfix: Speech effects such as stuttering no longer applies its TTS filter if the resulting message doesn't actually change the message Pickle-Coding: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Halon combustion releases 2.5 moles of pluoxium per mole of halon consumed. - balance: Halon combustion no longer releases carbon dioxide. - balance: Halon combustion releases resin foam. @@ -286,173 +100,6 @@ instead accelerates at higher temperatures. It is much faster overall. - balance: Halon formation releases 91.2321kJ of thermal energy per mole of halon consumed. -<<<<<<< HEAD - - bugfix: destructive analyzers can now get screwdrivered instead of put it in. - - bugfix: destructive analyzer now accepts alien wire cutters, and emags. - - qol: Dynamic midrounds "Obsession Awakening" and "Blob Host" now have ghost orbit - popups, so you can see them happening in real time. - - qol: There is no longer a ghost orbit popup for players being shocked by an electrified - tram rail. - - qol: The Stray Cargo orbit popup no longer has a half-second window to orbit before - it becomes useless. - - bugfix: Fixed double-encoded messages with AI holocalls. - - qol: AIs now get a z level indicator - - qol: You can now open airlocks (That you have access to) while inside a stealth - implant box - - balance: minebots have been buffed and have recieved new upgrades - Some Random Owl: - - rscadd: Added a food preference system! It has a few checks, but otherwise, gives - you a huge amount of freedom to decide your tastes! Give it a peek in your character - menu! - - rscdel: 'The quirks: Deviant Tastes, Pineapple Hater, Pineapple Liker, and Vegetarian - have been hidden as a result meaning they will be removed from all characters - who has taken these quirks to compensate for the fact you can set your preferences - for food rather than take these quirks' - StrangeWeirdKitten: - - rscadd: Nanite slurry OD will now heal synthetic organ damage, but raise core - temperature and do brute (half the rate of healing) in exchange. - - balance: Nanite slurry twice as effective for healing, but OD has been reduced - to 10u from 20u - - balance: Remade the orderable nanite slurry pills bottles into critical system - repair pills. Each pill will inflict a nanite slurry OD (30u), do ~ 75 brute, - some burn, but heal ~ 240 organ damage. - icequibe: - - qol: Allowed players to fully use the underground hermits without assistance outside - of ruin - jjpark-kb: - - rscadd: added the ability to make apc, fire alarm, and air alarms from forging -2024-04-06: - Majkl-J: - - bugfix: Guns are no longer a piece of attire - SkyratBot: - - admin: Admins can now run lua files bigger than 36 KB by importing them directly. - - bugfix: Removed erroneous light switch in janitor office - - bugfix: Modular shields now give correct feedback and no longer dissuade individuals - from breaking them. - YakumoChen: - - image: Headshots will no longer accept links from Discord, as they eventually - break. Imgbox has been added as an alternative image host. - projectkepler-ru: - - qol: Due to the equal opportunity act, nitrogen breathers and vox lungs design - were now added to limb printer to comply with the FDA regulation -2024-04-09: - Zergspower: - - bugfix: fixes Borg and Syndicate inducers not working -2024-04-12: - SkyratBot: - - bugfix: Medbots can no longer be used as especially large golden ID cards - - bugfix: Fixes lavaland SMES and other crap from not starting with enough energy. - - bugfix: The pirate SMES are now magical instead of secretly infinite. - - image: added gags sprites for; Sailor dress, Evening gown, Cardigan skirts and - striped dresses. - - refactor: Xenomorphs (Lavaland & Oldstation ones) are now basic mobs. -2024-04-16: - Majkl-J: - - bugfix: Actually disallows ghosts from flipping tables upright - - bugfix: Borgs no longer have wifi table control, and have to flip tables by being - next to them - SkyratBot: - - image: Pinpointers have been resprited -2024-04-17: - Bisar: - - qol: Cyborgs now understand door and APC wires at a glance, among others - LT3: - - balance: Rebalanced alcohol intoxication effects. - - balance: A unit of alcohol will now last longer in your system - - balance: Alcohol intoxicates at the same rate regardless if you chug it all at - once or sip it over a few minutes - - balance: Reduced light drinker quirk's booze penalty from 100% to 33% - Majkl-J: - - bugfix: Birdshot ci - - refactor: refactored some deciseconds in skyrat modular files with seconds - Melbert: - - bugfix: Skill rewards should properly be dropped out of unworthy player's hands - - bugfix: Captive Xeno end round report should make a tad more sense - - qol: Basic Bots will use their "salute" emotes less often. - - rscdel: Basic bot fists. - - bugfix: Fix fancy anomaly theme being broken - Rhials: - - bugfix: Sweeps a tile of dust off of the Maint Mania deathmatch map, which was - causing errors. - SkyratBot: - - image: Updates old belt sprites. Mostly the bags, but some misc. ones as well - like the chainsword and RPED - - bugfix: Broken chameleon kits can't be unbroken by an EMP. - - bugfix: strip menu sensors change respects locked sensors - - balance: Atmos resin can directly cool the floor. - - qol: Atmospherics Overalls now can store fire extinguishers in the suit storage - slot - - balance: Increased Advanced Extinguisher capacity to 100u - - qol: General settings tab into TGchat, looks better now, and is more convenient - to use. Also, each button has a font written on it. - - rscadd: Coffee machines can now carry over reagents from the beans to the coffee - (surely no one will inject poison into them) - - bugfix: RPEDs can be used on vendors again. Note that only bluespace RPEDs can - carry vendor refills as of writing. - - bugfix: RPEDs can display vendor parts again. - - bugfix: Restocking vendors gives credits whether done manually or by RPEDs. - - bugfix: Vendors reset their contained credits when restocked. - - qol: Crayons can now draw up to 4 letters at a time per tile. - - rscadd: A bunch of new medipens you can refill with the medipen refiller (survival/luxury/mutadone/saturnx/meth) - - spellcheck: Pre-Approved Cyborg Candidates are no longer "Cantidates" - - image: Updated the ability icons used by AIs and station bots - - bugfix: Being in critical condition no longer damages zombies. - - code_imp: TRAIT_NODEATH will actually stop you dying in (most) cases. - - spellcheck: Fixes a typo in the cargo console. - - bugfix: Goliaths can't grab their own riders with tentacles - - spellcheck: Effectively hitting furniture and machines with objects will no longer - be double punctuated. - - bugfix: blood rites - will no longer delete after running out of charges - - bugfix: blood rites - now heal shades as well - - bugfix: blood rites - now charge 1.65x for self healing as opposed to the ~2x - they were before - - code_imp: blood rites code hurts my eyes a bit less now - - spellcheck: grammar fixes in the roundstart advisory warnings - - bugfix: minebots no longer bomb each other (and other miners) through landmines - - bugfix: minebot shields will no longer lose color in lower z levels - - bugfix: Operating computers clears its ui display procedures if patient is moved - out of the operating table in any way - - balance: The upload and communication boards directly have trackers installed, - activated only when authenticated. -2024-04-18: - LT3: - - rscdel: APCs will no longer arc unless tampered with - - bugfix: APCs don't kill lights when a cell charger is used - - balance: Tesla coil zap modifier increased for increased roundstart power collection - - bugfix: Multi-cell chargers work properly with the new power system - - bugfix: Synth charging cord implant works properly with the new power system - SkyratBot: - - image: Everything that used the old gangtool sprites (door remotes, landing field - designators, some choice beacons, windicate borg reinforcements) has been resprited. - - image: Door remotes now visibly show their current mode. - scrcr0: - - rscadd: 'Adds the following emotes: howl, pant.' - - rscadd: Adds audio to clear_throat (male and female cues) - - rscdel: Removed duplicate definition for clear_throat. -2024-04-19: - Bisar: - - bugfix: Mechs will no longer delete their living non-occupant contents when destroyed. - Majkl-J: - - code_imp: All cafe areas are now children of /area/centcom/holding/cafe - - bugfix: There is only one borg inducer now, fixing a few bugs related to there - being multiple under the same path - Melbert: - - refactor: Staff of Healing should perform slightly better. - Nerev4r: - - rscadd: Teshari are now more agile, better at hearing stuff, and can feast on - carrion! - - spellcheck: The language icon and description for Schechi has been reworked to - be more lore-compliant. - Rhials: - - bugfix: The tide of post-round blob zombies when a blob wins will no longer break - the speakers in your headset. - SkyratBot: - - bugfix: Fixes Radiation Hood not having FOV blockage - - bugfix: Autolathe correctly computes the print amount of custom material items - like toolboxes and doesn't grey out its print button - - bugfix: 'LUA: Registering a signal on a deleted datum will throw a more descriptive - error message.' -======= SyncIt21: - bugfix: buying & selling huge quantities of materials on the market won't cause their prices & quantities to go beyond bounds. @@ -614,97 +261,10 @@ - spellcheck: Fixed an empty space in examining a human's bloody hands. - code_imp: It's a tad easier to exit an atom's examine text now. mc-oofert: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: slaughter/laughter demons have a cooler round end report - qol: you may not bodyslam yourself as a demon - code_imp: slaughter and laughter demons are given their antag datum when their mind initializes -<<<<<<< HEAD - - bugfix: Medipens can no longer be deepfried, closing an exploit that allowed people - to drain/inject chems into it with saltshakers and IV drips. - - bugfix: fixes ody sleeper UI not updating to new chems to inject. - - bugfix: fixes ody sleeper not telling user why they can't pick up a person. - - code_imp: gives a common method for giving reagent list data to .tsx - - bugfix: Netpods have had their security against exploits increased. - - bugfix: deathmatch can no longer occassionally send people to nullspace - - bugfix: facescarf ui toggle button works again - - qol: Basic dexterous mobs now have a health doll and screen damage indication - like other basic mobs. - - bugfix: Vorpal Scythe execute messages now read correctly. - - bugfix: Bit avatars no longer have access to free binary comms with the AI outfit - - image: Fixed the lobby menu's collapse button being offset by a pixel - jjpark-kb: - - rscadd: added the cursed ash carver (ashwalker crusher) - - rscadd: added primitive bonesetter and primitive-looking plant bags - - balance: removed the time limit from the ash staff - - balance: doubled the volume of the primitive centrifuge (50 to 100) - - balance: removed the consumption of bluespace in many ashwalker rituals - - rscadd: added the research paper from simple research (4 cloth in the crafting - menu) - - rscadd: added the research skill - - balance: experisci scanner affected by research skill - - balance: xenoarch affected by research skill -2024-04-21: - CliffracerX: - - rscadd: you can mount Mk. II Hyposprays onto the underside of Hypospray Kits & - quickdraw them - - rscadd: MK. II hypospray upgrade kit through imports - bigger vials, but it'll - hurt your wallet to get 'em! - - image: redid every Mk. II Hypospray, hypokit & vial sprite! - - qol: hypovials are now color-codable & the type can still be seen when loaded - into a hypospray - - qol: R&D can research how to make new hypokits & Mk. II Hyposprays - - balance: boosted deluxe hypokits' storage, nerfed small hypokits' storage & made - them pocketable - - admin: icspawning supports quirks & loadout items now - - admin: bluespace technician RPED has been significantly upgraded - - bugfix: hotfix for loadout wallets not filling properly -2024-04-24: - Majkl-J: - - bugfix: Basicmob xenos no longer die to lack of heating - SkyratBot: - - balance: The Bioscrambler will now actively attempt to get closer to living targets - rather than chilling in a closet nobody goes into (unless you trap it in a containment - field). - - balance: Because it can now travel through walls, the Bioscrambler will no longer - transform you THROUGH walls. - TreePizza: - - rscadd: Added a fax machine to the Tarkon bridge, as well as it's unique contact - for Tarkon TB (Top Brass). - - rscadd: The station can now fax the Tarkon bridge. The Ensign can now finally - do their job without having to leave their chair. - - rscadd: Added an Ectosniffer to the science lab so ghosts may now request a brain - to possess. - - rscadd: ~1 "hidden" Xenoplush for Monophobia characters.~ Goodnight sweet prince - you were too good for this world. - - rscadd: Added a light to the freezer and an additional one to the kitchen. - - bugfix: Added that awkwardly missing window to the top airlock and deleted the - equally awkward single disposal pipe that was underneath it. - - bugfix: 'Moved the glowing resin in the cargo_warehouse variation (the infested - one) so that it is no longer under the glass wall. - - ### Charlie:' - - qol: 'Charlie pods now have pref and loadout spawning. - - :cl:' -2024-04-26: - Jacquerel and Melbert: - - rscadd: A new achievement for moving a boulder from one place to another, at great - effort. - - balance: Hauling a boulder around makes you move slower, as it does when dragging - it. - Majkl-J: - - bugfix: Medicells now correctly use power - - bugfix: MCRs now correctly use power - - bugfix: Infinite powercells now have infinite power that's useful and not 2500 - Joules - - qol: slimes will stay active without needing any one to watch over - - code_imp: The way mobs idle has been refactored, please report any issues with - non-reactive mobs - Melbert: - - bugfix: Playing Cards memory now reads better - SkyratBot: -======= 2024-04-10: 00-Steven: - bugfix: Lead acid batteries have had their power values fixed. @@ -852,14 +412,12 @@ Horatio22: - spellcheck: grammar fixes in the roundstart advisory warnings Iamgoofball: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixes AI lag by re-adding idle mode to all AI that was lost with the simple mob to basic mob conversion. - bugfix: AI controllers with no clients around for 14 tiles will move into idle mode and stop planning or acting. - bugfix: AI controllers will now record how much time was spent on planning or un-idling AI controllers. -<<<<<<< HEAD - bugfix: The rebar crossbows now properly loosen their bowstring upon firing. - balance: Longfall modules no logner stun you when they activate. - balance: Falling from a height greater than one z-level while using the longfall @@ -874,7 +432,6 @@ - qol: Tuberculosis makes you cough more - qol: Nicotine Addiciton makes you cough less - qol: Medicine Addiction maybe makes you cough more, maybe makes you cough less -======= Jacquerel: - balance: The Bioscrambler will now actively attempt to get closer to living targets rather than chilling in a closet nobody goes into (unless you trap it in a containment @@ -1063,7 +620,6 @@ at least it gives you a workout... Melbert: - refactor: Atom-Item interactions have been refactored once more. Report any oddities. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Being deafnened from a loud sound (flashbang, explosions) will now force people not naturally deaf to shout - rscadd: Ear damage multiplier now only applies to taking damage, not healing damage, @@ -1073,52 +629,6 @@ snappily Rhials: - qol: Water tiles now extinguish fires on items and people. -<<<<<<< HEAD - SkyratBot: - - bugfix: basic bots no longer start with all access - - bugfix: being revived with a cyber-heart now properly restarts the cyber heart - - rscadd: miners can now purchase grapple guns - - bugfix: Fixes clipping in the ESC menu between buttons and long station names. - - bugfix: brimbeams no longer make a cog appear above the mob - - bugfix: cooling and anti-disruption RCD upgrades can now be printed in ancient - protolathes - - qol: There's a bit more user feedback when it comes to attempting to handcuff - someone. - grungussuss: - - bugfix: fixed being able to install multiple of the same upgrade to medical cyborgs -2024-04-29: - Majkl-J: - - bugfix: Synth recharging in mechchargers is now fixed - - bugfix: Crank cell can now be cranked for 1MJ of energy instead of 100J. How a - human manages to pull that off shall not be discussed - SpaceLoveSs13: - - admin: New verb to play local internet music! - StrangeWeirdKitten: - - bugfix: Hardlight wheelchair no longer drops metal when deconstructed - VexingRaven: - - bugfix: The debug box no longer spills its contents everywhere -2024-04-30: - LT3: - - bugfix: Skyrat specific crew monitors work properly - Majkl-J: - - code_imp: Further cleared out MCR defines - Melbert: - - bugfix: Midround malf can roll again - - bugfix: You can handcuff people with 2 arms and you can no longer handcuff people - with 0 arms - Rhials: - - bugfix: Overwatch Intelligence Agents no longer get their own uplinks, leading - to a self-replicating grey goo scenario. - - admin: Lazy loading map templates now gives you the option to not ghost/teleport - to the loaded area upon completion. - - bugfix: Fake handcuffs/Zipties no longer block clicks for a few seconds after - being resisted out of. - SkyratBot: - - bugfix: minebot shields are now actually orderable - - bugfix: vinegar may once again be crafted with wine, water, and sugar - - rscadd: Added a short scene when getting an Ordeal of Sisyphus achievement. - - bugfix: All alert polls ignore option works -======= SyncIt21: - code_imp: most cell power usages are scaled with defined constants to help adapt to future changes @@ -1386,28 +896,10 @@ Melbert: - bugfix: Plasma cutters work again Metekillot: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Mech domination now properly integrates with shunting. - bugfix: Combat upgraded AIs no longer get two buggy malf ability pickers if they also become malfunctioning - refactor: Refactored most of the functionality around malf AI shunting, mech control -<<<<<<< HEAD - - bugfix: The start-of-the-round tips will no longer feature virologists, but will, - however, start featuring heretics and coroners. - - admin: Possess Object is now back in the right-click context menu. - - balance: Netguardian Prime can see in the dark. - - image: You can see Netguardian Prime in the dark. - - bugfix: fixes mobs getting stuck trying to reach something unreachable - - bugfix: Examining someone with Med/Sec HUDs will no longer filter the message - under Radio. - - bugfix: CentCom dispatched a team of interns to fix the loot panel's loading message. - It should now load properly. It did before too, but now the message is fixed. - - image: The Infiltrator Suit has received a new model, sleeker than ever! - - admin: spy can now be rolebanned - - bugfix: pAI requests should no longer randomly permanently break in a round. - scabs3: - - rscadd: Added new lines and responses to the 'dark and brooding lizard plushie' -======= Rhials: - admin: Lazy loading map templates now gives you the option to not ghost/teleport to the loaded area upon completion. @@ -1431,4 +923,3 @@ however, start featuring heretics and coroners. intercepti0n: - rscadd: Added a short scene when getting an Ordeal of Sisyphus achievement. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-05.yml b/html/changelogs/archive/2024-05.yml index 1f3751fa983..2847a7d4f3a 100644 --- a/html/changelogs/archive/2024-05.yml +++ b/html/changelogs/archive/2024-05.yml @@ -1,5 +1,4 @@ 2024-05-01: -<<<<<<< HEAD Erol509: - rscadd: Added back TEG to techwebs and engineering protolathe - image: Changed TEG sprites from YogStation. Credits to original author. @@ -82,7 +81,6 @@ Majkl-J: - qol: Health analyzers now include basic information on treatment of husked bodies. - bugfix: Synth computers no longer force open the messenger app -======= 13spacemen: - bugfix: Ethereal unarmed attacks "sear" instead of "singe", which was buggy Constellado: @@ -141,40 +139,29 @@ - bugfix: Constantly fleeing in Battle Arcade will no longer give you a very large amount of decimals due to halving your gold every time. - bugfix: AIs can now track Silicon as long as their built-in camera is online. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - admin: Custom Single and Custom Multi votes are now combined into one vote - admin: Admins can now end votes instantly, rather than cancelling them - admin: Admins can now reset the vote cooldown - bugfix: Vote cooldown actually applies now -<<<<<<< HEAD - SkyratBot: - - qol: You can now quickly stamp papers with a right click - - image: added directional sprites for radiation shutters -======= Pickle-Coding: - bugfix: Fixes hypercharged slime core cells and circuit guns having 1,000 times less energy than intended. Watermelon914: - bugfix: Fixed the ipintel subsystem not working. kawoppi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: the civilian bounty control terminal displays the payout of new bounty options again - qol: the civilian bounty control terminal displays the description of new bounty options -<<<<<<< HEAD -======= nikothedude: - bugfix: Jousting no longer bypasses pacifism 2024-05-03: Echriser: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: conveyors now use left and right click controls - qol: add screentips for conveyor switches - rscdel: removes circuit conveyor circuit default trigger behavior in favor in favor of the three state triggers -<<<<<<< HEAD - bugfix: fix runtime when no events were drafted to be picked from - config: make events frequency configurable - rscadd: increased the size of the pool that Machine Blessing draws from @@ -216,7 +203,6 @@ - bugfix: Blood Brothers should spawn knowing what their objectives are. - bugfix: Teams of 3 Blood Brothers will once more have an additional objective. - bugfix: Fixed lua scripts breaking when turfs with registered signals get deleted. -======= Gaxeer: - bugfix: fix runtime when no events were drafted to be picked from - config: make events frequency configurable @@ -259,12 +245,10 @@ - bugfix: Ventcrawling mobs can change Z-level using multiz-decks again. 2024-05-05: Isratosh: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: If kidnapped and ransomed by pirates, you will now properly return to the station automatically after 6 minutes. - bugfix: You can no longer be kidnapped and held for ransom by cargo technicians posing as pirates. -<<<<<<< HEAD Useroth: - bugfix: Fixes transfer votes - refactor: Removes modular piece of code related to electrocution that is no longer @@ -291,7 +275,6 @@ BurgerBB: - qol: The inspector's Fedora now uses regex. When saying commands, it is much more generous on picking up trigger word. -======= Jacquerel: - bugfix: Blood Brothers should spawn knowing what their objectives are. - bugfix: Teams of 3 Blood Brothers will once more have an additional objective. @@ -330,7 +313,6 @@ - balance: Spies can now use other spies' uplinks. Melbert: - balance: To see wires in photos of blueprints, you first must squint at the photo. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ReturnToZender (hitting delete on a power cable): - rscdel: Single loose power cable in icebox maintenance Rhials: @@ -341,7 +323,6 @@ ShizCalev: - bugfix: Inducers no longer break completely after trying to charge a PDA with them. -<<<<<<< HEAD SkyratBot: - bugfix: Lootpanel now requires 515.1635 to generate most icons. TG support for 514 ended May 1. Update your client to fix the icons. @@ -369,7 +350,6 @@ 2024-05-10: GoldenAlpharex: - bugfix: Removed another rogue cable from underneath a disconnected SMES. -======= delingar: - rscadd: RD's skillchip adds cyborg wires knowledge jlsnow301: @@ -412,14 +392,12 @@ pump surgery.' Echriser: - bugfix: conveyor switches work for cyborgs again ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex for the code, Thlumyn for the sprites: - bugfix: Fixed smoothing turfs displaying some incorrect damaged overlays because of a non-smoothing damage overlay of different dimensions than the smoothing sprite used as the base. Less black void, let's go! - image: Added smooth broken/burnt overlays for grass, meaning that it's going to look a lot less broken when the grass tile is at the edge of a smoothing group. -<<<<<<< HEAD Jane: - qol: The Coroner's Ritual Knife can now sit upon Med Belts! Melbert: @@ -437,21 +415,7 @@ datum. ShizCalev: - bugfix: Cursed Items wizard event actually works again. - SkyratBot: - - bugfix: Silicons can set the teleporter destinations again. - - sound: Lasers adjust their pitch as they run out of charge, rather than frequency - - bugfix: The shuttle will no longer delete you while you are in jaunt - - qol: The labor camp shuttle properly sets people to parole after they complete - their work. - - qol: The labor camp shuttle specifies which person returned to the station. - - bugfix: space heaters now display the correct mode when the maintenance panel - is closed - - bugfix: Removed stray pixels appearing on certain parts of railing - - bugfix: Supermatter shards now have screentips with a wrench in hand - - qol: Added alt-click usage context to toggle_icon component -======= Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: Being sacrified by a Heretic no longer gives you an incurable phobia. - rscadd: Being sacrificed by a Heretic will drop 2-4 of your organs on the ground and replace them with "corrupt organs" with negative effects which can be suppressed @@ -459,7 +423,6 @@ - rscadd: Players who have been sacrificed by Heretics will experience additional and rapidly lethal consequences for attempting to fight someone who previously sacrificed them, as long as that person is wearing a focus. -<<<<<<< HEAD - bugfix: Pride pins can be reskinned again with alt-click. - bugfix: moths with functional/flight potion wings get an animation when they *flap once again, and it makes a sound @@ -484,7 +447,6 @@ Erol509: - rscadd: Leashes have been stocked in a very particular vendor in the dormitories. 2024-05-15: -======= - sound: Lasers adjust their pitch as they run out of charge, rather than frequency Melbert: - qol: Morgue trays (and the contents inside) are now animated on open and close @@ -523,7 +485,6 @@ Xander3359: - bugfix: Ale now has a drinking_glass style 2024-05-13: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bisar: - qol: Most of the alternate click modes (right click, control clicking, shift clicking, etc) have been enabled in the alt-click item menu. @@ -532,33 +493,26 @@ Melbert: - rscadd: Cigarette smoke is now more smokey. - rscadd: Taking a cigarette out of your mouth will let out a big puff of smoke. -<<<<<<< HEAD - qol: Some alerts, such as Fleshmend's, show their remaining duration on their icon. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PapaMichael: - bugfix: Rat Kings can no longer trap mice inside of pipes by creating them while ventcrawling. - balance: Rat Kings can no longer create grime and miasma while ventcrawling. Rhials: - rscadd: Bitrunners now have their own job figurine. Cool! -<<<<<<< HEAD Shayoki, Wolf751: - image: The frontier gas masks now fit properly on your snouts. SkyratBot: - bugfix: Deleting someones brain kills them again - qol: Gives Health sensor assemblies a UI so its easier to use. -======= nikothedude: - spellcheck: Added a period to the end of the wendigo deathrattle paganiy: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Now you can put a cigarette in your mouth just by hitting the pack of cigarettes on yourself. - bugfix: The cigarette pack no longer moves under the spaceman when they interacts with it with the RMB -<<<<<<< HEAD - bugfix: Accelerator laser gun no longer shoots sun size projectiles. - bugfix: Spies no longer get the 'nothing' / 'free objective' due to trying to make Protect objectives without targets. @@ -584,8 +538,6 @@ - bugfix: You no longer hit the smoke machine with the beaker - bugfix: You can hit the smoke machine with tools & beakers when in combat mode - bugfix: no abstract & hologram item interactions allowed with smoke machine -2024-05-17: -======= 2024-05-14: Jacquerel: - rscadd: People who spend time improving their bodies are able to evaluate the @@ -627,7 +579,6 @@ - bugfix: The SC/FISHER can now shoot floor lights. Jacquerel: - admin: Admins can now more easily modify whether a Blood Brother can convert someone ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jane: - qol: Shovels, Serrated Bone Shovels, and Entrenching Tools can now be hung upon Miner and Coroner Winter Coats, as well as the Coroner's Labcoat! @@ -637,14 +588,12 @@ the item rather than take it. - qol: Examine blocks for screen alert examining. - qol: Screentips for offer alerts. -<<<<<<< HEAD Seven: - bugfix: Fixed a runtime when using the cultist blood rites on yourself. ShizCalev: - bugfix: Spam clicking a modkit with a kinetic accelerator can no longer lead to ghosted versions of the modkits appearing in the modkit list, breaking the gun. SkyratBot: -======= PKPenguin321: - rscadd: New funny wizard staff/wand that shrinks stuff. - rscadd: Being shrunken now leaves you vulnerable to being crushed to death. @@ -684,7 +633,6 @@ necromanceranne: - bugfix: Fixes the knife offset for pipeguns tmyqlfpir: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Add tooltips to circuit editor buttons - qol: Add grid alignment mode to circuit editor - rscadd: Added new compare health state component @@ -693,7 +641,6 @@ - qol: Added activity toggle to voice activator component - qol: Added quiet mode to speech component - qol: NTNet send component will not use power/trigger if NTNet is offline -<<<<<<< HEAD - bugfix: The SC/FISHER can now shoot floor lights. - rscadd: parrots will now try to immitate the speaker's voice - bugfix: Fixes error when running docker compose on apt upgrade @@ -740,10 +687,8 @@ cyborg crowbar from being pointy. - bugfix: Fixes cyborg omnitools not using the correct wound bonus and armour penetration values. -======= 2024-05-17: 00-Steven: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Emotion masks no longer use a janky workaround for infinite reskinning. - bugfix: Mech pilot suit shows reskinning usage context correctly. - bugfix: Accessories show "wear above/below suit" usage context appropriately. @@ -752,13 +697,10 @@ rather than whether it's in storage or not. - rscdel: Removed redundant reskinning usage context code from medical sprays, now shows reskinning usage context like other reskinnables. -<<<<<<< HEAD - bugfix: Fixed the spess knife's cutter tool icon being invisible. - code_imp: Most instances of parse_zone now refer to the limb's plaintext_zone var -======= EnterTheJake: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Rust Heretics rusting is now consistent and tied to knowledge progression. - balance: Walking on rust applies disgust and chem purge to non-heretics and brute damage to silicons. @@ -777,8 +719,6 @@ - balance: Resist cold trait now gives immunity to freeze effects, and has now been added to Rustbringer's oath along with slowdown immunity. - bugfix: Fixed glowing runes being invisible. -<<<<<<< HEAD -======= JohnFulpWillard: - bugfix: Snails no longer move at normal speed while resting. - bugfix: Snails can no longer get insane speed from getting their legs replaced. @@ -808,7 +748,6 @@ improvedname: - bugfix: fixes metastation science scrubber pipeline jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed an issue preventing space ninjas from having a hud icon - rscadd: 'ORBIT UI CHANGES:' - rscadd: AFK players are greyed out. @@ -819,7 +758,6 @@ - rscadd: Round ending "critical" items will be listed at the top. - rscadd: Click the settings button to expand for more info - rscadd: Your current orbit target is highlighted. -<<<<<<< HEAD - bugfix: Pyre chaplains can no longer generate infinite favour for free by buying and selling candles. Candles now offer for 40 favour, down from 50. - bugfix: fixes metastation science scrubber pipeline @@ -844,7 +782,6 @@ - bugfix: Fixed a scenario in which a turret would have its covers closed while still firing. SkyratBot: -======= - bugfix: Simplebot UI won't display '0' anymore when locked mc-oofert: - rscadd: mobile defibrillator mount @@ -869,13 +806,11 @@ Echriser: - bugfix: Fixes a bunch of hearts turning into errors when you try to eat them Hatterhat: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: The Ansem, suppressor, and SC/FISHER included in the Fisher gimmick bundle now come together as one whole gun, the Ansem/SC. It's integrally suppressed, and fires the disruptor on right-click. - bugfix: The SC/FISHER disrupts APCs for an appropriate amount of time, not ten times the intended disruption length. -<<<<<<< HEAD - spellcheck: Fixes some typos in the goodies section and makes it look a bit more consistent. - rscdel: Due to a need for company restructuring, virologists have been laid off @@ -912,7 +847,6 @@ sheets, spacemenart, ben10omintrix, goofball, infrared baron, aofie: - rscadd: adds lavaland raptors and the raptor ranch 2024-05-21: -======= Jacquerel: - bugfix: Mob spawners (such as lavaland tendrils) won't spawn more mobs than they are supposed to, faster than they should. @@ -956,17 +890,14 @@ transform sting to turn someone into that species. - admin: Various bad things that can happen as a result of Legion organs are now logged ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - qol: Custom emotes now default to both visible and audible rather than just audible - qol: Invoking the custom emote verb now explains how to set your custom emote to visible or audible -<<<<<<< HEAD - rscadd: 'Icebox: The bar returns to its home.' - rscadd: 'Icebox: Standardizes some decal styles in the main hallway.' - bugfix: 'Icebox: The lower brig''s missing air alarm has been found.' ShizCalev: -======= Pickle-Coding: - balance: Cargo ripley's cell starts fully charged. Profakos: @@ -976,12 +907,10 @@ - bugfix: jumpsuit sensors quick maxing now works ShizCalev: - bugfix: Icecream vats will no longer eat cyborg beakers. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Balloons are no longer invisible when held. - bugfix: Malf AI can now properly interact with APCs under their control - bugfix: Malf AI & their slaved cyborgs won't be told that access is denied when trying to right-click lock/unlock APCs. -<<<<<<< HEAD - bugfix: Icecream vats will no longer eat cyborg beakers. SkyratBot: - bugfix: jumpsuit sensors quick maxing now works @@ -1008,7 +937,6 @@ grungussuss and Virgilcore: - sound: added sounds for the gateway 2024-05-23: -======= Striders13: - admin: sentience balloon can now assign antag to affected mobs Watermelon914: @@ -1043,50 +971,12 @@ tmyqlfpir: - bugfix: '[Metastation] Service hallway door being bypassed by lying down' 2024-05-22: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bisar: - balance: A wound being inflicted doesn't get broadcasted to everyone in view until a higher severity now. - sound: Wound sounds drop off more quickly, and no longer travel through walls. This has no effect on attack sounds. -<<<<<<< HEAD - SkyratBot: - - rscadd: Added smoke kit (5 grenades) with four grenades to uplink by 2 TC - - spellcheck: Removes a shit clown name and adds a better clown name instead - - bugfix: 'underage drinkers beware: the Booze-O-Mat and ShadyCigs Deluxe check - your age again' - - rscadd: Adds a new deathmatch modifier that enables quirks - - bugfix: The RD remote works on the AI upload door now - - qol: Crew Monitor UI now scrolls properly even after clicking the inner list. - - bugfix: Viewing Reticence's stats no longer causes an NtOS UI error - - bugfix: Crafting menu loads long lists faster - - spellcheck: The message displayed when adjusting a mask no longer incorrectly - states the way in which the mask has moved. - - bugfix: The deathmatch modifier menu works now - - spellcheck: the nuke op reinforcement beacon no longer talks about clones - - rscdel: Modularizes Night vision quirk - - bugfix: Monkey power reactions are instant and won't occur when exact reagent - requirements (50u power & 1u water) or above aren't met. Stops players from - cheesing monkeys from plumbing factories - - bugfix: ' fixes being able to ride all mobs through space' - - balance: Certain unhealthy organs can be detected via the advanced health scanner - - spellcheck: Correctly spells "received." - - spellcheck: Improved the grammar/spelling of a few raptor descriptions - - bugfix: '[Metastation] Service hallway door being bypassed by lying down' - - bugfix: fixed a weird door in icebox bridge - - qol: New players will no longer start with ghost ears, ghost sight and ghost whispers - on by default. - - spellcheck: Corrects spelling of "amulette" to "amulet" - - bugfix: Fixed spies having a slightly increased chance of getting a different - cost model for the elite syndicate hardsuit - - bugfix: Slimes will no longer consider feeding upon slime people - - image: Medical doctors and CMOs now start with their jumpsuits rather than surgery - scrubs and caps. - - bugfix: Miners can actually access and fix their engineering issues on the lavaland - base via the engineering section of the base. AGAIN. - - bugfix: The gulag SMES unit is no longer needlessly draining the entire power - grid of the main mining base. AGAIN. -======= + Fikou: - spellcheck: the nuke op reinforcement beacon no longer talks about clones Horatio22: @@ -1111,14 +1001,12 @@ improvedname: - rscdel: Removes night vision quirk necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The Research Director is now actually strong. - rscadd: Fitness bros will determine the Research Director to be stronger than they actually are, without even working out. How does he do it? - balance: Suplexing a rod grants a large burst of athletics experience. - rscadd: The more sentient casualties of the rod, the more experience suplexing that rod grants. Absorb the souls of the weak and feeble. -<<<<<<< HEAD 2024-05-24: Melbert: - bugfix: Height now applies less weird to certain worn items, bare-handed bloody @@ -1226,7 +1114,6 @@ Man Trap - balance: Mobs significantly larger than humans, such as Space Dragons and Xenomorph Queens, breakout of being arrested by a mech significantly faster. -======= nikothedude: - rscadd: Adds a new deathmatch modifier that enables quirks - bugfix: The deathmatch modifier menu works now @@ -1330,16 +1217,13 @@ - bugfix: Material floor tiles once again have their improved sprite. 2024-05-28: Echriser: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: computers with no lights can now turn on using the on/off signal - bugfix: RGB lights on PDA circuits now use a signal - bugfix: the is_off signal now works on consoles - bugfix: printing text on a console component now uses a signal - refactor: each input signal in console circuits now have their own proc -<<<<<<< HEAD - refactor: Wendigos abilities have been changed into actions that can be added to any mob. -======= EnterTheJake: - bugfix: Rust debuffs now gets properly removed if you derust a tile you are standing on. @@ -1348,7 +1232,6 @@ Fluffles: - bugfix: echolocation is less laggy. and works. Higgin: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Viruses now self-heal much more effectively with good mood, sleep, food, and spaceacillin. - balance: Viruses now punish being hungry more. Stay fed! @@ -1357,7 +1240,6 @@ - balance: Viruses now progress slightly slower. - balance: Viruses now only hide if their stealth stat is greater than their total computed severity. -<<<<<<< HEAD - rscadd: Added a screentip for hilbert's hotel door - bugfix: Fixed alt-click interaction with hilbert's hotel door - sound: Disposal chutes will no longer play a sound for each item when many items @@ -1375,7 +1257,6 @@ Fluffles: - bugfix: holodecks no longer use increasing amounts of power the longer they're on -======= Jacquerel: - balance: Mobs significantly larger than humans, such as Space Dragons and Xenomorph Queens, breakout of being arrested by a mech significantly faster. @@ -1425,7 +1306,6 @@ on FlufflesTheDog: - bugfix: viruses can no longer potentially have 8 symptoms ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - qol: Grown logs no longer spam your chat when cut into planks, instead displaying balloon alerts informing you of how many planks were made! @@ -1433,8 +1313,6 @@ a balloon alert instead. - bugfix: Cotton and Durathread bundles no longer runtime when creating raw cotton/durathread from the created stack having been merged with an existing one. -<<<<<<< HEAD -======= Gottfrei: - bugfix: "\u0421ertain cooldowns should now be more accurate and will no longer\ \ take an extra decisecond to clear." @@ -1446,38 +1324,15 @@ them pulsing. Pickle-Coding: - admin: fix_air will also fix the turfs' temperatures. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - bugfix: Trees will no longer be growing through railings on forest planets - bugfix: Trees/plants will no longer grow through wood pathways on Icebox - bugfix: Railings will no longer appear ontop of rock walls on icebox -<<<<<<< HEAD - SkyratBot: - - bugfix: Fixed a typo preventing creation of paystands using an ID. - - balance: Adds a threshold to oculine and increases metabolism, and reduces the - amount of oculine in a carrot - - sound: The volume of the gravity generator has been halved - - bugfix: viruses can no longer potentially have 8 symptoms - - rscdel: Wipes the last echo of sentient disease from existence - - bugfix: Slightly cleaned up PAI software downloads interface - - balance: Bioscramblers pulse more often but with less range, plus you can see - them pulsing. - - rscdel: Removes sentient disease from the game - - bugfix: "\u0421ertain cooldowns should now be more accurate and will no longer\ - \ take an extra decisecond to clear." - - bugfix: Drones stored inside objects will call the stored object's relaymove() - and return upon move - - sound: Shuttle docking and undocking is quieter now - - bugfix: Fixed screentips not appearing on clip on neckties - - bugfix: fixed watcher wreath bounties being incompletable - - admin: fix_air will also fix the turfs' temperatures. - - spellcheck: Fixed a missing space typo in ion law logic. Vekter: - spellcheck: Fixed a grammar inconsistency in round tips. - bugfix: Fixed a missing access helper in Northstar Medbay. Assistants should no longer be trapped post-mending. - bugfix: Replaced an incorrect disposal variant in Northstar's Medbay. -======= Vekter: - bugfix: Fixed a missing access helper in Northstar Medbay. Assistants should no longer be trapped post-mending. @@ -1485,15 +1340,12 @@ - spellcheck: Fixed a grammar inconsistency in round tips. Wayland-Smithy: - spellcheck: Fixed a missing space typo in ion law logic. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 grungussus: - bugfix: fixed metal foam plating description and add more user friendly explanation on how to replace tiling. grungussuss: -<<<<<<< HEAD - balance: The DNA vault now requires less animal and plant DNA to be completed - admin: admin RCD now works much faster. -======= - admin: admin RCD now works much faster. improvedname: - balance: Adds a threshold to oculine and increases metabolism, and reduces the @@ -1516,4 +1368,3 @@ - balance: The DNA vault now requires less animal and plant DNA to be completed oranges: - spellcheck: Gripper gloves are now Enhanced Retrieval gloves ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml index 6fa56bb5ff2..2c66c31dc5c 100644 --- a/html/changelogs/archive/2024-06.yml +++ b/html/changelogs/archive/2024-06.yml @@ -1,4 +1,4 @@ -<<<<<<< HEAD + 2024-06-02: '@xXPawnStarrXx, @Majkl-J': - bugfix: fixed an erroneous path to make the produce bin sprite appear. @@ -9,7 +9,6 @@ fulton packs! - bugfix: When a NODE Drone is forcibly separated from its vent, it will fly away. SkyratBot: -======= 2024-06-01: JohnFulpWillard: - rscadd: The Law office now has a pet goldfish. @@ -26,12 +25,10 @@ - bugfix: '[Tramstation] Departures and under east tram distro/waste pipes now properly connected' tralezab: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: New fish, the anxious zipzap - rscadd: New syndicate fish, the monocloning jumpercable - rscadd: New aquarium, the bioelectricity generator - bugfix: Mixotrophic fish now properly lack food requirements -<<<<<<< HEAD - rscadd: The Law office now has a pet goldfish. - rscadd: 'Station-Wide Background Checks (station trait, rare): Disables crew antagonists, but get a lot more non-crew antagonists' @@ -45,14 +42,11 @@ - bugfix: When removing a corrupted organ from a patient, the patient will now be checked for Holy Water or magic resistance, rather than the person performing the surgery. -======= zxaber: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Minebots purchased via mining points are no longer stuck in idle mode. Clicking on them will activate their AI. - spellcheck: Removed the examine text about feeding ore to minebots; this functionality was removed already. -<<<<<<< HEAD - bugfix: Fixes janitor borgs killing the machinery subsystem by charging light replacers 200k times a tick. oranges: @@ -61,8 +55,6 @@ - code_imp: Can now use kink toys on cyborgs xXPawnStarrXx: - bugfix: fixed an erroneous path -2024-06-03: -======= 2024-06-02: 00-Steven: - spellcheck: Photo descriptions containing living entities no longer have a pile @@ -86,20 +78,15 @@ - qol: Fermenting (wooden) barrels now have contextual helpers, to show what you need to do at a glance to interact with them. - code_imp: Documented a few of the fermenting barrel's variables. -<<<<<<< HEAD -======= Higgin: - bugfix: positive viruses are no longer hidden. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jane: - image: Central Command has cut funding to the Mining department, resulting in leather sleeves for the Shaft Miner Explorer Suit rather than the metal plates of before. -<<<<<<< HEAD LT3: - bugfix: Fixed bug where players could be invisibly attached to the tram forever Melbert: -======= JohnFulpWillard: - rscadd: You can now flush toilets. You can also put fish in the toilet. And flush them. @@ -117,7 +104,6 @@ Melbert: - balance: Re-ups the cost of the new ling adrenal ability - bugfix: Patches an exploit with new ling adrenal ability ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Wearing a mask can now prevent you from being spread airborne diseases. Prior, it only stopped you from spreading it yourself. - balance: Wearing a mask no longer 100% guarantees you don't spread viruses to @@ -130,7 +116,6 @@ (every eight seconds), rather than every two seconds. The chance of spread is the same, though - it has been scaled up to accommodate. - code_imp: Cleaned up a fair bid of airborne-transmission-code. Report any oddities. -<<<<<<< HEAD - balance: Re-ups the cost of the new ling adrenal ability - bugfix: Patches an exploit with new ling adrenal ability SkyratBot: @@ -140,7 +125,6 @@ - bugfix: Cryo tube respects `NO_DEBRIS_AFTER_DECONSTRUCTION` for the occupants visual contents flags & traits & won't allow hologram/abstract item interactions - code_imp: Cryo has improved attack chain & uses defines for reagent volume rounding -======= Metekillot: - qol: Sign language users can now sign in cuffs, but to a very limited degree. They also have more descriptive emotes for questions, exclamations, and a combination @@ -166,13 +150,11 @@ - balance: When an AI is alive, on main power, and not SSD its bolts cannot be raised or lowered externally. carlarctg: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added crutches! Wooden ones can be made with wood. Medical ones can be bought from the medvendor. - rscadd: Crutches will reduce slowdown from missing a leg by 60%, and they will remove the limping from fractured bones. (canes do that now too) They're also a fairly decent bludgeon. However, they do nothing if both legs are cut off. -<<<<<<< HEAD - refactor: Gondolas (including gondola pods) are now basic mobs. - bugfix: Fixed some borg modules just being constantly eaten up by borgs even when they shouldn't allow duplicates @@ -194,7 +176,6 @@ entities. .. Also removed that additional space they had too sometimes.. - qol: Photo descriptions containing living entities have these sub-descriptions split into newlines for ease of reading. -======= grungussuss: - qol: lathes will now print cables coils in packs of 5 - bugfix: added missing context tips for atmos canisters @@ -206,7 +187,6 @@ mc-oofert: - balance: you may not decap people with a plasma cutter necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: The various mining related suits now have consistent suit storage. Try putting a knife into your explorer suit's suit storage today! - balance: Bone armor work similarly to explorer suits, with similar armor values @@ -226,7 +206,6 @@ - balance: Berserker rage now halves brute damage rather than just adding Melee Armor to you and your squishy body. - qol: Berserker and H.E.C.K. helmets can be used for internals. -<<<<<<< HEAD - bugfix: ambush spider (should instantly agressive grab) and other giant spiders can now agressively grab - bugfix: positive viruses are no longer hidden. @@ -237,16 +216,13 @@ not. - bugfix: COMSIG_ATOM_POST_DIR_CHANGE is now a functional signal - balance: you may not decap people with a plasma cutter -======= nikothedude: - bugfix: COMSIG_ATOM_POST_DIR_CHANGE is now a functional signal norsvenska: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The NTSS Independence cryogenics thermomachine is now properly hooked up to the cryo loop. - qol: The NTSS Independence's medical bay has received improvements. The medibot and the sleeper are upgraded, and advanced surgery equipment has been added. -<<<<<<< HEAD - bugfix: you are now able to cancel the look up/down verbs from anywhere - refactor: ghetto chem separator has been reworked from scratch. See PR 83275 for details @@ -264,7 +240,6 @@ Goat: - bugfix: meta's cargo lobby and mining maintenance APCs is now connected to the power line -======= 2024-06-03: MTandi: - balance: 'Floor diseases cures are now common chemicals: Milk, Chlorine, Space @@ -287,7 +262,6 @@ Iajret: - bugfix: fixed being able to confirm cargo orders from cargo request console (and, probably, from PDAs) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jane: - balance: Spider Breachers and Vipers have swapped castes. Breachers come from Enriched Eggs while Vipers come from Abnormals! Breachers can no longer survive @@ -295,7 +269,6 @@ healed per wrap. Melbert: - sound: Boiling soup now makes a sound. -<<<<<<< HEAD PapaMichael: - spellcheck: Nukie uplinks no longer claim to have nonexistent "Tesla Energy Relays" SkyratBot: @@ -318,7 +291,6 @@ - bugfix: Fix artistic module not installable - qol: Made artistic module accessible at round start for any borg module 2024-06-07: -======= Time-Green: - bugfix: fixes touching a crutch permanently crippling you - bugfix: fixes crutches giving permanent speedboosts even when dropped @@ -332,7 +304,6 @@ Goat: - bugfix: meta's cargo lobby and mining maintenance APCs is now connected to the power line ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 GoldenAlpharex: - rscadd: Added Biomes capabilities to the Cave Generator, to allow for procedurally-placed biomes to be introduced in cave generation. This feature is not currently used @@ -341,7 +312,6 @@ - code_imp: Biomes can now affect features (which are usually structures), on top of flora and fauna. LT3: -<<<<<<< HEAD - balance: Doubled number of assignable wildcard slots on grey ID cards - balance: Doubled number of assignable wildcard slots on silver ID cards - balance: Doubled number of assignable wildcard slots on agent/chameleon ID cards @@ -355,7 +325,6 @@ single letter vars NullDagaf: - rscadd: watchers can now drop a new trophy -======= - qol: Icebox's service hall has a disposal unit again MelokGleb: - code_imp: crab17 telegraph now uses animated spinning telegraph circle instead @@ -403,7 +372,6 @@ - balance: Doubled number of assignable wildcard slots on grey ID cards - balance: Doubled number of assignable wildcard slots on silver ID cards - balance: Doubled number of assignable wildcard slots on agent/chameleon ID cards ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Rhials: - balance: cultist shades can no longer contribute to rune invocation until they've been out of their soulstone for a minute. Put them in a shell for God's sake! @@ -411,7 +379,6 @@ - code_imp: cult shades now have their own antag datum. - bugfix: constructs now properly clear the cultist antag datum and transfer the mind slightly earlier. -<<<<<<< HEAD - admin: Admins can now reroll random events into something else. SkyratBot: - bugfix: RLD glowsticks actually glow again. @@ -479,9 +446,7 @@ - bugfix: some missing modsuit (un)sealing messages should no longer be missing - bugfix: MOD circuit adapter core deployed parts output should work again - bugfix: Modsuit painter works again -======= SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: more examines & screentips for plumbing machinery - qol: plumbing grinder has a grind/juice mode which be toggled by hand - code_imp: improved attack chain for RPLD & plumbing grinder @@ -490,7 +455,6 @@ getting that item consumed - bugfix: You cannot grind abstract/ hologram items in the plumbing grinder - bugfix: growing vat now uses the correct layer selected on rapid plumbing device -<<<<<<< HEAD - qol: you now don't need to weld a closet to install/uninstall electronics/card readers. - bugfix: 'Tool-based flashes (read: from welders) are no longer incorrectly locked @@ -512,7 +476,6 @@ 2024-06-09: Goat: - bugfix: mobs no longer move during cutscenes -======= mc-oofert: - balance: cult stun gets weaker when they get red eyes and later more when they have halos @@ -608,12 +571,10 @@ Melbert: - bugfix: Fix some modifiers to do after speed (sanity, midas gun) stacking when they shouldn't ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 MichiRecRoom: - qol: Personal AI's face display selection is now a radial menu. As a bonus, now you can see what the faces look like before selecting them. Rhials: -<<<<<<< HEAD - rscadd: Adds some more station-trait dependent pulsar star reports. Keep an eye on that roundstart command report! - bugfix: Only filled graves will impact your mood. @@ -688,7 +649,6 @@ - bugfix: Hardcore random no longer mistakenly makes your hair white, this was not a feature. ShizCalev: -======= - bugfix: Only filled graves will impact your mood. SyncIt21: - spellcheck: Corrected wrench contextual screentip typo for smart fridge @@ -732,7 +692,6 @@ ShizCalev: - bugfix: Basic bots are now in the proper faction and will no longer be targeted by turrets. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: The spooky element will now apply the spooked mood event when someone is spooked. - bugfix: Fixed spookers getting a popup message when spooking mobs not actively @@ -741,11 +700,9 @@ heresy mood event. - bugfix: Seeing skeletons while having the skeleton phobia will now apply the spooked (by skeletons) mood event. -<<<<<<< HEAD - bugfix: Basic bots are now in the proper faction and will no longer be targeted by turrets. SkyratBot: -======= - bugfix: Getting surgically cut open while conscious will now give you the "THEY'RE CUTTING ME OPEN!!" surgical mood event. TheBoondock: @@ -796,7 +753,6 @@ - rscadd: medical chem vendors now sell bottles of calomel, a potent full-range chemical purger. Iamgoofball: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Changelings now do not like fire, as is tradition. - balance: If they are on fire, they no longer generate chemicals until they put the fire out. @@ -812,7 +768,6 @@ - bugfix: Fixes items you're holding not catching on fire alongside the rest of you when you light on fire. - bugfix: Fixes the Changeling Shield having one more hit than it was supposed to. -<<<<<<< HEAD - code_imp: stacking machine consoles check in area instead of a tiny view range on init - bugfix: Fixes several service and item-handling borg modules not functioning @@ -852,7 +807,6 @@ - bugfix: The orbit menu clicks are accurate again Thlumyn: - bugfix: add general engineering access to birdshot engineering entrance -======= IsaacExists: - bugfix: You may no longer submit, or obtain, a spy bounty for the contractor baton. LT3: @@ -874,7 +828,6 @@ - rscadd: Adds a positronic sphere to bepis tech and roboticist mail goodies. It can now wreack havoc across the robotics lab while whining for a DURAND body, but you can also punt it! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 WebcomicArtist: - rscadd: Added zaukerite (high damage/embed, low AP) and metallic hydrogen (High AP and piercing, but low embed) crossbow ammo for the rebar crossbows @@ -893,7 +846,6 @@ - bugfix: fixed rebar crossbow shots not dropping items on hitting walls - bugfix: fixed traitor crossbow having worse wound chance than the base one - sound: added new crossbow firing sound effect -<<<<<<< HEAD sprites by INFRARED_BARON: - image: New icons for Marauder, Seraph, Mauler and adjusts the Phazon/Dark Gygax's sprites. @@ -947,7 +899,6 @@ 2024-06-13: Majkl-J: - bugfix: Events can now spawn again -======= 2024-06-11: Addust: - bugfix: The Syndicate has corrected some technical issues at a listening post @@ -976,7 +927,6 @@ - bugfix: blood drunk miner can now path over lava NewyearnewmeUwu: - balance: Pacifists can now use psychotic brawling, at major mood costs. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 PowerfulAtom111: - rscadd: after a quick galactic meeting, insane people around the universe can now speak gibbering to express their ideas free from the prying ears of the @@ -985,27 +935,23 @@ all the other insane people are speaking - spellcheck: added a bit of text to the RDS quirk and the RDS medical record text to highlight the insane's new abilities -<<<<<<< HEAD SkyratBot: - bugfix: The recyclers in the snow cabin gateway, the cyborg mothership, and the deep storage space ruin are now rotated properly. - bugfix: there is now one more crayon in the Mortidrobe. - rscadd: Added another ruin to Lavaland - balance: Pacifists can now use psychotic brawling, at major mood costs. -======= aaaa1023: - bugfix: there is now one more crayon in the Mortidrobe. grungussuss: - bugfix: fixed getting a fake white dwarf report when the shift isn't extended mode, which lead to meta knowledge being used. munchyi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: 'added a new virtual domain :cl: ![image](https://github.com/tgstation/tgstation/assets/154919526/2d94fe21-bc45-40dc-9f84-4b69088b353c)' -<<<<<<< HEAD grungussuss: - bugfix: fixed getting a fake white dwarf report when the shift isn't extended mode, which lead to meta knowledge being used. @@ -1082,7 +1028,6 @@ gender. - sound: '*gasp now makes a sound, it''s the same as *gaspshock.' - sound: Xenos (or anything with hands) can clap -======= norsvenska: - bugfix: The recyclers in the snow cabin gateway, the cyborg mothership, and the deep storage space ruin are now rotated properly. @@ -1111,7 +1056,6 @@ Melbert: - rscadd: Character Loadouts - rscdel: Pride Pin quirk (it's in the Loadout menu now) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Over 200 item interactions have been refactored to use a newer, easier-to-use system. Report any oddities with using items on other objects you may see (such as surgery, reagent containers like cups and spray bottles, or construction @@ -1123,14 +1067,12 @@ such as hotkey, clicking on the storage boxes, and mousedrop will still work). - refactor: The detective's scanner will now be inserted into storage items if clicked normally, and will scan the storage item if on combat mode -<<<<<<< HEAD - sound: Portals made by portal guns now make sounds as expected - sound: Wormholes from the wormhole event now make sounds when formed - bugfix: Human mousedropping - bugfix: Fix inability to make r-glass by hand inside your backpack - balance: Taking stamina damage in stamcrit has diminishing returns associated, meaning you cannot be infinitely stamcrit. -======= - balance: Taking stamina damage in stamcrit has diminishing returns associated, meaning you cannot be infinitely stamcrit. Rhials: @@ -1228,15 +1170,12 @@ gender. - sound: '*gasp now makes a sound, it''s the same as *gaspshock.' - sound: Xenos (or anything with hands) can clap ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Re-adds Bagulo - balance: 'The max number of bluespace cores available to the crew has been reduced to 3 (was: 8)' - balance: Chucking a BoH into an uncharged singulo may save the station. -<<<<<<< HEAD Moostard: - rscadd: New armor piercing hypospray design can be researched now. -======= - sound: Portals made by portal guns now make sounds as expected - sound: Wormholes from the wormhole event now make sounds when formed - bugfix: Heirophant Club Blink at range @@ -1266,13 +1205,11 @@ - balance: Gorillas can strangle people. Melbert: - bugfix: Fix inability to make r-glass by hand inside your backpack ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ShizCalev: - bugfix: Fixed some surgery failure states not properly setting the correct mood event. - refactor: Minor refactor to how surgery events work, there is now better support for per-surgery mood events! -<<<<<<< HEAD - bugfix: Fixed a bug with station traits being added to modify weights for events that couldn't actually occur on the current map! SkyratBot: @@ -1336,7 +1273,6 @@ 2024-06-17: Gandalf2k15: - bugfix: You are no longer GBJd -======= Wayland-Smithy: - bugfix: Fixed revenant spawning next to brains and other unharvestable dead mobs. WebcomicArtist: @@ -1345,12 +1281,10 @@ - bugfix: Cosmos spells will no longer star mark your steed - qol: Baby plushies are now smaller than their parents 2024-06-17: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Hacks-The-Doors: - balance: dental pills can now be used in crit. - balance: dental pills now give off a message when you start using them - balance: dental pills have a 2.5 second delay when in soft crit -<<<<<<< HEAD SkyratBot: - sound: added compressed air sound for when air tanks are inserted into machinery - balance: Certain changeling abilities won't work while on fire. @@ -1359,14 +1293,12 @@ xXPawnStarrXx: - rscadd: Added new primitive, power free farming methods. - bugfix: stopped shelves spawning clay. (You don't think I saw you, but I did...) -======= JackEnoff: - balance: Certain changeling abilities won't work while on fire. TheBoondock: - sound: added compressed air sound for when air tanks are inserted into machinery grungussuss: - rscadd: Added Misha the bear to the HoS office on icebox. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 2024-06-18: Bisar: - balance: Replaced the free reagent purging with actually purging by exploding @@ -1374,7 +1306,6 @@ Let's go practice medicine! - bugfix: Fixed the free reagent purging mechanic from causing an explosion so weak that it doesn't cause any damage. -<<<<<<< HEAD Goat: - qol: fire extinguishers can now be filled via stationary tanks. (and water coolers) LT3: @@ -1521,7 +1452,6 @@ beam rifle. It shoots black holes. You can make this in-game. That's right, YOU! - balance: Only one vortex anomaly can be made in a round. -======= GPeckman: - bugfix: Mining borgs can get multiple modkits of the same type installed again. Goat: @@ -1547,7 +1477,6 @@ - rscadd: Added a variant of machinery scan experiment that accepts any machines with upgraded parts (required for tier 3 parts) - rscdel: Removed material scanning experiments from the tech tree -<<<<<<< HEAD - image: Resprited all jetpacks - qol: Fullscreen mode can now be toggled by pressing F11 or the button at the top right @@ -1555,7 +1484,6 @@ - rscadd: Added disks for accelerator modkits and crusher trophies to the bitrunning vendor - bugfix: Conga lines of more than 2 no longer break when going up and down stairs. -======= Melbert: - qol: Block'd out armor readout, should be more readable now - bugfix: Crusher Fix For Real @@ -1666,7 +1594,6 @@ - bugfix: gasping makes sound now 2024-06-21: 00-Steven: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - refactor: Updated cards/ids to use the proper item interaction system instead of attackby, please report any issues. - bugfix: You can no longer recolour an ID at any point if you open the menu but @@ -1675,8 +1602,6 @@ - qol: Prisoner IDs show genpop sentence time in hours/minutes/seconds instead of seconds. - qol: Prisoner IDs have genpop usage tips in their examine. -<<<<<<< HEAD -======= ArcaneMusic: - qol: Vending machines now give audio feedback when you restock a vending refill and get a payout. @@ -1709,7 +1634,6 @@ MTandi: - image: New gibber sprite - image: New food/slime processor sprite ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Added ordnance to extra access of geneticists and roboticists - balance: Reduced parts scanning tests' machine count to 4 from 8 - balance: Reduced augmented organs scanning tests mob count to 1 from 2 @@ -1718,7 +1642,6 @@ - bugfix: Allowed NTNet relay in away circuit imprinter for NT Frontier app - qol: NT Frontier app installed on RD and Scientists` PDAs by default - qol: Updated NT Frontier app to be more user-friendly -<<<<<<< HEAD - bugfix: Repurposed Glands (Adrenals) now show their correct duration and chemical cost in its description. grungussuss: @@ -1733,7 +1656,6 @@ - rscadd: Character Loadouts - rscdel: Pride Pin quirk (it's in the Loadout menu now) SkyratBot: -======= Rex9001: - bugfix: lunatics now get their hud properly - bugfix: lunatics now get objectives @@ -1791,7 +1713,6 @@ - balance: most livestock crates, with some exception, have been made cheaper to facilitate healthier mental states in the crew, go build a farm! jlsnow301: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: 'Bitrunning made more illegal: Increased the rate at which antags spawn.' - bugfix: '"Temporary" bitrunning antagonists and spawners are made actually temporary. You will return to your original body after death, just like CTF.' @@ -1801,7 +1722,6 @@ by clicking the hololadder and netpod respectively. - rscdel: Removed the starfront saloon BR map. - bugfix: 'Syndicate assault map: Added pistols, reduced exploits.' -<<<<<<< HEAD - balance: most livestock crates, with some exception, have been made cheaper to facilitate healthier mental states in the crew, go build a farm! - image: added sprite for debug heretic painting @@ -1820,10 +1740,8 @@ menu. SkyratBot: - bugfix: crayons interact with washing machine once again -2024-06-25: -======= 2024-06-24: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + Bisar: - balance: Sparks have been heavily adjusted; they only affect items made of plasma, pools of welding fuel, flammable people, cigarettes, and items that contain @@ -1831,12 +1749,10 @@ has been untouched. DATA, with sounds by Beebblie: - sound: Added sounds for turning on and off internals. -<<<<<<< HEAD LT3: - bugfix: Smartfridge will now correctly respond 'no power' instead of 'forbidden item' when it doesn't have power Melbert: -======= GoblinBackwards: - rscadd: Breathing nitrium now has a chance to make you burp. Kocma-san: @@ -1850,12 +1766,10 @@ - bugfix: Touch Spells now apply click CD again - bugfix: Touch Spells now apply fingerprints again - bugfix: Touch Spells now check if your hands are blocked again ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Fixed plate shards not randomizing icon correctly - qol: Gives plate sharts a more fitting hitsound / caltrop sound, gives them a set caltrop stun duration (instead of default) - bugfix: Fix DNA vault probes -<<<<<<< HEAD - bugfix: Touch Spells now apply click CD again - bugfix: Touch Spells now apply fingerprints again - bugfix: Touch Spells now check if your hands are blocked again @@ -1886,7 +1800,6 @@ 2024-06-26: Bisar: - bugfix: The light eater can now again eat lights from things with lights. -======= - bugfix: Bloody footprints now go until you run out of blood on your feet instead if only a single tile - rscadd: Adds an effect for emagging an emag @@ -1915,7 +1828,6 @@ - spellcheck: rewrote parts of the lunar heretic's abilities, items and traumas - spellcheck: rewrote GLA device's description for clarity - spellcheck: Grapple gun's description has been updated. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fluffles: - bugfix: emoji show up in the messenger UI - bugfix: emoji show up in the message server monitor UI @@ -1927,7 +1839,6 @@ - bugfix: deadchat pda messages show the imprinted sender's name instead of whoever is holding the pda - bugfix: emoji show up in deadchat pda messages -<<<<<<< HEAD Goat: - rscadd: Added boards for the library's book binder and scanner, printable at the service fabricator once computer tech is researched. Spritework done by lepiromano. @@ -1941,7 +1852,6 @@ color corresponding to the type of said dart loaded in it instead of a generic bullet sprite. SkyratBot: -======= FlufflesTheDog: - bugfix: printed medical beds are no longer randomly offset Goat: @@ -1953,16 +1863,13 @@ Guestify: - bugfix: Fixed secbots and mulebots bold text IsaacExists: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - spellcheck: Shrapnel removal messages now have closing parenthesis, removed unnecessary punctuation. - spellcheck: The nutriment pump implant's description in the lathes are no longer typo'd. -<<<<<<< HEAD - bugfix: printed medical beds are no longer randomly offset - admin: Admins have a new secret to mass revive and heal all players on the server. - rscadd: wawastation stand-in shuttle -======= Jacquerel: - bugfix: Minebots, Tamed Wolves, and Regal Rat Minions will now give you some space if you start attacking yourself, rather than joining in. @@ -2007,14 +1914,12 @@ - code_imp: Improves the definitions for welding protection values. - bugfix: The Stimmed mutation now has the appropriate instability value for a largely meaningless mutation. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: The nullblade, a nullrod variant that is weaker outright, but can inflict severe wounds by performing a sneak attack. Debilitate your target or attack from behind. - bugfix: The shortsword sprite no longer has a misaligned handle. - code_imp: Organized the nullrod file, and removed some unnecessary subtyping on various types of nullrods. -<<<<<<< HEAD - bugfix: Refactored borg omnitool code, fixing most of the unique interaction issues. - bugfix: The Infiltrator module now has the same welding protections as the engineering module. @@ -2082,7 +1987,6 @@ - qol: ' The xenobio console''s monkey placing command also clears dead monkeys on the tile.' - bugfix: Spraycans can once more paint things. -======= norsvenska: - bugfix: '[IceBox] The Head of Personnel''s Requests Console announcements now correctly display the HoP as the announcer, rather than "Unknown"' @@ -2121,13 +2025,11 @@ - bugfix: Spraycans can once more paint things. - bugfix: RND console now properly rounds research points SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: alt click runtime no more when using style meter - code_imp: improved alt & ctrl click code Vekter: - balance: The Event Horizon Anti-Existential Beam Rifle now requires Unregulated Bluespace Research to be constructed. -<<<<<<< HEAD 2024-06-28: LT3: - rscadd: New DeForest heavy medical kit, technician satchel @@ -2142,7 +2044,6 @@ effects from being 1-small as well - bugfix: Lizards and Moths don't deathgasp twice when they die - bugfix: Fixed cyborg omnitools being unusable on some things -======= Watermelon, Mayhazah: - balance: Drastically reduces the power consumption and max charge of power cells - balance: Added a new stock part called the battery, used primarily in the construction @@ -2195,13 +2096,11 @@ effects from being 1-small as well - sound: Glug-glug sound when dragging a leaking gas tank - bugfix: Lizards and Moths don't deathgasp twice when they die ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melberte: - rscadd: Cool Sword Cursor Maintenance App ShizCalev, SpaceLove: - refactor: Techweb strings are defined now so to maintain modularity - balance: Research papers will have less overall point generation. -<<<<<<< HEAD SkyratBot: - rscadd: Crystallizer boards added to Delta and Tram HFR rooms - balance: Mediborg surgical omnitool upgrade makes the health analyzer advanced @@ -2249,11 +2148,9 @@ - balance: Adamantine golem shells require 3 sheets rather than 1, due to unknown circumstances. - bugfix: Fixed disconnected APC on birdshot and other minor service fixes. -======= SmArtKar: - bugfix: Retracted pens can be put into PDAs SyncIt21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: adds examines, screentips & balloon alerts for flatpacker, flatpack box & cart - qol: adds correct material colour insertion animation for flat packer, continuous @@ -2271,12 +2168,10 @@ - bugfix: correct cost of the design scaled with `creation_coefficiency` is displayed in the UI - code_imp: overall improved code quality of all things flat pack related -<<<<<<< HEAD Vekter: - bugfix: Fixed the visibility of a pipe in Northstar's ordnance lab - bugfix: Fixes the door-bolting buttons in the dorms and bathrooms on Birdshot. 2024-06-30: -======= - bugfix: actions buttons can be dragged anywhere again Viralmilk22: - rscadd: Shifted up the service departments on Birdshot. @@ -2309,14 +2204,12 @@ creating fringe weaver beverage when ground up. qol: sugar may be acquired from grinding fireblossoms instead of polypore mycelium.' 2024-06-29: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bisar: - rscadd: Ashwalkers now start out allied to lavaland fauna (except for raptors). Attacking the fauna will break this alliance with the attacked beast and any who witness it. - bugfix: Ashwalkers are now actually in the ashwalker faction, instead of the neutral one. -<<<<<<< HEAD JohnFulpWillard, Tattax: - rscadd: Monkeys can now wear all jumpsuits. - rscadd: Bioscrambler anomalies can now give monkey legs. @@ -2335,7 +2228,6 @@ - bugfix: Airlocks will now correctly said what other airlock they are cyclelinked with. - bugfix: Portaturrets no longer go invisible when unwrenched from the ground. -======= EnterTheJake: - rscadd: A new Anomaly organ has been introduced, The Voltaic Combat Cyberheart! Higgin: @@ -2359,13 +2251,11 @@ - bugfix: peg legs can't bleed ShizCalev: - bugfix: Toggling ambient ship sounds will now instantly turn it on/off. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Deafened mobs will no longer hear the station's ambient sounds. - bugfix: Fixed ambient sounds resetting their loop when entering different bodies (ie admin ghosting, being moved to other mobs, ect.) - bugfix: Monkeys that become sentient through the sentience helmet will no longer be notified that they can ventcrawl. -<<<<<<< HEAD - bugfix: Toggling ambient ship sounds will now instantly turn it on/off. - bugfix: The soups wiki page no longer has error icons for soups that don't have unique sprites. @@ -2451,7 +2341,6 @@ properly - code_imp: Various improvements to taur leg code - code_imp: Taur bodies are properly subtyped -======= - bugfix: Airlocks will now correctly said what other airlock they are cyclelinked with. - bugfix: Portaturrets no longer go invisible when unwrenched from the ground. @@ -2544,4 +2433,4 @@ - bugfix: fixed the name of a request console in the medical sec outpost on metastation mc-oofert: - bugfix: both engineers and roboticists may now access the controls of a firebot ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml index 526fe6b10a4..e6cdb357a35 100644 --- a/html/changelogs/archive/2024-07.yml +++ b/html/changelogs/archive/2024-07.yml @@ -1,5 +1,4 @@ 2024-07-01: -<<<<<<< HEAD LT3: - rscdel: Removed references to security medic cargo packs - code_imp: Blood filter only pings and says finished when it's actually finished @@ -51,16 +50,13 @@ xXPawnStarrXx: - rscadd: Added new medical tools 2024-07-02: -======= Ben10Omintrix: - balance: raptors will now knock off their rider and disable them if hit by any energy projectiles or if they recieve any stamina damage ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Chestlet: - bugfix: Nanotrasen sent us a batch of faulty canisters. They've been recalled and replaced with less faulty canisters. - bugfix: Zauker SM interaction works correctly now. -<<<<<<< HEAD Kapu (ported by StrangeWeirdKitten): - bugfix: Ambience buzz will now respect ship ambience prefrences for observers. - sound: Ambience buzz requires APC enviorment power to function @@ -81,7 +77,6 @@ a few invocation types. - balance: portable air scrubbers scrub in a 3x3 square + hold as much gas as a canister -======= DaCoolBoss: - image: Relics ("strange objects") now have unique sprites. Iajret: @@ -138,7 +133,6 @@ - bugfix: brig cell timer ui works properly now - bugfix: wawastation arrivals has firealarms so you may now leave necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Mecha weaponry is capable, for the first time ever, of experiencing recoil. This was an intended mechanic, I promise. The code just literally never worked. - bugfix: Mecha bump melee attacks and click melee attacks are now on the same cooldown, @@ -147,7 +141,6 @@ - bugfix: You must be in combat mode to punch objects and to bumpsmash into objects. - bugfix: Stops mecha being able to punch literally any object and damage them. - code_imp: Tidies up some of the autodoc comments for mech weapons. -<<<<<<< HEAD - rscadd: Shield generators and shield gen walls now glow a light blue. Pretty! - bugfix: You can grind slime extracts in reagent grinders once more. - bugfix: Fixed some UI bugs in the power monitor screen. @@ -242,7 +235,6 @@ - bugfix: Fixed experimental dissection surgeries giving too many points - balance: 'Techweb: Moved NTNet relay back to tcomms node' - balance: 'Techweb: Moved blood pack and chem pack to the starting node' -======= spockye: - bugfix: fixed Wawastation areas - bugfix: fixed wawastation disposals @@ -252,7 +244,6 @@ - rscdel: Removed cordons on deathmatch maps, since they're autoadded now. 2024-07-02: 00-Steven: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Moved bedsheet bin interactions to the item interaction code. Please report any issues. - qol: Made bedsheet bin tool interactions right click, such that left click is @@ -261,10 +252,7 @@ - qol: Added more feedback to failing to hide items in bedsheet bins. - sound: Made putting items in bedsheet bins not silent (If the items have associated pickup/drop sounds). -<<<<<<< HEAD - image: Fixed shading on some metal ingots. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Deconstructing light switches now uses the proper tool action and tool usage code, please report any issues. - bugfix: Attempting to deconstruct a light switch by unscrewing it no longer makes @@ -278,7 +266,6 @@ - qol: Added an examine hint denoting light switches are screwed to the wall. - qol: Added visible messages for someone deconstructing a light switch parallel to deconstructing intercoms. -<<<<<<< HEAD - bugfix: portascrubbers also scrub the tile theyre on - rscadd: Ghost role food truck merchants may occasionally turn up at the station. - rscadd: Adds a new fugitive hunter type, MI13 secret agents. @@ -356,7 +343,6 @@ - rscadd: You can now microwave station pets that you can pick up, with predictable outcomes - image: The sprites for the projectile dampener field have been updated -======= Bisar: - qol: Loot panels should update more predictably and informatively now. - code_imp: Lootpanels have more consistent logic on when they automatically update. @@ -468,14 +454,12 @@ - bugfix: portascrubbers also scrub the tile theyre on 2024-07-04: 00-Steven: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - code_imp: Moved bedsheet interactions to the item interaction code. Please report any issues. - bugfix: Bedsheets adjust their offset to match that of the living they're tucking in. - sound: Bedsheets use the cloth drop/pickup sounds instead of being silent. - qol: You can tuck someone in telekinetically. -<<<<<<< HEAD - rscadd: mecha wire that shoots you or anyone nearby if pulsed or cut - bugfix: mecha shock wire shocks you - bugfix: Reverts the fully interactive lootpanel, please just refresh it if you @@ -510,7 +494,6 @@ - bugfix: Mending touch no longer damages non-humans - bugfix: fixes mansus grasp not clearing runes - image: Fixed the cargo crate having wrong stripe width in open state -======= ArcaneDefence: - rscadd: You can now microwave station pets that you can pick up, with predictable outcomes @@ -555,12 +538,10 @@ - bugfix: medi borgs can do brain surgery again - code_imp: improved multitool & general tool code for some machines - bugfix: you can hold your wound while resting via ctrl click ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: material container won't consume the contents of an item if that item itself is rejected for any reason - qol: you can use any storage medium & not just bags/boxes to dump stuff into material containers -<<<<<<< HEAD - balance: Facehuggers dont make people go to sleep but muffles speech - code_imp: Very very minor xenomorph code cleanup - refactor: Muzzles are now an element @@ -596,7 +577,6 @@ - rscdel: Removed science variant of plumbing RCD - bugfix: Fixed a bug when machines without stock parts didn't spawn frames on deconstruction - bugfix: Fixed vat grower not growing -======= - code_imp: improved mouse drag & drop code - code_imp: Improves cpu performance of transferring & removing reagents - bugfix: plumbing machinery should have consistent volumes throughout the course @@ -659,7 +639,6 @@ - qol: 'Techweb: Added fully augmented android scan discount experiment for Advanced Cybernetic Organs techweb node' - qol: Data disks are now printed in lathes instead of circuit imprinter ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'Techweb: High yield explosive is now a discount experiment for Exotic Ammo node, giving more free points' - balance: 'Techweb: Replaced the botany/xenobio discount experiments with a new @@ -678,11 +657,9 @@ trees' - qol: Made air horn craftable from a spraycan and a bikehorn - qol: 'Techweb: Better wording on the slime scan experiment' -<<<<<<< HEAD - balance: Settlers are a bit slower on their steeds. - image: Goody case locked/unlocked sprites have been swapped again, having a gap for unlocked and no gap for locked. -======= - refactor: Vat grower is a normal machine now that doesn't need plumbing - qol: Cytology petri dish smartfridge starts with 3 random samples - rscadd: Added protein powder condiment bottle, available in the cytology supplies @@ -701,14 +678,12 @@ Zergspower: - bugfix: fixes borgs ability to climb aaaa1023: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Increased view_range on the Psyker Bounty Hunters' Shuttle navigation console. - bugfix: 'Fixed the shuttle navigation console camera eye being incorrectly offset on: the SpacePol van, the Russian bounty hunters, the default bounty hunters, the Psyker bounty hunters, and the MI13 Foodtruck.' - bugfix: Fixed the SpacePol van, Russian bounty hunters, default bounty hunters, and Psyker bounty hunters' shuttles all flying in incorrect directions. -<<<<<<< HEAD - qol: Linked speech now prevents messages from highlighting if its a message you sent, or if you are the owner of said link.. - qol: Linked speech messages are now marked as radio messages, for chat tab purposes. @@ -788,7 +763,6 @@ 2024-07-09: LT3: - bugfix: Fixed medical stacks like mesh and sutures not treating wounds -======= - bugfix: 'Fixed the following shuttles flying in unexpected directions: Pubby escape pod, Humpback emergency shuttle, Pubby monastery shuttle, Birdboat emergency shuttle, Birdshot emergency shuttle' @@ -857,7 +831,6 @@ - bugfix: ' Birdshot botany is resized. bar is also smaller.' - bugfix: Birdshot public shrine now uses the correct dirt. (Goodbye chasms) LT3: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Advanced Medbay Equipment research node lowered to tier 3 - balance: Advanced Medbay Equipment now requires haloperidol scan experiment - balance: Haloperidol and cryostylane experiments can be performed roundstart @@ -865,7 +838,6 @@ - balance: Cryostasis now has Fusion instead of Controlled Plasma as a prerequisite - balance: Cryostasis cryostylane scan is now a discount experiment - balance: Crystallizer moved from Controlled Plasma to Fusion -<<<<<<< HEAD Majkl-J: - bugfix: Brings loadouts back on par with the old system mechanically Melbert: @@ -911,7 +883,6 @@ - bugfix: Fixed the bluescreen while setting a custom font in tgui panel - rscadd: 12% chance of a ouija board spawning in the chaplain office. Wawastation always has one. -======= Loafin34: - rscadd: There's a previously undiscovered variant of a nullrod, recently revealed from the depths of the skating rink.. @@ -926,7 +897,6 @@ windows not being able to embed into anyone. - refactor: Refactored embedding code to use datums instead of bespoke elements and ugly associated lists. -<<<<<<< HEAD - balance: Bait quality now influences the probabilities of getting a rarer fish compared to the most common one(s) - bugfix: paintings can be sponsored again @@ -939,7 +909,6 @@ xXPawnStarrXx: - bugfix: fixed my medical tools not being printable. 2024-07-10: -======= - bugfix: You require breathing once more. Toastgoats: - rscadd: Added the designer EVA suit, a unique pirate hardsuit for Silverscales. @@ -1011,16 +980,13 @@ JohnFulpWillard: - qol: You can now use a spoon or ladle on an ice cream vat to spill a reagent, ridding the machine of all reagent of that type. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Jolly: - code_imp: Behind the scenes, atmos machines (freezers/mixers) in maps were tweaked a bit. If you see them no longer connected to specific pipenets, please make an issue report, this is not intended behavior!! -<<<<<<< HEAD LT3: - qol: Hypospray and flashlight can be put in labcoat pockets Rhials: -======= Kocma-san: - qol: the disposal unit has been added to the cargo bay and miner's office. - bugfix: missed disposal pipe returned at QM's office @@ -1029,13 +995,11 @@ Rhials: - admin: Narrate verbs will now allow you to pick what text formatting span you want to use before you send them, if any. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Certain items can no longer be purchased or be offered with a discount on a loneop uplink. This is stuff like base cards (functionally useless) or Overwatch Intel Agents (which break the role). - balance: Loneops may now purchase chameleon noslips, station blackout triggers, and station comms failure triggers. -<<<<<<< HEAD SkyratBot: - bugfix: Missing janitor access restrictions have been added to Birdshot's custodial closet doors. @@ -1059,7 +1023,6 @@ preinstalled. - bugfix: fixed CNS rebooter/Changeling adrenaline not preventing/fixing stamina crit -======= SmArtKar: - bugfix: Blood filters should filter out reagents completely now instead of leaving a small amount no matter what. @@ -1114,7 +1077,6 @@ SyncIt21: - bugfix: stacking machines can be linked with its console via multitool aaaa1023: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscdel: 'Removed the shuttle manipulator entries for the following shuttles: Northstar ferry, Omegastation arrivals shuttle, and Donutstation cargo ferry. (These shuttles didn''t actually exist but they still had entries in the manipulator.)' @@ -1123,7 +1085,6 @@ Pubby cargo shuttle, and Delta cargo shuttle.' - bugfix: Fixed the ERT bounty shuttle having incorrect offsets in the shuttle navigation console. -<<<<<<< HEAD - qol: the disposal unit has been added to the cargo bay and miner's office. - bugfix: missed disposal pipe returned at QM's office - rscadd: Living flesh arms have a chance to actually touch the thing they're targeting @@ -1162,7 +1123,6 @@ instead, it uses the janitors regular area.' - bugfix: '[Birdshot] The entertainment center now has an APC.' - bugfix: '[Birdshot] A handful of smaller areas have received air alarms.' -======= grungussuss: - sound: Zippos, Lighters and cigarettes now have sound lizardqueenlexi: @@ -1181,7 +1141,6 @@ very slightly. - qol: You can now longer matrix-flip yourself into exhaustion, unless the emote is unintentional. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Melbert: - rscadd: 'Bot Language station trait split into two: One that affects bots (retains the old weight and cost) and one that affects machine (half weight, double the @@ -1190,7 +1149,6 @@ longer affect newly created machines or bots, just those present at game start - rscdel: Machine Language station trait cannot affect the Automated Announcer in telecomms -<<<<<<< HEAD SkyratBot: - refactor: move `status_display_bottom_text` and `fire_alarm_light_color` to security level prototypes @@ -1510,7 +1468,6 @@ now just being allowed to beep. - qol: Moths that pray get a moffin 2024-07-21: -======= SmArtKar: - bugfix: Vapes use correct fill level overlays - bugfix: You no longer try to pull out someones eyes in combat mode if they have @@ -1520,7 +1477,6 @@ carlarctg: - bugfix: Fixed an oversight that caused knockdown vomits to stun instead. 2024-07-12: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 00-Steven: - bugfix: You can see runechat above fullscreen overlays on lower multi-z levels again. Rejoice, blind players. Please report any weird rendering layering issues. @@ -1538,8 +1494,6 @@ - qol: N-spect scanner contextual screentips. - balance: Recharger security bounties ask for a quantity of 1, down from 3. - qol: security, cargo, and medbay have access to scanner gate boards. -<<<<<<< HEAD -======= Deadgebert: - balance: Moves XL beaker from Chemical Synthesis to Medbay Equipment - balance: Removes Plumbing node and moves most items to Chemical synthesis node @@ -1922,7 +1876,6 @@ AyIong: - bugfix: Announcement subheader will no longer overlap the header if the second one is very long ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DrDiasyl aka DrTuxedo: - rscadd: Security and Engineering holosigns can now be opened with their projector by clicking them from afar @@ -1935,7 +1888,6 @@ - spellcheck: Holosigns and holosign creators' descriptions give more information now GPeckman: -<<<<<<< HEAD - spellcheck: The techweb no longer erroneously refers to MODsuits as exosuits. Hardly3D: - rscadd: 'Added new hairstyle: Short Bangs 2' @@ -1973,8 +1925,6 @@ - qol: The Coroner Drobe got sorted into less 'shove everything in' and more 'in a sane format'. - image: Changed some default options in the character creator. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added the civilian modsuit module as a standalone model. It offers no slowdown while activated but does NOT protect you from the void of space. You can print the plating from an exosuit fabricator and build it like a normal @@ -1983,7 +1933,6 @@ model. - image: Tweaked the sprites for the civilian modsuit head, both in-hand and on the mob. Also added a civilian mod plating sprite. -<<<<<<< HEAD - image: Brainwashing victims now have smoothed out brain sprites without those pesky wrinkles - balance: reduced the prices of some blackmarket items across the board. @@ -2038,7 +1987,6 @@ - bugfix: another clothing file fixed - rscadd: Added admin spawnable Redsec varients to the override file 2024-07-22: -======= Ghommie: - bugfix: fixed megaphone tts filter. MTandi: @@ -2078,7 +2026,6 @@ zoomachina: - qol: chem dispenser displays units instead of kilowatts 2024-07-21: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 DrDiasyl aka DrTuxedo: - rscadd: Scanner gates now blare into the chat the reason why it got triggered - rscadd: Scanner gates now can have false positives/negatives, and the chance of @@ -2089,14 +2036,6 @@ - qol: Scanner gates description now tells to what mode they are set - bugfix: You no longer can remove N-Spector from scanner gates without unlocking them first -<<<<<<< HEAD - SkyratBot: - - qol: Mod UI is narrow again - - bugfix: Closing mind transfer popup does not transfer your mind anymore - - bugfix: Fixed beyblade *flipping. - - bugfix: Recalling lantern wisp now properly removes its effects from you - - spellcheck: Fixed a typo in the description for the Syndicate Rebar Crossbow in - the Uplink. 2024-07-23: LT3: - balance: APCs are no longer arc shielded by default @@ -2106,8 +2045,6 @@ you see any broken icons. Also if all the icons look like missing file icons for you, you gotta update byond man, you're like a year out of date. - rscadd: Fox infusion has more content related to it now - SkyratBot: -======= Inari-Whitebear: - spellcheck: Fixed a typo in the description for the Syndicate Rebar Crossbow in the Uplink. @@ -2125,7 +2062,6 @@ hardcoded pixel values - bugfix: Fixes organizer sometimes deleting brains Time-Green: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Gives voidwalker telepathy - bugfix: Fixes the Unsettle ability ignoring line of sight (which was it's sole gimmick, im just dumb) @@ -2139,7 +2075,6 @@ - balance: Gives voidwalkers chunky fingers - balance: Voidwalker applies NODEATH on hit - balance: Voided victims get dumped in safer places -<<<<<<< HEAD - rscadd: Adds Untie Shoes, a 1-point wizard spell. It can be upgraded to untie jackboots, summon shoes to untie, and become completely silent! - bugfix: Fixes fishing rods not working on adjacent targets. @@ -2149,7 +2084,6 @@ - bugfix: HONK mech now waddles - rscadd: 'Charlie: Replaced external cycling airlocks with airlock pumps' - bugfix: Shuttle events meteors now dont sometimes kill everyone -======= carlarctg: - bugfix: Fixed null description in cerulean regenerative extract 2024-07-22: @@ -2163,12 +2097,8 @@ Jackriip: - refactor: refactored global set_basalt_light proc into object proc JoshAdamPowell: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - admin: 'Nanotrasen has brought Central Command kicking and screaming into the 20th Century by providing them with a real fax machine. - - :cl:' -<<<<<<< HEAD - bugfix: Surgical tape and edagger's embedding values have been fixed - refactor: Refactored table item interactions, please report any issues. - bugfix: Fixed being unable to use decks to draw cards directly onto tables. @@ -2187,12 +2117,10 @@ Thedragmeme: - image: Adds a series of traditional yukata's and kimono's - image: Adds in black sandals and a traditional hairpin for the back of the hair -2024-07-24: Majkl-J: - bugfix: Collars can be locked again - bugfix: Taur legs can no longer create bloody floating sprites - code_imp: Taur legs no longer take overlay slots - SkyratBot: - bugfix: Alexander no longer causes harddels - bugfix: Removed a theoretical infinite block exploit from alexander - bugfix: Fixes bulldog shotgun unique mag display not working on the sprite @@ -2210,7 +2138,6 @@ - bugfix: You can no longer dupe metal by breaking walls under small light fixtures - bugfix: Animal/people skin is no longer metallic sounding - bugfix: Fixed fishing. -======= MTandi: - rscadd: 'Charlie: Replaced external cycling airlocks with airlock pumps' - qol: Updated smart fridge UI @@ -2229,7 +2156,6 @@ carlarctg: - rscadd: Adds Untie Shoes, a 1-point wizard spell. It can be upgraded to untie jackboots, summon shoes to untie, and become completely silent! ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - spellcheck: Renamed the Crimson Focus to the Crimson Medallion - bugfix: Fixed harvesters not being properly bound to their master, nor dying when they do @@ -2238,7 +2164,6 @@ - rscadd: Added wooshing, shaking, and glowing to flinging around with the heretic blade - balance: Removed the probability to not gain a reward when sacrificing a cultist -<<<<<<< HEAD - bugfix: Restores some of the items accidentally lost in the autodrobe. - bugfix: You can now put dead mice into mortars/grinders properly - qol: Now IDs and PDAs have money-reader module for picking some cash into your @@ -2247,7 +2172,6 @@ - bugfix: Fixes Hereditary Manifold Sickness's 4th stage not updating health when it should - config: Added an entry for TRAITOR_SCALING_MULTIPLIER, disabled by default -======= - bugfix: HONK mech now waddles necromanceranne: - qol: There is a larger stock of roundstart clothing availalbe in the clothing @@ -2295,7 +2219,6 @@ - qol: Now IDs and PDAs have money-reader module for picking some cash into your bank by swiping on money. Ghommie: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: You can raise lobstrosities from chasm chrabs inside an aquarium with the 'allow breeding' setting on. Keep the fish well fed, healthy and not lonely if you don't want an hostile one. @@ -2304,9 +2227,7 @@ - rscadd: For lobstrosities grown from aquariums, they can have additional effects based on the fish traits they had in the aquarium, like being venomous or even flying. -<<<<<<< HEAD - qol: Chat notifications are now at the top -======= Jacquerel, Kok0nut, Imaginos: - image: Wall-mounted and Table-mounted ID card authorisation machines now use different sprites @@ -2321,7 +2242,6 @@ SmArtKar: - bugfix: Stacking machine consoles link to machinery now - bugfix: You can now put dead mice into mortars/grinders properly ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Mechs now take armor into consideration when calculating punch damage - bugfix: Mechs no longer deal direct limb damage - bugfix: Drills automatically pick up ore on non-ripley mechs now without having @@ -2330,7 +2250,6 @@ - bugfix: Drills now take armor from correct bodyparts when attacking - code_imp: Cleaned up one-letter variables in mech drill code - bugfix: You can no longer microwave kisses, slappers, and other abstract items -<<<<<<< HEAD - bugfix: fixes bitrunning breaking upon repeatedly climbing in and out the pod - qol: Photocopier updated their UI - bugfix: Stacking machine consoles link to machinery now @@ -2418,7 +2337,6 @@ - code_imp: Cleaned up clamp code. - bugfix: Clamp no longer anchors down some objects upon failing to pick them up - bugfix: Deathsquad KILL CLAMP finally works once more -======= - bugfix: Having your liver fail no longer keeps drug traits active without metabolizing them - code_imp: Cleaned up clamp code. @@ -2443,13 +2361,11 @@ - spellcheck: Reworded Voidwalker's objectives to be more descriptive of their actual goals as opposed to just fluff. necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Strong-arm implants go on cooldown when activated, but deal more overall lethal damage on a single blow. - balance: The strong-arm implant does additional damage to fauna and some other dangerous mobs. - qol: You can pair toolset arm implants with the strong-arm implants. -<<<<<<< HEAD SpaceLoveSs13: - refactor: HUD traits now apply their corresponding hud automatically theselfish: @@ -2458,7 +2374,6 @@ DrDiasyl aka DrTuxedo: - sound: Hearing and talking into the radio now produces a sound. Heads get a special sound. -======= - balance: Quality cybernetic hearts combat bleeds and restore blood, rather than inject you with epinephrine when you enter crit. This can result in mild toxin buildup, however. @@ -2554,12 +2469,10 @@ JohnFulpWillard: - bugfix: '[Mafia] The show_help button no longer shows you who the Obsessed''s target is.' ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Players now receive a notification when trying to perform surgery steps that involve chemicals Rhials: -<<<<<<< HEAD - bugfix: Clown Ops gear has been returned to being available only to clown ops. Whoops! - bugfix: Monkey wizards can now interact with grand ritual runes. @@ -2597,7 +2510,6 @@ SkyratBot: - qol: drones now have soap in their internal storage! - bugfix: VIM no longer requires hands to enter -======= - bugfix: Monkey wizards can now interact with grand ritual runes. - bugfix: Clown Ops gear has been returned to being available only to clown ops. Whoops! @@ -2622,12 +2534,10 @@ DaCoolBoss: - spellcheck: military javelin's name is now fully uncapitalised SmArtKar: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Mining headsets now allow you to make callouts via pointing. You can use them to communicate with fellow miners or order your army of bots and raptors! - rscadd: Mining headsets keep your voice loud and clear in low-pressure environments (not vacuum!) -<<<<<<< HEAD - spellcheck: military javelin's name is now fully uncapitalised - rscadd: Cosmic Skull glows purple. Vekter: @@ -2635,7 +2545,6 @@ the Heretic dimension. theselfish: - bugfix: Unbroke the Patrol Cap, whoops!! -======= - qol: If you have auto fit viewport enabled, it will trigger upon entering or exiting fullscreen - bugfix: VIM no longer requires hands to enter @@ -2725,4 +2634,3 @@ thegrb93: - bugfix: Fixes getting permanently hot or cold if wearing thermal insulation as a lizard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml index 8c093be7ec5..e40667b93e9 100644 --- a/html/changelogs/archive/2024-08.yml +++ b/html/changelogs/archive/2024-08.yml @@ -1,258 +1,20 @@ 2024-08-01: -<<<<<<< HEAD - Bisar: - - bugfix: All mining mobs now properly listen to the signals sent by attackers and - will respond appropriately. - LT3: - - rscadd: Soul-bound (originally called magic) traumas can now be cured by performing - a blessed lobotomy featuring holy water - Rhials: - - rscadd: Spies can now pick their own custom objectives, if they so choose. - SkyratBot: - - bugfix: fixes a way of duplicating iron with wallmounted sparklers and light switches - - bugfix: Bank cards speak once more - - bugfix: Fixed mapload circuit floors not drawing power and deconstructing circuit - floors not reducing power load - - refactor: moves the create_all_lighting_objects proc to the lighting subsystem - - bugfix: spray can face spraying will no longer work on light-sensitives with eyewear - and people wearing eye covering masks - - bugfix: The clown planet domain is now completable - - bugfix: The charge indicators on power cells now work properly. - - code_imp: Removed some now redundant power cell appearance updates - - balance: Mining MODsuits are now considered thick clothing and gained expanded - storage. - - image: Mining MODsuits got a slight glowup and hide belts now - - rscadd: Carps, frogs and young lobstrosities now fear people wearing fishing hats! - Adults and megacarp favour the 'fight' part of the fear reflex however. - - bugfix: The hat stabilizer module now inherits the clothing traits of the attached - hat. - - qol: Aquariums start unanchored and don't autoconnect to plumbing. Their reproduction - prevention is also disabled by default. - - balance: Made it a tad easier to control the bait during the minigame. Buffed - the fishing skill. No fishing duds at all when using ANY bait. - - balance: Chasm Chrabs take less time to grow into Lobstrosities but need food - a bit more frequently. - - balance: '"Profound fisher" mobs will have less RNG-dependant time fishing.' - - bugfix: You can now ACTUALLY interact with other things while fishing if the fishing - rod isn't in your active hand. - - config: Added a config for specific gateway delays so locations like the beach - and the museum don't have to take 30 minutes to become available like the rest. - - rscadd: Stat Panel now scales like a chat, depends on the font size. Defaults - from the chat font size, but you can separate it. - - refactor: Refactored Stat Panel styles and Byond skin theme applying. Stat Panel - now looks more like a TGUI - - bugfix: plants no longer select reagent genes they already have while cross pollinating - - code_imp: 'improves reagent cross pollination code - - :cl:' - - image: Big balls are now much rounder, to more easily slide down into a cannon. - - bugfix: Heart eater wizard perk no longer works activates on organs that haven't - been used before - - balance: TTV bombs can be implanted into people's chest once again - - rscdel: Revert "Heretic spell invocations now use one dead language per path" - - bugfix: Removed a rogue wall grinder on icebox - - bugfix: Fixes getting permanently hot or cold if wearing thermal insulation as - a lizard -======= 00-Steven: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: You no longer render on top of tall enough objects that get vertically offset when anchored to a table when standing on the tile directly to the north of them. Examples are soda and booze dispensers. - bugfix: Removing the vertical offset some objects get when anchored to a table can be done by unanchoring it at any point, rather than only on a table. -<<<<<<< HEAD - - bugfix: 'fix a bug where botany reagents would dissapear from existing plants - - :cl:' - - qol: smart fridge UI now groups items by type+name instead of just type - - qol: smart fridge UI now shows item names next to the images - - qol: smart fridge UI has a list view option (default for chem and viro versions) - - bugfix: fixed smart fridge stacking sounds when dispensing multiple items - - bugfix: Mechs can no longer equip infinite amount of weapons - - bugfix: Mining MODsuits now can store everything that explorer suits can - - qol: You can now reorder items inside storages by dragging them - - bugfix: Portable atmos machine circuit boards list correct components - - bugfix: Portable atmos machine circuit boards accept unwrenched fittings - - bugfix: Portable atmos machines are movable on construction - - bugfix: Projectile dampener, recycler and ninja stealth MOD modules now work properly - - balance: The nukeops surplus smg, the pp-95, has been reworked into the Abielle - Smart-SMG. It performs nearly identically to the pp-95, however it's projectiles - get a slight homing ability towards whatever you click on. - - sound: New firing sounds for the surplus smg, credit to the m41 sound effects - from tgmc - - image: New sprites for the surplus smg, made by me - - bugfix: You can no longer tear peoples arms off with non-killer clamps - - balance: Discounts now pick 4-6 items each from a unique category - - balance: Items that cost below 4 TC cannot get discounted anymore - - balance: Elite syndicate MODs for traitors can no longer get discounted - - rscadd: The heretic's ritual of knowledge no longer requires binoculars - - rscadd: Clipboards are craftable using a wood plank, an iron rod and wirecutters - - bugfix: Fixes SS13.wait not working when called multiple times before it finishes - waiting. - grungussuss: - - bugfix: the abandoned plasma research facility on icemoon no longer has an item - that shouldn't exist - - sound: added sniff sounds - - sound: added sigh sounds - - bugfix: smuggler satchels will no longer spawn in space - - sound: leather, skins and cardboard have their own sound now - grungussuss and Kayozz: - - sound: more maintenance ambience has been added -2024-08-02: - SkyratBot: - - bugfix: Flashdarks now broduce darkness upon toggling - StrangeWeirdKitten: - - bugfix: Emote sounds will no longer play twice - yooriss, Erol509, Majkl-J: - - rscadd: The Echolocation quirk is now available with several levels of customization, - granting 5 tiles of pulsing view distance and significantly enhanced hearing - at the downside of being blind when deafened and twice as vulnerable to ear - damage. - - code_imp: Moves quirks to a standalone folder -2024-08-05: -======= ArcaneMusic: - qol: NODE drones summoned to tap a vent within ore vents now display a green status light to show how much longer they need the vent defended for. Axidyuwu: - bugfix: fixes a way of duplicating iron with wallmounted sparklers and light switches ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bisar: - qol: Machines check their parts during initialization now; this will usually apply in cases such as a machine in a prefab having been varedited to be upgraded. - code_imp: All machines check their parts during initialization. -<<<<<<< HEAD - LT3: - - bugfix: Bouncer now shows up as part of the service department - - bugfix: Synths have their own version of Blessed Lobotomy - Majkl-J: - - bugfix: Fixed harpy wing subtypes incorrectly fetching their icons - ReturnToZender (code): - - bugfix: Runechat now properly has its saturation capped at 90%. - Rhials: - - qol: Sentience potions can now be used without a provided summon reason. - SkyratBot: - - admin: Adds some missing traits to the mob trait list in VV - - bugfix: Silicons and simplemobs can also hear radio chatter now - - bugfix: Emergency climbing hooks now shouldn't spawn on non multi-z stations. - - bugfix: rod sounds will now vary in pitch - - qol: NODE drones summoned to tap a vent within ore vents now display a green status - light to show how much longer they need the vent defended for. - - qol: Skills are passed down to bitrunning avatars and then back to the original - body. - - bugfix: Fixed NT Frontier discounts not applying - - bugfix: Justice design no longer disappears - - bugfix: Mechs can attack other mechs in melee - - bugfix: birdshot engineering feedback has been applied - - image: All implants have received a fresh coat of paint - - bugfix: Putting people you're fireman carrying into contractor pods no longer - sends both of you to zelda's shadow realm - - bugfix: Shoving someone onto a table now causes them to become vulnerable to being - stunned. - - rscadd: Fletching starter kit! Make your own bow, shoot your friends in an unfortunate - workplace accident. Replace all those holy arrows you lost. - - bugfix: Bows now properly undraw once they have fired an arrow. - - code_imp: Bows now utilize overlays in order to display loaded arrows. Unique - overlays per arrow. - - qol: You no longer goofily swap with others trying to move in the same direction - as you if you're not faster than them - - code_imp: Moved mobswap check logic into a separate proc and made it more readable - - bugfix: Lizards no longer die from cold on icebox despite wearing insulation - - image: Made chem master container icons not blurry - - bugfix: Stop clientless lobstrosities from fishing other lobstrosities, which - in turn can fish other lobstrosities and so on. - - balance: Stop clientless lobstrosities from fishing the lavaland fishing spot - chest. - - qol: new uplink UI - - qol: made it possible to buy a custom amount of TC, instead of bundles with fixed - amounts - - rscadd: All the melons are now sliceable, and have inhands, instead of just watermelon - and holymelon respectively. - - rscadd: You can now hollow out melons of all kinds with a spoon to make helmets - or chestplates, based on the potency! If you are unlucky, you can tie up three - helmets into a chestplate with durathread using the crafting menu. - - rscadd: You can now make a bo staff out of bamboo and steelcap logs. - - rscadd: You can now make a moonflower buckler out of moonflowers and steelcap - logs. - - rscadd: You can also hollow out chantarelle to make mock-up wizard hat. - - rscadd: Parsnips, as mutation of carrots, become equaly able to be sharpaned, - turning into shivs, or with potency and luck, sabres. - - rscadd: You can now craft a durathread robe, and customize it into different variants - using specific plants in crafting menu. - - rscadd: Carrots gain a new possible mutation; cahn'root, brewable into root beer - and sharpanable into shivs or daggers! - - rscadd: Rice hat, made from bamboo, now has an alternative style, allowing you - to wear it in reverse and be much cooler. - - rscadd: Two new arrow variants appear in the crafting menu; sticky and poisonous - ones! If you want to make arrows at all though, remember to order bow-maker's - crate at cargo. - - bugfix: Fixed advanced pods showing up as cultist pods - - admin: Subtype vendor no longer requries an ID - - bugfix: wawastation pharmacy now has a hand labeller - - rscadd: RD can emag mech fabricator(like roboticist). - - qol: Callouts and MODsuit quick module pickers now track user - - bugfix: Existing gas flow meters have been recalled and replaced due to a faulty - screen connection, and once again convey pressure and temperature - - rscadd: Adds a bronze dimensional theme - - bugfix: AI mech control beacons and malf AI dominate mech work again. - Tattle: - - qol: dead cyborgs now blink yellow lights - - qol: damaged cyborgs have smoke particles when they've taken brute damage, and - sparks for burn - Varoxus: - - rscadd: increased maximum penis and testicle size. - jupyterkat: - - bugfix: fixed vibrators turning invisible on use - - bugfix: fixed toys not applying mood events on certain traits - - bugfix: fixed grammar on toys - - bugfix: toys now show that they are customizable and how to do it when available - - bugfix: 'toys interactions panel is no longer hidden under a scroll, and is now - a separate component - - :cl:' - xXPawnStarrXx: - - bugfix: fixed bounty pads accepting synthetic organs, which are basically cybernetic - tier 1's. -2024-08-06: - NullDagaf: - - code_imp: simple_farms now respect your skill level - - refactor: refactored simple_farm code - SkyratBot: - - bugfix: Bitrunning crate capture zones can no longer be destroyed - - image: added and updated belt/suit/mask storage sprites for several knives missing - them -2024-08-07: - HometownFunky: - - image: added shading to valeborg sprites and updated the colors for the vale jani/medical - models. - Leathergnome: - - rscadd: Wallet to the Loadout menu in the accesory tab - MrMelbert, SmArtKar: - - bugfix: Holding someone at gunpoint no longer makes all shots count as point blank - Odairu: - - rscadd: adds pixel shifting items, and pixel tilting mobs - - code_imp: optimizes pixelshifting - SkyratBot: - - image: Resprited teleporter beacons - - bugfix: Fixes the echolocation screen overlay not appearing with default arguments - due to using the wrong icon state - - bugfix: Fixed handyman assistants spawning without a PDA - - bugfix: Plasmamen helmets now display their smiles + can be painted with spraycans - - admin: fix hard restart option - - bugfix: Fixed an infinite TC glitch dupe - - bugfix: Elevator music no longer restarts when you take a step - - bugfix: Rice hat no longer disappears upon being toggled and can be raised back - up. Toggling sprites is now done by alt-clicking - - code_imp: Removed multiple cases of unnecessary updatehealth - - bugfix: Tinacusiate no longer changes hearing spans for every single person in-game - - bugfix: Grass sheath now holds parsnip sabres like its supposed to - - spellcheck: Fixed up parsnip sabre description grammar - - image: Ash Blade has received a new sprite. - - bugfix: Fixed a runtime error after draining a heretic influence. -======= Ghommie: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added tadpoles, which can be scooped from puddles with right-click. Functionally they're like most fish, which require an aquarium to survive, and also need to be fed fairly frequently, however they quickly become frogs after about 3 @@ -261,48 +23,6 @@ other in prison. - qol: Changed the name of an aquarium UI button from "Reproduction Prevention" to "Reproduction and Growth", as it controls both fish breeding and growth. -<<<<<<< HEAD - - bugfix: juvenile lobstrosities will now look for food - - qol: Renamed seed packs to have the plant name at the beginning - - bugfix: Bamboo staves can now be wielded - - bugfix: Bostaff no longer disappears forever when wielded - - rscdel: Remove narsie and ratvar plushies from loadout -2024-08-08: - LT3: - - bugfix: Fixed players being incorrectly immune to certain virus severities - Majkl-J: - - bugfix: Fixes guest accounts not having keybinds and getting constant runtimes - Odairu: - - qol: SAD now applies quirks - - rscadd: Adds a name pref for interdyne and lone infiltrators - Rhials: - - sound: Zipties no longer make handcuff noises when picked up or dropped. - SkyratBot: - - image: Updated clipboard sprite, adds white and black clipboard skins for med/sci - and security -2024-08-09: - Majkl-J: - - bugfix: Prescription huds work again - SkyratBot: - - bugfix: Smartfridges properly dispense `\Improper` items - xXPawnStarrXx: - - bugfix: fixed gaian soilbins losing their autotend function by making it togglable. -2024-08-10: - Majkl-J: - - bugfix: the milsim bitrun safehouse is no longer a hole - SkyratBot: - - bugfix: Fixed Charlie MOD installer not installing MODsuit unless you have a backpack - to drop -2024-08-11: - Odairu: - - bugfix: PT can do ordnance now - - qol: Added a new item, long range PDA. - SkyratBot: - - spellcheck: fixed many incorrect spellings of Waffle Corp and Donk Co. - - bugfix: Circuit UI scale no longer has weird rounding - - bugfix: Circuit UI no longer gets covered by components menu -2024-08-12: -======= - rscadd: Carps, frogs and young lobstrosities now fear people wearing fishing hats! Adults and megacarp favour the 'fight' part of the fear reflex however. - bugfix: The hat stabilizer module now inherits the clothing traits of the attached @@ -311,28 +31,11 @@ - bugfix: Emergency climbing hooks now shouldn't spawn on non multi-z stations. Jackraxxus: - bugfix: AI mech control beacons and malf AI dominate mech work again. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 LT3: - bugfix: Scanner gate now detects items thrown through it - bugfix: Scanner gate does not alarm for guns on players with mindshield - bugfix: Scanner gate does not alarm for guns on players with weapons ID card access - sound: Reduced volume of scanner gate alarm -<<<<<<< HEAD - Majkl-J: - - bugfix: fixed assistant jumpsuits overriding the loadout - - bugfix: smoking addiction is now fixed - Odairu: - - bugfix: lings turn into teshari properly - SkyratBot: - - bugfix: You no longer kill yourself in cockroach form if you attempt to unposess - it - - refactor: refactors pet collars and cultist pets into elements - - qol: Cable coil and welding tool healing now loops similarly to sutures/meshes - - bugfix: Fixed cable coil/welding tool heal message not displaying when healing - someone else - aKromatopzia: - - bugfix: teshari back item sprites work again -======= MTandi: - image: Made chem master container icons not blurry - bugfix: Portable atmos machine circuit boards list correct components @@ -503,57 +206,10 @@ SmArtKar: - bugfix: You no longer kill yourself in cockroach form if you attempt to unposess it ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 grungussuss: - sound: ore and sandstone blocks have their own sound grungussuss and kayozz: - sound: white noise from some ambience sounds has been pruned -<<<<<<< HEAD - plsleavemealon: - - balance: rebalanced synthetic surgery to also heal organic limbs - xXPawnStarrXx: - - bugfix: fixed medical bounty lists, so the organ bounties can be claimed. -2024-08-13: - Majkl-J: - - rscdel: Reverted the change that removed laser pointers attracting felinids - - bugfix: Felinids can no longer phase through reality in order to touch lasers - - bugfix: The cortical infestation event now looks for candidates - - qol: Cyborg heads no longer make you look boring and bland - - bugfix: Akulas signing up as janitors or botanists will now receive their wetsuits - Odairu: - - bugfix: clock out console doesn't take items if the ID bank doesn't match mob - name - SkyratBot: - - bugfix: Felinids no longer phase through diagonal gaps upon seeing a laser -2024-08-14: - Odairu: - - bugfix: fixes borg lights leaving for no raisin -2024-08-15: - Odairu: - - bugfix: adv cloaking module - SkyratBot: - - bugfix: fixed nested radios with encryption keys giving free comms - - bugfix: Ninjas can cloak again - - bugfix: Fake aurora caelus event no longer permanently paints space green - - rscadd: Added a cyborg plunger for janitorial modules - - bugfix: Fixed monk staffs not displaying a wielded sprite - - bugfix: Wawastation Science is connected to distro,Floor Electrical Relay cable - fixed - - bugfix: Circuit health analyzer/state components now work on targets inside lockers - - bugfix: Bubblegum can no longer bloodcrawl to other Z levels - - bugfix: Wellcheers no longer does nothing half the time - - spellcheck: fixed spelling and punctuation in the blackout drunk split personality - message - - bugfix: Fixed DNA samplers not being able to interact with non-scannable objects - - bugfix: wolf AI will no longer get stuck - - bugfix: You can no longer shove people into closets through directional glass - - bugfix: Fixed bileworms not having a deaggro range - - bugfix: Slimes no longer can feed when they're inside of objects or attacking - a target that became invalid after they chose their dinner - - image: Durand shield got a glowup - - bugfix: Durand shield no longer instantly drains its battery - - bugfix: Mech UI no longer lies about the amount of power your mech has left -======= 2024-08-13: Majkl-J: - bugfix: Felinids no longer phase through diagonal gaps upon seeing a laser @@ -568,7 +224,6 @@ your PDA from a closet, or as pAI using your digital messenger while inside of your card. Archemagus: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - bugfix: Strange zeros in paid off citations on sec records - bugfix: Now invalidating citations works - bugfix: You can change crimes description @@ -576,123 +231,6 @@ - qol: Paying off citation now automaticaly voiding it - qol: Crime issuer can void the crime without armory access - qol: In case of invalidation crime shows who voided it -<<<<<<< HEAD - - bugfix: Ash drakes no longer get stuck in flight if their target changes Z levels - or is destroyed and doesn't spawn lavaland turfs after the lava arena attack - ends - - bugfix: Fixed shuttle loan paperwork being unstampable - - image: Resprited all main assemblies - - bugfix: Fixed chanterelles runtiming upon being hollowed out with a spoon and - not spawning a hat - Vekter: - - balance: Removes the research requirement from cyborg endoskeletons, meaning they - can be built at roundstart again. - grungussuss: - - balance: bushes and other flora have had their HP reduced from 150 to 100. Trees - still have 150 HP - - balance: flora now has an X4 modifier to damage from burn sources - - balance: MODsuits now deploy 2 times faster - - balance: The infiltrator MODsuit now deploys 4 times faster -2024-08-16: - Bisar: - - qol: The preserved terrarium vault now has tier 4 hydroponics trays, making volume - based tray chemistry take less time. - Melbert: - - rscadd: 'Adds a copy of the famous 1995 musical "Space Station 13: The Musical" - to contraband of the autodrobe' - SkyratBot: - - bugfix: Hydraulic clamps (the mech tool) can force powered doors open again. - - bugfix: The first tab is now selected with ore redemption machines when opened - for the first time - - qol: Dishes with a special food effect are marked in the Cooking UI - - rscadd: New Spaghetti Carbonara dish that makes people Italian temporarily - - rscadd: Omelette Du Fromage makes people French temporarily - - rscadd: Shock Immunity is no longer a random level 4-5 food buff, but a buff given - by a new Jupiter-Cup-Cake - - rscadd: Mime Tart gives Mute trait - - rscadd: Clown Cake gives Waddle Walk trait - - rscadd: Stuffed Legion gives Ashstorm Immune trait - - bugfix: Soulscythe now deletes the soul mob when destroyed - - rscadd: Crabs and lobstrosities (as well as the lobster foam helmet and the fishing - hat) now pack a boatload of fish puns. - - qol: Integrated circuit modules now can be linked to component printers - - code_imp: made it look a little cleaner for head PDAs - - bugfix: Fixes getting a "You are too far away!" interaction block on inventory - items when inside of another object. This includes accessing storage or using - your PDA from a closet, or as pAI using your digital messenger while inside - of your card. - - bugfix: Fixed portable chem mixer spamming you if not held while its UI is open - - bugfix: Fixed Creatures not being able to use non-jaunt actions when seen - - balance: Space suits no longer provide all of the slowdown when wearing space - gear. Helmets now share the burden and you can now move faster when wearing - only a space suit. Helmets now provide a bit of slowdown when worn alone as - a result. - - bugfix: Fixed activating specific BCI actions whilst unconsious - - rscadd: 'durathread robes can now store botany gear - - :cl:' - - qol: Nanotrasen has fitted the Janitorial Emergency Response Team with equipment - better suited for the job. - - balance: Reduced pathfinding circuit component cooldown from 30 seconds to 5 seconds - - bugfix: fixes monkey ai hitting u from a distance with unloaded guns - - bugfix: pre-upgraded soda dispensers are actually pre-upgraded again - - bugfix: Raw durathread bundles and sinew strands no longer make metal clang sounds. - - bugfix: Fixed pipes/cables/disposals rendering above closed catwalks. - - bugfix: Fixed catwalks covering pipes generating illogical pipe caps when screwed. - - bugfix: Opened catwalks are no longer assumed to be above-floor for the sake of - generating pipe caps. - - bugfix: Blade heretic ascension now gives you floating blades once again - - bugfix: Heretic sacrifice area no longer modifies global ambience lists - - bugfix: Fixed action buttons relative to EAST,SOUTH, or CENTER being improperly - moved during view_audit_buttons() - - rscadd: The new smartgun has replaced the unusable energy cannon in mystery boxes - - bugfix: Firelocks can be opened with crowbar rigth-click in combat mode. - - balance: Reduced caltrop default paralyze timer from 6 to 2 - - qol: Cargo Gorka suit slot now allows emergency/plasmaman internals. - - qol: Magicarps no longer fire their projectiles while out of combat mode - - bugfix: breaking certain terrain in deathmatch doesnt instantly breach to space - - qol: Paraplegics can now opt into appearing on the shift without their legs. - - balance: Supermatter bioscrambler anomalies are now docile. - - balance: Deja Vu perk now teleports you to where you were before the last teleport, - instead of where you arrived on the station - - bugfix: Deja Vu can no longer be used to return to the wizard ship - - bugfix: borgs no longer drop MMIs when chasmed - - bugfix: In light of recent allegations of wizardry among the kitchen staff, our - cooks will now need bowls when crafting food that comes in bowls. This should - also stop said bowls from vanishing once the food is gone. - - code_imp: Cult magic item paths are no longer strings - - bugfix: Void storm now updates mob health - - balance: Abductors (the antag, not the species) can no longer be converted by - any antagonist. - - qol: Circuit components can now be recycles in circuit printers, and automatically - do so upon being removed if a circuit has a linked printer - - spellcheck: Recycling a single item no longer outputs a line with a rogue space - infront of it - - bugfix: Chameleon gun counts as harmless and can be fired by pacifists - - qol: atmos meters can now be attached to layer 1 and 5 - - bugfix: AI Players can now operate the BRM (Boulder Retrival Matrix) - grungussuss: - - sound: 'added rustle sounds for: toolbox, medkit, box' - - sound: 'added open sounds for: toolbox, box' - - code_imp: added support for giving container items rustle sounds - grungussuss and Beeblie: - - sound: internals breathing sound has received more variance and had its volume - reduced - tmyqlfpir: - - rscdel: Remove skyrat cooldown for pathfinding circuit component as it is now - upstream'd -2024-08-17: - Adrian16199: - - bugfix: Cargo guard no longer has QM access, this was unintended - - qol: Medical guard now have morgue access, custodial closet given to service guard - Bisar: - - bugfix: Potted plants no longer permanently mark you as one of their own. - SkyratBot: - - rscadd: big pharma now supplies a single pack of experimental medication as an - easy to access (albeit expensive) cargo goodie! - - balance: price for the cargo crate with 2 pill bottles of experimental medication - has been increased to 600 to better reflect the goodie case price. -======= Astrogem2: - bugfix: Raw durathread bundles and sinew strands no longer make metal clang sounds. Ben10Omintrix: @@ -732,7 +270,6 @@ generally represent how a player might be affected by the changes rather than a summary of the PR''s contents. -->' MTandi: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: 'TechWeb: NT Frontier partners now give full discounts for many high tier nodes, corresponding to the partner theme, instead of partial discounts for random nodes' @@ -747,31 +284,6 @@ one' - bugfix: 'TechWeb: Cryostasis node properly requires advanced medbay equipment as it should' -<<<<<<< HEAD - - sound: generic ship ambience volume has been reduced - - bugfix: fixes pickup animation not matching player offset - - bugfix: corrects offset of cobweb fluff object - - bugfix: Raptors properly respect their own factions now. - - balance: Multiple gloves/shoes that had armor values but failed to apply them - got fixed - - bugfix: You can no longer hear radio sounds if you're deaf. - - bugfix: Fixed improvised shield crafting recipe being overriden by moonflowers - - bugfix: Empty blood brother teams will now be cleaned up, instead of clogging - up the roundend report. - - bugfix: Trying to repair someone's undamaged limb with a welder or wires no longer - has you smacking them - grungussuss: - - sound: added new sounds for RCD, RPD and Plumbing Constructor. -2024-08-18: - Majkl-J: - - bugfix: Fixed some erroneous things with the synth update - - code_imp: No more harddel cells upon synths charging - SkyratBot: - - qol: The Voidwalker wisp void now loops you - - rscadd: You can sell items on the blackmarket with the LTSRBT now. - - bugfix: Added some checks to prevent the swapper device and bluespace anomalies - from theorically being able to send things and people to nullspace. -======= Melbert: - rscadd: 'Adds a copy of the famous 1995 musical "Space Station 13: The Musical" to contraband of the autodrobe' @@ -961,22 +473,10 @@ SmArtKar: - rscadd: You can now lean on windows the same way you can lean on walls - bugfix: You no longer stop leaning on walls after clicking on anything ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - qol: Dumping things into microwave en-masse is done via RMB (drag'n'drop support coming soon!) - bugfix: RPEDs can now upgrade microwaves - bugfix: Spies can finally steal microwaves (Use RMB!) -<<<<<<< HEAD - - bugfix: Mechs' directional armor now actually works - - bugfix: Added a light switch to the science hallway in Metastation - - bugfix: Air alarms stuck in warning state despite area completely fine - - bugfix: bedsheets are laid on beds properly now - - bugfix: Mobs shown in ghost alerts shouldn't be offset out of the box - - image: Several midround dynamic alert icons should be more demonstrative of what - is spawning - - bugfix: Fixed the shower water visually not coming out behind the showerhead. - - bugfix: fixes surgery table buckle offsets -======= TheVekter: - bugfix: Updated Metastation for Wallening Time-Green: @@ -1034,7 +534,6 @@ mc-oofert: - rscadd: portable gravity unit, bought at cargo necromanceranne: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Drunken fist fighting now has bonuses and penalties based on how intoxicated you are. Controlled liquor intake could make you a better brawler. Though you might vomit if you go too hard. @@ -1046,91 +545,6 @@ - qol: Unarmed effects that would utilize stamina values now use a split of half brute, half burn to determine outcomes or for meeting thresholds. This affects; punch accuracy, stagger combo thresholds and grab vulnerability thresholds. -<<<<<<< HEAD - - rscadd: You can now lean on windows the same way you can lean on walls - - bugfix: You no longer stop leaning on walls after clicking on anything - - rscadd: add syndicate branded lipstick to uplink (6 TC), after applying lipstick - *kiss deals damage equal to energy gun - - bugfix: fix wallhit sound for projectile - - image: Resprited more types of fillets, and moonfish eggs - - image: Resprited mech drills, plasma cutter, pka and cargo clamp. - - bugfix: Alien beds no longer pretend they can be deconstructed with a wrench - - bugfix: idle basic mobs will now plan behaviors rather than completely shut down - itseasytosee: - - bugfix: illustrious ethereals now properly get the tenacious trait - - code_imp: more species features have been moved to their individual body parts. -2024-08-19: - Melbert: - - qol: Xenos and digi lizards have claw footprints - - bugfix: Patch exploit allowing nigh-infinite heretic points - SkyratBot: - - bugfix: Fixed random lipstick texture, fake syndie lipstick no longer can randomly - spawn - - bugfix: fixes ai controllers incorrectly idling when changing z level - - image: Gas tanks got updated worn sprites - - rscadd: White crayons (Renamed to Sticks of Chalk) may now be used on dead bodies - to draw a body outline onto the ground easily. - - qol: The CentCom officer's beret has had its slowdown removed to be in line with - the winter coat. - - bugfix: lights placed on walls with the RLD now face the correct direction. - TwistedSilicon: - - bugfix: Clarkes will no longer become unable to dump ores upon picking a boulder - up. Mine away. - projectkepler-ru: - - bugfix: fixed lipstick runtime -2024-08-21: - EspeciallyStrange, Waterpig & Wolf751: - - rscadd: Sporting Rifle in .40 - - rscadd: Printable 10mm Speedloader, they're quite cheap but not at all that great. - - rscadd: Round start security pistol set in 9mm, 10mm revolver and also an alert - locked flechette rifle - - rscadd: Conversion kit for guns, alongside the blueshield/NTC getting a new magistrate - weapon beacn, letting them call in the energy revolver, the HoS revolver from - bubberstation and the M45A5 from ye olden time - - rscadd: Research for the new technode, military grade weaponry 1, 2 , 3 With the - last one requiring you to have illegal tech - - balance: Due to the on-going Sol Conflict not reflected in C-3 Sector. skild, - takbok, bogseo, AMR, LMG are no longer obtainable, cargo took a very heavy hit - due to embargo. A certain individual with a sequencer might be able to reach - this however. - - rscadd: a new helmet type that is inoffensive to the tactical group of the playerbase, - people wanted it so we'll have it, at the same time, you can now reskin the - 'classic' helmet' to have an alternate blue variant too - - balance: made laser much easier to get while ballistic are abit more rare and - more expensive - - balance: massively overhauled how ballistic security work, being they are now - a mid-late game researchable tech - - balance: '90% of ammo are no longer purchasable, instead they are available as - tech, see above. - - balance; .40 damage has their wound decreased' - - balance: 9mm damage is reduced to 25, 10mm damage is reduced to 30 - - balance: laser are 25 damage, as they are supposed to - - balance: .38 are now 30 damage - - balance: The new C-3 Sector peacekeeper combat shotgun, they're bulky, replacing - the old combat shotgun. But they don't fire as fast due to a certain recoil - compensation mechanism, however, the HoS shotgun has been given a gyroscopic - stabilizer allowing them to be fired one handed - - balance: stardust ammo now fire one projectile with 100% embed chance, 5 second - removal time instead of 10. and is slightly harder to get - - balance: the RCF and prybar are removed from import but colonization crate still - exist, this is done to compensate for the fact they are way too easily obtained, - requiring no research tech and even provide ore satchel of holding before research - for it is acquired. Prybar is only ever used by antag and greytider to get into - place, otherwise, if a paramedic need to, they can bug engineering for a prybar - when a crate is made - - image: added new sprites for the gun, pictured above. - Rhials: - - sound: '"radio message received" audio now has a brief cooldown.' - Shroopy: - - spellcheck: Fixed a typo in the sanity examine if you have the alexithymia quirk. - SkyratBot: - - balance: PACMANs now have significantly increased power output and take longer - to consume a single sheet - - balance: Inducers can now be recharged with plasma - - balance: Inducers ordered from cargo now start with upgraded megacells instead - of upgraded batteries -======= thegrb93: - bugfix: Air alarms stuck in warning state despite area completely fine 2024-08-19: @@ -1150,7 +564,6 @@ pesto, tomato sauce, pineapple slice, pineapple salsa, bran request cereals and bronx bar have been resprited. - rscdel: Waffles no longer magically conjure a "waffle tray" trash item when eaten. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - image: Shrunk the arrow shown when pointing at things to be less invasive. - rscadd: Wearing an ID with the trim of a command/leader position gives you bigger arrows (about the size of arrows before this PR) which may also be of different @@ -1160,112 +573,12 @@ - bugfix: ERT engies and medics now come with the engineering and entrails-reader skillchips respectively, like their station counterparts. - bugfix: Fixed not facing atoms that you're pointing at. -<<<<<<< HEAD - - rscadd: portable gravity unit, bought at cargo - - image: Utility belts got new tool overlay sprites - - spellcheck: CE's toolbelt is no longer capitalized or considered an improper noun - - balance: wheelchairs no longer double your movement cooldown if you moved diagonally - - balance: Vomiting from disgust now removes 50 of it from you. - - qol: Haunted 8ball now gives you a TGUI input with your question for ghosts instead - of telling them the last thing it heard. - - image: 8ball has received a resprite - - admin: Subsystem Overview now has the ability to track a rolling average of tick - by tick subsystem cpu usage. - - bugfix: spawning on a table or other elevated object does not offset you forever - - balance: Air alarms are now usable by Station Engineers as well as Atmospherics - Technicians. - - image: Updated cryostasis beaker's sprite - aKromatopzia: - - image: Teshari clothing got some more fallback sprites; more GAGS'd job labcoats - work on teshari; two-colour small scarves and suspenders have new sprites. - - rscadd: TG RD coat (the purple one) is obtainable from CommDrobe now. -2024-08-22: - Majkl-J: - - bugfix: Having an augments+ tongue no longer runtimes when becoming abductor antag - - bugfix: Abductors and skeletons no longer load your prefs in so you don't end - up looking like a frankenstein version of yourself - Odairu: - - bugfix: android legs have a digi version so they properly get replaced - - rscadd: army crawling - - code_imp: Improves the stealth crawl of borers and moves it to an easy to use - element - Rhials: - - bugfix: Beepsky will now salute commissioned bots, instead of himself, when encountering - one. - Shroopy: - - qol: filled Kilostation surgical trays with tools and rearranged things so they're - next to the operating tables - - qol: swapped out the Kilostation animal pen fire door for a regular windoor. No - more fire alarm noise! - SkyratBot: - - bugfix: Fixed elephant graveyard active turfs - - qol: Reporting issues on the Github should now be a far more simpler experience. - Hitting the "Report Issue" button in the top-right of your BYOND Client Screen - will still autofill in the fields as expected. - - bugfix: Replaced a locked cabinet that you cannot open in ninja den with an unlocked - one - - rscadd: Buckshot is back on the menu, on the blackmarket. - - balance: the integrity of firearms now counts toward projectile damage. A gun - that's on the very verge of breaking down will deal half as much damage. - - qol: Clicking floor tiles now also closes curator/morgue doors, like with normal - airlocks. - - bugfix: Captain's spare safe no longer turns invisible when opened - - bugfix: The area of the CentCom Z-Level dedicated to the Lobby Screen should look - far better now, with a solid black title screen should the lobby image not load - in/get deleted. -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - rscadd: Added a bluespace fish case to the advanced fishing node. - balance: Fish cases will keep a fish from getting hungrier or ready to reproduce, while also healing it up to 65% health. - balance: Examining a fish with zero fishing skill whatsoever won't give a reading on its size and weight. Conversely, examining one with the skill leveled two times will give general information on if it's starving, sick, hungry, or dead. -<<<<<<< HEAD - - rscadd: Added a treasure chest you can rarely fish from the ocean/beach, with - loot being a mix of fishing and piratey stuff. - - rscadd: You can revive fish with strange reagent now. - - bugfix: paintings now drop canvas and frame when knocked off the wall. - - bugfix: Random spraypaint setting now properly paints large decals - - bugfix: Ragnarok deathmatch arena now has noteleport area - - bugfix: lua scripting now works on linux - - bugfix: Fixed active turfs on crashsite ruin - - rscadd: Fishing toolboxes (and occasionally maintenance) now come with a paper - slip containing fishing-related tips. - grungussuss: - - sound: computers now make clicky clacky sounds - plsleavemealon: - - rscadd: Added several new options to the ration ticket quirk tailored specifically - to ethereal players. -2024-08-23: - EspeciallyStrange: - - rscadd: Flatpacked machine to void raptor engineering and science - - rscadd: Breaching Missile for the paddy in void raptor - LT3: - - spellcheck: Feline Traits quirk renamed to Felinid Traits, to resolve confusion - what feline features get added - Majkl-J: - - bugfix: Fixes the icon unit test - Odairu: - - rscadd: asset protection modsuit and gives it to the AP ert - Rhials: - - admin: You can now choose the humanoid species spawned by an ERT summon in the - summon menu. - - qol: Delivery/Bot pathing nodes have been added to the middle room of Runtime - station. - SkyratBot: - - bugfix: fences will no longer appear pitch black and they will layer properly - - bugfix: Fixed soapbox component sometimes runtiming roundstart - - rscadd: Punching mitts! Punch wildlife to death and scream the whole time. ADVENTURE! - - balance: Megafauna can be affected by martial arts. - - bugfix: Fixes lobby buttons from station traits having no name and being unexaminable. - - image: Updated goliath cloak sprites - - balance: reticence requires progression - - bugfix: Fixes kudzu being able to spawn on openspace turfs resulting in it getting - stuck - - balance: Changed max refined vortex cores from 1 to 3. Changed the Event Horizon - Anti-Existential Beam Rifle recipe to require 2 vortex cores. -======= - bugfix: paintings now drop canvas and frame when knocked off the wall. Jacquerel: - bugfix: Whatever the roaches were getting into which made them hover above the @@ -1383,108 +696,11 @@ - balance: the integrity of firearms now counts toward projectile damage. A gun that's on the very verge of breaking down will deal half as much damage. Jacquerel: ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - balance: Pacifist carp can now be spawned from the friendly gold core reaction, and no longer appear from the hostile one. - bugfix: The teeth of toothless carp will not occasionally reappear - bugfix: Crabs will now run from attackers larger than them and attack things smaller than them, as intended. -<<<<<<< HEAD - - qol: Unarmed attacks with carp jaws now uses a bite effect rather than a punch - effect. - - bugfix: custom pies and cakes are craftable again - - balance: The CytoPro has had prices raised to slightly more reasonable levels. - - bugfix: Radioactive nebula no longer runtimes on runtime station - by Xackii, sprites by ArcaneMusic: - - rscadd: Added big manipulators. - nikothedude: - - balance: Naga constrict time needed reduced to 2.2 seconds - - bugfix: Science prescription glasses no longer give a medhud - - bugfix: AR prescription huds actually work now - projectkepler-ru: - - bugfix: the CMG should now actually be normal sized when folded - - bugfix: bein able to buy the MCR, please stop - - rscdel: obliterated powerstation from the blueshift. it should no longer be present - now -2024-08-24: - projectkepler-ru: - - bugfix: erronously the c10 speedloader was normal sized - - rscadd: you can now buy sidearm crate again - - code_imp: Frangible slug is re-coded to work abit differently -2024-08-25: - EspeciallyStrange: - - bugfix: m45a5 guncase not spawning with an ammo pouch, I neglected this - - bugfix: the various guncase not being the pistol sized one - - rscadd: renoster shotgun purchasable - - balance: flechette ammo slightly easier to re-print - Kepteyn: - - rscadd: adds three new dorm rooms to hilbert's hotel options. - LT3: - - qol: Blacksmith anvil noises can be toggled with ambience sound preference - SkyratBot: - - spellcheck: Hierophant no longer lies about obliterating someone - - qol: goliath arm can defuse gibonite by bumping or direct click - - bugfix: Marine helmets no longer change their sprite to security helmets when - their flashlight is toggled - - balance: Rusted Ritual now requries 10 sheets of Iron instead of Titanium. - - bugfix: Aquarium decorations now contain plastic. - - spellcheck: Added item descriptions for aquarium decorations. - plsleavemealon: - - qol: Lets ethereals have custom food preferences - projectkepler-ru: - - bugfix: frangible slug literally doing nothing to window and grille - - bugfix: frangible slug should now no longer 1 shot borg or mech - - balance: combat shotgun recoil removed, instead, they just get a delay - - balance: bolt action delay on the ceremonial rifle reduced from 2 second to 6 - ticks instead -2024-08-26: - LT3: - - bugfix: Flannel shirts actually cover your body when buttoned up - SkyratBot: - - rscadd: Achievement for eating 500 cigarettes - - balance: Cigarettes are now edible - - code_imp: Adds a variable to hide the food examine on the edible element - - bugfix: wet hides and hairless hides no longer make metal clanging noises when - picked up/dropped - - bugfix: SSPolling no longer fills in the candidate list with empty entries to - guarantee it returns a list size of amount_to_pick - grungussuss: - - sound: lead pipe has sound - projectkepler-ru: - - balance: the effect of frangible slug on non-airlock is now halved - - balance: NTC lose their gunbeacon, instead, they get a unique pistol intended - for incapacitating target and for self defense. - - balance: m45a5 has less painful wait period - - bugfix: gun not being in pistol case when they should be - - rscadd: 10mm AP, HP speedloader to the tech -2024-08-27: - LT3: - - spellcheck: Sneak a peek of Hilbert's Hotel, not a sneak peak - SkyratBot: - - bugfix: fixes blob spore and slime AI endlessly attacking the dead - aKromatopzia: - - image: more teshari clothing sprites - projectkepler-ru: - - bugfix: Helmet pepperspray not working because of an NRI sabotage on the supplyline, - the IDMA Force has now succesfully repelled the attack and has shifted focus - toward trying to identify the suspect involved in this attack - - bugfix: weird suppresor overlay shenanigan -2024-08-28: - Odairu: - - balance: No more hands in army crawl (goodbye gbp) - SkyratBot: - - bugfix: Bioscrambler anomalies no longer affect inorganic species - - spellcheck: Fixed a typo on snowdin shuttle transi(s)t consoles - - rscadd: Added salt electrolysis reaction - projectkepler-ru: - - bugfix: eland not being restricted - - bugfix: battle rifle stillbeing puchasable normally -2024-08-29: - Melbert: - - bugfix: Juicing and grinding should break less - SkyratBot: - - qol: revolver in roundstart holsters is on the last slot and not on first -======= Redrover1760: - balance: Changed max refined vortex cores from 1 to 3. Changed the Event Horizon Anti-Existential Beam Rifle recipe to require 2 vortex cores. @@ -1589,26 +805,12 @@ 2024-08-28: Melbert: - bugfix: Juicing and grinding should break less ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Vekter: - bugfix: Fixed an issue causing Quartermaster office access to show in the wrong area on Plexagon Access Management. - bugfix: Fixed an inconsistency in the naming for QM Office access. grungussuss: - bugfix: after 4 years, computer sound loop now works properly -<<<<<<< HEAD -2024-08-31: - LT3: - - bugfix: Blueshift's cargo shuttle buttons are no longer trapped under glass windows - - bugfix: Blueshift's cargo shuttle conveyors are properly linked - Majkl-J: - - balance: You can now use larger dick sizes no matter the character size - - bugfix: You no longer get dusted upon trying to store your supermatter sliver. - SkyratBot: - - bugfix: Stagger animation is no longer horrilbly jittery - thegrb93: - - bugfix: Fixes not being able to disassemble the lewd machines -======= 2024-08-29: FeudeyTF: - rscadd: Added board for detective's evidences @@ -1626,4 +828,3 @@ free. - balance: Plexagon Crew Manifest no longer provides Detomatix resistance, but security records and status display control now do. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/html/statbrowser.css b/html/statbrowser.css index bef17092c05..d8c0f92b626 100644 --- a/html/statbrowser.css +++ b/html/statbrowser.css @@ -16,11 +16,7 @@ a:hover { } h3 { -<<<<<<< HEAD - margin: 0 -0.5em 0.25em; -======= margin: 0 -0.5em 0.5em; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 padding: 1em 0.66em 0.5em; border-bottom: 0.1667em solid; } @@ -45,8 +41,6 @@ img { background-color: #ffffff; } -<<<<<<< HEAD -======= .menu-wrap { flex-wrap: wrap-reverse; } @@ -68,7 +62,6 @@ img { color: white; } ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 .button { display: inline-table; cursor: pointer; @@ -90,10 +83,7 @@ img { } .button.active { -<<<<<<< HEAD -======= cursor: default; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 background-color: #dfdfdf; color: black; border-bottom-color: #000000; @@ -112,11 +102,7 @@ img { } .grid-container { -<<<<<<< HEAD - margin: 0; -======= margin: -0.25em; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } .grid-item { @@ -125,22 +111,14 @@ img { user-select: none; -ms-user-select: none; /* Remove after Byond 516 */ width: 100%; -<<<<<<< HEAD - box-sizing: border-box; -======= max-height: 1.85em; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 text-decoration: none; background-color: transparent; color: black; } -<<<<<<< HEAD -.grid-item:hover { -======= .grid-item:hover, .grid-item:active { ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 color: #003399; z-index: 1; } @@ -149,35 +127,20 @@ img { display: inline-block; overflow: hidden; text-overflow: ellipsis; -<<<<<<< HEAD - box-sizing: border-box; - white-space: nowrap; -======= white-space: nowrap; pointer-events: none; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 width: 100%; padding: 0.33em 0.5em; border-radius: 0.25em; } -<<<<<<< HEAD -.grid-item-text:hover { - position: absolute; - top: -1.33em; -======= .grid-item:hover .grid-item-text { overflow: visible; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 white-space: normal; background-color: #ececec; } -<<<<<<< HEAD -.grid-item-text:active { -======= .grid-item:active .grid-item-text { ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 background-color: #dfdfdf; } @@ -232,12 +195,8 @@ body.dark { } .dark a:hover, -<<<<<<< HEAD -.dark .grid-item:hover { -======= .dark .grid-item:hover, .dark .grid-item:active { ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 color: #80bfff; } @@ -245,13 +204,10 @@ body.dark { background-color: #131313; } -<<<<<<< HEAD -======= .dark #menu.tabs-classic .button.active { background-color: #20b142; } ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 .dark .button { color: rgba(255, 255, 255, 0.5); } @@ -274,18 +230,10 @@ body.dark { color: #b2c4dd; } -<<<<<<< HEAD -.dark .grid-item-text:hover { - background-color: #252525; -} - -.dark .grid-item-text:active { -======= .dark .grid-item:hover .grid-item-text { background-color: #252525; } .dark .grid-item:active .grid-item-text { ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 background-color: #313131; } diff --git a/html/statbrowser.js b/html/statbrowser.js index 62f8110860f..3fe115943a7 100644 --- a/html/statbrowser.js +++ b/html/statbrowser.js @@ -716,8 +716,6 @@ function set_font_size(size) { document.body.style.setProperty('font-size', size); } -<<<<<<< HEAD -======= function set_tabs_style(style) { if (style == "default") { menu.classList.add('menu-wrap'); @@ -731,7 +729,6 @@ function set_tabs_style(style) { } } ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 function set_style_sheet(sheet) { if (document.getElementById("goonStyle")) { var currentSheet = document.getElementById("goonStyle"); diff --git a/interface/skin.dmf b/interface/skin.dmf index fd0bfad4bce..41d615afe12 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -126,7 +126,6 @@ window "mapwindow" right-click = true saved-params = "zoom;letterbox;zoom-mode" style = ".center { text-align: center; } .maptext { font-family: 'Grand9K Pixel'; font-size: 6pt; -dm-text-outline: 1px black; color: white; line-height: 1.0; } .command_headset { font-weight: bold; } .context { font-family: 'Pixellari'; font-size: 12pt; -dm-text-outline: 1px black; } .subcontext { font-family: 'TinyUnicode'; font-size: 12pt; line-height: 0.75; } .small { font-family: 'Spess Font'; font-size: 6pt; line-height: 1.4; } .big { font-family: 'Pixellari'; font-size: 12pt; } .reallybig { font-size: 12pt; } .extremelybig { font-size: 12pt; } .greentext { color: #00FF00; font-size: 6pt; } .redtext { color: #FF0000; font-size: 6pt; } .clown { color: #FF69BF; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-family: 'Spess Font'; font-size: 6pt; line-height: 1.4; }" -<<<<<<< HEAD elem "title_browser" type = BROWSER pos = 0,0 @@ -138,8 +137,6 @@ window "mapwindow" is-disabled = true saved-params = "" auto-format = false -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 elem "status_bar" type = LABEL pos = 0,464 diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index cd13e5381b6..372dfef6bd5 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -65,10 +65,7 @@ h1.alert, h2.alert {color: #000000;} .emote {} .infoplain {} -<<<<<<< HEAD .mentor {} -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 .userdanger {color: #ff0000; font-weight: bold; font-size: 3;} .danger {color: #ff0000; font-weight: bold;} diff --git a/lua/SS13_base.lua b/lua/SS13_base.lua index 33d1571d452..23f464bf328 100644 --- a/lua/SS13_base.lua +++ b/lua/SS13_base.lua @@ -5,51 +5,13 @@ local SS13 = {} __SS13_signal_handlers = __SS13_signal_handlers or {} -<<<<<<< HEAD -SS13.SSlua = dm.global_vars.vars.SSlua -======= SS13.SSlua = dm.global_vars.SSlua ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 SS13.global_proc = "some_magic_bullshit" SS13.state = state.state function SS13.get_runner_ckey() -<<<<<<< HEAD - return SS13.state:get_var("ckey_last_runner") -end - -function SS13.get_runner_client() - return dm.global_vars:get_var("GLOB"):get_var("directory"):get(SS13.get_runner_ckey()) -end - -function SS13.istype(thing, type) - return dm.global_proc("_istype", thing, dm.global_proc("_text2path", type)) == 1 -end - -function SS13.start_tracking(datum) - local references = SS13.state.vars.references - references:add(datum) - SS13.state:call_proc("clear_on_delete", datum) -end - -function SS13.new(type, ...) - local datum = SS13.new_untracked(type, ...) - if datum then - SS13.start_tracking(datum) - return datum - end -end - -function SS13.type(string_type) - return dm.global_proc("_text2path", string_type) -end - -function SS13.qdel(datum) - if SS13.is_valid(datum) then - dm.global_proc("qdel", datum) -======= return SS13.state.ckey_last_runner end @@ -68,26 +30,13 @@ SS13.new = dm.new function SS13.qdel(datum) if SS13.is_valid(datum) then dm.global_procs.qdel(datum) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return true end return false end -<<<<<<< HEAD -function SS13.new_untracked(type, ...) - return dm.global_proc("_new", type, { ... }) -end - -function SS13.is_valid(datum) - if datum and not datum:is_null() and not datum:get_var("gc_destroyed") then - return true - end - return false -======= function SS13.is_valid(datum) return dm.is_valid_ref(datum) and not datum.gc_destroyed ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 end function SS13.await(thing_to_call, proc_to_call, ...) @@ -97,19 +46,6 @@ function SS13.await(thing_to_call, proc_to_call, ...) if thing_to_call == SS13.global_proc then proc_to_call = "/proc/" .. proc_to_call end -<<<<<<< HEAD - local promise = SS13.new("/datum/auxtools_promise", thing_to_call, proc_to_call, ...) - local promise_vars = promise.vars - while promise_vars.status == 0 do - sleep() - end - local return_value, runtime_message = promise_vars.return_value, promise_vars.runtime_message - SS13.stop_tracking(promise) - return return_value, runtime_message -end - -function SS13.register_signal(datum, signal, func) -======= local promise = SS13.new("/datum/promise", thing_to_call, proc_to_call, ...) while promise.status == 0 do sleep() @@ -154,117 +90,10 @@ function SS13.register_signal(datum, signal, func) if not type(func) == "function" then return end ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if not SS13.istype(datum, "/datum") then return end if not SS13.is_valid(datum) then -<<<<<<< HEAD - error("Tried to register a signal on a deleted datum!", 2) - return - end - local datumWeakRef = dm.global_proc("WEAKREF", datum) - if not __SS13_signal_handlers[datumWeakRef] then - __SS13_signal_handlers[datumWeakRef] = {} - end - if signal == "_cleanup" then - return - end - if not __SS13_signal_handlers[datumWeakRef][signal] then - __SS13_signal_handlers[datumWeakRef][signal] = {} - end - local callback = SS13.new("/datum/callback", SS13.state, "call_function_return_first") - local callbackWeakRef = dm.global_proc("WEAKREF", callback) - callback:call_proc("RegisterSignal", datum, signal, "Invoke") - local path = { "__SS13_signal_handlers", datumWeakRef, signal, callbackWeakRef, "func" } - callback.vars.arguments = { path } - -- Turfs don't remove their signals on deletion. - if not __SS13_signal_handlers[datumWeakRef]._cleanup and not SS13.istype(datum, "/turf") then - local cleanupCallback = SS13.new("/datum/callback", SS13.state, "call_function_return_first") - local cleanupPath = { "__SS13_signal_handlers", datumWeakRef, "_cleanup"} - cleanupCallback.vars.arguments = { cleanupPath } - cleanupCallback:call_proc("RegisterSignal", datum, "parent_qdeleting", "Invoke") - __SS13_signal_handlers[datumWeakRef]._cleanup = function(datum) - SS13.start_tracking(datumWeakRef) - timer.set_timeout(0, function() - SS13.signal_handler_cleanup(datumWeakRef) - SS13.stop_tracking(cleanupCallback) - SS13.stop_tracking(datumWeakRef) - end) - end - end - __SS13_signal_handlers[datumWeakRef][signal][callbackWeakRef] = { func = func, callback = callback } - return callback -end - -function SS13.stop_tracking(datum) - SS13.state:call_proc("let_soft_delete", datum) -end - -function SS13.unregister_signal(datum, signal, callback) - local function clear_handler(handler_info) - if not handler_info then - return - end - if not handler_info.callback then - return - end - local handler_callback = handler_info.callback - local callbackWeakRef = dm.global_proc("WEAKREF", handler_callback) - if not SS13.istype(datum, "/datum/weakref") then - handler_callback:call_proc("UnregisterSignal", datum, signal) - else - local actualDatum = datum:call_proc("hard_resolve") - if SS13.is_valid(actualDatum) then - handler_callback:call_proc("UnregisterSignal", actualDatum, signal) - end - end - SS13.stop_tracking(handler_callback) - end - - local datumWeakRef = datum - if not SS13.istype(datum, "/datum/weakref") then - datumWeakRef = dm.global_proc("WEAKREF", datum) - end - if not __SS13_signal_handlers[datumWeakRef] then - return - end - - if signal == "_cleanup" then - return - end - - if not __SS13_signal_handlers[datumWeakRef][signal] then - return - end - - if not callback then - for handler_key, handler_info in __SS13_signal_handlers[datumWeakRef][signal] do - clear_handler(handler_info) - end - __SS13_signal_handlers[datumWeakRef][signal] = nil - else - if not SS13.istype(callback, "/datum/callback") then - return - end - local callbackWeakRef = dm.global_proc("WEAKREF", callback) - clear_handler(__SS13_signal_handlers[datumWeakRef][signal][callbackWeakRef]) - __SS13_signal_handlers[datumWeakRef][signal][callbackWeakRef] = nil - end -end - -function SS13.signal_handler_cleanup(datumWeakRef) - if not __SS13_signal_handlers[datumWeakRef] then - return - end - - for signal, _ in __SS13_signal_handlers[datumWeakRef] do - SS13.unregister_signal(datumWeakRef, signal) - end - __SS13_signal_handlers[datumWeakRef] = nil -end - -======= error("Tried to register a signal on a deleted datum", 2) end if not __SS13_signal_handlers[datum] then @@ -323,5 +152,4 @@ function SS13.unregister_signal(datum, signal, func) end end ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return SS13 diff --git a/lua/handler_group.lua b/lua/handler_group.lua index 6cf664297bb..050551b8529 100644 --- a/lua/handler_group.lua +++ b/lua/handler_group.lua @@ -1,52 +1,29 @@ -<<<<<<< HEAD -local SS13 = require('SS13') -======= local SS13 = require("SS13") ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 local HandlerGroup = {} HandlerGroup.__index = HandlerGroup function HandlerGroup.new() return setmetatable({ -<<<<<<< HEAD - registered = {} -======= registered = {}, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, HandlerGroup) end -- Registers a signal on a datum for this handler group instance. function HandlerGroup:register_signal(datum, signal, func) -<<<<<<< HEAD - local callback = SS13.register_signal(datum, signal, func) - if not callback then - return - end - table.insert(self.registered, { datum = dm.global_proc("WEAKREF", datum), signal = signal, callback = callback }) -======= local registered_successfully = SS13.register_signal(datum, signal, func) if not registered_successfully then return end table.insert(self.registered, { datum = datum, signal = signal, func = func }) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 end -- Clears all the signals that have been registered on this HandlerGroup function HandlerGroup:clear() for _, data in self.registered do -<<<<<<< HEAD - if not data.callback or not data.datum then - continue - end - SS13.unregister_signal(data.datum, data.signal, data.callback) -======= if not data.func or not SS13.is_valid(data.datum) then continue end SS13.unregister_signal(data.datum, data.signal, data.func) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 end table.clear(self.registered) end @@ -68,8 +45,4 @@ function HandlerGroup.register_once(datum, signal, func) return callback end -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return HandlerGroup diff --git a/lua/state.lua b/lua/state.lua index 641250539d9..cba24d64356 100644 --- a/lua/state.lua +++ b/lua/state.lua @@ -1,14 +1,7 @@ -<<<<<<< HEAD -local SSlua = dm.global_vars:get_var("SSlua") - -for _, state in SSlua:get_var("states") do - if state:get_var("internal_id") == dm.state_id then -======= local SSlua = dm.global_vars.SSlua for _, state in SSlua.states do if state.internal_id == _state_id then ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return { state = state } end end diff --git a/lua/timer.lua b/lua/timer.lua index e12aba8c4fd..e79cc8cdca5 100644 --- a/lua/timer.lua +++ b/lua/timer.lua @@ -2,31 +2,19 @@ local state = require("state") local Timer = {} -<<<<<<< HEAD -local SSlua = dm.global_vars:get_var("SSlua") -======= local SSlua = dm.global_vars.SSlua ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 __Timer_timers = __Timer_timers or {} __Timer_callbacks = __Timer_callbacks or {} function __add_internal_timer(func, time, loop) local timer = { loop = loop, -<<<<<<< HEAD - executeTime = time + dm.world:get_var("time") -======= executeTime = time + dm.world.time, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } __Timer_callbacks[tostring(func)] = function() timer.executing = false if loop and timer.terminate ~= true then -<<<<<<< HEAD - timer.executeTime = dm.world:get_var("time") + time -======= timer.executeTime = dm.world.time + time ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 else __stop_internal_timer(tostring(func)) end @@ -49,37 +37,21 @@ function __stop_internal_timer(func) end __Timer_timer_processing = __Timer_timer_processing or false -<<<<<<< HEAD -state.state:set_var("timer_enabled", 1) -======= state.state.timer_enabled = 1 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 __Timer_timer_process = function(seconds_per_tick) if __Timer_timer_processing then return 0 end __Timer_timer_processing = true -<<<<<<< HEAD - local time = dm.world:get_var("time") -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 for func, timeData in __Timer_timers do if timeData.executing == true then continue end -<<<<<<< HEAD - if over_exec_usage(0.85) then - sleep() - end - if time >= timeData.executeTime then - state.state:get_var("functions_to_execute"):add(func) -======= if _exec.time / (dm.world.tick_lag * 100) > 0.85 then sleep() end if dm.world.time >= timeData.executeTime then list.add(state.state.functions_to_execute, func) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 timeData.executing = true end end @@ -88,21 +60,9 @@ __Timer_timer_process = function(seconds_per_tick) end function Timer.wait(time) -<<<<<<< HEAD -<<<<<<< HEAD - local next_yield_index = __next_yield_index - __add_internal_timer(function() - SSlua:call_proc("queue_resume", state.state, next_yield_index) -======= local yieldIndex = _exec.next_yield_index __add_internal_timer(function() SSlua:queue_resume(state.state, yieldIndex) ->>>>>>> 6577c58b948b (Fixes lua function SS13.wait. (#85427)) -======= - local yieldIndex = _exec.next_yield_index - __add_internal_timer(function() - SSlua:queue_resume(state.state, yieldIndex) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 end, time * 10, false) coroutine.yield() end diff --git a/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm b/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm index 90a4a475d18..6ee88554689 100644 --- a/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -88,7 +88,6 @@ GLOBAL_LIST_INIT(skyrat_wood_recipes, list( new/datum/stack_recipe("sturdy wooden fence", /obj/structure/railing/wooden_fencing, 5, time = 2 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), new/datum/stack_recipe("sturdy wooden fence gate", /obj/structure/railing/wooden_fencing/gate, 5, time = 2 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), new/datum/stack_recipe("large wooden gate", /obj/structure/mineral_door/wood/large_gate, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), - new/datum/stack_recipe("wooden bowl", /obj/item/reagent_containers/cup/bowl/wood_bowl, 3, time = 2 SECONDS, category = CAT_TOOLS), )) diff --git a/modular_skyrat/master_files/code/modules/antagonists/changeling/changeling.dm b/modular_skyrat/master_files/code/modules/antagonists/changeling/changeling.dm index ac9481b9e36..2fe00762dde 100644 --- a/modular_skyrat/master_files/code/modules/antagonists/changeling/changeling.dm +++ b/modular_skyrat/master_files/code/modules/antagonists/changeling/changeling.dm @@ -5,8 +5,6 @@ /datum/changeling_profile /// The bra worn by the profile source var/bra - /// The color of the underwear used by the profile source - var/underwear_color /// The color of the undershirt used by the profile source var/undershirt_color /// The color of the socks used by the profile source diff --git a/code/modules/client/preferences/middleware/food.dm b/modular_skyrat/master_files/code/modules/client/preferences/middleware/food.dm similarity index 100% rename from code/modules/client/preferences/middleware/food.dm rename to modular_skyrat/master_files/code/modules/client/preferences/middleware/food.dm diff --git a/modular_skyrat/master_files/code/modules/clothing/back/antigravityharness.dm b/modular_skyrat/master_files/code/modules/clothing/back/antigravityharness.dm index b82146de02b..0cff51c5959 100644 --- a/modular_skyrat/master_files/code/modules/clothing/back/antigravityharness.dm +++ b/modular_skyrat/master_files/code/modules/clothing/back/antigravityharness.dm @@ -61,7 +61,7 @@ /// This cycles the harness's current mode to the next one, likely using the action button. Goes from Off to Anti to Extra, always. /obj/item/gravity_harness/proc/toggle_mode(mob/user, voluntary) - if(!istype(user) || user.incapacitated()) + if(!istype(user) || user.incapacitated) return FALSE if(!gravity_on && (!current_cell || current_cell.charge < GRAVITY_FIELD_COST)) diff --git a/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/snail.dm b/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/snail.dm index 7d145267b94..ed5f55b7742 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/snail.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/snail.dm @@ -12,9 +12,6 @@ . = ..() new_snailperson.update_icons() -/datum/species/snail/update_quirk_mail_goodies(mob/living/carbon/human/recipient, datum/quirk/quirk, list/mail_goodies = list()) - return //This is so that they don't get lube sent in the mail - they don't have exotic blood, so there's no need for it. - /obj/item/storage/backpack/snail /// Whether or not a bluespace anomaly core has been inserted var/storage_core = FALSE diff --git a/modular_skyrat/modules/admin/code/smites/pie.dm b/modular_skyrat/modules/admin/code/smites/pie.dm index ac8e38c3c80..a4b71fdca96 100644 --- a/modular_skyrat/modules/admin/code/smites/pie.dm +++ b/modular_skyrat/modules/admin/code/smites/pie.dm @@ -5,4 +5,5 @@ /datum/smite/pie/effect(client/user, mob/living/target) . = ..() var/obj/item/food/pie/cream/nostun/creamy = new(get_turf(target)) - creamy.splat(target) + var/datum/component/splat/splat_handler = creamy.GetComponent(/datum/component/splat) + splat_handler.splat(splat_handler, target) diff --git a/modular_skyrat/modules/alt_vox/code/vox_procs.dm b/modular_skyrat/modules/alt_vox/code/vox_procs.dm index 24782dec561..00d6945d004 100644 --- a/modular_skyrat/modules/alt_vox/code/vox_procs.dm +++ b/modular_skyrat/modules/alt_vox/code/vox_procs.dm @@ -16,7 +16,7 @@ set desc = "Display a list of vocal words to announce to the crew." set category = "AI Commands" - if(incapacitated()) + if(incapacitated) return var/dat = {" @@ -77,7 +77,7 @@ last_announcement = message - if(incapacitated()) + if(incapacitated) return if(control_disabled) @@ -188,7 +188,7 @@ set desc = "Switch your VOX announcement voice!" set category = "AI Commands" - if(incapacitated()) + if(incapacitated) return var/selection = tgui_input_list(src, "Please select a new VOX voice:", "VOX VOICE", vox_voices) if(selection == null) @@ -203,7 +203,7 @@ set desc = "Display the list of recently pressed vox lines." set category = "AI Commands" - if(incapacitated()) + if(incapacitated) return to_chat(src, vox_word_string) diff --git a/modular_skyrat/modules/borgs/code/robot_items.dm b/modular_skyrat/modules/borgs/code/robot_items.dm index dc7c7cc032e..4679acc6aa4 100644 --- a/modular_skyrat/modules/borgs/code/robot_items.dm +++ b/modular_skyrat/modules/borgs/code/robot_items.dm @@ -575,7 +575,7 @@ /obj/item/borg_shapeshifter/proc/check_menu(mob/user) if(!istype(user)) return FALSE - if(user.incapacitated() || !user.Adjacent(src)) + if(user.incapacitated || !user.Adjacent(src)) return FALSE return TRUE diff --git a/modular_skyrat/modules/clock_cult/code/actions/_action.dm b/modular_skyrat/modules/clock_cult/code/actions/_action.dm index bbc1347d3d3..5cbe6fb3c85 100644 --- a/modular_skyrat/modules/clock_cult/code/actions/_action.dm +++ b/modular_skyrat/modules/clock_cult/code/actions/_action.dm @@ -38,7 +38,7 @@ return ..(losing_mob) /datum/action/innate/clockcult/quick_bind/IsAvailable(feedback) - if(!IS_CLOCK(owner) || owner.incapacitated()) + if(!IS_CLOCK(owner) || owner.incapacitated) return FALSE return ..() diff --git a/modular_skyrat/modules/clock_cult/code/items/replica_fabricator.dm b/modular_skyrat/modules/clock_cult/code/items/replica_fabricator.dm index 1a0a53e83b0..ce2e4d025a1 100644 --- a/modular_skyrat/modules/clock_cult/code/items/replica_fabricator.dm +++ b/modular_skyrat/modules/clock_cult/code/items/replica_fabricator.dm @@ -131,7 +131,7 @@ if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot1.ogg b/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot1.ogg index 14b3868d067..fc2836ff1f4 100644 Binary files a/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot1.ogg and b/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot1.ogg differ diff --git a/modular_skyrat/modules/clock_cult/sound/ocularwarden-dot1.ogg b/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot2.ogg similarity index 51% rename from modular_skyrat/modules/clock_cult/sound/ocularwarden-dot1.ogg rename to modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot2.ogg index fc2836ff1f4..635116cb67c 100644 Binary files a/modular_skyrat/modules/clock_cult/sound/ocularwarden-dot1.ogg and b/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-dot2.ogg differ diff --git a/modular_skyrat/modules/clock_cult/sound/ocularwarden-target.ogg b/modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-target.ogg similarity index 100% rename from modular_skyrat/modules/clock_cult/sound/ocularwarden-target.ogg rename to modular_skyrat/modules/clock_cult/sound/machinery/ocularwarden-target.ogg diff --git a/modular_skyrat/modules/clock_cult/sound/scripture_tier_up.ogg b/modular_skyrat/modules/clock_cult/sound/magic/scripture_tier_up.ogg similarity index 100% rename from modular_skyrat/modules/clock_cult/sound/scripture_tier_up.ogg rename to modular_skyrat/modules/clock_cult/sound/magic/scripture_tier_up.ogg diff --git a/modular_skyrat/modules/colony_fabricator/code/tools/tools.dm b/modular_skyrat/modules/colony_fabricator/code/tools/tools.dm index e531c85a746..5dba39ef7c7 100644 --- a/modular_skyrat/modules/colony_fabricator/code/tools/tools.dm +++ b/modular_skyrat/modules/colony_fabricator/code/tools/tools.dm @@ -89,7 +89,7 @@ /obj/item/screwdriver/omni_drill/proc/check_menu(mob/user) if(!istype(user)) return FALSE - if(user.incapacitated() || !user.Adjacent(src)) + if(user.incapacitated || !user.Adjacent(src)) return FALSE return TRUE diff --git a/modular_skyrat/modules/cryosleep/code/ai.dm b/modular_skyrat/modules/cryosleep/code/ai.dm index 350dcd701f2..84a1073ec11 100644 --- a/modular_skyrat/modules/cryosleep/code/ai.dm +++ b/modular_skyrat/modules/cryosleep/code/ai.dm @@ -3,7 +3,7 @@ set desc = "Puts the current AI personality into cryogenic stasis, freeing the space for another." set category = "AI Commands" - if(incapacitated()) + if(incapacitated) return switch(alert("Would you like to enter cryo? This will ghost you. Remember to AHELP before cryoing out of important roles, even with no admins online.",,"Yes.","No.")) if("Yes.") diff --git a/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm b/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm index 6a4faf96763..9172f256463 100644 --- a/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm +++ b/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm @@ -21,7 +21,7 @@ /obj/item/clothing/mask/balaclavaadjust/proc/adjust_mask(mob/living/carbon/human/user) if(!istype(user)) return - if(!user.incapacitated()) + if(!user.incapacitated) switch(open) if (0) flags_inv = HIDEHAIR diff --git a/modular_skyrat/modules/customization/modules/clothing/masks/gasmask.dm b/modular_skyrat/modules/customization/modules/clothing/masks/gasmask.dm index 5abd71f2411..eb9ab470ebf 100644 --- a/modular_skyrat/modules/customization/modules/clothing/masks/gasmask.dm +++ b/modular_skyrat/modules/customization/modules/clothing/masks/gasmask.dm @@ -127,7 +127,7 @@ ) /obj/item/clothing/mask/gas/clown_hat/vox/ui_action_click(mob/user) - if(!istype(user) || user.incapacitated()) + if(!istype(user) || user.incapacitated) return var/list/options = list() @@ -142,7 +142,7 @@ if(!choice) return FALSE - if(src && choice && !user.incapacitated() && in_range(user,src)) + if(src && choice && !user.incapacitated && in_range(user,src)) icon_state = options[choice] user.update_worn_mask() update_item_action_buttons() @@ -167,7 +167,7 @@ ) /obj/item/clothing/mask/gas/mime/vox/ui_action_click(mob/user) - if(!istype(user) || user.incapacitated()) + if(!istype(user) || user.incapacitated) return var/list/options = list() @@ -180,7 +180,7 @@ if(!choice) return FALSE - if(src && choice && !user.incapacitated() && in_range(user,src)) + if(src && choice && !user.incapacitated && in_range(user,src)) var/mob/living/carbon/human/human_user = user if(human_user.dna.species.mutant_bodyparts["snout"]) icon = 'modular_skyrat/master_files/icons/obj/clothing/masks.dmi' diff --git a/modular_skyrat/modules/customization/modules/clothing/masks/paper.dm b/modular_skyrat/modules/customization/modules/clothing/masks/paper.dm index 214cc5244c8..8f87da13da0 100644 --- a/modular_skyrat/modules/customization/modules/clothing/masks/paper.dm +++ b/modular_skyrat/modules/customization/modules/clothing/masks/paper.dm @@ -101,7 +101,7 @@ /obj/item/clothing/mask/paper/proc/adjust_mask(mob/living/carbon/human/user) if(!istype(user)) return - if(!user.incapacitated()) + if(!user.incapacitated) var/is_worn = user.wear_mask == src wear_hair_over = !wear_hair_over if(wear_hair_over) @@ -116,7 +116,7 @@ /obj/item/clothing/mask/paper/proc/adjust_strap(mob/living/carbon/human/user) if(!istype(user)) return - if(!user.incapacitated()) + if(!user.incapacitated) var/is_worn = user.wear_mask == src strap_hidden = !strap_hidden to_chat(user, "You [is_worn ? "" : "will "][strap_hidden ? "hide" : "show"] the mask strap.") diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm index 2e7a478627a..3af776fe024 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -479,7 +479,7 @@ var/goggles = FALSE /obj/item/clothing/head/avipilot/proc/adjust_goggles(mob/living/carbon/user) - if(user?.incapacitated()) + if(user?.incapacitated) return if(goggles) icon_state = "avipilotup" diff --git a/modular_skyrat/modules/emotes/sound/voice/goose_honk.ogg b/modular_skyrat/modules/emotes/sound/voice/goose_honk.ogg new file mode 100644 index 00000000000..b15b7695b32 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/voice/goose_honk.ogg differ diff --git a/modular_skyrat/modules/faction/code/radio.dm b/modular_skyrat/modules/faction/code/radio.dm index 4d1c7a5838e..ef152c95e6f 100644 --- a/modular_skyrat/modules/faction/code/radio.dm +++ b/modular_skyrat/modules/faction/code/radio.dm @@ -4,7 +4,7 @@ channels = list(RADIO_CHANNEL_FACTION = 1) greyscale_config = /datum/greyscale_config/encryptionkey_cargo greyscale_colors = "#49241a#dca01b" - independent = TRUE + special_channels = RADIO_SPECIAL_CENTCOM /obj/item/radio/headset/headset_faction name = "faction radio headset" diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm index 5399b3811ef..05311ff66cd 100644 --- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm +++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm @@ -162,7 +162,7 @@ resolve_parent.balloon_alert(user, "can't reach!") return FALSE - if(!isliving(user) || user.incapacitated()) + if(!isliving(user) || user.incapacitated) return FALSE var/obj/item/gun/gun_to_draw = locate() in real_location diff --git a/modular_skyrat/modules/goofsec/code/sol_fed.dm b/modular_skyrat/modules/goofsec/code/sol_fed.dm index 0a4af4683ad..aba107bf036 100644 --- a/modular_skyrat/modules/goofsec/code/sol_fed.dm +++ b/modular_skyrat/modules/goofsec/code/sol_fed.dm @@ -384,7 +384,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( /obj/item/encryptionkey/headset_solfed/atmos name = "\improper SolFed adv. atmos encryption key" icon_state = "cypherkey_medical" - independent = TRUE + special_channels = RADIO_SPECIAL_CENTCOM channels = list(RADIO_CHANNEL_SOLFED = 1, RADIO_CHANNEL_ENGINEERING = 1, RADIO_CHANNEL_COMMAND = 1) greyscale_config = /datum/greyscale_config/encryptionkey_medical greyscale_colors = "#ebebeb#2b2793" diff --git a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm index ac1bfa53b07..32bb559c403 100644 --- a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm +++ b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm @@ -163,7 +163,7 @@ /obj/item/storage/hypospraykit/proc/check_menu(mob/user) if(!istype(user)) return FALSE - if(user.incapacitated() || !user.is_holding(src)) + if(user.incapacitated || !user.is_holding(src)) return FALSE return TRUE diff --git a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm index 86bf66e3435..7209d8648eb 100644 --- a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm +++ b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm @@ -318,7 +318,7 @@ /obj/item/hypospray/mkii/attack_hand(mob/living/user) if(user && loc == user && user.is_holding(src)) - if(user.incapacitated()) + if(user.incapacitated) return else if(!vial) . = ..() diff --git a/modular_skyrat/modules/layer_shift/code/mob_movement.dm b/modular_skyrat/modules/layer_shift/code/mob_movement.dm index 740b3e2289e..e2ce3dc36e5 100644 --- a/modular_skyrat/modules/layer_shift/code/mob_movement.dm +++ b/modular_skyrat/modules/layer_shift/code/mob_movement.dm @@ -10,7 +10,7 @@ set name = "Shift Layer Upwards" set category = "IC" - if(incapacitated()) + if(incapacitated) to_chat(src, span_warning("You can't do that right now!")) return FALSE @@ -29,7 +29,7 @@ set name = "Shift Layer Downwards" set category = "IC" - if(incapacitated()) + if(incapacitated) to_chat(src, span_warning("You can't do that right now!")) return FALSE diff --git a/modular_skyrat/modules/mapping/code/radio.dm b/modular_skyrat/modules/mapping/code/radio.dm index a65f1baff24..e99cb5a37e1 100644 --- a/modular_skyrat/modules/mapping/code/radio.dm +++ b/modular_skyrat/modules/mapping/code/radio.dm @@ -1,19 +1,19 @@ /obj/item/encryptionkey/headset_syndicate/cybersun name = "cybersun radio encryption key" channels = list(RADIO_CHANNEL_CYBERSUN = 1) - independent = TRUE + special_channels = RADIO_SPECIAL_CENTCOM /obj/item/encryptionkey/headset_syndicate/interdyne name = "interdyne radio encryption key" channels = list(RADIO_CHANNEL_INTERDYNE = 1) - independent = TRUE + special_channels = RADIO_SPECIAL_CENTCOM /obj/item/encryptionkey/headset_syndicate/guild name = "private radio encryption key" channels = list(RADIO_CHANNEL_GUILD = 1) - independent = TRUE + special_channels = RADIO_SPECIAL_CENTCOM /obj/item/encryptionkey/headset_cargo/tarkon name = "tarkon industry radio encryption key" channels = list(RADIO_CHANNEL_TARKON = 1) - independent = TRUE + special_channels = RADIO_SPECIAL_CENTCOM diff --git a/modular_skyrat/modules/modular_items/code/modular_glasses.dm b/modular_skyrat/modules/modular_items/code/modular_glasses.dm index f9232ae9d49..934fcad8ee7 100644 --- a/modular_skyrat/modules/modular_items/code/modular_glasses.dm +++ b/modular_skyrat/modules/modular_items/code/modular_glasses.dm @@ -49,7 +49,7 @@ /obj/item/clothing/glasses/hud/ar/proc/toggle_mode(mob/user, voluntary) - if(!istype(user) || user.incapacitated()) + if(!istype(user) || user.incapacitated) return if(mode == modes[mode]) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm index 41a6aa81eab..88de03410c5 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm @@ -117,7 +117,7 @@ /obj/item/clothing/mask/gas/bdsm_mask/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE @@ -148,12 +148,12 @@ // To make in unremovable without helping when mask is on (for MouseDrop) /datum/storage/pockets/small/bdsm_mask/on_mousedrop_onto(datum/source, atom/over_object, mob/user) var/obj/item/clothing/mask/gas/bdsm_mask/mask = source - if(!istype(mask) || ismecha(user.loc) || user.incapacitated() || !mask.is_locked(user)) + if(!istype(mask) || ismecha(user.loc) || user.incapacitated || !mask.is_locked(user)) return ..() return NONE //handled in mask mousedrop, don't allow content dumping /obj/item/clothing/mask/gas/bdsm_mask/mouse_drop_dragged(atom/over_object, mob/user, src_location, over_location, params) - if(ismecha(user.loc) || user.incapacitated() || !is_locked(user)) + if(ismecha(user.loc) || user.incapacitated || !is_locked(user)) return if(!istype(over_object, /atom/movable/screen/inventory/hand)) return diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm index 16f0fec9eb8..01a9c5c153f 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm @@ -161,7 +161,7 @@ /obj/item/clothing/head/deprivation_helmet/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm index 5150f7a539b..efeef0229b0 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm @@ -73,7 +73,7 @@ /obj/item/clothing/glasses/hypno/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm index 6e1674fc87f..e2188044227 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm @@ -37,7 +37,7 @@ /obj/item/clothing/glasses/blindfold/kinky/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm index 8e73ea7d434..7e8822c1869 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm @@ -43,7 +43,7 @@ /obj/item/clothing/ears/kinky_headphones/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm index 002f861f13c..0ce885feda3 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm @@ -78,7 +78,7 @@ /obj/item/clothing/suit/straight_jacket/kinky_sleepbag/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm index 53b01b6699e..dcb8743bb98 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm @@ -63,7 +63,7 @@ /obj/item/clothing/accessory/lewdapron/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm index 5201bb02a35..17fa7de9344 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm @@ -49,7 +49,7 @@ /obj/item/clothing/suit/straight_jacket/shackles/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm index 4043fbb1e9c..1a53fbdd256 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm @@ -38,7 +38,7 @@ /obj/item/clothing/strapon/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_sex_toy.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_sex_toy.dm index c4401dfc4cd..8bdbf5fb5a0 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_sex_toy.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_sex_toy.dm @@ -60,7 +60,7 @@ /obj/item/clothing/sextoy/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm index 58b5acf4fbe..bdf1417c492 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm @@ -254,7 +254,7 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors /// Choose a color and transparency level for the toy /obj/item/clothing/sextoy/dildo/custom_dildo/proc/customize(mob/living/user) - if(!src || !user || user.incapacitated() || !in_range(user, src)) + if(!src || !user || user.incapacitated || !in_range(user, src)) return FALSE var/color_choice = tgui_input_list(user, "Choose a color for your dildo.", "Dildo Color", GLOB.dildo_colors) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm index 1e86737219c..125fb0a9cde 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm @@ -130,7 +130,7 @@ /obj/item/clothing/mask/leatherwhip/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm index dfb307b8203..9b0cfa527f8 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm @@ -26,7 +26,7 @@ /obj/item/spanking_pad/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm index ab5530b3726..6eb5415bc1a 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm @@ -44,7 +44,7 @@ /obj/item/bdsm_candle/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm index 9c0d65f6789..cb4acaa577a 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm @@ -195,7 +195,7 @@ /obj/machinery/vending/dorms/proc/check_menu(mob/living/user, obj/item/multitool) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE if(!multitool || !user.is_holding(multitool)) return FALSE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm index e2ee0e9a136..50c21f8653d 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm @@ -154,7 +154,7 @@ /obj/structure/chair/milking_machine/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm index cae915e4b7b..c6ad52f494d 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm @@ -61,7 +61,7 @@ /obj/item/fancy_pillow/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE - if(user.incapacitated()) + if(user.incapacitated) return FALSE return TRUE diff --git a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm index 01eda1e746d..c795dadbd97 100644 --- a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm +++ b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm @@ -154,7 +154,7 @@ . = ..() /obj/machinery/mounted_machine_gun/user_buckle_mob(mob/living/user_to_buckle, mob/buckling_user, check_loc = TRUE) - if(user_to_buckle.incapacitated() || !istype(user_to_buckle)) + if(user_to_buckle.incapacitated || !istype(user_to_buckle)) return user_to_buckle.forceMove(get_turf(src)) . = ..() @@ -404,7 +404,7 @@ direction_track(current_user, target_turf) /obj/machinery/mounted_machine_gun/proc/direction_track(mob/user, atom/targeted) - if(user.incapacitated()) + if(user.incapacitated) return setDir(get_dir(src, targeted)) user.setDir(dir) diff --git a/modular_skyrat/modules/mutants/code/mutant_cure.dm b/modular_skyrat/modules/mutants/code/mutant_cure.dm index 81aad77fbff..9527af9670d 100644 --- a/modular_skyrat/modules/mutants/code/mutant_cure.dm +++ b/modular_skyrat/modules/mutants/code/mutant_cure.dm @@ -25,7 +25,7 @@ update_appearance() /obj/item/rna_extractor/attack_self(mob/living/user) - if(user.incapacitated()) + if(user.incapacitated) return unload_vial(user) diff --git a/modular_skyrat/modules/synths/code/species/synthetic.dm b/modular_skyrat/modules/synths/code/species/synthetic.dm index 116a7fe100a..09ab5c0a987 100644 --- a/modular_skyrat/modules/synths/code/species/synthetic.dm +++ b/modular_skyrat/modules/synths/code/species/synthetic.dm @@ -1,7 +1,6 @@ /datum/species/synthetic name = "Synthetic Humanoid" id = SPECIES_SYNTH - say_mod = "beeps" inherent_biotypes = MOB_ROBOTIC | MOB_HUMANOID inherent_traits = list( TRAIT_CAN_STRIP, diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm index 81ef781ff31..a8f55b12fd9 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm @@ -69,7 +69,7 @@ /// Handles if either BULLET_ACT_HIT or BULLET_ACT_FORCE_PIERCE happens to something using the xeno evade ability /datum/action/cooldown/alien/skyrat/evade/proc/on_projectile_hit() - if(owner.incapacitated(IGNORE_GRAB) || !isturf(owner.loc) || !evade_active) + if(!INCAPACITATED_IGNORING(owner, INCAPABLE_GRAB) || !isturf(owner.loc) || !evade_active) return BULLET_ACT_HIT owner.visible_message(span_danger("[owner] effortlessly dodges the projectile!"), span_userdanger("You dodge the projectile!")) diff --git a/sound/attributions.txt b/sound/attributions.txt index caaef320757..45cf4bb1ac8 100644 --- a/sound/attributions.txt +++ b/sound/attributions.txt @@ -209,10 +209,7 @@ beaker_pickup.ogg was made by lowering pitch: Bottle Tap.wav by alex_alexalex -- https://freesound.org/s/395492/ -- License: Attribution NonCommercial 3.0 beaker_place.ogg was made by cutting and lowering pitch: place glass object.wav by milpower -- https://freesound.org/s/353105/ -- License: Creative Commons 0 -<<<<<<< HEAD -======= glass_reverse.ogg is adapted from a combination of: https://freesound.org/people/C_Rogers/sounds/203368/ -- glass-shattering-hit_01.ogg by C_Rogers on freesound.org (CC0) https://freesound.org/people/Czarcazas/sounds/330800/ -- Audio reversal/fading of Shattering Glass (Small) by Czarcazas -- https://freesound.org/s/330800/ -- License: Attribution 3.0 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/sound/machines/license.txt b/sound/machines/license.txt index 75fc8b74cfa..0d7de5a5dfa 100644 --- a/sound/machines/license.txt +++ b/sound/machines/license.txt @@ -7,12 +7,8 @@ coffeemaker_brew.ogg originally made by Adriana Lopez (Acekat13X31), edited to r This is licensed under CC-BY 4.0, found at https://creativecommons.org/licenses/by/4.0/ shutter.ogg adapted from Joseph Sardin on BigSoundBank -<<<<<<< HEAD -https://bigsoundbank.com/detail-2475-manual-roller-shutter-closing-out-2.html -======= https://bigsoundbank.com/detail-2475-manual-roller-shutter-closing-out-2.html lever_start.ogg and lever_stop.ogg are made by A_Kuha on FreeSound https://freesound.org/people/A_Kuha/sounds/676412 This is licensed under CC-0, found at https://creativecommons.org/publicdomain/zero/1.0/ ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/strings/fishing_tips.txt b/strings/fishing_tips.txt index 1c9e31f5085..e11c4ac2701 100644 --- a/strings/fishing_tips.txt +++ b/strings/fishing_tips.txt @@ -5,7 +5,7 @@ You could buy fish dirt cheap from the black market, but you probably won't get Rescue hooks can be used to snag in other people. Good for getting husks out of plasma rivers. Pufferfish are known for the slow yet lethal poison they store inside their liver. Magnet hooks are great to fish anything that's NOT a fish. -You can perform scanning experiments with an experi-scanner and some fish. They'll give sci some extra techweb points and get you more modules for the fishing portal generator. +You can perform scanning experiments with an experi-scanner and some fish. They'll give sci some extra techweb points and get you more modules for the fishing portal generator. Fish scanning experiments can be automatically performed with an advanced fishing rod. However to print one you need to have at least completed the first one. Advanced fishing rods come pre-equipped with a unexhaustible bait that ignores bait preferences of each fish, letting you catch'em all. Don't expect to be able to catch a lot of fish without a bait. @@ -39,10 +39,6 @@ The sludgefish from the toilets can be used as a steady supply of cheap fish and In a jiffy, you can scoop tadpoles from ponds with your bare hands, place them inside aquariums and quickly raise them into frogs. The legendary fishing hat isn't just cosmetic. Space carps (as well as young lobstrosities and frogs) do truly fear those who wear it. Have you ever heard a lobster or crab talk? Well, neither have I, but they say they're quite the fishy punsters. -<<<<<<< HEAD -You can get an experiscanner from science to perform fish scanning experiments, which can unlock more modules for the fishing portal, as well as fishing technology nodes (better equipment) for research. -======= You can get an experiscanner from science to perform fish scanning experiments, which can unlock more modules for the fishing portal, as well as fishing technology nodes (better equipment) for research. If you have enough credits, you can buy a set of fishing lures from cargo. Each lure allows you to catch different species of fish and won't get consumed, however they need to be spun at intervals to work. This may sound silly, but squids and their ink sacs can be used as weapons to temporarily blind people. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/strings/modular_maps/safehouse.toml b/strings/modular_maps/safehouse.toml index 3b149e35b16..90faf735140 100644 --- a/strings/modular_maps/safehouse.toml +++ b/strings/modular_maps/safehouse.toml @@ -32,12 +32,9 @@ modules = ["test_only_safehouse.dmm"] [rooms.wood] modules = ["wood.dmm"] -<<<<<<< HEAD # SKYRAT EDIT ADDITION START - custom domains / Disabled until solution found [rooms.ancient_milsim] modules = ["skyrat_ancientmilsim.dmm"] # SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/strings/names/mime.txt b/strings/names/mime.txt index d8f44e1073f..dfdd02ea76c 100644 --- a/strings/names/mime.txt +++ b/strings/names/mime.txt @@ -47,8 +47,4 @@ Victimless Mime Voiceless Dead Wall Runner Wes -<<<<<<< HEAD Zips-the-Lips -======= -Zips-the-Lips ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/strings/pirates.json b/strings/pirates.json index 24573636117..191cc927de7 100644 --- a/strings/pirates.json +++ b/strings/pirates.json @@ -139,7 +139,6 @@ "Spaceflower", "Status Quo", "Swords and Sandals", -<<<<<<< HEAD "Thesaurus Terror", "Archduke's Silver Ring", "Silver Steed" @@ -174,9 +173,6 @@ "Ivan Godwhisperer 64", "Two-By-Ten Apostols 13", "Novomoskovsk 65" -======= - "Thesaurus Terror" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ], "skeleton_names":[ "Flying Dutchman" diff --git a/strings/tips.txt b/strings/tips.txt index 78e871166c4..6d8fd65bf92 100644 --- a/strings/tips.txt +++ b/strings/tips.txt @@ -200,11 +200,7 @@ As the Detective, your revolver can be loaded with .357 ammunition obtained from As the Head of Personnel, you are not higher ranking than other heads of staff, even though you are expected to take the Captain's place first should he go missing. If the situation seems too rough for you, consider allowing another head to become temporary Captain. As the Head of Security, don't let the power go to your head. You may have high access, great equipment, and a miniature army at your side, but being a terrible person without a good reason is grounds for banning. As the Head of Security, you are expected to coordinate your security force to handle any threat that comes to the station. Sometimes it means making use of the armory to handle a blob, sometimes it means being ruthless during a revolution or cult. -<<<<<<< HEAD -As the Head of Security, you can call for executions or forced cyborgization, which require the Captain's or the Prisoner's consent, respectively. -======= As the Head of Security, you can call for executions or forced cyborgization, but may require the Captain's approval. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 As the Lawyer, try to negotiate with the Warden if sentences seem too high for the crime. As the Lawyer, you can try to convince the Captain and Head of Security to hold trials for prisoners in the courtroom. As the Malfunctioning AI, look into flooding the station with plasma fires to kill off large portions of the crew, letting you pick off the remaining few with space suits who escaped. @@ -229,11 +225,7 @@ Basketball requires skill. Spinning drains stamina, reduces accuracy, but gives Basketball requires teamwork. Passing the ball with LMB is instant and costs no stamina. Clicking on a windoor rather then bumping into it will keep it open, you can click it again to close it. Different weapons have different strengths. Some weapons, such as spears, floor tiles, and throwing stars, deal more damage when thrown compared to when attacked normally. -<<<<<<< HEAD Don't be afraid to ask for help, whether from your peers or from mentors. -======= -Don't be afraid to ask for help, whether from your peers or from admins. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Experiment with different setups of the Supermatter engine to maximize output, but don't risk the crew's safety to do so! Felinids get temporarily distracted by laser pointers. Use this to your advantage when being pursued by one. Firesuits and winter coats offer mild protection from the cold, allowing you to spend longer periods of time near breaches and space than if wearing nothing at all. diff --git a/tgstation.dme b/tgstation.dme index 4963b148bcf..e36cae811a8 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -394,6 +394,100 @@ #include "code\__DEFINES\traits\declarations.dm" #include "code\__DEFINES\traits\macros.dm" #include "code\__DEFINES\traits\sources.dm" +#include "code\__DEFINES\~skyrat_defines\_organ_defines.dm" +#include "code\__DEFINES\~skyrat_defines\access.dm" +#include "code\__DEFINES\~skyrat_defines\actionspeed_modification.dm" +#include "code\__DEFINES\~skyrat_defines\admin.dm" +#include "code\__DEFINES\~skyrat_defines\airlock.dm" +#include "code\__DEFINES\~skyrat_defines\ammo_defines.dm" +#include "code\__DEFINES\~skyrat_defines\antagonists.dm" +#include "code\__DEFINES\~skyrat_defines\apc_defines.dm" +#include "code\__DEFINES\~skyrat_defines\armaments.dm" +#include "code\__DEFINES\~skyrat_defines\armor_defines.dm" +#include "code\__DEFINES\~skyrat_defines\atom_hud.dm" +#include "code\__DEFINES\~skyrat_defines\augment.dm" +#include "code\__DEFINES\~skyrat_defines\automapper.dm" +#include "code\__DEFINES\~skyrat_defines\banning.dm" +#include "code\__DEFINES\~skyrat_defines\barsigns.dm" +#include "code\__DEFINES\~skyrat_defines\baton_upgrades.dm" +#include "code\__DEFINES\~skyrat_defines\cargo_import_companies.dm" +#include "code\__DEFINES\~skyrat_defines\cells.dm" +#include "code\__DEFINES\~skyrat_defines\chat.dm" +#include "code\__DEFINES\~skyrat_defines\clock_cult.dm" +#include "code\__DEFINES\~skyrat_defines\colony_fabricator_misc.dm" +#include "code\__DEFINES\~skyrat_defines\colors.dm" +#include "code\__DEFINES\~skyrat_defines\combat.dm" +#include "code\__DEFINES\~skyrat_defines\computers.dm" +#include "code\__DEFINES\~skyrat_defines\construction.dm" +#include "code\__DEFINES\~skyrat_defines\DNA.dm" +#include "code\__DEFINES\~skyrat_defines\economy.dm" +#include "code\__DEFINES\~skyrat_defines\events.dm" +#include "code\__DEFINES\~skyrat_defines\examine_defines.dm" +#include "code\__DEFINES\~skyrat_defines\faction.dm" +#include "code\__DEFINES\~skyrat_defines\factions.dm" +#include "code\__DEFINES\~skyrat_defines\flavor_defines.dm" +#include "code\__DEFINES\~skyrat_defines\food.dm" +#include "code\__DEFINES\~skyrat_defines\game_options.dm" +#include "code\__DEFINES\~skyrat_defines\hud.dm" +#include "code\__DEFINES\~skyrat_defines\id_cards.dm" +#include "code\__DEFINES\~skyrat_defines\integrated_electronics.dm" +#include "code\__DEFINES\~skyrat_defines\interactions.dm" +#include "code\__DEFINES\~skyrat_defines\inventory.dm" +#include "code\__DEFINES\~skyrat_defines\jobs.dm" +#include "code\__DEFINES\~skyrat_defines\keybindings.dm" +#include "code\__DEFINES\~skyrat_defines\language.dm" +#include "code\__DEFINES\~skyrat_defines\lazy_templates.dm" +#include "code\__DEFINES\~skyrat_defines\lewd_defines.dm" +#include "code\__DEFINES\~skyrat_defines\limbs.dm" +#include "code\__DEFINES\~skyrat_defines\liquids.dm" +#include "code\__DEFINES\~skyrat_defines\living.dm" +#include "code\__DEFINES\~skyrat_defines\loadout.dm" +#include "code\__DEFINES\~skyrat_defines\logging.dm" +#include "code\__DEFINES\~skyrat_defines\manufacturer_strings.dm" +#include "code\__DEFINES\~skyrat_defines\mapping.dm" +#include "code\__DEFINES\~skyrat_defines\maths.dm" +#include "code\__DEFINES\~skyrat_defines\medical_defines.dm" +#include "code\__DEFINES\~skyrat_defines\mobs.dm" +#include "code\__DEFINES\~skyrat_defines\nifsofts.dm" +#include "code\__DEFINES\~skyrat_defines\obj_flags.dm" +#include "code\__DEFINES\~skyrat_defines\opposing_force_defines.dm" +#include "code\__DEFINES\~skyrat_defines\pinpointers.dm" +#include "code\__DEFINES\~skyrat_defines\pollution.dm" +#include "code\__DEFINES\~skyrat_defines\preferences.dm" +#include "code\__DEFINES\~skyrat_defines\projectiles.dm" +#include "code\__DEFINES\~skyrat_defines\quirks.dm" +#include "code\__DEFINES\~skyrat_defines\reagents.dm" +#include "code\__DEFINES\~skyrat_defines\research.dm" +#include "code\__DEFINES\~skyrat_defines\research_categories.dm" +#include "code\__DEFINES\~skyrat_defines\reskin_defines.dm" +#include "code\__DEFINES\~skyrat_defines\robot_defines.dm" +#include "code\__DEFINES\~skyrat_defines\say.dm" +#include "code\__DEFINES\~skyrat_defines\security_alerts.dm" +#include "code\__DEFINES\~skyrat_defines\signals.dm" +#include "code\__DEFINES\~skyrat_defines\solfed.dm" +#include "code\__DEFINES\~skyrat_defines\sound.dm" +#include "code\__DEFINES\~skyrat_defines\span.dm" +#include "code\__DEFINES\~skyrat_defines\species_clothing_paths.dm" +#include "code\__DEFINES\~skyrat_defines\strippable.dm" +#include "code\__DEFINES\~skyrat_defines\synth_defines.dm" +#include "code\__DEFINES\~skyrat_defines\techweb_nodes.dm" +#include "code\__DEFINES\~skyrat_defines\teshari_clothing_paths.dm" +#include "code\__DEFINES\~skyrat_defines\text.dm" +#include "code\__DEFINES\~skyrat_defines\tools.dm" +#include "code\__DEFINES\~skyrat_defines\traits.dm" +#include "code\__DEFINES\~skyrat_defines\turfs.dm" +#include "code\__DEFINES\~skyrat_defines\vox_defines.dm" +#include "code\__DEFINES\~skyrat_defines\vv.dm" +#include "code\__DEFINES\~skyrat_defines\wounds.dm" +#include "code\__DEFINES\~skyrat_defines\_globalvars\bitfields.dm" +#include "code\__DEFINES\~skyrat_defines\_globalvars\food.dm" +#include "code\__DEFINES\~skyrat_defines\_globalvars\logging.dm" +#include "code\__DEFINES\~skyrat_defines\_globalvars\lists\mapping.dm" +#include "code\__DEFINES\~skyrat_defines\_HELPERS\atmos_mapping_helpers.dm" +#include "code\__DEFINES\~skyrat_defines\_HELPERS\lighting.dm" +#include "code\__DEFINES\~skyrat_defines\_HELPERS\offset_index.dm" +#include "code\__DEFINES\~skyrat_defines\signals\signals_human.dm" +#include "code\__DEFINES\~skyrat_defines\traits\declarations.dm" #include "code\__HELPERS\_auxtools_api.dm" #include "code\__HELPERS\_dreamluau.dm" #include "code\__HELPERS\_lists.dm" @@ -508,6 +602,10 @@ #include "code\__HELPERS\paths\sssp.dm" #include "code\__HELPERS\sorts\helpers.dm" #include "code\__HELPERS\sorts\sort_instance.dm" +#include "code\__HELPERS\~skyrat_helpers\is_helpers.dm" +#include "code\__HELPERS\~skyrat_helpers\level_traits.dm" +#include "code\__HELPERS\~skyrat_helpers\logging.dm" +#include "code\__HELPERS\~skyrat_helpers\unsorted.dm" #include "code\_globalvars\_regexes.dm" #include "code\_globalvars\admin.dm" #include "code\_globalvars\arcade.dm" @@ -6394,12 +6492,6 @@ #include "interface\fonts\spess_font.dm" #include "interface\fonts\tiny_unicode.dm" #include "interface\fonts\vcr_osd_mono.dm" -#include "interface\fonts\fonts_datum.dm" -#include "interface\fonts\grand_9k.dm" -#include "interface\fonts\pixellari.dm" -#include "interface\fonts\spess_font.dm" -#include "interface\fonts\tiny_unicode.dm" -#include "interface\fonts\vcr_osd_mono.dm" #include "modular_skyrat\master_files\code\_globalvars\configuration.dm" #include "modular_skyrat\master_files\code\_globalvars\regexes.dm" #include "modular_skyrat\master_files\code\_globalvars\religion.dm" @@ -6574,6 +6666,7 @@ #include "modular_skyrat\master_files\code\modules\client\preferences\tgui_prefs_migration.dm" #include "modular_skyrat\master_files\code\modules\client\preferences\underwear_color.dm" #include "modular_skyrat\master_files\code\modules\client\preferences\voice.dm" +#include "modular_skyrat\master_files\code\modules\client\preferences\middleware\food.dm" #include "modular_skyrat\master_files\code\modules\client\preferences\middleware\languages.dm" #include "modular_skyrat\master_files\code\modules\client\preferences\middleware\limbs_and_markings.dm" #include "modular_skyrat\master_files\code\modules\client\preferences\middleware\species_additional_changes.dm" @@ -7584,7 +7677,6 @@ #include "modular_skyrat\modules\gladiator\code\modules\mob\living\simple_animal\hostile\megafauna\markedone.dm" #include "modular_skyrat\modules\goofsec\code\cellphone.dm" #include "modular_skyrat\modules\goofsec\code\department_guards.dm" -#include "modular_skyrat\modules\goofsec\code\hud.dm" #include "modular_skyrat\modules\goofsec\code\sec_clothing_overrides.dm" #include "modular_skyrat\modules\goofsec\code\sol_fed.dm" #include "modular_skyrat\modules\goofsec\code\solfed_clothing.dm" @@ -8490,3 +8582,4 @@ #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\spitter.dm" #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\warrior.dm" // END_INCLUDE + diff --git a/tgui/docs/tutorial-and-examples.md b/tgui/docs/tutorial-and-examples.md index 115b1559d42..1b5ecab8968 100644 --- a/tgui/docs/tutorial-and-examples.md +++ b/tgui/docs/tutorial-and-examples.md @@ -75,11 +75,7 @@ Finally, the `ui_act` proc is called by the interface whenever the user used an input. The input's `action` and `params` are passed to the proc. ```dm -<<<<<<< HEAD -/obj/machinery/my_machine/ui_act(action, params) -======= /obj/machinery/my_machine/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 . = ..() if(.) return diff --git a/tgui/package.json b/tgui/package.json index 96ad9a40368..bb59cc24c74 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -50,11 +50,7 @@ "swc-loader": "^0.2.6", "typescript": "^5.4.3", "url-loader": "^4.1.1", -<<<<<<< HEAD - "webpack": "^5.94.0", -======= "webpack": "^5.91.0", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "webpack-bundle-analyzer": "^4.10.1", "webpack-cli": "^5.1.4" } diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json index 8a29c6f636c..5f1b5be3e54 100644 --- a/tgui/packages/tgui-dev-server/package.json +++ b/tgui/packages/tgui-dev-server/package.json @@ -4,18 +4,10 @@ "version": "5.0.1", "type": "module", "dependencies": { -<<<<<<< HEAD - "axios": "^1.7.4", - "glob": "^7.2.3", - "source-map": "^0.7.4", - "stacktrace-parser": "^0.1.10", - "ws": "^8.17.1" -======= "axios": "^1.6.8", "glob": "^7.2.3", "source-map": "^0.7.4", "stacktrace-parser": "^0.1.10", "ws": "^8.16.0" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } } diff --git a/tgui/packages/tgui-panel/chat/constants.ts b/tgui/packages/tgui-panel/chat/constants.ts index 706b8b68de1..f872d06055b 100644 --- a/tgui/packages/tgui-panel/chat/constants.ts +++ b/tgui/packages/tgui-panel/chat/constants.ts @@ -37,10 +37,7 @@ export const MESSAGE_TYPE_EVENTCHAT = 'eventchat'; export const MESSAGE_TYPE_ADMINLOG = 'adminlog'; export const MESSAGE_TYPE_ATTACKLOG = 'attacklog'; export const MESSAGE_TYPE_DEBUG = 'debug'; -<<<<<<< HEAD export const MESSAGE_TYPE_MENTOR = 'mentor'; // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Metadata for each message type export const MESSAGE_TYPES = [ @@ -57,22 +54,14 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_LOCALCHAT, name: 'Local', description: 'In-character local messages (say, emote, etc)', -<<<<<<< HEAD selector: '.say, .emote, .looc', -======= - selector: '.say, .emote', ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, { type: MESSAGE_TYPE_RADIO, name: 'Radio', description: 'All departments of radio messages', selector: -<<<<<<< HEAD - '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .secradio, .gangradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster, .resonate, .abductor, .alien, .changeling', -======= '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .enteradio, .comradio, .secradio, .gangradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster, .resonate, .abductor, .alien, .changeling', ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, { type: MESSAGE_TYPE_INFO, @@ -98,11 +87,7 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_OOC, name: 'OOC', description: 'The bluewall of global OOC messages', -<<<<<<< HEAD selector: '.ooc, .adminooc, .adminobserverooc, .oocplain, .looc, .rlooc', -======= - selector: '.ooc, .adminooc, .adminobserverooc, .oocplain', ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, { type: MESSAGE_TYPE_ADMINPM, @@ -161,13 +146,10 @@ export const MESSAGE_TYPES = [ description: 'DEBUG: SSPlanets subsystem Recover().', admin: true, }, -<<<<<<< HEAD { type: MESSAGE_TYPE_MENTOR, // SKYRAT EDIT name: 'Mentor Log', description: 'Mentor PMs and other mentor things.', selector: '.mentor, .mentornotice', }, -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ]; diff --git a/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx b/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx index e2159dccf90..f1f10ba74ae 100644 --- a/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx +++ b/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx @@ -20,18 +20,10 @@ import { FONTS } from './constants'; import { selectSettings } from './selectors'; export function SettingsGeneral(props) { -<<<<<<< HEAD - const { theme, fontFamily, fontSize, lineHeight, statLinked, statFontSize } = - useSelector(selectSettings); - const dispatch = useDispatch(); - const [freeFont, setFreeFont] = useState(false); - const [statFont, setStatFont] = useState(false); -======= const { theme, fontFamily, fontSize, lineHeight } = useSelector(selectSettings); const dispatch = useDispatch(); const [freeFont, setFreeFont] = useState(false); ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return (
@@ -126,48 +118,6 @@ export function SettingsGeneral(props) { stepPixelSize={20} minValue={8} maxValue={32} -<<<<<<< HEAD - value={statFont ? statFontSize : fontSize} - unit="px" - format={(value) => toFixed(value)} - onChange={(e, value) => - dispatch( - updateSettings({ - [statFont ? 'statFontSize' : 'fontSize']: value, - }), - ) - } - /> - - - - - {!!statFont && ( - -
diff --git a/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx b/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx index a70548df7a1..48fecbbc2ab 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx @@ -11,10 +11,7 @@ import { BooleanLike } from 'tgui-core/react'; import { useBackend } from '../backend'; import { Window } from '../layouts'; -<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout, @@ -70,16 +67,10 @@ type Info = { can_change_objective: BooleanLike; }; -<<<<<<< HEAD // SKYRAT EDIT change height from 750 to 900 export const AntagInfoChangeling = (props) => { return ( -======= -export const AntagInfoChangeling = (props) => { - return ( - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 { -<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx b/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx index ff8a829f5aa..b540b42552a 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx @@ -2,10 +2,7 @@ import { Section, Stack } from 'tgui-core/components'; import { useBackend } from '../backend'; import { Window } from '../layouts'; -<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout } from './common/Objectives'; type Info = { @@ -13,33 +10,23 @@ type Info = { objectives: Objective[]; }; -<<<<<<< HEAD // SKYRAT EDIT increase height from 250 to 500 -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 export const AntagInfoGeneric = (props) => { const { data } = useBackend(); const { antag_name, objectives } = data; return ( -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
You are the {antag_name}! -<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx index 65f75b1818e..34901d10c26 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx @@ -12,10 +12,7 @@ import { BooleanLike } from 'tgui-core/react'; import { useBackend } from '../backend'; import { Window } from '../layouts'; -<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout, @@ -94,36 +91,24 @@ const IntroductionSection = (props) => { -<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 {!ascended && ( >>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } objectives={objectives} objectiveFollowup={ diff --git a/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx b/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx index 29ea3ccfd70..88520752b1e 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx @@ -4,10 +4,7 @@ import { BooleanLike } from 'tgui-core/react'; import { useBackend } from '../backend'; import { Window } from '../layouts'; -<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout, @@ -64,10 +61,7 @@ const IntroductionSection = (props) => { /> } /> -<<<<<<< HEAD -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
@@ -86,27 +80,17 @@ const FlavorSection = (props) => { mr={-0.8} mt={-0.5} icon="hammer" -<<<<<<< HEAD /* SKYRAT EDIT: ORIGINAL TOOLTIP -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 tooltip={` This is a gameplay suggestion for bored ais. You don't have to follow it, unless you want some ideas for how to spend the round.`} -<<<<<<< HEAD */ tooltip={` Please refer to the 'Antagonist Policy' section of the wiki if you have any questions.`} tooltipPosition="bottom-start" /> -======= - tooltipPosition="bottom-start" - > - Policy - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } > diff --git a/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx b/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx index 8a5da41d207..97782ffab9c 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx @@ -1,10 +1,7 @@ import { BlockQuote, Stack } from 'tgui-core/components'; import { Window } from '../layouts'; -<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 const goodstyle = { color: 'lightgreen', @@ -53,14 +50,11 @@ export const AntagInfoMorph = (props) => { {' '} -<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx b/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx index c07f0c5cb56..a1243ff5fe6 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx @@ -1,10 +1,7 @@ import { BlockQuote, LabeledList, Section, Stack } from 'tgui-core/components'; import { Window } from '../layouts'; -<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 const tipstyle = { color: 'white', @@ -74,14 +71,11 @@ export const AntagInfoNightmare = (props) => { -<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx b/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx index 82b0ed18198..fd2a2d921ce 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx @@ -3,10 +3,7 @@ import { BooleanLike } from 'tgui-core/react'; import { useBackend } from '../backend'; import { Window } from '../layouts'; -<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout, @@ -57,14 +54,11 @@ export const AntagInfoNinja = (props) => { what you can do! -<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 >>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout } from './common/Objectives'; const allystyle = { @@ -59,7 +56,6 @@ const IntroductionSection = (props) => { -<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION START */} @@ -68,8 +64,6 @@ const IntroductionSection = (props) => { {/* SKYRAT EDIT ADDITION END */} -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ); @@ -242,19 +236,11 @@ const CodewordsSection = (props) => { ); }; -<<<<<<< HEAD -// SKYRAT EDIT: change height from 580 to 650 -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 export const AntagInfoTraitor = (props) => { const { data } = useBackend(); const { theme, given_uplink } = data; return ( -<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx b/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx index 02e0b0150ef..e316de69c13 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx @@ -3,10 +3,7 @@ import { BooleanLike } from 'tgui-core/react'; import { useBackend } from '../backend'; import { Window } from '../layouts'; -<<<<<<< HEAD import { Rules } from './AntagInfoRules'; // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 import { Objective, ObjectivePrintout, @@ -57,20 +54,13 @@ type Info = { can_change_objective: BooleanLike; }; -<<<<<<< HEAD // SKYRAT EDIT CHANGE - height from 630 to 700 -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 export const AntagInfoWizard = (props) => { const { data, act } = useBackend(); const { ritual, objectives, can_change_objective } = data; return ( -<<<<<<< HEAD -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 @@ -95,14 +85,11 @@ export const AntagInfoWizard = (props) => { -<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {/* SKYRAT EDIT ADDITION END */} -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/Aquarium.tsx b/tgui/packages/tgui/interfaces/Aquarium.tsx index cb8bb4578c3..90030afbfb4 100644 --- a/tgui/packages/tgui/interfaces/Aquarium.tsx +++ b/tgui/packages/tgui/interfaces/Aquarium.tsx @@ -1,12 +1,3 @@ -<<<<<<< HEAD -import { - Button, - Flex, - Knob, - LabeledControls, - NumberInput, - Section, -======= import { capitalizeFirst } from 'common/string'; import { Box, @@ -19,7 +10,6 @@ import { NumberInput, Section, Stack, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } from 'tgui-core/components'; import { BooleanLike } from 'tgui-core/react'; @@ -28,15 +18,6 @@ import { Window } from '../layouts'; type Data = { temperature: number; -<<<<<<< HEAD - fluid_type: string; - minTemperature: number; - maxTemperature: number; - fluidTypes: string[]; - contents: { ref: string; name: string }[]; - allow_breeding: BooleanLike; - feeding_interval: number; -======= fluidType: string; minTemperature: number; maxTemperature: number; @@ -64,93 +45,10 @@ type PropData = { prop_name: string; prop_icon: string; prop_icon_state: string; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }; export const Aquarium = (props) => { const { act, data } = useBackend(); -<<<<<<< HEAD - const { - temperature, - fluid_type, - minTemperature, - maxTemperature, - fluidTypes, - contents, - allow_breeding, - feeding_interval, - } = data; - - return ( - - -
- - - - act('temperature', { - temperature: value, - }) - } - /> - - - - {fluidTypes.map((f) => ( - -
-
- {contents.map((movable) => ( -
-======= const { fishData } = data; return ( @@ -190,13 +88,10 @@ export const Aquarium = (props) => { ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ); }; -<<<<<<< HEAD -======= const FishInfo = (props) => { const { act, data } = useBackend(); @@ -458,4 +353,3 @@ const Settings = (props) => { function dissectName(input: string): string { return input.split(' ')[0].slice(0, 18); } ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/Cargo/index.tsx b/tgui/packages/tgui/interfaces/Cargo/index.tsx index 5920d5dfb2f..b3c169ec94c 100644 --- a/tgui/packages/tgui/interfaces/Cargo/index.tsx +++ b/tgui/packages/tgui/interfaces/Cargo/index.tsx @@ -11,12 +11,9 @@ import { CargoData } from './types'; enum TAB { Catalog = 'catalog', Requests = 'requests', -<<<<<<< HEAD /* SKYRAT EDIT BELOW - ADDS company imports */ Imports = 'company_import_window', /* SKYRAT EDIT END */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Cart = 'cart', Help = 'help', } @@ -32,13 +29,9 @@ export function Cargo(props) { } export function CargoContent(props) { -<<<<<<< HEAD /* SKYRAT EDIT BELOW - ADDS act */ const { act, data } = useBackend(); /* SKYRAT EDIT END */ -======= - const { data } = useBackend(); ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 const { cart = [], requests = [], requestonly } = data; @@ -63,7 +56,6 @@ export function CargoContent(props) { > Catalog -<<<<<<< HEAD {/* SKYRAT EDIT START - Company imports */} {/* SKYRAT EDIT END */} -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 0 && 'yellow'} diff --git a/tgui/packages/tgui/interfaces/Changelog.jsx b/tgui/packages/tgui/interfaces/Changelog.jsx index 3638b0626b8..07eef1cf3dc 100644 --- a/tgui/packages/tgui/interfaces/Changelog.jsx +++ b/tgui/packages/tgui/interfaces/Changelog.jsx @@ -185,7 +185,6 @@ export class Changelog extends Component { const header = (
-<<<<<<< HEAD

Skyrat Space Station 13

Thanks to: @@ -199,33 +198,13 @@ export class Changelog extends Component { here {', recent GitHub contributors can be found '} -======= -

Traditional Games Space Station 13

-

- Thanks to: - Baystation 12, /vg/station, NTstation, CDK Station devs, - FacepunchStation, GoonStation devs, the original Space Station 13 - developers, Invisty for the title image and the countless others who - have contributed to the game, issue tracker or wiki over the years. -

-

- {'Current organization members can be found '} - here - {', recent GitHub contributors can be found '} - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 here .

-<<<<<<< HEAD {'You can also join our forums '} here. -======= - {'You can also join our discord '} - here. ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3

{dateDropdown}
diff --git a/tgui/packages/tgui/interfaces/CheckboxInput.tsx b/tgui/packages/tgui/interfaces/CheckboxInput.tsx index 3058de08efa..f23767548be 100644 --- a/tgui/packages/tgui/interfaces/CheckboxInput.tsx +++ b/tgui/packages/tgui/interfaces/CheckboxInput.tsx @@ -51,12 +51,9 @@ export const CheckboxInput = (props) => { setSelections(newSelections); }; -<<<<<<< HEAD -======= const selectionIndexes = selections.map( (selected: string) => items.indexOf(selected) + 1, ); ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return ( @@ -109,11 +106,7 @@ export const CheckboxInput = (props) => {
-<<<<<<< HEAD - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
diff --git a/tgui/packages/tgui/interfaces/ChemDispenser.tsx b/tgui/packages/tgui/interfaces/ChemDispenser.tsx index 18a35ccad2e..b92b7015442 100644 --- a/tgui/packages/tgui/interfaces/ChemDispenser.tsx +++ b/tgui/packages/tgui/interfaces/ChemDispenser.tsx @@ -164,14 +164,11 @@ export const ChemDispenser = (props) => { {recipes.length === 0 && No recipes.} -<<<<<<< HEAD
@@ -62,7 +51,4 @@ export const NtosCrewManifest = (props) => { ); }; -<<<<<<< HEAD // SKYRAT EDIT END - ALTERNATIVE_JOB_TITLES -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/NtosRecords.jsx b/tgui/packages/tgui/interfaces/NtosRecords.jsx index 1db5cfd15ca..78c9c97960c 100644 --- a/tgui/packages/tgui/interfaces/NtosRecords.jsx +++ b/tgui/packages/tgui/interfaces/NtosRecords.jsx @@ -45,13 +45,10 @@ export const NtosRecords = (props) => { ' ' + record.age + ' ' + -<<<<<<< HEAD /* SKYRAT EDIT ADDITION BEGIN - Chronological age */ record.chrono_age + ' ' + /* SKYRAT EDIT ADDITION END */ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 record.fingerprint, ) ) @@ -68,7 +65,6 @@ export const NtosRecords = (props) => {
Gender: {record.gender}
-<<<<<<< HEAD {/* SKYRAT EDIT CHANGE - Chronological age, ORIGINAL: Age: {record.age} */} Physical Age: {record.age} {/* SKYRAT EDIT CHANGE END */} @@ -77,10 +73,6 @@ export const NtosRecords = (props) => { Chronological Age: {record.chrono_age}
{/* SKYRAT EDIT ADDITION END */} -======= - Age: {record.age} -
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Fingerprint Hash: {record.fingerprint}

@@ -111,15 +103,12 @@ export const NtosRecords = (props) => { {record.name}
-<<<<<<< HEAD {/* SKYRAT EDIT ADDITION BEGIN - Chronological age */} Physical Age: {record.age}
Chronological Age: {record.chrono_age}
{/* SKYRAT EDIT ADDITION END */} -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Bloodtype: {record.bloodtype}
Minor Disabilities: {record.mi_dis} diff --git a/tgui/packages/tgui/interfaces/PaiCard.tsx b/tgui/packages/tgui/interfaces/PaiCard.tsx index 557c41085e5..10190d7a86e 100644 --- a/tgui/packages/tgui/interfaces/PaiCard.tsx +++ b/tgui/packages/tgui/interfaces/PaiCard.tsx @@ -37,10 +37,7 @@ type Pai = { transmit: BooleanLike; receive: BooleanLike; range: number; -<<<<<<< HEAD leash_enabled: BooleanLike; // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }; export const PaiCard = (props) => { @@ -167,10 +164,7 @@ const PaiOptions = (props) => { transmit, receive, range, -<<<<<<< HEAD leash_enabled /* SKYRAT EDIT ADDITION */, -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, } = data; const suppliedLaws = laws[0] ? decodeHtmlEntities(laws[0]) : 'None'; @@ -202,7 +196,6 @@ const PaiOptions = (props) => { Toggle -<<<<<<< HEAD {/* SKYRAT EDIT ADDITION START */} {!emagged && ( @@ -217,8 +210,6 @@ const PaiOptions = (props) => { )} {/* SKYRAT EDIT ADDITION END */} -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 {emagged ? ( '∞' @@ -228,12 +219,8 @@ const PaiOptions = (props) => { - - ))} - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ); }; @@ -105,7 +74,6 @@ export const CharacterPreferenceWindow = (props) => { case Page.Jobs: pageContents = ; break; -<<<<<<< HEAD // SKYRAT EDIT case Page.Limbs: pageContents = ; @@ -114,8 +82,6 @@ export const CharacterPreferenceWindow = (props) => { pageContents = ; break; // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 case Page.Main: pageContents = ( setCurrentPage(Page.Species)} /> @@ -160,13 +126,7 @@ export const CharacterPreferenceWindow = (props) => { Buy BYOND premium for more slots! )} -<<<<<<< HEAD - - -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 @@ -203,7 +163,6 @@ export const CharacterPreferenceWindow = (props) => { Occupations -<<<<<<< HEAD { // SKYRAT EDIT } @@ -216,13 +175,10 @@ export const CharacterPreferenceWindow = (props) => { Augments+ -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 @@ -235,8 +191,6 @@ export const CharacterPreferenceWindow = (props) => { >>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 page={Page.Antags} setPage={setCurrentPage} > @@ -255,13 +209,7 @@ export const CharacterPreferenceWindow = (props) => { -<<<<<<< HEAD - - -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 {pageContents} diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx index 15e19a88b34..49e9163467b 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx @@ -32,7 +32,6 @@ const PriorityButton = (props: { const className = `PreferencesMenu__Jobs__departments__priority`; return ( -<<<<<<< HEAD // SKYRAT EDIT START -<<<<<<< HEAD void }) => { {prefPageContents} {/* SKYRAT EDIT END: Swappable pref menus */} -======= - - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx index e4f10e802ba..2d1557fc6f4 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx @@ -225,11 +225,7 @@ function QuirkPopper(props: QuirkPopperProps) { onClick={(e) => { e.stopPropagation(); }} -<<<<<<< HEAD maxWidth="400px" // SKYRAT EDIT - maxWidth to 400px from 300px -======= - maxWidth="300px" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 backgroundColor="black" px="5px" py="3px" @@ -308,15 +304,8 @@ export function QuirksPage(props) { return ( { if (!server_data) { - // SKYRAT EDIT END -======= - render={(server_data) => { - if (!server_data) { ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 return Loading quirks...; } @@ -325,11 +314,7 @@ export function QuirksPage(props) { quirk_blacklist: quirkBlacklist, quirk_info: quirkInfo, points_enabled: pointsEnabled, -<<<<<<< HEAD - } = server_data.quirks; // SKYRAT EDIT - Quirks balance refactor -======= } = server_data.quirks; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 const quirks = Object.entries(quirkInfo); quirks.sort(([_, quirkA], [__, quirkB]) => { @@ -340,28 +325,10 @@ export function QuirksPage(props) { } }); -<<<<<<< HEAD // SKYRAT EDIT START - Better Quirk Count Code let balance = -data.quirks_balance; let positiveQuirks = data.positive_quirk_count; // SKYRAT EDIT END -======= - let balance = 0; - let positiveQuirks = 0; - - for (const selectedQuirkName of selectedQuirks) { - const selectedQuirk = quirkInfo[selectedQuirkName]; - if (!selectedQuirk) { - continue; - } - - if (selectedQuirk.value > 0) { - positiveQuirks += 1; - } - - balance += selectedQuirk.value; - } ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 const getReasonToNotAdd = (quirkName: string) => { const quirk = quirkInfo[quirkName]; @@ -377,15 +344,12 @@ export function QuirksPage(props) { } } -<<<<<<< HEAD - // SKYRAT EDIT START - Veteran quirks + // SKYRAT EDIT START - Veteran quirks. Please phase these out! - Kali if (quirk.veteran_only && !data.is_veteran) { return 'You need to be a veteran to select this quirk, apply today!'; } // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 const selectedQuirkNames = selectedQuirks.map((quirkKey) => { return quirkInfo[quirkKey].name; }); @@ -471,11 +435,7 @@ export function QuirksPage(props) { }, ]; })} -<<<<<<< HEAD - serverData={server_data} // SKYRAT EDIT CHANGE -======= serverData={server_data} ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 randomBodyEnabled={randomBodyEnabled} /> @@ -539,11 +499,7 @@ export function QuirksPage(props) { }, ]; })} -<<<<<<< HEAD - serverData={server_data} // sKYRAT EDIT CHANGE -======= serverData={server_data} ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 randomBodyEnabled={randomBodyEnabled} /> diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/SpeciesPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/SpeciesPage.tsx index 1b282354f27..dfb56213d64 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/SpeciesPage.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/SpeciesPage.tsx @@ -271,7 +271,6 @@ const SpeciesPageInner = (props: { {species.map(([speciesKey, species]) => { -<<<<<<< HEAD // SKYRAT EDIT START - Veteran-only species let speciesPage = ( ); -<<<<<<< HEAD if (species.veteran_only && !data.is_veteran) { let tooltipContent = species.name + @@ -315,8 +307,6 @@ const SpeciesPageInner = (props: { } return speciesPage; // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 })} @@ -336,13 +326,9 @@ const SpeciesPageInner = (props: { ) } > -<<<<<<< HEAD {/* SKYRAT EDIT CHANGE START - Adds maxHeight, scrollable*/}
{/* SKYRAT EDIT CHANGE END */} -======= -
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 {currentSpecies.desc}
@@ -363,15 +349,11 @@ const SpeciesPageInner = (props: {
-<<<<<<< HEAD
-======= -
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 {currentSpecies.lore.map((text, index) => ( {text} diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts b/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts index e6e2953e595..0db589003a1 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts @@ -26,10 +26,7 @@ export enum Food { Sugar = 'SUGAR', Toxic = 'TOXIC', Vegetables = 'VEGETABLES', -<<<<<<< HEAD Bloody = 'BLOODY', // SKYRAT EDIT ADDITION - Hemophage Food -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } export enum JobPriority { @@ -55,11 +52,8 @@ export type Species = { enabled_features: string[]; -<<<<<<< HEAD veteran_only: boolean; // SKYRAT EDIT - Veteran quirks -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 perks: { positive: Perk[]; negative: Perk[]; @@ -86,13 +80,10 @@ export type Department = { export type Job = { description: string; department: string; -<<<<<<< HEAD // SKYRAT EDIT veteran?: boolean; alt_titles?: string[]; // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }; export type Quirk = { @@ -102,7 +93,6 @@ export type Quirk = { value: number; customizable: boolean; customization_options?: string[]; -<<<<<<< HEAD veteran_only: boolean; // SKYRAT EDIT - Veteran quirks }; @@ -146,10 +136,6 @@ export type Organ = { }; // SKYRAT EDIT END -======= -}; - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 export type QuirkInfo = { max_positive_quirks: number; quirk_info: Record; @@ -192,14 +178,12 @@ export type PreferencesMenuData = { character_preview_view: string; character_profiles: (string | null)[]; -<<<<<<< HEAD preview_options: string[]; // SKYRAT EDIT ADDITION preview_selection: string; // SKYRAT EDIT ADDITION is_veteran: BooleanLike; // SKYRAT EDIT - Veteran status -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + character_preferences: { clothing: Record; features: Record; @@ -238,7 +222,6 @@ export type PreferencesMenuData = { >; job_preferences: Record; -<<<<<<< HEAD // SKYRAT EDIT job_alt_titles: Record; @@ -256,8 +239,7 @@ export type PreferencesMenuData = { ckey: string; is_donator: BooleanLike; // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 + keybindings: Record; overflow_role: string; selected_quirks: string[]; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/loadout/ItemDisplay.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/loadout/ItemDisplay.tsx index eadd6e89954..a7a3f9b5e01 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/loadout/ItemDisplay.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/loadout/ItemDisplay.tsx @@ -84,7 +84,6 @@ export const ItemDisplay = (props: { {info} ))} -<<<<<<< HEAD { // SKYRAT EDIT START - EXPANDED LOADOUT >>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 )} @@ -111,16 +108,10 @@ export const ItemDisplay = (props: { const ItemListDisplay = (props: { items: LoadoutItem[] }) => { const { data } = useBackend(); const { loadout_list } = data.character_preferences.misc; -<<<<<<< HEAD const itemList = FilterItemList(props.items); // SKYRAT EDIT - EXPANDED LOADOUT return ( {itemList.map((item /* SKYRAT EDIT : {props.items.map((item) => (*/) => ( -======= - return ( - - {props.items.map((item) => ( ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 { ); }; -<<<<<<< HEAD // SKYRAT EDIT START - EXPANDED LOADOUT const FilterItemList = (items: LoadoutItem[]) => { const { data } = useBackend(); @@ -216,9 +206,6 @@ const ItemJobRestriction = (item: LoadoutItem) => { }; // SKYRAT EDIT END - EXPANDED LOADOUT -======= - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 export const LoadoutTabDisplay = (props: { category: LoadoutCategory | undefined; }) => { diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/loadout/base.ts b/tgui/packages/tgui/interfaces/PreferencesMenu/loadout/base.ts index 32ddde9628b..d6db95bc87c 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/loadout/base.ts +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/loadout/base.ts @@ -31,7 +31,6 @@ export type LoadoutItem = { buttons: LoadoutButton[]; reskins: ReskinOption[] | null; information: string[]; -<<<<<<< HEAD // SKYRAT EDIT ckey_whitelist: string[] | null; restricted_roles: string[] | null; @@ -40,8 +39,6 @@ export type LoadoutItem = { donator_only: BooleanLike; erp_item: BooleanLike; // SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }; // Category of items in the loadout diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/base.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/base.tsx index a4f94b021c0..8dbe75ccc4b 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/base.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/base.tsx @@ -17,10 +17,7 @@ import { NumberInput, Slider, Stack, -<<<<<<< HEAD TextArea, // SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } from '../../../../components'; import { createSetPreference, PreferencesMenuData } from '../../data'; import { ServerPreferencesFetcher } from '../../ServerPreferencesFetcher'; @@ -269,7 +266,6 @@ export const FeatureShortTextInput = ( /> ); }; -<<<<<<< HEAD // SKYRAT EDIT ADDITION START - SKYRAT FEATURES DOWN HERE export const FeatureTextInput = ( @@ -359,5 +355,3 @@ export const FeatureTriBoolInput = (props: FeatureValueProps) => { ); }; // SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/age.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/age.tsx index c046d827e4c..109f5edfa76 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/age.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/age.tsx @@ -1,7 +1,6 @@ import { Feature, FeatureNumberInput } from '../base'; export const age: Feature = { -<<<<<<< HEAD // name: 'Age', // ORIGINAL name: 'Age (Physical)', // SKYRAT EDIT CHANGE - Chronological age // SKYRAT EDIT ADDITION BEGIN - Chronological age @@ -10,8 +9,5 @@ export const age: Feature = { Includes 'normal' aging, such as experiences which physically age the body, and 'anti-aging' medical procedures.\ Does not include time spent in cryo-sleep.", // SKYRAT EDIT ADDITION END -======= - name: 'Age', ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 component: FeatureNumberInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx index d6879267b7f..35dcc856fc6 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx @@ -114,14 +114,11 @@ export const underwear_color: Feature = { component: FeatureColorInput, }; -<<<<<<< HEAD export const bra_color: Feature = { name: 'Bra color', component: FeatureColorInput, }; -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 export const feature_vampire_status: Feature = { name: 'Vampire status', component: FeatureDropdownInput, diff --git a/tgui/packages/tgui/interfaces/ScannerGate.jsx b/tgui/packages/tgui/interfaces/ScannerGate.jsx index 4b8e6c0aa39..ae304827607 100644 --- a/tgui/packages/tgui/interfaces/ScannerGate.jsx +++ b/tgui/packages/tgui/interfaces/ScannerGate.jsx @@ -54,7 +54,6 @@ const TARGET_SPECIES_LIST = [ name: 'Zombie', value: 'zombie', }, -<<<<<<< HEAD // SKYRAT EDIT START - MORE SCANNER GATE OPTIONS { name: 'Anthromorph', @@ -116,8 +115,6 @@ const TARGET_GENDER_LIST = [ value: 'female', }, // SKYRAT EDIT END - MORE SCANNER GATE OPTIONS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ]; const TARGET_NUTRITION_LIST = [ @@ -174,15 +171,12 @@ const SCANNER_GATE_ROUTES = { title: 'Scanner Mode: Nutrition', component: () => ScannerGateNutrition, }, -<<<<<<< HEAD // SKYRAT EDIT START - MORE SCANNER GATE OPTIONS Gender: { title: 'Scanner Mode: Gender', component: () => ScannerGateGender, }, // SKYRAT EDIT END - MORE SCANNER GATE OPTIONS -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 Contraband: { title: 'Scanner Mode: Contraband', component: () => ScannerGateContraband, @@ -239,13 +233,10 @@ const ScannerGateOff = (props) => { content="Species" onClick={() => act('set_mode', { new_mode: 'Species' })} /> -<<<<<<< HEAD
diff --git a/tgui/packages/tgui/interfaces/SecurityRecords/types.ts b/tgui/packages/tgui/interfaces/SecurityRecords/types.ts index eef083aa0e1..1e334d0fbdd 100644 --- a/tgui/packages/tgui/interfaces/SecurityRecords/types.ts +++ b/tgui/packages/tgui/interfaces/SecurityRecords/types.ts @@ -3,28 +3,19 @@ import { BooleanLike } from 'common/react'; export type SecurityRecordsData = { assigned_view: string; authenticated: BooleanLike; -<<<<<<< HEAD -======= station_z: BooleanLike; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 available_statuses: string[]; current_user: string; higher_access: BooleanLike; records: SecurityRecord[]; min_age: number; max_age: number; -<<<<<<< HEAD max_chrono_age: number; // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }; export type SecurityRecord = { age: number; -<<<<<<< HEAD chrono_age: number; // SKYRAT EDIT ADDITION - Chronological age -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 citations: Crime[]; crew_ref: string; crimes: Crime[]; @@ -37,13 +28,10 @@ export type SecurityRecord = { trim: string; wanted_status: string; voice: string; -<<<<<<< HEAD // SKYRAT EDIT START - RP Records past_general_records: string; past_security_records: string; // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }; export type Crime = { diff --git a/tgui/packages/tgui/interfaces/StripMenu.tsx b/tgui/packages/tgui/interfaces/StripMenu.tsx index ff77a872d1f..b3f26ad5deb 100644 --- a/tgui/packages/tgui/interfaces/StripMenu.tsx +++ b/tgui/packages/tgui/interfaces/StripMenu.tsx @@ -6,11 +6,7 @@ import { useBackend } from '../backend'; import { Box, Button, Icon, Image, Stack } from '../components'; import { Window } from '../layouts'; -<<<<<<< HEAD const ROWS = 6; // SKYRAT EDIT CHANGE -======= -const ROWS = 5; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 const COLUMNS = 6; const BUTTON_DIMENSIONS = '50px'; @@ -63,20 +59,12 @@ const ALTERNATE_ACTIONS: Record = { }, enable_internals: { -<<<<<<< HEAD icon: 'lungs', // SKYRAT EDIT - TGFONT IS FUCKED AND I DUNNO WHY SO HERE'S A BANDAID - original "tg-air-tank" -======= - icon: 'tg-air-tank', ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 text: 'Enable internals', }, disable_internals: { -<<<<<<< HEAD icon: 'lungs-virus', // SKYRAT EDIT - TGFONT IS FUCKED AND I DUNNO WHY SO HERE'S A BANDAID - original "tg-air-tank-slash" -======= - icon: 'tg-air-tank-slash', ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 text: 'Disable internals', }, @@ -225,7 +213,7 @@ const SLOTS: Record< gridSpot: getGridSpotKey([4, 5]), image: 'inventory-pocket.png', }, -<<<<<<< HEAD + // SKYRAT EDIT ADDITION vagina: { displayName: 'vagina', @@ -252,10 +240,7 @@ const SLOTS: Record< }, }; // SKYRAT EDIT END -======= -}; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 enum ObscuringLevel { Completely = 1, Hidden = 2, diff --git a/tgui/packages/tgui/interfaces/SurgeryInitiator.tsx b/tgui/packages/tgui/interfaces/SurgeryInitiator.tsx index ca60cba415a..2ad10d4c7fd 100644 --- a/tgui/packages/tgui/interfaces/SurgeryInitiator.tsx +++ b/tgui/packages/tgui/interfaces/SurgeryInitiator.tsx @@ -11,10 +11,7 @@ import { BodyZone, BodyZoneSelector } from './common/BodyZoneSelector'; type Surgery = { name: string; blocked?: BooleanLike; -<<<<<<< HEAD blocked_reason?: string; // SKYRAT EDIT ADDITION - Surgically unremovable limb -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }; type SurgeryInitiatorData = { @@ -100,16 +97,11 @@ class SurgeryInitiatorInner extends Component< disabled={surgery.blocked} selected={index === this.state.selectedSurgeryIndex} tooltip={ -<<<<<<< HEAD surgery.blocked ? surgery.blocked_reason ?? 'That surgery is unavailable!' : undefined } // SKYRAT EDIT - ORIGINAL: tooltip={surgery.blocked ? "Their body is covered!" : undefined} -======= - surgery.blocked ? 'Their body is covered!' : undefined - } ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 key={surgery.name} fluid > diff --git a/tgui/packages/tgui/interfaces/VotePanel.tsx b/tgui/packages/tgui/interfaces/VotePanel.tsx index fb1d74784c2..2d135727ba6 100644 --- a/tgui/packages/tgui/interfaces/VotePanel.tsx +++ b/tgui/packages/tgui/interfaces/VotePanel.tsx @@ -278,12 +278,8 @@ const ChoicesPanel = (props) => { name="vote-yea" /> )} -<<<<<<< HEAD {currentVote.displayStatistics || user.isLowerAdmin /* SKYRAT EDIT*/ -======= - {currentVote.displayStatistics ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ? choice.votes + ' Votes' : null} @@ -322,15 +318,11 @@ const ChoicesPanel = (props) => { user.multiSelection[user.ckey.concat(choice.name)] === 1 ? ( ) : null} -<<<<<<< HEAD { user.isLowerAdmin ? `${choice.votes} Votes` : '' /* SKYRAT EDIT*/ } -======= - {choice.votes} Votes ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/interfaces/common/CharacterPreview.tsx b/tgui/packages/tgui/interfaces/common/CharacterPreview.tsx index 622140aee2f..e6e6e6ed3d5 100644 --- a/tgui/packages/tgui/interfaces/common/CharacterPreview.tsx +++ b/tgui/packages/tgui/interfaces/common/CharacterPreview.tsx @@ -1,6 +1,5 @@ import { ByondUi } from '../../components'; -<<<<<<< HEAD export const CharacterPreview = (props: { width?: string; // SKYRAT EDIT height: string; @@ -12,12 +11,6 @@ export const CharacterPreview = (props: { return ( { - return ( - >>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 height={props.height} params={{ id: props.id, diff --git a/tgui/packages/tgui/interfaces/common/InputButtons.tsx b/tgui/packages/tgui/interfaces/common/InputButtons.tsx index 9a55b56c16e..c3cf9e0ded8 100644 --- a/tgui/packages/tgui/interfaces/common/InputButtons.tsx +++ b/tgui/packages/tgui/interfaces/common/InputButtons.tsx @@ -7,11 +7,7 @@ type InputButtonsData = { }; type InputButtonsProps = { -<<<<<<< HEAD - input: string | number | string[]; -======= input: string | number | string[] | [string[], number[]]; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 on_submit?: () => void; on_cancel?: () => void; message?: string; diff --git a/tgui/packages/tgui/interfaces/common/JobToIcon.ts b/tgui/packages/tgui/interfaces/common/JobToIcon.ts index 76914904b1d..69e4a3764a1 100644 --- a/tgui/packages/tgui/interfaces/common/JobToIcon.ts +++ b/tgui/packages/tgui/interfaces/common/JobToIcon.ts @@ -1,13 +1,9 @@ export type AvailableJob = keyof typeof JOB2ICON; /** Icon map of jobs to their fontawesome5 (free) counterpart. */ -<<<<<<< HEAD // SKYRAT EDIT START - ORIGINAL: export const JOB2ICONs = { const BASEICONS = { // SKYRAT EDIT - END -======= -export const JOB2ICON = { ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 AI: 'eye', Assistant: 'toolbox', 'Atmospheric Technician': 'fan', @@ -61,7 +57,6 @@ export const JOB2ICON = { 'Syndicate Operative': 'dragon', 'Veteran Security Advisor': 'ribbon', Warden: 'handcuffs', -<<<<<<< HEAD // SKYRAT EDIT START - Skyrat-exclusive jobs have icons too 'Telecomms Specialist': 'tower-cell', @@ -295,6 +290,3 @@ const ALTTITLES = { // Combine the Base icons and ALt titles export const JOB2ICON = { ...BASEICONS, ...ALTTITLES } as const; // SKYRAT EDIT END -======= -} as const; ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json index 3ae56a0a0e5..7f7688ac6c7 100644 --- a/tgui/packages/tgui/package.json +++ b/tgui/packages/tgui/package.json @@ -6,17 +6,11 @@ "@popperjs/core": "^2.11.8", "@types/marked": "4.3.2", "@types/react": "^18.2.74", -<<<<<<< HEAD - "common": "workspace:*", - "dateformat": "^4.6.3", - "dompurify": "^2.4.9", -======= "blob-polyfill": "^9.0.20240710", "common": "workspace:*", "dateformat": "^4.6.3", "dompurify": "^2.4.9", "file-extension-icon-js": "^1.1.6", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "highlight.js": "^11.9.0", "jest": "^29.7.0", "js-yaml": "^4.1.0", diff --git a/tgui/packages/tgui/styles/interfaces/PreferencesMenu.scss b/tgui/packages/tgui/styles/interfaces/PreferencesMenu.scss index 515fe371bb7..e8246b6f293 100644 --- a/tgui/packages/tgui/styles/interfaces/PreferencesMenu.scss +++ b/tgui/packages/tgui/styles/interfaces/PreferencesMenu.scss @@ -145,7 +145,6 @@ $department_map: ( border-right: 2px solid rgba(0, 0, 0, 0.3); color: black; -<<<<<<< HEAD // SKYRAT EDIT START > * { height: calc(100% + 0.2em); @@ -168,13 +167,6 @@ $department_map: ( } // SKYRAT EDIT END -======= - > * { - height: calc(100% + 0.2em); - padding-bottom: 0.2em; - } - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 &:first-child { border-top: 2px solid rgba(0, 0, 0, 0.3); } @@ -182,45 +174,34 @@ $department_map: ( .options { background: rgba(0, 0, 0, 0.2); height: 100%; -<<<<<<< HEAD + // SKYRAT EDIT START text-align: right; align-items: center; justify-content: center; // SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } } &--Captain { border: 3px solid rgba(200, 200, 0, 1); -<<<<<<< HEAD border-bottom: 0; // SKYRAT EDIT -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 - &:first-child { border-top: 3px solid rgba(200, 200, 0, 1); } -<<<<<<< HEAD // SKYRAT EDIT START -- Taking the second last because last is {children} &:nth-last-child(2) { border-bottom: 3px solid rgba(200, 200, 0, 1); } // SKYRAT EDIT END -======= .job-name { font-size: 17px; } ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } } - &__priority { border: 1px solid rgba(0, 0, 0, 0.3); - &--off::after { content: ''; diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss index d5de88d6193..2fb7549e7a7 100644 --- a/tgui/packages/tgui/styles/main.scss +++ b/tgui/packages/tgui/styles/main.scss @@ -78,14 +78,11 @@ @include meta.load-css('./interfaces/Trophycase.scss'); @include meta.load-css('./interfaces/Uplink.scss'); @include meta.load-css('./interfaces/UtilityModulesPane.scss'); -<<<<<<< HEAD // SKYRAT EDIT ADDITION START @include meta.load-css('./interfaces/ClockworkResearch.scss'); @include meta.load-css('./interfaces/ClockworkSlab.scss'); // SKYRAT EDIT ADDITION END -======= @include meta.load-css('./interfaces/DetectiveBoard.scss'); ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 // Layouts @include meta.load-css('./layouts/Layout.scss'); diff --git a/tgui/yarn.lock b/tgui/yarn.lock index d70b81cdf1d..c7ce18ba85c 100644 --- a/tgui/yarn.lock +++ b/tgui/yarn.lock @@ -12,8 +12,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@adobe/css-tools@npm:^4.0.1": version: 4.3.3 resolution: "@adobe/css-tools@npm:4.3.3" @@ -21,7 +19,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@ampproject/remapping@npm:^2.2.0": version: 2.3.0 resolution: "@ampproject/remapping@npm:2.3.0" @@ -32,9 +29,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1, @babel/code-frame@npm:^7.24.2": -======= "@babel/code-frame@npm:7.10.4": version: 7.10.4 resolution: "@babel/code-frame@npm:7.10.4" @@ -54,7 +48,6 @@ __metadata: linkType: hard "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1, @babel/code-frame@npm:^7.24.2, @babel/code-frame@npm:^7.5.5": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.24.2 resolution: "@babel/code-frame@npm:7.24.2" dependencies: @@ -64,8 +57,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.4": version: 7.24.4 resolution: "@babel/compat-data@npm:7.24.4" @@ -73,7 +64,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@babel/compat-data@npm:^7.23.5": version: 7.24.1 resolution: "@babel/compat-data@npm:7.24.1" @@ -81,8 +71,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/core@npm:7.12.3": version: 7.12.3 resolution: "@babel/core@npm:7.12.3" @@ -130,7 +118,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.23.9": version: 7.24.3 resolution: "@babel/core@npm:7.24.3" @@ -154,8 +141,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/generator@npm:^7.12.1, @babel/generator@npm:^7.24.5": version: 7.24.5 resolution: "@babel/generator@npm:7.24.5" @@ -168,7 +153,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@babel/generator@npm:^7.24.1, @babel/generator@npm:^7.7.2": version: 7.24.1 resolution: "@babel/generator@npm:7.24.1" @@ -181,9 +165,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/helper-compilation-targets@npm:^7.23.6": -======= "@babel/helper-annotate-as-pure@npm:^7.18.6, @babel/helper-annotate-as-pure@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-annotate-as-pure@npm:7.22.5" @@ -203,7 +184,6 @@ __metadata: linkType: hard "@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.23.6": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.23.6 resolution: "@babel/helper-compilation-targets@npm:7.23.6" dependencies: @@ -216,8 +196,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.21.0, @babel/helper-create-class-features-plugin@npm:^7.24.1, @babel/helper-create-class-features-plugin@npm:^7.24.4, @babel/helper-create-class-features-plugin@npm:^7.24.5": version: 7.24.5 resolution: "@babel/helper-create-class-features-plugin@npm:7.24.5" @@ -265,7 +243,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@babel/helper-environment-visitor@npm:^7.22.20": version: 7.22.20 resolution: "@babel/helper-environment-visitor@npm:7.22.20" @@ -292,9 +269,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/helper-module-imports@npm:^7.22.15": -======= "@babel/helper-member-expression-to-functions@npm:^7.23.0, @babel/helper-member-expression-to-functions@npm:^7.24.5": version: 7.24.5 resolution: "@babel/helper-member-expression-to-functions@npm:7.24.5" @@ -305,7 +279,6 @@ __metadata: linkType: hard "@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.24.1, @babel/helper-module-imports@npm:^7.24.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.24.3 resolution: "@babel/helper-module-imports@npm:7.24.3" dependencies: @@ -314,8 +287,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.24.5": version: 7.24.5 resolution: "@babel/helper-module-transforms@npm:7.24.5" @@ -331,7 +302,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@babel/helper-module-transforms@npm:^7.23.3": version: 7.23.3 resolution: "@babel/helper-module-transforms@npm:7.23.3" @@ -347,8 +317,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/helper-optimise-call-expression@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-optimise-call-expression@npm:7.22.5" @@ -358,7 +326,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.8.0": version: 7.24.0 resolution: "@babel/helper-plugin-utils@npm:7.24.0" @@ -366,8 +333,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.5, @babel/helper-plugin-utils@npm:^7.8.3": version: 7.24.5 resolution: "@babel/helper-plugin-utils@npm:7.24.5" @@ -401,7 +366,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@babel/helper-simple-access@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-simple-access@npm:7.22.5" @@ -411,8 +375,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/helper-simple-access@npm:^7.24.5": version: 7.24.5 resolution: "@babel/helper-simple-access@npm:7.24.5" @@ -431,7 +393,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@babel/helper-split-export-declaration@npm:^7.22.6": version: 7.22.6 resolution: "@babel/helper-split-export-declaration@npm:7.22.6" @@ -441,9 +402,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/helper-string-parser@npm:^7.23.4": -======= "@babel/helper-split-export-declaration@npm:^7.24.5": version: 7.24.5 resolution: "@babel/helper-split-export-declaration@npm:7.24.5" @@ -454,7 +412,6 @@ __metadata: linkType: hard "@babel/helper-string-parser@npm:^7.23.4, @babel/helper-string-parser@npm:^7.24.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.24.1 resolution: "@babel/helper-string-parser@npm:7.24.1" checksum: 10c0/2f9bfcf8d2f9f083785df0501dbab92770111ece2f90d120352fda6dd2a7d47db11b807d111e6f32aa1ba6d763fe2dc6603d153068d672a5d0ad33ca802632b2 @@ -468,8 +425,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/helper-validator-identifier@npm:^7.24.5": version: 7.24.5 resolution: "@babel/helper-validator-identifier@npm:7.24.5" @@ -477,7 +432,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@babel/helper-validator-option@npm:^7.23.5": version: 7.23.5 resolution: "@babel/helper-validator-option@npm:7.23.5" @@ -485,8 +439,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/helper-wrap-function@npm:^7.22.20": version: 7.24.5 resolution: "@babel/helper-wrap-function@npm:7.24.5" @@ -509,7 +461,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@babel/helpers@npm:^7.24.1": version: 7.24.1 resolution: "@babel/helpers@npm:7.24.1" @@ -521,8 +472,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/highlight@npm:^7.10.4": version: 7.24.5 resolution: "@babel/highlight@npm:7.24.5" @@ -535,7 +484,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@babel/highlight@npm:^7.24.2": version: 7.24.2 resolution: "@babel/highlight@npm:7.24.2" @@ -557,8 +505,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/parser@npm:^7.12.3, @babel/parser@npm:^7.24.5, @babel/parser@npm:^7.7.0": version: 7.24.5 resolution: "@babel/parser@npm:7.24.5" @@ -713,7 +659,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@babel/plugin-syntax-async-generators@npm:^7.8.4": version: 7.8.4 resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4" @@ -736,11 +681,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/plugin-syntax-class-properties@npm:^7.8.3": -======= "@babel/plugin-syntax-class-properties@npm:^7.12.13, @babel/plugin-syntax-class-properties@npm:^7.8.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.12.13 resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13" dependencies: @@ -751,9 +692,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/plugin-syntax-import-meta@npm:^7.8.3": -======= "@babel/plugin-syntax-class-static-block@npm:^7.14.5": version: 7.14.5 resolution: "@babel/plugin-syntax-class-static-block@npm:7.14.5" @@ -832,7 +770,6 @@ __metadata: linkType: hard "@babel/plugin-syntax-import-meta@npm:^7.10.4, @babel/plugin-syntax-import-meta@npm:^7.8.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.10.4 resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4" dependencies: @@ -854,11 +791,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/plugin-syntax-jsx@npm:^7.7.2": -======= "@babel/plugin-syntax-jsx@npm:^7.23.3, @babel/plugin-syntax-jsx@npm:^7.24.1, @babel/plugin-syntax-jsx@npm:^7.7.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.24.1 resolution: "@babel/plugin-syntax-jsx@npm:7.24.1" dependencies: @@ -869,11 +802,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3": -======= "@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4, @babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.10.4 resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4" dependencies: @@ -895,11 +824,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/plugin-syntax-numeric-separator@npm:^7.8.3": -======= "@babel/plugin-syntax-numeric-separator@npm:^7.10.4, @babel/plugin-syntax-numeric-separator@npm:^7.8.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.10.4 resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4" dependencies: @@ -943,9 +868,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/plugin-syntax-top-level-await@npm:^7.8.3": -======= "@babel/plugin-syntax-private-property-in-object@npm:^7.14.5": version: 7.14.5 resolution: "@babel/plugin-syntax-private-property-in-object@npm:7.14.5" @@ -958,7 +880,6 @@ __metadata: linkType: hard "@babel/plugin-syntax-top-level-await@npm:^7.14.5, @babel/plugin-syntax-top-level-await@npm:^7.8.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.14.5 resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5" dependencies: @@ -969,11 +890,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/plugin-syntax-typescript@npm:^7.7.2": -======= "@babel/plugin-syntax-typescript@npm:^7.24.1, @babel/plugin-syntax-typescript@npm:^7.7.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.24.1 resolution: "@babel/plugin-syntax-typescript@npm:7.24.1" dependencies: @@ -984,9 +901,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0, @babel/template@npm:^7.3.3": -======= "@babel/plugin-syntax-unicode-sets-regex@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-syntax-unicode-sets-regex@npm:7.18.6" @@ -1842,7 +1756,6 @@ __metadata: linkType: hard "@babel/template@npm:^7.10.4, @babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0, @babel/template@npm:^7.3.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.24.0 resolution: "@babel/template@npm:7.24.0" dependencies: @@ -1853,8 +1766,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.12.1, @babel/traverse@npm:^7.24.5, @babel/traverse@npm:^7.7.0": version: 7.24.5 resolution: "@babel/traverse@npm:7.24.5" @@ -1873,7 +1784,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@babel/traverse@npm:^7.24.1": version: 7.24.1 resolution: "@babel/traverse@npm:7.24.1" @@ -1903,8 +1813,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@babel/types@npm:^7.12.1, @babel/types@npm:^7.12.6, @babel/types@npm:^7.22.15, @babel/types@npm:^7.23.4, @babel/types@npm:^7.24.5, @babel/types@npm:^7.4.4, @babel/types@npm:^7.7.0": version: 7.24.5 resolution: "@babel/types@npm:7.24.5" @@ -1916,7 +1824,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@bcoe/v8-coverage@npm:^0.2.3": version: 0.2.3 resolution: "@bcoe/v8-coverage@npm:0.2.3" @@ -1924,8 +1831,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@cnakazawa/watch@npm:^1.0.3": version: 1.0.4 resolution: "@cnakazawa/watch@npm:1.0.4" @@ -1952,7 +1857,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@discoveryjs/json-ext@npm:0.5.7, @discoveryjs/json-ext@npm:^0.5.0": version: 0.5.7 resolution: "@discoveryjs/json-ext@npm:0.5.7" @@ -2139,8 +2043,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@eslint/eslintrc@npm:^0.4.3": version: 0.4.3 resolution: "@eslint/eslintrc@npm:0.4.3" @@ -2158,7 +2060,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@eslint/eslintrc@npm:^2.1.4": version: 2.1.4 resolution: "@eslint/eslintrc@npm:2.1.4" @@ -2233,19 +2134,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@gar/promisify@npm:^1.1.3": -======= "@gar/promisify@npm:^1.0.1, @gar/promisify@npm:^1.1.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.1.3 resolution: "@gar/promisify@npm:1.1.3" checksum: 10c0/0b3c9958d3cd17f4add3574975e3115ae05dc7f1298a60810414b16f6f558c137b5fb3cd3905df380bacfd955ec13f67c1e6710cbb5c246a7e8d65a8289b2bff languageName: node linkType: hard -<<<<<<< HEAD -======= "@hapi/address@npm:2.x.x": version: 2.1.4 resolution: "@hapi/address@npm:2.1.4" @@ -2288,7 +2183,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@humanwhocodes/config-array@npm:^0.11.14": version: 0.11.14 resolution: "@humanwhocodes/config-array@npm:0.11.14" @@ -2300,8 +2194,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@humanwhocodes/config-array@npm:^0.5.0": version: 0.5.0 resolution: "@humanwhocodes/config-array@npm:0.5.0" @@ -2313,7 +2205,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@humanwhocodes/module-importer@npm:^1.0.1": version: 1.0.1 resolution: "@humanwhocodes/module-importer@npm:1.0.1" @@ -2321,8 +2212,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@humanwhocodes/object-schema@npm:^1.2.0": version: 1.2.1 resolution: "@humanwhocodes/object-schema@npm:1.2.1" @@ -2330,7 +2219,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@humanwhocodes/object-schema@npm:^2.0.2": version: 2.0.3 resolution: "@humanwhocodes/object-schema@npm:2.0.3" @@ -2372,8 +2260,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@jest/console@npm:^26.6.2": version: 26.6.2 resolution: "@jest/console@npm:26.6.2" @@ -2388,7 +2274,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@jest/console@npm:^29.7.0": version: 29.7.0 resolution: "@jest/console@npm:29.7.0" @@ -2403,8 +2288,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@jest/core@npm:^26.6.0, @jest/core@npm:^26.6.3": version: 26.6.3 resolution: "@jest/core@npm:26.6.3" @@ -2441,7 +2324,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@jest/core@npm:^29.7.0": version: 29.7.0 resolution: "@jest/core@npm:29.7.0" @@ -2492,8 +2374,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@jest/environment@npm:^26.6.0, @jest/environment@npm:^26.6.2": version: 26.6.2 resolution: "@jest/environment@npm:26.6.2" @@ -2506,7 +2386,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@jest/environment@npm:^29.7.0": version: 29.7.0 resolution: "@jest/environment@npm:29.7.0" @@ -2538,8 +2417,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@jest/fake-timers@npm:^26.6.2": version: 26.6.2 resolution: "@jest/fake-timers@npm:26.6.2" @@ -2554,7 +2431,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@jest/fake-timers@npm:^29.7.0": version: 29.7.0 resolution: "@jest/fake-timers@npm:29.7.0" @@ -2569,8 +2445,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@jest/globals@npm:^26.6.2": version: 26.6.2 resolution: "@jest/globals@npm:26.6.2" @@ -2582,7 +2456,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@jest/globals@npm:^29.7.0": version: 29.7.0 resolution: "@jest/globals@npm:29.7.0" @@ -2595,8 +2468,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@jest/reporters@npm:^26.6.2": version: 26.6.2 resolution: "@jest/reporters@npm:26.6.2" @@ -2633,7 +2504,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@jest/reporters@npm:^29.7.0": version: 29.7.0 resolution: "@jest/reporters@npm:29.7.0" @@ -2680,8 +2550,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@jest/source-map@npm:^26.6.2": version: 26.6.2 resolution: "@jest/source-map@npm:26.6.2" @@ -2693,7 +2561,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@jest/source-map@npm:^29.6.3": version: 29.6.3 resolution: "@jest/source-map@npm:29.6.3" @@ -2705,8 +2572,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@jest/test-result@npm:^26.6.0, @jest/test-result@npm:^26.6.2": version: 26.6.2 resolution: "@jest/test-result@npm:26.6.2" @@ -2719,7 +2584,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@jest/test-result@npm:^29.7.0": version: 29.7.0 resolution: "@jest/test-result@npm:29.7.0" @@ -2732,8 +2596,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@jest/test-sequencer@npm:^26.6.3": version: 26.6.3 resolution: "@jest/test-sequencer@npm:26.6.3" @@ -2747,7 +2609,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@jest/test-sequencer@npm:^29.7.0": version: 29.7.0 resolution: "@jest/test-sequencer@npm:29.7.0" @@ -2760,8 +2621,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@jest/transform@npm:^26.6.2": version: 26.6.2 resolution: "@jest/transform@npm:26.6.2" @@ -2785,7 +2644,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@jest/transform@npm:^29.7.0": version: 29.7.0 resolution: "@jest/transform@npm:29.7.0" @@ -2809,8 +2667,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@jest/types@npm:^26.6.0, @jest/types@npm:^26.6.2": version: 26.6.2 resolution: "@jest/types@npm:26.6.2" @@ -2824,7 +2680,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@jest/types@npm:^29.6.3": version: 29.6.3 resolution: "@jest/types@npm:29.6.3" @@ -2938,8 +2793,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@npmcli/fs@npm:^1.0.0": version: 1.1.1 resolution: "@npmcli/fs@npm:1.1.1" @@ -2950,7 +2803,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@npmcli/fs@npm:^2.1.0": version: 2.1.2 resolution: "@npmcli/fs@npm:2.1.2" @@ -2970,8 +2822,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@npmcli/move-file@npm:^1.0.1": version: 1.1.2 resolution: "@npmcli/move-file@npm:1.1.2" @@ -2982,7 +2832,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@npmcli/move-file@npm:^2.0.0": version: 2.0.1 resolution: "@npmcli/move-file@npm:2.0.1" @@ -3000,8 +2849,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@pmmmwh/react-refresh-webpack-plugin@npm:0.4.3": version: 0.4.3 resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.4.3" @@ -3038,7 +2885,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@polka/url@npm:^1.0.0-next.24": version: 1.0.0-next.25 resolution: "@polka/url@npm:1.0.0-next.25" @@ -3053,8 +2899,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@rollup/plugin-node-resolve@npm:^7.1.1": version: 7.1.3 resolution: "@rollup/plugin-node-resolve@npm:7.1.3" @@ -3095,7 +2939,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@sinclair/typebox@npm:^0.27.8": version: 0.27.8 resolution: "@sinclair/typebox@npm:0.27.8" @@ -3103,8 +2946,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@sinonjs/commons@npm:^1.7.0": version: 1.8.6 resolution: "@sinonjs/commons@npm:1.8.6" @@ -3114,7 +2955,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@sinonjs/commons@npm:^3.0.0": version: 3.0.1 resolution: "@sinonjs/commons@npm:3.0.1" @@ -3133,8 +2973,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@sinonjs/fake-timers@npm:^6.0.1": version: 6.0.1 resolution: "@sinonjs/fake-timers@npm:6.0.1" @@ -3285,7 +3123,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@swc/core-darwin-arm64@npm:1.4.11": version: 1.4.11 resolution: "@swc/core-darwin-arm64@npm:1.4.11" @@ -3431,8 +3268,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@testing-library/dom@npm:^7.28.1": version: 7.31.2 resolution: "@testing-library/dom@npm:7.31.2" @@ -3497,7 +3332,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@tootallnate/once@npm:2": version: 2.0.0 resolution: "@tootallnate/once@npm:2.0.0" @@ -3505,9 +3339,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@types/babel__core@npm:^7.1.14": -======= "@types/aria-query@npm:^4.2.0": version: 4.2.2 resolution: "@types/aria-query@npm:4.2.2" @@ -3516,7 +3347,6 @@ __metadata: linkType: hard "@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.1.7": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.20.5 resolution: "@types/babel__core@npm:7.20.5" dependencies: @@ -3548,11 +3378,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.6": -======= "@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.4, @types/babel__traverse@npm:^7.0.6": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.20.5 resolution: "@types/babel__traverse@npm:7.20.5" dependencies: @@ -3561,9 +3387,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@types/estree@npm:^1.0.5": -======= "@types/eslint-scope@npm:^3.7.3": version: 3.7.7 resolution: "@types/eslint-scope@npm:3.7.7" @@ -3595,16 +3418,12 @@ __metadata: linkType: hard "@types/estree@npm:*, @types/estree@npm:^1.0.5": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.0.5 resolution: "@types/estree@npm:1.0.5" checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d languageName: node linkType: hard -<<<<<<< HEAD -"@types/graceful-fs@npm:^4.1.3": -======= "@types/estree@npm:0.0.39": version: 0.0.39 resolution: "@types/estree@npm:0.0.39" @@ -3623,7 +3442,6 @@ __metadata: linkType: hard "@types/graceful-fs@npm:^4.1.2, @types/graceful-fs@npm:^4.1.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.1.9 resolution: "@types/graceful-fs@npm:4.1.9" dependencies: @@ -3632,8 +3450,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@types/html-minifier-terser@npm:^5.0.0": version: 5.1.2 resolution: "@types/html-minifier-terser@npm:5.1.2" @@ -3641,7 +3457,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1": version: 2.0.6 resolution: "@types/istanbul-lib-coverage@npm:2.0.6" @@ -3667,11 +3482,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@types/jest@npm:^29.5.12": -======= "@types/jest@npm:*, @types/jest@npm:^29.5.12": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 29.5.12 resolution: "@types/jest@npm:29.5.12" dependencies: @@ -3692,19 +3503,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": -======= "@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.3, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.7, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.0.15 resolution: "@types/json-schema@npm:7.0.15" checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db languageName: node linkType: hard -<<<<<<< HEAD -======= "@types/json5@npm:^0.0.29": version: 0.0.29 resolution: "@types/json5@npm:0.0.29" @@ -3712,7 +3517,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@types/marked@npm:4.3.2": version: 4.3.2 resolution: "@types/marked@npm:4.3.2" @@ -3720,8 +3524,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@types/minimatch@npm:*": version: 5.1.2 resolution: "@types/minimatch@npm:5.1.2" @@ -3729,7 +3531,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@types/node@npm:*, @types/node@npm:^20.12.3": version: 20.12.3 resolution: "@types/node@npm:20.12.3" @@ -3739,8 +3540,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@types/normalize-package-data@npm:^2.4.0": version: 2.4.4 resolution: "@types/normalize-package-data@npm:2.4.4" @@ -3762,7 +3561,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@types/prop-types@npm:*": version: 15.7.12 resolution: "@types/prop-types@npm:15.7.12" @@ -3770,8 +3568,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@types/q@npm:^1.5.1": version: 1.5.8 resolution: "@types/q@npm:1.5.8" @@ -3779,7 +3575,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@types/react-dom@npm:^18.2.24": version: 18.2.24 resolution: "@types/react-dom@npm:18.2.24" @@ -3799,8 +3594,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@types/resolve@npm:0.0.8": version: 0.0.8 resolution: "@types/resolve@npm:0.0.8" @@ -3810,7 +3603,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@types/semver@npm:^7.5.0": version: 7.5.8 resolution: "@types/semver@npm:7.5.8" @@ -3818,8 +3610,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@types/source-list-map@npm:*": version: 0.1.6 resolution: "@types/source-list-map@npm:0.1.6" @@ -3827,7 +3617,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@types/stack-utils@npm:^2.0.0": version: 2.0.3 resolution: "@types/stack-utils@npm:2.0.3" @@ -3835,8 +3624,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@types/tapable@npm:^1, @types/tapable@npm:^1.0.5": version: 1.0.12 resolution: "@types/tapable@npm:1.0.12" @@ -3853,7 +3640,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@types/tough-cookie@npm:*": version: 4.0.5 resolution: "@types/tough-cookie@npm:4.0.5" @@ -3861,8 +3647,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@types/uglify-js@npm:*": version: 3.17.5 resolution: "@types/uglify-js@npm:3.17.5" @@ -3872,7 +3656,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@types/webpack-env@npm:^1.18.4": version: 1.18.4 resolution: "@types/webpack-env@npm:1.18.4" @@ -3880,8 +3663,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@types/webpack-sources@npm:*": version: 3.2.3 resolution: "@types/webpack-sources@npm:3.2.3" @@ -3907,7 +3688,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@types/yargs-parser@npm:*": version: 21.0.3 resolution: "@types/yargs-parser@npm:21.0.3" @@ -3915,8 +3695,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@types/yargs@npm:^15.0.0": version: 15.0.19 resolution: "@types/yargs@npm:15.0.19" @@ -3926,7 +3704,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@types/yargs@npm:^17.0.8": version: 17.0.32 resolution: "@types/yargs@npm:17.0.32" @@ -3936,8 +3713,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@typescript-eslint/eslint-plugin@npm:^4.5.0": version: 4.33.0 resolution: "@typescript-eslint/eslint-plugin@npm:4.33.0" @@ -4008,7 +3783,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@typescript-eslint/parser@npm:^7.5.0": version: 7.5.0 resolution: "@typescript-eslint/parser@npm:7.5.0" @@ -4027,8 +3801,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@typescript-eslint/scope-manager@npm:4.33.0": version: 4.33.0 resolution: "@typescript-eslint/scope-manager@npm:4.33.0" @@ -4039,7 +3811,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@typescript-eslint/scope-manager@npm:7.5.0": version: 7.5.0 resolution: "@typescript-eslint/scope-manager@npm:7.5.0" @@ -4050,8 +3821,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@typescript-eslint/types@npm:3.10.1": version: 3.10.1 resolution: "@typescript-eslint/types@npm:3.10.1" @@ -4066,7 +3835,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@typescript-eslint/types@npm:7.5.0": version: 7.5.0 resolution: "@typescript-eslint/types@npm:7.5.0" @@ -4074,8 +3842,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@typescript-eslint/typescript-estree@npm:3.10.1": version: 3.10.1 resolution: "@typescript-eslint/typescript-estree@npm:3.10.1" @@ -4113,7 +3879,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@typescript-eslint/typescript-estree@npm:7.5.0": version: 7.5.0 resolution: "@typescript-eslint/typescript-estree@npm:7.5.0" @@ -4150,8 +3915,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@typescript-eslint/visitor-keys@npm:3.10.1": version: 3.10.1 resolution: "@typescript-eslint/visitor-keys@npm:3.10.1" @@ -4171,7 +3934,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@typescript-eslint/visitor-keys@npm:7.5.0": version: 7.5.0 resolution: "@typescript-eslint/visitor-keys@npm:7.5.0" @@ -4199,8 +3961,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@webassemblyjs/ast@npm:1.9.0": version: 1.9.0 resolution: "@webassemblyjs/ast@npm:1.9.0" @@ -4212,7 +3972,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@webassemblyjs/floating-point-hex-parser@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.6" @@ -4220,8 +3979,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@webassemblyjs/floating-point-hex-parser@npm:1.9.0": version: 1.9.0 resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.9.0" @@ -4229,7 +3986,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@webassemblyjs/helper-api-error@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/helper-api-error@npm:1.11.6" @@ -4237,8 +3993,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@webassemblyjs/helper-api-error@npm:1.9.0": version: 1.9.0 resolution: "@webassemblyjs/helper-api-error@npm:1.9.0" @@ -4246,7 +4000,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@webassemblyjs/helper-buffer@npm:1.12.1": version: 1.12.1 resolution: "@webassemblyjs/helper-buffer@npm:1.12.1" @@ -4254,8 +4007,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@webassemblyjs/helper-buffer@npm:1.9.0": version: 1.9.0 resolution: "@webassemblyjs/helper-buffer@npm:1.9.0" @@ -4288,7 +4039,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@webassemblyjs/helper-numbers@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/helper-numbers@npm:1.11.6" @@ -4307,8 +4057,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0": version: 1.9.0 resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0" @@ -4316,7 +4064,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@webassemblyjs/helper-wasm-section@npm:1.12.1": version: 1.12.1 resolution: "@webassemblyjs/helper-wasm-section@npm:1.12.1" @@ -4329,8 +4076,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@webassemblyjs/helper-wasm-section@npm:1.9.0": version: 1.9.0 resolution: "@webassemblyjs/helper-wasm-section@npm:1.9.0" @@ -4343,7 +4088,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@webassemblyjs/ieee754@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/ieee754@npm:1.11.6" @@ -4353,8 +4097,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@webassemblyjs/ieee754@npm:1.9.0": version: 1.9.0 resolution: "@webassemblyjs/ieee754@npm:1.9.0" @@ -4364,7 +4106,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@webassemblyjs/leb128@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/leb128@npm:1.11.6" @@ -4374,8 +4115,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@webassemblyjs/leb128@npm:1.9.0": version: 1.9.0 resolution: "@webassemblyjs/leb128@npm:1.9.0" @@ -4385,7 +4124,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@webassemblyjs/utf8@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/utf8@npm:1.11.6" @@ -4393,8 +4131,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@webassemblyjs/utf8@npm:1.9.0": version: 1.9.0 resolution: "@webassemblyjs/utf8@npm:1.9.0" @@ -4418,7 +4154,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@webassemblyjs/wasm-edit@npm:^1.12.1": version: 1.12.1 resolution: "@webassemblyjs/wasm-edit@npm:1.12.1" @@ -4448,8 +4183,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@webassemblyjs/wasm-gen@npm:1.9.0": version: 1.9.0 resolution: "@webassemblyjs/wasm-gen@npm:1.9.0" @@ -4463,7 +4196,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@webassemblyjs/wasm-opt@npm:1.12.1": version: 1.12.1 resolution: "@webassemblyjs/wasm-opt@npm:1.12.1" @@ -4476,8 +4208,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@webassemblyjs/wasm-opt@npm:1.9.0": version: 1.9.0 resolution: "@webassemblyjs/wasm-opt@npm:1.9.0" @@ -4490,7 +4220,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@webassemblyjs/wasm-parser@npm:1.12.1, @webassemblyjs/wasm-parser@npm:^1.12.1": version: 1.12.1 resolution: "@webassemblyjs/wasm-parser@npm:1.12.1" @@ -4505,8 +4234,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@webassemblyjs/wasm-parser@npm:1.9.0": version: 1.9.0 resolution: "@webassemblyjs/wasm-parser@npm:1.9.0" @@ -4535,7 +4262,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@webassemblyjs/wast-printer@npm:1.12.1": version: 1.12.1 resolution: "@webassemblyjs/wast-printer@npm:1.12.1" @@ -4546,8 +4272,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "@webassemblyjs/wast-printer@npm:1.9.0": version: 1.9.0 resolution: "@webassemblyjs/wast-printer@npm:1.9.0" @@ -4559,7 +4283,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@webpack-cli/configtest@npm:^2.1.1": version: 2.1.1 resolution: "@webpack-cli/configtest@npm:2.1.1" @@ -4614,11 +4337,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"abab@npm:^2.0.6": -======= "abab@npm:^2.0.3, abab@npm:^2.0.5, abab@npm:^2.0.6": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.0.6 resolution: "abab@npm:2.0.6" checksum: 10c0/0b245c3c3ea2598fe0025abf7cc7bb507b06949d51e8edae5d12c1b847a0a0c09639abcb94788332b4e2044ac4491c1e8f571b51c7826fd4b0bda1685ad4a278 @@ -4646,8 +4365,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.8": version: 1.3.8 resolution: "accepts@npm:1.3.8" @@ -4668,7 +4385,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "acorn-globals@npm:^7.0.0": version: 7.0.1 resolution: "acorn-globals@npm:7.0.1" @@ -4679,18 +4395,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"acorn-import-attributes@npm:^1.9.5": - version: 1.9.5 - resolution: "acorn-import-attributes@npm:1.9.5" - peerDependencies: - acorn: ^8 - checksum: 10c0/5926eaaead2326d5a86f322ff1b617b0f698aa61dc719a5baa0e9d955c9885cc71febac3fb5bacff71bbf2c4f9c12db2056883c68c53eb962c048b952e1e013d - languageName: node - linkType: hard - -"acorn-jsx@npm:^5.3.2": -======= "acorn-import-assertions@npm:^1.9.0": version: 1.9.0 resolution: "acorn-import-assertions@npm:1.9.0" @@ -4701,7 +4405,6 @@ __metadata: linkType: hard "acorn-jsx@npm:^5.3.1, acorn-jsx@npm:^5.3.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 5.3.2 resolution: "acorn-jsx@npm:5.3.2" peerDependencies: @@ -4710,8 +4413,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "acorn-walk@npm:^7.1.1": version: 7.2.0 resolution: "acorn-walk@npm:7.2.0" @@ -4719,7 +4420,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.0.2": version: 8.3.2 resolution: "acorn-walk@npm:8.3.2" @@ -4727,9 +4427,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": -======= "acorn@npm:^6.4.1": version: 6.4.2 resolution: "acorn@npm:6.4.2" @@ -4749,7 +4446,6 @@ __metadata: linkType: hard "acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.2.4, acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 8.11.3 resolution: "acorn@npm:8.11.3" bin: @@ -4758,8 +4454,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "address@npm:1.1.2": version: 1.1.2 resolution: "address@npm:1.1.2" @@ -4784,7 +4478,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "agent-base@npm:6, agent-base@npm:^6.0.2": version: 6.0.2 resolution: "agent-base@npm:6.0.2" @@ -4822,8 +4515,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "ajv-errors@npm:^1.0.0": version: 1.0.1 resolution: "ajv-errors@npm:1.0.1" @@ -4833,7 +4524,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ajv-formats@npm:^2.1.1": version: 2.1.1 resolution: "ajv-formats@npm:2.1.1" @@ -4848,11 +4538,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"ajv-keywords@npm:^3.5.2": -======= "ajv-keywords@npm:^3.1.0, ajv-keywords@npm:^3.4.1, ajv-keywords@npm:^3.5.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.5.2 resolution: "ajv-keywords@npm:3.5.2" peerDependencies: @@ -4872,11 +4558,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"ajv@npm:^6.11.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:^6.12.6": -======= "ajv@npm:^6.1.0, ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.11.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:^6.12.6": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -4900,9 +4582,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"ansi-escapes@npm:^4.2.1": -======= "ajv@npm:^8.0.1": version: 8.13.0 resolution: "ajv@npm:8.13.0" @@ -4937,7 +4616,6 @@ __metadata: linkType: hard "ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.3.2 resolution: "ansi-escapes@npm:4.3.2" dependencies: @@ -4946,9 +4624,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"ansi-regex@npm:^5.0.1": -======= "ansi-html@npm:0.0.7, ansi-html@npm:^0.0.7": version: 0.0.7 resolution: "ansi-html@npm:0.0.7" @@ -4973,7 +4648,6 @@ __metadata: linkType: hard "ansi-regex@npm:^5.0.0, ansi-regex@npm:^5.0.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 5.0.1 resolution: "ansi-regex@npm:5.0.1" checksum: 10c0/9a64bb8627b434ba9327b60c027742e5d17ac69277960d041898596271d992d4d52ba7267a63ca10232e29f6107fc8a835f6ce8d719b88c5f8493f8254813737 @@ -4987,11 +4661,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"ansi-styles@npm:^3.2.1": -======= "ansi-styles@npm:^3.2.0, ansi-styles@npm:^3.2.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.2.1 resolution: "ansi-styles@npm:3.2.1" dependencies: @@ -5023,9 +4693,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"anymatch@npm:^3.0.3, anymatch@npm:~3.1.2": -======= "anymatch@npm:^2.0.0": version: 2.0.0 resolution: "anymatch@npm:2.0.0" @@ -5037,7 +4704,6 @@ __metadata: linkType: hard "anymatch@npm:^3.0.0, anymatch@npm:^3.0.3, anymatch@npm:~3.1.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.1.3 resolution: "anymatch@npm:3.1.3" dependencies: @@ -5054,8 +4720,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "aproba@npm:^1.1.1": version: 1.2.0 resolution: "aproba@npm:1.2.0" @@ -5063,7 +4727,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "archy@npm:^1.0.0": version: 1.0.0 resolution: "archy@npm:1.0.0" @@ -5097,8 +4760,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "aria-query@npm:^4.2.2": version: 4.2.2 resolution: "aria-query@npm:4.2.2" @@ -5146,7 +4807,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "array-buffer-byte-length@npm:^1.0.1": version: 1.0.1 resolution: "array-buffer-byte-length@npm:1.0.1" @@ -5157,8 +4817,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "array-flatten@npm:1.1.1": version: 1.1.1 resolution: "array-flatten@npm:1.1.1" @@ -5173,7 +4831,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "array-includes@npm:^3.1.6, array-includes@npm:^3.1.7": version: 3.1.8 resolution: "array-includes@npm:3.1.8" @@ -5188,8 +4845,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "array-union@npm:^1.0.1": version: 1.0.2 resolution: "array-union@npm:1.0.2" @@ -5199,7 +4854,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "array-union@npm:^2.1.0": version: 2.1.0 resolution: "array-union@npm:2.1.0" @@ -5207,8 +4861,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "array-uniq@npm:^1.0.1": version: 1.0.3 resolution: "array-uniq@npm:1.0.3" @@ -5223,7 +4875,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "array.prototype.findlast@npm:^1.2.4": version: 1.2.5 resolution: "array.prototype.findlast@npm:1.2.5" @@ -5238,9 +4889,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"array.prototype.flat@npm:^1.3.1": -======= "array.prototype.findlastindex@npm:^1.2.3": version: 1.2.5 resolution: "array.prototype.findlastindex@npm:1.2.5" @@ -5256,7 +4904,6 @@ __metadata: linkType: hard "array.prototype.flat@npm:^1.3.1, array.prototype.flat@npm:^1.3.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.3.2 resolution: "array.prototype.flat@npm:1.3.2" dependencies: @@ -5280,8 +4927,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "array.prototype.reduce@npm:^1.0.6": version: 1.0.7 resolution: "array.prototype.reduce@npm:1.0.7" @@ -5297,7 +4942,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "array.prototype.toreversed@npm:^1.1.2": version: 1.1.2 resolution: "array.prototype.toreversed@npm:1.1.2" @@ -5339,8 +4983,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "arrify@npm:^2.0.1": version: 2.0.1 resolution: "arrify@npm:2.0.1" @@ -5420,7 +5062,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "asynckit@npm:^0.4.0": version: 0.4.0 resolution: "asynckit@npm:0.4.0" @@ -5428,8 +5069,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "at-least-node@npm:^1.0.0": version: 1.0.0 resolution: "at-least-node@npm:1.0.0" @@ -5446,7 +5085,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "atomic-sleep@npm:^1.0.0": version: 1.0.0 resolution: "atomic-sleep@npm:1.0.0" @@ -5454,8 +5092,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "autoprefixer@npm:^9.6.1": version: 9.8.8 resolution: "autoprefixer@npm:9.8.8" @@ -5473,7 +5109,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "available-typed-arrays@npm:^1.0.7": version: 1.0.7 resolution: "available-typed-arrays@npm:1.0.7" @@ -5495,11 +5130,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"axios@npm:^1.7.4": - version: 1.7.4 - resolution: "axios@npm:1.7.4" -======= "axe-core@npm:=4.7.0": version: 4.7.0 resolution: "axe-core@npm:4.7.0" @@ -5510,14 +5140,10 @@ __metadata: "axios@npm:^1.6.8": version: 1.6.8 resolution: "axios@npm:1.6.8" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 dependencies: follow-redirects: "npm:^1.15.6" form-data: "npm:^4.0.0" proxy-from-env: "npm:^1.1.0" -<<<<<<< HEAD - checksum: 10c0/5ea1a93140ca1d49db25ef8e1bd8cfc59da6f9220159a944168860ad15a2743ea21c5df2967795acb15cbe81362f5b157fdebbea39d53117ca27658bab9f7f17 -======= checksum: 10c0/0f22da6f490335479a89878bc7d5a1419484fbb437b564a80c34888fc36759ae4f56ea28d55a191695e5ed327f0bad56e7ff60fb6770c14d1be6501505d47ab9 languageName: node linkType: hard @@ -5571,7 +5197,6 @@ __metadata: peerDependencies: "@babel/core": ^7.0.0 checksum: 10c0/355e431fbd663fd43dcf68c93edcf66e31c3295c35754739edb3ce39435fdc407de75540b310b370e6eb924af528839b6effb8de21870ad12423aac31e258221 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 languageName: node linkType: hard @@ -5592,9 +5217,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"babel-plugin-istanbul@npm:^6.1.1": -======= "babel-loader@npm:8.1.0": version: 8.1.0 resolution: "babel-loader@npm:8.1.0" @@ -5612,7 +5234,6 @@ __metadata: linkType: hard "babel-plugin-istanbul@npm:^6.0.0, babel-plugin-istanbul@npm:^6.1.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 6.1.1 resolution: "babel-plugin-istanbul@npm:6.1.1" dependencies: @@ -5625,8 +5246,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "babel-plugin-jest-hoist@npm:^26.6.2": version: 26.6.2 resolution: "babel-plugin-jest-hoist@npm:26.6.2" @@ -5639,7 +5258,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "babel-plugin-jest-hoist@npm:^29.6.3": version: 29.6.3 resolution: "babel-plugin-jest-hoist@npm:29.6.3" @@ -5652,8 +5270,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "babel-plugin-macros@npm:^3.1.0": version: 3.1.0 resolution: "babel-plugin-macros@npm:3.1.0" @@ -5734,7 +5350,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "babel-preset-current-node-syntax@npm:^1.0.0": version: 1.0.1 resolution: "babel-preset-current-node-syntax@npm:1.0.1" @@ -5757,8 +5372,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "babel-preset-jest@npm:^26.6.2": version: 26.6.2 resolution: "babel-preset-jest@npm:26.6.2" @@ -5771,7 +5384,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "babel-preset-jest@npm:^29.6.3": version: 29.6.3 resolution: "babel-preset-jest@npm:29.6.3" @@ -5784,8 +5396,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "babel-preset-react-app@npm:^10.0.0": version: 10.0.1 resolution: "babel-preset-react-app@npm:10.0.1" @@ -5829,7 +5439,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "balanced-match@npm:^1.0.0": version: 1.0.2 resolution: "balanced-match@npm:1.0.2" @@ -5837,8 +5446,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "base64-js@npm:^1.0.2": version: 1.5.1 resolution: "base64-js@npm:1.5.1" @@ -5881,7 +5488,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "big.js@npm:^5.2.2": version: 5.2.2 resolution: "big.js@npm:5.2.2" @@ -5889,8 +5495,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "binary-extensions@npm:^1.0.0": version: 1.13.1 resolution: "binary-extensions@npm:1.13.1" @@ -5898,7 +5502,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "binary-extensions@npm:^2.0.0": version: 2.3.0 resolution: "binary-extensions@npm:2.3.0" @@ -5915,8 +5518,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "blob-polyfill@npm:^9.0.20240710": version: 9.0.20240710 resolution: "blob-polyfill@npm:9.0.20240710" @@ -5986,7 +5587,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "brace-expansion@npm:^1.1.7": version: 1.1.11 resolution: "brace-expansion@npm:1.1.11" @@ -6006,18 +5606,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"braces@npm:^3.0.3, braces@npm:~3.0.2": - version: 3.0.3 - resolution: "braces@npm:3.0.3" - dependencies: - fill-range: "npm:^7.1.1" - checksum: 10c0/7c6dfd30c338d2997ba77500539227b9d1f85e388a5f43220865201e407e076783d0881f2d297b9f80951b4c957fcf0b51c1d2d24227631643c3f7c284b0aa04 - languageName: node - linkType: hard - -"browserslist@npm:^4.21.10, browserslist@npm:^4.22.2": -======= "braces@npm:^2.3.1, braces@npm:^2.3.2": version: 2.3.2 resolution: "braces@npm:2.3.2" @@ -6148,7 +5736,6 @@ __metadata: linkType: hard "browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.21.10, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0, browserslist@npm:^4.6.2, browserslist@npm:^4.6.4": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.23.0 resolution: "browserslist@npm:4.23.0" dependencies: @@ -6178,8 +5765,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "buffer-indexof@npm:^1.0.0": version: 1.1.1 resolution: "buffer-indexof@npm:1.1.1" @@ -6205,7 +5790,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "bufferstreams@npm:^3.0.0": version: 3.0.0 resolution: "bufferstreams@npm:3.0.0" @@ -6215,8 +5799,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "builtin-modules@npm:^3.1.0": version: 3.3.0 resolution: "builtin-modules@npm:3.3.0" @@ -6294,7 +5876,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cacache@npm:^16.1.0": version: 16.1.3 resolution: "cacache@npm:16.1.3" @@ -6341,8 +5922,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "cache-base@npm:^1.0.1": version: 1.0.1 resolution: "cache-base@npm:1.0.1" @@ -6360,7 +5939,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "call-bind@npm:^1.0.2, call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7": version: 1.0.7 resolution: "call-bind@npm:1.0.7" @@ -6374,8 +5952,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "caller-callsite@npm:^2.0.0": version: 2.0.0 resolution: "caller-callsite@npm:2.0.0" @@ -6401,7 +5977,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "callsites@npm:^3.0.0": version: 3.1.0 resolution: "callsites@npm:3.1.0" @@ -6409,11 +5984,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"camel-case@npm:^4.1.2": -======= "camel-case@npm:^4.1.1, camel-case@npm:^4.1.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.1.2 resolution: "camel-case@npm:4.1.2" dependencies: @@ -6423,30 +5994,20 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"camelcase@npm:^5.3.1": -======= "camelcase@npm:5.3.1, camelcase@npm:^5.0.0, camelcase@npm:^5.3.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 5.3.1 resolution: "camelcase@npm:5.3.1" checksum: 10c0/92ff9b443bfe8abb15f2b1513ca182d16126359ad4f955ebc83dc4ddcc4ef3fdd2c078bc223f2673dc223488e75c99b16cc4d056624374b799e6a1555cf61b23 languageName: node linkType: hard -<<<<<<< HEAD -"camelcase@npm:^6.2.0": -======= "camelcase@npm:^6.0.0, camelcase@npm:^6.1.0, camelcase@npm:^6.2.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 6.3.0 resolution: "camelcase@npm:6.3.0" checksum: 10c0/0d701658219bd3116d12da3eab31acddb3f9440790c0792e0d398f0a520a6a4058018e546862b6fba89d7ae990efaeb97da71e1913e9ebf5a8b5621a3d55c710 languageName: node linkType: hard -<<<<<<< HEAD -======= "caniuse-api@npm:^3.0.0": version: 3.0.0 resolution: "caniuse-api@npm:3.0.0" @@ -6466,7 +6027,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "caniuse-lite@npm:^1.0.30001587": version: 1.0.30001605 resolution: "caniuse-lite@npm:1.0.30001605" @@ -6485,9 +6045,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"chalk@npm:^2.4.2": -======= "capture-exit@npm:^2.0.0": version: 2.0.0 resolution: "capture-exit@npm:2.0.0" @@ -6505,7 +6062,6 @@ __metadata: linkType: hard "chalk@npm:2.4.2, chalk@npm:^2.4.1, chalk@npm:^2.4.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.4.2 resolution: "chalk@npm:2.4.2" dependencies: @@ -6516,9 +6072,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"chalk@npm:^4.0.0": -======= "chalk@npm:^3.0.0": version: 3.0.0 resolution: "chalk@npm:3.0.0" @@ -6530,7 +6083,6 @@ __metadata: linkType: hard "chalk@npm:^4.0.0, chalk@npm:^4.1.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.1.2 resolution: "chalk@npm:4.1.2" dependencies: @@ -6567,9 +6119,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"chokidar@npm:>=3.0.0 <4.0.0": -======= "check-types@npm:^11.2.3": version: 11.2.3 resolution: "check-types@npm:11.2.3" @@ -6578,7 +6127,6 @@ __metadata: linkType: hard "chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.4.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.6.0 resolution: "chokidar@npm:3.6.0" dependencies: @@ -6597,8 +6145,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "chokidar@npm:^2.1.8": version: 2.1.8 resolution: "chokidar@npm:2.1.8" @@ -6629,7 +6175,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "chownr@npm:^2.0.0": version: 2.0.0 resolution: "chownr@npm:2.0.0" @@ -6644,8 +6189,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "ci-info@npm:^2.0.0": version: 2.0.0 resolution: "ci-info@npm:2.0.0" @@ -6653,7 +6196,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ci-info@npm:^3.2.0": version: 3.9.0 resolution: "ci-info@npm:3.9.0" @@ -6661,8 +6203,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3": version: 1.0.4 resolution: "cipher-base@npm:1.0.4" @@ -6680,7 +6220,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cjs-module-lexer@npm:^1.0.0": version: 1.2.3 resolution: "cjs-module-lexer@npm:1.2.3" @@ -6688,8 +6227,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "class-utils@npm:^0.3.5": version: 0.3.6 resolution: "class-utils@npm:0.3.6" @@ -6711,7 +6248,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "clean-stack@npm:^2.0.0": version: 2.2.0 resolution: "clean-stack@npm:2.2.0" @@ -6732,8 +6268,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "cliui@npm:^5.0.0": version: 5.0.0 resolution: "cliui@npm:5.0.0" @@ -6756,7 +6290,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cliui@npm:^8.0.1": version: 8.0.1 resolution: "cliui@npm:8.0.1" @@ -6786,8 +6319,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "coa@npm:^2.0.2": version: 2.0.2 resolution: "coa@npm:2.0.2" @@ -6799,7 +6330,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "collect-v8-coverage@npm:^1.0.0": version: 1.0.2 resolution: "collect-v8-coverage@npm:1.0.2" @@ -6807,9 +6337,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"color-convert@npm:^1.9.0": -======= "collection-visit@npm:^1.0.0": version: 1.0.0 resolution: "collection-visit@npm:1.0.0" @@ -6821,7 +6348,6 @@ __metadata: linkType: hard "color-convert@npm:^1.9.0, color-convert@npm:^1.9.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.9.3 resolution: "color-convert@npm:1.9.3" dependencies: @@ -6846,19 +6372,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"color-name@npm:~1.1.4": -======= "color-name@npm:^1.0.0, color-name@npm:~1.1.4": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.1.4 resolution: "color-name@npm:1.1.4" checksum: 10c0/a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95 languageName: node linkType: hard -<<<<<<< HEAD -======= "color-string@npm:^1.6.0": version: 1.9.1 resolution: "color-string@npm:1.9.1" @@ -6869,7 +6389,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "color-support@npm:^1.1.3": version: 1.1.3 resolution: "color-support@npm:1.1.3" @@ -6879,8 +6398,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "color@npm:^3.0.0": version: 3.2.1 resolution: "color@npm:3.2.1" @@ -6891,7 +6408,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "colorette@npm:^2.0.14": version: 2.0.20 resolution: "colorette@npm:2.0.20" @@ -6922,8 +6438,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "commander@npm:^4.1.1": version: 4.1.1 resolution: "commander@npm:4.1.1" @@ -6931,7 +6445,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "commander@npm:^7.2.0": version: 7.2.0 resolution: "commander@npm:7.2.0" @@ -6939,8 +6452,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "common-tags@npm:^1.8.0": version: 1.8.2 resolution: "common-tags@npm:1.8.2" @@ -6948,15 +6459,12 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "common@workspace:*, common@workspace:packages/common": version: 0.0.0-use.local resolution: "common@workspace:packages/common" languageName: unknown linkType: soft -<<<<<<< HEAD -======= "commondir@npm:^1.0.1": version: 1.0.1 resolution: "commondir@npm:1.0.1" @@ -7004,7 +6512,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "concat-map@npm:0.0.1": version: 0.0.1 resolution: "concat-map@npm:0.0.1" @@ -7012,8 +6519,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "concat-stream@npm:^1.5.0": version: 1.6.2 resolution: "concat-stream@npm:1.6.2" @@ -7047,7 +6552,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "console-control-strings@npm:^1.1.0": version: 1.1.0 resolution: "console-control-strings@npm:1.1.0" @@ -7066,9 +6570,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"content-disposition@npm:^0.5.3": -======= "constants-browserify@npm:^1.0.0": version: 1.0.0 resolution: "constants-browserify@npm:1.0.0" @@ -7077,7 +6578,6 @@ __metadata: linkType: hard "content-disposition@npm:0.5.4, content-disposition@npm:^0.5.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 0.5.4 resolution: "content-disposition@npm:0.5.4" dependencies: @@ -7086,8 +6586,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "content-type@npm:~1.0.4, content-type@npm:~1.0.5": version: 1.0.5 resolution: "content-type@npm:1.0.5" @@ -7118,7 +6616,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "convert-source-map@npm:^2.0.0": version: 2.0.0 resolution: "convert-source-map@npm:2.0.0" @@ -7126,8 +6623,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "cookie-signature@npm:1.0.6": version: 1.0.6 resolution: "cookie-signature@npm:1.0.6" @@ -7142,7 +6637,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cookie@npm:^0.5.0": version: 0.5.0 resolution: "cookie@npm:0.5.0" @@ -7150,8 +6644,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "copy-concurrently@npm:^1.0.0": version: 1.0.5 resolution: "copy-concurrently@npm:1.0.5" @@ -7196,7 +6688,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "core-js@npm:^3.36.1": version: 3.36.1 resolution: "core-js@npm:3.36.1" @@ -7204,8 +6695,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "core-js@npm:^3.6.5": version: 3.37.0 resolution: "core-js@npm:3.37.0" @@ -7213,7 +6702,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "core-util-is@npm:~1.0.0": version: 1.0.3 resolution: "core-util-is@npm:1.0.3" @@ -7221,8 +6709,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "cosmiconfig@npm:^5.0.0": version: 5.2.1 resolution: "cosmiconfig@npm:5.2.1" @@ -7285,7 +6771,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "create-jest@npm:^29.7.0": version: 29.7.0 resolution: "create-jest@npm:29.7.0" @@ -7303,11 +6788,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": -======= "cross-spawn@npm:7.0.3, cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.0.3 resolution: "cross-spawn@npm:7.0.3" dependencies: @@ -7318,8 +6799,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "cross-spawn@npm:^6.0.0": version: 6.0.5 resolution: "cross-spawn@npm:6.0.5" @@ -7421,7 +6900,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "css-loader@npm:^6.10.0": version: 6.10.0 resolution: "css-loader@npm:6.10.0" @@ -7446,8 +6924,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "css-prefers-color-scheme@npm:^3.1.1": version: 3.1.1 resolution: "css-prefers-color-scheme@npm:3.1.1" @@ -7560,7 +7036,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cssesc@npm:^3.0.0": version: 3.0.0 resolution: "cssesc@npm:3.0.0" @@ -7570,8 +7045,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "cssnano-preset-default@npm:^4.0.8": version: 4.0.8 resolution: "cssnano-preset-default@npm:4.0.8" @@ -7668,7 +7141,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "cssom@npm:^0.5.0": version: 0.5.0 resolution: "cssom@npm:0.5.0" @@ -7715,8 +7187,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "cyclist@npm:^1.0.1": version: 1.0.2 resolution: "cyclist@npm:1.0.2" @@ -7724,7 +7194,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "d@npm:1, d@npm:^1.0.1, d@npm:^1.0.2": version: 1.0.2 resolution: "d@npm:1.0.2" @@ -7735,8 +7204,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "damerau-levenshtein@npm:^1.0.8": version: 1.0.8 resolution: "damerau-levenshtein@npm:1.0.8" @@ -7755,7 +7222,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "data-urls@npm:^3.0.2": version: 3.0.2 resolution: "data-urls@npm:3.0.2" @@ -7825,9 +7291,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": -======= "debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.0": version: 2.6.9 resolution: "debug@npm:2.6.9" @@ -7838,7 +7301,6 @@ __metadata: linkType: hard "debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -7850,9 +7312,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"decimal.js@npm:^10.4.2, decimal.js@npm:^10.4.3": -======= "debug@npm:^3.2.7": version: 3.2.7 resolution: "debug@npm:3.2.7" @@ -7870,15 +7329,12 @@ __metadata: linkType: hard "decimal.js@npm:^10.2.1, decimal.js@npm:^10.4.2, decimal.js@npm:^10.4.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 10.4.3 resolution: "decimal.js@npm:10.4.3" checksum: 10c0/6d60206689ff0911f0ce968d40f163304a6c1bc739927758e6efc7921cfa630130388966f16bf6ef6b838cb33679fbe8e7a78a2f3c478afce841fd55ac8fb8ee languageName: node linkType: hard -<<<<<<< HEAD -======= "decode-uri-component@npm:^0.2.0": version: 0.2.2 resolution: "decode-uri-component@npm:0.2.2" @@ -7893,7 +7349,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dedent@npm:^1.0.0": version: 1.5.1 resolution: "dedent@npm:1.5.1" @@ -7906,9 +7361,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"deep-is@npm:^0.1.3": -======= "deep-equal@npm:^1.0.1": version: 1.1.2 resolution: "deep-equal@npm:1.1.2" @@ -7924,7 +7376,6 @@ __metadata: linkType: hard "deep-is@npm:^0.1.3, deep-is@npm:~0.1.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 0.1.4 resolution: "deep-is@npm:0.1.4" checksum: 10c0/7f0ee496e0dff14a573dc6127f14c95061b448b87b995fc96c017ce0a1e66af1675e73f1d6064407975bc4ea6ab679497a29fff7b5b9c4e99cb10797c1ad0b4c @@ -7938,8 +7389,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "default-gateway@npm:^4.2.0": version: 4.2.0 resolution: "default-gateway@npm:4.2.0" @@ -7950,7 +7399,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.4": version: 1.1.4 resolution: "define-data-property@npm:1.1.4" @@ -7962,11 +7410,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"define-properties@npm:^1.1.3, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1": -======= "define-properties@npm:^1.1.2, define-properties@npm:^1.1.3, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.2.1 resolution: "define-properties@npm:1.2.1" dependencies: @@ -7977,8 +7421,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "define-property@npm:^0.2.5": version: 0.2.5 resolution: "define-property@npm:0.2.5" @@ -8022,7 +7464,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "delayed-stream@npm:~1.0.0": version: 1.0.0 resolution: "delayed-stream@npm:1.0.0" @@ -8044,8 +7485,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "depd@npm:~1.1.2": version: 1.1.2 resolution: "depd@npm:1.1.2" @@ -8077,7 +7516,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "detect-newline@npm:^3.0.0": version: 3.1.0 resolution: "detect-newline@npm:3.1.0" @@ -8085,8 +7523,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "detect-node@npm:^2.0.4": version: 2.1.0 resolution: "detect-node@npm:2.1.0" @@ -8114,7 +7550,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "diff-sequences@npm:^29.6.3": version: 29.6.3 resolution: "diff-sequences@npm:29.6.3" @@ -8122,8 +7557,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "diffie-hellman@npm:^5.0.0": version: 5.0.3 resolution: "diffie-hellman@npm:5.0.3" @@ -8135,7 +7568,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dir-glob@npm:^3.0.1": version: 3.0.1 resolution: "dir-glob@npm:3.0.1" @@ -8145,8 +7577,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "dns-equal@npm:^1.0.0": version: 1.0.0 resolution: "dns-equal@npm:1.0.0" @@ -8173,7 +7603,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "doctrine@npm:^2.1.0": version: 2.1.0 resolution: "doctrine@npm:2.1.0" @@ -8192,8 +7621,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "dom-accessibility-api@npm:^0.5.6": version: 0.5.16 resolution: "dom-accessibility-api@npm:0.5.16" @@ -8261,7 +7688,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "domexception@npm:^4.0.0": version: 4.0.0 resolution: "domexception@npm:4.0.0" @@ -8271,8 +7697,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "domhandler@npm:^4.0.0, domhandler@npm:^4.2.0, domhandler@npm:^4.3.1": version: 4.3.1 resolution: "domhandler@npm:4.3.1" @@ -8282,7 +7706,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dompurify@npm:^2.4.9": version: 2.4.9 resolution: "dompurify@npm:2.4.9" @@ -8290,8 +7713,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "domutils@npm:^1.7.0": version: 1.7.0 resolution: "domutils@npm:1.7.0" @@ -8313,7 +7734,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dot-case@npm:^3.0.4": version: 3.0.4 resolution: "dot-case@npm:3.0.4" @@ -8324,9 +7744,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"duplexer@npm:^0.1.2": -======= "dot-prop@npm:^5.2.0": version: 5.3.0 resolution: "dot-prop@npm:5.3.0" @@ -8351,15 +7768,12 @@ __metadata: linkType: hard "duplexer@npm:^0.1.1, duplexer@npm:^0.1.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 0.1.2 resolution: "duplexer@npm:0.1.2" checksum: 10c0/c57bcd4bdf7e623abab2df43a7b5b23d18152154529d166c1e0da6bee341d84c432d157d7e97b32fecb1bf3a8b8857dd85ed81a915789f550637ed25b8e64fc2 languageName: node linkType: hard -<<<<<<< HEAD -======= "duplexify@npm:^3.4.2, duplexify@npm:^3.6.0": version: 3.7.1 resolution: "duplexify@npm:3.7.1" @@ -8372,7 +7786,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eastasianwidth@npm:^0.2.0": version: 0.2.0 resolution: "eastasianwidth@npm:0.2.0" @@ -8380,8 +7793,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "ee-first@npm:1.1.1": version: 1.1.1 resolution: "ee-first@npm:1.1.1" @@ -8403,7 +7814,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "electron-to-chromium@npm:^1.4.668": version: 1.4.724 resolution: "electron-to-chromium@npm:1.4.724" @@ -8411,8 +7821,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "elliptic@npm:^6.5.3, elliptic@npm:^6.5.5": version: 6.5.5 resolution: "elliptic@npm:6.5.5" @@ -8428,7 +7836,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "emittery@npm:^0.13.1": version: 0.13.1 resolution: "emittery@npm:0.13.1" @@ -8436,8 +7843,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "emittery@npm:^0.7.1": version: 0.7.2 resolution: "emittery@npm:0.7.2" @@ -8452,7 +7857,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "emoji-regex@npm:^8.0.0": version: 8.0.0 resolution: "emoji-regex@npm:8.0.0" @@ -8474,8 +7878,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "encodeurl@npm:~1.0.2": version: 1.0.2 resolution: "encodeurl@npm:1.0.2" @@ -8483,7 +7885,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "encoding@npm:^0.1.13": version: 0.1.13 resolution: "encoding@npm:0.1.13" @@ -8493,15 +7894,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"enhanced-resolve@npm:^5.17.1": - version: 5.17.1 - resolution: "enhanced-resolve@npm:5.17.1" - dependencies: - graceful-fs: "npm:^4.2.4" - tapable: "npm:^2.2.0" - checksum: 10c0/81a0515675eca17efdba2cf5bad87abc91a528fc1191aad50e275e74f045b41506167d420099022da7181c8d787170ea41e4a11a0b10b7a16f6237daecb15370 -======= "end-of-stream@npm:^1.0.0, end-of-stream@npm:^1.1.0": version: 1.4.4 resolution: "end-of-stream@npm:1.4.4" @@ -8546,7 +7938,6 @@ __metadata: version: 2.2.0 resolution: "entities@npm:2.2.0" checksum: 10c0/7fba6af1f116300d2ba1c5673fc218af1961b20908638391b4e1e6d5850314ee2ac3ec22d741b3a8060479911c99305164aed19b6254bde75e7e6b1b2c3f3aa3 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 languageName: node linkType: hard @@ -8580,8 +7971,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "errno@npm:^0.1.3, errno@npm:~0.1.7": version: 0.1.8 resolution: "errno@npm:0.1.8" @@ -8593,7 +7982,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "error-ex@npm:^1.3.1": version: 1.3.2 resolution: "error-ex@npm:1.3.2" @@ -8603,9 +7991,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.1, es-abstract@npm:^1.23.2": -======= "error-stack-parser@npm:^2.0.6": version: 2.1.4 resolution: "error-stack-parser@npm:2.1.4" @@ -8616,7 +8001,6 @@ __metadata: linkType: hard "es-abstract@npm:^1.17.2, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.1, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.23.3 resolution: "es-abstract@npm:1.23.3" dependencies: @@ -8670,8 +8054,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "es-array-method-boxes-properly@npm:^1.0.0": version: 1.0.0 resolution: "es-array-method-boxes-properly@npm:1.0.0" @@ -8679,7 +8061,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "es-define-property@npm:^1.0.0": version: 1.0.0 resolution: "es-define-property@npm:1.0.0" @@ -8696,8 +8077,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "es-iterator-helpers@npm:^1.0.15": version: 1.0.19 resolution: "es-iterator-helpers@npm:1.0.19" @@ -8720,7 +8099,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "es-iterator-helpers@npm:^1.0.17": version: 1.0.18 resolution: "es-iterator-helpers@npm:1.0.18" @@ -8802,11 +8180,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"es6-iterator@npm:^2.0.3": -======= "es6-iterator@npm:2.0.3, es6-iterator@npm:^2.0.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.0.3 resolution: "es6-iterator@npm:2.0.3" dependencies: @@ -8933,11 +8307,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"escalade@npm:^3.1.1": -======= "escalade@npm:^3.0.2, escalade@npm:^3.1.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.1.2 resolution: "escalade@npm:3.1.2" checksum: 10c0/6b4adafecd0682f3aa1cd1106b8fff30e492c7015b178bc81b2d2f75106dabea6c6d6e8508fc491bd58e597c74abb0e8e2368f943ecb9393d4162e3c2f3cf287 @@ -8951,8 +8321,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "escape-string-regexp@npm:2.0.0, escape-string-regexp@npm:^2.0.0": version: 2.0.0 resolution: "escape-string-regexp@npm:2.0.0" @@ -8960,7 +8328,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "escape-string-regexp@npm:^1.0.5": version: 1.0.5 resolution: "escape-string-regexp@npm:1.0.5" @@ -8968,16 +8335,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"escape-string-regexp@npm:^2.0.0": - version: 2.0.0 - resolution: "escape-string-regexp@npm:2.0.0" - checksum: 10c0/2530479fe8db57eace5e8646c9c2a9c80fa279614986d16dcc6bcaceb63ae77f05a851ba6c43756d816c61d7f4534baf56e3c705e3e0d884818a46808811c507 - languageName: node - linkType: hard - -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "escape-string-regexp@npm:^4.0.0": version: 4.0.0 resolution: "escape-string-regexp@npm:4.0.0" @@ -8985,8 +8342,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "escodegen@npm:^1.8.1": version: 1.14.3 resolution: "escodegen@npm:1.14.3" @@ -9006,7 +8361,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "escodegen@npm:^2.0.0": version: 2.1.0 resolution: "escodegen@npm:2.1.0" @@ -9036,9 +8390,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"eslint-plugin-react@npm:^7.34.1": -======= "eslint-config-react-app@npm:^6.0.0": version: 6.0.0 resolution: "eslint-config-react-app@npm:6.0.0" @@ -9178,7 +8529,6 @@ __metadata: linkType: hard "eslint-plugin-react@npm:^7.21.5, eslint-plugin-react@npm:^7.34.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.34.1 resolution: "eslint-plugin-react@npm:7.34.1" dependencies: @@ -9224,8 +8574,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "eslint-plugin-testing-library@npm:^3.9.2": version: 3.10.2 resolution: "eslint-plugin-testing-library@npm:3.10.2" @@ -9237,7 +8585,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eslint-plugin-unused-imports@npm:^3.1.0": version: 3.1.0 resolution: "eslint-plugin-unused-imports@npm:3.1.0" @@ -9260,11 +8607,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"eslint-scope@npm:5.1.1": -======= "eslint-scope@npm:5.1.1, eslint-scope@npm:^5.0.0, eslint-scope@npm:^5.1.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 5.1.1 resolution: "eslint-scope@npm:5.1.1" dependencies: @@ -9274,8 +8617,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "eslint-scope@npm:^4.0.3": version: 4.0.3 resolution: "eslint-scope@npm:4.0.3" @@ -9286,7 +8627,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eslint-scope@npm:^7.2.2": version: 7.2.2 resolution: "eslint-scope@npm:7.2.2" @@ -9297,8 +8637,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "eslint-utils@npm:^2.0.0, eslint-utils@npm:^2.1.0": version: 2.1.0 resolution: "eslint-utils@npm:2.1.0" @@ -9333,7 +8671,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3": version: 3.4.3 resolution: "eslint-visitor-keys@npm:3.4.3" @@ -9341,8 +8678,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "eslint-webpack-plugin@npm:^2.5.2": version: 2.7.0 resolution: "eslint-webpack-plugin@npm:2.7.0" @@ -9410,7 +8745,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "eslint@npm:^8.57.0": version: 8.57.0 resolution: "eslint@npm:8.57.0" @@ -9471,8 +8805,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "espree@npm:^7.3.0, espree@npm:^7.3.1": version: 7.3.1 resolution: "espree@npm:7.3.1" @@ -9484,7 +8816,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "espree@npm:^9.6.0, espree@npm:^9.6.1": version: 9.6.1 resolution: "espree@npm:9.6.1" @@ -9496,8 +8827,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "esprima@npm:1.2.2": version: 1.2.2 resolution: "esprima@npm:1.2.2" @@ -9508,7 +8837,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "esprima@npm:^4.0.0, esprima@npm:^4.0.1": version: 4.0.1 resolution: "esprima@npm:4.0.1" @@ -9519,11 +8847,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"esquery@npm:^1.4.2": -======= "esquery@npm:^1.4.0, esquery@npm:^1.4.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.5.0 resolution: "esquery@npm:1.5.0" dependencies: @@ -9532,11 +8856,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"esrecurse@npm:^4.3.0": -======= "esrecurse@npm:^4.1.0, esrecurse@npm:^4.3.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.3.0 resolution: "esrecurse@npm:4.3.0" dependencies: @@ -9545,11 +8865,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"estraverse@npm:^4.1.1": -======= "estraverse@npm:^4.1.1, estraverse@npm:^4.2.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.3.0 resolution: "estraverse@npm:4.3.0" checksum: 10c0/9cb46463ef8a8a4905d3708a652d60122a0c20bb58dec7e0e12ab0e7235123d74214fc0141d743c381813e1b992767e2708194f6f6e0f9fd00c1b4e0887b8b6d @@ -9563,8 +8879,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "estree-walker@npm:^0.6.1": version: 0.6.1 resolution: "estree-walker@npm:0.6.1" @@ -9579,7 +8893,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "esutils@npm:^2.0.2": version: 2.0.3 resolution: "esutils@npm:2.0.3" @@ -9587,8 +8900,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "etag@npm:~1.8.1": version: 1.8.1 resolution: "etag@npm:1.8.1" @@ -9596,7 +8907,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "event-emitter@npm:^0.3.5": version: 0.3.5 resolution: "event-emitter@npm:0.3.5" @@ -9607,9 +8917,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"events@npm:^3.2.0": -======= "eventemitter3@npm:^4.0.0": version: 4.0.7 resolution: "eventemitter3@npm:4.0.7" @@ -9618,15 +8925,12 @@ __metadata: linkType: hard "events@npm:^3.0.0, events@npm:^3.2.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.3.0 resolution: "events@npm:3.3.0" checksum: 10c0/d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6 languageName: node linkType: hard -<<<<<<< HEAD -======= "eventsource@npm:^2.0.2": version: 2.0.2 resolution: "eventsource@npm:2.0.2" @@ -9684,7 +8988,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "execa@npm:^5.0.0": version: 5.1.1 resolution: "execa@npm:5.1.1" @@ -9709,8 +9012,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "expand-brackets@npm:^2.1.4": version: 2.1.4 resolution: "expand-brackets@npm:2.1.4" @@ -9740,7 +9041,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "expect@npm:^29.0.0, expect@npm:^29.7.0": version: 29.7.0 resolution: "expect@npm:29.7.0" @@ -9761,8 +9061,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "express@npm:^4.17.1": version: 4.19.2 resolution: "express@npm:4.19.2" @@ -9802,7 +9100,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ext@npm:^1.7.0": version: 1.7.0 resolution: "ext@npm:1.7.0" @@ -9812,8 +9109,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "extend-shallow@npm:^2.0.1": version: 2.0.1 resolution: "extend-shallow@npm:2.0.1" @@ -9849,7 +9144,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fantasticon@npm:^1.2.3": version: 1.2.3 resolution: "fantasticon@npm:1.2.3" @@ -9892,11 +9186,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"fast-glob@npm:^3.2.9": -======= "fast-glob@npm:^3.1.1, fast-glob@npm:^3.2.9": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.3.2 resolution: "fast-glob@npm:3.3.2" dependencies: @@ -9928,11 +9218,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"fast-levenshtein@npm:^2.0.6": -======= "fast-levenshtein@npm:^2.0.6, fast-levenshtein@npm:~2.0.6": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.0.6 resolution: "fast-levenshtein@npm:2.0.6" checksum: 10c0/111972b37338bcb88f7d9e2c5907862c280ebf4234433b95bc611e518d192ccb2d38119c4ac86e26b668d75f7f3894f4ff5c4982899afced7ca78633b08287c4 @@ -10000,8 +9286,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "faye-websocket@npm:^0.11.3, faye-websocket@npm:^0.11.4": version: 0.11.4 resolution: "faye-websocket@npm:0.11.4" @@ -10011,7 +9295,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fb-watchman@npm:^2.0.0": version: 2.0.2 resolution: "fb-watchman@npm:2.0.2" @@ -10021,8 +9304,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "figgy-pudding@npm:^3.5.1": version: 3.5.2 resolution: "figgy-pudding@npm:3.5.2" @@ -10030,7 +9311,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "file-entry-cache@npm:^6.0.1": version: 6.0.1 resolution: "file-entry-cache@npm:6.0.1" @@ -10040,8 +9320,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "file-extension-icon-js@npm:^1.1.6": version: 1.1.6 resolution: "file-extension-icon-js@npm:1.1.6" @@ -10069,7 +9347,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "file-loader@npm:^6.2.0": version: 6.2.0 resolution: "file-loader@npm:6.2.0" @@ -10089,14 +9366,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"fill-range@npm:^7.1.1": - version: 7.1.1 - resolution: "fill-range@npm:7.1.1" - dependencies: - to-regex-range: "npm:^5.0.1" - checksum: 10c0/b75b691bbe065472f38824f694c2f7449d7f5004aa950426a2c28f0306c60db9b880c0b0e4ed819997ffb882d1da02cfcfc819bddc94d71627f5269682edf018 -======= "filesize@npm:6.1.0": version: 6.1.0 resolution: "filesize@npm:6.1.0" @@ -10159,7 +9428,6 @@ __metadata: make-dir: "npm:^3.0.2" pkg-dir: "npm:^4.1.0" checksum: 10c0/92747cda42bff47a0266b06014610981cfbb71f55d60f2c8216bc3108c83d9745507fb0b14ecf6ab71112bed29cd6fb1a137ee7436179ea36e11287e3159e587 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 languageName: node linkType: hard @@ -10175,11 +9443,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"find-up@npm:^4.0.0, find-up@npm:^4.1.0": -======= "find-up@npm:4.1.0, find-up@npm:^4.0.0, find-up@npm:^4.1.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.1.0 resolution: "find-up@npm:4.1.0" dependencies: @@ -10189,8 +9453,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "find-up@npm:^3.0.0": version: 3.0.0 resolution: "find-up@npm:3.0.0" @@ -10200,7 +9462,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "find-up@npm:^5.0.0": version: 5.0.0 resolution: "find-up@npm:5.0.0" @@ -10245,9 +9506,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"follow-redirects@npm:^1.15.6": -======= "flatten@npm:^1.0.2": version: 1.0.3 resolution: "flatten@npm:1.0.3" @@ -10266,7 +9524,6 @@ __metadata: linkType: hard "follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.6": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.15.6 resolution: "follow-redirects@npm:1.15.6" peerDependenciesMeta: @@ -10285,8 +9542,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "for-in@npm:^1.0.2": version: 1.0.2 resolution: "for-in@npm:1.0.2" @@ -10294,7 +9549,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "foreground-child@npm:^3.1.0": version: 3.1.1 resolution: "foreground-child@npm:3.1.1" @@ -10305,8 +9559,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "fork-ts-checker-webpack-plugin@npm:4.1.6": version: 4.1.6 resolution: "fork-ts-checker-webpack-plugin@npm:4.1.6" @@ -10333,7 +9585,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "form-data@npm:^4.0.0": version: 4.0.0 resolution: "form-data@npm:4.0.0" @@ -10352,8 +9603,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "fragment-cache@npm:^0.2.1": version: 0.2.1 resolution: "fragment-cache@npm:0.2.1" @@ -10414,7 +9663,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" @@ -10433,8 +9681,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "fs-write-stream-atomic@npm:^1.0.8": version: 1.0.10 resolution: "fs-write-stream-atomic@npm:1.0.10" @@ -10447,7 +9693,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "fs.realpath@npm:^1.0.0": version: 1.0.0 resolution: "fs.realpath@npm:1.0.0" @@ -10455,9 +9700,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"fsevents@npm:^2.3.2, fsevents@npm:~2.3.2": -======= "fsevents@npm:^1.2.7": version: 1.2.13 resolution: "fsevents@npm:1.2.13" @@ -10470,7 +9712,6 @@ __metadata: linkType: hard "fsevents@npm:^2.1.2, fsevents@npm:^2.1.3, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.3.3 resolution: "fsevents@npm:2.3.3" dependencies: @@ -10480,9 +9721,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin": -======= "fsevents@patch:fsevents@npm%3A^1.2.7#optional!builtin": version: 1.2.13 resolution: "fsevents@patch:fsevents@npm%3A1.2.13#optional!builtin::version=1.2.13&hash=d11327" @@ -10494,7 +9732,6 @@ __metadata: linkType: hard "fsevents@patch:fsevents@npm%3A^2.1.2#optional!builtin, fsevents@patch:fsevents@npm%3A^2.1.3#optional!builtin, fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" dependencies: @@ -10522,8 +9759,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "functional-red-black-tree@npm:^1.0.1": version: 1.0.1 resolution: "functional-red-black-tree@npm:1.0.1" @@ -10531,7 +9766,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "functions-have-names@npm:^1.2.3": version: 1.2.3 resolution: "functions-have-names@npm:1.2.3" @@ -10555,11 +9789,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"gensync@npm:^1.0.0-beta.2": -======= "gensync@npm:^1.0.0-beta.1, gensync@npm:^1.0.0-beta.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.0.0-beta.2 resolution: "gensync@npm:1.0.0-beta.2" checksum: 10c0/782aba6cba65b1bb5af3b095d96249d20edbe8df32dbf4696fd49be2583faf676173bf4809386588828e4dd76a3354fcbeb577bab1c833ccd9fc4577f26103f8 @@ -10573,11 +9803,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"get-caller-file@npm:^2.0.5": -======= "get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.0.5 resolution: "get-caller-file@npm:2.0.5" checksum: 10c0/c6c7b60271931fa752aeb92f2b47e355eac1af3a2673f47c9589e8f8a41adc74d45551c1bc57b5e66a80609f10ffb72b6f575e4370d61cc3f7f3aaff01757cde @@ -10597,8 +9823,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "get-own-enumerable-property-symbols@npm:^3.0.0": version: 3.0.2 resolution: "get-own-enumerable-property-symbols@npm:3.0.2" @@ -10606,7 +9830,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "get-package-type@npm:^0.1.0": version: 0.1.0 resolution: "get-package-type@npm:0.1.0" @@ -10614,8 +9837,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "get-stream@npm:^4.0.0": version: 4.1.0 resolution: "get-stream@npm:4.1.0" @@ -10634,7 +9855,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "get-stream@npm:^6.0.0": version: 6.0.1 resolution: "get-stream@npm:6.0.1" @@ -10662,8 +9882,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "get-value@npm:^2.0.3, get-value@npm:^2.0.6": version: 2.0.6 resolution: "get-value@npm:2.0.6" @@ -10681,7 +9899,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2": version: 5.1.2 resolution: "glob-parent@npm:5.1.2" @@ -10722,11 +9939,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0, glob@npm:^7.2.3": -======= "glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0, glob@npm:^7.2.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -10753,8 +9966,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "global-modules@npm:2.0.0": version: 2.0.0 resolution: "global-modules@npm:2.0.0" @@ -10775,7 +9986,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "globals@npm:^11.1.0": version: 11.12.0 resolution: "globals@npm:11.12.0" @@ -10783,11 +9993,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"globals@npm:^13.19.0": -======= "globals@npm:^13.19.0, globals@npm:^13.6.0, globals@npm:^13.9.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 13.24.0 resolution: "globals@npm:13.24.0" dependencies: @@ -10805,9 +10011,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"globby@npm:^11.1.0": -======= "globby@npm:11.0.1": version: 11.0.1 resolution: "globby@npm:11.0.1" @@ -10823,7 +10026,6 @@ __metadata: linkType: hard "globby@npm:^11.0.3, globby@npm:^11.1.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: @@ -10837,8 +10039,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "globby@npm:^6.1.0": version: 6.1.0 resolution: "globby@npm:6.1.0" @@ -10852,7 +10052,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gopd@npm:^1.0.1": version: 1.0.1 resolution: "gopd@npm:1.0.1" @@ -10862,11 +10061,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": -======= "graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2 @@ -10880,8 +10075,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "growly@npm:^1.3.0": version: 1.3.0 resolution: "growly@npm:1.3.0" @@ -10899,7 +10092,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "gzip-size@npm:^6.0.0": version: 6.0.0 resolution: "gzip-size@npm:6.0.0" @@ -10909,8 +10101,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "handle-thing@npm:^2.0.0": version: 2.0.1 resolution: "handle-thing@npm:2.0.1" @@ -10918,7 +10108,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "handlebars@npm:^4.7.7": version: 4.7.8 resolution: "handlebars@npm:4.7.8" @@ -10937,8 +10126,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "harmony-reflect@npm:^1.4.6": version: 1.6.2 resolution: "harmony-reflect@npm:1.6.2" @@ -10946,7 +10133,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2": version: 1.0.2 resolution: "has-bigints@npm:1.0.2" @@ -10984,11 +10170,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3": -======= "has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.0.3 resolution: "has-symbols@npm:1.0.3" checksum: 10c0/e6922b4345a3f37069cdfe8600febbca791c94988c01af3394d86ca3360b4b93928bbf395859158f88099cb10b19d98e3bbab7c9ff2c1bd09cf665ee90afa2c3 @@ -11011,8 +10193,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "has-value@npm:^0.3.1": version: 0.3.1 resolution: "has-value@npm:0.3.1" @@ -11090,7 +10270,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "hasown@npm:^2.0.0, hasown@npm:^2.0.1, hasown@npm:^2.0.2": version: 2.0.2 resolution: "hasown@npm:2.0.2" @@ -11100,8 +10279,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "he@npm:^1.2.0": version: 1.2.0 resolution: "he@npm:1.2.0" @@ -11111,7 +10288,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "header-case@npm:^2.0.4": version: 2.0.4 resolution: "header-case@npm:2.0.4" @@ -11122,8 +10298,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "hex-color-regex@npm:^1.1.0": version: 1.1.0 resolution: "hex-color-regex@npm:1.1.0" @@ -11131,7 +10305,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "highlight.js@npm:^11.9.0": version: 11.9.0 resolution: "highlight.js@npm:11.9.0" @@ -11139,8 +10312,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "hmac-drbg@npm:^1.0.1": version: 1.0.1 resolution: "hmac-drbg@npm:1.0.1" @@ -11201,7 +10372,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "html-encoding-sniffer@npm:^3.0.0": version: 3.0.0 resolution: "html-encoding-sniffer@npm:3.0.0" @@ -11211,8 +10381,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "html-entities@npm:^1.2.1, html-entities@npm:^1.3.1": version: 1.4.0 resolution: "html-entities@npm:1.4.0" @@ -11220,7 +10388,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "html-escaper@npm:^2.0.0, html-escaper@npm:^2.0.2": version: 2.0.2 resolution: "html-escaper@npm:2.0.2" @@ -11228,8 +10395,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "html-minifier-terser@npm:^5.0.1": version: 5.1.1 resolution: "html-minifier-terser@npm:5.1.1" @@ -11278,7 +10443,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "http-cache-semantics@npm:^4.1.0, http-cache-semantics@npm:^4.1.1": version: 4.1.1 resolution: "http-cache-semantics@npm:4.1.1" @@ -11286,8 +10450,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "http-deceiver@npm:^1.2.7": version: 1.2.7 resolution: "http-deceiver@npm:1.2.7" @@ -11295,7 +10457,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "http-errors@npm:2.0.0": version: 2.0.0 resolution: "http-errors@npm:2.0.0" @@ -11309,8 +10470,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "http-errors@npm:~1.6.2": version: 1.6.3 resolution: "http-errors@npm:1.6.3" @@ -11341,7 +10500,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "http-proxy-agent@npm:^5.0.0": version: 5.0.0 resolution: "http-proxy-agent@npm:5.0.0" @@ -11363,8 +10521,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "http-proxy-middleware@npm:0.19.1": version: 0.19.1 resolution: "http-proxy-middleware@npm:0.19.1" @@ -11395,7 +10551,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1": version: 5.0.1 resolution: "https-proxy-agent@npm:5.0.1" @@ -11416,8 +10571,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "human-signals@npm:^1.1.1": version: 1.1.1 resolution: "human-signals@npm:1.1.1" @@ -11425,7 +10578,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "human-signals@npm:^2.1.0": version: 2.1.0 resolution: "human-signals@npm:2.1.0" @@ -11442,8 +10594,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "iconv-lite@npm:0.4.24": version: 0.4.24 resolution: "iconv-lite@npm:0.4.24" @@ -11453,7 +10603,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2": version: 0.6.3 resolution: "iconv-lite@npm:0.6.3" @@ -11463,8 +10612,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "icss-utils@npm:^4.0.0, icss-utils@npm:^4.1.1": version: 4.1.1 resolution: "icss-utils@npm:4.1.1" @@ -11474,7 +10621,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "icss-utils@npm:^5.0.0, icss-utils@npm:^5.1.0": version: 5.1.0 resolution: "icss-utils@npm:5.1.0" @@ -11484,9 +10630,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"ignore@npm:^5.2.0": -======= "identity-obj-proxy@npm:3.0.0": version: 3.0.0 resolution: "identity-obj-proxy@npm:3.0.0" @@ -11518,15 +10661,12 @@ __metadata: linkType: hard "ignore@npm:^5.1.4, ignore@npm:^5.1.8, ignore@npm:^5.2.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 5.3.1 resolution: "ignore@npm:5.3.1" checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd languageName: node linkType: hard -<<<<<<< HEAD -======= "immer@npm:8.0.1": version: 8.0.1 resolution: "immer@npm:8.0.1" @@ -11534,7 +10674,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "immutable@npm:^4.0.0": version: 4.3.5 resolution: "immutable@npm:4.3.5" @@ -11542,9 +10681,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"import-fresh@npm:^3.2.1": -======= "import-cwd@npm:^2.0.0": version: 2.1.0 resolution: "import-cwd@npm:2.1.0" @@ -11565,7 +10701,6 @@ __metadata: linkType: hard "import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.3.0 resolution: "import-fresh@npm:3.3.0" dependencies: @@ -11575,8 +10710,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "import-from@npm:^2.1.0": version: 2.1.0 resolution: "import-from@npm:2.1.0" @@ -11598,7 +10731,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "import-local@npm:^3.0.2": version: 3.1.0 resolution: "import-local@npm:3.1.0" @@ -11625,9 +10757,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"infer-owner@npm:^1.0.4": -======= "indexes-of@npm:^1.0.1": version: 1.0.1 resolution: "indexes-of@npm:1.0.1" @@ -11636,7 +10765,6 @@ __metadata: linkType: hard "infer-owner@npm:^1.0.3, infer-owner@npm:^1.0.4": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.0.4 resolution: "infer-owner@npm:1.0.4" checksum: 10c0/a7b241e3149c26e37474e3435779487f42f36883711f198c45794703c7556bc38af224088bd4d1a221a45b8208ae2c2bcf86200383621434d0c099304481c5b9 @@ -11653,19 +10781,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.3, inherits@npm:~2.0.1": -======= "inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2 languageName: node linkType: hard -<<<<<<< HEAD -======= "inherits@npm:2.0.3": version: 2.0.3 resolution: "inherits@npm:2.0.3" @@ -11690,7 +10812,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "internal-slot@npm:^1.0.7": version: 1.0.7 resolution: "internal-slot@npm:1.0.7" @@ -11719,9 +10840,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"ipaddr.js@npm:1.9.1": -======= "ip-regex@npm:^2.1.0": version: 2.1.0 resolution: "ip-regex@npm:2.1.0" @@ -11737,15 +10855,12 @@ __metadata: linkType: hard "ipaddr.js@npm:1.9.1, ipaddr.js@npm:^1.9.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.9.1 resolution: "ipaddr.js@npm:1.9.1" checksum: 10c0/0486e775047971d3fdb5fb4f063829bac45af299ae0b82dcf3afa2145338e08290563a2a70f34b732d795ecc8311902e541a8530eeb30d75860a78ff4e94ce2a languageName: node linkType: hard -<<<<<<< HEAD -======= "is-absolute-url@npm:^2.0.0": version: 2.1.0 resolution: "is-absolute-url@npm:2.1.0" @@ -11779,7 +10894,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "is-array-buffer@npm:^3.0.4": version: 3.0.4 resolution: "is-array-buffer@npm:3.0.4" @@ -11797,8 +10911,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "is-arrayish@npm:^0.3.1": version: 0.3.2 resolution: "is-arrayish@npm:0.3.2" @@ -11806,7 +10918,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "is-async-function@npm:^2.0.0": version: 2.0.0 resolution: "is-async-function@npm:2.0.0" @@ -11825,8 +10936,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "is-binary-path@npm:^1.0.0": version: 1.0.1 resolution: "is-binary-path@npm:1.0.1" @@ -11836,7 +10945,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "is-binary-path@npm:~2.1.0": version: 2.1.0 resolution: "is-binary-path@npm:2.1.0" @@ -11856,8 +10964,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "is-buffer@npm:^1.1.5": version: 1.1.6 resolution: "is-buffer@npm:1.1.6" @@ -11865,7 +10971,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7": version: 1.2.7 resolution: "is-callable@npm:1.2.7" @@ -11873,9 +10978,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"is-core-module@npm:^2.13.0": -======= "is-ci@npm:^2.0.0": version: 2.0.0 resolution: "is-ci@npm:2.0.0" @@ -11902,7 +11004,6 @@ __metadata: linkType: hard "is-core-module@npm:^2.0.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.13.1 resolution: "is-core-module@npm:2.13.1" dependencies: @@ -11911,8 +11012,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "is-data-descriptor@npm:^1.0.1": version: 1.0.1 resolution: "is-data-descriptor@npm:1.0.1" @@ -11922,7 +11021,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "is-data-view@npm:^1.0.1": version: 1.0.1 resolution: "is-data-view@npm:1.0.1" @@ -11941,9 +11039,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"is-extglob@npm:^2.1.1": -======= "is-descriptor@npm:^0.1.0": version: 0.1.7 resolution: "is-descriptor@npm:0.1.7" @@ -11997,7 +11092,6 @@ __metadata: linkType: hard "is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.1.1 resolution: "is-extglob@npm:2.1.1" checksum: 10c0/5487da35691fbc339700bbb2730430b07777a3c21b9ebaecb3072512dfd7b4ba78ac2381a87e8d78d20ea08affb3f1971b4af629173a6bf435ff8a4c47747912 @@ -12013,8 +11107,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "is-fullwidth-code-point@npm:^2.0.0": version: 2.0.0 resolution: "is-fullwidth-code-point@npm:2.0.0" @@ -12022,7 +11114,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "is-fullwidth-code-point@npm:^3.0.0": version: 3.0.0 resolution: "is-fullwidth-code-point@npm:3.0.0" @@ -12046,8 +11137,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "is-glob@npm:^3.1.0": version: 3.1.0 resolution: "is-glob@npm:3.1.0" @@ -12057,7 +11146,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1": version: 4.0.3 resolution: "is-glob@npm:4.0.3" @@ -12081,8 +11169,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "is-module@npm:^1.0.0": version: 1.0.0 resolution: "is-module@npm:1.0.0" @@ -12090,7 +11176,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "is-negative-zero@npm:^2.0.3": version: 2.0.3 resolution: "is-negative-zero@npm:2.0.3" @@ -12107,8 +11192,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "is-number@npm:^3.0.0": version: 3.0.0 resolution: "is-number@npm:3.0.0" @@ -12118,7 +11201,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "is-number@npm:^7.0.0": version: 7.0.0 resolution: "is-number@npm:7.0.0" @@ -12126,8 +11208,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "is-obj@npm:^1.0.1": version: 1.0.1 resolution: "is-obj@npm:1.0.1" @@ -12167,7 +11247,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "is-path-inside@npm:^3.0.3": version: 3.0.3 resolution: "is-path-inside@npm:3.0.3" @@ -12175,9 +11254,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"is-plain-object@npm:^2.0.4": -======= "is-plain-obj@npm:^1.0.0": version: 1.1.0 resolution: "is-plain-obj@npm:1.1.0" @@ -12186,7 +11262,6 @@ __metadata: linkType: hard "is-plain-object@npm:^2.0.3, is-plain-object@npm:^2.0.4": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.0.4 resolution: "is-plain-object@npm:2.0.4" dependencies: @@ -12226,8 +11301,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "is-regexp@npm:^1.0.0": version: 1.0.0 resolution: "is-regexp@npm:1.0.0" @@ -12249,7 +11322,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "is-set@npm:^2.0.3": version: 2.0.3 resolution: "is-set@npm:2.0.3" @@ -12266,8 +11338,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "is-stream@npm:^1.1.0": version: 1.1.0 resolution: "is-stream@npm:1.1.0" @@ -12275,7 +11345,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "is-stream@npm:^2.0.0": version: 2.0.1 resolution: "is-stream@npm:2.0.1" @@ -12310,8 +11379,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "is-typedarray@npm:^1.0.0": version: 1.0.0 resolution: "is-typedarray@npm:1.0.0" @@ -12319,7 +11386,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "is-weakmap@npm:^2.0.2": version: 2.0.2 resolution: "is-weakmap@npm:2.0.2" @@ -12346,8 +11412,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "is-windows@npm:^1.0.2": version: 1.0.2 resolution: "is-windows@npm:1.0.2" @@ -12371,7 +11435,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "isarray@npm:0.0.1": version: 0.0.1 resolution: "isarray@npm:0.0.1" @@ -12379,8 +11442,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "isarray@npm:1.0.0, isarray@npm:^1.0.0, isarray@npm:~1.0.0": version: 1.0.0 resolution: "isarray@npm:1.0.0" @@ -12388,7 +11449,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "isarray@npm:^2.0.5": version: 2.0.5 resolution: "isarray@npm:2.0.5" @@ -12410,9 +11470,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"isobject@npm:^3.0.1": -======= "isobject@npm:^2.0.0": version: 2.1.0 resolution: "isobject@npm:2.1.0" @@ -12423,7 +11480,6 @@ __metadata: linkType: hard "isobject@npm:^3.0.0, isobject@npm:^3.0.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.0.1 resolution: "isobject@npm:3.0.1" checksum: 10c0/03344f5064a82f099a0cd1a8a407f4c0d20b7b8485e8e816c39f249e9416b06c322e8dec5b842b6bb8a06de0af9cb48e7bc1b5352f0fadc2f0abac033db3d4db @@ -12437,8 +11493,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "istanbul-lib-instrument@npm:^4.0.3": version: 4.0.3 resolution: "istanbul-lib-instrument@npm:4.0.3" @@ -12451,7 +11505,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "istanbul-lib-instrument@npm:^5.0.4": version: 5.2.1 resolution: "istanbul-lib-instrument@npm:5.2.1" @@ -12500,11 +11553,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"istanbul-reports@npm:^3.1.3": -======= "istanbul-reports@npm:^3.0.2, istanbul-reports@npm:^3.1.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.1.7 resolution: "istanbul-reports@npm:3.1.7" dependencies: @@ -12540,8 +11589,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-changed-files@npm:^26.6.2": version: 26.6.2 resolution: "jest-changed-files@npm:26.6.2" @@ -12553,7 +11600,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-changed-files@npm:^29.7.0": version: 29.7.0 resolution: "jest-changed-files@npm:29.7.0" @@ -12565,8 +11611,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-circus@npm:26.6.0": version: 26.6.0 resolution: "jest-circus@npm:26.6.0" @@ -12596,7 +11640,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-circus@npm:^29.7.0": version: 29.7.0 resolution: "jest-circus@npm:29.7.0" @@ -12625,8 +11668,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-cli@npm:^26.6.0": version: 26.6.3 resolution: "jest-cli@npm:26.6.3" @@ -12650,7 +11691,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-cli@npm:^29.7.0": version: 29.7.0 resolution: "jest-cli@npm:29.7.0" @@ -12677,8 +11717,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-config@npm:^26.6.3": version: 26.6.3 resolution: "jest-config@npm:26.6.3" @@ -12710,7 +11748,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-config@npm:^29.7.0": version: 29.7.0 resolution: "jest-config@npm:29.7.0" @@ -12749,8 +11786,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-diff@npm:^26.6.2": version: 26.6.2 resolution: "jest-diff@npm:26.6.2" @@ -12763,7 +11798,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-diff@npm:^29.7.0": version: 29.7.0 resolution: "jest-diff@npm:29.7.0" @@ -12776,8 +11810,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-docblock@npm:^26.0.0": version: 26.0.0 resolution: "jest-docblock@npm:26.0.0" @@ -12787,7 +11819,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-docblock@npm:^29.7.0": version: 29.7.0 resolution: "jest-docblock@npm:29.7.0" @@ -12797,8 +11828,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-each@npm:^26.6.0, jest-each@npm:^26.6.2": version: 26.6.2 resolution: "jest-each@npm:26.6.2" @@ -12812,7 +11841,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-each@npm:^29.7.0": version: 29.7.0 resolution: "jest-each@npm:29.7.0" @@ -12826,8 +11854,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-environment-jsdom@npm:^26.6.2": version: 26.6.2 resolution: "jest-environment-jsdom@npm:26.6.2" @@ -12843,7 +11869,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-environment-jsdom@npm:^29.7.0": version: 29.7.0 resolution: "jest-environment-jsdom@npm:29.7.0" @@ -12865,8 +11890,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-environment-node@npm:^26.6.2": version: 26.6.2 resolution: "jest-environment-node@npm:26.6.2" @@ -12881,7 +11904,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-environment-node@npm:^29.7.0": version: 29.7.0 resolution: "jest-environment-node@npm:29.7.0" @@ -12896,8 +11918,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-get-type@npm:^26.3.0": version: 26.3.0 resolution: "jest-get-type@npm:26.3.0" @@ -12905,7 +11925,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-get-type@npm:^29.6.3": version: 29.6.3 resolution: "jest-get-type@npm:29.6.3" @@ -12913,8 +11932,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-haste-map@npm:^26.6.2": version: 26.6.2 resolution: "jest-haste-map@npm:26.6.2" @@ -12940,7 +11957,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-haste-map@npm:^29.7.0": version: 29.7.0 resolution: "jest-haste-map@npm:29.7.0" @@ -12964,8 +11980,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-jasmine2@npm:^26.6.3": version: 26.6.3 resolution: "jest-jasmine2@npm:26.6.3" @@ -13002,7 +12016,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-leak-detector@npm:^29.7.0": version: 29.7.0 resolution: "jest-leak-detector@npm:29.7.0" @@ -13013,8 +12026,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-matcher-utils@npm:^26.6.0, jest-matcher-utils@npm:^26.6.2": version: 26.6.2 resolution: "jest-matcher-utils@npm:26.6.2" @@ -13027,7 +12038,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-matcher-utils@npm:^29.7.0": version: 29.7.0 resolution: "jest-matcher-utils@npm:29.7.0" @@ -13040,8 +12050,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-message-util@npm:^26.6.0, jest-message-util@npm:^26.6.2": version: 26.6.2 resolution: "jest-message-util@npm:26.6.2" @@ -13059,7 +12067,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-message-util@npm:^29.7.0": version: 29.7.0 resolution: "jest-message-util@npm:29.7.0" @@ -13077,8 +12084,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-mock@npm:^26.6.2": version: 26.6.2 resolution: "jest-mock@npm:26.6.2" @@ -13089,7 +12094,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-mock@npm:^29.7.0": version: 29.7.0 resolution: "jest-mock@npm:29.7.0" @@ -13113,8 +12117,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-regex-util@npm:^26.0.0": version: 26.0.0 resolution: "jest-regex-util@npm:26.0.0" @@ -13122,7 +12124,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-regex-util@npm:^29.6.3": version: 29.6.3 resolution: "jest-regex-util@npm:29.6.3" @@ -13130,8 +12131,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-resolve-dependencies@npm:^26.6.3": version: 26.6.3 resolution: "jest-resolve-dependencies@npm:26.6.3" @@ -13143,7 +12142,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-resolve-dependencies@npm:^29.7.0": version: 29.7.0 resolution: "jest-resolve-dependencies@npm:29.7.0" @@ -13154,8 +12152,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-resolve@npm:26.6.0": version: 26.6.0 resolution: "jest-resolve@npm:26.6.0" @@ -13188,7 +12184,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-resolve@npm:^29.7.0": version: 29.7.0 resolution: "jest-resolve@npm:29.7.0" @@ -13206,8 +12201,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-runner@npm:^26.6.0, jest-runner@npm:^26.6.3": version: 26.6.3 resolution: "jest-runner@npm:26.6.3" @@ -13236,7 +12229,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-runner@npm:^29.7.0": version: 29.7.0 resolution: "jest-runner@npm:29.7.0" @@ -13266,8 +12258,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-runtime@npm:^26.6.0, jest-runtime@npm:^26.6.3": version: 26.6.3 resolution: "jest-runtime@npm:26.6.3" @@ -13305,7 +12295,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-runtime@npm:^29.7.0": version: 29.7.0 resolution: "jest-runtime@npm:29.7.0" @@ -13336,8 +12325,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-serializer@npm:^26.6.2": version: 26.6.2 resolution: "jest-serializer@npm:26.6.2" @@ -13372,7 +12359,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-snapshot@npm:^29.7.0": version: 29.7.0 resolution: "jest-snapshot@npm:29.7.0" @@ -13401,8 +12387,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-util@npm:^26.6.0, jest-util@npm:^26.6.2": version: 26.6.2 resolution: "jest-util@npm:26.6.2" @@ -13417,7 +12401,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-util@npm:^29.7.0": version: 29.7.0 resolution: "jest-util@npm:29.7.0" @@ -13432,8 +12415,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-validate@npm:^26.6.2": version: 26.6.2 resolution: "jest-validate@npm:26.6.2" @@ -13448,7 +12429,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-validate@npm:^29.7.0": version: 29.7.0 resolution: "jest-validate@npm:29.7.0" @@ -13463,8 +12443,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest-watch-typeahead@npm:0.6.1": version: 0.6.1 resolution: "jest-watch-typeahead@npm:0.6.1" @@ -13497,7 +12475,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest-watcher@npm:^29.7.0": version: 29.7.0 resolution: "jest-watcher@npm:29.7.0" @@ -13514,9 +12491,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"jest-worker@npm:^27.4.5": -======= "jest-worker@npm:^24.9.0": version: 24.9.0 resolution: "jest-worker@npm:24.9.0" @@ -13539,7 +12513,6 @@ __metadata: linkType: hard "jest-worker@npm:^27.4.5, jest-worker@npm:^27.5.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 27.5.1 resolution: "jest-worker@npm:27.5.1" dependencies: @@ -13562,8 +12535,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jest@npm:26.6.0": version: 26.6.0 resolution: "jest@npm:26.6.0" @@ -13577,7 +12548,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jest@npm:^29.7.0": version: 29.7.0 resolution: "jest@npm:29.7.0" @@ -13634,8 +12604,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jsdom@npm:^16.4.0": version: 16.7.0 resolution: "jsdom@npm:16.7.0" @@ -13676,7 +12644,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "jsdom@npm:^20.0.0": version: 20.0.3 resolution: "jsdom@npm:20.0.3" @@ -13761,8 +12728,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "jsesc@npm:~0.5.0": version: 0.5.0 resolution: "jsesc@npm:0.5.0" @@ -13772,7 +12737,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "json-buffer@npm:3.0.1": version: 3.0.1 resolution: "json-buffer@npm:3.0.1" @@ -13780,8 +12744,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "json-parse-better-errors@npm:^1.0.1, json-parse-better-errors@npm:^1.0.2": version: 1.0.2 resolution: "json-parse-better-errors@npm:1.0.2" @@ -13789,7 +12751,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1": version: 2.3.1 resolution: "json-parse-even-better-errors@npm:2.3.1" @@ -13818,8 +12779,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "json5@npm:^1.0.1, json5@npm:^1.0.2": version: 1.0.2 resolution: "json5@npm:1.0.2" @@ -13831,7 +12790,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "json5@npm:^2.1.2, json5@npm:^2.2.3": version: 2.2.3 resolution: "json5@npm:2.2.3" @@ -13848,9 +12806,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"jsx-ast-utils@npm:^2.4.1 || ^3.0.0": -======= "jsonfile@npm:^4.0.0": version: 4.0.0 resolution: "jsonfile@npm:4.0.0" @@ -13888,7 +12843,6 @@ __metadata: linkType: hard "jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.5": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.3.5 resolution: "jsx-ast-utils@npm:3.3.5" dependencies: @@ -13909,8 +12863,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "killable@npm:^1.0.1": version: 1.0.1 resolution: "killable@npm:1.0.1" @@ -13936,7 +12888,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "kind-of@npm:^6.0.2": version: 6.0.3 resolution: "kind-of@npm:6.0.3" @@ -13951,8 +12902,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "klona@npm:^2.0.4": version: 2.0.6 resolution: "klona@npm:2.0.6" @@ -13986,7 +12935,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "leven@npm:^3.1.0": version: 3.1.0 resolution: "leven@npm:3.1.0" @@ -14004,8 +12952,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "levn@npm:~0.3.0": version: 0.3.0 resolution: "levn@npm:0.3.0" @@ -14016,7 +12962,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "light-my-request@npm:^4.2.0": version: 4.12.0 resolution: "light-my-request@npm:4.12.0" @@ -14036,8 +12981,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "loader-runner@npm:^2.4.0": version: 2.4.0 resolution: "loader-runner@npm:2.4.0" @@ -14045,7 +12988,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "loader-runner@npm:^4.2.0": version: 4.3.0 resolution: "loader-runner@npm:4.3.0" @@ -14053,8 +12995,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "loader-utils@npm:2.0.0": version: 2.0.0 resolution: "loader-utils@npm:2.0.0" @@ -14077,7 +13017,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "loader-utils@npm:^2.0.0, loader-utils@npm:^2.0.4": version: 2.0.4 resolution: "loader-utils@npm:2.0.4" @@ -14089,8 +13028,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "locate-path@npm:^3.0.0": version: 3.0.0 resolution: "locate-path@npm:3.0.0" @@ -14101,7 +13038,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "locate-path@npm:^5.0.0": version: 5.0.0 resolution: "locate-path@npm:5.0.0" @@ -14120,8 +13056,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "lodash._reinterpolate@npm:^3.0.0": version: 3.0.0 resolution: "lodash._reinterpolate@npm:3.0.0" @@ -14143,7 +13077,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "lodash.merge@npm:^4.6.2": version: 4.6.2 resolution: "lodash.merge@npm:4.6.2" @@ -14151,9 +13084,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"lodash@npm:^4.17.10, lodash@npm:^4.17.21": -======= "lodash.template@npm:^4.5.0": version: 4.5.0 resolution: "lodash.template@npm:4.5.0" @@ -14188,15 +13118,12 @@ __metadata: linkType: hard "lodash@npm:>=3.5 <5, lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.5, lodash@npm:^4.7.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c languageName: node linkType: hard -<<<<<<< HEAD -======= "loglevel@npm:^1.6.8": version: 1.9.1 resolution: "loglevel@npm:1.9.1" @@ -14204,7 +13131,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0": version: 1.4.0 resolution: "loose-envify@npm:1.4.0" @@ -14266,8 +13192,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "lz-string@npm:^1.4.4": version: 1.5.0 resolution: "lz-string@npm:1.5.0" @@ -14305,7 +13229,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "make-dir@npm:^4.0.0": version: 4.0.0 resolution: "make-dir@npm:4.0.0" @@ -14367,8 +13290,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "map-cache@npm:^0.2.2": version: 0.2.2 resolution: "map-cache@npm:0.2.2" @@ -14385,7 +13306,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "marked@npm:^4.3.0": version: 4.3.0 resolution: "marked@npm:4.3.0" @@ -14395,8 +13315,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "md5.js@npm:^1.3.4": version: 1.3.5 resolution: "md5.js@npm:1.3.5" @@ -14429,7 +13347,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "memoizee@npm:^0.4.15": version: 0.4.15 resolution: "memoizee@npm:0.4.15" @@ -14446,8 +13363,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "memory-fs@npm:^0.4.1": version: 0.4.1 resolution: "memory-fs@npm:0.4.1" @@ -14475,7 +13390,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "merge-stream@npm:^2.0.0": version: 2.0.0 resolution: "merge-stream@npm:2.0.0" @@ -14490,8 +13404,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "methods@npm:~1.1.2": version: 1.1.2 resolution: "methods@npm:1.1.2" @@ -14499,7 +13411,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "microbuffer@npm:^1.0.0": version: 1.0.0 resolution: "microbuffer@npm:1.0.0" @@ -14507,19 +13418,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"micromatch@npm:^4.0.4": - version: 4.0.8 - resolution: "micromatch@npm:4.0.8" - dependencies: - braces: "npm:^3.0.3" - picomatch: "npm:^2.3.1" - checksum: 10c0/166fa6eb926b9553f32ef81f5f531d27b4ce7da60e5baf8c021d043b27a388fb95e46a8038d5045877881e673f8134122b59624d5cecbd16eb50a42e7a6b5ca8 - languageName: node - linkType: hard - -"mime-db@npm:1.52.0": -======= "microevent.ts@npm:~0.1.1": version: 0.1.1 resolution: "microevent.ts@npm:0.1.1" @@ -14571,18 +13469,13 @@ __metadata: linkType: hard "mime-db@npm:1.52.0, mime-db@npm:>= 1.43.0 < 2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.52.0 resolution: "mime-db@npm:1.52.0" checksum: 10c0/0557a01deebf45ac5f5777fe7740b2a5c309c6d62d40ceab4e23da9f821899ce7a900b7ac8157d4548ddbb7beffe9abc621250e6d182b0397ec7f10c7b91a5aa languageName: node linkType: hard -<<<<<<< HEAD -"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27": -======= "mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:~2.1.17, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.1.35 resolution: "mime-types@npm:2.1.35" dependencies: @@ -14591,8 +13484,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "mime@npm:1.6.0": version: 1.6.0 resolution: "mime@npm:1.6.0" @@ -14611,7 +13502,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mime@npm:^3.0.0": version: 3.0.0 resolution: "mime@npm:3.0.0" @@ -14628,8 +13518,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "min-indent@npm:^1.0.0": version: 1.0.1 resolution: "min-indent@npm:1.0.1" @@ -14651,7 +13539,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mini-css-extract-plugin@npm:^2.8.1": version: 2.8.1 resolution: "mini-css-extract-plugin@npm:2.8.1" @@ -14664,8 +13551,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1": version: 1.0.1 resolution: "minimalistic-assert@npm:1.0.1" @@ -14689,7 +13574,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "minimatch@npm:9.0.3": version: 9.0.3 resolution: "minimatch@npm:9.0.3" @@ -14726,11 +13610,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"minimist@npm:^1.2.5": -======= "minimist@npm:^1.1.1, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 10c0/19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6 @@ -14794,11 +13674,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"minipass-pipeline@npm:^1.2.4": -======= "minipass-pipeline@npm:^1.2.2, minipass-pipeline@npm:^1.2.4": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.2.4 resolution: "minipass-pipeline@npm:1.2.4" dependencies: @@ -14849,8 +13725,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "mississippi@npm:^3.0.0": version: 3.0.0 resolution: "mississippi@npm:3.0.0" @@ -14890,7 +13764,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4": version: 1.0.4 resolution: "mkdirp@npm:1.0.4" @@ -14900,8 +13773,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "move-concurrently@npm:^1.0.1": version: 1.0.1 resolution: "move-concurrently@npm:1.0.1" @@ -14916,7 +13787,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "mrmime@npm:^2.0.0": version: 2.0.0 resolution: "mrmime@npm:2.0.0" @@ -14924,8 +13794,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "ms@npm:2.0.0": version: 2.0.0 resolution: "ms@npm:2.0.0" @@ -14933,7 +13801,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ms@npm:2.1.2": version: 2.1.2 resolution: "ms@npm:2.1.2" @@ -14941,20 +13808,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"ms@npm:^2.0.0": -======= "ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.1.3 resolution: "ms@npm:2.1.3" checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48 languageName: node linkType: hard -<<<<<<< HEAD -"nan@npm:^2.14.2": -======= "multicast-dns-service-types@npm:^1.1.0": version: 1.1.0 resolution: "multicast-dns-service-types@npm:1.1.0" @@ -14975,7 +13835,6 @@ __metadata: linkType: hard "nan@npm:^2.12.1, nan@npm:^2.14.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.19.0 resolution: "nan@npm:2.19.0" dependencies: @@ -14993,8 +13852,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "nanomatch@npm:^1.2.9": version: 1.2.13 resolution: "nanomatch@npm:1.2.13" @@ -15023,7 +13880,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" @@ -15040,22 +13896,14 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"negotiator@npm:^0.6.3": -======= "negotiator@npm:0.6.3, negotiator@npm:^0.6.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 0.6.3 resolution: "negotiator@npm:0.6.3" checksum: 10c0/3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2 languageName: node linkType: hard -<<<<<<< HEAD -"neo-async@npm:^2.6.2": -======= "neo-async@npm:^2.5.0, neo-async@npm:^2.6.1, neo-async@npm:^2.6.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.6.2 resolution: "neo-async@npm:2.6.2" checksum: 10c0/c2f5a604a54a8ec5438a342e1f356dff4bc33ccccdb6dc668d94fe8e5eccfc9d2c2eea6064b0967a767ba63b33763f51ccf2cd2441b461a7322656c1f06b3f5d @@ -15069,8 +13917,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "nice-try@npm:^1.0.4": version: 1.0.5 resolution: "nice-try@npm:1.0.5" @@ -15078,7 +13924,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "no-case@npm:^3.0.4": version: 3.0.4 resolution: "no-case@npm:3.0.4" @@ -15089,8 +13934,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "node-forge@npm:^0.10.0": version: 0.10.0 resolution: "node-forge@npm:0.10.0" @@ -15098,7 +13941,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "node-gyp@npm:^9.0.0": version: 9.4.1 resolution: "node-gyp@npm:9.4.1" @@ -15147,8 +13989,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "node-libs-browser@npm:^2.2.1": version: 2.2.1 resolution: "node-libs-browser@npm:2.2.1" @@ -15201,7 +14041,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "node-releases@npm:^2.0.14": version: 2.0.14 resolution: "node-releases@npm:2.0.14" @@ -15231,8 +14070,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "normalize-package-data@npm:^2.5.0": version: 2.5.0 resolution: "normalize-package-data@npm:2.5.0" @@ -15254,7 +14091,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": version: 3.0.0 resolution: "normalize-path@npm:3.0.0" @@ -15262,9 +14098,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"npm-run-path@npm:^4.0.1": -======= "normalize-range@npm:^0.1.2": version: 0.1.2 resolution: "normalize-range@npm:0.1.2" @@ -15301,7 +14134,6 @@ __metadata: linkType: hard "npm-run-path@npm:^4.0.0, npm-run-path@npm:^4.0.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.0.1 resolution: "npm-run-path@npm:4.0.1" dependencies: @@ -15322,8 +14154,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "nth-check@npm:^1.0.2": version: 1.0.2 resolution: "nth-check@npm:1.0.2" @@ -15356,7 +14186,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "nwsapi@npm:^2.2.2, nwsapi@npm:^2.2.4": version: 2.2.7 resolution: "nwsapi@npm:2.2.7" @@ -15364,19 +14193,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"object-assign@npm:^4.1.1": -======= "object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.1.1 resolution: "object-assign@npm:4.1.1" checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414 languageName: node linkType: hard -<<<<<<< HEAD -======= "object-copy@npm:^0.1.0": version: 0.1.0 resolution: "object-copy@npm:0.1.0" @@ -15388,7 +14211,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "object-inspect@npm:^1.13.1": version: 1.13.1 resolution: "object-inspect@npm:1.13.1" @@ -15396,8 +14218,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "object-is@npm:^1.1.5": version: 1.1.6 resolution: "object-is@npm:1.1.6" @@ -15408,7 +14228,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "object-keys@npm:^1.1.1": version: 1.1.1 resolution: "object-keys@npm:1.1.1" @@ -15416,8 +14235,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "object-visit@npm:^1.0.0": version: 1.0.1 resolution: "object-visit@npm:1.0.1" @@ -15427,7 +14244,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "object.assign@npm:^4.1.4, object.assign@npm:^4.1.5": version: 4.1.5 resolution: "object.assign@npm:4.1.5" @@ -15440,11 +14256,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"object.entries@npm:^1.1.7": -======= "object.entries@npm:^1.1.0, object.entries@npm:^1.1.7": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.1.8 resolution: "object.entries@npm:1.1.8" dependencies: @@ -15467,8 +14279,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "object.getownpropertydescriptors@npm:^2.0.3, object.getownpropertydescriptors@npm:^2.1.0": version: 2.1.8 resolution: "object.getownpropertydescriptors@npm:2.1.8" @@ -15495,7 +14305,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "object.hasown@npm:^1.1.3": version: 1.1.4 resolution: "object.hasown@npm:1.1.4" @@ -15507,9 +14316,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"object.values@npm:^1.1.6, object.values@npm:^1.1.7": -======= "object.pick@npm:^1.3.0": version: 1.3.0 resolution: "object.pick@npm:1.3.0" @@ -15520,7 +14326,6 @@ __metadata: linkType: hard "object.values@npm:^1.1.0, object.values@npm:^1.1.6, object.values@npm:^1.1.7": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.2.0 resolution: "object.values@npm:1.2.0" dependencies: @@ -15531,9 +14336,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"once@npm:^1.3.0": -======= "obuf@npm:^1.0.0, obuf@npm:^1.1.2": version: 1.1.2 resolution: "obuf@npm:1.1.2" @@ -15558,7 +14360,6 @@ __metadata: linkType: hard "once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.4.0 resolution: "once@npm:1.4.0" dependencies: @@ -15567,11 +14368,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"onetime@npm:^5.1.2": -======= "onetime@npm:^5.1.0, onetime@npm:^5.1.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 5.1.2 resolution: "onetime@npm:5.1.2" dependencies: @@ -15580,8 +14377,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "open@npm:^7.0.2": version: 7.4.2 resolution: "open@npm:7.4.2" @@ -15592,7 +14387,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "opener@npm:^1.5.2": version: 1.5.2 resolution: "opener@npm:1.5.2" @@ -15602,8 +14396,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "opn@npm:^5.5.0": version: 5.5.0 resolution: "opn@npm:5.5.0" @@ -15653,7 +14445,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "optionator@npm:^0.9.3": version: 0.9.3 resolution: "optionator@npm:0.9.3" @@ -15668,9 +14459,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"p-limit@npm:^2.2.0": -======= "os-browserify@npm:^0.3.0": version: 0.3.0 resolution: "os-browserify@npm:0.3.0" @@ -15693,7 +14481,6 @@ __metadata: linkType: hard "p-limit@npm:^2.0.0, p-limit@npm:^2.2.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.3.0 resolution: "p-limit@npm:2.3.0" dependencies: @@ -15711,8 +14498,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "p-locate@npm:^3.0.0": version: 3.0.0 resolution: "p-locate@npm:3.0.0" @@ -15722,7 +14507,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "p-locate@npm:^4.1.0": version: 4.1.0 resolution: "p-locate@npm:4.1.0" @@ -15741,8 +14525,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "p-map@npm:^2.0.0": version: 2.1.0 resolution: "p-map@npm:2.1.0" @@ -15750,7 +14532,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "p-map@npm:^4.0.0": version: 4.0.0 resolution: "p-map@npm:4.0.0" @@ -15760,8 +14541,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "p-retry@npm:^3.0.1": version: 3.0.1 resolution: "p-retry@npm:3.0.1" @@ -15771,7 +14550,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "p-try@npm:^2.0.0": version: 2.2.0 resolution: "p-try@npm:2.2.0" @@ -15779,20 +14557,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"pako@npm:^1.0.0": -======= "pako@npm:^1.0.0, pako@npm:~1.0.5": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.0.11 resolution: "pako@npm:1.0.11" checksum: 10c0/86dd99d8b34c3930345b8bbeb5e1cd8a05f608eeb40967b293f72fe469d0e9c88b783a8777e4cc7dc7c91ce54c5e93d88ff4b4f060e6ff18408fd21030d9ffbe languageName: node linkType: hard -<<<<<<< HEAD -"param-case@npm:^3.0.4": -======= "parallel-transform@npm:^1.1.0": version: 1.2.0 resolution: "parallel-transform@npm:1.2.0" @@ -15805,7 +14576,6 @@ __metadata: linkType: hard "param-case@npm:^3.0.3, param-case@npm:^3.0.4": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.0.4 resolution: "param-case@npm:3.0.4" dependencies: @@ -15824,9 +14594,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"parse-json@npm:^5.2.0": -======= "parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.7": version: 5.1.7 resolution: "parse-asn1@npm:5.1.7" @@ -15852,7 +14619,6 @@ __metadata: linkType: hard "parse-json@npm:^5.0.0, parse-json@npm:^5.2.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 5.2.0 resolution: "parse-json@npm:5.2.0" dependencies: @@ -15864,8 +14630,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "parse5@npm:6.0.1": version: 6.0.1 resolution: "parse5@npm:6.0.1" @@ -15873,7 +14637,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "parse5@npm:^7.0.0, parse5@npm:^7.1.1, parse5@npm:^7.1.2": version: 7.1.2 resolution: "parse5@npm:7.1.2" @@ -15883,8 +14646,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "parseurl@npm:~1.3.2, parseurl@npm:~1.3.3": version: 1.3.3 resolution: "parseurl@npm:1.3.3" @@ -15892,7 +14653,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pascal-case@npm:^3.1.2": version: 3.1.2 resolution: "pascal-case@npm:3.1.2" @@ -15903,8 +14663,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "pascalcase@npm:^0.1.1": version: 0.1.1 resolution: "pascalcase@npm:0.1.1" @@ -15919,7 +14677,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "path-case@npm:^3.0.4": version: 3.0.4 resolution: "path-case@npm:3.0.4" @@ -15930,8 +14687,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "path-dirname@npm:^1.0.0": version: 1.0.2 resolution: "path-dirname@npm:1.0.2" @@ -15946,7 +14701,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "path-exists@npm:^4.0.0": version: 4.0.0 resolution: "path-exists@npm:4.0.0" @@ -15961,8 +14715,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "path-is-inside@npm:^1.0.2": version: 1.0.2 resolution: "path-is-inside@npm:1.0.2" @@ -15977,7 +14729,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "path-key@npm:^3.0.0, path-key@npm:^3.1.0": version: 3.1.1 resolution: "path-key@npm:3.1.1" @@ -15985,11 +14736,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"path-parse@npm:^1.0.7": -======= "path-parse@npm:^1.0.6, path-parse@npm:^1.0.7": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.0.7 resolution: "path-parse@npm:1.0.7" checksum: 10c0/11ce261f9d294cc7a58d6a574b7f1b935842355ec66fba3c3fd79e0f036462eaf07d0aa95bb74ff432f9afef97ce1926c720988c6a7451d8a584930ae7de86e1 @@ -16006,8 +14753,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "path-to-regexp@npm:0.1.7": version: 0.1.7 resolution: "path-to-regexp@npm:0.1.7" @@ -16015,7 +14760,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "path-type@npm:^4.0.0": version: 4.0.0 resolution: "path-type@npm:4.0.0" @@ -16023,8 +14767,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "pbkdf2@npm:^3.0.3, pbkdf2@npm:^3.1.2": version: 3.1.2 resolution: "pbkdf2@npm:3.1.2" @@ -16052,7 +14794,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "picocolors@npm:^1.0.0": version: 1.0.0 resolution: "picocolors@npm:1.0.0" @@ -16060,19 +14801,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1": -======= "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.3.1 resolution: "picomatch@npm:2.3.1" checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be languageName: node linkType: hard -<<<<<<< HEAD -======= "pify@npm:^2.0.0": version: 2.3.0 resolution: "pify@npm:2.3.0" @@ -16103,7 +14838,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pino-std-serializers@npm:^3.1.0": version: 3.2.0 resolution: "pino-std-serializers@npm:3.2.0" @@ -16128,20 +14862,13 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"pirates@npm:^4.0.4": -======= "pirates@npm:^4.0.1, pirates@npm:^4.0.4": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.0.6 resolution: "pirates@npm:4.0.6" checksum: 10c0/00d5fa51f8dded94d7429700fb91a0c1ead00ae2c7fd27089f0c5b63e6eca36197fe46384631872690a66f390c5e27198e99006ab77ae472692ab9c2ca903f36 languageName: node linkType: hard -<<<<<<< HEAD -"pkg-dir@npm:^4.2.0": -======= "pkg-dir@npm:^3.0.0": version: 3.0.0 resolution: "pkg-dir@npm:3.0.0" @@ -16152,7 +14879,6 @@ __metadata: linkType: hard "pkg-dir@npm:^4.1.0, pkg-dir@npm:^4.2.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.2.0 resolution: "pkg-dir@npm:4.2.0" dependencies: @@ -16161,8 +14887,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "pkg-up@npm:3.1.0": version: 3.1.0 resolution: "pkg-up@npm:3.1.0" @@ -16172,7 +14896,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "platform@npm:^1.3.6": version: 1.3.6 resolution: "platform@npm:1.3.6" @@ -16180,8 +14903,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "pnp-webpack-plugin@npm:1.6.4": version: 1.6.4 resolution: "pnp-webpack-plugin@npm:1.6.4" @@ -16209,7 +14930,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "possible-typed-array-names@npm:^1.0.0": version: 1.0.0 resolution: "possible-typed-array-names@npm:1.0.0" @@ -16217,8 +14937,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "postcss-attribute-case-insensitive@npm:^4.0.1": version: 4.0.2 resolution: "postcss-attribute-case-insensitive@npm:4.0.2" @@ -16619,7 +15337,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "postcss-modules-extract-imports@npm:^3.0.0": version: 3.0.0 resolution: "postcss-modules-extract-imports@npm:3.0.0" @@ -16629,8 +15346,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "postcss-modules-local-by-default@npm:^3.0.3": version: 3.0.3 resolution: "postcss-modules-local-by-default@npm:3.0.3" @@ -16643,7 +15358,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "postcss-modules-local-by-default@npm:^4.0.4": version: 4.0.4 resolution: "postcss-modules-local-by-default@npm:4.0.4" @@ -16657,8 +15371,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "postcss-modules-scope@npm:^2.2.0": version: 2.2.0 resolution: "postcss-modules-scope@npm:2.2.0" @@ -16669,7 +15381,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "postcss-modules-scope@npm:^3.1.1": version: 3.1.1 resolution: "postcss-modules-scope@npm:3.1.1" @@ -16681,8 +15392,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "postcss-modules-values@npm:^3.0.0": version: 3.0.0 resolution: "postcss-modules-values@npm:3.0.0" @@ -16693,7 +15402,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "postcss-modules-values@npm:^4.0.0": version: 4.0.0 resolution: "postcss-modules-values@npm:4.0.0" @@ -16705,9 +15413,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4": -======= "postcss-nesting@npm:^7.0.0": version: 7.0.1 resolution: "postcss-nesting@npm:7.0.1" @@ -17008,7 +15713,6 @@ __metadata: linkType: hard "postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 6.0.16 resolution: "postcss-selector-parser@npm:6.0.16" dependencies: @@ -17018,9 +15722,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0": -======= "postcss-svgo@npm:^4.0.3": version: 4.0.3 resolution: "postcss-svgo@npm:4.0.3" @@ -17051,16 +15752,12 @@ __metadata: linkType: hard "postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.2.0 resolution: "postcss-value-parser@npm:4.2.0" checksum: 10c0/f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161 languageName: node linkType: hard -<<<<<<< HEAD -"postcss@npm:^8.4.33": -======= "postcss-values-parser@npm:^2.0.0, postcss-values-parser@npm:^2.0.1": version: 2.0.1 resolution: "postcss-values-parser@npm:2.0.1" @@ -17094,7 +15791,6 @@ __metadata: linkType: hard "postcss@npm:^8.1.0, postcss@npm:^8.4.33": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 8.4.38 resolution: "postcss@npm:8.4.38" dependencies: @@ -17112,8 +15808,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "prelude-ls@npm:~1.1.2": version: 1.1.2 resolution: "prelude-ls@npm:1.1.2" @@ -17128,7 +15822,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "prettier@npm:^3.2.5": version: 3.2.5 resolution: "prettier@npm:3.2.5" @@ -17138,8 +15831,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "pretty-bytes@npm:^5.3.0": version: 5.6.0 resolution: "pretty-bytes@npm:5.6.0" @@ -17169,7 +15860,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "pretty-format@npm:^29.0.0, pretty-format@npm:^29.7.0": version: 29.7.0 resolution: "pretty-format@npm:29.7.0" @@ -17188,8 +15878,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "process-nextick-args@npm:~2.0.0": version: 2.0.1 resolution: "process-nextick-args@npm:2.0.1" @@ -17197,7 +15885,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "process-warning@npm:^1.0.0": version: 1.0.0 resolution: "process-warning@npm:1.0.0" @@ -17205,8 +15892,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "process@npm:^0.11.10": version: 0.11.10 resolution: "process@npm:0.11.10" @@ -17221,7 +15906,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "promise-inflight@npm:^1.0.1": version: 1.0.1 resolution: "promise-inflight@npm:1.0.1" @@ -17239,8 +15923,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "promise@npm:^8.1.0": version: 8.3.0 resolution: "promise@npm:8.3.0" @@ -17260,7 +15942,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "prompts@npm:^2.0.1": version: 2.4.2 resolution: "prompts@npm:2.4.2" @@ -17282,11 +15963,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"proxy-addr@npm:^2.0.7": -======= "proxy-addr@npm:^2.0.7, proxy-addr@npm:~2.0.7": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.0.7 resolution: "proxy-addr@npm:2.0.7" dependencies: @@ -17303,8 +15980,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "prr@npm:~1.0.1": version: 1.0.1 resolution: "prr@npm:1.0.1" @@ -17312,7 +15987,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "psl@npm:^1.1.33": version: 1.9.0 resolution: "psl@npm:1.9.0" @@ -17320,8 +15994,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "public-encrypt@npm:^4.0.0": version: 4.0.3 resolution: "public-encrypt@npm:4.0.3" @@ -17374,7 +16046,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.0": version: 2.3.1 resolution: "punycode@npm:2.3.1" @@ -17389,8 +16060,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "q@npm:^1.1.2": version: 1.5.1 resolution: "q@npm:1.5.1" @@ -17440,7 +16109,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "querystringify@npm:^2.1.1": version: 2.2.0 resolution: "querystringify@npm:2.2.0" @@ -17462,9 +16130,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"randombytes@npm:^2.1.0": -======= "raf@npm:^3.4.1": version: 3.4.1 resolution: "raf@npm:3.4.1" @@ -17475,7 +16140,6 @@ __metadata: linkType: hard "randombytes@npm:^2.0.0, randombytes@npm:^2.0.1, randombytes@npm:^2.0.5, randombytes@npm:^2.1.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.1.0 resolution: "randombytes@npm:2.1.0" dependencies: @@ -17484,8 +16148,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "randomfill@npm:^1.0.3": version: 1.0.4 resolution: "randomfill@npm:1.0.4" @@ -17574,7 +16236,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "react-dom@npm:^18.2.0": version: 18.2.0 resolution: "react-dom@npm:18.2.0" @@ -17587,8 +16248,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "react-error-overlay@npm:^6.0.9": version: 6.0.11 resolution: "react-error-overlay@npm:6.0.11" @@ -17596,7 +16255,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "react-fast-compare@npm:^3.0.1": version: 3.2.2 resolution: "react-fast-compare@npm:3.2.2" @@ -17611,8 +16269,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "react-is@npm:^17.0.1": version: 17.0.2 resolution: "react-is@npm:17.0.2" @@ -17620,7 +16276,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "react-is@npm:^18.0.0": version: 18.2.0 resolution: "react-is@npm:18.2.0" @@ -17642,8 +16297,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "react-refresh@npm:^0.8.3": version: 0.8.3 resolution: "react-refresh@npm:0.8.3" @@ -17739,7 +16392,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "react@npm:^18.2.0": version: 18.2.0 resolution: "react@npm:18.2.0" @@ -17749,8 +16401,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "read-pkg-up@npm:^7.0.1": version: 7.0.1 resolution: "read-pkg-up@npm:7.0.1" @@ -17789,7 +16439,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "readable-stream@npm:^1.0.33": version: 1.1.14 resolution: "readable-stream@npm:1.1.14" @@ -17802,11 +16451,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": -======= "readable-stream@npm:^3.0.6, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.6.2 resolution: "readable-stream@npm:3.6.2" dependencies: @@ -17817,8 +16462,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "readdirp@npm:^2.2.1": version: 2.2.1 resolution: "readdirp@npm:2.2.1" @@ -17830,7 +16473,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "readdirp@npm:~3.6.0": version: 3.6.0 resolution: "readdirp@npm:3.6.0" @@ -17849,8 +16491,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "recursive-readdir@npm:2.2.2": version: 2.2.2 resolution: "recursive-readdir@npm:2.2.2" @@ -17870,7 +16510,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "reflect.getprototypeof@npm:^1.0.4": version: 1.0.6 resolution: "reflect.getprototypeof@npm:1.0.6" @@ -17886,9 +16525,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"regenerator-runtime@npm:^0.14.1": -======= "regenerate-unicode-properties@npm:^10.1.0": version: 10.1.1 resolution: "regenerate-unicode-properties@npm:10.1.1" @@ -17920,16 +16556,12 @@ __metadata: linkType: hard "regenerator-runtime@npm:^0.14.0, regenerator-runtime@npm:^0.14.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 0.14.1 resolution: "regenerator-runtime@npm:0.14.1" checksum: 10c0/1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4 languageName: node linkType: hard -<<<<<<< HEAD -"regexp.prototype.flags@npm:^1.5.2": -======= "regenerator-transform@npm:^0.15.2": version: 0.15.2 resolution: "regenerator-transform@npm:0.15.2" @@ -17957,7 +16589,6 @@ __metadata: linkType: hard "regexp.prototype.flags@npm:^1.5.1, regexp.prototype.flags@npm:^1.5.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.5.2 resolution: "regexp.prototype.flags@npm:1.5.2" dependencies: @@ -17969,8 +16600,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "regexpp@npm:^3.1.0": version: 3.2.0 resolution: "regexpp@npm:3.2.0" @@ -18044,7 +16673,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "require-directory@npm:^2.1.1": version: 2.1.1 resolution: "require-directory@npm:2.1.1" @@ -18059,8 +16687,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "require-main-filename@npm:^2.0.0": version: 2.0.0 resolution: "require-main-filename@npm:2.0.0" @@ -18068,7 +16694,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "requires-port@npm:^1.0.0": version: 1.0.0 resolution: "requires-port@npm:1.0.0" @@ -18076,8 +16701,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "resolve-cwd@npm:^2.0.0": version: 2.0.0 resolution: "resolve-cwd@npm:2.0.0" @@ -18087,7 +16710,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "resolve-cwd@npm:^3.0.0": version: 3.0.0 resolution: "resolve-cwd@npm:3.0.0" @@ -18097,8 +16719,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "resolve-from@npm:^3.0.0": version: 3.0.0 resolution: "resolve-from@npm:3.0.0" @@ -18106,7 +16726,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "resolve-from@npm:^4.0.0": version: 4.0.0 resolution: "resolve-from@npm:4.0.0" @@ -18128,8 +16747,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "resolve-url-loader@npm:^3.1.2": version: 3.1.5 resolution: "resolve-url-loader@npm:3.1.5" @@ -18155,7 +16772,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "resolve.exports@npm:^2.0.0": version: 2.0.2 resolution: "resolve.exports@npm:2.0.2" @@ -18163,9 +16779,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"resolve@npm:^1.20.0": -======= "resolve@npm:1.18.1": version: 1.18.1 resolution: "resolve@npm:1.18.1" @@ -18177,7 +16790,6 @@ __metadata: linkType: hard "resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.18.1, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4, resolve@npm:^1.3.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -18203,9 +16815,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"resolve@patch:resolve@npm%3A^1.20.0#optional!builtin": -======= "resolve@patch:resolve@npm%3A1.18.1#optional!builtin": version: 1.18.1 resolution: "resolve@patch:resolve@npm%3A1.18.1#optional!builtin::version=1.18.1&hash=c3c19d" @@ -18217,7 +16826,6 @@ __metadata: linkType: hard "resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.12.0#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin, resolve@patch:resolve@npm%3A^1.18.1#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" dependencies: @@ -18243,8 +16851,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "ret@npm:~0.1.10": version: 0.1.15 resolution: "ret@npm:0.1.15" @@ -18252,7 +16858,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ret@npm:~0.2.0": version: 0.2.2 resolution: "ret@npm:0.2.2" @@ -18274,8 +16879,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "rework-visit@npm:1.0.0": version: 1.0.0 resolution: "rework-visit@npm:1.0.0" @@ -18293,7 +16896,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rfdc@npm:^1.1.4, rfdc@npm:^1.2.0": version: 1.3.1 resolution: "rfdc@npm:1.3.1" @@ -18301,9 +16903,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"rimraf@npm:^3.0.2": -======= "rgb-regex@npm:^1.0.1": version: 1.0.1 resolution: "rgb-regex@npm:1.0.1" @@ -18330,7 +16929,6 @@ __metadata: linkType: hard "rimraf@npm:^3.0.0, rimraf@npm:^3.0.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.0.2 resolution: "rimraf@npm:3.0.2" dependencies: @@ -18341,8 +16939,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1": version: 2.0.2 resolution: "ripemd160@npm:2.0.2" @@ -18403,7 +16999,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "rrweb-cssom@npm:^0.6.0": version: 0.6.0 resolution: "rrweb-cssom@npm:0.6.0" @@ -18411,8 +17006,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "rsvp@npm:^4.8.4": version: 4.8.5 resolution: "rsvp@npm:4.8.5" @@ -18420,7 +17013,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "run-parallel@npm:^1.1.9": version: 1.2.0 resolution: "run-parallel@npm:1.2.0" @@ -18430,8 +17022,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "run-queue@npm:^1.0.0, run-queue@npm:^1.0.3": version: 1.0.3 resolution: "run-queue@npm:1.0.3" @@ -18441,7 +17031,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "safe-array-concat@npm:^1.1.2": version: 1.1.2 resolution: "safe-array-concat@npm:1.1.2" @@ -18454,9 +17043,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"safe-buffer@npm:5.2.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": -======= "safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1": version: 5.1.2 resolution: "safe-buffer@npm:5.1.2" @@ -18465,7 +17051,6 @@ __metadata: linkType: hard "safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: 10c0/6501914237c0a86e9675d4e51d89ca3c21ffd6a31642efeba25ad65720bce6921c9e7e974e5be91a786b25aa058b5303285d3c15dbabf983a919f5f630d349f3 @@ -18492,9 +17077,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"safer-buffer@npm:>= 2.1.2 < 3.0.0": -======= "safe-regex@npm:^1.1.0": version: 1.1.0 resolution: "safe-regex@npm:1.1.0" @@ -18505,15 +17087,12 @@ __metadata: linkType: hard "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" checksum: 10c0/7e3c8b2e88a1841c9671094bbaeebd94448111dd90a81a1f606f3f67708a6ec57763b3b47f06da09fc6054193e0e6709e77325415dc8422b04497a8070fa02d4 languageName: node linkType: hard -<<<<<<< HEAD -======= "sane@npm:^4.0.3": version: 4.1.0 resolution: "sane@npm:4.1.0" @@ -18565,7 +17144,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sass-loader@npm:^14.1.1": version: 14.1.1 resolution: "sass-loader@npm:14.1.1" @@ -18612,8 +17190,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "sax@npm:~1.2.4": version: 1.2.4 resolution: "sax@npm:1.2.4" @@ -18630,7 +17206,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "saxes@npm:^6.0.0": version: 6.0.0 resolution: "saxes@npm:6.0.0" @@ -18640,8 +17215,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "scheduler@npm:^0.20.2": version: 0.20.2 resolution: "scheduler@npm:0.20.2" @@ -18652,7 +17225,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "scheduler@npm:^0.23.0": version: 0.23.0 resolution: "scheduler@npm:0.23.0" @@ -18662,8 +17234,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "schema-utils@npm:^1.0.0": version: 1.0.0 resolution: "schema-utils@npm:1.0.0" @@ -18686,7 +17256,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0": version: 3.3.0 resolution: "schema-utils@npm:3.3.0" @@ -18717,8 +17286,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "select-hose@npm:^2.0.0": version: 2.0.0 resolution: "select-hose@npm:2.0.0" @@ -18735,7 +17302,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "semver-store@npm:^0.3.0": version: 0.3.0 resolution: "semver-store@npm:0.3.0" @@ -18743,9 +17309,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"semver@npm:^6.3.0, semver@npm:^6.3.1": -======= "semver@npm:2 || 3 || 4 || 5, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0": version: 5.7.2 resolution: "semver@npm:5.7.2" @@ -18765,7 +17328,6 @@ __metadata: linkType: hard "semver@npm:^6.0.0, semver@npm:^6.3.0, semver@npm:^6.3.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 6.3.1 resolution: "semver@npm:6.3.1" bin: @@ -18774,8 +17336,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "semver@npm:^7.2.1": version: 7.6.2 resolution: "semver@npm:7.6.2" @@ -18785,7 +17345,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4": version: 7.6.0 resolution: "semver@npm:7.6.0" @@ -18797,8 +17356,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "send@npm:0.18.0": version: 0.18.0 resolution: "send@npm:0.18.0" @@ -18820,7 +17377,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sentence-case@npm:^3.0.4": version: 3.0.4 resolution: "sentence-case@npm:3.0.4" @@ -18832,8 +17388,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "serialize-javascript@npm:^4.0.0": version: 4.0.0 resolution: "serialize-javascript@npm:4.0.0" @@ -18852,7 +17406,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "serialize-javascript@npm:^6.0.1": version: 6.0.2 resolution: "serialize-javascript@npm:6.0.2" @@ -18862,8 +17415,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "serve-index@npm:^1.9.1": version: 1.9.1 resolution: "serve-index@npm:1.9.1" @@ -18891,7 +17442,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "set-blocking@npm:^2.0.0": version: 2.0.0 resolution: "set-blocking@npm:2.0.0" @@ -18932,8 +17482,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "set-value@npm:^2.0.0, set-value@npm:^2.0.1": version: 2.0.1 resolution: "set-value@npm:2.0.1" @@ -18960,7 +17508,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "setprototypeof@npm:1.2.0": version: 1.2.0 resolution: "setprototypeof@npm:1.2.0" @@ -18968,8 +17515,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "sha.js@npm:^2.4.0, sha.js@npm:^2.4.8": version: 2.4.11 resolution: "sha.js@npm:2.4.11" @@ -18982,7 +17527,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "shallow-clone@npm:^3.0.0": version: 3.0.1 resolution: "shallow-clone@npm:3.0.1" @@ -18992,8 +17536,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "shebang-command@npm:^1.2.0": version: 1.2.0 resolution: "shebang-command@npm:1.2.0" @@ -19003,7 +17545,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "shebang-command@npm:^2.0.0": version: 2.0.0 resolution: "shebang-command@npm:2.0.0" @@ -19013,8 +17554,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "shebang-regex@npm:^1.0.0": version: 1.0.0 resolution: "shebang-regex@npm:1.0.0" @@ -19022,7 +17561,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "shebang-regex@npm:^3.0.0": version: 3.0.0 resolution: "shebang-regex@npm:3.0.0" @@ -19030,8 +17568,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "shell-quote@npm:1.7.2": version: 1.7.2 resolution: "shell-quote@npm:1.7.2" @@ -19046,7 +17582,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "side-channel@npm:^1.0.4, side-channel@npm:^1.0.6": version: 1.0.6 resolution: "side-channel@npm:1.0.6" @@ -19059,11 +17594,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": -======= "signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.0.7 resolution: "signal-exit@npm:3.0.7" checksum: 10c0/25d272fa73e146048565e08f3309d5b942c1979a6f4a58a8c59d5fa299728e9c2fcd1a759ec870863b1fd38653670240cd420dad2ad9330c71f36608a6a1c912 @@ -19077,8 +17608,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "simple-swizzle@npm:^0.2.2": version: 0.2.2 resolution: "simple-swizzle@npm:0.2.2" @@ -19088,7 +17617,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sirv@npm:^2.0.3": version: 2.0.4 resolution: "sirv@npm:2.0.4" @@ -19114,8 +17642,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "slice-ansi@npm:^4.0.0": version: 4.0.0 resolution: "slice-ansi@npm:4.0.0" @@ -19127,7 +17653,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "slugify@npm:^1.6.0": version: 1.6.6 resolution: "slugify@npm:1.6.6" @@ -19152,8 +17677,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "snapdragon-node@npm:^2.0.1": version: 2.1.1 resolution: "snapdragon-node@npm:2.1.1" @@ -19214,7 +17737,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "socks-proxy-agent@npm:^7.0.0": version: 7.0.0 resolution: "socks-proxy-agent@npm:7.0.0" @@ -19257,8 +17779,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "sort-keys@npm:^1.0.0": version: 1.1.2 resolution: "sort-keys@npm:1.1.2" @@ -19268,7 +17788,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "source-list-map@npm:^2.0.0": version: 2.0.1 resolution: "source-list-map@npm:2.0.1" @@ -19283,8 +17802,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "source-map-resolve@npm:^0.5.0, source-map-resolve@npm:^0.5.2": version: 0.5.3 resolution: "source-map-resolve@npm:0.5.3" @@ -19298,7 +17815,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "source-map-support@npm:0.5.13": version: 0.5.13 resolution: "source-map-support@npm:0.5.13" @@ -19309,11 +17825,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"source-map-support@npm:~0.5.20": -======= "source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.20": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 0.5.21 resolution: "source-map-support@npm:0.5.21" dependencies: @@ -19323,9 +17835,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.1": -======= "source-map-url@npm:^0.4.0": version: 0.4.1 resolution: "source-map-url@npm:0.4.1" @@ -19334,16 +17843,12 @@ __metadata: linkType: hard "source-map@npm:0.6.1, source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.0, source-map@npm:~0.6.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 0.6.1 resolution: "source-map@npm:0.6.1" checksum: 10c0/ab55398007c5e5532957cb0beee2368529618ac0ab372d789806f5718123cc4367d57de3904b4e6a4170eb5a0b0f41373066d02ca0735a0c4d75c7d328d3e011 languageName: node linkType: hard -<<<<<<< HEAD -"source-map@npm:^0.7.4": -======= "source-map@npm:^0.5.0, source-map@npm:^0.5.6": version: 0.5.7 resolution: "source-map@npm:0.5.7" @@ -19352,15 +17857,12 @@ __metadata: linkType: hard "source-map@npm:^0.7.3, source-map@npm:^0.7.4": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 0.7.4 resolution: "source-map@npm:0.7.4" checksum: 10c0/dc0cf3768fe23c345ea8760487f8c97ef6fca8a73c83cd7c9bf2fde8bc2c34adb9c0824d6feb14bc4f9e37fb522e18af621543f1289038a66ac7586da29aa7dc languageName: node linkType: hard -<<<<<<< HEAD -======= "sourcemap-codec@npm:^1.4.8": version: 1.4.8 resolution: "sourcemap-codec@npm:1.4.8" @@ -19438,7 +17940,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "sprintf-js@npm:^1.1.3": version: 1.1.3 resolution: "sprintf-js@npm:1.1.3" @@ -19462,8 +17963,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "ssri@npm:^6.0.1": version: 6.0.2 resolution: "ssri@npm:6.0.2" @@ -19482,7 +17981,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ssri@npm:^9.0.0": version: 9.0.1 resolution: "ssri@npm:9.0.1" @@ -19492,9 +17990,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"stack-utils@npm:^2.0.3": -======= "stable@npm:^0.1.8": version: 0.1.8 resolution: "stable@npm:0.1.8" @@ -19503,7 +17998,6 @@ __metadata: linkType: hard "stack-utils@npm:^2.0.2, stack-utils@npm:^2.0.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 2.0.6 resolution: "stack-utils@npm:2.0.6" dependencies: @@ -19512,8 +18006,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "stackframe@npm:^1.3.4": version: 1.3.4 resolution: "stackframe@npm:1.3.4" @@ -19521,7 +18013,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "stacktrace-parser@npm:^0.1.10": version: 0.1.10 resolution: "stacktrace-parser@npm:0.1.10" @@ -19531,8 +18022,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "static-eval@npm:2.0.2": version: 2.0.2 resolution: "static-eval@npm:2.0.2" @@ -19552,7 +18041,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "statuses@npm:2.0.1": version: 2.0.1 resolution: "statuses@npm:2.0.1" @@ -19560,8 +18048,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "statuses@npm:>= 1.4.0 < 2": version: 1.5.0 resolution: "statuses@npm:1.5.0" @@ -19616,7 +18102,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "string-length@npm:^4.0.1": version: 4.0.2 resolution: "string-length@npm:4.0.2" @@ -19627,8 +18112,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "string-natural-compare@npm:^3.0.1": version: 3.0.1 resolution: "string-natural-compare@npm:3.0.1" @@ -19636,7 +18119,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "string-similarity@npm:^4.0.1": version: 4.0.4 resolution: "string-similarity@npm:4.0.4" @@ -19655,8 +18137,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "string-width@npm:^3.0.0, string-width@npm:^3.1.0": version: 3.1.0 resolution: "string-width@npm:3.1.0" @@ -19668,7 +18148,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "string-width@npm:^5.0.1, string-width@npm:^5.1.2": version: 5.1.2 resolution: "string-width@npm:5.1.2" @@ -19734,11 +18213,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"string_decoder@npm:^1.1.1": -======= "string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.3.0 resolution: "string_decoder@npm:1.3.0" dependencies: @@ -19754,8 +18229,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "string_decoder@npm:~1.1.1": version: 1.1.1 resolution: "string_decoder@npm:1.1.1" @@ -19776,7 +18249,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": version: 6.0.1 resolution: "strip-ansi@npm:6.0.1" @@ -19786,8 +18258,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "strip-ansi@npm:6.0.0": version: 6.0.0 resolution: "strip-ansi@npm:6.0.0" @@ -19815,7 +18285,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "strip-ansi@npm:^7.0.1": version: 7.1.0 resolution: "strip-ansi@npm:7.1.0" @@ -19825,8 +18294,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "strip-bom@npm:^3.0.0": version: 3.0.0 resolution: "strip-bom@npm:3.0.0" @@ -19834,7 +18301,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "strip-bom@npm:^4.0.0": version: 4.0.0 resolution: "strip-bom@npm:4.0.0" @@ -19842,8 +18308,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "strip-comments@npm:^1.0.2": version: 1.0.2 resolution: "strip-comments@npm:1.0.2" @@ -19861,7 +18325,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "strip-final-newline@npm:^2.0.0": version: 2.0.0 resolution: "strip-final-newline@npm:2.0.0" @@ -19869,9 +18332,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"strip-json-comments@npm:^3.1.1": -======= "strip-indent@npm:^3.0.0": version: 3.0.0 resolution: "strip-indent@npm:3.0.0" @@ -19882,15 +18342,12 @@ __metadata: linkType: hard "strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" checksum: 10c0/9681a6257b925a7fa0f285851c0e613cc934a50661fa7bb41ca9cbbff89686bb4a0ee366e6ecedc4daafd01e83eee0720111ab294366fe7c185e935475ebcecd languageName: node linkType: hard -<<<<<<< HEAD -======= "style-loader@npm:1.3.0": version: 1.3.0 resolution: "style-loader@npm:1.3.0" @@ -19903,7 +18360,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "style-loader@npm:^3.3.4": version: 3.3.4 resolution: "style-loader@npm:3.3.4" @@ -19913,8 +18369,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "stylehacks@npm:^4.0.0": version: 4.0.3 resolution: "stylehacks@npm:4.0.3" @@ -19926,7 +18380,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "supports-color@npm:^5.3.0": version: 5.5.0 resolution: "supports-color@npm:5.5.0" @@ -19936,9 +18389,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"supports-color@npm:^7.1.0": -======= "supports-color@npm:^6.1.0": version: 6.1.0 resolution: "supports-color@npm:6.1.0" @@ -19949,7 +18399,6 @@ __metadata: linkType: hard "supports-color@npm:^7.0.0, supports-color@npm:^7.1.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.2.0 resolution: "supports-color@npm:7.2.0" dependencies: @@ -19967,8 +18416,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "supports-hyperlinks@npm:^2.0.0": version: 2.3.0 resolution: "supports-hyperlinks@npm:2.3.0" @@ -19979,7 +18426,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "supports-preserve-symlinks-flag@npm:^1.0.0": version: 1.0.0 resolution: "supports-preserve-symlinks-flag@npm:1.0.0" @@ -19987,8 +18433,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "svg-parser@npm:^2.0.2": version: 2.0.4 resolution: "svg-parser@npm:2.0.4" @@ -19996,7 +18440,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "svg-pathdata@npm:^6.0.0": version: 6.0.3 resolution: "svg-pathdata@npm:6.0.3" @@ -20037,8 +18480,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "svgo@npm:^1.0.0, svgo@npm:^1.2.2": version: 1.3.2 resolution: "svgo@npm:1.3.2" @@ -20062,7 +18503,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "svgpath@npm:^2.1.5": version: 2.6.0 resolution: "svgpath@npm:2.6.0" @@ -20089,8 +18529,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "table@npm:^6.0.9": version: 6.8.2 resolution: "table@npm:6.8.2" @@ -20111,7 +18549,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tapable@npm:^2.1.1, tapable@npm:^2.2.0, tapable@npm:^2.2.1": version: 2.2.1 resolution: "tapable@npm:2.2.1" @@ -20119,11 +18556,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"tar@npm:^6.1.11, tar@npm:^6.1.2": -======= "tar@npm:^6.0.2, tar@npm:^6.1.11, tar@npm:^6.1.2": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 6.2.1 resolution: "tar@npm:6.2.1" dependencies: @@ -20137,8 +18570,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "temp-dir@npm:^1.0.0": version: 1.0.0 resolution: "temp-dir@npm:1.0.0" @@ -20205,7 +18636,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "terser-webpack-plugin@npm:^5.3.10": version: 5.3.10 resolution: "terser-webpack-plugin@npm:5.3.10" @@ -20228,8 +18658,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "terser@npm:^4.1.2, terser@npm:^4.6.2, terser@npm:^4.6.3": version: 4.8.1 resolution: "terser@npm:4.8.1" @@ -20243,7 +18671,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "terser@npm:^5.26.0, terser@npm:^5.30.2": version: 5.30.2 resolution: "terser@npm:5.30.2" @@ -20258,8 +18685,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "terser@npm:^5.3.4": version: 5.31.0 resolution: "terser@npm:5.31.0" @@ -20274,7 +18699,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "test-exclude@npm:^6.0.0": version: 6.0.0 resolution: "test-exclude@npm:6.0.0" @@ -20286,11 +18710,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"text-table@npm:^0.2.0": -======= "text-table@npm:0.2.0, text-table@npm:^0.2.0": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 0.2.0 resolution: "text-table@npm:0.2.0" checksum: 10c0/02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c @@ -20333,19 +18753,11 @@ __metadata: version: 0.0.0-use.local resolution: "tgui-dev-server@workspace:packages/tgui-dev-server" dependencies: -<<<<<<< HEAD - axios: "npm:^1.7.4" - glob: "npm:^7.2.3" - source-map: "npm:^0.7.4" - stacktrace-parser: "npm:^0.1.10" - ws: "npm:^8.17.1" -======= axios: "npm:^1.6.8" glob: "npm:^7.2.3" source-map: "npm:^0.7.4" stacktrace-parser: "npm:^0.1.10" ws: "npm:^8.16.0" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 languageName: unknown linkType: soft @@ -20422,11 +18834,7 @@ __metadata: swc-loader: "npm:^0.2.6" typescript: "npm:^5.4.3" url-loader: "npm:^4.1.1" -<<<<<<< HEAD - webpack: "npm:^5.94.0" -======= webpack: "npm:^5.91.0" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 webpack-bundle-analyzer: "npm:^4.10.1" webpack-cli: "npm:^5.1.4" languageName: unknown @@ -20439,17 +18847,11 @@ __metadata: "@popperjs/core": "npm:^2.11.8" "@types/marked": "npm:4.3.2" "@types/react": "npm:^18.2.74" -<<<<<<< HEAD - common: "workspace:*" - dateformat: "npm:^4.6.3" - dompurify: "npm:^2.4.9" -======= blob-polyfill: "npm:^9.0.20240710" common: "workspace:*" dateformat: "npm:^4.6.3" dompurify: "npm:^2.4.9" file-extension-icon-js: "npm:^1.1.6" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 highlight.js: "npm:^11.9.0" jest: "npm:^29.7.0" js-yaml: "npm:^4.1.0" @@ -20463,8 +18865,6 @@ __metadata: languageName: unknown linkType: soft -<<<<<<< HEAD -======= "throat@npm:^5.0.0": version: 5.0.0 resolution: "throat@npm:5.0.0" @@ -20498,7 +18898,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "timers-ext@npm:^0.1.7": version: 0.1.7 resolution: "timers-ext@npm:0.1.7" @@ -20509,8 +18908,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "timsort@npm:^0.3.0": version: 0.3.0 resolution: "timsort@npm:0.3.0" @@ -20518,7 +18915,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tiny-lru@npm:^8.0.1": version: 8.0.2 resolution: "tiny-lru@npm:8.0.2" @@ -20533,8 +18929,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "to-arraybuffer@npm:^1.0.0": version: 1.0.1 resolution: "to-arraybuffer@npm:1.0.1" @@ -20542,7 +18936,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "to-fast-properties@npm:^2.0.0": version: 2.0.0 resolution: "to-fast-properties@npm:2.0.0" @@ -20550,8 +18943,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "to-object-path@npm:^0.3.0": version: 0.3.0 resolution: "to-object-path@npm:0.3.0" @@ -20571,7 +18962,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "to-regex-range@npm:^5.0.1": version: 5.0.1 resolution: "to-regex-range@npm:5.0.1" @@ -20581,8 +18971,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "to-regex@npm:^3.0.1, to-regex@npm:^3.0.2": version: 3.0.2 resolution: "to-regex@npm:3.0.2" @@ -20595,7 +18983,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "toidentifier@npm:1.0.1": version: 1.0.1 resolution: "toidentifier@npm:1.0.1" @@ -20610,8 +18997,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "tough-cookie@npm:^4.0.0": version: 4.1.4 resolution: "tough-cookie@npm:4.1.4" @@ -20624,7 +19009,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tough-cookie@npm:^4.1.2": version: 4.1.3 resolution: "tough-cookie@npm:4.1.3" @@ -20637,8 +19021,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "tr46@npm:^2.1.0": version: 2.1.0 resolution: "tr46@npm:2.1.0" @@ -20648,7 +19030,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tr46@npm:^3.0.0": version: 3.0.0 resolution: "tr46@npm:3.0.0" @@ -20667,8 +19048,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "tryer@npm:^1.0.1": version: 1.0.1 resolution: "tryer@npm:1.0.1" @@ -20676,7 +19055,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ts-api-utils@npm:^1.0.1": version: 1.3.0 resolution: "ts-api-utils@npm:1.3.0" @@ -20686,8 +19064,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "ts-pnp@npm:1.2.0, ts-pnp@npm:^1.1.6": version: 1.2.0 resolution: "ts-pnp@npm:1.2.0" @@ -20717,7 +19093,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "tslib@npm:^2.0.3": version: 2.6.2 resolution: "tslib@npm:2.6.2" @@ -20725,8 +19100,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "tsutils@npm:^3.17.1, tsutils@npm:^3.21.0": version: 3.21.0 resolution: "tsutils@npm:3.21.0" @@ -20738,7 +19111,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "ttf2eot@npm:^2.0.0": version: 2.0.0 resolution: "ttf2eot@npm:2.0.0" @@ -20777,8 +19149,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "tty-browserify@npm:0.0.0": version: 0.0.0 resolution: "tty-browserify@npm:0.0.0" @@ -20786,7 +19156,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "type-check@npm:^0.4.0, type-check@npm:~0.4.0": version: 0.4.0 resolution: "type-check@npm:0.4.0" @@ -20796,8 +19165,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "type-check@npm:~0.3.2": version: 0.3.2 resolution: "type-check@npm:0.3.2" @@ -20807,7 +19174,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "type-detect@npm:4.0.8": version: 4.0.8 resolution: "type-detect@npm:4.0.8" @@ -20829,8 +19195,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "type-fest@npm:^0.3.1": version: 0.3.1 resolution: "type-fest@npm:0.3.1" @@ -20845,7 +19209,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "type-fest@npm:^0.7.1": version: 0.7.1 resolution: "type-fest@npm:0.7.1" @@ -20853,8 +19216,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "type-fest@npm:^0.8.1": version: 0.8.1 resolution: "type-fest@npm:0.8.1" @@ -20872,7 +19233,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "type@npm:^2.7.2": version: 2.7.2 resolution: "type@npm:2.7.2" @@ -20932,8 +19292,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "typedarray-to-buffer@npm:^3.1.5": version: 3.1.5 resolution: "typedarray-to-buffer@npm:3.1.5" @@ -20950,7 +19308,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "typescript@npm:^5.4.3": version: 5.4.3 resolution: "typescript@npm:5.4.3" @@ -20992,8 +19349,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "underscore@npm:1.12.1": version: 1.12.1 resolution: "underscore@npm:1.12.1" @@ -21001,7 +19356,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "undici-types@npm:~5.26.4": version: 5.26.5 resolution: "undici-types@npm:5.26.5" @@ -21016,8 +19370,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "unicode-canonical-property-names-ecmascript@npm:^2.0.0": version: 2.0.0 resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0" @@ -21084,7 +19436,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "unique-filename@npm:^2.0.0": version: 2.0.1 resolution: "unique-filename@npm:2.0.1" @@ -21103,8 +19454,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "unique-slug@npm:^2.0.0": version: 2.0.2 resolution: "unique-slug@npm:2.0.2" @@ -21114,7 +19463,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "unique-slug@npm:^3.0.0": version: 3.0.0 resolution: "unique-slug@npm:3.0.0" @@ -21133,8 +19481,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "unique-string@npm:^1.0.0": version: 1.0.0 resolution: "unique-string@npm:1.0.0" @@ -21151,7 +19497,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "universalify@npm:^0.2.0": version: 0.2.0 resolution: "universalify@npm:0.2.0" @@ -21159,8 +19504,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "universalify@npm:^2.0.0": version: 2.0.1 resolution: "universalify@npm:2.0.1" @@ -21199,7 +19542,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "update-browserslist-db@npm:^1.0.13": version: 1.0.13 resolution: "update-browserslist-db@npm:1.0.13" @@ -21232,11 +19574,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"uri-js@npm:^4.2.2": -======= "uri-js@npm:^4.2.2, uri-js@npm:^4.4.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.4.1 resolution: "uri-js@npm:4.4.1" dependencies: @@ -21245,9 +19583,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"url-loader@npm:^4.1.1": -======= "urix@npm:^0.1.0": version: 0.1.0 resolution: "urix@npm:0.1.0" @@ -21256,7 +19591,6 @@ __metadata: linkType: hard "url-loader@npm:4.1.1, url-loader@npm:^4.1.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 4.1.1 resolution: "url-loader@npm:4.1.1" dependencies: @@ -21273,11 +19607,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"url-parse@npm:^1.5.3": -======= "url-parse@npm:^1.5.10, url-parse@npm:^1.5.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.5.10 resolution: "url-parse@npm:1.5.10" dependencies: @@ -21287,9 +19617,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2": -======= "url@npm:^0.11.0": version: 0.11.3 resolution: "url@npm:0.11.3" @@ -21308,15 +19635,12 @@ __metadata: linkType: hard "util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.0.2 resolution: "util-deprecate@npm:1.0.2" checksum: 10c0/41a5bdd214df2f6c3ecf8622745e4a366c4adced864bc3c833739791aeeeb1838119af7daed4ba36428114b5c67dcda034a79c882e97e43c03e66a4dd7389942 languageName: node linkType: hard -<<<<<<< HEAD -======= "util.promisify@npm:1.0.0": version: 1.0.0 resolution: "util.promisify@npm:1.0.0" @@ -21407,7 +19731,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "v8-to-istanbul@npm:^9.0.1": version: 9.2.0 resolution: "v8-to-istanbul@npm:9.2.0" @@ -21419,8 +19742,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "validate-npm-package-license@npm:^3.0.1": version: 3.0.4 resolution: "validate-npm-package-license@npm:3.0.4" @@ -21431,7 +19752,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "varstream@npm:^0.3.2": version: 0.3.2 resolution: "varstream@npm:0.3.2" @@ -21444,8 +19764,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "vary@npm:~1.1.2": version: 1.1.2 resolution: "vary@npm:1.1.2" @@ -21485,7 +19803,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "w3c-xmlserializer@npm:^4.0.0": version: 4.0.0 resolution: "w3c-xmlserializer@npm:4.0.0" @@ -21495,11 +19812,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"walker@npm:^1.0.8": -======= "walker@npm:^1.0.7, walker@npm:^1.0.8, walker@npm:~1.0.5": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.0.8 resolution: "walker@npm:1.0.8" dependencies: @@ -21517,8 +19830,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "watchpack-chokidar2@npm:^2.0.1": version: 2.0.1 resolution: "watchpack-chokidar2@npm:2.0.1" @@ -21545,7 +19856,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "watchpack@npm:^2.4.1": version: 2.4.1 resolution: "watchpack@npm:2.4.1" @@ -21556,8 +19866,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "wbuf@npm:^1.1.0, wbuf@npm:^1.7.3": version: 1.7.3 resolution: "wbuf@npm:1.7.3" @@ -21588,7 +19896,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "webidl-conversions@npm:^7.0.0": version: 7.0.0 resolution: "webidl-conversions@npm:7.0.0" @@ -21651,8 +19958,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "webpack-dev-middleware@npm:^3.7.2": version: 3.7.3 resolution: "webpack-dev-middleware@npm:3.7.3" @@ -21740,7 +20045,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "webpack-merge@npm:^5.7.3": version: 5.10.0 resolution: "webpack-merge@npm:5.10.0" @@ -21752,11 +20056,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"webpack-sources@npm:^1.4.3": -======= "webpack-sources@npm:^1.1.0, webpack-sources@npm:^1.3.0, webpack-sources@npm:^1.4.0, webpack-sources@npm:^1.4.1, webpack-sources@npm:^1.4.3": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 1.4.3 resolution: "webpack-sources@npm:1.4.3" dependencies: @@ -21773,12 +20073,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"webpack@npm:^5.94.0": - version: 5.94.0 - resolution: "webpack@npm:5.94.0" - dependencies: -======= "webpack@npm:4.44.2": version: 4.44.2 resolution: "webpack@npm:4.44.2" @@ -21822,23 +20116,15 @@ __metadata: resolution: "webpack@npm:5.91.0" dependencies: "@types/eslint-scope": "npm:^3.7.3" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "@types/estree": "npm:^1.0.5" "@webassemblyjs/ast": "npm:^1.12.1" "@webassemblyjs/wasm-edit": "npm:^1.12.1" "@webassemblyjs/wasm-parser": "npm:^1.12.1" acorn: "npm:^8.7.1" -<<<<<<< HEAD - acorn-import-attributes: "npm:^1.9.5" - browserslist: "npm:^4.21.10" - chrome-trace-event: "npm:^1.0.2" - enhanced-resolve: "npm:^5.17.1" -======= acorn-import-assertions: "npm:^1.9.0" browserslist: "npm:^4.21.10" chrome-trace-event: "npm:^1.0.2" enhanced-resolve: "npm:^5.16.0" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 es-module-lexer: "npm:^1.2.1" eslint-scope: "npm:5.1.1" events: "npm:^3.2.0" @@ -21858,9 +20144,6 @@ __metadata: optional: true bin: webpack: bin/webpack.js -<<<<<<< HEAD - checksum: 10c0/b4d1b751f634079bd177a89eef84d80fa5bb8d6fc15d72ab40fc2b9ca5167a79b56585e1a849e9e27e259803ee5c4365cb719e54af70a43c06358ec268ff4ebf -======= checksum: 10c0/74a3e0ea1c9a492accf035317f31769ffeaaab415811524b9f17bc7bf7012c5b6e1a9860df5ca6903f3ae2618727b801eb47d9351a2595dfffb25941d368b88c languageName: node linkType: hard @@ -21889,7 +20172,6 @@ __metadata: dependencies: iconv-lite: "npm:0.4.24" checksum: 10c0/79d9f276234fd06bb27de4c1f9137a0471bfa578efaec0474ab46b6d64bf30bb14492e6f88eff0e6794bdd6fa48b44f4d7a2e9c41424a837a63bba9626e35c62 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 languageName: node linkType: hard @@ -21902,8 +20184,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "whatwg-fetch@npm:^3.4.1": version: 3.6.20 resolution: "whatwg-fetch@npm:3.6.20" @@ -21918,7 +20198,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "whatwg-mimetype@npm:^3.0.0": version: 3.0.0 resolution: "whatwg-mimetype@npm:3.0.0" @@ -21946,8 +20225,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0": version: 8.7.0 resolution: "whatwg-url@npm:8.7.0" @@ -21959,7 +20236,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "which-boxed-primitive@npm:^1.0.2": version: 1.0.2 resolution: "which-boxed-primitive@npm:1.0.2" @@ -22005,8 +20281,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "which-module@npm:^2.0.0": version: 2.0.1 resolution: "which-module@npm:2.0.1" @@ -22014,7 +20288,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.9": version: 1.1.15 resolution: "which-typed-array@npm:1.1.15" @@ -22028,8 +20301,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "which@npm:^1.2.9, which@npm:^1.3.1": version: 1.3.1 resolution: "which@npm:1.3.1" @@ -22041,7 +20312,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "which@npm:^2.0.1, which@npm:^2.0.2": version: 2.0.2 resolution: "which@npm:2.0.2" @@ -22080,8 +20350,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "word-wrap@npm:^1.2.5, word-wrap@npm:~1.2.3": version: 1.2.5 resolution: "word-wrap@npm:1.2.5" @@ -22089,7 +20357,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wordwrap@npm:^1.0.0": version: 1.0.0 resolution: "wordwrap@npm:1.0.0" @@ -22097,8 +20364,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "workbox-background-sync@npm:^5.1.4": version: 5.1.4 resolution: "workbox-background-sync@npm:5.1.4" @@ -22304,7 +20569,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0": version: 7.0.0 resolution: "wrap-ansi@npm:7.0.0" @@ -22316,8 +20580,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "wrap-ansi@npm:^5.1.0": version: 5.1.0 resolution: "wrap-ansi@npm:5.1.0" @@ -22340,7 +20602,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "wrap-ansi@npm:^8.1.0": version: 8.1.0 resolution: "wrap-ansi@npm:8.1.0" @@ -22359,8 +20620,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "write-file-atomic@npm:^3.0.0": version: 3.0.3 resolution: "write-file-atomic@npm:3.0.3" @@ -22373,7 +20632,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "write-file-atomic@npm:^4.0.2": version: 4.0.2 resolution: "write-file-atomic@npm:4.0.2" @@ -22384,9 +20642,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"ws@npm:^7.3.1": -======= "ws@npm:^6.2.1": version: 6.2.2 resolution: "ws@npm:6.2.2" @@ -22397,7 +20652,6 @@ __metadata: linkType: hard "ws@npm:^7.3.1, ws@npm:^7.4.6": ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 version: 7.5.9 resolution: "ws@npm:7.5.9" peerDependencies: @@ -22412,15 +20666,9 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"ws@npm:^8.11.0, ws@npm:^8.13.0, ws@npm:^8.17.1": - version: 8.17.1 - resolution: "ws@npm:8.17.1" -======= "ws@npm:^8.11.0, ws@npm:^8.13.0, ws@npm:^8.16.0": version: 8.16.0 resolution: "ws@npm:8.16.0" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ">=5.0.2" @@ -22429,9 +20677,6 @@ __metadata: optional: true utf-8-validate: optional: true -<<<<<<< HEAD - checksum: 10c0/f4a49064afae4500be772abdc2211c8518f39e1c959640457dcee15d4488628620625c783902a52af2dd02f68558da2868fd06e6fd0e67ebcd09e6881b1b5bfe -======= checksum: 10c0/a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a languageName: node linkType: hard @@ -22440,7 +20685,6 @@ __metadata: version: 3.0.0 resolution: "xml-name-validator@npm:3.0.0" checksum: 10c0/da310f6a7a52f8eb0fce3d04ffa1f97387ca68f47e8620ae3a259909c4e832f7003313b918e53840a6bf57fb38d5ae3c5f79f31f911b2818a7439f7898f8fbf1 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 languageName: node linkType: hard @@ -22458,8 +20702,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "xtend@npm:^4.0.0, xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2" @@ -22474,7 +20716,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "y18n@npm:^5.0.5": version: 5.0.8 resolution: "y18n@npm:5.0.8" @@ -22496,8 +20737,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "yaml@npm:^1.10.0": version: 1.10.2 resolution: "yaml@npm:1.10.2" @@ -22525,7 +20764,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "yargs-parser@npm:^21.1.1": version: 21.1.1 resolution: "yargs-parser@npm:21.1.1" @@ -22533,8 +20771,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -======= "yargs@npm:^13.3.2": version: 13.3.2 resolution: "yargs@npm:13.3.2" @@ -22572,7 +20808,6 @@ __metadata: languageName: node linkType: hard ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "yargs@npm:^17.3.1": version: 17.7.2 resolution: "yargs@npm:17.7.2" diff --git a/tools/UpdatePaths/Scripts/60619_toxins_to_plasma.txt b/tools/UpdatePaths/Scripts/60619_toxins_to_plasma.txt index 209362c8007..bb1b4bb2935 100644 --- a/tools/UpdatePaths/Scripts/60619_toxins_to_plasma.txt +++ b/tools/UpdatePaths/Scripts/60619_toxins_to_plasma.txt @@ -31,11 +31,7 @@ /obj/machinery/atmospherics/miner/toxins : /obj/machinery/atmospherics/miner/plasma /obj/item/storage/backpack/satchel/tox : /obj/item/storage/backpack/satchel/science -<<<<<<< HEAD -/obj/item/computer_hardware/hard_drive/role/signal/toxins : /obj/item/computer_hardware/hard_drive/role/signal/ordnance -======= /obj/item/cartridge/signal/toxins : /obj/item/cartridge/signal/ordnance ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/pda/toxins : /obj/item/pda/science /obj/item/book/manual/wiki/toxins : /obj/item/book/manual/wiki/ordnance /obj/item/storage/backpack/duffelbag/toxins : /obj/item/storage/backpack/duffelbag/science diff --git a/tools/UpdatePaths/Scripts/62789_camera_diag_f2w.txt b/tools/UpdatePaths/Scripts/62789_camera_diag_f2w.txt index e6f27c891a5..f8a9a51e92b 100644 --- a/tools/UpdatePaths/Scripts/62789_camera_diag_f2w.txt +++ b/tools/UpdatePaths/Scripts/62789_camera_diag_f2w.txt @@ -1,12 +1,5 @@ -<<<<<<< HEAD -/obj/machinery/camera/@SUBTYPES {dir=5} : @OLD {@OLD;dir=10} -/obj/machinery/camera/@SUBTYPES {dir=10} : @OLD {@OLD;dir=5} -/obj/machinery/camera/@SUBTYPES {dir=6} : @OLD {@OLD;dir=9} -/obj/machinery/camera/@SUBTYPES {dir=9} : @OLD {@OLD;dir=6} -======= /obj/machinery/camera/@SUBTYPES {dir=5;conversion_done=@UNSET} : @OLD {@OLD;dir=10;conversion_done=1} /obj/machinery/camera/@SUBTYPES {dir=10;conversion_done=@UNSET} : @OLD {@OLD;dir=5;conversion_done=1} /obj/machinery/camera/@SUBTYPES {dir=6;conversion_done=@UNSET} : @OLD {@OLD;dir=9;conversion_done=1} /obj/machinery/camera/@SUBTYPES {dir=9;conversion_done=@UNSET} : @OLD {@OLD;dir=6;conversion_done=1} /obj/machinery/camera/@SUBTYPES {conversion_done=1} : @OLD {@OLD;conversion_done=@SKIP} ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tools/UpdatePaths/Scripts/65236_clothingunderrepath.txt b/tools/UpdatePaths/Scripts/65236_clothingunderrepath.txt index e6966d1a6b6..f1b3da2a199 100644 --- a/tools/UpdatePaths/Scripts/65236_clothingunderrepath.txt +++ b/tools/UpdatePaths/Scripts/65236_clothingunderrepath.txt @@ -145,13 +145,8 @@ /obj/item/clothing/under/rank/chief_medical_officer : /obj/item/clothing/under/rank/medical/chief_medical_officer /obj/item/clothing/under/rank/chief_medical_officer/skirt : /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt /obj/item/clothing/under/rank/medical/doctor/blue : /obj/item/clothing/under/rank/medical/scrubs/blue -<<<<<<< HEAD /obj/item/clothing/under/rank/medical/doctor/green : /obj/item/clothing/under/rank/medical/scrubs/green /obj/item/clothing/under/rank/medical/doctor/purple : /obj/item/clothing/under/rank/medical/scrubs/purple -======= -/obj/item/clothing/under/rank/medical/doctor/blue : /obj/item/clothing/under/rank/medical/scrubs/green -/obj/item/clothing/under/rank/medical/doctor/blue : /obj/item/clothing/under/rank/medical/scrubs/purple ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 /obj/item/clothing/under/rank/geneticist : /obj/item/clothing/under/rank/rnd/geneticist /obj/item/clothing/under/rank/geneticist/skirt : /obj/item/clothing/under/rank/rnd/geneticist/skirt /obj/item/clothing/under/rank/virologist : /obj/item/clothing/under/rank/medical/virologist diff --git a/tools/UpdatePaths/Scripts/69081_drinks_refactor.txt b/tools/UpdatePaths/Scripts/69081_drinks_refactor.txt index a6b4f2e5b0e..600561732bd 100644 --- a/tools/UpdatePaths/Scripts/69081_drinks_refactor.txt +++ b/tools/UpdatePaths/Scripts/69081_drinks_refactor.txt @@ -22,8 +22,4 @@ /obj/item/reagent_containers/cup/glass/bottle/cream : /obj/item/reagent_containers/cup/glass/bottle/juice/cream {@OLD} /obj/item/reagent_containers/cup/glass/bottle/limejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice {@OLD} /obj/item/reagent_containers/cup/glass/bottle/pineapplejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice {@OLD} -<<<<<<< HEAD /obj/item/reagent_containers/cup/glass/bottle/menthol : /obj/item/reagent_containers/cup/glass/bottle/juice/menthol {@OLD} -======= -/obj/item/reagent_containers/cup/glass/bottle/menthol : /obj/item/reagent_containers/cup/glass/bottle/juice/menthol {@OLD} ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php index ac160d67027..87aec4adb75 100644 --- a/tools/WebhookProcessor/github_webhook_processor.php +++ b/tools/WebhookProcessor/github_webhook_processor.php @@ -44,16 +44,11 @@ $discordWebHooks = array(); // Only these repositories will announce in game. // Any repository that players actually care about. $game_announce_whitelist = array( -<<<<<<< HEAD /* SKYRAT EDIT - We want it to announce to us - ORIGINAL: "tgstation", "TerraGov-Marine-Corps", // ORIGINAL END - SKYRAT EDIT: */ "Skyrat-tg", -======= - "tgstation", - "TerraGov-Marine-Corps", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ); // Any repository that matches in this blacklist will not appear on Discord. diff --git a/tools/autowiki/package-lock.json b/tools/autowiki/package-lock.json index 392d3296e9c..5bd3fcbe51a 100644 --- a/tools/autowiki/package-lock.json +++ b/tools/autowiki/package-lock.json @@ -8,11 +8,7 @@ "name": "autowiki", "version": "1.0.0", "dependencies": { -<<<<<<< HEAD - "mwbot": "^2.1.3" -======= "mwbot": "^2.0.0" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } }, "node_modules/ajv": { @@ -354,24 +350,14 @@ } }, "node_modules/mwbot": { -<<<<<<< HEAD - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/mwbot/-/mwbot-2.1.3.tgz", - "integrity": "sha512-ULQWIfRWfh0WJKmqcapshk/5VNU1KEfrI7+hLeO3WoyuTGBVlhr3eE9TEyc4Q46vmztR6YHlaA6TmDGQr7/akg==", -======= "version": "2.0.0", "resolved": "https://registry.npmjs.org/mwbot/-/mwbot-2.0.0.tgz", "integrity": "sha512-9iTx8oFMntC60yyaPJjN4GEgiQlal7i03jATu7kq5b9BGW5aNz7YbrpjaciLNr0Z33PTdQe0hRTJ0JdUJi2WQg==", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dependencies": { "bluebird": "^3.7.2", "request": "^2.88.2", "semlog": "^0.6.10", -<<<<<<< HEAD - "semver": "^7.3.8" -======= "semver": "7.3.4" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }, "engines": { "node": ">=10.0.0" @@ -488,15 +474,9 @@ } }, "node_modules/semver": { -<<<<<<< HEAD - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", -======= "version": "7.3.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "dependencies": { "lru-cache": "^6.0.0" }, @@ -882,30 +862,21 @@ "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" }, "mwbot": { -<<<<<<< HEAD - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/mwbot/-/mwbot-2.1.3.tgz", - "integrity": "sha512-ULQWIfRWfh0WJKmqcapshk/5VNU1KEfrI7+hLeO3WoyuTGBVlhr3eE9TEyc4Q46vmztR6YHlaA6TmDGQr7/akg==", -======= "version": "2.0.0", "resolved": "https://registry.npmjs.org/mwbot/-/mwbot-2.0.0.tgz", "integrity": "sha512-9iTx8oFMntC60yyaPJjN4GEgiQlal7i03jATu7kq5b9BGW5aNz7YbrpjaciLNr0Z33PTdQe0hRTJ0JdUJi2WQg==", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "requires": { "bluebird": "^3.7.2", "request": "^2.88.2", "semlog": "^0.6.10", -<<<<<<< HEAD - "semver": "^7.3.8" -======= "semver": "7.3.4" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + }, "performance-now": { "version": "2.1.0", @@ -983,15 +954,9 @@ } }, "semver": { -<<<<<<< HEAD - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", -======= "version": "7.3.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 "requires": { "lru-cache": "^6.0.0" } diff --git a/tools/autowiki/package.json b/tools/autowiki/package.json index 05e31e74b03..39ac2bc7d5d 100644 --- a/tools/autowiki/package.json +++ b/tools/autowiki/package.json @@ -5,10 +5,6 @@ "main": "autowiki.js", "author": "Mothblocks", "dependencies": { -<<<<<<< HEAD - "mwbot": "^2.1.3" -======= "mwbot": "^2.0.0" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } } diff --git a/tools/bootstrap/node_.ps1 b/tools/bootstrap/node_.ps1 index 4f540c99185..8e3c96517f9 100644 --- a/tools/bootstrap/node_.ps1 +++ b/tools/bootstrap/node_.ps1 @@ -35,13 +35,8 @@ if ($Env:TG_BOOTSTRAP_CACHE) { [int]$OSMajor = (Get-WmiObject -Class Win32_OperatingSystem).Version.Split(".")[0] # Set Node version based on OS version -<<<<<<< HEAD -if ($OSVersion -gt 6.1) { - # Windows 7 is version 6.1 -======= if ($OSMajor -lt 10) { # Anything under Windows 10 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 $NodeVersion = Extract-Variable -Path "$BaseDir\..\..\dependencies.sh" -Key "NODE_VERSION_COMPAT" } else { diff --git a/tools/build/build.js b/tools/build/build.js index dc670dec626..5074858bd42 100644 --- a/tools/build/build.js +++ b/tools/build/build.js @@ -79,14 +79,11 @@ export const ForceRecutParameter = new Juke.Parameter({ name: "force-recut", }); -<<<<<<< HEAD -======= export const SkipIconCutter = new Juke.Parameter({ type: 'boolean', name: "skip-icon-cutter", }); ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 export const WarningParameter = new Juke.Parameter({ type: 'string[]', alias: 'W', @@ -94,11 +91,7 @@ export const WarningParameter = new Juke.Parameter({ export const NoWarningParameter = new Juke.Parameter({ type: 'string[]', -<<<<<<< HEAD - alias: 'NW', -======= alias: 'I', ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 }); export const CutterTarget = new Juke.Target({ @@ -216,17 +209,10 @@ export const DmMapsIncludeTarget = new Juke.Target({ }); export const DmTarget = new Juke.Target({ -<<<<<<< HEAD - parameters: [DefineParameter, DmVersionParameter, WarningParameter, NoWarningParameter], - dependsOn: ({ get }) => [ - get(DefineParameter).includes('ALL_MAPS') && DmMapsIncludeTarget, - IconCutterTarget, -======= parameters: [DefineParameter, DmVersionParameter, WarningParameter, NoWarningParameter, SkipIconCutter], dependsOn: ({ get }) => [ get(DefineParameter).includes('ALL_MAPS') && DmMapsIncludeTarget, !get(SkipIconCutter) && IconCutterTarget, ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ], inputs: [ '_maps/map_files/generic/**', @@ -235,11 +221,8 @@ export const DmTarget = new Juke.Target({ 'html/**', 'icons/**', 'interface/**', -<<<<<<< HEAD 'modular_skyrat/**', ///SKYRAT EDIT ADDITION - Making the CBT work -======= 'sound/**', ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 `${DME_NAME}.dme`, NamedVersionFile, ], diff --git a/tools/build/lib/byond.js b/tools/build/lib/byond.js index cdfbaa7736e..1f708640778 100644 --- a/tools/build/lib/byond.js +++ b/tools/build/lib/byond.js @@ -166,15 +166,6 @@ export const DreamMaker = async (dmeFile, options = {}) => { await testDmVersion(dmPath); testOutputFile(`${dmeBaseName}.dmb`); testOutputFile(`${dmeBaseName}.rsc`); -<<<<<<< HEAD - const runWithWarningChecks = async (dmPath, args) => { - const execReturn = await Juke.exec(dmPath, args); - const ignoredWarningCodes = options.ignoreWarningCodes ?? []; - const reg = ignoredWarningCodes.length > 0 ? new RegExp(`\d+:warning: (?!(${ignoredWarningCodes.join('|')}))`) : /\d+:warning: /; - if (options.warningsAsErrors && execReturn.combined.match(reg)) { - Juke.logger.error(`Compile warnings treated as errors`); - throw new Juke.ExitCode(2); -======= const runWithWarningChecks = async (dmPath, args) => { const execReturn = await Juke.exec(dmPath, args); @@ -190,7 +181,6 @@ export const DreamMaker = async (dmeFile, options = {}) => { Juke.logger.error(`Compile warnings treated as errors`); throw new Juke.ExitCode(2); } ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 } return execReturn; } @@ -198,13 +188,7 @@ export const DreamMaker = async (dmeFile, options = {}) => { const { defines } = options; if (defines && defines.length > 0) { Juke.logger.info('Using defines:', defines.join(', ')); -<<<<<<< HEAD - } -======= - } - ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 await runWithWarningChecks(dmPath, [...defines.map(def => `-D${def}`), dmeFile]); }; diff --git a/tools/ci/install_node.sh b/tools/ci/install_node.sh index 6bde1273a65..906984ed3fa 100644 --- a/tools/ci/install_node.sh +++ b/tools/ci/install_node.sh @@ -5,11 +5,6 @@ source dependencies.sh if [[ -e ~/.nvm/nvm.sh ]]; then source ~/.nvm/nvm.sh -<<<<<<< HEAD - nvm install $NODE_VERSION - nvm use $NODE_VERSION -======= nvm install $NODE_VERSION_COMPAT nvm use $NODE_VERSION_COMPAT ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 fi diff --git a/tools/ezdb/ezdb/paths.py b/tools/ezdb/ezdb/paths.py index 5079cc0501f..945adbc05b9 100644 --- a/tools/ezdb/ezdb/paths.py +++ b/tools/ezdb/ezdb/paths.py @@ -30,11 +30,8 @@ def get_mariadb_install_db_path(): def get_initial_schema_path(): return get_root_path() / 'SQL' / 'tgstation_schema.sql' -<<<<<<< HEAD def get_modular_schema_path(): return get_root_path() / 'SQL' / 'skyrat_schema.sql' -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 def get_changelog_path(): return get_root_path() / 'SQL' / 'database_changelog.md' diff --git a/tools/ezdb/steps/install_initial_schema.py b/tools/ezdb/steps/install_initial_schema.py index 320a83e956d..e835b3c785d 100644 --- a/tools/ezdb/steps/install_initial_schema.py +++ b/tools/ezdb/steps/install_initial_schema.py @@ -2,11 +2,7 @@ from contextlib import closing from ..ezdb.changes import get_current_version from ..ezdb.config import read_config from ..ezdb.mysql import execute_sql, insert_new_schema_query, open_connection, start_daemon -<<<<<<< HEAD from ..ezdb.paths import get_initial_schema_path, get_modular_schema_path -======= -from ..ezdb.paths import get_initial_schema_path ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 from .step import Step class InstallInitialSchema(Step): @@ -55,10 +51,7 @@ class InstallInitialSchema(Step): with open(get_initial_schema_path(), 'r') as file: schema = file.read() execute_sql(schema + ";" + insert_new_schema_query(major_version, minor_version)) -<<<<<<< HEAD with open(get_modular_schema_path(), 'r') as file: schema = file.read() execute_sql(schema) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 diff --git a/tools/midi2piano/midi2piano.py b/tools/midi2piano/midi2piano.py index 07f9868ec48..8b38947f8da 100644 --- a/tools/midi2piano/midi2piano.py +++ b/tools/midi2piano/midi2piano.py @@ -172,9 +172,9 @@ def sort_score_by_event_times(score): key=lambda indx: score[indx][0]) )) -def convert_into_seconds_per_ticks(score): +def convert_into_delta_times(score): """ - Transform start_time into seconds_per_tick and returns new score + Transform start_time into delta_time and returns new score """ return list(map( lambda super_event: ( @@ -292,28 +292,6 @@ def main_cycle(): """ Activate the script """ -<<<<<<< HEAD -<<<<<<< HEAD - while True: - midi_file = obtain_midi_file() - if not midi_file: - return # Cancel - score = midi2score_without_ticks(midi_file) - score = filter_events_from_score(score) - score = filter_start_time_and_note_num(score) - score = filter_empty_tracks(score) - score = merge_events(score) - score = sort_score_by_event_times(score) - score = convert_into_seconds_per_ticks(score) - score = perform_roundation(score) - most_frequent_dur = obtain_common_duration(score) - score = reduce_score_to_chords(score) - sheet_music = obtain_sheet_music(score, most_frequent_dur) - split_music = explode_sheet_music(sheet_music) - sheet_music = finalize_sheet_music(split_music, most_frequent_dur) -======= -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 midi_file = obtain_midi_file() if not midi_file: return # Cancel @@ -330,10 +308,6 @@ def main_cycle(): sheet_music = obtain_sheet_music(score, most_frequent_dur) split_music = explode_sheet_music(sheet_music) sheet_music = finalize_sheet_music(split_music, most_frequent_dur) -<<<<<<< HEAD ->>>>>>> 5146c7fc83d (Fixes Midi2Piano Tool (#85967)) -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 pclip.copy(sheet_music) messagebox.showinfo("Midi2Piano Information", "Your sheet music has been copied to your clipboard.") diff --git a/tools/requirements.txt b/tools/requirements.txt index 55a92869a71..b271fe9f547 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,12 +1,6 @@ -<<<<<<< HEAD -pygit2==1.11.1 -bidict==0.22.0 -Pillow==10.3.0 -======= pygit2==1.7.2 bidict==0.22.0 Pillow==9.3.0 ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 # changelogs PyYaml==6.0.1 diff --git a/tools/tgs_scripts/InstallDeps.sh b/tools/tgs_scripts/InstallDeps.sh index 122afe951ff..246578c024c 100755 --- a/tools/tgs_scripts/InstallDeps.sh +++ b/tools/tgs_scripts/InstallDeps.sh @@ -25,14 +25,6 @@ if ! ( [ -x "$has_git" ] && [ -x "$has_curl" ] && [ -x "$has_pip3" ] && [ -f "/u if ! [ -x "$has_sudo" ]; then dpkg --add-architecture i386 apt-get update -<<<<<<< HEAD - apt-get install -y lib32z1 git pkg-config libssl-dev:i386 libssl-dev zlib1g-dev:i386 curl - else - sudo dpkg --add-architecture i386 - sudo apt-get update - sudo apt-get install -y lib32z1 git pkg-config libssl-dev:i386 libssl-dev zlib1g-dev:i386 curl -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 apt-get install -y lib32z1 git pkg-config libssl-dev:i386 libssl-dev zlib1g-dev:i386 curl libclang-dev g++-multilib python3 python3-pip else sudo dpkg --add-architecture i386 diff --git a/tools/ticked_file_enforcement/schemas/tgstation_dme.json b/tools/ticked_file_enforcement/schemas/tgstation_dme.json index c47347fa23b..d55457e8b4a 100644 --- a/tools/ticked_file_enforcement/schemas/tgstation_dme.json +++ b/tools/ticked_file_enforcement/schemas/tgstation_dme.json @@ -5,11 +5,7 @@ "excluded_files": [], "forbidden_includes": [ "code/modules/tgs/**/*.dm", -<<<<<<< HEAD "code/modules/unit_tests/[!_]*.dm", "code/modules/unit_tests/~skyrat/[!_]*.dm" -======= - "code/modules/unit_tests/[!_]*.dm" ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 ] } diff --git a/tools/ticked_file_enforcement/ticked_file_enforcement.py b/tools/ticked_file_enforcement/ticked_file_enforcement.py index c39059fe0f5..758dfb491b0 100644 --- a/tools/ticked_file_enforcement/ticked_file_enforcement.py +++ b/tools/ticked_file_enforcement/ticked_file_enforcement.py @@ -55,15 +55,12 @@ with open(file_reference, 'r') as file: break elif not reading: continue -<<<<<<< HEAD # SKYRAT EDIT START - Modular unit tests elif line == "// SKYRAT EDIT START": continue elif line == "// SKYRAT EDIT END": continue # SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 lines.append(line) @@ -87,13 +84,10 @@ for code_file in scannable_files: dm_path = code_file.replace('/', '\\') else: dm_path = os.path.basename(code_file) -<<<<<<< HEAD # SKYRAT EDIT START - Modular unit tests - have to append this again after it gets removed; this was not designed upstream with subfolders for unit tests in mind so we must cope. if("~skyrat/" in code_file): dm_path = "~skyrat\\" + dm_path # SKYRAT EDIT END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 included = f"#include \"{dm_path}\"" in lines diff --git a/tools/trait_validity/check.py b/tools/trait_validity/check.py index cb626499f16..1f83559d4e9 100644 --- a/tools/trait_validity/check.py +++ b/tools/trait_validity/check.py @@ -14,10 +14,7 @@ def red(text): on_github = os.getenv("GITHUB_ACTIONS") == "true" defines_file = "code/__DEFINES/traits/declarations.dm" -<<<<<<< HEAD skyrat_defines_file = "code/__DEFINES/~skyrat_defines/traits/declarations.dm" # SKYRAT EDIT ADDITION -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 globalvars_file = "code/_globalvars/traits/_traits.dm" how_to_fix_message = f"Please ensure that all traits in the {defines_file} file are added in the {globalvars_file} file." @@ -34,15 +31,12 @@ if not os.path.isfile(defines_file): print(red(f"Could not find the defines file '{defines_file}'!")) sys.exit(1) -<<<<<<< HEAD # SKYRAT EDIT ADDITION START if not os.path.isfile(skyrat_defines_file): print(red(f"Could not find the skyrat defines file '{skyrat_defines_file}'!")) sys.exit(1) # SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if not os.path.isfile(globalvars_file): print(red(f"Could not find the globalvars file '{globalvars_file}'!")) sys.exit(1) @@ -75,7 +69,6 @@ for potential_define in scannable_lines: number_of_defines += 1 defines_to_search_for.append(match.group(2)) -<<<<<<< HEAD # SKYRAT EDIT ADDITION START scannable_lines = [] with open(skyrat_defines_file, 'r') as file: @@ -103,8 +96,6 @@ for potential_define in scannable_lines: defines_to_search_for.append(match.group(2)) # SKYRAT EDIT ADDITION END -======= ->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3 if number_of_defines == 0: print(red("No defines found! This is likely an error.")) sys.exit(1)