diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 545ec24266db..cdd04e32c364 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -163,6 +163,22 @@ eg: `/datum/thing`, not `datum/thing` In DM, this is optional, but omitting it makes finding definitions harder. To be specific, you can declare the path `/arbitrary`, but it will still be, in actuality, `/datum/arbitrary`. Write your code to reflect this. +### Do not use list operators in strings + +The use of list operators to augment strings is not allowed. This is roughly 10 times slower than using a list with a Join() Function. + +```dm +//Bad +var/text = "text" +text += "More text" +to_chat(world, text) + +//Good +var/list/text = list("text") +text += "More text" +to_chat(world, text.Join("")) +``` + ### Do not use text/string based type paths It is rarely allowed to put type paths in a text format, as there are no compile errors if the type path no longer exists. Here is an example: diff --git a/.github/workflows/auto_translate.yml b/.github/workflows/auto_translate.yml index d247f222853d..1c892a2f4b02 100644 --- a/.github/workflows/auto_translate.yml +++ b/.github/workflows/auto_translate.yml @@ -53,6 +53,7 @@ jobs: - name: 'Push Translation' run: | + git fetch origin translate git checkout origin/translate git config --local user.email "action@github.com" git config --local user.name "ss220bot" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8f6b2e869bc..b2872dc2bffa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,10 +108,6 @@ jobs: sudo apt update || true sudo apt install libssl1.1:i386 ldd librust_g.so - - name: Start Redis - uses: supercharge/redis-github-action@1.7.0 - with: - redis-version: 6 - name: Compile & Run Unit Tests run: | tools/ci/install_byond.sh '${{ matrix.byondtype }}' diff --git a/README.md b/README.md index 196fb7376a2d..8e91c5e0afc9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -# Paradise +# Paradise WyccStation SS220 + [![CI](https://github.com/ParadiseSS13/Paradise/workflows/CI/badge.svg)](https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3ACI) [![Render Nanomaps](https://github.com/ParadiseSS13/Paradise/workflows/Render%20Nanomaps/badge.svg)](https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3A%22Render+Nanomaps%22) [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/paradisess13/paradise.svg)](http://isitmaintained.com/project/paradisess13/paradise "Average time to resolve an issue") @@ -8,13 +9,13 @@ [![forthebadge](http://forthebadge.com/images/badges/contains-technical-debt.svg)](http://forthebadge.com) [![forthebadge](http://forthebadge.com/images/badges/fuck-it-ship-it.svg)](http://forthebadge.com) -# Useful Links +# Полезные ссылки -- [Discord](https://discordapp.com/invite/YJDsXFE) -- [Documentation](https://codedocs.paradisestation.org) -- [Website](https://www.paradisestation.org/) +- [Discord](https://discord.com/invite/ss220) +- [Wiki](https://wiki.ss220.club/) +- [Documentation](https://ss220club.github.io/Paradise-SS220/) -# Useful Documents +# Полезные материалы - [Autodocumentation Guide](.github/AUTODOC_GUIDE.md) - [Code of Conduct](./CODE_OF_CONDUCT.md) @@ -23,7 +24,6 @@ --- - ### LICENSE Paradise is licensed under the GNU Affero General Public License version 3. @@ -44,8 +44,8 @@ Any files located in the `Paradise/sound/goonstation` directories, or any subdirectories of mentioned directories are licensed under the Creative Commons 3.0 BY-NC-SA license -(https://creativecommons.org/licenses/by-nc-sa/3.0) +() All other assets including icons and sound files are licensed under the -Creative Commons 3.0 BY-SA license (https://creativecommons.org/licenses/by-sa/3.0/), +Creative Commons 3.0 BY-SA license (), unless otherwise indicated. diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql index d00d5e14da36..6855c02dabe0 100644 --- a/SQL/paradise_schema.sql +++ b/SQL/paradise_schema.sql @@ -297,6 +297,7 @@ CREATE TABLE `player` ( `server_region` VARCHAR(32) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci', `muted_adminsounds_ckeys` MEDIUMTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci', `viewrange` VARCHAR(5) NOT NULL DEFAULT '19x15' COLLATE 'utf8mb4_general_ci', + `species_whitelist` LONGTEXT COLLATE utf8mb4_unicode_ci NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `ckey` (`ckey`), KEY `lastseen` (`lastseen`), diff --git a/SQL/updates220/53.220.5-53.220.6.sql b/SQL/updates220/53.220.5-53.220.6.sql new file mode 100644 index 000000000000..d39755af7e84 --- /dev/null +++ b/SQL/updates220/53.220.5-53.220.6.sql @@ -0,0 +1,4 @@ +# Updating DB from 53.220.5 to 53.220.6 +# Adds species whitelist ~legendaxe + +ALTER TABLE `player` ADD `species_whitelist` LONGTEXT COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '["human"]'; diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index aaf4019e4b77..30469b847cec 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -55190,13 +55190,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /obj/machinery/door/airlock/engineering/glass{ heat_proof = 1; name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "gvN" = ( @@ -74829,13 +74828,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/xenobio_south) "peF" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /obj/machinery/door/airlock/engineering/glass{ heat_proof = 1; name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "pfh" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm index 7443d3fa731e..09f32f0d372b 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm @@ -5151,7 +5151,7 @@ /obj/effect/decal/cleanable/cobweb2, /obj/effect/turf_decal/delivery/hollow, /obj/structure/rack, -/obj/item/assembly/signaler/anomaly/random, +/obj/item/paper/researchnotes, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -8441,13 +8441,13 @@ /area/ruin/space/unpowered) "Fm" = ( /obj/structure/safe, -/obj/item/paper/researchnotes, -/obj/item/clothing/glasses/hud/security/sunglasses/fluff/eyepro, /obj/machinery/light/small{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/hollow, +/obj/item/assembly/signaler/anomaly/random, +/obj/item/storage/lockbox/experimental_weapon, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index 7f3673136216..b1d1eacd3ca9 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -1075,6 +1075,7 @@ /area/ruin/space/derelict/crew_quarters) "cK" = ( /obj/structure/table, +/obj/item/soap/deluxe/laundry, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "blue" @@ -1191,6 +1192,7 @@ "cZ" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, +/obj/item/soap/deluxe/laundry, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "blue" diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 81202a08678b..706c03d5c47e 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -7527,7 +7527,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/any/supply/mining, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, /turf/simulated/floor/plasteel{ icon_state = "darkgreencorners" }, @@ -8026,11 +8026,11 @@ name = "Shuttle Dock" }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/supply/mining, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredfull" diff --git a/_maps/map_files220/MetaStation/MetaStation.dmm b/_maps/map_files220/MetaStation/MetaStation.dmm index 04631367e38b..98ce759904a0 100644 --- a/_maps/map_files220/MetaStation/MetaStation.dmm +++ b/_maps/map_files220/MetaStation/MetaStation.dmm @@ -731,7 +731,7 @@ "aih" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "aii" = ( @@ -754,7 +754,7 @@ pixel_y = 3 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "aij" = ( @@ -764,24 +764,24 @@ "ail" = ( /obj/structure/closet/athletic_mixed, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "aim" = ( /obj/structure/closet/boxinggloves, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "ain" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "aio" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "air" = ( @@ -876,7 +876,7 @@ icon_state = "plant-20" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "ajc" = ( @@ -2984,21 +2984,21 @@ /obj/structure/closet/lasertag/red, /obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "atO" = ( /obj/machinery/newscaster/directional/south, /obj/structure/closet/lasertag/blue, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "atP" = ( /obj/structure/sign/poster/official/random/south, /obj/structure/closet/masks, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "atQ" = ( @@ -3074,7 +3074,7 @@ /obj/machinery/light/directional/south, /obj/machinery/economy/vending/cola, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "atX" = ( @@ -3222,7 +3222,7 @@ /obj/effect/landmark/spawner/rev, /obj/structure/morgue, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "auz" = ( @@ -3261,7 +3261,7 @@ /obj/machinery/economy/vending/coffee, /obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "auO" = ( @@ -3283,7 +3283,7 @@ pixel_x = -6 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "auV" = ( @@ -3480,7 +3480,7 @@ pixel_y = -30 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/fitness) "avK" = ( @@ -3518,7 +3518,7 @@ pixel_x = -29 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/aisat/interior) "avQ" = ( @@ -3910,7 +3910,7 @@ /obj/item/clothing/under/misc/assistantformal, /obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "axb" = ( @@ -4072,7 +4072,7 @@ }, /obj/machinery/atmospherics/portable/canister/sleeping_agent, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/security/execution) "axB" = ( @@ -5179,7 +5179,7 @@ /obj/item/clothing/head/bearpelt, /obj/effect/turf_decal/delivery/white/hollow/right, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/vault) "aCy" = ( @@ -5209,7 +5209,7 @@ }, /obj/effect/turf_decal/delivery/white/hollow/left, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/vault) "aCD" = ( @@ -5458,7 +5458,7 @@ }, /obj/effect/turf_decal/delivery/white/hollow/right, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/vault) "aDF" = ( @@ -5484,7 +5484,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/vault) "aDH" = ( @@ -5502,7 +5502,7 @@ }, /obj/effect/turf_decal/delivery/white/hollow/left, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/vault) "aDK" = ( @@ -5745,7 +5745,7 @@ /obj/machinery/economy/vending/shoedispenser, /obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "aEE" = ( @@ -5839,7 +5839,7 @@ /obj/effect/turf_decal/delivery/white/hollow/right, /obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/vault) "aEZ" = ( @@ -5874,7 +5874,7 @@ }, /obj/effect/turf_decal/delivery/white/hollow/left, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/vault) "aFd" = ( @@ -6076,7 +6076,7 @@ network = list("SS13","vault") }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/vault) "aGo" = ( @@ -6255,7 +6255,7 @@ }, /obj/machinery/suit_storage_unit/ce, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "aGY" = ( @@ -6390,7 +6390,7 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/vault, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/vault) "aHD" = ( @@ -6562,7 +6562,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "aIn" = ( @@ -6762,7 +6762,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/telecomms/computer) "aIS" = ( @@ -6818,7 +6818,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/supply/lobby) "aJa" = ( @@ -7248,7 +7248,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/supply/lobby) "aKi" = ( @@ -9160,7 +9160,7 @@ /obj/structure/closet/secure_closet/personal, /obj/item/clothing/under/misc/assistantformal, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "aQA" = ( @@ -9173,7 +9173,7 @@ }, /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "aQB" = ( @@ -9185,7 +9185,7 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "aQC" = ( @@ -9215,7 +9215,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "aQJ" = ( @@ -9414,7 +9414,7 @@ "aRn" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "aRo" = ( @@ -10519,7 +10519,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/smes) "aUP" = ( @@ -10678,7 +10678,7 @@ /obj/machinery/economy/vending/autodrobe, /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "aVo" = ( @@ -10693,7 +10693,7 @@ "aVp" = ( /obj/machinery/economy/vending/clothing, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "aVq" = ( @@ -10715,7 +10715,7 @@ }, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "aVs" = ( @@ -11204,7 +11204,7 @@ /obj/machinery/power/apc/super/west, /obj/machinery/computer/security/engineering, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/smes) "aWO" = ( @@ -11265,7 +11265,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/smes) "aWY" = ( @@ -11503,7 +11503,7 @@ pixel_x = 29 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/aisat/interior) "aXL" = ( @@ -11874,7 +11874,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/smes) "aYV" = ( @@ -11887,7 +11887,7 @@ pixel_y = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/smes) "aYW" = ( @@ -12109,7 +12109,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/ai_upload/foyer) "aZP" = ( @@ -12257,13 +12257,13 @@ /area/station/hallway/secondary/bridge) "bad" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "baf" = ( /obj/structure/closet/wardrobe/grey, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "bag" = ( @@ -12581,7 +12581,7 @@ "bbg" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/central) "bbh" = ( @@ -12592,7 +12592,7 @@ }, /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/central) "bbj" = ( @@ -12625,7 +12625,7 @@ /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/ai_upload/foyer) "bbm" = ( @@ -12722,7 +12722,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "bby" = ( @@ -12753,7 +12753,7 @@ "bbB" = ( /obj/machinery/economy/vending/snack, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/central) "bbC" = ( @@ -12778,7 +12778,7 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/central) "bbE" = ( @@ -12800,7 +12800,7 @@ /obj/machinery/ai_status_display/north, /obj/machinery/computer/station_alert, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bbM" = ( @@ -12956,7 +12956,7 @@ pixel_y = 26 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/ai_upload/foyer) "bcm" = ( @@ -12994,7 +12994,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/ai_upload/foyer) "bcq" = ( @@ -13442,7 +13442,7 @@ /area/station/engineering/tech_storage) "bdy" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bdA" = ( @@ -13454,7 +13454,7 @@ c_tag = "Chief Engineer's Office" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bdB" = ( @@ -13500,7 +13500,7 @@ /obj/machinery/status_display/directional/north, /obj/machinery/computer/card/minor/ce, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bdF" = ( @@ -13977,7 +13977,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "beF" = ( @@ -14007,7 +14007,7 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "beH" = ( @@ -14037,7 +14037,7 @@ }, /obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "beJ" = ( @@ -14073,7 +14073,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "beP" = ( @@ -14167,7 +14167,7 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bff" = ( @@ -14571,13 +14571,13 @@ /obj/item/radio/intercom/directional/east, /obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "bgo" = ( /obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "bgp" = ( @@ -14653,7 +14653,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "bgt" = ( @@ -14678,7 +14678,7 @@ req_access_txt = "11" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bgv" = ( @@ -14938,7 +14938,7 @@ pixel_y = 12 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bhh" = ( @@ -15120,7 +15120,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "bhK" = ( @@ -15144,7 +15144,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "bhM" = ( @@ -15158,7 +15158,7 @@ icon_state = "1-8" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "bhQ" = ( @@ -15234,7 +15234,7 @@ }, /obj/machinery/power/apc/directional/west, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "bib" = ( @@ -15802,7 +15802,7 @@ "bjw" = ( /obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "bjx" = ( @@ -15858,7 +15858,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "bjC" = ( @@ -15901,7 +15901,7 @@ pixel_x = 30 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bjH" = ( @@ -15909,7 +15909,7 @@ /mob/living/simple_animal/parrot/Poly, /obj/machinery/keycard_auth/south, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bjI" = ( @@ -15917,7 +15917,7 @@ /obj/item/megaphone, /obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bjK" = ( @@ -16437,7 +16437,7 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/starboard) "blm" = ( @@ -16448,7 +16448,7 @@ }, /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/starboard) "bln" = ( @@ -16473,7 +16473,7 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "blr" = ( @@ -16561,13 +16561,13 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/aisat) "blF" = ( /obj/machinery/ai_slipper, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/ai) "blI" = ( @@ -16856,7 +16856,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bmn" = ( @@ -16977,7 +16977,7 @@ dir = 9 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bmF" = ( @@ -17048,7 +17048,7 @@ "bmT" = ( /obj/machinery/porta_turret/ai_turret, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/ai) "bmU" = ( @@ -17078,7 +17078,7 @@ "bmX" = ( /obj/machinery/economy/vending/artvend, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "bmZ" = ( @@ -17233,7 +17233,7 @@ /obj/item/stack/spacecash/c1000, /obj/effect/turf_decal/delivery/white/hollow/left, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/vault) "bnw" = ( @@ -17313,7 +17313,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/aisat) "bnM" = ( @@ -17323,7 +17323,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bnN" = ( @@ -17441,7 +17441,7 @@ req_access_txt = "56" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "boc" = ( @@ -17541,7 +17541,7 @@ pixel_y = -30 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "bop" = ( @@ -17653,7 +17653,7 @@ pixel_y = 21 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/ai) "boI" = ( @@ -19190,7 +19190,7 @@ "bsX" = ( /obj/machinery/teleport/hub, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/aisat/interior) "bsY" = ( @@ -19278,7 +19278,7 @@ "btr" = ( /obj/machinery/economy/vending/coffee, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/port) "bts" = ( @@ -19996,7 +19996,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/aisat/service) "bvp" = ( @@ -20156,7 +20156,7 @@ /obj/machinery/economy/vending/cola, /obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/port) "bvF" = ( @@ -20582,7 +20582,7 @@ /obj/machinery/status_display/directional/north, /obj/machinery/teleport/station, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/aisat/interior) "bws" = ( @@ -20860,7 +20860,7 @@ pixel_y = 2 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "bxr" = ( @@ -21082,7 +21082,7 @@ "bxP" = ( /obj/machinery/economy/vending/snack, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/port) "bxQ" = ( @@ -21478,7 +21478,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "byZ" = ( @@ -21683,7 +21683,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/port) "bzE" = ( @@ -21714,13 +21714,13 @@ "bzG" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/port) "bzH" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/port) "bzJ" = ( @@ -21894,7 +21894,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/bridge) "bAi" = ( @@ -21916,7 +21916,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "bAl" = ( @@ -22030,7 +22030,7 @@ }, /obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/smes) "bAQ" = ( @@ -22782,7 +22782,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/aisat/service) "bDe" = ( @@ -25021,7 +25021,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "bKX" = ( @@ -25538,7 +25538,7 @@ "bNl" = ( /obj/machinery/economy/vending/coffee, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/secondary/bridge) "bNm" = ( @@ -26023,7 +26023,7 @@ pixel_y = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "bOT" = ( @@ -26066,7 +26066,7 @@ /obj/machinery/newscaster/directional/south, /obj/machinery/economy/vending/cigarette, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/secondary/bridge) "bOZ" = ( @@ -26162,7 +26162,7 @@ /obj/item/storage/belt/utility, /obj/item/clothing/head/welding, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "bPj" = ( @@ -26367,7 +26367,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "bQe" = ( @@ -26892,7 +26892,7 @@ }, /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "bRS" = ( @@ -27171,7 +27171,7 @@ pixel_x = -4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/teleporter) "bSQ" = ( @@ -27398,7 +27398,7 @@ "bTB" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/library) "bTC" = ( @@ -27425,7 +27425,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "bTG" = ( @@ -27713,7 +27713,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "bUO" = ( @@ -27825,7 +27825,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "bVc" = ( @@ -28267,7 +28267,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "bWB" = ( @@ -28813,7 +28813,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/teleporter) "bYa" = ( @@ -28982,7 +28982,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "bYy" = ( @@ -29102,7 +29102,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "bYT" = ( @@ -29994,7 +29994,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "cbK" = ( @@ -30286,7 +30286,7 @@ icon_state = "pipe-j2" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/central) "ccE" = ( @@ -30783,7 +30783,7 @@ }, /obj/machinery/disposal, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/central) "cek" = ( @@ -31368,7 +31368,7 @@ /obj/item/radio/intercom/directional/east, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "cgn" = ( @@ -33569,7 +33569,7 @@ pixel_y = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/maintenance/aft2) "cnO" = ( @@ -34180,7 +34180,7 @@ "cqj" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/chapel) "cqk" = ( @@ -34459,7 +34459,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "crq" = ( @@ -36641,7 +36641,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "czo" = ( @@ -36711,7 +36711,7 @@ /obj/machinery/light/directional/south, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "czy" = ( @@ -36820,7 +36820,7 @@ autolink_id = "aisat_vent" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/aisat) "czV" = ( @@ -37110,7 +37110,7 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "cAX" = ( @@ -37335,7 +37335,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/research) "cBQ" = ( @@ -37927,7 +37927,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "cDU" = ( @@ -38060,7 +38060,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "cEl" = ( @@ -38169,7 +38169,7 @@ "cEF" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/maintenance/aft2) "cEG" = ( @@ -38331,7 +38331,7 @@ /obj/effect/turf_decal/delivery/hollow, /obj/machinery/atmospherics/portable/canister/oxygen, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "cFf" = ( @@ -38782,7 +38782,7 @@ /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/grown/harebell, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/chapel) "cGF" = ( @@ -38815,7 +38815,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/research) "cGR" = ( @@ -39174,7 +39174,7 @@ "cHX" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/chapel) "cHY" = ( @@ -39622,7 +39622,7 @@ "cJB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "cJD" = ( @@ -40553,7 +40553,7 @@ }, /obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/ai_monitored/storage/eva) "cNk" = ( @@ -41012,7 +41012,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/chapel) "cOZ" = ( @@ -41200,7 +41200,7 @@ "cPH" = ( /obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "cPI" = ( @@ -41223,7 +41223,7 @@ }, /obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/secondary/exit) "cPM" = ( @@ -41234,7 +41234,7 @@ }, /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/secondary/exit) "cPN" = ( @@ -41970,7 +41970,7 @@ /obj/item/reagent_containers/food/snacks/grown/poppy, /obj/item/reagent_containers/food/snacks/grown/poppy, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/chapel) "cSS" = ( @@ -41980,7 +41980,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/chapel) "cST" = ( @@ -41994,7 +41994,7 @@ pixel_y = 29 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/chapel) "cSU" = ( @@ -42002,7 +42002,7 @@ /obj/structure/table/wood, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/chapel) "cSV" = ( @@ -42551,7 +42551,7 @@ }, /obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "cVc" = ( @@ -42971,7 +42971,7 @@ pixel_y = -2 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/chapel) "cWS" = ( @@ -43693,7 +43693,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "dan" = ( @@ -43903,7 +43903,7 @@ "dbb" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/central) "dbc" = ( @@ -44374,7 +44374,7 @@ /obj/structure/table/wood, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/chapel) "dep" = ( @@ -44405,7 +44405,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/research) "deu" = ( @@ -44551,7 +44551,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/maintenance/aft2) "deX" = ( @@ -45095,7 +45095,7 @@ autolink_id = "aisat_vent" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/aisat) "dkG" = ( @@ -45453,7 +45453,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/ai) "dvc" = ( @@ -46126,7 +46126,7 @@ /area/station/maintenance/auxsolarstarboard) "dQb" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "dQq" = ( @@ -46155,7 +46155,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "dRU" = ( @@ -46554,7 +46554,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/security/evidence) "dZy" = ( @@ -46585,7 +46585,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/research) "dZI" = ( @@ -46875,7 +46875,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /obj/effect/mapping_helpers/airlock/access/all/science/minisat, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/aisat) "efX" = ( @@ -47179,7 +47179,7 @@ /obj/structure/closet/wardrobe/black, /obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "epG" = ( @@ -47981,7 +47981,7 @@ "eFV" = ( /obj/machinery/economy/vending/hatdispenser, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "eGw" = ( @@ -48053,7 +48053,7 @@ /obj/effect/turf_decal/delivery/white/hollow, /obj/machinery/atmospherics/portable/scrubber/huge, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "eJh" = ( @@ -48070,7 +48070,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "eJG" = ( @@ -48617,7 +48617,7 @@ }, /obj/structure/closet/secure_closet/roboticist, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "eVZ" = ( @@ -48793,7 +48793,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/security/evidence) "fau" = ( @@ -49026,7 +49026,7 @@ "fho" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "fhs" = ( @@ -49086,7 +49086,7 @@ network = list("Research","SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "fiV" = ( @@ -49348,7 +49348,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "fpi" = ( @@ -49774,7 +49774,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/security/evidence) "fyt" = ( @@ -49980,7 +49980,7 @@ /obj/effect/turf_decal/delivery/hollow, /obj/machinery/atmospherics/portable/canister/toxins, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "fCQ" = ( @@ -51333,7 +51333,7 @@ /obj/machinery/atmospherics/portable/canister, /obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "ghF" = ( @@ -51602,7 +51602,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "gqj" = ( @@ -51774,7 +51774,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/machinery/door/airlock/engineering/glass{ heat_proof = 1; name = "Supermatter Chamber" @@ -52372,7 +52371,7 @@ }, /obj/effect/turf_decal/caution/stand_clear, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/security/armory/secure) "gLu" = ( @@ -52862,7 +52861,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "gVX" = ( @@ -52960,7 +52959,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /obj/effect/mapping_helpers/airlock/access/all/science/minisat, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/aisat) "gXN" = ( @@ -54072,7 +54071,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible, /obj/item/wrench, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/security/execution) "hxd" = ( @@ -54732,7 +54731,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/office/ce) "hKu" = ( @@ -54792,7 +54791,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "hLt" = ( @@ -54845,7 +54844,7 @@ /obj/item/reagent_containers/food/snacks/grown/harebell, /obj/item/reagent_containers/food/snacks/grown/harebell, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/chapel) "hLX" = ( @@ -54864,7 +54863,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "hMJ" = ( @@ -55215,7 +55214,7 @@ /area/station/science/toxins/mixing) "hVK" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "hVX" = ( @@ -55292,7 +55291,7 @@ /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/secondary/exit) "hYz" = ( @@ -56537,7 +56536,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "iyv" = ( @@ -56663,7 +56662,7 @@ "iBi" = ( /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "iBq" = ( @@ -56958,7 +56957,7 @@ }, /obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/security/evidence) "iJz" = ( @@ -57333,7 +57332,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "iQK" = ( @@ -57570,7 +57569,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/ai) "iYh" = ( @@ -59332,7 +59331,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "jSg" = ( @@ -60455,7 +60454,7 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/security/evidence) "kzm" = ( @@ -60978,7 +60977,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "kHZ" = ( @@ -61206,7 +61205,7 @@ /obj/effect/turf_decal/delivery/white/hollow, /obj/machinery/atmospherics/portable/scrubber, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "kNk" = ( @@ -61544,7 +61543,7 @@ /obj/machinery/atmospherics/portable/canister/sleeping_agent, /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "kUy" = ( @@ -62877,7 +62876,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "lwx" = ( @@ -63802,7 +63801,7 @@ }, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/chapel) "lPe" = ( @@ -65404,7 +65403,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "mCT" = ( @@ -66863,7 +66862,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/research) "nia" = ( @@ -67234,7 +67233,7 @@ /obj/item/crowbar, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "nqt" = ( @@ -67317,7 +67316,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "nsB" = ( @@ -68112,7 +68111,7 @@ }, /obj/machinery/power/port_gen/pacman, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/aisat/service) "nKy" = ( @@ -68294,7 +68293,7 @@ /obj/machinery/economy/vending/suitdispenser, /obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "nPV" = ( @@ -68328,7 +68327,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "nSs" = ( @@ -68428,7 +68427,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "nUU" = ( @@ -68921,7 +68920,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/ai) "oeP" = ( @@ -69022,7 +69021,7 @@ /area/station/science/research) "oiv" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/service/chapel) "oiC" = ( @@ -69189,7 +69188,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "ooN" = ( @@ -69354,7 +69353,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "ouq" = ( @@ -69383,7 +69382,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "ovM" = ( @@ -69791,7 +69790,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "oIb" = ( @@ -70313,7 +70312,7 @@ }, /obj/machinery/light_switch/north, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "oVx" = ( @@ -70741,7 +70740,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/xenobio_south) "peF" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/machinery/door/airlock/engineering/glass{ heat_proof = 1; name = "Supermatter Chamber" @@ -71464,13 +71462,13 @@ icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "pxG" = ( /obj/structure/morgue, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "pxM" = ( @@ -71496,7 +71494,7 @@ /obj/item/storage/belt/utility, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "pzQ" = ( @@ -71615,7 +71613,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "pCg" = ( @@ -72656,7 +72654,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "pXX" = ( @@ -73073,7 +73071,7 @@ dir = 10 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/engineering/tech_storage) "qfR" = ( @@ -74023,7 +74021,7 @@ "qFl" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "qFz" = ( @@ -74528,7 +74526,7 @@ pixel_x = -2 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "qTF" = ( @@ -75136,7 +75134,7 @@ dir = 5 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "rif" = ( @@ -75578,7 +75576,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /obj/effect/mapping_helpers/airlock/access/all/science/minisat, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/aisat) "rsQ" = ( @@ -75661,7 +75659,7 @@ /obj/machinery/atmospherics/portable/pump, /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "ruH" = ( @@ -77043,7 +77041,7 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/security/armory/secure) "scF" = ( @@ -77087,7 +77085,7 @@ /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "sdO" = ( @@ -77486,7 +77484,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "soO" = ( @@ -77640,7 +77638,7 @@ pixel_y = -24 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/ai) "stc" = ( @@ -77844,7 +77842,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "syP" = ( @@ -78090,7 +78088,7 @@ /obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/unary/tank/air, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/aisat/service) "sFN" = ( @@ -78250,7 +78248,7 @@ /area/station/medical/reception) "sIm" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "sID" = ( @@ -78782,7 +78780,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "sSq" = ( @@ -79134,7 +79132,7 @@ }, /obj/machinery/space_heater, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/security/execution) "tbE" = ( @@ -80038,7 +80036,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "twN" = ( @@ -80819,7 +80817,7 @@ "tVd" = ( /obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "tVw" = ( @@ -81040,7 +81038,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "ubB" = ( @@ -81177,7 +81175,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/public/locker) "ueF" = ( @@ -82092,7 +82090,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/command/teleporter) "uEX" = ( @@ -82667,7 +82665,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "uSc" = ( @@ -82694,7 +82692,7 @@ /obj/effect/turf_decal/delivery/hollow, /obj/machinery/atmospherics/portable/canister, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "uSA" = ( @@ -82923,7 +82921,7 @@ sort_type_txt = "14" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/robotics) "uXE" = ( @@ -82937,7 +82935,7 @@ /obj/item/clothing/mask/gas, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "uXK" = ( @@ -84279,7 +84277,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "vDG" = ( @@ -84499,7 +84497,7 @@ /obj/effect/turf_decal/delivery/hollow, /obj/machinery/atmospherics/portable/canister/carbon_dioxide, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "vLQ" = ( @@ -84643,7 +84641,7 @@ /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/research) "vRv" = ( @@ -84890,7 +84888,7 @@ }, /obj/machinery/power/apc/directional/north, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "vXb" = ( @@ -85382,7 +85380,7 @@ "wkM" = ( /obj/machinery/economy/vending/cola, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/secondary/bridge) "wlo" = ( @@ -85731,7 +85729,7 @@ network = list("Research","SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "wul" = ( @@ -85838,7 +85836,7 @@ /obj/machinery/firealarm/directional/west, /obj/machinery/computer/teleporter, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/turret_protected/aisat/interior) "wxL" = ( @@ -85945,8 +85943,7 @@ /area/station/maintenance/fore) "wzW" = ( /obj/structure/holohoop{ - dir = 8; - pixel_x = -13 + dir = 8 }, /obj/effect/turf_decal/stripes/white/line{ dir = 4 @@ -86145,7 +86142,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "wET" = ( @@ -86241,7 +86238,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "wJt" = ( @@ -86333,7 +86330,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "wNA" = ( @@ -87379,7 +87376,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "xmN" = ( @@ -87459,7 +87456,7 @@ /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/hallway/primary/central) "xoB" = ( @@ -87746,7 +87743,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/medical/morgue) "xvX" = ( @@ -88723,7 +88720,7 @@ /obj/machinery/atmospherics/portable/canister/oxygen, /obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/storage) "xSg" = ( @@ -89251,7 +89248,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "yej" = ( @@ -89303,7 +89300,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/science/toxins/launch) "yeW" = ( @@ -89372,7 +89369,7 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/station/security/evidence) "ygK" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm index 292dace2438e..6b955ac2a323 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm @@ -78,7 +78,7 @@ "cG" = ( /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel/airless{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/unpowered/unpowered_structures) "cJ" = ( @@ -102,7 +102,7 @@ /obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/black, /turf/simulated/floor/plasteel/airless{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/unpowered/unpowered_structures) "dx" = ( @@ -135,7 +135,7 @@ amount = 2 }, /turf/simulated/floor/plasteel/airless{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/unpowered/unpowered_structures) "eh" = ( @@ -358,7 +358,7 @@ /obj/effect/turf_decal/delivery/white, /obj/structure/ore_box, /turf/simulated/floor/plasteel/airless{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/unpowered/unpowered_structures) "qa" = ( @@ -387,7 +387,7 @@ "rI" = ( /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel/airless{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/unpowered/unpowered_structures) "sn" = ( @@ -733,7 +733,7 @@ /obj/machinery/status_display/directional/east, /obj/machinery/suit_storage_unit/standard_unit, /turf/simulated/floor/plasteel/airless{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/powered) "FF" = ( @@ -746,7 +746,7 @@ /obj/item/stack/spacecash/c20, /obj/item/stack/spacecash/c10, /turf/simulated/floor/plasteel/airless{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/unpowered/unpowered_structures) "FZ" = ( @@ -809,7 +809,7 @@ /obj/item/reagent_containers/pill/methamphetamine, /obj/item/reagent_containers/pill/methamphetamine, /turf/simulated/floor/plasteel/airless{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/unpowered/unpowered_structures) "HI" = ( @@ -899,7 +899,7 @@ /obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/black, /turf/simulated/floor/plasteel/airless{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/unpowered/unpowered_structures) "KZ" = ( @@ -954,7 +954,7 @@ /obj/item/stack/cable_coil, /obj/item/t_scanner, /turf/simulated/floor/plasteel/airless{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/unpowered/unpowered_structures) "NK" = ( @@ -1136,7 +1136,7 @@ /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel/airless{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/powered) "TU" = ( @@ -1239,7 +1239,7 @@ /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel/airless{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/unpowered/unpowered_structures) "Zv" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm index 3247df0bec33..b5282e591432 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm @@ -9,7 +9,7 @@ }, /obj/item/book/manual/barman_recipes, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/powered) "c" = ( @@ -26,7 +26,7 @@ dir = 5 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/powered) "d" = ( @@ -101,7 +101,7 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/powered) "u" = ( @@ -183,7 +183,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/powered) "J" = ( @@ -225,7 +225,7 @@ /area/ruin/space/powered) "Q" = ( /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/powered) "R" = ( @@ -267,7 +267,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/powered) "Y" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm index b5e03425dd50..15e96f131afb 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm @@ -36,7 +36,7 @@ /obj/effect/turf_decal/box, /obj/item/multitool, /turf/simulated/floor/plasteel/airless{ - icon_state = "blackfull" + icon_state = "dark" }, /area/ruin/space/unpowered/unpowered_structures) "dQ" = ( diff --git a/_maps/map_files220/RandomZLevels/blackmesa.dmm b/_maps/map_files220/RandomZLevels/blackmesa.dmm index 5381b4b4d5c1..c0d38bf476ac 100644 --- a/_maps/map_files220/RandomZLevels/blackmesa.dmm +++ b/_maps/map_files220/RandomZLevels/blackmesa.dmm @@ -112,7 +112,7 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_decon_room) "akR" = ( @@ -155,7 +155,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "ang" = ( @@ -248,6 +248,7 @@ /obj/structure/table, /obj/machinery/light/directional/east, /obj/structure/alien/xenoweeds, +/obj/item/reagent_containers/glass/bottle/regeneration, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "atT" = ( @@ -291,7 +292,7 @@ "avn" = ( /obj/machinery/door/airlock/science, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "avx" = ( @@ -365,7 +366,8 @@ dir = 1 }, /obj/machinery/power/emitter{ - dir = 8 + dir = 8; + anchored = 1 }, /turf/simulated/floor/catwalk, /area/awaymission/black_mesa/scientist_hall) @@ -387,7 +389,7 @@ }, /obj/effect/mapping_helpers/airlock/locked, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "aBt" = ( @@ -395,7 +397,7 @@ /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/acid_lake_hallway) "aBu" = ( -/obj/machinery/door/airlock/multi_tile/command/glass, +/obj/machinery/door/airlock/command/glass, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_hallway_two) "aCa" = ( @@ -561,11 +563,9 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_medbay) "aOq" = ( -/obj/structure/flora/biolumini/flower, -/turf/simulated/floor/beach/away/coastline/xen{ - dir = 8 - }, -/area/awaymission/black_mesa/xen/acid_lake_hallway) +/obj/effect/landmark/damageturf, +/turf/simulated/floor/plasteel, +/area/awaymission/black_mesa/black_ops_entrance) "aOA" = ( /obj/structure/chair/office, /turf/simulated/floor/plasteel/dark, @@ -609,7 +609,7 @@ /obj/machinery/door/airlock/science, /obj/effect/mapping_helpers/airlock/locked, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "aRc" = ( @@ -631,7 +631,7 @@ /obj/machinery/chem_dispenser, /obj/structure/reagent_dispensers/fueltank/chem/north, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "aUx" = ( @@ -659,7 +659,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "aUS" = ( @@ -678,8 +678,8 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/hecu_zone_external_hall) "aVR" = ( -/obj/machinery/door/airlock/multi_tile/command/glass, /obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/command, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/black_ops_hall) "aVW" = ( @@ -858,7 +858,7 @@ "bjS" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "bkh" = ( @@ -950,7 +950,7 @@ "bry" = ( /obj/machinery/door_control/shutter/west{ id = "nihi"; - req_access = 271 + req_one_access_txt = "271" }, /turf/simulated/floor/vault{ icon_state = "alienvault" @@ -1064,7 +1064,7 @@ icon_state = "bodyscanner" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "bxi" = ( @@ -1110,8 +1110,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/high_security_hallway) "bAz" = ( -/obj/machinery/door/airlock/multi_tile/command/glass, -/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/command/glass, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_turret_blockade) "bAE" = ( @@ -1137,7 +1136,7 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "bBQ" = ( @@ -1201,7 +1200,7 @@ pixel_y = 10 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "bFV" = ( @@ -1248,7 +1247,7 @@ /obj/structure/table, /obj/item/restraints/handcuffs/alien, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "bJt" = ( @@ -1270,7 +1269,7 @@ dir = 4 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "bKD" = ( @@ -1289,7 +1288,7 @@ icon_keyboard = "generic_key_broken" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "bKS" = ( @@ -1328,7 +1327,7 @@ "bLE" = ( /obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "bLK" = ( @@ -1437,7 +1436,8 @@ dir = 1 }, /obj/machinery/power/emitter{ - dir = 1 + dir = 1; + anchored = 1 }, /turf/simulated/floor/catwalk, /area/awaymission/black_mesa/black_ops_button) @@ -1469,7 +1469,7 @@ /obj/structure/alien/xenoweeds, /obj/item/ammo_box/magazine/enforcer/lethal, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "bRc" = ( @@ -1634,7 +1634,7 @@ "cct" = ( /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "ccM" = ( @@ -1667,7 +1667,7 @@ "cer" = ( /obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "ceV" = ( @@ -1729,7 +1729,7 @@ can_be_unanchored = 0 }, /obj/structure/rack, -/obj/item/gun/energy/immolator, +/obj/item/gun/energy/immolator/multi, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/high_security_emitter) "cjz" = ( @@ -1941,7 +1941,7 @@ }, /obj/item/storage/box/drinkingglasses, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "cty" = ( @@ -1976,7 +1976,7 @@ /obj/item/kitchen/knife/combat/survival, /obj/item/geiger_counter, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa) "cxX" = ( @@ -2059,7 +2059,7 @@ "cDl" = ( /obj/structure/closet/crate/can, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "cED" = ( @@ -2081,7 +2081,7 @@ amount = 30 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "cFH" = ( @@ -2119,7 +2119,7 @@ /obj/structure/flora/biolumini/lamp/weaklight, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/resonant_chamber) "cIK" = ( @@ -2247,7 +2247,7 @@ /obj/item/pen, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "cPk" = ( @@ -2268,7 +2268,7 @@ /obj/structure/table, /obj/item/hemostat/alien, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "cTI" = ( @@ -2357,7 +2357,7 @@ /obj/machinery/light_construct/directional/north, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "cYu" = ( @@ -2415,13 +2415,13 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "cZE" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "cZS" = ( @@ -2436,7 +2436,7 @@ /obj/structure/alien/xenoweeds, /obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/resonant_chamber) "daR" = ( @@ -2505,7 +2505,7 @@ /obj/machinery/light_construct/directional/east, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "dfu" = ( @@ -2528,7 +2528,7 @@ "dgZ" = ( /obj/structure/extinguisher_cabinet/directional/east, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/gas_emitter_chamber) "dhl" = ( @@ -2556,7 +2556,7 @@ /obj/structure/alien/xenoweeds, /obj/item/clothing/under/rank/security/officer/dispatch, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "dko" = ( @@ -2622,6 +2622,7 @@ id = "teledown"; id_target = "teleup" }, +/obj/effect/turf_decal/box, /turf/simulated/floor/mineral/titanium, /area/awaymission/black_mesa/lambda_hallway) "dou" = ( @@ -2656,8 +2657,11 @@ "dpo" = ( /obj/structure/table, /obj/structure/alien/xenoweeds, +/obj/machinery/door_control/shutter{ + id = "exp_room" + }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "dpI" = ( @@ -2682,7 +2686,7 @@ "dsw" = ( /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/resonant_chamber) "dsF" = ( @@ -2739,7 +2743,7 @@ "dvg" = ( /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "dvJ" = ( @@ -2756,7 +2760,7 @@ dir = 4 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa) "dwj" = ( @@ -2808,7 +2812,7 @@ "dyC" = ( /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "dzf" = ( @@ -2864,7 +2868,7 @@ dir = 8 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa) "dEx" = ( @@ -2994,7 +2998,7 @@ "dNc" = ( /obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "dNg" = ( @@ -3046,7 +3050,7 @@ "dON" = ( /obj/item/tape/black_mesa/first_eas, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "dPd" = ( @@ -3054,13 +3058,13 @@ dir = 4 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "dPL" = ( -/obj/structure/xen_pylon, -/turf/simulated/floor/plating/xen, -/area/awaymission/black_mesa/xen/acid_lake) +/obj/machinery/door/airlock/command/glass, +/turf/simulated/floor/plasteel/smooth, +/area/awaymission/black_mesa/black_ops_hall) "dQy" = ( /obj/machinery/gateway/centeraway{ calibrated = 0; @@ -3203,14 +3207,10 @@ }, /area/awaymission/black_mesa/science_internal) "dZy" = ( -/obj/effect/turf_decal/siding/trimline/blue{ - alpha = 130; - dir = 8 - }, -/obj/machinery/light_construct/directional/west, -/obj/structure/alien/xenoweeds, +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/locked, /turf/simulated/floor/plasteel/smooth, -/area/awaymission/black_mesa/entrance_internal_hall) +/area/awaymission/black_mesa/black_ops_hall) "dZQ" = ( /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/hecu_zone_atrium) @@ -3365,9 +3365,9 @@ /turf/simulated/wall/indestructible/rock/mineral, /area/awaymission/black_mesa/entrance_lobby) "eja" = ( -/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer, -/turf/simulated/floor/plating/xen, -/area/awaymission/black_mesa/xen/acid_lake_hallway) +/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen, +/turf/simulated/floor/plasteel, +/area/awaymission/black_mesa/employee_dorm_room) "ejd" = ( /obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel, @@ -3588,9 +3588,7 @@ /turf/simulated/floor/bluegrid, /area/awaymission/black_mesa/lambda_teleporter) "exE" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, +/obj/machinery/door/airlock/public, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_science_room) "eyf" = ( @@ -3697,7 +3695,7 @@ /obj/item/reagent_containers/food/condiment/milk, /obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "eHr" = ( @@ -3878,7 +3876,7 @@ id_tag = "nihi" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/black_ops_entrance) "eSl" = ( @@ -3890,7 +3888,7 @@ "eSp" = ( /obj/machinery/r_n_d/protolathe, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "eSD" = ( @@ -3993,9 +3991,10 @@ /turf/simulated/floor/plating/dirt/xen_dirt, /area/awaymission/black_mesa/xen/vortigaunt_village) "fbn" = ( -/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen, -/turf/simulated/floor/plating/ironsand, -/area/awaymission/black_mesa/hecu_zone_towards_facility) +/obj/structure/table/wood, +/obj/item/ammo_box/magazine/m556, +/turf/simulated/floor/wood/fancy/cherry, +/area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth) "fbq" = ( /obj/effect/baseturf_helper{ baseturf = /turf/simulated/floor/plating @@ -4392,12 +4391,13 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "fBJ" = ( /obj/machinery/power/emitter{ - dir = 1 + dir = 1; + anchored = 1 }, /turf/simulated/floor/plasteel/smooth{ icon_state = "smooth_large" @@ -4494,7 +4494,7 @@ desc = "Learn science by destroying things!" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_decon_room) "fJF" = ( @@ -4588,9 +4588,9 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/high_security_surgery) "fPn" = ( -/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen/zombie, -/turf/simulated/floor/plating/asteroid, -/area/awaymission/black_mesa/hecu_zone_towards_facility) +/obj/structure/xen_pylon, +/turf/simulated/floor/plating/xen, +/area/awaymission/black_mesa/xen/village_hallway) "fPp" = ( /obj/structure/table, /obj/item/storage/box/donkpockets/empty, @@ -4655,7 +4655,7 @@ "fSP" = ( /obj/machinery/atmospherics/portable/canister, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/gas_emitter_chamber) "fST" = ( @@ -4764,8 +4764,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/caution/stand_clear, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_decon_room) "gaz" = ( @@ -4796,7 +4797,7 @@ "gdi" = ( /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "gdy" = ( @@ -4808,7 +4809,7 @@ id_tag = "sectorcmain" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "gdY" = ( @@ -4824,7 +4825,7 @@ /area/awaymission/black_mesa/entrance) "get" = ( /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_decon_room) "gev" = ( @@ -4961,7 +4962,7 @@ dir = 1 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "gol" = ( @@ -5062,7 +5063,7 @@ /obj/structure/table, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "guL" = ( @@ -5163,7 +5164,7 @@ "gxV" = ( /obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "gyi" = ( @@ -5215,7 +5216,7 @@ /obj/structure/table, /obj/item/scalpel/alien, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "gBe" = ( @@ -5267,17 +5268,23 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/high_security_sec_point) "gEn" = ( -/obj/structure/alien/xenoweeds, -/obj/structure{ - icon = 'modular_ss220/maps220/icons/misc_objects.dmi'; - icon_state = "microscope"; - name = "\improper Микроскоп"; - density = 1; - anchored = 1; - desc = "Самый обычный микроскоп." +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plasteel, -/area/awaymission/black_mesa/entrance_large_office) +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/wall/indestructible/riveted, +/area/awaymission/black_mesa/security_outpost) "gHa" = ( /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/smooth, @@ -5295,7 +5302,7 @@ /obj/structure/alien/xenoweeds, /obj/item/shield/riot, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "gHP" = ( @@ -5304,7 +5311,7 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "gHV" = ( @@ -5332,7 +5339,7 @@ /obj/machinery/light/directional/west, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "gMj" = ( @@ -5340,7 +5347,7 @@ dir = 1 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "gMF" = ( @@ -5412,7 +5419,7 @@ "gRP" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "gSd" = ( @@ -5421,7 +5428,9 @@ /area/awaymission/black_mesa/black_ops_button) "gSe" = ( /obj/structure/table, -/obj/item/gun/projectile/automatic/wt550, +/obj/item/gun/projectile/automatic/m90, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/vortigaunt_village) "gSi" = ( @@ -5509,7 +5518,7 @@ dir = 4 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_decon_room) "gXj" = ( @@ -5800,7 +5809,7 @@ "hpC" = ( /obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "hqJ" = ( @@ -5922,7 +5931,7 @@ }, /obj/machinery/reagentgrinder, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "hBk" = ( @@ -6015,7 +6024,7 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "hIk" = ( @@ -6052,14 +6061,14 @@ /obj/item/ammo_box/magazine/beretta/mm919, /obj/item/ammo_box/magazine/beretta/mm919, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa) "hKb" = ( /obj/structure/chair/office/dark, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "hKN" = ( @@ -6105,7 +6114,7 @@ "hNf" = ( /obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "hNj" = ( @@ -6113,7 +6122,7 @@ dir = 4 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/gas_emitter_chamber) "hNN" = ( @@ -6181,7 +6190,7 @@ /obj/structure/alien/xenoweeds, /obj/structure/flora/biolumini/flower/weaklight, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "hUH" = ( @@ -6189,7 +6198,7 @@ /obj/effect/gibspawner/xeno, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "hUI" = ( @@ -6210,7 +6219,7 @@ /obj/structure/rack/gunrack, /obj/item/ammo_box/shotgun/buck, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "hWN" = ( @@ -6275,9 +6284,9 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "ibM" = ( -/obj/effect/light_emitter/colored/lime, -/turf/simulated/floor/plating/xen, -/area/awaymission/black_mesa/xen/nihilanth_computer) +/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen, +/turf/simulated/floor/plating, +/area/awaymission/black_mesa/employee_dorm_room) "ict" = ( /obj/structure/closet/crate/can, /turf/simulated/floor/plasteel, @@ -6293,6 +6302,7 @@ /area/awaymission/black_mesa/lambda_teleporter) "icy" = ( /obj/machinery/light/directional/west, +/obj/machinery/porta_turret/syndicate/black_mesa/blackops, /turf/simulated/floor/bluegrid, /area/awaymission/black_mesa/black_ops_turret_blockade) "idq" = ( @@ -6321,7 +6331,7 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "ifL" = ( @@ -6341,7 +6351,7 @@ /obj/effect/mob_spawn/human/corpse/damaged, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "ihr" = ( @@ -6470,7 +6480,7 @@ /area/awaymission/black_mesa/resonant_chamber) "ipB" = ( /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "ipV" = ( @@ -6522,11 +6532,9 @@ /turf/simulated/floor/plating, /area/awaymission/black_mesa/resonant_chamber) "iua" = ( -/obj/structure/xen_pylon, -/turf/simulated/floor/beach/away/coastline/xen{ - dir = 8 - }, -/area/awaymission/black_mesa/xen/freeman_hallway) +/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer, +/turf/simulated/floor/plasteel/smooth, +/area/awaymission/black_mesa/lambda_teleporter) "ivk" = ( /obj/structure/flora/biolumini/flower, /turf/simulated/floor/plating/xen, @@ -6536,7 +6544,7 @@ /obj/item/retractor/alien, /obj/item/cautery/alien, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "iwO" = ( @@ -6589,7 +6597,7 @@ /obj/item/grenade/chem_grenade, /obj/item/screwdriver, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "iCo" = ( @@ -6599,7 +6607,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "iCI" = ( @@ -6631,7 +6639,7 @@ /obj/item/reagent_containers/food/snacks/poppypretzel, /obj/item/reagent_containers/food/snacks/plum_pie, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "iEm" = ( @@ -6669,7 +6677,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/entrance_internal_hall) "iFq" = ( -/obj/machinery/door/airlock/multi_tile/command/glass, +/obj/machinery/door/airlock/command/glass, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_science_room) "iFr" = ( @@ -6679,7 +6687,7 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "iFv" = ( @@ -6833,7 +6841,7 @@ "iPm" = ( /obj/machinery/autolathe, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "iPv" = ( @@ -6851,7 +6859,7 @@ "iPW" = ( /obj/structure/railing, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_decon_room) "iQJ" = ( @@ -6871,12 +6879,10 @@ }, /area/awaymission/black_mesa/deep_sci_hall) "iQT" = ( -/obj/effect/bump_teleporter{ - id = "hecuup"; - id_target = "hecudown" - }, +/obj/structure/alien/xenoweeds, +/obj/effect/turf_decal/arrows, /turf/simulated/floor/mineral/titanium, -/area/awaymission/black_mesa/black_ops_entrance) +/area/awaymission/black_mesa/genetics_elevator) "iQV" = ( /obj/structure/chair/stool/bamboo, /turf/simulated/floor/wood/fancy/cherry, @@ -7011,7 +7017,7 @@ "iYS" = ( /obj/effect/mob_spawn/human/corpse/damaged, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/gas_emitter_chamber) "iZg" = ( @@ -7321,7 +7327,7 @@ "jsj" = ( /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/gas_emitter_chamber) "jsy" = ( @@ -7351,7 +7357,7 @@ "juh" = ( /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "jva" = ( @@ -7414,7 +7420,7 @@ name = "Jim Norton's Quebecois Coffee apron" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "jzj" = ( @@ -7422,7 +7428,8 @@ dir = 8 }, /obj/machinery/power/emitter{ - dir = 1 + dir = 1; + anchored = 1 }, /turf/simulated/floor/catwalk, /area/awaymission/black_mesa/scientist_hall) @@ -7535,7 +7542,7 @@ /obj/machinery/light/directional/west, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "jHk" = ( @@ -7548,7 +7555,7 @@ /obj/structure/alien/xenoweeds, /obj/item/paper/researchnotes, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "jHF" = ( @@ -7696,14 +7703,13 @@ /turf/simulated/floor/beach/away/coastline/xen, /area/awaymission/black_mesa/xen/acid_lake_hallway) "jUd" = ( -/obj/effect/turf_decal/siding/trimline/blue{ - alpha = 130; - dir = 8 +/obj/effect/turf_decal/arrows{ + dir = 1 }, -/obj/structure/alien/xenoweeds, -/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer, -/turf/simulated/floor/plasteel/smooth, -/area/awaymission/black_mesa/entrance_internal_hall) +/turf/simulated/floor/vault{ + icon_state = "alienvault" + }, +/area/awaymission/black_mesa/xen/nihilanth_computer) "jUh" = ( /obj/item/storage/firstaid/fire, /turf/simulated/floor/plating/xen, @@ -7744,7 +7750,7 @@ dir = 1 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "jWv" = ( @@ -7757,7 +7763,7 @@ /obj/structure/alien/xenoweeds, /obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "jWQ" = ( @@ -7840,7 +7846,7 @@ dir = 8 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "kbN" = ( @@ -7946,7 +7952,7 @@ "kht" = ( /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "khv" = ( @@ -7967,6 +7973,9 @@ "kig" = ( /obj/structure/rack/gunrack, /obj/effect/decal/cleanable/dirt, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/acid_lake_building) "kii" = ( @@ -8132,7 +8141,7 @@ "ksI" = ( /obj/item/gun/projectile/shotgun/automatic/combat, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "ktr" = ( @@ -8183,11 +8192,11 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/black_ops_armory) "kwz" = ( -/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer, -/turf/simulated/floor/beach/away/coastline/xen{ - dir = 8 +/obj/effect/turf_decal/arrows, +/turf/simulated/floor/vault{ + icon_state = "alienvault" }, -/area/awaymission/black_mesa/xen/acid_lake_hallway) +/area/awaymission/black_mesa/xen/nihilanth_computer) "kwE" = ( /obj/effect/baseturf_helper{ baseturf = /turf/simulated/floor/plating/xen @@ -8426,11 +8435,11 @@ }, /area/awaymission/black_mesa/xen/entering_zone) "kPc" = ( -/obj/structure/shockplant, -/turf/simulated/floor/beach/away/coastline/xen{ - dir = 4 - }, -/area/awaymission/black_mesa/xen/acid_lake_hallway) +/obj/structure/window/reinforced, +/obj/structure/closet, +/obj/item/ammo_box/shotgun/buck, +/turf/simulated/floor/plasteel, +/area/awaymission/black_mesa/security_outpost) "kPp" = ( /obj/machinery/chem_heater, /turf/simulated/floor/plasteel, @@ -8471,7 +8480,8 @@ pixel_y = 10 }, /obj/machinery/door_control/shutter{ - id = "biolabs" + id = "biolabs"; + name = "Biolabs Blastdoor Control" }, /turf/simulated/floor/catwalk, /area/awaymission/black_mesa/resonant_chamber) @@ -8518,10 +8528,8 @@ }, /area/awaymission/black_mesa/xen/acid_lake_hallway) "kRO" = ( -/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen/zombie, -/obj/effect/gibspawner/human, -/turf/simulated/floor/plating/ironsand, -/area/awaymission/black_mesa/hecu_zone_towards_facility) +/turf/simulated/floor/beach/away/coastline/beachcorner/xen, +/area/awaymission/black_mesa/xen/acid_lake_hallway) "kSZ" = ( /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, @@ -8716,6 +8724,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_entrance) "lgI" = ( +/obj/machinery/door/airlock/command, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_turret_blockade) "lhm" = ( @@ -8724,14 +8733,13 @@ /area/awaymission/black_mesa/hecu_zone_towards_facility) "liq" = ( /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "ljD" = ( -/obj/effect/mob_spawn/human/corpse/damaged, -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/plating/ironsand, -/area/awaymission/black_mesa/hecu_zone_towards_facility) +/obj/item/ammo_box/magazine/enforcer/lethal, +/turf/simulated/floor/plasteel, +/area/awaymission/black_mesa/entrance_lobby) "ljT" = ( /obj/effect/landmark/burnturf, /turf/simulated/floor/plasteel/smooth, @@ -8789,9 +8797,9 @@ /area/awaymission/black_mesa/dorm_computers) "lmi" = ( /obj/structure/table, -/obj/item/folder/blue, +/obj/item/stack/telecrystal/twenty, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "lml" = ( @@ -8820,7 +8828,7 @@ /obj/item/folder/blue, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "lnQ" = ( @@ -8880,12 +8888,13 @@ dir = 10 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "lrK" = ( /obj/machinery/power/emitter{ - dir = 4 + dir = 4; + anchored = 1 }, /obj/machinery/light/directional/west, /turf/simulated/floor/redgrid, @@ -9039,7 +9048,7 @@ "lyJ" = ( /obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/scientist_zombie, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_decon_room) "lzo" = ( @@ -9208,9 +9217,7 @@ /area/awaymission/black_mesa/tram_tunnel) "lKn" = ( /obj/structure/flora/biolumini, -/turf/simulated/floor/beach/away/coastline/xen{ - dir = 8 - }, +/turf/simulated/floor/beach/away/coastline/xen, /area/awaymission/black_mesa/xen/acid_lake_hallway) "lKw" = ( /obj/effect/spawner/window/reinforced/grilled, @@ -9258,7 +9265,7 @@ "lMU" = ( /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/resonant_chamber) "lNi" = ( @@ -9272,7 +9279,7 @@ /area/awaymission/black_mesa/cryo_room) "lOL" = ( /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "lPu" = ( @@ -9285,7 +9292,7 @@ dir = 8 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "lPM" = ( @@ -9309,7 +9316,7 @@ /obj/structure/extinguisher_cabinet/directional/south, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "lRc" = ( @@ -9386,7 +9393,7 @@ /area/awaymission/black_mesa/security_outpost) "lXl" = ( /obj/structure/table, -/obj/item/ammo_box/magazine/wt550m9, +/obj/item/stack/telecrystal/fifty, /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/vortigaunt_village) "lXo" = ( @@ -9422,7 +9429,7 @@ /obj/structure/table, /obj/item/reagent_containers/food/drinks/coffee, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "lZl" = ( @@ -9491,7 +9498,8 @@ dir = 1 }, /obj/machinery/power/emitter{ - dir = 4 + dir = 4; + anchored = 1 }, /turf/simulated/floor/catwalk, /area/awaymission/black_mesa/scientist_hall) @@ -9524,7 +9532,7 @@ "mfO" = ( /obj/machinery/door/airlock/command, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "mfQ" = ( @@ -9624,7 +9632,7 @@ id = "sectorcmain2" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "mlK" = ( @@ -9682,7 +9690,7 @@ "mpu" = ( /obj/machinery/door_control/shutter/east{ id = "nihi"; - req_access = 271 + req_one_access_txt = "271" }, /turf/simulated/floor/vault{ icon_state = "alienvault" @@ -9750,7 +9758,7 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "mwb" = ( @@ -9873,7 +9881,7 @@ "mDy" = ( /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "mDG" = ( @@ -9929,7 +9937,7 @@ dir = 2 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/gas_emitter_chamber) "mJo" = ( @@ -10031,7 +10039,7 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "mOZ" = ( @@ -10072,7 +10080,7 @@ "mQD" = ( /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "mQK" = ( @@ -10116,7 +10124,7 @@ /obj/structure/alien/xenoweeds, /obj/item/clothing/head/helmet, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "mSt" = ( @@ -10261,7 +10269,7 @@ }, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/gas_emitter_chamber) "mZX" = ( @@ -10343,7 +10351,9 @@ /area/awaymission/black_mesa/hecu_zone_camp) "ndD" = ( /obj/structure/lattice/catwalk/mining, -/obj/machinery/power/emitter, +/obj/machinery/power/emitter{ + anchored = 1 + }, /turf/simulated/floor/chasm/straight_down/lava_land_surface/normal_air{ light_color = null; light_range = 0; @@ -10437,7 +10447,7 @@ dir = 8 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "nkg" = ( @@ -10466,7 +10476,7 @@ "nnb" = ( /obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/gas_emitter_chamber) "nnq" = ( @@ -10564,9 +10574,18 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/genetics_elevator) "ntL" = ( -/obj/machinery/porta_turret/syndicate/black_mesa/blackops, -/turf/simulated/floor/bluegrid, -/area/awaymission/black_mesa/black_ops_turret_blockade) +/obj/structure/table, +/obj/structure/alien/xenoweeds, +/obj/structure{ + icon = 'modular_ss220/maps220/icons/misc_objects.dmi'; + icon_state = "microscope"; + name = "\improper Микроскоп"; + density = 1; + anchored = 1; + desc = "Самый обычный микроскоп." + }, +/turf/simulated/floor/plasteel, +/area/awaymission/black_mesa/entrance_lobby) "ntN" = ( /turf/simulated/floor/beach/away/water/deep/xen, /area/awaymission/black_mesa/xen/lost_camp_hallway) @@ -10910,7 +10929,7 @@ "nSy" = ( /obj/machinery/smartfridge/secure/chemistry, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "nSD" = ( @@ -10919,7 +10938,7 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "nSG" = ( @@ -11112,13 +11131,13 @@ "oeI" = ( /obj/structure/fence, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "ofw" = ( /obj/machinery/economy/vending/plasmaresearch, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "ofJ" = ( @@ -11140,7 +11159,7 @@ dir = 1 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/resonant_chamber) "ogO" = ( @@ -11381,7 +11400,7 @@ dir = 8 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "oxr" = ( @@ -11401,7 +11420,7 @@ "oyy" = ( /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/gas_emitter_chamber) "oyB" = ( @@ -11526,7 +11545,8 @@ /area/awaymission/black_mesa/hecu_zone_infirmary) "oGP" = ( /obj/machinery/power/emitter{ - dir = 8 + dir = 8; + anchored = 1 }, /turf/simulated/floor/redgrid, /area/awaymission/black_mesa/black_ops_turret_blockade) @@ -11593,7 +11613,7 @@ icon_state = "bodyscanner" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "oJf" = ( @@ -11728,6 +11748,7 @@ id = "labdown"; id_target = "labup" }, +/obj/effect/turf_decal/box, /turf/simulated/floor/mineral/titanium, /area/awaymission/black_mesa/scientist_hall) "oRD" = ( @@ -11773,7 +11794,7 @@ /obj/structure/closet, /obj/item/hand_labeler, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "oVV" = ( @@ -11783,7 +11804,7 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "oWH" = ( @@ -11878,7 +11899,7 @@ "paH" = ( /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "paI" = ( @@ -11919,7 +11940,7 @@ pixel_y = 8 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "pck" = ( @@ -11934,14 +11955,18 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "pcB" = ( -/turf/simulated/floor/mineral/titanium, -/area/awaymission/black_mesa/lambda_hallway) +/obj/structure/marker_beacon/spotlight/jade, +/obj/structure/marker_beacon/spotlight/jade, +/turf/simulated/floor/vault{ + icon_state = "alienvault" + }, +/area/awaymission/black_mesa/xen/nihilanth_hallway) "pdr" = ( /obj/structure/closet, /obj/structure/alien/xenoweeds, /obj/item/clothing/suit/armor/vest/security, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "pdH" = ( @@ -11974,7 +11999,7 @@ dir = 4 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/resonant_chamber) "phm" = ( @@ -12020,7 +12045,7 @@ /obj/machinery/light_construct/directional/west, /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "piL" = ( @@ -12050,7 +12075,7 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "plT" = ( @@ -12099,7 +12124,7 @@ /obj/machinery/door/firedoor, /obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "pqV" = ( @@ -12193,6 +12218,7 @@ /area/awaymission/black_mesa/hecu_zone_camp) "pxl" = ( /obj/machinery/light/directional/east, +/obj/machinery/porta_turret/syndicate/black_mesa/blackops, /turf/simulated/floor/bluegrid, /area/awaymission/black_mesa/black_ops_turret_blockade) "pxr" = ( @@ -12216,7 +12242,7 @@ dir = 8 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "pxT" = ( @@ -12281,7 +12307,9 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_internal_hall) "pCC" = ( -/obj/machinery/power/emitter, +/obj/machinery/power/emitter{ + anchored = 1 + }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/engine, /area/awaymission/black_mesa/deep_sci_turret) @@ -12323,7 +12351,7 @@ /obj/structure/table/glass, /obj/item/clothing/glasses/science, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "pHL" = ( @@ -12355,7 +12383,7 @@ /obj/item/storage/backpack/satchel, /obj/item/storage/backpack/satchel, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "pJG" = ( @@ -12363,6 +12391,7 @@ id = "hecudown"; id_target = "hecuup" }, +/obj/effect/turf_decal/box, /turf/simulated/floor/mineral/titanium, /area/awaymission/black_mesa/black_ops_downstairs_atrium) "pKq" = ( @@ -12456,7 +12485,7 @@ /area/awaymission/black_mesa/genetics_sec) "pPy" = ( /obj/structure/table, -/obj/item/stack/telecrystal, +/obj/item/stack/telecrystal/twenty, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_large_office) "pPH" = ( @@ -12469,7 +12498,7 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/resonant_chamber) "pQk" = ( @@ -12575,7 +12604,7 @@ dir = 8 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "pWK" = ( @@ -12667,11 +12696,13 @@ /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/acid_lake_building) "qfg" = ( -/obj/structure/flora/biolumini, -/turf/simulated/floor/beach/away/coastline/xen{ - dir = 6 +/obj/effect/bump_teleporter{ + id = "hecuup"; + id_target = "hecudown" }, -/area/awaymission/black_mesa/xen/acid_lake_hallway) +/obj/effect/turf_decal/box, +/turf/simulated/floor/mineral/titanium, +/area/awaymission/black_mesa/black_ops_entrance) "qfN" = ( /obj/machinery/light_construct/directional/west, /turf/simulated/floor/plasteel, @@ -12912,7 +12943,7 @@ /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth) "qvj" = ( -/obj/structure/bonfire/lit/dense, +/obj/structure/bonfire/lit, /turf/simulated/floor/plating/dirt/xen_dirt, /area/awaymission/black_mesa/xen/vortigaunt_village) "qwo" = ( @@ -13023,7 +13054,7 @@ /obj/effect/gibspawner/human, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "qDS" = ( @@ -13098,7 +13129,7 @@ /obj/structure/table, /obj/item/kitchen/knife/combat/survival, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "qGt" = ( @@ -13145,7 +13176,7 @@ dir = 8 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "qIz" = ( @@ -13185,7 +13216,7 @@ /obj/item/radio/intercom, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "qMA" = ( @@ -13298,7 +13329,7 @@ "qPF" = ( /obj/structure/closet/walllocker/firelocker/south, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "qPR" = ( @@ -13321,7 +13352,7 @@ /area/awaymission/black_mesa/tram_room) "qQc" = ( /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "qQh" = ( @@ -13449,14 +13480,15 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_button) "raf" = ( -/obj/effect/mob_spawn/human/corpse/damaged, -/turf/simulated/floor/catwalk, -/area/awaymission/black_mesa/entrance_internal_hall) +/obj/machinery/door/airlock/titanium, +/obj/effect/mapping_helpers/airlock/locked, +/turf/simulated/floor/mineral/titanium, +/area/awaymission/black_mesa/tram_room) "raF" = ( /obj/machinery/light_construct/directional/south, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "rbO" = ( @@ -13483,6 +13515,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/awaymission/black_mesa/hecu_zone_tunnel) +"rdw" = ( +/obj/structure/alien/xenoweeds, +/obj/structure/flora/biolumini/flower/weaklight, +/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen/zombie, +/turf/simulated/floor/plasteel, +/area/awaymission/black_mesa/entrance_large_office) "rdI" = ( /obj/structure/chair/office{ dir = 8 @@ -13491,7 +13529,7 @@ /area/awaymission/black_mesa/security_outpost) "rei" = ( /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/gas_emitter_chamber) "reH" = ( @@ -13711,7 +13749,7 @@ "rur" = ( /obj/item/taperecorder/empty, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "ruQ" = ( @@ -13724,7 +13762,7 @@ "rvi" = ( /obj/machinery/r_n_d/destructive_analyzer, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "rvt" = ( @@ -13744,7 +13782,8 @@ /area/awaymission/black_mesa/science_labs) "rxp" = ( /obj/machinery/power/emitter{ - dir = 1 + dir = 1; + anchored = 1 }, /turf/simulated/floor/engine, /area/awaymission/black_mesa/high_security_emitter) @@ -13759,11 +13798,9 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/security_outpost) "rzl" = ( -/obj/structure/flora/biolumini/mine, -/turf/simulated/floor/beach/away/coastline/xen{ - dir = 6 - }, -/area/awaymission/black_mesa/xen/acid_lake_hallway) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/awaymission/black_mesa/xen/acid_lake_building) "rzE" = ( /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/freezer, @@ -13818,7 +13855,7 @@ /turf/simulated/floor/wood, /area/awaymission/black_mesa/employee_dorm_room) "rBp" = ( -/obj/structure/bonfire/lit/dense, +/obj/structure/bonfire/lit, /turf/simulated/floor/plating/dirt/xen_dirt, /area/awaymission/black_mesa/xen/vortigaunt_village_nihilanth) "rBw" = ( @@ -13860,7 +13897,7 @@ "rDe" = ( /obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen/zombie, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "rDh" = ( @@ -13936,7 +13973,7 @@ /obj/machinery/door/airlock/command, /obj/effect/mapping_helpers/airlock/locked, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/tram_room) "rJm" = ( @@ -14040,7 +14077,7 @@ /obj/structure/alien/xenoweeds, /obj/structure/flora/biolumini/lamp/weaklight, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "rPn" = ( @@ -14067,10 +14104,9 @@ /turf/simulated/wall/indestructible/rock/mineral/xen, /area/awaymission/black_mesa/xen/village_hallway) "rQu" = ( -/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer, -/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/damageturf, /turf/simulated/floor/plating, -/area/awaymission/black_mesa/dorm_tunnel) +/area/awaymission/black_mesa/black_ops_entrance) "rQO" = ( /obj/structure/chair/sofa/bench/left, /obj/effect/turf_decal/siding/trimline/blue{ @@ -14086,9 +14122,9 @@ /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/xen/lost_camp) "rQX" = ( -/obj/effect/gibspawner/human, -/turf/simulated/floor/plating/ironsand, -/area/awaymission/black_mesa/hecu_zone_towards_facility) +/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/vortigaunt_hostile, +/turf/simulated/floor/plasteel/smooth, +/area/awaymission/black_mesa/lambda_teleporter) "rRP" = ( /obj/effect/mob_spawn/human/corpse/scientist{ pickable_species = list("Human"); @@ -14116,7 +14152,7 @@ }, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "rTn" = ( @@ -14241,6 +14277,7 @@ "sbd" = ( /obj/structure/table, /obj/structure/alien/xenoweeds, +/obj/item/paper/researchnotes, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "sbg" = ( @@ -14447,13 +14484,13 @@ /area/awaymission/black_mesa/high_security_emitter) "spC" = ( /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "spQ" = ( /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "sqa" = ( @@ -14466,10 +14503,7 @@ /area/awaymission/black_mesa/xen/nihilanth_arena) "sqh" = ( /obj/structure/table, -/obj/item/gun/energy/temperature{ - emagged = 1; - name = "faulty temperature gun" - }, +/obj/item/gun/energy/lasercannon, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/deep_sci_turret) "sqX" = ( @@ -14487,7 +14521,7 @@ pixel_x = -5 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "sre" = ( @@ -14575,11 +14609,10 @@ /turf/simulated/wall/indestructible/riveted, /area/awaymission/black_mesa) "swk" = ( -/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer, -/turf/simulated/floor/beach/away/coastline/xen{ - dir = 4 - }, -/area/awaymission/black_mesa/xen/acid_lake_hallway) +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/command, +/turf/simulated/floor/plasteel, +/area/awaymission/black_mesa/black_ops_turret_blockade) "swo" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/coffee, @@ -14601,7 +14634,7 @@ "sxP" = ( /obj/machinery/porta_turret/syndicate/black_mesa, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "sxR" = ( @@ -14698,7 +14731,7 @@ "sCc" = ( /obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/gas_emitter_chamber) "sCp" = ( @@ -14730,7 +14763,7 @@ pixel_x = 5 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "sCY" = ( @@ -14771,7 +14804,7 @@ /obj/structure/table, /obj/item/circular_saw/alien, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "sGw" = ( @@ -14779,7 +14812,7 @@ /obj/machinery/light_construct/directional/west, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "sHl" = ( @@ -14918,11 +14951,10 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_science_room) "sRN" = ( -/obj/structure/flora/biolumini/lamp, -/turf/simulated/floor/beach/away/coastline/xen{ - dir = 8 - }, -/area/awaymission/black_mesa/xen/acid_lake_hallway) +/obj/structure/rack, +/obj/item/whetstone, +/turf/simulated/floor/plasteel/smooth, +/area/awaymission/black_mesa/cryo_storage) "sSg" = ( /obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/hecu, /turf/simulated/floor/plasteel/white, @@ -15266,7 +15298,8 @@ "tto" = ( /obj/structure/lattice/catwalk/mining, /obj/machinery/power/emitter{ - dir = 4 + dir = 4; + anchored = 1 }, /turf/simulated/floor/chasm/straight_down/lava_land_surface/normal_air{ light_color = null; @@ -15310,7 +15343,7 @@ /area/awaymission/black_mesa/employee_dorm_room) "tvK" = ( /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa) "tvY" = ( @@ -15431,6 +15464,9 @@ /area/awaymission/black_mesa/hecu_zone_camp) "tFG" = ( /obj/effect/spawner/window/plastitanium, +/obj/machinery/door/poddoor/shutters{ + id_tag = "exp_room" + }, /turf/simulated/floor/plating, /area/awaymission/black_mesa/resonant_chamber) "tFL" = ( @@ -15440,16 +15476,13 @@ }, /area/awaymission/black_mesa/xen/acid_lake_hallway) "tFM" = ( -/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen/zombie, -/obj/effect/light_emitter{ - light_color = "#FFFFFF"; - set_cap = 1; - icon = 'modular_ss220/maps220/icons/mapping_helpers.dmi'; - icon_state = "sunlight_helper"; - layer = 10 +/obj/effect/bump_teleporter{ + id = "teleup"; + id_target = "teledown" }, -/turf/simulated/floor/plating/ironsand, -/area/awaymission/black_mesa/hecu_zone_towards_facility) +/obj/effect/turf_decal/box, +/turf/simulated/floor/mineral/titanium, +/area/awaymission/black_mesa/black_ops_hallway_two) "tFX" = ( /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/smooth, @@ -15696,7 +15729,7 @@ /obj/structure/closet/crate/can, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "tYo" = ( @@ -15711,7 +15744,7 @@ "tYG" = ( /obj/machinery/economy/vending/coffee/free, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "tZg" = ( @@ -15778,7 +15811,7 @@ /obj/structure/filingcabinet/chestdrawer, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "ueE" = ( @@ -15909,7 +15942,7 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/resonant_chamber) "umi" = ( @@ -15943,7 +15976,7 @@ icon_keyboard = "generic_key_broken" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "urh" = ( @@ -16056,7 +16089,7 @@ /obj/structure/bed/dogbed, /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "uza" = ( @@ -16260,9 +16293,9 @@ }, /area/awaymission/black_mesa/xen/nihilanth_arena) "uKC" = ( -/obj/structure/xen_pylon, -/turf/simulated/floor/plating/xen, -/area/awaymission/black_mesa/xen/nihilanth_computer) +/obj/effect/turf_decal/arrows, +/turf/simulated/floor/mineral/titanium, +/area/awaymission/black_mesa/black_ops_hallway_two) "uKJ" = ( /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/freeman_hallway) @@ -16292,15 +16325,9 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "uLn" = ( -/obj/effect/light_emitter{ - light_color = "#FFFFFF"; - set_cap = 1; - icon = 'modular_ss220/maps220/icons/mapping_helpers.dmi'; - icon_state = "sunlight_helper"; - layer = 10 - }, -/turf/simulated/floor/plating/asteroid, -/area/awaymission/black_mesa/hecu_zone_towards_facility) +/obj/structure/holosign/barrier, +/turf/simulated/floor/plasteel, +/area/awaymission/black_mesa/black_ops_entrance) "uLw" = ( /obj/structure/closet, /obj/item/storage/firstaid/brute, @@ -16309,7 +16336,7 @@ /obj/item/storage/firstaid/regular, /obj/item/storage/firstaid/toxin, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "uLA" = ( @@ -16334,12 +16361,10 @@ /turf/simulated/floor/plating/dirt/xen_dirt, /area/awaymission/black_mesa/xen/nihilanth_computer) "uNn" = ( -/obj/effect/bump_teleporter{ - id = "labup"; - id_target = "labdown" - }, -/turf/simulated/floor/mineral/titanium, -/area/awaymission/black_mesa/genetics_elevator) +/obj/structure/rack, +/obj/item/flash, +/turf/simulated/floor/plasteel/smooth, +/area/awaymission/black_mesa/cryo_storage) "uNr" = ( /obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen/zombie, /turf/simulated/floor/plasteel, @@ -16418,7 +16443,7 @@ /obj/machinery/light_construct/directional/west, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "uRJ" = ( @@ -16441,7 +16466,7 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "uRY" = ( @@ -16508,7 +16533,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "uVZ" = ( @@ -16794,7 +16819,7 @@ /obj/structure/table, /obj/item/folder/red, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "vpF" = ( @@ -16841,7 +16866,7 @@ dir = 4 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "vtP" = ( @@ -16984,14 +17009,13 @@ /turf/simulated/floor/plating, /area/awaymission/black_mesa/science_internal) "vFk" = ( -/obj/effect/turf_decal/siding/trimline/blue{ - alpha = 130; - dir = 4 +/obj/effect/bump_teleporter{ + id = "labup"; + id_target = "labdown" }, -/obj/structure/alien/xenoweeds, -/obj/structure/flora/biolumini/lamp/weaklight, -/turf/simulated/floor/plasteel/smooth, -/area/awaymission/black_mesa/entrance_internal_hall) +/obj/effect/turf_decal/box, +/turf/simulated/floor/mineral/titanium, +/area/awaymission/black_mesa/genetics_elevator) "vGh" = ( /obj/effect/turf_decal/siding/red, /obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/scientist_zombie, @@ -17072,7 +17096,7 @@ /obj/item/storage/toolbox/mechanical, /obj/item/clothing/gloves/color/yellow, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "vKo" = ( @@ -17147,7 +17171,7 @@ /obj/item/surgicaldrill/alien, /obj/item/hemostat/alien, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/high_security_surgery) "vPe" = ( @@ -17420,14 +17444,14 @@ /obj/item/folder/white, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "wje" = ( /obj/structure/flora/biolumini/mine/weaklight, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/resonant_chamber) "wlb" = ( @@ -17519,7 +17543,7 @@ "wpw" = ( /obj/machinery/light_construct/directional/north, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_decon_room) "wpZ" = ( @@ -17542,7 +17566,7 @@ /obj/structure/alien/xenoweeds, /obj/item/gun/projectile/automatic/pistol/enforcer/lethal, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "wrQ" = ( @@ -17560,7 +17584,7 @@ "wsn" = ( /obj/machinery/door/airlock/science/glass, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "wsC" = ( @@ -17722,7 +17746,7 @@ }, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "wBn" = ( @@ -17832,7 +17856,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "wKi" = ( @@ -17847,7 +17871,8 @@ "wKE" = ( /obj/structure/lattice/catwalk/mining, /obj/machinery/power/emitter{ - dir = 1 + dir = 1; + anchored = 1 }, /turf/simulated/floor/chasm/straight_down/lava_land_surface/normal_air{ light_color = null; @@ -17896,9 +17921,7 @@ /turf/simulated/floor/plating/dirt/xen_dirt, /area/awaymission/black_mesa/xen/nihilanth_computer) "wOg" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, +/obj/machinery/door/airlock/silver, /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/black_ops_server) "wOK" = ( @@ -17918,7 +17941,7 @@ name = "broken pod"; density = 1 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plating, /area/awaymission/black_mesa/xen/acid_lake_building) "wPx" = ( /obj/effect/baseturf_helper{ @@ -18030,7 +18053,7 @@ dir = 4 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "wTC" = ( @@ -18058,7 +18081,7 @@ dir = 1 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "wWn" = ( @@ -18130,7 +18153,7 @@ }, /obj/effect/landmark/awaymissions/black_mesa/random_mob_placer, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "wZH" = ( @@ -18244,7 +18267,7 @@ "xgX" = ( /obj/structure/railing/corner, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_decon_room) "xhR" = ( @@ -18268,12 +18291,8 @@ }, /area/awaymission/black_mesa/xen/freeman_hallway) "xlP" = ( -/obj/effect/bump_teleporter{ - id = "teleup"; - id_target = "teledown" - }, -/turf/simulated/floor/mineral/titanium, -/area/awaymission/black_mesa/black_ops_hallway_two) +/turf/simulated/floor/plating, +/area/awaymission/black_mesa/xen/acid_lake_building) "xmi" = ( /obj/machinery/photocopier, /turf/simulated/floor/plasteel/dark, @@ -18415,7 +18434,7 @@ }, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "xsq" = ( @@ -18459,7 +18478,7 @@ dir = 8 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "xwD" = ( @@ -18482,7 +18501,7 @@ /obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/xen, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "xxl" = ( @@ -18498,9 +18517,9 @@ /area/awaymission/black_mesa/entrance_internal_hall) "xxt" = ( /obj/machinery/light_construct/directional/west, -/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer, +/obj/effect/landmark/awaymissions/black_mesa/random_mob_placer/vortigaunt_hostile, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/resonant_chamber) "xxB" = ( @@ -18518,7 +18537,7 @@ "xyI" = ( /obj/effect/gibspawner/human, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "xyX" = ( @@ -18566,7 +18585,7 @@ /obj/structure/alien/xenoweeds, /obj/structure/reagent_dispensers/water_cooler, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/entrance_lobby) "xFf" = ( @@ -18585,7 +18604,7 @@ /obj/machinery/light/directional/south, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "xFO" = ( @@ -18627,7 +18646,7 @@ /area/awaymission/black_mesa/cryo_room) "xIf" = ( /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/resonant_chamber) "xIr" = ( @@ -18657,7 +18676,7 @@ dir = 1 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "xKJ" = ( @@ -18700,7 +18719,7 @@ "xOI" = ( /obj/effect/mob_spawn/human/corpse/damaged, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_internal) "xOS" = ( @@ -18717,9 +18736,7 @@ /turf/simulated/floor/plasteel/smooth, /area/awaymission/black_mesa/deep_sci_medbay) "xPM" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, +/obj/machinery/door/airlock/silver, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/black_ops_button) "xPR" = ( @@ -18753,7 +18770,7 @@ /obj/machinery/light_construct/directional/south, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/resonant_chamber) "xSs" = ( @@ -18801,7 +18818,7 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/science_labs) "xVj" = ( @@ -18818,7 +18835,7 @@ /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/freeman_arena) "xVG" = ( -/obj/item/ammo_box/magazine/wt550m9, +/obj/item/ammo_box/magazine/m556, /turf/simulated/floor/plating/xen, /area/awaymission/black_mesa/xen/freeman_puzzle) "xVR" = ( @@ -18860,7 +18877,7 @@ /obj/item/chair/stool, /obj/structure/alien/xenoweeds, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/equipment_room) "xYx" = ( @@ -18916,7 +18933,9 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/power/emitter, +/obj/machinery/power/emitter{ + anchored = 1 + }, /turf/simulated/floor/catwalk, /area/awaymission/black_mesa/scientist_hall) "yai" = ( @@ -18997,9 +19016,11 @@ /turf/simulated/floor/plating/asteroid, /area/awaymission/black_mesa/hecu_zone_towards_facility) "yhB" = ( -/obj/structure/flora/biolumini/flower, -/turf/simulated/floor/beach/away/coastline/xen, -/area/awaymission/black_mesa/xen/acid_lake_hallway) +/obj/structure/table, +/obj/structure/alien/xenoweeds, +/obj/item/healthanalyzer/advanced, +/turf/simulated/floor/plasteel, +/area/awaymission/black_mesa/entrance_lobby) "yia" = ( /obj/structure/cable{ d1 = 4; @@ -19077,7 +19098,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel/dark{ - icon_state = "blackfull" + icon_state = "dark" }, /area/awaymission/black_mesa/security_outpost) "ylL" = ( @@ -19444,11 +19465,6 @@ cBU cBU cBU cBU -pDM -pDM -pDM -pDM -pDM cBU cBU cBU @@ -19607,13 +19623,13 @@ cBU cBU cBU cBU -"} -(3,1,1) = {" cBU cBU cBU cBU cBU +"} +(3,1,1) = {" cBU cBU cBU @@ -19699,14 +19715,6 @@ cBU cBU cBU cBU -pDM -pDM -pDM -eIT -eIT -coE -pDM -pDM cBU cBU cBU @@ -19864,8 +19872,6 @@ cBU cBU cBU cBU -"} -(4,1,1) = {" cBU cBU cBU @@ -19879,6 +19885,8 @@ cBU cBU cBU cBU +"} +(4,1,1) = {" cBU cBU cBU @@ -19955,16 +19963,6 @@ cBU cBU cBU cBU -pDM -pDM -eIT -eja -eIT -fie -eIT -eIT -pDM -pDM cBU cBU cBU @@ -19979,23 +19977,6 @@ cBU cBU cBU cBU -pDM -pDM -pDM -pDM -pDM -pDM -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -20019,6 +20000,13 @@ cBU cBU cBU cBU +pDM +pDM +pDM +pDM +pDM +pDM +pDM cBU cBU cBU @@ -20036,9 +20024,6 @@ cBU cBU cBU cBU -pDM -pDM -pDM cBU cBU cBU @@ -20072,6 +20057,9 @@ cBU cBU cBU cBU +pDM +pDM +pDM cBU cBU cBU @@ -20121,8 +20109,6 @@ cBU cBU cBU cBU -"} -(5,1,1) = {" cBU cBU cBU @@ -20156,6 +20142,8 @@ cBU cBU cBU cBU +"} +(5,1,1) = {" cBU cBU cBU @@ -20211,17 +20199,6 @@ cBU cBU cBU cBU -pDM -pDM -mBt -eIT -eIT -eIT -eIT -eIT -eIT -eIT -pDM cBU cBU cBU @@ -20230,23 +20207,6 @@ cBU cBU cBU cBU -pDM -pDM -pDM -pDM -pDM -pDM -pDM -rSN -rSN -aug -oHA -tFL -pDM -pDM -pDM -pDM -pDM cBU cBU cBU @@ -20294,26 +20254,15 @@ cBU pDM pDM pDM -hMz pDM pDM pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +rSN +rSN +aug +oHA +tFL pDM pDM pDM @@ -20363,54 +20312,147 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -"} -(6,1,1) = {" -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +pDM +pDM +hMz +pDM +pDM +pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +pDM +pDM +pDM +pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +"} +(6,1,1) = {" +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -20458,27 +20500,6 @@ cBU cBU cBU cBU -pDM -pDM -pDM -pDM -pDM -pDM -pDM -pDM -pDM -pDM -pDM -oHA -oHA -oHA -oHA -oHA -kPc -oHA -swk -oHA -pDM pDM pDM pDM @@ -20502,9 +20523,6 @@ coV coV coV coV -cYW -pDM -pDM pDM cBU cBU @@ -20515,11 +20533,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU pDM pDM pDM @@ -20547,6 +20560,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM pDM hMz @@ -20714,29 +20735,29 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +pDM pDM pDM -qfg -qnz -qnz -coV -coV -coV -coV -coV -coV -coV -coV -coV -coV -coV -coV -coV -coV -coV -coV -coV -coV coV coV coV @@ -20759,10 +20780,6 @@ coV coV coV coV -coV -coV -coV -pDM pDM pDM cBU @@ -20771,10 +20788,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU pDM pDM pDM @@ -20803,6 +20816,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM pDM egj @@ -20971,27 +20992,27 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +pDM pDM -rzl -qnz -qnz -coV -qnz -coV -coV -coV -coV -coV -coV -coV -coV -coV -coV -cYW -coV -coV -coV -coV coV coV coV @@ -21017,14 +21038,6 @@ coV coV coV coV -coV -coV -coV -coV -pDM -pDM -pDM -pDM pDM pDM pDM @@ -21059,6 +21072,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM pDM egj @@ -21227,28 +21248,28 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM pDM coV -qnz -qnz -coV -coV -coV -pDM -pDM -pDM -pDM -pDM -pDM -coV -coV -coV -coV -coV -coV -coV -coV coV coV coV @@ -21284,14 +21305,6 @@ coV coV coV coV -coV -coV -coV -coV -coV -coV -coV -coV ccM pxr wwZ @@ -21316,6 +21329,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -21484,31 +21505,31 @@ cBU cBU cBU cBU -pDM -sLJ -qnz -qnz -qnz -qnz -pDM -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU cBU pDM pDM -pDM -pDM -pDM -pDM -pDM -pDM -pDM -pDM -pDM -egN +qnz +qnz +coV +coV +aaL egN pZW egN @@ -21534,14 +21555,6 @@ coV coV coV coV -coV -coV -coV -bYn -coV -coV -coV -coV cYW coV coV @@ -21573,6 +21586,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -21741,13 +21762,6 @@ cBU cBU cBU cBU -pDM -qnz -qnz -qnz -qnz -pDM -pDM cBU cBU cBU @@ -21764,6 +21778,13 @@ cBU cBU cBU cBU +cBU +pDM +pDM +qnz +qnz +coV +coV pDM pDM pDM @@ -21798,14 +21819,6 @@ coV coV coV coV -coV -coV -coV -coV -coV -coV -coV -coV kRH aaL jPD @@ -21830,6 +21843,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -21867,7 +21888,7 @@ vmV vmV bRL vmV -iua +vmV vmV pDM pDM @@ -21998,14 +22019,6 @@ cBU cBU cBU cBU -pDM -qnz -qnz -coV -pDM -pDM -cBU -cBU cBU cBU cBU @@ -22022,6 +22035,14 @@ cBU cBU cBU cBU +pDM +pDM +lKn +coV +qnz +coV +coV +pDM cBU cBU cBU @@ -22044,14 +22065,6 @@ cBU cBU pDM pDM -pDM -coV -coV -coV -coV -coV -coV -coV coV coV bYn @@ -22087,6 +22100,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -22255,15 +22276,6 @@ cBU cBU cBU cBU -pDM -coV -qnz -coV -pDM -cBU -cBU -cBU -cBU cBU cBU cBU @@ -22280,6 +22292,14 @@ cBU cBU cBU cBU +pDM +eIT +jTT +coV +coV +coV +coV +pDM cBU cBU cBU @@ -22302,13 +22322,6 @@ cBU cBU cBU pDM -pDM -pDM -coV -coV -coV -cYW -coV coV coV coV @@ -22344,6 +22357,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -22512,17 +22533,6 @@ cBU cBU cBU cBU -pDM -coV -coV -coV -pDM -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -22539,6 +22549,14 @@ cBU cBU cBU cBU +pDM +eIT +jTT +coV +coV +coV +coV +pDM cBU cBU cBU @@ -22567,11 +22585,6 @@ pDM pDM pDM pDM -pDM -pDM -pDM -pDM -pDM coV coV coV @@ -22601,6 +22614,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -22768,22 +22789,6 @@ cBU cBU cBU cBU -pDM -pDM -bYn -coV -coV -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -22801,6 +22806,14 @@ cBU cBU cBU cBU +pDM +eIT +jTT +coV +coV +coV +coV +pDM cBU cBU cBU @@ -22858,6 +22871,14 @@ pDM cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM hyk egj @@ -23025,23 +23046,6 @@ cBU cBU cBU cBU -pDM -jTT -coV -coV -coV -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -23058,6 +23062,15 @@ cBU cBU cBU cBU +pDM +pDM +ekK +jTT +coV +coV +coV +coV +pDM cBU cBU cBU @@ -23115,6 +23128,14 @@ pDM cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM uKJ uKJ @@ -23282,15 +23303,6 @@ cBU cBU cBU cBU -pDM -jTT -coV -coV -bYn -pDM -cBU -cBU -cBU cBU cBU cBU @@ -23307,6 +23319,15 @@ cBU cBU cBU cBU +pDM +eIT +eIT +jTT +coV +coV +coV +coV +pDM cBU cBU cBU @@ -23356,6 +23377,11 @@ cBU cBU cBU cBU +pDM +pDM +eIT +hoQ +pDM cBU cBU cBU @@ -23364,11 +23390,6 @@ cBU cBU cBU cBU -pDM -pDM -eIT -hoQ -pDM cBU cBU cBU @@ -23539,15 +23560,6 @@ cBU cBU cBU cBU -pDM -yhB -coV -qnz -coV -pDM -cBU -cBU -cBU cBU cBU cBU @@ -23564,6 +23576,15 @@ cBU cBU cBU cBU +pDM +mBt +eIT +jTT +coV +coV +coV +pDM +pDM cBU cBU cBU @@ -23614,6 +23635,10 @@ cBU cBU cBU cBU +pDM +eIT +hoQ +pDM cBU cBU cBU @@ -23622,10 +23647,6 @@ cBU cBU cBU cBU -pDM -eIT -hoQ -pDM cBU cBU cBU @@ -23796,22 +23817,6 @@ cBU cBU cBU cBU -pDM -pDM -coV -qnz -coV -pDM -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -23828,6 +23833,14 @@ cBU cBU cBU cBU +pDM +fie +kRO +sLJ +qnz +coV +coV +pDM cBU cBU cBU @@ -23886,6 +23899,14 @@ pDM pDM cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM jAL uKJ @@ -24054,22 +24075,6 @@ cBU cBU cBU cBU -pDM -qnz -qnz -qnz -qnz -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -24085,6 +24090,14 @@ cBU cBU cBU cBU +pDM +pDM +pDM +qnz +qnz +qnz +coV +pDM cBU cBU cBU @@ -24143,6 +24156,14 @@ eIT pDM cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM uKJ hyk @@ -24311,22 +24332,6 @@ cBU cBU cBU cBU -pDM -qnz -qnz -qnz -qnz -pDM -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -24343,6 +24348,14 @@ cBU cBU cBU cBU +pDM +pDM +qnz +qnz +coV +coV +pDM +pDM cBU cBU cBU @@ -24400,6 +24413,14 @@ eIT pDM cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM uKJ uKJ @@ -24568,22 +24589,7 @@ cBU cBU cBU cBU -pDM -pDM -qnz -qnz -qnz -qnz -pDM -pDM -pDM cBU -pDM -pDM -pDM -pDM -pDM -pDM cBU cBU cBU @@ -24600,6 +24606,13 @@ cBU cBU cBU cBU +pDM +qnz +coV +coV +coV +coV +pDM cBU cBU cBU @@ -24657,6 +24670,14 @@ hoQ pDM cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -24826,36 +24847,6 @@ cBU cBU cBU cBU -pDM -pDM -qnz -qnz -qnz -qnz -coV -pDM -pDM -pDM -oHA -oHA -oHA -aug -pDM -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -24872,6 +24863,28 @@ cBU cBU cBU cBU +pDM +coV +coV +coV +coV +qnz +pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -24914,6 +24927,14 @@ hoQ pDM cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -25084,36 +25105,11 @@ cBU cBU cBU cBU -pDM -qnz -qnz -qnz -coV -coV -coV -coV -coV -coV -coV -coV -coV -coV -pDM -pDM -pDM -pDM cBU cBU cBU cBU cBU -pDM -pDM -pDM -pDM -pDM -pDM -pDM cBU cBU cBU @@ -25124,6 +25120,23 @@ cBU cBU cBU cBU +pDM +pDM +coV +coV +qnz +qnz +pDM +cBU +pDM +pDM +pDM +pDM +pDM +pDM +pDM +cBU +cBU cBU cBU cBU @@ -25171,6 +25184,14 @@ eIT pDM cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM pDM egj @@ -25341,27 +25362,27 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -pDM +coV coV qnz qnz -coV -coV -coV -coV -bYn -coV -coV -coV -coV -coV -coV -coV -pDM -pDM -pDM -pDM pDM pDM pDM @@ -25403,14 +25424,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU pDM hoQ hoQ @@ -25429,6 +25442,14 @@ pDM cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -25599,6 +25620,21 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM pDM coV @@ -25606,21 +25642,6 @@ coV coV coV coV -coV -coV -coV -coV -coV -coV -coV -cYW -coV -qnz -qnz -qnz -qnz -qnz -coV bYn coV coV @@ -25660,14 +25681,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU pDM pDM hoQ @@ -25686,6 +25699,14 @@ pDM cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -25857,11 +25878,23 @@ cBU cBU cBU cBU -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM coV -cYW -coV coV coV coV @@ -25873,18 +25906,6 @@ coV coV coV coV -qnz -qnz -qnz -qnz -qnz -coV -coV -coV -coV -coV -coV -coV coV coV coV @@ -25918,14 +25939,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU pDM pDM hoQ @@ -25943,6 +25956,14 @@ pDM cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -26115,14 +26136,20 @@ cBU cBU cBU cBU -pDM -pDM -aOq -kwz -egN -lKn -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM pDM coV @@ -26132,12 +26159,6 @@ coV qnz coV qnz -qnz -qnz -qnz -qnz -coV -qnz coV coV coV @@ -26174,14 +26195,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU pDM pDM pDM @@ -26200,6 +26213,14 @@ pDM cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -26373,18 +26394,21 @@ cBU cBU cBU cBU -pDM -pDM -pDM -pDM -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU pDM pDM -pDM -coV coV coV coV @@ -26392,9 +26416,6 @@ coV qnz qnz qnz -qnz -qnz -qnz coV coV coV @@ -26428,14 +26449,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU pDM pDM pDM @@ -26457,6 +26470,14 @@ pDM cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -26640,15 +26661,15 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU pDM pDM pDM pDM pDM -sRN -egN -egN -pDM pDM pDM pDM @@ -26683,14 +26704,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU pDM pDM pDM @@ -26714,6 +26727,14 @@ pDM cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM pDM egj @@ -26901,11 +26922,11 @@ cBU cBU cBU cBU -pDM -pDM -pDM -pDM -pDM +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -26938,14 +26959,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU pDM pDM pDM @@ -26972,6 +26985,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -27194,14 +27215,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU pDM pDM hoQ @@ -27229,6 +27242,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -27451,14 +27472,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU pDM hoQ eIT @@ -27466,7 +27479,7 @@ eIT coE eIT eIT -eIT +hoQ eIT eIT eIT @@ -27486,6 +27499,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM pDM egj @@ -27708,22 +27729,14 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU pDM pDM -hoQ -eIT eIT eIT eIT eIT eIT +hoQ eIT eIT wZR @@ -27744,6 +27757,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -27805,7 +27826,7 @@ nmA fDl aHI aHI -cbQ +fbn nmA lQm lQm @@ -27966,12 +27987,7 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM pDM eIT eIT @@ -27980,12 +27996,9 @@ eIT eIT eIT eIT -hoQ -hoQ -hoQ -hoQ -hoQ -hoQ +eIT +eIT +eIT pDM pDM pDM @@ -28001,6 +28014,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM egj egj @@ -28212,9 +28233,6 @@ glb glb glb pDM -pDM -pDM -cBU cBU cBU cBU @@ -28227,22 +28245,17 @@ cBU cBU cBU cBU -cBU -cBU -pDM -hoQ -eIT -eIT -eIT -eIT -eIT -pDM pDM pDM pDM pDM pDM pDM +eIT +eIT +eIT +hoQ +hoQ pDM cBU cBU @@ -28258,6 +28271,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM pDM egj @@ -30884,7 +30905,7 @@ qQx tMu aHI aHI -cbQ +fbn nmA lQm lQm @@ -31284,7 +31305,7 @@ coD duq dEx lUJ -lUJ +xlP pzr kbV lUJ @@ -31398,7 +31419,7 @@ lQm nmA aHI aHI -cbQ +fbn nmA lQm lQm @@ -32051,7 +32072,7 @@ glb rJm pzr keq -lUJ +xlP uzo uzo lUJ @@ -32315,7 +32336,7 @@ pzr pzr pzr uzo -lUJ +xlP pzr jSI uCx @@ -32415,7 +32436,7 @@ aHI nmA aHI aHI -cbQ +fbn nmA ddQ lQm @@ -32571,7 +32592,7 @@ oKR bQp pzr xGo -uzo +rzl uzo pzr lUJ @@ -32672,7 +32693,7 @@ aHI tMu aHI aHI -cbQ +fbn nmA lQm lQm @@ -32928,7 +32949,7 @@ cbQ cjE nmA aHI -cbQ +fbn xRP nmA weS @@ -33342,7 +33363,7 @@ uzo lUJ pzr wOT -lUJ +xlP uWR qEp mKp @@ -35484,7 +35505,7 @@ cBU cBU pDM htb -cNs +jUd lwD cNs cNs @@ -35523,7 +35544,7 @@ cNs cNs cNs lwD -cNs +kwz kCU pDM cBU @@ -35741,7 +35762,7 @@ cBU cBU pDM htb -cNs +jUd cNs cNs cNs @@ -35780,7 +35801,7 @@ cNs cNs cNs cNs -cNs +kwz kCU pDM cBU @@ -37001,8 +37022,8 @@ sOI sOI sOI sOI -sOI -sOI +plT +plT plT sOI sOI @@ -38093,7 +38114,7 @@ xik inc inc inc -inc +xoF pDM cBU cBU @@ -38607,7 +38628,7 @@ inc inc inc inc -inc +xoF pDM cBU cBU @@ -38864,16 +38885,16 @@ inc inc inc inc -inc +xoF +pDM pDM cBU cBU cBU -cBU -cBU -cBU -cBU -cBU +pDM +pDM +pDM +pDM cBU cBU cBU @@ -39121,17 +39142,17 @@ inc inc inc inc -inc +xoF +pDM pDM cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +gnh +mPy +dkS +pDM +pDM cBU cBU cBU @@ -39378,7 +39399,16 @@ inc inc inc inc +xoF +pDM +pDM +pDM +pDM +pDM +inc inc +cPK +coH pDM cBU cBU @@ -39387,17 +39417,8 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -"} -(80,1,1) = {" +"} +(80,1,1) = {" cBU cBU cBU @@ -39638,14 +39659,14 @@ inc inc pDM pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +xoF +xoF +inc +inc +inc +inc +pDM cBU cBU cBU @@ -39872,7 +39893,7 @@ inc inc inc inc -uKC +inc fYx fYx inc @@ -39894,6 +39915,14 @@ inc inc inc xoF +xoF +xoF +xoF +xoF +coH +inc +inc +xMl pDM cBU cBU @@ -39902,14 +39931,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU "} (82,1,1) = {" cBU @@ -40152,14 +40173,14 @@ inc inc xoF pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +xoF +xoF +inc +cPK +inc +inc +pDM cBU cBU cBU @@ -40410,13 +40431,13 @@ inc xoF pDM pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +xoF +inc +sXb +inc +iPU +pDM cBU cBU cBU @@ -40624,186 +40645,55 @@ cBU cBU cBU cBU -cBU -cBU -cBU pDM pDM -xoF +pDM +pDM +pDM +pDM +pDM xoF inc inc -lZe -xik inc -rnD +inc +inc cNs cNs -rnD +inc inc inc inc fYx -uMq +xik fYx inc inc inc -rnD +inc cNs cNs -rnD inc inc -lZe inc inc inc -ibM inc inc inc inc -xoF +inc +inc +inc xoF pDM cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -"} -(85,1,1) = {" -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -pDM -xti -xti -xti -xti -apu -xti -wIg -wIg -wIg -wIg -wIg -wIg -wIg -wIg -xti -xti -xti -wIg -xti -xti -obr -xti -xti -xti -xti -sfp -xti -xti pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU pDM -sXe -pui pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +dkS +coH pDM -glb -glb -glb -dPL -glb -glb -glb -glb -glb -glb -glb -glb -glb -glb -glb -glb -glb -glb -qIh -glb -qIh -glb -glb -glb -glb -glb -qIh -qIh pDM cBU cBU @@ -40812,34 +40702,8 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -eJa -cBU -cBU -cBU -cBU -eJa -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +"} +(85,1,1) = {" cBU cBU cBU @@ -40874,6 +40738,36 @@ cBU cBU cBU cBU +pDM +xti +xti +xti +xti +apu +xti +wIg +wIg +wIg +wIg +wIg +wIg +wIg +wIg +xti +xti +xti +wIg +xti +xti +obr +xti +xti +xti +xti +sfp +xti +xti +pDM cBU cBU cBU @@ -40886,33 +40780,160 @@ cBU cBU cBU pDM -xoF +sXe +pui +pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +pDM +glb +glb +glb +glb +glb +glb +glb +glb +glb +glb +glb +glb +glb +glb +glb +glb +glb +glb +qIh +glb +qIh +glb +glb +glb +glb +glb +qIh +qIh +pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +pDM +mPy +cPK +inc +inc +pDM +pDM xoF inc +lZe inc +mPy inc +cNs +cNs inc inc inc -eaI -cNs -vQy -psj -psj -psj -fYx +qqU +inc fYx fYx -psj -psj -psj -vQy -cNs -eaI +qqU inc inc inc +cNs +cNs +inc +mPy inc +lZe inc inc inc @@ -40922,14 +40943,14 @@ inc inc inc xoF -xoF pDM cBU cBU cBU -cBU -cBU -cBU +pDM +pDM +pDM +pDM cBU cBU cBU @@ -41080,12 +41101,7 @@ cBU cBU cBU cBU -eJa -cBU -cBU -cBU cBU -eJa cBU cBU cBU @@ -41143,42 +41159,46 @@ cBU cBU cBU pDM +pDM +inc +inc +lbw +inc xoF +pDM xoF inc inc -lZe inc inc inc cNs cNs -iew -fYx -waR -fYx -fYx -fYx +inc +inc +inc +inc fYx fYx -waR fYx -wNR +inc +inc +inc +inc cNs cNs inc inc inc -lZe inc inc inc +bpk inc inc inc inc inc -bpk xoF pDM cBU @@ -41195,6 +41215,7 @@ cBU cBU cBU cBU +cBU "} (87,1,1) = {" cBU @@ -41306,7 +41327,7 @@ nkg rJm glb glb -dPL +qIh glb glb glb @@ -41337,12 +41358,7 @@ cBU cBU cBU cBU -eJa -gqw -alh -cBU cBU -eJa cBU cBU cBU @@ -41400,34 +41416,38 @@ cBU cBU cBU pDM -xoF -xoF +ixB +inc +qIz inc inc +xoF +xoF +xoF inc +lZe inc inc inc cNs cNs -iew -waR -avx -fYx -fYx +inc +inc +inc +inc fYx fYx fYx -avx -waR -wNR +inc +inc +inc +inc cNs cNs inc -jtF -inc inc inc +lZe inc inc inc @@ -41439,6 +41459,7 @@ inc xoF pDM pDM +pDM cBU cBU cBU @@ -41594,12 +41615,7 @@ cBU cBU cBU cBU -eJa cBU -pLR -xZJ -cBU -eJa cBU cBU cBU @@ -41657,34 +41673,37 @@ cBU cBU cBU pDM +pDM +inc +inc +inc +inc +xoF +pDM xoF xoF inc inc -lZe -inc inc inc cNs cNs -iew -fYx -waR -fYx -fYx -fYx -fYx -fYx -waR +inc +inc +inc +inc +inc +inc fYx -wNR +inc +inc +inc +inc cNs cNs inc inc inc -lZe -inc inc inc inc @@ -41694,7 +41713,6 @@ inc inc inc inc -xoF pDM pDM cBU @@ -41709,6 +41727,9 @@ cBU cBU cBU cBU +cBU +cBU +cBU "} (89,1,1) = {" cBU @@ -41804,7 +41825,7 @@ pDM pDM sXe sXe -sXe +fPn rJm glb glb @@ -41838,25 +41859,21 @@ cBU cBU cBU cBU -xrh -xrh -xrh -xrh -xrh -xrh -xrh -xrh -xrh -xrh -xrh -xrh -xrh -eJa -rzP -lnj -nKH -alh -eJa +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -41914,45 +41931,45 @@ cBU cBU cBU pDM -xoF +lbw +inc inc inc +xoF +pDM +xoF +xoF +lZe inc inc +rnD +cNs +cNs +rnD inc inc inc -cNs -oGW -vQy -tDf -tDf -tDf fYx fYx fYx -tDf -tDf -tDf -vQy -eaI -cNs -inc inc inc inc +rnD +cNs +cNs +rnD inc -qll inc +lZe inc +xik inc inc inc inc -tax inc inc -xoF pDM cBU cBU @@ -41966,6 +41983,10 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU "} (90,1,1) = {" cBU @@ -42095,35 +42116,31 @@ cBU cBU cBU cBU -xrh -byo -byo -uba -byo -byo -byo -byo -byo -byo -uba -byo -byo -eJa -eJa -tQw -qqZ -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -42171,35 +42188,33 @@ cBU cBU cBU pDM -xoF +cPK inc +ixB +pDM +pDM +pDM +xoF +xoF inc inc -lZe inc inc -rnD cNs cNs -rnD -inc -inc -inc +vQy +psj +psj +psj fYx -idq fYx -inc -inc -inc -rnD -cNs -cNs -rnD -inc -inc -lZe -inc -inc +fYx +psj +psj +psj +vQy +oGW +oGW inc inc inc @@ -42208,9 +42223,15 @@ inc inc inc inc +tax inc xoF pDM +pDM +cBU +cBU +cBU +cBU cBU cBU cBU @@ -42352,34 +42373,24 @@ cBU cBU cBU cBU -xrh -byo -byo -byo -byo -byo -byo -byo -byo -gPT -byo -iZg -byo -eJa -tGI -tQw -tQw -cXa -pPH -tQw -dVy -tQw -tQw +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU eJa -kEn -dpl -kik -rBh +cBU +cBU +cBU +cBU eJa cBU cBU @@ -42421,45 +42432,50 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM pDM -pDM +upk pDM pDM cBU pDM +pDM xoF -inc -inc -inc -inc +lZe inc inc inc cNs cNs -inc -inc -inc -inc +iew fYx +waR fYx fYx -inc -inc -inc -inc +fYx +fYx +fYx +waR +fYx +wNR cNs cNs inc inc inc -inc -inc -inc -inc -inc -inc +lZe inc inc inc @@ -42480,6 +42496,11 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU "} (92,1,1) = {" cBU @@ -42609,34 +42630,24 @@ cBU cBU cBU cBU -xrh -iZg -byo -llO -jFC -byo -tiU -llO -byo -qrX -jFC -byo -byo +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU eJa -naq -bnK -bnK -bnK -qWm -uxS -tQw -fQr -tQw -hsS -rit -rit -rUp -rit +cBU +cBU +cBU +cBU eJa cBU cBU @@ -42678,42 +42689,49 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -mPy -cPK -inc pDM pDM +cBU +cBU +pDM pDM xoF -xoF -inc inc -lZe inc inc inc cNs cNs -inc -inc -inc -inc +iew +waR +avx fYx fYx fYx -inc -inc -inc -inc +fYx +fYx +avx +waR +wNR cNs cNs inc inc inc -lZe -inc -inc inc inc inc @@ -42721,8 +42739,6 @@ inc inc inc inc -inc -xoF pDM pDM cBU @@ -42737,6 +42753,11 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU "} (93,1,1) = {" cBU @@ -42866,34 +42887,24 @@ cBU cBU cBU cBU -xrh -tKJ -byo -ocA -ggX -byo -fOx -ggX -byo -mML -ggX -byo -tKJ -eJa -kcY -bnK -bnK -bnK -hPO -tQw -tQw -cXa -tQw +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU eJa -abt -rit -qVj -hRl +gqw +alh +cBU +cBU eJa cBU cBU @@ -42934,53 +42945,63 @@ cBU cBU cBU cBU -pDM -pDM -inc -inc -lbw -inc -xoF +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM xoF lZe inc -inc -inc -inc -inc +xik inc cNs cNs -inc -inc -inc -inc -inc +iew fYx +waR fYx -inc -inc -inc -inc +fYx +fYx +fYx +fYx +waR +fYx +wNR cNs cNs inc inc inc -inc -inc -inc -inc -xik -inc -inc +lZe inc inc inc inc xoF pDM +pDM +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -43123,35 +43144,45 @@ cBU cBU cBU cBU -xrh -byo -byo -byo -byo -byo -byo -iZg -gPT -byo -byo -byo -byo -eJa -uRJ -bnK -fqj -cXa -hPO -mDg -tQw -nKw -cXa -eJa -pZY -uVv -qpe -qpe -eJa +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +eJa +cBU +pLR +xZJ +cBU +eJa +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -43192,44 +43223,27 @@ cBU cBU cBU pDM -ixB -inc -qIz -inc -inc -xoF -xoF xoF -xoF -lZe inc -lZe -inc -iPU -inc -cNs -cNs inc inc inc -qqU +oGW +eaI +vQy +tDf +tDf +tDf fYx fYx -inc -qqU -inc -inc -inc +fYx +tDf +tDf +tDf +vQy cNs cNs inc -upk -inc -lZe -inc -inc -inc -inc inc inc inc @@ -43238,6 +43252,13 @@ inc inc xoF pDM +pDM +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -43340,7 +43361,7 @@ sXe sXe sXe sXe -alo +sXe sXe sXe sXe @@ -43381,37 +43402,23 @@ cBU cBU cBU xrh -byo -byo -pXr -jFC -byo -xrX -jFC -byo -llO -bUq -byo -byo -eJa -kcY -bnK -bnK -cXa -gmt -xKJ -qWm -qWm -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa +xrh +xrh +xrh +xrh +xrh +xrh +xrh +xrh +xrh +xrh +xrh +xrh eJa +rzP +lnj +nKH +alh eJa cBU cBU @@ -43448,25 +43455,39 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM pDM -inc -inc -inc -inc -xoF -pDM -xoF -xoF lZe inc inc -inc -inc -inc +rnD cNs cNs -inc +rnD inc inc inc @@ -43476,25 +43497,25 @@ fYx inc inc inc -inc +rnD cNs cNs +rnD inc inc -inc -inc -inc -inc -inc -inc -inc -inc -inc -inc +lZe inc inc xoF pDM +pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -43638,55 +43659,65 @@ cBU cBU cBU xrh -tKJ byo -tSb -ggX byo -ocA -ggX +uba +byo +byo +byo +byo +byo +byo +uba byo -mML -ggX byo -tKJ eJa -bxi -cXa -bnK -aTy -tQw -tQw -bnK -bnK -ueF -eeL -tQw -nKj -iRm -nKH -qEe -hcm +eJa tQw -pqV +qqZ +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa eJa -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -43707,17 +43738,7 @@ cBU cBU cBU pDM -lbw -inc -inc -inc -xoF -pDM -xoF -xoF -inc inc -lZe inc inc inc @@ -43729,7 +43750,7 @@ inc inc fYx fYx -inc +fYx inc inc inc @@ -43739,14 +43760,6 @@ cNs inc inc inc -lZe -inc -inc -inc -inc -inc -inc -inc inc inc inc @@ -43765,6 +43778,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (97,1,1) = {" cBU @@ -43899,51 +43920,61 @@ byo byo byo byo -gPT -cAx byo -gPT byo byo byo -xrh +gPT +byo +iZg +byo eJa -pqV -nnq -bnK +tGI +tQw tQw -bnK -bnK -bnK -cXa cXa -bnK +pPH tQw -bnK -bnK -bnK -nnq -nnq +dVy tQw tQw -fcg -lJG -lJG -lJG -lJG -woq -cKL -oHR -lJG -lJG -cKL -cKL -iEv -lJG -lJG -lJG -baK -gpI +eJa +kEn +dpl +kik +rBh +eJa +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -43964,17 +43995,7 @@ cBU cBU cBU pDM -cPK -inc -ixB -pDM -pDM -pDM -xoF -xoF -inc -inc -inc +lZe inc inc inc @@ -43986,7 +44007,7 @@ inc inc fYx fYx -fYx +inc inc inc inc @@ -43996,19 +44017,19 @@ cNs inc inc inc -inc -inc -inc -inc -inc -inc -inc -inc -inc -inc +lZe inc xoF pDM +pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -44152,55 +44173,34 @@ cBU cBU cBU xrh +iZg byo +llO +jFC byo -xrX -xrX +tiU +llO byo -aGZ -xrX +qrX +jFC byo -llO -pXr byo -pzi -tQw +eJa +naq bnK -tQw -hcm -tQw bnK -cXa bnK +qWm +uxS tQw -bnK -bnK -cXa -bnK -bnK -bnK -ueF -bnK -bnK -cXa +fQr +tQw +hsS +rit +rit +rUp +rit eJa -cKL -cKL -cKL -oHR -cKL -lJG -lJG -lJG -lJG -vTw -cKL -rbQ -cKL -cKL -lJG -vTw -gpI cBU cBU cBU @@ -44220,45 +44220,57 @@ cBU cBU cBU cBU -pDM -pDM -upk -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU pDM -xoF -lZe inc -kBd -lZe -xik inc -rnD +inc +inc cNs cNs -rnD inc inc inc -fYx +inc fYx fYx inc inc inc -rnD -cNs -cNs -rnD inc inc -lZe -inc -inc -inc -mPy -inc +cNs +cNs inc inc inc @@ -44279,6 +44291,15 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (99,1,1) = {" cBU @@ -44411,53 +44432,60 @@ cBU xrh tKJ byo -mML -ggX -byo ocA ggX byo fOx ggX byo -kEM -tQw +mML +ggX +byo +tKJ +eJa +kcY bnK -tQw +bnK +bnK +hPO tQw tQw cXa tQw -tQw -fqj -bnK -bnK -ueF -bnK -bnK -cXa -bnK -bnK -bnK -ueF eJa -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -gpI -cKL -cKL -gpI +abt +rit +qVj +hRl +eJa +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -44478,50 +44506,34 @@ cBU cBU cBU cBU -pDM -pDM -pDM cBU cBU pDM -xoF -xoF -inc -inc -inc +pDM inc inc inc cNs -oGW -vQy -psj -psj -psj -fYx -fYx -fYx -psj -psj -psj -vQy -eaI cNs inc inc inc inc +fYx inc +fYx inc inc inc inc +cNs +cNs inc inc inc inc -xoF -xoF +inc +pDM pDM cBU cBU @@ -44536,6 +44548,15 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (100,1,1) = {" cBU @@ -44667,36 +44688,32 @@ cBU cBU xrh byo -etk byo byo byo byo byo +iZg +gPT byo byo byo -gPT byo -tQw -cXa -tQw -tQw -bnK -bnK -bnK -bnK -tQw +eJa +uRJ bnK +ibM +cXa +hPO +mDg tQw -nnq -tQw -tQw -bnK -bnK -bnK -bnK -nnq +nKw +cXa +eJa +pZY +uVv +qpe +qpe eJa cBU cBU @@ -44711,10 +44728,19 @@ cBU cBU cBU cBU -gpI -lJG -oHR -gpI +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -44741,43 +44767,28 @@ cBU cBU cBU pDM -inc xoF inc +kBd +cNs +lwD inc -lZe inc inc inc -cNs -cNs -iew -fYx -waR fYx fYx -uMq fYx -fYx -waR -fYx -wNR -cNs -cNs -inc -inc -inc -lZe -inc inc inc inc inc +lwD +cNs inc inc inc inc -xoF pDM pDM cBU @@ -44793,6 +44804,16 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (101,1,1) = {" cBU @@ -44925,36 +44946,53 @@ cBU xrh byo byo -hxC -byo +pXr +jFC byo -rMY -iZg +xrX +jFC byo -hxC +llO +bUq byo byo -gQA -ueF -tQw -nnq -bnK -bnK -bnK -ueF -nnq -nnq +eJa +kcY bnK bnK -tQw -tQw -gOd -tQw -ueF -tQw -nnq -nnq +cXa +gmt +xKJ +qWm +qWm eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI cBU cBU cBU @@ -44968,18 +45006,6 @@ cBU cBU cBU cBU -gpI -lJG -cKL -gpI -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -44998,51 +45024,32 @@ cBU cBU cBU pDM -pDM -inc -inc +xoF inc inc +cNs +cNs inc inc +qll inc -cNs -cNs -iew -waR -avx -fYx fYx fYx fYx -fYx -avx -waR -wNR -cNs -cNs -inc -inc -inc -inc -inc inc inc inc inc +cNs +cNs inc inc inc inc -xoF pDM cBU cBU cBU -pDM -pDM -pDM -pDM cBU cBU cBU @@ -45050,8 +45057,6 @@ cBU cBU cBU cBU -"} -(102,1,1) = {" cBU cBU cBU @@ -45066,6 +45071,8 @@ cBU cBU cBU cBU +"} +(102,1,1) = {" cBU cBU cBU @@ -45179,39 +45186,6 @@ cBU cBU cBU cBU -xrh -xrh -jkM -xrh -xrh -xrh -xrh -xrh -xrh -xrh -xrh -xrh -xrh -akr -tQw -bMr -akr -eJa -iUc -akr -eJa -tvB -eJa -akr -akr -eJa -tvB -eJa -akr -iUc -eJa -tvB -eJa cBU cBU cBU @@ -45225,9 +45199,56 @@ cBU cBU cBU cBU -gpI +cBU +xrh +tKJ +byo +tSb +ggX +byo +ocA +ggX +byo +mML +ggX +byo +tKJ +eJa +bxi +cXa +bnK +aTy +tQw +tQw +bnK +bnK +ueF +eeL +tQw +nKj +iRm +nKH +qEe +hcm +tQw +pqV +eJa +lJG +lJG lJG +lJG +woq cKL +oHR +lJG +lJG +cKL +cKL +iEv +lJG +lJG +lJG +baK gpI cBU cBU @@ -45255,50 +45276,32 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU pDM -inc -inc -inc -lZe -inc +xoF inc inc cNs cNs -iew -fYx -waR -fYx -fYx -fYx -fYx -fYx -waR -fYx -wNR -cNs -cNs inc inc inc -lZe inc inc +fYx +fYx inc inc inc inc +cNs +cNs +inc inc inc -xoF -xoF -pDM -cBU -cBU -pDM -gnh -mPy -dkS pDM pDM cBU @@ -45307,8 +45310,6 @@ cBU cBU cBU cBU -"} -(103,1,1) = {" cBU cBU cBU @@ -45327,6 +45328,8 @@ cBU cBU cBU cBU +"} +(103,1,1) = {" cBU cBU cBU @@ -45436,39 +45439,12 @@ cBU cBU cBU cBU -sec -dto -dto -dto -sec -cBU cBU cBU cBU cBU cBU cBU -eJa -alh -nKH -nKH -alh -eJa -rit -rit -gly -ueF -eJa -rit -rit -oqJ -rit -eJa -rit -rit -oqJ -rit -eJa cBU cBU cBU @@ -45481,10 +45457,55 @@ cBU cBU cBU cBU -cBU -gpI +xrh +byo +byo +byo +byo +gPT +cAx +byo +gPT +byo +byo +byo +xrh +eJa +pqV +nnq +bnK +tQw +bnK +bnK +bnK +cXa +cXa +bnK +tQw +bnK +bnK +bnK +nnq +nnq +tQw +tQw +fcg +cKL cKL cKL +oHR +cKL +lJG +lJG +lJG +lJG +vTw +cKL +rbQ +cKL +cKL +lJG +vTw gpI cBU cBU @@ -45512,51 +45533,32 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +pDM pDM xoF inc -inc -inc -inc -inc -inc -oGW cNs -vQy -tDf -tDf -tDf -fYx -fYx -fYx -tDf -tDf -tDf -vQy cNs -eaI inc inc inc inc inc +fYx +fYx inc inc -ibM inc inc +cNs +cNs inc inc -xoF -xoF -pDM -pDM -pDM pDM -inc -inc -cPK -coH pDM cBU cBU @@ -45564,8 +45566,6 @@ cBU cBU cBU cBU -"} -(104,1,1) = {" cBU cBU cBU @@ -45585,6 +45585,8 @@ cBU cBU cBU cBU +"} +(104,1,1) = {" cBU cBU cBU @@ -45693,11 +45695,6 @@ cBU cBU cBU cBU -sec -nXQ -dto -dto -sec cBU cBU cBU @@ -45705,28 +45702,6 @@ cBU cBU cBU cBU -eJa -ouG -cBU -eLv -cBU -eJa -hML -ueF -mNM -dyz -eJa -kEn -rit -mNM -dyz -eJa -kEn -rit -mNM -dyz -eJa -cBU cBU cBU cBU @@ -45739,8 +45714,54 @@ cBU cBU cBU cBU +xrh +byo +byo +xrX +xrX +byo +aGZ +xrX +byo +llO +pXr +byo +pzi +tQw +bnK +tQw +eja +tQw +bnK +cXa +bnK +tQw +bnK +bnK +cXa +bnK +bnK +bnK +ueF +bnK +bnK +cXa +eJa gpI -oHR +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +gpI +cKL cKL gpI cBU @@ -45769,17 +45790,17 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU pDM xoF -inc -inc -lZe -inc -inc -rnD +bpk cNs cNs -rnD +inc inc inc inc @@ -45789,40 +45810,18 @@ fYx inc inc inc -rnD +inc cNs cNs -rnD -inc -inc -lZe -inc -inc -inc inc -inc -inc -qll -lZe -xoF -xoF pDM pDM -xoF -xoF -inc -inc -inc -inc -pDM cBU cBU cBU cBU cBU cBU -"} -(105,1,1) = {" cBU cBU cBU @@ -45843,6 +45842,8 @@ cBU cBU cBU cBU +"} +(105,1,1) = {" cBU cBU cBU @@ -45950,11 +45951,6 @@ cBU cBU cBU cBU -sec -mEZ -dto -dto -sec cBU cBU cBU @@ -45962,26 +45958,51 @@ cBU cBU cBU cBU -eJa cBU cBU -pLR -ouG -eJa -uBD -dyz -vtp -dyz -eJa -uBD -dyz -uGL -dyz -eJa -uBD -dyz -uGL -dyz +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +xrh +tKJ +byo +mML +ggX +byo +ocA +ggX +byo +fOx +ggX +byo +kEM +tQw +bnK +tQw +tQw +tQw +cXa +tQw +tQw +fqj +bnK +bnK +ueF +bnK +bnK +cXa +bnK +bnK +bnK +ueF eJa cBU cBU @@ -45997,8 +46018,8 @@ cBU cBU cBU gpI -cKL -cKL +lJG +oHR gpI cBU cBU @@ -46026,14 +46047,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU pDM pDM inc -inc -inc -inc -inc -inc cNs cNs inc @@ -46041,37 +46062,37 @@ inc inc inc fYx -fYx -fYx +idq +xxl inc inc inc inc cNs cNs -inc -inc -inc -inc -inc -inc -inc -inc -inc -inc -inc -lZe -xoF -xoF -xoF -xoF -xoF -xoF -coH -inc -inc -xMl pDM +pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -46207,44 +46228,56 @@ cBU cBU cBU cBU -sec -dto -nXQ -lEA -sec -cBU +xrh +byo +etk +byo +byo +byo +byo +byo +byo +byo +byo +gPT +byo +tQw +cXa +tQw +tQw +bnK +bnK +bnK +bnK +tQw +bnK +tQw +nnq +tQw +tQw +bnK +bnK +bnK +bnK +nnq +eJa cBU cBU cBU cBU cBU cBU -eJa cBU -gqw -gqw cBU -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa -eJa cBU cBU cBU cBU cBU +gpI +lJG +cKL +gpI cBU cBU cBU @@ -46253,13 +46286,6 @@ cBU cBU cBU cBU -gpI -cKL -cKL -gpI -cBU -cBU -cBU cBU cBU cBU @@ -46285,12 +46311,7 @@ cBU cBU cBU pDM -inc -inc -lZe -ibM -inc -inc +pDM cNs cNs inc @@ -46306,29 +46327,29 @@ inc inc cNs cNs -inc -inc -inc -lZe -inc -inc -inc -inc -inc -inc -inc -lZe -xoF -xoF pDM pDM -xoF -xoF -inc -cPK -inc -inc -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -46464,11 +46485,39 @@ cBU cBU cBU cBU -sec -dto -nXQ -dto -sec +xrh +byo +byo +hxC +byo +byo +rMY +iZg +byo +hxC +byo +byo +gQA +ueF +tQw +nnq +bnK +bnK +bnK +ueF +nnq +nnq +bnK +bnK +tQw +tQw +gOd +tQw +ueF +tQw +nnq +nnq +eJa cBU cBU cBU @@ -46476,14 +46525,16 @@ cBU cBU cBU cBU -eJa cBU cBU cBU cBU -eJa cBU cBU +gpI +vTw +cKL +gpI cBU cBU cBU @@ -46510,10 +46561,6 @@ cBU cBU cBU cBU -gpI -vTw -cKL -gpI cBU cBU cBU @@ -46521,6 +46568,25 @@ cBU cBU cBU cBU +pDM +cNs +cNs +pDM +inc +inc +inc +lcy +lcy +lcy +inc +pDM +pDM +pDM +cNs +cNs +pDM +cBU +cBU cBU cBU cBU @@ -46541,51 +46607,6 @@ cBU cBU cBU cBU -pDM -xoF -inc -inc -inc -inc -inc -cNs -cNs -inc -inc -inc -inc -fYx -xik -fYx -inc -inc -inc -inc -cNs -cNs -inc -inc -inc -inc -inc -inc -inc -inc -inc -inc -inc -inc -xoF -xoF -pDM -pDM -pDM -xoF -inc -sXb -inc -iPU -pDM cBU cBU cBU @@ -46721,23 +46742,38 @@ cBU cBU cBU cBU -sec -dto -nXQ -vdn -sec -cBU -cBU -cBU -cBU -cBU -cBU -cBU +xrh +xrh +jkM +xrh +xrh +xrh +xrh +xrh +xrh +xrh +xrh +xrh +xrh +akr +tQw +bMr +akr eJa -cBU -cBU -cBU -cBU +iUc +akr +eJa +tvB +eJa +akr +akr +eJa +tvB +eJa +akr +iUc +eJa +tvB eJa cBU cBU @@ -46752,6 +46788,10 @@ cBU cBU cBU cBU +gpI +cKL +cKL +gpI cBU cBU cBU @@ -46767,19 +46807,6 @@ cBU cBU cBU cBU -gpI -cKL -cKL -gpI -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -46799,65 +46826,22 @@ cBU cBU cBU pDM -xoF -inc -lZe -inc -mPy -inc -cNs -cNs -inc -inc -inc -qqU -inc -fYx -fYx -qqU -inc -inc -inc cNs cNs -inc -mPy -inc -lZe -inc -inc -inc -inc -inc -inc -inc -inc -xoF -pDM pDM -cBU pDM pDM pDM -dkS -coH +shz +shz +shz pDM pDM cBU -cBU -cBU -cBU -cBU -cBU -"} -(109,1,1) = {" -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +cNs +cNs +pDM cBU cBU cBU @@ -46886,6 +46870,8 @@ cBU cBU cBU cBU +"} +(109,1,1) = {" cBU cBU cBU @@ -46901,40 +46887,6 @@ cBU cBU cBU cBU -hAu -hAu -hAu -wQm -wQm -wQm -wQm -wQm -qZh -qZh -hAu -uGD -sJM -hAu -wQm -njg -heL -uNQ -dDc -urj -fOV -wQm -eOF -fYF -wQm -sJM -uGD -ojR -hAu -hAu -sJM -hAu -hAu -hAu cBU cBU cBU @@ -46970,6 +46922,44 @@ cBU cBU cBU cBU +hAu +hAu +hAu +wQm +wQm +wQm +wQm +wQm +qZh +qZh +hAu +uGD +sJM +hAu +wQm +njg +heL +uNQ +dDc +urj +fOV +wQm +eOF +fYF +wQm +sJM +uGD +ojR +hAu +hAu +sJM +hAu +hAu +hAu +cBU +cBU +cBU +cBU cBU cBU cBU @@ -46978,11 +46968,6 @@ cBU cBU cBU cBU -sec -dto -nXQ -dto -sec cBU cBU cBU @@ -47014,6 +46999,42 @@ cBU cBU cBU cBU +sec +dto +dto +dto +sec +cBU +cBU +cBU +cBU +cBU +cBU +cBU +eJa +alh +nKH +nKH +alh +eJa +rit +rit +gly +ueF +eJa +rit +rit +oqJ +rit +eJa +rit +rit +oqJ +rit +eJa +cBU +cBU +cBU cBU lam lam @@ -47055,49 +47076,28 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -xoF -inc -inc -inc -inc -inc -cNs -cNs -inc -inc -inc -inc -fYx -fYx -fYx -inc -inc -inc -inc cNs cNs -inc -inc -inc -inc -inc -inc -bpk -inc -inc -inc -inc -inc -xoF pDM cBU cBU -cBU -cBU pDM +sAG +sAG +sAG pDM +cBU +cBU pDM +cNs +cNs pDM cBU cBU @@ -47106,6 +47106,27 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (110,1,1) = {" cBU @@ -47236,9 +47257,9 @@ cBU cBU cBU sec +nXQ dto dto -nXQ sec cBU cBU @@ -47247,27 +47268,27 @@ cBU cBU cBU cBU +eJa +ouG cBU +eLv cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +eJa +hML +ueF +mNM +dyz +eJa +kEn +rit +mNM +dyz +eJa +kEn +rit +mNM +dyz +eJa cBU cBU cBU @@ -47312,41 +47333,28 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -xoF -inc -lZe -inc -inc -inc cNs cNs -inc -inc -inc -inc -fYx -fYx -fYx -inc -inc -inc -inc +pDM +cBU +cBU +pDM +sAG +sAG +sAG +pDM +cBU +cBU +pDM cNs cNs -inc -inc -inc -lZe -inc -inc -inc -inc -inc -inc -inc -inc -xoF pDM cBU cBU @@ -47363,6 +47371,19 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (111,1,1) = {" cBU @@ -47492,30 +47513,11 @@ cBU cBU cBU cBU -sec -dto -dto -vdn -sec -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +sec +mEZ +dto +dto +sec cBU cBU cBU @@ -47523,8 +47525,27 @@ cBU cBU cBU cBU +eJa cBU cBU +pLR +ouG +eJa +uBD +dyz +vtp +dyz +eJa +uBD +dyz +uGL +dyz +eJa +uBD +dyz +uGL +dyz +eJa cBU cBU cBU @@ -47569,41 +47590,28 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -xoF -xoF -inc -inc -inc -inc cNs cNs -inc -inc -inc -inc -inc -uKC -fYx -inc -inc -inc -inc +pDM +cBU +cBU +pDM +sAG +sAG +sAG +pDM +cBU +cBU +pDM cNs cNs -inc -inc -inc -inc -inc -inc -inc -inc -inc -inc -inc -inc -pDM pDM cBU cBU @@ -47620,6 +47628,19 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (112,1,1) = {" cBU @@ -47751,8 +47772,8 @@ cBU cBU sec dto -dto -dto +nXQ +lEA sec cBU cBU @@ -47761,27 +47782,27 @@ cBU cBU cBU cBU +eJa cBU +gqw +gqw cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa +eJa cBU cBU cBU @@ -47826,40 +47847,28 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -xoF -xoF -lZe -inc -inc -rnD -cNs -cNs -rnD -inc -inc -inc -fYx -fYx -fYx -inc -inc -inc -rnD cNs +lwD +pDM +cBU +cBU +pDM +sAG +sAG +sAG +pDM +cBU +cBU +pDM +lwD cNs -rnD -inc -inc -lZe -inc -xik -inc -inc -inc -inc -inc -inc pDM cBU cBU @@ -47877,6 +47886,18 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (113,1,1) = {" cBU @@ -48007,8 +48028,8 @@ cBU cBU cBU sec -lEA dto +nXQ dto sec cBU @@ -48018,12 +48039,12 @@ cBU cBU cBU cBU +eJa cBU cBU cBU cBU -cBU -cBU +eJa cBU cBU cBU @@ -48083,40 +48104,28 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -xoF -xoF -inc -inc -inc -inc cNs cNs -vQy -psj -psj -psj -fYx -fYx -fYx -psj -psj -psj -vQy -oGW -oGW -inc -inc -inc -inc -inc -inc -inc -inc -tax -inc -xoF pDM +cBU +cBU +pDM +sAG +sAG +sAG +pDM +cBU +cBU +pDM +cNs +cNs pDM cBU cBU @@ -48134,6 +48143,18 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (114,1,1) = {" cBU @@ -48264,9 +48285,9 @@ cBU cBU cBU sec -vdn dto -rQu +nXQ +vdn sec cBU cBU @@ -48275,12 +48296,12 @@ cBU cBU cBU cBU +eJa cBU cBU cBU cBU -cBU -cBU +eJa cBU cBU cBU @@ -48340,40 +48361,40 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM +cpi +cpi pDM -xoF -lZe -inc -inc -inc -cNs -cNs -iew -fYx -waR -fYx -fYx -fYx -fYx -fYx -waR -fYx -wNR -cNs -cNs -inc -inc -inc -lZe -inc -inc -inc -inc -inc -inc -xoF +cBU +cBU pDM +wsl +sAG +wsl +pDM +cBU +cBU +pDM +qst +qst +pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -48521,9 +48542,9 @@ cBU cBU cBU sec -vdn dto nXQ +dto sec cBU cBU @@ -48598,37 +48619,26 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +pDM +pDM +pDM +pDM +cBU +cBU +pDM +sAG +sAG +sAG +pDM +cBU +cBU +pDM pDM -xoF -inc -inc -inc -inc -cNs -cNs -iew -waR -avx -fYx -fYx -fYx -fYx -fYx -avx -waR -wNR -cNs -cNs -inc -inc -inc -inc -inc -inc -inc -inc -inc -inc pDM pDM cBU @@ -48648,6 +48658,17 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (116,1,1) = {" cBU @@ -48779,8 +48800,8 @@ cBU cBU sec dto -nXQ dto +nXQ sec cBU cBU @@ -48855,37 +48876,21 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -xoF -lZe -inc -xik -inc -cNs -cNs -iew -fYx -waR -fYx -fYx -fYx -fYx -fYx -waR -fYx -wNR -cNs -cNs -inc -inc -inc -lZe -inc -inc -inc -inc -xoF -pDM +sAG +sAG +sAG pDM cBU cBU @@ -48905,6 +48910,22 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (117,1,1) = {" cBU @@ -49036,8 +49057,8 @@ cBU cBU sec dto -mEZ dto +vdn sec cBU cBU @@ -49112,36 +49133,21 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -xoF -inc -inc -inc -inc -oGW -eaI -vQy -tDf -tDf -tDf -fYx -fYx -fYx -tDf -tDf -tDf -vQy -cNs -cNs -inc -inc -inc -inc -inc -inc -inc -xoF -pDM +sAG +sAG +sAG pDM cBU cBU @@ -49162,6 +49168,21 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (118,1,1) = {" cBU @@ -49293,7 +49314,7 @@ cBU cBU sec dto -nXQ +dto dto sec cBU @@ -49327,7 +49348,7 @@ cBU cBU cBU cBU -cBU +lam lam imv jYB @@ -49369,36 +49390,36 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM +sAG +sAG +sAG pDM -lZe -inc -inc -rnD -cNs -cNs -rnD -inc -inc -inc -fYx -fYx -fYx -inc -inc -inc -rnD -cNs -cNs -rnD -inc -inc -lZe -inc -inc -xoF -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -49529,7 +49550,7 @@ jzI jzI jzI jzI -mKs +rQX pNr hGp awq @@ -49549,7 +49570,7 @@ cBU cBU cBU sec -gBL +lEA dto dto sec @@ -49584,8 +49605,8 @@ cBU cBU cBU cBU -cBU lam +nPs tcd jYB jYB @@ -49627,33 +49648,20 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -inc -inc -inc -inc -cNs -cNs -inc -inc -inc -inc -fYx -fYx -fYx -inc -inc -inc -inc -cNs -cNs -inc -inc -inc -inc -inc -inc -xoF +sAG +sAG +sAG pDM cBU cBU @@ -49676,6 +49684,19 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (120,1,1) = {" cBU @@ -49781,7 +49802,7 @@ pNr pNr jzI jzI -aRc +jzI jzI jzI jzI @@ -49841,9 +49862,9 @@ cBU cBU cBU cBU -cBU lam -jYB +nPs +nPs jYB jYB oPq @@ -49884,33 +49905,20 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -lZe -inc -inc -inc -cNs -cNs -inc -inc -inc -inc -fYx -fYx -inc -inc -inc -inc -inc -cNs -cNs -inc -inc -inc -lZe -inc -xoF -pDM +wsl +sAG +wsl pDM cBU cBU @@ -49933,6 +49941,19 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (121,1,1) = {" cBU @@ -50065,7 +50086,7 @@ cBU sec dto dto -dto +gBL sec cBU cBU @@ -50098,9 +50119,9 @@ cBU cBU cBU cBU -cBU lam nPs +nPs jYB jYB oPq @@ -50123,7 +50144,7 @@ ylH mbB mbB epO -yia +gEn qju qju dEI @@ -50141,32 +50162,20 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -inc -inc -inc -inc -cNs -cNs -inc -inc -inc -inc -fYx -fYx -inc -inc -inc -inc -inc -cNs -cNs -inc -inc -inc -inc -inc -xoF +sAG +sAG +sAG pDM cBU cBU @@ -50190,6 +50199,18 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (122,1,1) = {" cBU @@ -50355,7 +50376,7 @@ cBU cBU cBU cBU -cBU +lam lam imv jYB @@ -50384,7 +50405,7 @@ yia uVZ oTR gBe -oTR +kPc lLt wCu cMn @@ -50398,32 +50419,20 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -pDM -inc -inc -inc -cNs -cNs -inc -inc -inc -inc -fYx -inc -fYx -inc -inc -inc -inc -cNs -cNs -inc -inc -inc -inc -inc -pDM +sAG +sAG +sAG pDM cBU cBU @@ -50447,6 +50456,18 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (123,1,1) = {" cBU @@ -50656,30 +50677,19 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -xoF -inc -kBd -cNs -lwD -inc -inc -inc -inc -fYx -fYx -fYx -inc -inc -inc -inc -lwD -cNs -inc -inc -inc -inc -pDM +sAG +sAG +sAG pDM cBU cBU @@ -50704,6 +50714,17 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (124,1,1) = {" cBU @@ -50913,29 +50934,19 @@ mWo cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -xoF -inc -inc -cNs -cNs -inc -inc -qll -inc -fYx -fYx -fYx -inc -inc -inc -inc -cNs -cNs -inc -inc -inc -inc +sAG +sAG +sAG pDM cBU cBU @@ -50961,6 +50972,16 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (125,1,1) = {" cBU @@ -51170,29 +51191,19 @@ mWo cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -xoF -inc -inc -cNs -cNs -inc -inc -inc -inc -inc -fYx -fYx -inc -inc -inc -inc -cNs -cNs -inc -inc -inc -pDM +sAG +sAG +sAG pDM cBU cBU @@ -51218,6 +51229,16 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (126,1,1) = {" cBU @@ -51315,7 +51336,7 @@ hAu cBU cBU awq -pNr +iua jzI jzI jzI @@ -51427,29 +51448,29 @@ mWo cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM +wsl +sAG +wsl pDM -xoF -inc -cNs -cNs -inc -inc -inc -inc -inc -fYx -fYx -inc -inc -inc -inc -cNs -cNs -inc -inc -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -51685,26 +51706,18 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -xoF -bpk -cNs -cNs -inc -inc -inc -inc -fYx -fYx -fYx -inc -inc -inc -inc -cNs -cNs -inc -pDM +sAG +sAG +sAG pDM cBU cBU @@ -51732,6 +51745,14 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (128,1,1) = {" cBU @@ -51942,26 +51963,26 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM +sAG +sAG +sAG pDM -inc -cNs -cNs -inc -inc -inc -inc -fYx -idq -xxl -inc -inc -inc -inc -cNs -cNs -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -52022,7 +52043,7 @@ rPn nOT rPn ygZ -fbn +lHU cBU cBU cBU @@ -52200,25 +52221,25 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM +sAG +sAG +sAG pDM -cNs -cNs -inc -inc -inc -inc -fYx -fYx -fYx -inc -inc -inc -inc -cNs -cNs -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -52438,7 +52459,7 @@ mbB ryp mWo tEt -oTR +kPc eQR btr mtH @@ -52458,22 +52479,16 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM -cNs -cNs -pDM -inc -inc -inc -lcy -lcy -lcy -inc -pDM -pDM -pDM -cNs -cNs +sAG +sAG +sAG pDM cBU cBU @@ -52503,6 +52518,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (131,1,1) = {" cBU @@ -52532,7 +52553,7 @@ cBU cBU lHU lHU -tFM +jlm rPn rPn lHU @@ -52715,22 +52736,16 @@ cBU cBU cBU cBU -pDM -cNs -cNs -pDM -pDM -pDM -pDM -shz -shz -shz -pDM -pDM +cBU +cBU +cBU +cBU +cBU cBU pDM -cNs -cNs +sAG +sAG +sAG pDM cBU cBU @@ -52760,6 +52775,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU "} (132,1,1) = {" cBU @@ -52787,173 +52808,179 @@ cBU cBU cBU cBU -lHU -lHU -lHU -rPn -rPn -qrA -lHU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -wQm -wGz -wGz -wQm -hAu -fOV -wQm -pjp -mdI -pjp -wQm -wQm -hAu -hAu -hAu -wQm -jJn -tRK -tRK -fOV -saK -wQm -soY -oju -soY -soY -soY -soY -soY -soY -soY -soY -soY -oju -soY -hAu -hAu -ojR -hAu -hAu -hAu -hAu -hAu -hAu -hAu -cBU -cBU -cBU -awq -mFn -jzI -jzI -jzI -uHn -hiP -uSx -uSx -uSx -xcU -uSx -uSx -uSx -jaA -exB -jzI -jzI -jzI -qzT -awq -cBU -cBU -cBU -cBU -sec -dto -dto -dto -vdn -sfi -ltT -lZs -dto -nXQ -vdn -sec -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -lam -lam -lam -huL -eup -qQa -rVM -huL -lam -lam -lam -tiK -lam -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +lHU +lHU +lHU +rPn +rPn +qrA +lHU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +wQm +wGz +wGz +wQm +hAu +fOV +wQm +pjp +mdI +pjp +wQm +wQm +hAu +hAu +hAu +wQm +jJn +tRK +tRK +fOV +saK +wQm +soY +oju +soY +soY +soY +soY +soY +soY +soY +soY +soY +oju +soY +hAu +hAu +ojR +hAu +hAu +hAu +hAu +hAu +hAu +hAu +cBU +cBU +cBU +awq +mFn +jzI +jzI +jzI +uHn +hiP +uSx +uSx +uSx +xcU +uSx +uSx +uSx +jaA +exB +jzI +jzI +jzI +qzT +awq +cBU +cBU +cBU +cBU +sec +dto +dto +dto +vdn +sfi +ltT +lZs +dto +nXQ +vdn +sec +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +lam +lam +lam +huL +eup +qQa +rVM +huL +lam +lam +lam +tiK +lam +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -52973,22 +53000,16 @@ cBU cBU cBU pDM -cNs -cNs +wsl +sAG +wsl pDM cBU cBU -pDM -sAG -sAG -sAG -pDM cBU cBU -pDM -cNs -cNs -pDM +cBU +cBU cBU cBU cBU @@ -53230,11 +53251,11 @@ cBU cBU cBU pDM -cNs -cNs pDM -cBU -cBU +pDM +pDM +pDM +pDM pDM sAG sAG @@ -53242,10 +53263,10 @@ sAG pDM cBU cBU -pDM -cNs -cNs -pDM +cBU +cBU +cBU +cBU cBU cBU cBU @@ -53375,7 +53396,7 @@ cBU awq mFn jzI -jzI +vvv jzI jzI jzI @@ -53487,22 +53508,22 @@ cBU cBU cBU pDM -cNs -cNs -pDM -cBU -cBU -pDM +wsl +vzR +vzR +vzR +wsl +rJr sAG sAG sAG pDM cBU cBU -pDM -cNs -cNs -pDM +cBU +cBU +cBU +cBU cBU cBU cBU @@ -53634,7 +53655,7 @@ pNr pNr jzI jzI -aRc +jzI jzI jzI jzI @@ -53744,27 +53765,18 @@ cBU cBU cBU pDM -cNs -lwD -pDM -cBU -cBU -pDM +vzR +sAG +sAG +sAG +sAG +rJr sAG sAG sAG pDM cBU cBU -pDM -lwD -cNs -pDM -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -53775,6 +53787,15 @@ cBU cBU cBU cBU +pDM +pDM +pDM +pDM +pDM +pDM +pDM +pDM +pDM cBU cBU cBU @@ -53815,13 +53836,13 @@ cBU cBU cBU lHU -lHU -qpX -xuE +fkB +rPn +rPn rPn -jlm lHU -cBU +lHU +lHU cBU cBU cBU @@ -53894,7 +53915,7 @@ pNr jzI jzI jzI -vvv +jzI jzI jzI jzI @@ -54000,32 +54021,17 @@ cBU cBU cBU cBU -pDM -cNs -cNs -pDM -cBU -cBU -pDM -sAG -sAG -sAG -pDM -cBU -cBU -pDM -cNs -cNs -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +vzR +sAG +mxS +mxS +sAG +xno +sAG +sAG +sAG +pDM cBU cBU cBU @@ -54035,6 +54041,21 @@ cBU cBU cBU cBU +pDM +pDM +pDM +pDM +fzo +fzo +fzo +qVd +fzo +fzo +fzo +pDM +pDM +pDM +pDM cBU cBU cBU @@ -54070,16 +54091,16 @@ cBU cBU cBU cBU -cBU lHU lHU lHU rPn rPn -fPn +rPn +rPn +lHU +ubv lHU -cBU -cBU cBU cBU cBU @@ -54258,21 +54279,15 @@ cBU cBU cBU pDM -cpi -cpi -pDM -cBU -cBU -pDM -wsl +vzR +sAG +mxS +mxS +sAG +usu +sAG +sAG sAG -wsl -pDM -cBU -cBU -pDM -qst -qst pDM cBU cBU @@ -54281,19 +54296,25 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +pDM +pDM +fzo +fzo +fzo +fzo +fzo +fzo +qVd +fzo +fzo +fzo +fzo +fzo +fzo +pDM +pDM +pDM cBU cBU cBU @@ -54327,9 +54348,11 @@ cBU cBU cBU cBU -cBU lHU lHU +lHU +skR +xuE rPn rPn lHU @@ -54339,8 +54362,6 @@ cBU cBU cBU cBU -cBU -cBU rsC uHz gMY @@ -54515,43 +54536,43 @@ cBU cBU cBU pDM -pDM -pDM -pDM -cBU -cBU -pDM +vzR sAG +mxS +mxS sAG +xno +wsl sAG +wsl pDM cBU cBU -pDM -pDM -pDM -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU cBU +pDM +pDM +fzo +fzo +fzo +fzo +fzo +fzo +fzo +fzo +qVd +fzo +fzo +fzo +fzo +fzo +fzo +fzo +fzo +pDM +pDM cBU cBU cBU @@ -54584,16 +54605,16 @@ cBU cBU cBU cBU -cBU lHU -lhm +jlm +qrA +rTn rPn rPn +rPn +rPn +qrA lHU -lHU -lHU -cBU -cBU cBU cBU cBU @@ -54771,13 +54792,13 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU pDM +vzR +sAG +sAG +sAG +sAG +rJr sAG sAG sAG @@ -54787,29 +54808,29 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +pDM +fzo +fzo +fzo +fzo +fzo +fzo +fzo +fzo +fzo +qVd +fzo +fzo +fzo +fzo +fzo +fzo +fzo +fzo +fzo +pDM +pDM cBU cBU cBU @@ -54841,16 +54862,16 @@ cBU cBU cBU cBU -cBU lHU lHU -rPn -rPn lHU lHU lHU -cBU -cBU +rPn +eaO +rPn +qrA +lHU cBU cBU cBU @@ -55028,46 +55049,46 @@ cBU cBU cBU cBU +pDM +wsl +vzR +vzR +vzR +wsl +rJr +sAG +sAG +sAG +pDM cBU cBU cBU cBU -cBU -cBU -pDM -sAG -sAG -sAG -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +pDM +qVd +fzo +fzo +fzo +fzo +fzo +fzo +fzo +mnL +mnL +mnL +mnL +mnL +fzo +fzo +fzo +fzo +fzo +fzo +fzo +qVd +pDM +pDM cBU cBU cBU @@ -55097,21 +55118,21 @@ cBU cBU cBU cBU -cBU +lHU +lHU +lHU lHU lHU lHU rPn rPn rPn -qrA +jlm lHU cBU cBU cBU cBU -cBU -cBU rsC uch oOP @@ -55285,12 +55306,12 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +pDM +pDM +pDM +pDM +pDM pDM sAG sAG @@ -55299,33 +55320,33 @@ pDM cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +pDM +fzo +fzo +qVd +fzo +fzo +fzo +fzo +mnL +mnL +fzo +fzo +qVd +fzo +fzo +mnL +mnL +fzo +fzo +fzo +fzo +qVd +fzo +fzo +pDM +pDM cBU cBU cBU @@ -55354,10 +55375,12 @@ cBU cBU cBU cBU -cBU lHU lHU -jlm +lHU +lHU +qrA +rPn rPn rPn rPn @@ -55367,8 +55390,6 @@ cBU cBU cBU cBU -cBU -cBU rsC rtp aAc @@ -55499,7 +55520,7 @@ cBU lam jYB jYB -tXF +raf iio uCd iio @@ -55556,33 +55577,33 @@ pDM cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +fzo +fzo +fzo +fzo +qVd +fzo +fzo +qVd +fzo +fzo +fzo +fzo +qVd +fzo +fzo +fzo +fzo +qVd +fzo +fzo +qVd +fzo +fzo +fzo +fzo +pDM cBU cBU cBU @@ -55611,17 +55632,17 @@ cBU cBU cBU cBU -cBU -kRO +lHU +lHU +lHU lHU lHU lHU rPn -lhm +rPn +rPn +lHU lHU -cBU -cBU -cBU cBU cBU cBU @@ -55752,7 +55773,7 @@ cBU cBU cBU cBU -cBU +lam lam imv jYB @@ -55806,41 +55827,41 @@ cBU cBU cBU pDM -wsl sAG -wsl +sAG +sAG pDM cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +pDM +fzo +fzo +fzo +fzo +fzo +qVd +qVd +fzo +fzo +fzo +fzo +fzo +qVd +fzo +fzo +fzo +fzo +fzo +qVd +qVd +fzo +fzo +fzo +fzo +fzo +pDM +pDM cBU cBU cBU @@ -55867,22 +55888,22 @@ cBU cBU cBU cBU -cBU -cBU lHU -qrA lHU lHU +lHU +lHU +lHU +lHU +lHU +rPn xuE -ljD +ubv lHU cBU cBU cBU cBU -cBU -cBU -cBU rsC heN nLL @@ -55944,8 +55965,8 @@ cBU cBU eWk dop -pcB -pcB +pOI +pOI lqR lqR lqR @@ -56009,8 +56030,8 @@ cBU cBU cBU cBU -cBU lam +nPs ndr jYB xGL @@ -56063,41 +56084,41 @@ cBU cBU cBU pDM +wsl sAG -sAG -sAG +wsl pDM cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +fzo +fzo +fzo +fzo +fzo +fzo +qVd +qVd +fzo +fzo +fzo +fzo +fzo +qVd +fzo +fzo +fzo +fzo +fzo +qVd +qVd +fzo +fzo +fzo +fzo +fzo +fzo +pDM cBU cBU cBU @@ -56124,18 +56145,18 @@ cBU cBU cBU cBU -cBU -cBU lHU +sed lHU +jlm lHU lHU +eqD +qpX xuE +eqD +lHU lHU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -56266,9 +56287,9 @@ cBU cBU cBU cBU -cBU lam -jYB +nPs +nPs jYB xGL ktP @@ -56326,35 +56347,35 @@ sAG pDM cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +fzo +fzo +fzo +fzo +fzo +qVd +fzo +fzo +qVd +fzo +fzo +mnL +fzo +qVd +fzo +mnL +fzo +fzo +qVd +fzo +fzo +qVd +fzo +fzo +fzo +fzo +fzo +pDM cBU cBU cBU @@ -56381,19 +56402,19 @@ cBU cBU cBU cBU -cBU -cBU lHU lHU lHU +qrA +lHU +lHU +qpX +lHU rPn rPn +jlm +lHU lHU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -56523,9 +56544,9 @@ cBU cBU cBU cBU -cBU lam nPs +nPs jYB xGL mpR @@ -56582,37 +56603,37 @@ sAG sAG pDM cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +pDM +fzo +fzo +fzo +fzo +mnL +fzo +fzo +fzo +fzo +qVd +fzo +fzo +fzo +qVd +fzo +fzo +fzo +qVd +fzo +fzo +mpu +fzo +mnL +fzo +fzo +fzo +fzo +pDM +pDM cBU cBU "} @@ -56638,19 +56659,19 @@ cBU cBU cBU cBU -cBU -cBU lHU lHU lHU +lHU +qrA +qrA +lHU +lHU rPn rPn lHU -cBU -cBU -cBU -cBU -cBU +sed +lHU cBU cBU cBU @@ -56780,66 +56801,30 @@ cBU cBU cBU cBU -cBU -lam -imv -jYB -xGL -mpR -cZp -iio -xGL -jYB -jYB -rTo -euy -lam -cBU -cBU -cBU -cBU -cBU -cBU -kCO -nHK -pwk -kCO -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +lam +lam +imv +jYB +xGL +mpR +cZp +iio +xGL +jYB +jYB +rTo +euy +lam cBU cBU cBU cBU -pDM -sAG -sAG -sAG -pDM cBU cBU +kCO +nHK +pwk +kCO cBU cBU cBU @@ -56869,7 +56854,43 @@ cBU cBU cBU cBU +pDM +sAG +sAG +sAG +pDM cBU +pDM +fzo +fzo +fzo +fzo +fzo +mnL +fzo +fzo +fzo +fzo +fzo +qVd +fzo +fzo +qVd +fzo +fzo +qVd +fzo +qAN +mnL +mnL +wQB +mnL +mnL +fzo +fzo +fzo +fzo +pDM cBU cBU "} @@ -56895,19 +56916,19 @@ cBU cBU cBU cBU -cBU -cBU lHU lHU lHU +ubv +lHU +lHU +lHU +eqD +xuE rPn -uLn lHU -cBU -cBU -cBU -cBU -cBU +lHU +lHU cBU cBU cBU @@ -57091,42 +57112,42 @@ cBU cBU cBU pDM +pcB sAG -sAG -sAG +wsl +pDM +pDM +pDM +fzo +fzo +fzo +fzo +mnL +fzo +fzo +fzo +fzo +fzo +fzo +fzo +qVd +fzo +qVd +fzo +qVd +fzo +fzo +qAN +qVd +qVd +fzo +qVd +mnL +fzo +fzo +fzo +fzo pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU "} @@ -57152,19 +57173,19 @@ cBU cBU cBU cBU -cBU -cBU +sed +lHU +lHU +lHU +lHU lHU lHU lHU rPn rPn lHU -cBU -cBU -cBU -cBU -cBU +lHU +lHU cBU cBU cBU @@ -57348,44 +57369,44 @@ cBU cBU cBU pDM -wsl +sAG +sAG +sAG sAG wsl +usu +fzo +fzo +fzo +fzo +mnL +fzo +fzo +fzo +fzo +fzo +fzo +fzo +fzo +qVd +qVd +qVd +fzo +fzo +fzo +qAN +pXU +sqa +vfW +fzo +mnL +fzo +fzo +fzo +fzo pDM cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU "} (150,1,1) = {" cBU @@ -57409,19 +57430,19 @@ cBU cBU cBU cBU -cBU -cBU -fbn +lHU +qrA +qrA +lHU lHU lHU +pdI +lHU rPn rPn lHU -cBU -cBU -cBU -cBU -cBU +pdI +lHU cBU cBU cBU @@ -57604,43 +57625,43 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +sAG +sAG +sAG +sAG +wsl +usu +qVd +qVd +qVd +qVd +mnL +qVd +qVd +qVd +qVd +qVd +qVd +tce +qVd +qVd +qVd +qVd +qVd +qVd +qVd +qAN +uJh +dQy +dOs +fzo +mnL +qVd +qVd +qVd +qVd +pDM cBU cBU "} @@ -57666,19 +57687,19 @@ cBU cBU cBU cBU -cBU -cBU +lHU +lHU +jlm +lHU +lHU lHU lHU lHU rPn rPn -fkB -cBU -cBU -cBU -cBU -cBU +lHU +jlm +lHU cBU cBU cBU @@ -57865,41 +57886,41 @@ pDM sAG sAG sAG +sAG +wsl +usu +fzo +fzo +fzo +fzo +mnL +fzo +fzo +fzo +fzo +fzo +fzo +fzo +fzo +qVd +qVd +qVd +fzo +fzo +fzo +qAN +auq +tgn +oPu +fzo +mnL +fzo +fzo +fzo +fzo pDM cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU "} (152,1,1) = {" cBU @@ -57923,19 +57944,19 @@ cBU cBU cBU cBU -cBU -cBU lHU +qrA +lHU +lml +lml +lml lHU lHU -xuE rPn -rQX -cBU -cBU -cBU -cBU -cBU +rPn +lHU +lHU +lHU cBU cBU cBU @@ -58119,42 +58140,42 @@ cBU cBU cBU pDM -sAG -sAG -sAG pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +pDM +pDM +pDM +pDM +pDM +fzo +fzo +fzo +fzo +mnL +fzo +fzo +fzo +fzo +fzo +fzo +fzo +qVd +fzo +qVd +fzo +qVd +fzo +fzo +qAN +qVd +qVd +fzo +qVd +mnL +fzo +fzo +fzo +fzo +pDM cBU cBU "} @@ -58180,19 +58201,19 @@ cBU cBU cBU cBU -cBU -cBU lHU -jlm lHU lHU -rPn +shN +xUH +lml +lHU +lHU +lAQ +lAQ +lHU lHU lHU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -58375,43 +58396,43 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU cBU cBU cBU +pDM +fzo +fzo +fzo +fzo +fzo +mnL +fzo +fzo +fzo +fzo +fzo +qVd +fzo +fzo +qVd +fzo +fzo +qVd +fzo +qAN +mnL +mnL +wQB +mnL +mnL +fzo +fzo +fzo +fzo +pDM cBU cBU "} @@ -58438,18 +58459,18 @@ cBU cBU cBU cBU -cBU -lHU -lHU -eqD -rPn -rPn -lHU -lHU -cBU -cBU -cBU -cBU +gCB +cgL +cgL +jgF +cgL +gCB +gCB +sCY +ema +gCB +gCB +gCB cBU cBU cBU @@ -58632,43 +58653,43 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU cBU cBU cBU +pDM +pDM +fzo +fzo +fzo +fzo +mnL +fzo +fzo +fzo +fzo +qVd +fzo +fzo +fzo +qVd +fzo +fzo +fzo +qVd +fzo +fzo +bry +fzo +mnL +fzo +fzo +fzo +fzo +pDM +pDM cBU cBU "} @@ -58695,17 +58716,17 @@ cBU cBU cBU cBU -cBU -cBU -lHU -qpX -xuE -rPn -lHU -lHU -cBU -cBU -cBU +gCB +vvz +kzB +suO +mKq +gCB +sCY +vCc +vCc +sCY +gCB cBU cBU cBU @@ -58889,35 +58910,6 @@ cBU cBU cBU cBU -pDM -wsl -sAG -wsl -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -58925,6 +58917,35 @@ cBU cBU cBU cBU +pDM +fzo +fzo +fzo +fzo +fzo +qVd +fzo +fzo +qVd +fzo +fzo +mnL +fzo +qVd +fzo +mnL +fzo +fzo +qVd +fzo +fzo +qVd +fzo +fzo +fzo +fzo +fzo +pDM cBU cBU cBU @@ -58952,17 +58973,17 @@ cBU cBU cBU cBU -cBU -cBU -lHU -lHU -rPn -lHU -lHU -lHU -cBU -cBU -cBU +gCB +urs +sCY +sCY +sCY +gCB +sCY +vCc +vCc +sCY +gCB cBU cBU cBU @@ -59146,35 +59167,6 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -59182,6 +59174,35 @@ cBU cBU cBU cBU +pDM +fzo +fzo +fzo +fzo +fzo +fzo +qVd +qVd +fzo +fzo +fzo +fzo +fzo +qVd +fzo +fzo +fzo +fzo +fzo +qVd +qVd +fzo +fzo +fzo +fzo +fzo +fzo +pDM cBU cBU cBU @@ -59209,34 +59230,34 @@ cBU cBU cBU cBU -cBU -cBU -lHU -lHU -rPn -rPn -rPn -lHU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +gCB +gCB +gCB +qWn +gCB +gCB +sCY +vCc +vCc +sCY +gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -59403,35 +59424,6 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -59439,6 +59431,35 @@ cBU cBU cBU cBU +pDM +pDM +fzo +fzo +fzo +fzo +fzo +qVd +qVd +fzo +fzo +fzo +fzo +fzo +qVd +fzo +fzo +fzo +fzo +fzo +qVd +qVd +fzo +fzo +fzo +fzo +fzo +pDM +pDM cBU cBU cBU @@ -59466,17 +59487,17 @@ cBU cBU cBU cBU -cBU -cBU -lHU -lHU -rPn -rPn -rPn -lHU -cBU -cBU -cBU +gCB +bJF +lCA +sCY +sCY +gCB +sCY +vCc +vCc +sCY +gCB cBU cBU cBU @@ -59660,33 +59681,6 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -59695,6 +59689,33 @@ cBU cBU cBU cBU +pDM +fzo +fzo +fzo +fzo +qVd +fzo +fzo +qVd +fzo +fzo +fzo +fzo +qVd +fzo +fzo +fzo +fzo +qVd +fzo +fzo +qVd +fzo +fzo +fzo +fzo +pDM cBU cBU cBU @@ -59723,17 +59744,17 @@ cBU cBU cBU cBU -cBU -cBU -lHU -lHU -rPn -rPn -uLn -lHU -lHU -cBU -cBU +gCB +lCA +lCA +sCY +sCY +gCB +sCY +vCc +vCc +sCY +gCB cBU cBU cBU @@ -59911,89 +59932,89 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU pDM pDM +fzo +fzo +qVd +fzo +fzo +fzo +fzo +mnL +mnL +fzo +fzo +qVd +fzo +fzo +mnL +mnL +fzo +fzo +fzo +fzo +qVd +fzo +fzo pDM pDM -pDM -pDM -pDM -sAG -sAG -sAG -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -"} -(160,1,1) = {" -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -lHU -fkB -rPn -rPn -rPn -lHU -lHU -lHU cBU cBU cBU cBU +"} +(160,1,1) = {" +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +gCB +sCY +mPR +lCA +sCY +gCB +uIO +vCc +vCc +uIO +gCB +cBU +cBU +cBU cBU cBU cBU @@ -60168,31 +60189,6 @@ cBU cBU cBU cBU -pDM -wsl -vzR -vzR -vzR -wsl -rJr -sAG -sAG -sAG -pDM -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU cBU cBU cBU @@ -60208,6 +60204,31 @@ cBU cBU cBU cBU +pDM +pDM +qVd +fzo +fzo +fzo +fzo +fzo +fzo +fzo +mnL +mnL +mnL +mnL +mnL +fzo +fzo +fzo +fzo +fzo +fzo +fzo +qVd +pDM +pDM cBU cBU cBU @@ -60237,17 +60258,17 @@ cBU cBU cBU cBU -cBU -lHU -lHU -lHU -rPn -rPn -rPn -rPn -lHU -ubv -lHU +gCB +sCY +lCA +sCY +sCY +gCB +gCB +wqt +wqt +gCB +gCB cBU cBU cBU @@ -60425,20 +60446,6 @@ cBU cBU cBU cBU -pDM -vzR -sAG -sAG -sAG -sAG -rJr -wsl -sAG -wsl -pDM -cBU -cBU -cBU cBU cBU cBU @@ -60448,15 +60455,6 @@ cBU cBU cBU cBU -pDM -pDM -pDM -pDM -pDM -pDM -pDM -pDM -pDM cBU cBU cBU @@ -60464,6 +60462,29 @@ cBU cBU cBU cBU +pDM +pDM +fzo +fzo +fzo +fzo +fzo +fzo +fzo +fzo +fzo +qVd +fzo +fzo +fzo +fzo +fzo +fzo +fzo +fzo +fzo +pDM +pDM cBU cBU cBU @@ -60494,17 +60515,17 @@ cBU cBU cBU cBU -cBU -lHU -lHU -lHU -skR -xuE -rPn -rPn -lHU -lHU -lHU +gCB +uIO +sCY +sCY +uIO +gCB +sCY +vCc +vCc +sCY +gCB cBU cBU cBU @@ -60682,17 +60703,14 @@ cBU cBU cBU cBU -pDM -vzR -sAG -mxS -mxS -sAG -xno -sAG -sAG -sAG -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -60704,8 +60722,11 @@ cBU cBU pDM pDM -pDM -pDM +fzo +fzo +fzo +fzo +fzo fzo fzo fzo @@ -60713,13 +60734,13 @@ qVd fzo fzo fzo +fzo +fzo +fzo +fzo +fzo pDM pDM -pDM -pDM -cBU -cBU -cBU cBU cBU cBU @@ -60751,17 +60772,17 @@ cBU cBU cBU cBU -cBU -lHU -jlm -qrA -rTn -rPn -rPn -rPn -rPn -qrA -lHU +gCB +gCB +qWn +gCB +gCB +gCB +sCY +vCc +vCc +sCY +gCB cBU cBU cBU @@ -60939,17 +60960,17 @@ cBU cBU cBU cBU -pDM -vzR -sAG -mxS -mxS -sAG -usu -sAG -sAG -sAG -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -61008,17 +61029,17 @@ cBU cBU cBU cBU -cBU -lHU -lHU -lHU -lHU -lHU -rPn -eaO -rPn -qrA -lHU +gCB +sun +sCY +sCY +sCY +gCB +uLn +vCc +vCc +uLn +gCB cBU cBU cBU @@ -61149,7 +61170,7 @@ cBU cBU cBU cBU -cBU +lam lam imv jYB @@ -61196,17 +61217,20 @@ cBU cBU cBU cBU -pDM -vzR -sAG -mxS -mxS -sAG -xno -sAG -sAG -sAG -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -61215,11 +61239,8 @@ cBU cBU pDM pDM -fzo -fzo -fzo -fzo -fzo +pDM +pDM fzo fzo fzo @@ -61227,13 +61248,13 @@ qVd fzo fzo fzo -fzo -fzo -fzo -fzo -fzo pDM pDM +pDM +pDM +cBU +cBU +cBU cBU cBU cBU @@ -61265,17 +61286,17 @@ cBU cBU cBU cBU -lHU -lHU -lHU -lHU -lHU -lHU -rPn -rPn -rPn -jlm -lHU +gCB +sCY +sCY +sCY +sCY +gCB +urs +vCc +vCc +urs +gCB cBU cBU cBU @@ -61406,8 +61427,8 @@ cBU cBU cBU cBU -cBU lam +nPs aCN jYB jYB @@ -61453,17 +61474,24 @@ cBU cBU cBU cBU -pDM -vzR -sAG -sAG -sAG -sAG -rJr -sAG -sAG -sAG -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -61471,27 +61499,20 @@ cBU cBU pDM pDM -fzo -fzo -fzo -fzo -fzo -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -fzo -fzo -fzo -fzo -fzo -fzo pDM pDM +pDM +pDM +pDM +pDM +pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -61522,18 +61543,18 @@ cBU cBU cBU cBU -lHU -lHU -lHU -lHU -qrA -rPn -rPn -rPn -rPn -lHU -lHU -cBU +gCB +sCY +sCY +sCY +sCY +gCB +gCB +pbY +pbY +gCB +gCB +gCB cBU cBU dom @@ -61663,9 +61684,9 @@ cBU cBU cBU cBU -cBU lam -jYB +lam +nPs jYB jYB oPq @@ -61710,46 +61731,46 @@ cBU cBU cBU cBU -pDM -wsl -vzR -vzR -vzR -wsl -rJr -sAG -sAG -sAG -pDM cBU cBU cBU cBU -pDM -pDM -qVd -fzo -fzo -fzo -fzo -fzo -fzo -fzo -mnL -mnL -mnL -mnL -mnL -fzo -fzo -fzo -fzo -fzo -fzo -fzo -qVd -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -61779,18 +61800,18 @@ cBU cBU cBU cBU -lHU -lHU -lHU -lHU -lHU -lHU -rPn -rPn -rPn -lHU -lHU -cBU +gCB +sCY +sCY +rQu +aOq +sCY +fWm +sCY +sCY +fWm +sCY +gCB cBU cBU dom @@ -61920,9 +61941,9 @@ cBU cBU cBU cBU -cBU lam nPs +nPs jYB jYB oPq @@ -61967,47 +61988,47 @@ cBU cBU cBU cBU -pDM -pDM -pDM -pDM -pDM -pDM -pDM -wsl -sAG -wsl -pDM cBU cBU cBU -pDM -pDM -fzo -fzo -qVd -fzo -fzo -fzo -fzo -mnL -mnL -fzo -fzo -qVd -fzo -fzo -mnL -mnL -fzo -fzo -fzo -fzo -qVd -fzo -fzo -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -62035,19 +62056,19 @@ cBU cBU cBU cBU -lHU -lHU -lHU -lHU -lHU -lHU -lHU -lHU -rPn -xuE -ubv -lHU cBU +gCB +kuN +sCY +aOq +sCY +sCY +sCY +sCY +sCY +sCY +sun +gCB cBU cBU dom @@ -62177,7 +62198,7 @@ cBU cBU cBU cBU -cBU +lam lam imv jYB @@ -62230,41 +62251,41 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -pDM cBU cBU cBU -pDM -fzo -fzo -fzo -fzo -qVd -fzo -fzo -qVd -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -fzo -qVd -fzo -fzo -qVd -fzo -fzo -fzo -fzo -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -62292,19 +62313,19 @@ cBU cBU cBU cBU -lHU -sed -lHU -jlm -lHU -lHU -eqD -qpX -xuE -eqD -lHU -lHU cBU +gCB +sCY +urs +sCY +mPR +nYy +sCY +sCY +sCY +sCY +sCY +gCB cBU cBU dom @@ -62435,21 +62456,65 @@ cBU cBU cBU cBU -lam -jYB -jYB -jYB -oPq -mMq -cNP -jYB -jYB -jYB -lam -cBU -cBU -cBU -cBU +lam +jYB +jYB +jYB +oPq +mMq +cNP +jYB +jYB +jYB +lam +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +kCO +kCO +kCO +kCO +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -62465,11 +62530,6 @@ cBU cBU cBU cBU -kCO -kCO -kCO -kCO -cBU cBU cBU cBU @@ -62487,45 +62547,6 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -pDM -cBU -cBU -pDM -pDM -fzo -fzo -fzo -fzo -fzo -qVd -qVd -fzo -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -fzo -fzo -qVd -qVd -fzo -fzo -fzo -fzo -fzo -pDM -pDM -cBU -cBU -cBU "} (170,1,1) = {" cBU @@ -62549,19 +62570,19 @@ cBU cBU cBU cBU -lHU -lHU -lHU -qrA -lHU -lHU -qpX -lHU -rPn -rPn -jlm -lHU -lHU +cBU +gCB +gCB +gCB +gCB +sCY +sCY +sCY +sCY +qMG +sCY +osC +gCB cBU cBU dom @@ -62744,42 +62765,42 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -pDM cBU cBU -pDM -fzo -fzo -fzo -fzo -fzo -fzo -qVd -qVd -fzo -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -fzo -fzo -qVd -qVd -fzo -fzo -fzo -fzo -fzo -fzo -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -62806,19 +62827,19 @@ cBU cBU cBU cBU -lHU -lHU -lHU -lHU -qrA -qrA -lHU -lHU -rPn -rPn -lHU -sed -lHU +cBU +gCB +mKq +oyL +cgL +suO +sCY +sCY +sCY +sCY +sCY +sCY +gCB cBU cBU dom @@ -63001,42 +63022,42 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -pDM cBU cBU -pDM -fzo -fzo -fzo -fzo -fzo -qVd -fzo -fzo -qVd -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -fzo -qVd -fzo -fzo -qVd -fzo -fzo -fzo -fzo -fzo -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -63063,19 +63084,19 @@ cBU cBU cBU cBU -lHU -lHU -lHU -ubv -lHU -lHU -lHU -eqD -xuE -rPn -lHU -lHU -lHU +cBU +gCB +sun +mHK +jgF +suO +sCY +rQu +qMG +sCY +sCY +lCA +gCB cBU cBU dom @@ -63258,43 +63279,43 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -pDM cBU -pDM -pDM -fzo -fzo -fzo -fzo -mnL -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -qVd -fzo -fzo -fzo -qVd -fzo -fzo -mpu -fzo -mnL -fzo -fzo -fzo -fzo -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU "} @@ -63320,19 +63341,19 @@ cBU cBU cBU cBU -sed -lHU -lHU -lHU -lHU -lHU -lHU -lHU -rPn -rPn -lHU -lHU -lHU +cBU +gCB +smm +kUw +gCB +sCY +sCY +sCY +sCY +sCY +qMG +sCY +gCB cBU cBU dom @@ -63515,43 +63536,43 @@ cBU cBU cBU cBU -pDM -wsl -sAG -wsl -pDM cBU -pDM -fzo -fzo -fzo -fzo -fzo -mnL -fzo -fzo -fzo -fzo -fzo -qVd -fzo -fzo -qVd -fzo -fzo -qVd -fzo -qAN -mnL -mnL -wQB -mnL -mnL -fzo -fzo -fzo -fzo -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU "} @@ -63577,19 +63598,19 @@ cBU cBU cBU cBU -lHU -qrA -qrA -lHU -lHU -lHU -pdI -lHU -rPn -rPn -lHU -pdI -lHU +cBU +gCB +lgH +gCB +gCB +rQu +sCY +aOq +sCY +lCA +lCA +lCA +gCB cBU cBU uNL @@ -63772,43 +63793,43 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -pDM -pDM -pDM -fzo -fzo -fzo -fzo -mnL -fzo -fzo -fzo -fzo -fzo -fzo -fzo -qVd -fzo -qVd -fzo -qVd -fzo -fzo -qAN -qVd -qVd -fzo -qVd -mnL -fzo -fzo -fzo -fzo -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU "} @@ -63834,19 +63855,19 @@ cBU cBU cBU cBU -lHU -lHU -jlm -lHU -lHU -lHU -lHU -lHU -rPn -rPn -lHU -jlm -lHU +cBU +gCB +sCY +bKD +sCY +aOq +rQu +sCY +qMG +lCA +sCY +tjR +gCB cBU cBU uNL @@ -64029,47 +64050,8 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -sAG -wsl -usu -fzo -fzo -fzo -fzo -mnL -fzo -fzo -fzo -fzo -fzo -fzo -fzo -fzo -qVd -qVd -qVd -fzo -fzo -fzo -qAN -pXU -sqa -vfW -fzo -mnL -fzo -fzo -fzo -fzo -pDM cBU cBU -"} -(176,1,1) = {" cBU cBU cBU @@ -64091,19 +64073,58 @@ cBU cBU cBU cBU -lHU -qrA -lHU -lml -lml -lml -lHU -lHU -rPn -rPn -lHU -lHU -lHU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +"} +(176,1,1) = {" +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +gCB +gCB +gCB +gCB +sCY +tFu +lCA +sCY +qMG +sCY +sCY +sCY +sCY +bJF +gCB cBU cBU uNL @@ -64286,47 +64307,8 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -sAG -wsl -usu -qVd -qVd -qVd -qVd -mnL -qVd -qVd -qVd -qVd -qVd -qVd -tce -qVd -qVd -qVd -qVd -qVd -qVd -qVd -qAN -uJh -dQy -dOs -fzo -mnL -qVd -qVd -qVd -qVd -pDM cBU cBU -"} -(177,1,1) = {" cBU cBU cBU @@ -64348,19 +64330,58 @@ cBU cBU cBU cBU -lHU -lHU -lHU -shN -xUH -lml -lHU -lHU -rPn -rPn -lHU -lHU -lHU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +"} +(177,1,1) = {" +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +eSd +sCY +sCY +sCY +lCA +sCY +aOq +sCY +sCY +sCY +ihO +lCA +lCA +nix +gCB cBU cBU uNL @@ -64543,47 +64564,8 @@ cBU cBU cBU cBU -pDM -sAG -sAG -sAG -sAG -wsl -usu -fzo -fzo -fzo -fzo -mnL -fzo -fzo -fzo -fzo -fzo -fzo -fzo -fzo -qVd -qVd -qVd -fzo -fzo -fzo -qAN -auq -tgn -oPu -fzo -mnL -fzo -fzo -fzo -fzo -pDM cBU cBU -"} -(178,1,1) = {" cBU cBU cBU @@ -64606,17 +64588,56 @@ cBU cBU cBU cBU -gCB -cgL -cgL -jgF -cgL -gCB -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +"} +(178,1,1) = {" +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +eSd sCY -ema -gCB -gCB +sCY +rFw +sCY +qMG +sCY +sCY +sCY +sCY +sCY +lCA +lCA +bJF gCB cBU cBU @@ -64800,47 +64821,8 @@ cBU cBU cBU cBU -pDM -pDM -pDM -pDM -pDM -pDM -pDM -fzo -fzo -fzo -fzo -mnL -fzo -fzo -fzo -fzo -fzo -fzo -fzo -qVd -fzo -qVd -fzo -qVd -fzo -fzo -qAN -qVd -qVd -fzo -qVd -mnL -fzo -fzo -fzo -fzo -pDM cBU cBU -"} -(179,1,1) = {" cBU cBU cBU @@ -64863,20 +64845,59 @@ cBU cBU cBU cBU -gCB -vvz -kzB -suO -mKq -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +"} +(179,1,1) = {" +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +eSd +lCA +sun sCY -vCc -vCc sCY +lCA +sCY +nYy +sCY +qMG +lCA +sCY +lCA +jFS gCB cBU cBU -cBU uNL uNL uNL @@ -65063,41 +65084,8 @@ cBU cBU cBU cBU -pDM -fzo -fzo -fzo -fzo -fzo -mnL -fzo -fzo -fzo -fzo -fzo -qVd -fzo -fzo -qVd -fzo -fzo -qVd -fzo -qAN -mnL -mnL -wQB -mnL -mnL -fzo -fzo -fzo -fzo -pDM cBU cBU -"} -(180,1,1) = {" cBU cBU cBU @@ -65120,20 +65108,53 @@ cBU cBU cBU cBU -gCB -urs +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +"} +(180,1,1) = {" +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +eSd +tFu +lCA sCY sCY +cZc +xFO sCY -gCB sCY -vCc -vCc +sCY +sCY +lCA +mTL sCY gCB cBU cBU -cBU uNL uNL uNL @@ -65275,33 +65296,65 @@ cBU cBU cBU cBU -xZT -tUl -wwF -pOl -wGQ -ptr -wGQ -srS -wGQ -mXa -owu -owu -owu -bBe -bBe -owu -owu -owu -kFR -owu -owu -bBe -bBe -mIE -owu -bGS -cXr +xZT +tUl +wwF +pOl +wGQ +ptr +wGQ +srS +wGQ +mXa +owu +owu +owu +bBe +bBe +owu +owu +owu +kFR +owu +owu +bBe +bBe +mIE +owu +bGS +cXr +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -65320,38 +65373,6 @@ cBU cBU cBU cBU -pDM -pDM -fzo -fzo -fzo -fzo -mnL -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -qVd -fzo -fzo -fzo -qVd -fzo -fzo -bry -fzo -mnL -fzo -fzo -fzo -fzo -pDM -pDM -cBU cBU "} (181,1,1) = {" @@ -65374,21 +65395,21 @@ cBU cBU cBU cBU -cBU -cBU -cBU gCB gCB gCB -qWn gCB gCB +gCB +gCB +pkT sCY -vCc -vCc sCY +qMG +osC +gCB +gCB gCB -cBU cBU cBU uNL @@ -65578,35 +65599,35 @@ cBU cBU cBU cBU -pDM -fzo -fzo -fzo -fzo -fzo -qVd -fzo -fzo -qVd -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -fzo -qVd -fzo -fzo -qVd -fzo -fzo -fzo -fzo -fzo -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -65634,16 +65655,15 @@ cBU cBU cBU cBU +cBU +cBU +cBU gCB -bJF -lCA -sCY -sCY -gCB -sCY -vCc -vCc -sCY +eow +eow +sPZ +eow +eow gCB cBU cBU @@ -65658,6 +65678,7 @@ cBU cBU cBU cBU +cBU uNL uNL uNL @@ -65784,123 +65805,122 @@ cBU cBU cBU cBU -bFW -xcv -clC -clC -jiD -bFW -pOl -wwF -wGQ -wGQ -wGQ -wGQ -pOl -tKc -xZT -dWW -owu -tjO -cXr -cXr -cXr -cXr -cXr -cXr -owu -iDd -cXr -cXr -cXr -cXr -cXr -cXr -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -pDM -fzo -fzo -fzo -fzo -fzo -fzo -qVd -qVd -fzo -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -fzo -fzo -qVd -qVd -fzo -fzo -fzo -fzo -fzo -fzo -pDM -cBU -cBU -cBU -"} -(183,1,1) = {" -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU -cBU +bFW +xcv +clC +clC +jiD +bFW +pOl +wwF +wGQ +wGQ +wGQ +wGQ +pOl +tKc +xZT +dWW +owu +tjO +cXr +cXr +cXr +cXr +cXr +cXr +owu +iDd +cXr +cXr +cXr +cXr +cXr +cXr +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +"} +(183,1,1) = {" +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU gCB -lCA -lCA -sCY -sCY -gCB -sCY -vCc -vCc -sCY +sPZ +sPZ +riF +sPZ +sPZ gCB cBU cBU @@ -65915,6 +65935,7 @@ cBU cBU cBU cBU +cBU uNL uNL uNL @@ -66056,7 +66077,7 @@ wGQ pOl ybK xZT -tjO +uNn owu tjO cXr @@ -66092,35 +66113,35 @@ cBU cBU cBU cBU -pDM -pDM -fzo -fzo -fzo -fzo -fzo -qVd -qVd -fzo -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -fzo -fzo -qVd -qVd -fzo -fzo -fzo -fzo -fzo -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -66148,16 +66169,15 @@ cBU cBU cBU cBU +cBU +cBU +cBU gCB -sCY -mPR -lCA -sCY gCB -uIO -vCc -vCc -uIO +ckl +riF +sPZ +sPZ gCB cBU cBU @@ -66172,6 +66192,7 @@ cBU cBU cBU cBU +cBU uNL uNL uNL @@ -66313,7 +66334,7 @@ ptr pOl mcy xZT -tjO +sRN kFR dWW cXr @@ -66350,33 +66371,33 @@ cBU cBU cBU cBU -pDM -fzo -fzo -fzo -fzo -qVd -fzo -fzo -qVd -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -fzo -qVd -fzo -fzo -qVd -fzo -fzo -fzo -fzo -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -66405,16 +66426,15 @@ cBU cBU cBU cBU +cBU +cBU +cBU gCB -sCY -lCA -sCY -sCY -gCB -gCB -wqt -wqt -gCB +riF +sPZ +riF +sPZ +riF gCB cBU cBU @@ -66429,6 +66449,7 @@ cBU cBU cBU cBU +cBU uNL uNL uNL @@ -66607,33 +66628,33 @@ cBU cBU cBU cBU -pDM -pDM -fzo -fzo -qVd -fzo -fzo -fzo -fzo -mnL -mnL -fzo -fzo -qVd -fzo -fzo -mnL -mnL -fzo -fzo -fzo -fzo -qVd -fzo -fzo -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -66662,16 +66683,15 @@ cBU cBU cBU cBU +cBU +cBU +cBU gCB -uIO -sCY -sCY -uIO -gCB -sCY -vCc -vCc -sCY +qfg +qfg +qfg +qfg +qfg gCB cBU cBU @@ -66686,6 +66706,7 @@ cBU cBU cBU cBU +cBU uNL uNL uNL @@ -66753,6 +66774,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU imX imX imX @@ -66800,12 +66827,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU bFW vKJ vKJ @@ -66865,31 +66886,31 @@ cBU cBU cBU cBU -pDM -pDM -qVd -fzo -fzo -fzo -fzo -fzo -fzo -fzo -mnL -mnL -mnL -mnL -mnL -fzo -fzo -fzo -fzo -fzo -fzo -fzo -qVd -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -66919,16 +66940,15 @@ cBU cBU cBU cBU +cBU +cBU +cBU +gCB gCB gCB -qWn gCB gCB gCB -sCY -vCc -vCc -sCY gCB cBU cBU @@ -66943,6 +66963,7 @@ cBU cBU cBU cBU +cBU uNL uNL uNL @@ -67010,6 +67031,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU imX kPp qkQ @@ -67057,12 +67084,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU bFW lYY lYY @@ -67123,29 +67144,29 @@ cBU cBU cBU cBU -pDM -pDM -fzo -fzo -fzo -fzo -fzo -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -fzo -fzo -fzo -fzo -fzo -fzo -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -67176,17 +67197,17 @@ cBU cBU cBU cBU -gCB -sun -sCY -sCY -sCY -gCB -sCY -vCc -vCc -sCY -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -67267,6 +67288,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU imX hcf vJj @@ -67314,12 +67341,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU bFW lYY lYY @@ -67381,27 +67402,27 @@ cBU cBU cBU cBU -pDM -pDM -fzo -fzo -fzo -fzo -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -fzo -fzo -fzo -fzo -fzo -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -67433,17 +67454,17 @@ cBU cBU cBU cBU -gCB -sCY -sCY -sCY -sCY -gCB -uIO -vCc -vCc -uIO -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -67524,6 +67545,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU imX xCP uNK @@ -67571,12 +67598,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU bFW oza bFW @@ -67639,25 +67660,25 @@ cBU cBU cBU cBU -pDM -pDM -pDM -fzo -fzo -fzo -fzo -fzo -fzo -qVd -fzo -fzo -fzo -fzo -fzo -fzo -pDM -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -67690,18 +67711,18 @@ cBU cBU cBU cBU -gCB -sCY -sCY -sCY -sCY -gCB -gCB -pbY -pbY -gCB -gCB -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -67781,6 +67802,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU imX wDP eRF @@ -67828,12 +67855,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU bFW vKJ sXB @@ -67898,21 +67919,21 @@ cBU cBU cBU cBU -pDM -pDM -pDM -pDM -fzo -fzo -fzo -qVd -fzo -fzo -fzo -pDM -pDM -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -67947,18 +67968,18 @@ cBU cBU cBU cBU -gCB -sCY -sCY -sCY -sCY -sCY -fWm -sCY -sCY -fWm -sCY -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -68038,6 +68059,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU imX gSn bBj @@ -68085,12 +68112,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU bFW akl sXB @@ -68158,15 +68179,15 @@ cBU cBU cBU cBU -pDM -pDM -pDM -pDM -pDM -pDM -pDM -pDM -pDM +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -68204,18 +68225,18 @@ cBU cBU cBU cBU -gCB -kuN -sCY -sCY -sCY -sCY -sCY -sCY -sCY -sCY -sun -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -68295,6 +68316,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU lsT cGG vBa @@ -68342,12 +68369,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU bFW oza bFW @@ -68461,18 +68482,18 @@ cBU cBU cBU cBU -gCB -sCY -urs -sCY -mPR -nYy -sCY -sCY -sCY -sCY -sCY -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -68552,6 +68573,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU lsT anD hSO @@ -68599,12 +68626,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU bFW ikc lYY @@ -68718,18 +68739,18 @@ cBU cBU cBU cBU -gCB -gCB -gCB -gCB -sCY -sCY -sCY -sCY -qMG -sCY -osC -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -68809,6 +68830,12 @@ ewG ewG cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU lsT anD oHW @@ -68856,12 +68883,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU bFW ikc lYY @@ -68975,18 +68996,18 @@ cBU cBU cBU cBU -gCB -mKq -oyL -cgL -suO -sCY -sCY -sCY -sCY -sCY -sCY -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -69066,14 +69087,20 @@ aZV ewG cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU lsT anD hSO lsT yli fgI -iWV -uNn +ikQ +vFk lsT iUg tSu @@ -69109,12 +69136,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs vfs vfs @@ -69232,18 +69253,18 @@ cBU cBU cBU cBU -gCB -sun -mHK -jgF -suO -sCY -sCY -qMG -sCY -sCY -lCA -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -69323,14 +69344,20 @@ ttW ewG cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU lsT anD hSO cCI -yli -yli ikQ -uNn +iQT +ikQ +vFk lsT ogV ogV @@ -69366,12 +69393,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs aPT fvM @@ -69489,18 +69510,18 @@ cBU cBU cBU cBU -gCB -smm -kUw -gCB -sCY -sCY -sCY -sCY -sCY -qMG -sCY -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -69580,14 +69601,20 @@ bwp ewG cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU lsT anD hSO kEc -yli -yli +iQT ikQ -uNn +ikQ +vFk lsT gSl gSl @@ -69623,12 +69650,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs phZ iaA @@ -69746,18 +69767,18 @@ cBU cBU cBU cBU -gCB -lgH -gCB -gCB -sCY -sCY -sCY -sCY -lCA -lCA -lCA -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -69837,14 +69858,20 @@ bzU ewG cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU lsT anD hSO lsT yli iWV -iWV -uNn +ikQ +vFk lsT hSO bcx @@ -69880,12 +69907,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs oao iwV @@ -70003,18 +70024,18 @@ cBU cBU cBU cBU -gCB -sCY -bKD -sCY -sCY -sCY -sCY -qMG -lCA -sCY -tjR -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -70094,6 +70115,12 @@ ttW ewG cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU lsT anD wZx @@ -70137,12 +70164,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs dko geO @@ -70257,21 +70278,21 @@ cBU cBU cBU cBU -gCB -gCB -gCB -gCB -sCY -tFu -lCA -sCY -qMG -sCY -sCY -sCY -sCY -bJF -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -70351,6 +70372,12 @@ ewG ewG cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU lsT anD hSO @@ -70394,12 +70421,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs phZ iaA @@ -70514,21 +70535,21 @@ cBU cBU cBU cBU -eSd -sCY -sCY -sCY -lCA -sCY -sCY -sCY -sCY -sCY -ihO -lCA -lCA -nix -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -70608,6 +70629,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU lsT ayA cGq @@ -70651,12 +70678,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs pDq fDU @@ -70771,21 +70792,21 @@ cBU cBU cBU cBU -eSd -sCY -sCY -rFw -sCY -qMG -sCY -sCY -sCY -sCY -sCY -lCA -lCA -bJF -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -70865,6 +70886,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU lsT lsT lsT @@ -70908,12 +70935,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs vfs vfs @@ -71028,21 +71049,21 @@ cBU cBU cBU cBU -eSd -lCA -sun -sCY -sCY -lCA -sCY -nYy -sCY -qMG -lCA -sCY -lCA -jFS -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -71136,6 +71157,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU ffQ jYW xOF @@ -71169,12 +71196,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs eHZ sNi @@ -71285,21 +71306,21 @@ cBU cBU cBU cBU -eSd -tFu -lCA -sCY -sCY -cZc -xFO -sCY -sCY -sCY -sCY -lCA -mTL -sCY -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -71393,6 +71414,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU ffQ xHR vDH @@ -71426,12 +71453,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs eHZ sNi @@ -71542,21 +71563,21 @@ cBU cBU cBU cBU -gCB -gCB -gCB -gCB -gCB -gCB -gCB -pkT -sCY -sCY -qMG -osC -gCB -gCB -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -71650,6 +71671,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU ffQ gRd wPz @@ -71683,12 +71710,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs lya sNi @@ -71805,13 +71826,13 @@ cBU cBU cBU cBU -gCB -eow -eow -sPZ -eow -eow -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -71907,6 +71928,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU ffQ xHR xxs @@ -71940,12 +71967,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs eHZ sNi @@ -72062,13 +72083,19 @@ cBU cBU cBU cBU -gCB -sPZ -sPZ -sPZ -sPZ -sPZ -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -72197,12 +72224,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs eHZ omX @@ -72210,7 +72231,7 @@ qNR gdy sNi sNi -sbd +ntL vfs cBU cBU @@ -72319,13 +72340,13 @@ cBU cBU cBU cBU -gCB -gCB -ckl -sPZ -sPZ -sPZ -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -72421,6 +72442,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU ffQ eEN vDH @@ -72454,12 +72481,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vfs eHZ sNi @@ -72576,13 +72597,13 @@ cBU cBU cBU cBU -gCB -riF -sPZ -riF -sPZ -riF -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -72636,7 +72657,7 @@ rru rru rru iJx -aXl +vQr rcG aXl jwD @@ -72678,6 +72699,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU ffQ dGw vDH @@ -72701,12 +72728,6 @@ ffQ ffQ ffQ ffQ -ffQ -ffQ -ffQ -ffQ -ffQ -ffQ cBU cBU cBU @@ -72724,7 +72745,7 @@ qNR gdy sNi atr -sbd +yhB vfs cBU cBU @@ -72833,13 +72854,13 @@ cBU cBU cBU cBU -gCB -iQT -iQT -iQT -iQT -iQT -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -72935,6 +72956,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU ffQ qKf vDH @@ -72950,12 +72977,6 @@ cJx cJx cJx cJx -jUd -dZy -cJx -cJx -cJx -cJx cJx cJx bon @@ -73090,13 +73111,13 @@ cBU cBU cBU cBU -gCB -gCB -gCB -gCB -gCB -gCB -gCB +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -73192,6 +73213,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU ffQ rQO vDH @@ -73203,12 +73230,6 @@ eXs eXs eXs eXs -raf -eXs -eXs -eXs -eXs -eXs eXs eXs eXs @@ -73407,11 +73428,11 @@ mjI mjI mZX iJx -vQr +aXl aXl krZ aXl -oIv +aXl aXl itY aXl @@ -73449,6 +73470,12 @@ cBU cBU cBU cBU +cBU +cBU +cBU +cBU +cBU +cBU ffQ vaB rhL @@ -73463,12 +73490,6 @@ mDm mDm mDm mDm -vFk -mDm -rhL -mDm -mDm -mDm dkw mDm mDm @@ -73667,7 +73688,7 @@ iJx aXl aXl aXl -aXl +oIv utI rtx rtx @@ -73706,12 +73727,12 @@ cBU cBU cBU cBU -ffQ -ffQ -ffQ -ffQ -ffQ -ffQ +cBU +cBU +cBU +cBU +cBU +cBU ffQ ffQ ffQ @@ -74242,7 +74263,7 @@ pYv nqq bWC shF -shF +fBe pnF tbg xHR @@ -75206,7 +75227,7 @@ liq liq liq iJx -vQr +aXl aXl rmM mBO @@ -75288,7 +75309,7 @@ sNi sNi iwV iwV -ifL +ljD geO ifL vfs @@ -75688,11 +75709,11 @@ pIu pIu pIu pIu -pIu -lRe +iFq lRe lRe lRe +aBu lRe nrj aYx @@ -75766,8 +75787,8 @@ dXu uEM uEM sUG -slw -slw +mhL +mhL mhL oRp uPC @@ -76023,8 +76044,8 @@ uEM uEM uEM oFP -slw -slw +mhL +mhL mhL oRp uPC @@ -76041,7 +76062,7 @@ woi shF wWP shF -gEn +shF shF dwI nSs @@ -76982,12 +77003,12 @@ lRe nrj lRe mtw -cBU -cBU -cBU -cBU -cBU -cBU +mtw +mtw +mtw +mtw +mtw +mtw cBU cBU cBU @@ -77238,6 +77259,12 @@ dNY lRe nrj lRe +lRe +hbJ +hcP +clO +feX +tFM mtw cBU cBU @@ -77249,12 +77276,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vqb liq gtN @@ -77494,7 +77515,13 @@ pIu dNY lRe nrj -aYx +nrj +nrj +uza +nrj +uKC +uKC +tFM mtw cBU cBU @@ -77506,12 +77533,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vqb liq gtN @@ -77750,8 +77771,14 @@ rOw pIu dNY lRe -nrj lRe +lRe +lRe +hbJ +hcP +clO +aeV +tFM mtw cBU cBU @@ -77763,12 +77790,6 @@ cBU cBU cBU cBU -cBU -cBU -cBU -cBU -cBU -cBU vqb liq gtN @@ -78006,16 +78027,16 @@ ajC tVX pIu dNY -lRe -nrj -lRe mtw -cBU -cBU -cBU -cBU -cBU -cBU +mtw +mtw +mtw +mtw +mtw +mtw +mtw +mtw +mtw cBU cBU cBU @@ -78263,10 +78284,10 @@ ajC pIu pIu dNY -lRe -nrj -lRe -mtw +cBU +cBU +cBU +cBU cBU cBU cBU @@ -78494,7 +78515,7 @@ tkT cBU vfH vfH -rab +xPM xPM vfH vfH @@ -78520,10 +78541,10 @@ ajC pIu pIu dNY -lRe -nrj -lRe -mtw +cBU +cBU +cBU +cBU cBU cBU cBU @@ -78777,10 +78798,10 @@ ajC tVX pIu dNY -lRe -nrj -lRe -mtw +cBU +cBU +cBU +cBU cBU cBU cBU @@ -78865,7 +78886,7 @@ cBU cBU bbe cqo -nqq +rdw shF shF shF @@ -79034,10 +79055,10 @@ ajC gUm sRF dNY -lRe -nrj -lRe -mtw +cBU +cBU +cBU +cBU cBU cBU cBU @@ -79269,7 +79290,7 @@ rab rab vfH cBU -hhM +cBU hhM hhM hhM @@ -79291,10 +79312,10 @@ ajC pUu fgh dNY -lRe -nrj -aYx -mtw +cBU +cBU +cBU +cBU cBU cBU cBU @@ -79527,11 +79548,11 @@ hzy tkT tkT tkT +tkT +aGx aGx -ntL -icy icy -ntL +aGx aGx hhM jcD @@ -79548,10 +79569,10 @@ ajC fgh pIu dNY -lRe -nrj -lRe -mtw +cBU +cBU +cBU +cBU cBU cBU cBU @@ -79782,13 +79803,13 @@ gHV gHV gHV gHV +gHV seR tkT hhM wqJ wqJ wqJ -wqJ hhM hhM iPV @@ -79805,10 +79826,10 @@ ajC pIu pIu dNY -lRe -nrj -lRe -mtw +cBU +cBU +cBU +cBU cBU cBU cBU @@ -80039,9 +80060,9 @@ gHV gHV gHV gHV +gHV seR -aVR -bLK +dPL bLK bLK bLK @@ -80050,7 +80071,7 @@ bLK bAz bLK bLK -bAz +swk pIu pIu pIu @@ -80062,10 +80083,10 @@ ajC tVX pIu dNY -lRe -nrj -lRe -mtw +cBU +cBU +cBU +cBU cBU cBU cBU @@ -80289,6 +80310,7 @@ riS bmb gHV gHV +dZy gHV gHV gHV @@ -80297,14 +80319,13 @@ gHV gHV gHV seR -gHV -bLK +dPL bLK bLK bLK bLK bLK -lgI +bAz bLK bLK lgI @@ -80319,10 +80340,10 @@ ajC pIu pIu dNY -lRe -nrj -lRe -mtw +cBU +cBU +cBU +cBU cBU cBU cBU @@ -80553,13 +80574,13 @@ gHV gHV gHV gHV +gHV seR tkT hhM wqJ wqJ wqJ -wqJ hhM hhM iPV @@ -80576,10 +80597,10 @@ xdZ pIu sRF dNY -lRe -nrj -lRe -mtw +cBU +cBU +cBU +cBU cBU cBU cBU @@ -80812,11 +80833,11 @@ eEJ tkT tkT tkT +tkT +aGx aGx -ntL -pxl pxl -ntL +aGx aGx hhM jcD @@ -80833,10 +80854,10 @@ pIu pIu rOw dNY -lRe -nrj -lRe -mtw +cBU +cBU +cBU +cBU cBU cBU cBU @@ -81068,7 +81089,7 @@ pwu pwu oMw cBU -hhM +cBU hhM hhM hhM @@ -81090,10 +81111,10 @@ pIu pIu pIu dNY -lRe -nrj -aYx -mtw +cBU +cBU +cBU +cBU cBU cBU cBU @@ -81343,14 +81364,14 @@ dNY dNY dNY dNY -pIu +exE exE dNY dNY -lRe -nrj -lRe -mtw +cBU +cBU +cBU +cBU cBU cBU cBU @@ -81604,16 +81625,16 @@ pIu pIu pIu dNY -lRe -nrj -lRe -mtw -mtw -mtw -mtw -mtw -mtw -mtw +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -81811,7 +81832,7 @@ cBU hvc lzo lzo -lzo +lkt lzo lzo hvc @@ -81861,16 +81882,16 @@ pIu pIu pIu dNY -lRe -nrj -lRe -lRe -hbJ -hcP -clO -feX -xlP -mtw +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -82068,7 +82089,7 @@ cBU hvc hvc wap -lzo +lkt lzo lzo hvc @@ -82092,7 +82113,7 @@ oMw oMw oMw oMw -pwu +wOg wOg oMw oMw @@ -82118,16 +82139,16 @@ pIu iox sRF dNY -lRe -nrj -nrj -nrj -uza -nrj -clO -clO -xlP -mtw +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -82375,16 +82396,16 @@ xYg xVR lBi dNY -lRe -lRe -lRe -lRe -hbJ -hcP -clO -aeV -xlP -mtw +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU @@ -82632,16 +82653,16 @@ aNH aNH aNH dNY -mtw -mtw -mtw -mtw -mtw -mtw -mtw -mtw -mtw -mtw +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU +cBU cBU cBU cBU diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm index 616713d1adf8..a5085f015980 100644 --- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm +++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm @@ -161,7 +161,7 @@ /obj/machinery/economy/vending/cigarette/free, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "ajJ" = ( @@ -318,7 +318,7 @@ /obj/structure/largecrate, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "atT" = ( @@ -358,7 +358,7 @@ /obj/item/clothing/gloves/color/black, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside) "axq" = ( @@ -456,7 +456,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "aHl" = ( @@ -504,7 +504,7 @@ /obj/effect/turf_decal/caution, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "aKg" = ( @@ -566,7 +566,7 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "aPs" = ( @@ -639,7 +639,7 @@ /obj/effect/decal/remains/human, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "aWy" = ( @@ -671,7 +671,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "baN" = ( @@ -865,7 +865,7 @@ /obj/item/shard, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside) "blr" = ( @@ -893,7 +893,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "bon" = ( @@ -920,7 +920,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "boK" = ( @@ -1000,7 +1000,7 @@ /obj/structure/railing, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside/river) "bru" = ( @@ -1030,7 +1030,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "bsO" = ( @@ -1069,7 +1069,7 @@ /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "btI" = ( @@ -1102,7 +1102,7 @@ /obj/item/ammo_casing/caseless/arrow, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "bvC" = ( @@ -1344,7 +1344,7 @@ /obj/structure/closet/crate, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "bKN" = ( @@ -1463,7 +1463,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "bSO" = ( @@ -1560,7 +1560,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "caM" = ( @@ -1585,7 +1585,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "cbH" = ( @@ -1691,7 +1691,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside/river) "cjT" = ( @@ -1775,7 +1775,7 @@ /obj/structure/closet/crate/radiation, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "cod" = ( @@ -1797,7 +1797,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "cpc" = ( @@ -1884,7 +1884,7 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "cxP" = ( @@ -1957,7 +1957,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "cAM" = ( @@ -2080,7 +2080,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside) "cFQ" = ( @@ -2184,7 +2184,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "cLm" = ( @@ -2206,7 +2206,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "cNf" = ( @@ -2423,7 +2423,7 @@ /obj/structure/closet/crate/radiation, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "deq" = ( @@ -2521,7 +2521,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "dla" = ( @@ -2776,7 +2776,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "dGT" = ( @@ -2965,7 +2965,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "dSA" = ( @@ -2975,7 +2975,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "dTm" = ( @@ -3063,7 +3063,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "dZu" = ( @@ -3137,7 +3137,7 @@ /obj/machinery/light_construct/directional/east, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "ecP" = ( @@ -3330,7 +3330,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "erB" = ( @@ -3719,7 +3719,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "eOR" = ( @@ -3729,7 +3729,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "ePb" = ( @@ -3816,7 +3816,7 @@ /obj/effect/turf_decal/arrows, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "eUq" = ( @@ -3944,7 +3944,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "fgN" = ( @@ -4006,7 +4006,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside) "fjM" = ( @@ -4051,7 +4051,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "fnP" = ( @@ -4411,7 +4411,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside) "fJU" = ( @@ -4594,7 +4594,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside/river) "fYG" = ( @@ -4653,7 +4653,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "gck" = ( @@ -4691,7 +4691,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "geP" = ( @@ -4728,7 +4728,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "giz" = ( @@ -4801,7 +4801,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "gon" = ( @@ -4977,7 +4977,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "gBW" = ( @@ -5177,7 +5177,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "gQV" = ( @@ -5309,7 +5309,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "gZv" = ( @@ -5668,7 +5668,7 @@ /obj/item/storage/box, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "htc" = ( @@ -5697,7 +5697,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "htO" = ( @@ -5772,7 +5772,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "hyb" = ( @@ -6175,7 +6175,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "iaW" = ( @@ -6210,7 +6210,7 @@ /obj/effect/landmark/awaystart, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "ibX" = ( @@ -6333,7 +6333,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "iim" = ( @@ -6530,7 +6530,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "ivg" = ( @@ -6573,7 +6573,7 @@ /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "iyF" = ( @@ -6607,7 +6607,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "iBS" = ( @@ -6724,7 +6724,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside/river) "iJu" = ( @@ -6811,7 +6811,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "iMW" = ( @@ -6820,7 +6820,7 @@ /obj/item/clothing/gloves/color/black, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside) "iNw" = ( @@ -6977,7 +6977,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "iXz" = ( @@ -7050,7 +7050,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside/river) "jcp" = ( @@ -7124,7 +7124,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "jhj" = ( @@ -7351,7 +7351,7 @@ /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "jvN" = ( @@ -7386,7 +7386,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "jxF" = ( @@ -7548,7 +7548,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "jFM" = ( @@ -7559,7 +7559,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "jHd" = ( @@ -7885,7 +7885,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside) "kcJ" = ( @@ -7916,7 +7916,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "kdW" = ( @@ -8077,7 +8077,7 @@ /obj/item/shield/riot, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "knx" = ( @@ -8174,7 +8174,7 @@ /obj/effect/turf_decal/arrows, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "kuK" = ( @@ -8279,7 +8279,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside) "kzW" = ( @@ -8333,7 +8333,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "kDy" = ( @@ -8414,7 +8414,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "kIr" = ( @@ -8661,7 +8661,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "kWD" = ( @@ -8703,7 +8703,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "kZj" = ( @@ -8990,7 +8990,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "lpa" = ( @@ -9051,7 +9051,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "lsA" = ( @@ -9108,7 +9108,7 @@ /obj/item/storage/bag/ore, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "lxn" = ( @@ -9201,7 +9201,7 @@ "lFP" = ( /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside/river) "lGm" = ( @@ -9211,7 +9211,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "lGL" = ( @@ -9333,7 +9333,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "lPf" = ( @@ -9520,7 +9520,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "mdg" = ( @@ -9553,7 +9553,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "mfj" = ( @@ -9636,7 +9636,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "mjM" = ( @@ -9652,7 +9652,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "mky" = ( @@ -9668,7 +9668,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "mkC" = ( @@ -9807,7 +9807,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "mqZ" = ( @@ -10053,14 +10053,14 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "mFZ" = ( /obj/structure/sign/poster/official/random/south, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "mHv" = ( @@ -10168,7 +10168,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "mKY" = ( @@ -10268,7 +10268,7 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "mRQ" = ( @@ -10365,7 +10365,7 @@ /obj/machinery/light_construct/directional/south, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "mVl" = ( @@ -10510,7 +10510,7 @@ /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "ndV" = ( @@ -10558,7 +10558,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "nhk" = ( @@ -10702,7 +10702,7 @@ /obj/item/pen, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "nwg" = ( @@ -10945,7 +10945,7 @@ /obj/item/stack/rods, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "nOA" = ( @@ -11011,7 +11011,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "nRW" = ( @@ -11025,7 +11025,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside/river) "nSR" = ( @@ -11251,7 +11251,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "ojJ" = ( @@ -11335,7 +11335,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside/river) "opf" = ( @@ -11483,7 +11483,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "oyy" = ( @@ -11621,7 +11621,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "oFV" = ( @@ -11652,7 +11652,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "oHG" = ( @@ -11682,7 +11682,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "oKl" = ( @@ -11753,7 +11753,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "oNm" = ( @@ -11848,7 +11848,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "oSZ" = ( @@ -12067,7 +12067,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "piW" = ( @@ -12214,7 +12214,7 @@ /obj/item/radio, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside) "psW" = ( @@ -12296,7 +12296,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "pzw" = ( @@ -12797,7 +12797,7 @@ /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "qlE" = ( @@ -12961,7 +12961,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "quj" = ( @@ -12971,7 +12971,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "qur" = ( @@ -13019,7 +13019,7 @@ /obj/effect/turf_decal/grass, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "qwS" = ( @@ -13051,7 +13051,7 @@ /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "qxx" = ( @@ -13071,7 +13071,7 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "qzb" = ( @@ -13124,7 +13124,7 @@ "qCV" = ( /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "qDq" = ( @@ -13190,7 +13190,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "qGN" = ( @@ -13209,7 +13209,7 @@ /obj/item/ammo_casing/caseless/arrow, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "qIV" = ( @@ -13364,7 +13364,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "qTm" = ( @@ -13424,7 +13424,7 @@ /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "qVG" = ( @@ -13464,7 +13464,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "qZP" = ( @@ -13656,7 +13656,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "rma" = ( @@ -13727,7 +13727,7 @@ /obj/effect/spawner/random_spawners/blood_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "rpz" = ( @@ -13862,7 +13862,7 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "ryw" = ( @@ -13909,7 +13909,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "rAs" = ( @@ -13928,7 +13928,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "rAR" = ( @@ -14053,7 +14053,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "rKf" = ( @@ -14238,7 +14238,7 @@ /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "rSb" = ( @@ -14257,7 +14257,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "rSv" = ( @@ -14391,7 +14391,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "rZa" = ( @@ -14523,7 +14523,7 @@ /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "skb" = ( @@ -14573,7 +14573,7 @@ /obj/machinery/light_construct/directional/south, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "soo" = ( @@ -14638,7 +14638,7 @@ /obj/structure/ore_box, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "srO" = ( @@ -14652,7 +14652,7 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "srT" = ( @@ -14720,7 +14720,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside) "syQ" = ( @@ -14765,7 +14765,7 @@ /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "szw" = ( @@ -14933,7 +14933,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "sKN" = ( @@ -14943,7 +14943,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "sMs" = ( @@ -15023,7 +15023,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "sQQ" = ( @@ -15084,7 +15084,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "sUj" = ( @@ -15330,7 +15330,7 @@ /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "tjS" = ( @@ -15426,7 +15426,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "tpH" = ( @@ -15573,7 +15573,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "tAH" = ( @@ -15593,7 +15593,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "tAY" = ( @@ -15632,7 +15632,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "tDn" = ( @@ -15739,7 +15739,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "tLH" = ( @@ -15874,7 +15874,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "tUb" = ( @@ -15910,7 +15910,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "tUU" = ( @@ -16005,7 +16005,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "ubw" = ( @@ -16079,7 +16079,7 @@ /obj/structure/railing/corner, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside/river) "ueW" = ( @@ -16248,7 +16248,7 @@ /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "upc" = ( @@ -16664,7 +16664,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "uNI" = ( @@ -16719,7 +16719,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "uRJ" = ( @@ -16846,7 +16846,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "vbZ" = ( @@ -16970,7 +16970,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "vjv" = ( @@ -16996,7 +16996,7 @@ /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "vlw" = ( @@ -17056,7 +17056,7 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "vot" = ( @@ -17105,7 +17105,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "vqT" = ( @@ -17194,7 +17194,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "vws" = ( @@ -17463,7 +17463,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "vKb" = ( @@ -17528,7 +17528,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "vMV" = ( @@ -17746,7 +17746,7 @@ /obj/item/stack/sheet/mineral/plasma/fifty, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "wbT" = ( @@ -17786,7 +17786,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "weC" = ( @@ -17812,7 +17812,7 @@ "wft" = ( /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "wgn" = ( @@ -17823,7 +17823,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "who" = ( @@ -17935,7 +17935,7 @@ /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "wtJ" = ( @@ -18010,7 +18010,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "wzc" = ( @@ -18244,7 +18244,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "wMk" = ( @@ -18368,7 +18368,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "wRw" = ( @@ -18411,7 +18411,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "wUi" = ( @@ -18467,7 +18467,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "wZE" = ( @@ -18526,7 +18526,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside/complex) "xaS" = ( @@ -18742,7 +18742,7 @@ /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "xsG" = ( @@ -18760,7 +18760,7 @@ /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "xtu" = ( @@ -18771,7 +18771,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "xtv" = ( @@ -18935,7 +18935,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "xDi" = ( @@ -19004,7 +19004,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "xJT" = ( @@ -19015,7 +19015,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/outside) "xKX" = ( @@ -19087,7 +19087,7 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "xPg" = ( @@ -19153,7 +19153,7 @@ /obj/effect/landmark/awaystart, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/awaymission/jungle_planet/inside) "xQt" = ( diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index 50fda46f384d..13178353637e 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -4425,6 +4425,25 @@ /area/station/security/lobby) "asY" = ( /obj/structure/chair/office/dark, +/obj/machinery/door_control/normal/east{ + id = "BrigRight"; + name = "Brig Foyer Right Doors"; + req_one_access_txt = "63" + }, +/obj/machinery/door_control/normal/east{ + pixel_y = 8; + name = "Brig Foyer Left Doors"; + req_one_access_txt = "63"; + desc = "A remote control switch for the brig foyer."; + id = "BrigLeft" + }, +/obj/machinery/door_control/normal/east{ + pixel_y = -8; + desc = "A remote control switch for the brig foyer."; + id = "BrigEast"; + name = "Brig Foyer East Doors"; + req_one_access_txt = "63" + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkred" @@ -4877,29 +4896,13 @@ icon_state = "4-8" }, /obj/effect/mapping_helpers/airlock/windoor/access/any/security/general, -/obj/machinery/door_control/normal{ - desc = "A remote control switch for the brig foyer."; - id = "BrigLeft"; - name = "Brig Foyer Left Doors"; - pixel_x = -5; - pixel_y = 6; - req_one_access_txt = "63" - }, -/obj/machinery/door_control/normal{ - desc = "A remote control switch for the brig foyer."; - id = "BrigRight"; - name = "Brig Foyer Right Doors"; - pixel_x = 5; - pixel_y = 6; - req_one_access_txt = "63" +/obj/item/paper_bin{ + pixel_y = 3; + pixel_x = -4 }, -/obj/machinery/door_control/normal{ - desc = "A remote control switch for the brig foyer."; - id = "BrigEast"; - name = "Brig Foyer East Doors"; - pixel_x = 5; - pixel_y = -2; - req_one_access_txt = "63" +/obj/item/pen{ + pixel_x = -2; + pixel_y = 5 }, /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -9749,7 +9752,7 @@ }, /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ - icon_state = "Dark_Golden_1"; + icon_state = "dark"; dir = 6 }, /area/station/legal/courtroom) @@ -13411,7 +13414,16 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aXI" = ( +/obj/machinery/light/small/directional/west, /obj/structure/table/glass, +/obj/item/reagent_containers/spray/pestspray{ + pixel_x = -6; + pixel_y = 9 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_y = 4; + pixel_x = 4 + }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "aXL" = ( @@ -13888,9 +13900,9 @@ }, /area/station/command/vault) "aZj" = ( -/obj/machinery/light/small/directional/west, /obj/structure/table/glass, /obj/item/cultivator, +/obj/item/shovel/spade, /obj/item/hatchet, /obj/item/crowbar, /obj/item/plant_analyzer, @@ -15022,10 +15034,12 @@ /area/station/hallway/primary/central/north) "bdx" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/spray/plantbgone, -/obj/item/reagent_containers/spray/pestspray, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/rh, +/obj/item/reagent_containers/glass/bottle/nutrient/ez{ + pixel_x = 4 + }, +/obj/item/reagent_containers/glass/bottle/nutrient/rh{ + pixel_x = -4 + }, /obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; @@ -15903,8 +15917,9 @@ /area/station/service/expedition) "bgM" = ( /obj/structure/table/glass, -/obj/item/hatchet, /obj/item/cultivator, +/obj/item/shovel/spade, +/obj/item/hatchet, /obj/item/crowbar, /obj/item/plant_analyzer, /obj/item/reagent_containers/glass/bucket, @@ -51967,7 +51982,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/assembly/mousetrap/armed, /turf/simulated/floor/plasteel{ - icon_state = "Dark" + icon_state = "dark" }, /area/station/maintenance/abandonedbar) "fZX" = ( @@ -54264,7 +54279,7 @@ /obj/effect/turf_decal/arrows/black{ dir = 8 }, -/obj/machinery/door/poddoor/shutters/preopen{ +/obj/machinery/door/poddoor/shutters/window/preopen{ dir = 8; id_tag = "hopqueue"; name = "Privacy Shutters" @@ -55157,7 +55172,7 @@ /obj/item/reagent_containers/glass/bucket, /obj/structure/sink/directional/north, /turf/simulated/floor/plasteel{ - icon_state = "Dark" + icon_state = "dark" }, /area/station/maintenance/abandonedbar) "heL" = ( @@ -60566,6 +60581,8 @@ /obj/item/radio/intercom/custom{ pixel_y = 36 }, +/obj/structure/filingcabinet/security, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkred" @@ -64740,10 +64757,9 @@ /obj/machinery/door/airlock/medical/glass{ name = "Isolator" }, -/obj/machinery/door/poddoor/shutters/preopen{ +/obj/machinery/door/poddoor/shutters/window/preopen{ dir = 1; - id_tag = "durka2"; - layer = 4 + id_tag = "durka2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -69712,10 +69728,9 @@ /obj/item/reagent_containers/glass/beaker/waterbottle/large{ pixel_x = 7 }, -/obj/machinery/door/poddoor/shutters/preopen{ +/obj/machinery/door/poddoor/shutters/window/preopen{ dir = 1; - id_tag = "durka2"; - layer = 4 + id_tag = "durka2" }, /obj/machinery/door/window/reinforced/normal{ dir = 1; @@ -76961,7 +76976,7 @@ /obj/effect/turf_decal/arrows/black{ dir = 4 }, -/obj/machinery/door/poddoor/shutters/preopen{ +/obj/machinery/door/poddoor/shutters/window/preopen{ dir = 8; id_tag = "hopqueue"; name = "Privacy Shutters" @@ -77073,7 +77088,8 @@ dir = 8 }, /obj/structure/holohoop{ - dir = 4 + dir = 4; + pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -78176,8 +78192,8 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "Dark_Golden_1"; - dir = 5 + icon_state = "dark"; + dir = 6 }, /area/station/legal/courtroom) "pBP" = ( @@ -78664,14 +78680,13 @@ /obj/machinery/door/airlock/medical/glass{ name = "Isolator" }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id_tag = "durka1"; - layer = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/mapping_helpers/airlock/access/any/medical/psychology, +/obj/machinery/door/poddoor/shutters/window/preopen{ + dir = 1; + id_tag = "durka1" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78974,11 +78989,6 @@ }, /area/station/engineering/atmos) "pTa" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id_tag = "durka1"; - layer = 4 - }, /obj/structure/table/reinforced, /obj/machinery/door/window/reinforced/normal{ name = "Secure Desk" @@ -78990,6 +79000,10 @@ /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/psychology{ dir = 1 }, +/obj/machinery/door/poddoor/shutters/window/preopen{ + dir = 1; + id_tag = "durka1" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79793,7 +79807,7 @@ /area/station/maintenance/assembly_line) "qjA" = ( /turf/simulated/floor/plasteel{ - icon_state = "Dark" + icon_state = "dark" }, /area/station/maintenance/abandonedbar) "qjC" = ( @@ -95642,7 +95656,7 @@ /obj/item/clothing/accessory/scarf/white, /obj/effect/spawner/lootdrop/maintenance/three, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/station/maintenance/abandonedbar) "vXb" = ( diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index e8a86a8df028..2e03bff2bea4 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -60,7 +60,8 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/starboard2) "abV" = ( -/obj/machinery/economy/vending/security, +/obj/structure/table/reinforced, +/obj/machinery/recharger, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -249,6 +250,9 @@ d2 = 8; icon_state = "1-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood/oak, /area/station/science/robotics/showroom) "adb" = ( @@ -425,6 +429,7 @@ icon_state = "2-8" }, /obj/effect/landmark/start/internal_affairs, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "aeh" = ( @@ -979,6 +984,12 @@ icon_state = "cmo" }, /area/station/medical/break_room) +"ahr" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "aht" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -1513,6 +1524,9 @@ "alX" = ( /obj/machinery/economy/vending/lawdrobe, /obj/machinery/light/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "amd" = ( @@ -1622,6 +1636,9 @@ id = "PrivateRoom2" }, /obj/structure/chair/comfy/brown, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_male) "amF" = ( @@ -1794,6 +1811,7 @@ /area/station/hallway/secondary/entry) "anv" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/blue, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "any" = ( @@ -1983,6 +2001,17 @@ icon_state = "neutral" }, /area/station/maintenance/fore2) +"aon" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/public/vacant_store) "aoo" = ( /turf/simulated/wall, /area/station/public/vacant_office) @@ -4109,6 +4138,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "auz" = ( @@ -4835,7 +4867,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/station/security/permabrig) "axv" = ( @@ -5298,6 +5330,15 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) +"ayU" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/wood/corner, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/legal/lawoffice) "ayV" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -5422,13 +5463,9 @@ }, /area/station/command/office/cmo) "azx" = ( -/obj/structure/table/reinforced, -/obj/machinery/photocopier/faxmachine/longrange{ - pixel_y = 4; - department = "Quartermaster's Office" - }, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/light/directional/north, +/obj/structure/filingcabinet, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -6305,6 +6342,12 @@ }, /turf/simulated/floor/plating, /area/station/supply/qm) +"aCA" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "aCD" = ( /obj/machinery/atmospherics/portable/scrubber/huge/stationary, /obj/effect/decal/cleanable/dirt, @@ -6447,6 +6490,9 @@ /obj/machinery/economy/vending/crittercare, /obj/effect/turf_decal/delivery, /obj/machinery/light/directional/north, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, /turf/simulated/floor/plasteel, /area/station/public/pool) "aCU" = ( @@ -6617,6 +6663,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/turf_decal/delivery/partial{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -6935,7 +6984,6 @@ }, /area/station/supply/qm) "aEL" = ( -/obj/effect/turf_decal/delivery/hollow, /obj/structure/dresser, /turf/simulated/floor/carpet/orange, /area/station/supply/qm) @@ -7384,6 +7432,9 @@ /area/station/engineering/controlroom) "aGr" = ( /obj/structure/dresser, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "aGs" = ( @@ -7692,6 +7743,9 @@ dir = 4 }, /obj/machinery/light_switch/west, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "aHR" = ( @@ -8496,12 +8550,9 @@ }, /area/station/hallway/primary/fore) "aKw" = ( -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/station/hallway/primary/fore) +/obj/effect/turf_decal/siding/wood, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "aKx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8787,6 +8838,9 @@ /area/station/service/clown) "aLE" = ( /obj/item/kirbyplants, +/obj/effect/turf_decal/siding/blue{ + dir = 9 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aLM" = ( @@ -9419,6 +9473,7 @@ dir = 1 }, /obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/siding/dark_red, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aON" = ( @@ -9471,6 +9526,9 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery/partial{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -10417,6 +10475,9 @@ "aTB" = ( /obj/machinery/light/directional/west, /obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -11249,7 +11310,7 @@ /obj/effect/turf_decal/delivery/hollow, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/station/security/permabrig) "aXu" = ( @@ -11312,6 +11373,12 @@ /area/station/engineering/atmos) "aXH" = ( /obj/machinery/light_switch/north, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "aXJ" = ( @@ -12050,8 +12117,14 @@ }, /area/station/supply/office) "baZ" = ( -/obj/machinery/recharge_station, /obj/effect/turf_decal/delivery/hollow, +/obj/structure/table/reinforced, +/obj/item/eftpos{ + pixel_x = 6 + }, +/obj/item/eftpos{ + pixel_x = -6 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -12464,7 +12537,12 @@ }, /area/station/aisat) "bcB" = ( -/obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/arrows/black{ + dir = 4 + }, +/obj/effect/turf_decal/delivery/partial{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -14322,6 +14400,12 @@ icon_state = "purple" }, /area/station/supply/miningdock) +"bjM" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/simulated/floor/wood/oak, +/area/station/command/office/captain) "bjN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14405,6 +14489,9 @@ /area/station/hallway/primary/port) "bjZ" = ( /obj/machinery/light/directional/east, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "bka" = ( @@ -15552,6 +15639,9 @@ /obj/structure/chair/sofa/corner{ dir = 1 }, +/obj/effect/turf_decal/siding/dark_red{ + dir = 10 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "bpm" = ( @@ -16435,6 +16525,14 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) +"bta" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "btc" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -16567,6 +16665,9 @@ /area/station/service/hydroponics) "btF" = ( /obj/structure/dresser, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_male) "btH" = ( @@ -17005,6 +17106,12 @@ /obj/item/shard, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"bvS" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/legal/lawoffice) "bvT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17186,6 +17293,13 @@ icon_state = "whiteblue" }, /area/station/medical/medbay2) +"bwV" = ( +/obj/item/flag/nt, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/simulated/floor/wood/oak, +/area/station/command/office/ntrep) "bwY" = ( /obj/machinery/light/small/directional/west, /obj/structure/closet/firecloset, @@ -17786,8 +17900,9 @@ }, /area/station/hallway/primary/central/sw) "bzb" = ( -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/central/ne) +/obj/effect/turf_decal/siding/wood/corner, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "bzc" = ( /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, @@ -18610,6 +18725,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "bCL" = ( @@ -20318,6 +20436,7 @@ dir = 10; initialize_directions = 10 }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "bHK" = ( @@ -20707,19 +20826,34 @@ /obj/structure/table/wood, /obj/machinery/status_display/directional/west, /obj/item/flashlight/lamp, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bIZ" = ( /obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bJa" = ( /obj/item/kirbyplants, /obj/machinery/light/directional/south, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bJb" = ( /obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bJc" = ( @@ -20728,10 +20862,17 @@ d2 = 4; icon_state = "0-4" }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bJe" = ( /obj/machinery/newscaster/security_unit/south, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bJf" = ( @@ -20743,6 +20884,9 @@ "bJg" = ( /obj/structure/table/wood, /obj/item/paicard, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bJi" = ( @@ -20763,6 +20907,9 @@ /obj/structure/table/wood, /obj/item/clipboard, /obj/item/toy/figure/crew/captain, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bJk" = ( @@ -20771,6 +20918,9 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bJl" = ( @@ -20784,28 +20934,46 @@ /area/station/security/permabrig) "bJm" = ( /obj/machinery/light/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bJn" = ( /obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bJo" = ( /obj/machinery/ai_status_display/north, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bJp" = ( /obj/structure/sign/bobross{ pixel_y = 32 }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bJq" = ( /obj/machinery/status_display/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bJr" = ( /obj/item/kirbyplants, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bJs" = ( @@ -21262,6 +21430,9 @@ pixel_y = -4; req_one_access_txt = "18" }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bKH" = ( @@ -21282,9 +21453,19 @@ /area/station/command/meeting_room) "bKM" = ( /obj/machinery/light_switch/south, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bKN" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bKP" = ( @@ -21348,6 +21529,9 @@ /area/station/command/office/captain) "bLg" = ( /obj/machinery/alarm/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bLh" = ( @@ -21370,6 +21554,9 @@ /obj/item/clipboard, /obj/item/book/manual/wiki/security_space_law/black, /obj/item/stamp/law, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "bLj" = ( @@ -21402,10 +21589,16 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "bLm" = ( /obj/machinery/hologram/holopad, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "bLn" = ( @@ -21804,10 +21997,16 @@ /area/station/hallway/primary/central/north) "bMM" = ( /obj/machinery/photocopier, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bMN" = ( /obj/machinery/hologram/holopad, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bMO" = ( @@ -21850,6 +22049,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bMV" = ( @@ -21913,16 +22115,11 @@ "bNh" = ( /obj/machinery/light/directional/east, /obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) -"bNi" = ( -/obj/structure/table, -/obj/item/flashlight/lamp{ - pixel_y = 10 - }, -/obj/item/book/manual/wiki/security_space_law, -/turf/simulated/floor/plasteel, -/area/station/security/processing) "bNj" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -22408,6 +22605,9 @@ "bOE" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bOF" = ( @@ -22499,6 +22699,9 @@ /area/station/command/office/captain) "bOV" = ( /obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bOX" = ( @@ -22515,6 +22718,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bOZ" = ( @@ -22526,6 +22730,7 @@ d2 = 8; icon_state = "0-8" }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bPb" = ( @@ -22533,6 +22738,9 @@ c_tag = "Captain's Room"; dir = 8 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bPc" = ( @@ -22552,6 +22760,9 @@ }, /obj/item/camera, /obj/item/taperecorder, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "bPe" = ( @@ -22564,6 +22775,7 @@ pixel_y = 6; pixel_x = 6 }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "bPf" = ( @@ -22586,6 +22798,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "bPh" = ( @@ -22594,6 +22807,9 @@ dir = 8 }, /obj/machinery/light_switch/east, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "bPi" = ( @@ -22952,7 +23168,7 @@ network = list("Prison","SS13") }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/station/security/permabrig) "bQi" = ( @@ -23097,11 +23313,18 @@ /obj/machinery/ai_status_display/west, /obj/item/storage/briefcase, /obj/item/storage/secure/briefcase, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bQG" = ( /obj/item/kirbyplants, /obj/machinery/light/directional/north, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bQH" = ( @@ -23110,6 +23333,10 @@ c_tag = "Command Meeting Room"; dir = 1 }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bQI" = ( @@ -23213,11 +23440,17 @@ /obj/machinery/photocopier/faxmachine/longrange{ department = "Captain's Office" }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bQU" = ( /obj/structure/table/wood, /obj/machinery/recharger, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bQV" = ( @@ -23771,7 +24004,7 @@ "bSX" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/station/security/permabrig) "bTb" = ( @@ -24413,16 +24646,30 @@ name = "Head of Personnel Requests Console"; pixel_y = 30 }, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/effect/turf_decal/siding/wood/corner, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "bUR" = ( /obj/item/kirbyplants, /obj/machinery/keycard_auth/north, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "bUU" = ( /obj/structure/table/wood, /obj/machinery/smartfridge/id, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "bUV" = ( @@ -24579,6 +24826,9 @@ /obj/structure/chair/office/light{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/medical/psych) "bVz" = ( @@ -24965,6 +25215,12 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/office/hop) "bWR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "bWT" = ( @@ -25302,6 +25558,12 @@ "bYu" = ( /obj/machinery/status_display/directional/east, /obj/machinery/pdapainter, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "bYv" = ( @@ -25313,10 +25575,19 @@ "bYy" = ( /obj/machinery/photocopier, /obj/machinery/computer/security/telescreen/entertainment/directional/west, +/obj/effect/turf_decal/siding/wood/end{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain/bedroom) "bYA" = ( /obj/machinery/light_switch/north, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain/bedroom) "bYB" = ( @@ -25715,10 +25986,14 @@ department = "Head of Personnel's Office" }, /obj/machinery/keycard_auth/east, +/obj/effect/turf_decal/siding/wood/end, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "cab" = ( /obj/structure/closet/secure_closet/ntrep, +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "cad" = ( @@ -25737,23 +26012,39 @@ /area/station/command/office/ntrep) "cae" = ( /obj/structure/bookcase/sop, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "caf" = ( /obj/structure/chair/sofa/right, /obj/structure/sign/poster/official/random/north, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "cag" = ( /obj/structure/chair/sofa, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "cah" = ( /obj/structure/chair/sofa/corner, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "cai" = ( /obj/item/flag/nt, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "caj" = ( @@ -25782,6 +26073,9 @@ name = "Blueshield Requests Console"; pixel_y = 30 }, +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "cam" = ( @@ -25858,6 +26152,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "caF" = ( @@ -25880,6 +26177,9 @@ /obj/item/book/manual/wiki/sop_legal, /obj/item/book/manual/wiki/sop_command, /obj/machinery/light/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "caM" = ( @@ -26168,6 +26468,9 @@ "cbz" = ( /obj/machinery/suit_storage_unit/captain, /obj/machinery/light/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain/bedroom) "cbA" = ( @@ -26219,7 +26522,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/service/library, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/station/service/library) "cbQ" = ( @@ -26278,6 +26581,12 @@ /obj/machinery/light_switch/west{ pixel_y = 32 }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "cbX" = ( @@ -26306,6 +26615,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "cca" = ( @@ -26332,12 +26644,21 @@ }, /obj/structure/sign/poster/official/random/east, /obj/machinery/computer/security/telescreen/entertainment/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "ccd" = ( /obj/structure/chair/comfy/black{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "cce" = ( @@ -26358,6 +26679,12 @@ pixel_x = 24; req_access_txt = "67" }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "cch" = ( @@ -26401,6 +26728,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain/bedroom) "cck" = ( @@ -26495,6 +26825,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "ccD" = ( @@ -26747,6 +27080,9 @@ /obj/item/storage/box/PDAs, /obj/item/storage/box/ids, /obj/effect/spawner/random_spawners/id_skins, +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "cdI" = ( @@ -26755,6 +27091,12 @@ }, /obj/effect/mapping_helpers/airlock/access/all/command/ntrep, /obj/machinery/light/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "cdJ" = ( @@ -26782,6 +27124,9 @@ dir = 8 }, /obj/machinery/light/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "cdP" = ( @@ -26793,6 +27138,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "cdQ" = ( @@ -26828,6 +27179,12 @@ /obj/machinery/keycard_auth/east{ pixel_y = -3 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "cdT" = ( @@ -26847,6 +27204,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain/bedroom) "cdW" = ( @@ -26859,6 +27219,9 @@ c_tag = "Captain's Quarters"; dir = 1 }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain/bedroom) "cdY" = ( @@ -26888,6 +27251,12 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "cem" = ( @@ -26907,6 +27276,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "ceo" = ( @@ -26934,6 +27306,9 @@ /area/station/security/warden) "ceq" = ( /obj/machinery/papershredder, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "cer" = ( @@ -27082,6 +27457,9 @@ /area/station/engineering/control) "cfa" = ( /obj/structure/closet/secure_closet/captains, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain/bedroom) "cfb" = ( @@ -27226,6 +27604,15 @@ }, /turf/simulated/floor/wood/parquet, /area/station/service/library) +"cfx" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "cfy" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, @@ -27253,6 +27640,12 @@ "cfE" = ( /obj/structure/table/wood, /obj/machinery/recharger, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "cfF" = ( @@ -27269,10 +27662,15 @@ /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "cfK" = ( +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "cfL" = ( /obj/item/flag/nt, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "cfM" = ( @@ -27283,6 +27681,12 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "cfN" = ( @@ -27296,6 +27700,12 @@ /area/station/command/office/blueshield) "cfP" = ( /obj/machinery/light/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "cfQ" = ( @@ -27479,6 +27889,9 @@ "cgS" = ( /obj/structure/table/wood, /obj/item/clothing/head/helmet/skull/Yorick, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "cgW" = ( @@ -27540,6 +27953,12 @@ /area/station/command/office/hop) "chj" = ( /obj/machinery/photocopier, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "chl" = ( @@ -27555,6 +27974,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "chq" = ( @@ -27573,6 +27998,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "chs" = ( @@ -27580,6 +28011,12 @@ /obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/item/reagent_containers/food/drinks/drinkingglass, /obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "cht" = ( @@ -27652,6 +28089,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "chG" = ( @@ -27678,10 +28118,14 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "chN" = ( /obj/item/kirbyplants, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "chO" = ( @@ -27912,12 +28356,24 @@ /obj/structure/bed/dogbed/ian, /obj/machinery/alarm/directional/east, /mob/living/simple_animal/pet/dog/corgi/Ian, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "ciF" = ( /obj/machinery/photocopier, /obj/structure/sign/poster/official/random/west, /obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "ciH" = ( @@ -27930,6 +28386,10 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "ciL" = ( @@ -27950,6 +28410,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "ciP" = ( @@ -27962,12 +28428,22 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "ciR" = ( /obj/machinery/photocopier, /obj/structure/sign/poster/official/random/east, /obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "ciS" = ( @@ -28422,11 +28898,23 @@ "ckp" = ( /obj/machinery/light/directional/west, /obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "cks" = ( /obj/machinery/ai_status_display/east, /obj/structure/filingcabinet, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "ckt" = ( @@ -28560,6 +29048,9 @@ /area/station/legal/courtroom) "ckP" = ( /obj/machinery/alarm/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "ckR" = ( @@ -28691,6 +29182,12 @@ /obj/item/clipboard, /obj/item/toy/figure/crew/ian, /obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "clU" = ( @@ -28996,6 +29493,12 @@ "cnt" = ( /obj/item/kirbyplants, /obj/machinery/light_switch/south, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "cnx" = ( @@ -29316,14 +29819,16 @@ /turf/simulated/floor/carpet/black, /area/station/legal/courtroom) "coM" = ( -/turf/simulated/floor/wood/fancy/oak, -/area/station/legal/courtroom) +/obj/effect/turf_decal/siding/wood, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/public/vacant_store) "coN" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/wood/end, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "coP" = ( @@ -29343,6 +29848,9 @@ /obj/machinery/door_control/shutter/west{ id = "vacantstore" }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "coS" = ( @@ -29358,11 +29866,17 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "coT" = ( /obj/machinery/status_display/directional/east, /obj/structure/table, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "coU" = ( @@ -29693,8 +30207,7 @@ /area/station/hallway/secondary/bridge) "cqt" = ( /obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/box/red, -/turf/simulated/floor/wood/fancy/oak, +/turf/simulated/floor/carpet, /area/station/legal/courtroom) "cqu" = ( /obj/effect/decal/cleanable/dirt, @@ -29735,6 +30248,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "cqy" = ( @@ -29753,11 +30267,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "cqB" = ( /obj/structure/table, /obj/machinery/alarm/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "cqG" = ( @@ -30875,6 +31393,9 @@ /area/station/ai_monitored/storage/eva) "cvu" = ( /obj/item/kirbyplants, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "cvz" = ( @@ -31267,6 +31788,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/effect/turf_decal/siding/white/corner{ + dir = 1 + }, /turf/simulated/floor/plasteel/freezer, /area/station/public/pool) "cxp" = ( @@ -31498,6 +32022,9 @@ /area/station/science/robotics/showroom) "cyi" = ( /obj/structure/bookcase, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood/oak, /area/station/science/robotics/showroom) "cyj" = ( @@ -31506,6 +32033,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/science/robotics/showroom) "cyl" = ( @@ -31775,6 +32306,10 @@ d2 = 4; icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -31987,6 +32522,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/turf_decal/siding/wood/end{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/science/robotics/showroom) "czL" = ( @@ -32039,6 +32577,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/effect/turf_decal/siding/wood/end{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/science/robotics/showroom) "czV" = ( @@ -32268,12 +32809,7 @@ pixel_x = -8 }, /obj/effect/turf_decal/delivery/hollow, -/obj/item/eftpos{ - pixel_x = -6 - }, -/obj/item/eftpos{ - pixel_x = 6 - }, +/obj/item/book/manual/wiki/security_space_law, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -34085,6 +34621,9 @@ pixel_x = 3; pixel_y = 3 }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/public/pool) "cJs" = ( @@ -34098,6 +34637,9 @@ "cJz" = ( /obj/structure/table/wood/poker, /obj/item/deck/cards, +/obj/effect/turf_decal/siding/dark_red{ + dir = 1 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "cJA" = ( @@ -34587,10 +35129,6 @@ /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) "cLr" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ @@ -34603,6 +35141,9 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/disposalpipe/junction/y{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -34835,6 +35376,9 @@ icon_state = "4-8" }, /obj/item/flag/sec, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "cMG" = ( @@ -34872,6 +35416,7 @@ /obj/effect/turf_decal/delivery/partial{ dir = 1 }, +/obj/effect/turf_decal/siding/white, /turf/simulated/floor/plasteel/freezer, /area/station/public/pool) "cMS" = ( @@ -35154,6 +35699,9 @@ /obj/item/bedsheet/red{ dir = 1 }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "cOq" = ( @@ -35551,6 +36099,9 @@ /turf/simulated/floor/plating, /area/station/medical/psych) "cPQ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood/oak, /area/station/medical/psych) "cPS" = ( @@ -35592,6 +36143,7 @@ dir = 1 }, /obj/machinery/light/directional/south, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "cQf" = ( @@ -35623,6 +36175,9 @@ "cQj" = ( /obj/machinery/economy/arcade/claw, /obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "cQk" = ( @@ -35833,6 +36388,9 @@ /area/station/science/xenobiology) "cRb" = ( /obj/machinery/photocopier, +/obj/effect/turf_decal/siding/wood/end{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/medical/psych) "cRc" = ( @@ -36362,6 +36920,9 @@ dir = 8 }, /obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "cTf" = ( @@ -36716,6 +37277,9 @@ /obj/structure/sign/poster/official/walk{ pixel_x = -32 }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -37085,6 +37649,9 @@ }, /area/station/hallway/secondary/exit) "cWe" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 6 + }, /obj/structure/curtain/open/shower/security{ icon_state = "closed"; opacity = 1 @@ -37093,6 +37660,9 @@ /area/station/public/arcade) "cWf" = ( /obj/structure/sign/poster/official/random/west, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -37109,6 +37679,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, /turf/simulated/floor/plasteel/freezer, /area/station/public/pool) "cWh" = ( @@ -39271,7 +39844,9 @@ "dhd" = ( /obj/machinery/economy/vending/cigarette, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "dhe" = ( @@ -40374,6 +40949,9 @@ /obj/structure/sign/poster/official/walk{ pixel_y = 32 }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/public/pool) "dne" = ( @@ -40384,6 +40962,9 @@ }, /mob/living/simple_animal/mouse/hamster/Representative, /obj/structure/bed/dogbed/pet, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "dng" = ( @@ -41195,6 +41776,7 @@ /area/station/medical/medbay) "drp" = ( /obj/item/kirbyplants, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "drq" = ( @@ -44144,6 +44726,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_male) "dIx" = ( @@ -45030,6 +45615,10 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "dOn" = ( @@ -47842,7 +48431,9 @@ /turf/simulated/floor/plasteel/grimy, /area/station/security/detective) "dZP" = ( -/obj/machinery/hologram/holopad, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "dZQ" = ( @@ -48220,6 +48811,7 @@ /obj/structure/sign/poster/official/safety_internals{ pixel_y = -32 }, +/obj/effect/turf_decal/siding/white, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -48471,6 +49063,12 @@ "eir" = ( /obj/machinery/economy/vending/cart, /obj/machinery/computer/security/telescreen/entertainment/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "eiA" = ( @@ -48649,6 +49247,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -48845,6 +49446,9 @@ /area/station/maintenance/old_kitchen) "eoI" = ( /obj/effect/spawner/random_spawners/cobweb_right_rare, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "eoX" = ( @@ -49087,6 +49691,13 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/explab) +"esO" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "etw" = ( /obj/structure/table, /obj/item/reagent_containers/glass/bucket, @@ -49333,6 +49944,9 @@ dir = 1 }, /obj/structure/sign/poster/official/random/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_male) "exh" = ( @@ -50336,6 +50950,9 @@ /obj/item/clothing/suit/blacktrenchcoat, /obj/item/clothing/head/fedora, /obj/machinery/status_display/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/public/sleep_male) "eOm" = ( @@ -50906,6 +51523,18 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/command/vault) +"eXa" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/public/vacant_store) +"eXm" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/simulated/floor/wood/oak, +/area/station/command/office/captain/bedroom) "eXw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance, @@ -50959,6 +51588,13 @@ icon_state = "vault" }, /area/station/service/expedition) +"eXM" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/simulated/floor/wood/oak, +/area/station/medical/psych) "eXU" = ( /obj/machinery/atmospherics/unary/vent_pump{ autolink_id = "o2_out"; @@ -51307,6 +51943,12 @@ /area/station/medical/chemistry) "ffM" = ( /obj/item/kirbyplants, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "ffN" = ( @@ -51378,10 +52020,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "fhb" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain/bedroom) "fhk" = ( @@ -51395,6 +52043,9 @@ /area/station/security/storage) "fho" = ( /obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "fhp" = ( @@ -52415,7 +53066,7 @@ }, /obj/structure/railing, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/station/security/permabrig) "fxe" = ( @@ -54151,6 +54802,17 @@ icon_state = "redyellowfull" }, /area/station/maintenance/old_kitchen) +"fZt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/arcade, +/area/station/public/arcade) "fZJ" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -54374,6 +55036,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "gcZ" = ( @@ -54745,10 +55411,14 @@ /area/station/science/misc_lab) "gkg" = ( /obj/machinery/firealarm/directional/north, +/obj/structure/bed/dogbed, +/mob/living/simple_animal/pet/sloth/paperwork, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "gkj" = ( -/obj/effect/turf_decal/box/red, /obj/machinery/power/apc{ cell_type = 25000; dir = 4; @@ -54760,7 +55430,7 @@ d2 = 8; icon_state = "0-8" }, -/turf/simulated/floor/wood/fancy/oak, +/turf/simulated/floor/carpet, /area/station/legal/courtroom) "gkk" = ( /turf/simulated/floor/plasteel{ @@ -54772,6 +55442,7 @@ /obj/structure/table/glass, /obj/item/storage/fancy/donut_box, /obj/machinery/ai_status_display/south, +/obj/effect/turf_decal/siding/white, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -54818,6 +55489,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, /turf/simulated/floor/plasteel/freezer, /area/station/public/pool) "glw" = ( @@ -54857,7 +55531,12 @@ "glR" = ( /obj/machinery/disposal, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "gme" = ( @@ -55476,6 +56155,18 @@ /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) +"gwF" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "gwI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -56037,6 +56728,17 @@ /obj/effect/spawner/random_spawners/oil_maybe, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"gIb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "gIn" = ( /obj/machinery/optable, /turf/simulated/floor/plasteel{ @@ -56169,6 +56871,9 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "gJQ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "gJS" = ( @@ -56342,6 +57047,9 @@ "gMf" = ( /obj/machinery/papershredder, /obj/machinery/light/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "gMx" = ( @@ -56418,6 +57126,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "gMW" = ( @@ -56517,6 +57228,12 @@ icon_state = "darkbluecorners" }, /area/station/maintenance/starboard2) +"gOG" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/simulated/floor/wood/oak, +/area/station/command/meeting_room) "gOP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -56581,6 +57298,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "gPW" = ( @@ -56647,6 +57367,9 @@ d2 = 8; icon_state = "1-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "gRm" = ( @@ -57418,6 +58141,13 @@ icon_state = "neutralcorner" }, /area/station/engineering/hardsuitstorage) +"heL" = ( +/obj/item/kirbyplants, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "heT" = ( /obj/effect/spawner/lootdrop/trash, /obj/effect/spawner/lootdrop/trash, @@ -57746,7 +58476,6 @@ /area/station/medical/cryo) "hiT" = ( /obj/structure/closet/secure_closet/quartermaster, -/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/carpet/orange, /area/station/supply/qm) "hjl" = ( @@ -58336,6 +59065,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "hvl" = ( @@ -58822,6 +59554,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "hCj" = ( @@ -59188,6 +59923,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood/oak, /area/station/science/robotics/showroom) "hHk" = ( @@ -59211,6 +59949,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "hHy" = ( @@ -59244,6 +59985,7 @@ "hIj" = ( /obj/structure/bed/psych, /obj/random/therapy, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/oak, /area/station/medical/psych) "hIE" = ( @@ -60378,6 +61120,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "iaP" = ( @@ -60984,6 +61729,9 @@ "ijQ" = ( /obj/structure/table, /obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "ijT" = ( @@ -61017,6 +61765,12 @@ icon_state = "white" }, /area/station/medical/virology/lab) +"ikz" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/public/vacant_store) "ikC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -62314,6 +63068,9 @@ /obj/machinery/disposal, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/public/pool) "iEG" = ( @@ -62668,6 +63425,9 @@ /area/station/medical/virology/lab) "iKe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "iKr" = ( @@ -62918,6 +63678,10 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/wood/fancy, /area/station/service/theatre) +"iOy" = ( +/obj/effect/turf_decal/siding/wood/corner, +/turf/simulated/floor/wood, +/area/station/command/office/hos) "iOA" = ( /obj/structure/table/glass, /obj/item/defibrillator/loaded{ @@ -63292,6 +64056,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "iUW" = ( @@ -63373,6 +64143,9 @@ dir = 8 }, /obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "iVO" = ( @@ -63596,7 +64369,11 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/carpet, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "iZL" = ( /obj/effect/turf_decal/stripes/corner, @@ -63685,6 +64462,9 @@ /obj/structure/chair{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "jbL" = ( @@ -63694,6 +64474,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/security/permabrig) +"jbN" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/turf/simulated/floor/carpet/arcade, +/area/station/public/arcade) "jbU" = ( /obj/structure/table/reinforced, /obj/structure/mirror{ @@ -64024,6 +64810,10 @@ icon_state = "neutral" }, /area/station/maintenance/fsmaint) +"jgY" = ( +/obj/effect/turf_decal/siding/wood, +/turf/simulated/floor/wood/oak, +/area/station/command/office/captain) "jgZ" = ( /mob/living/simple_animal/hostile/retaliate/carp/koi{ name = "Jeremy" @@ -64919,6 +65709,12 @@ }, /turf/simulated/floor/wood/parquet, /area/station/service/library) +"jtC" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/public/vacant_store) "jtK" = ( /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, @@ -65066,6 +65862,9 @@ range = 10; req_one_access_txt = "38" }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "jvu" = ( @@ -65441,6 +66240,9 @@ pixel_y = 6; pixel_x = 6 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "jDc" = ( @@ -65895,10 +66697,17 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain/bedroom) "jKd" = ( /obj/machinery/photocopier, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "jKj" = ( @@ -66021,9 +66830,11 @@ /area/station/maintenance/starboard2) "jLO" = ( /obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/delivery/hollow, /obj/machinery/disposal, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "jMo" = ( @@ -66107,6 +66918,9 @@ /obj/structure/sign/poster/official/random/south, /obj/structure/rack, /obj/item/storage/secure/briefcase, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "jOi" = ( @@ -66160,6 +66974,9 @@ dir = 4 }, /obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "jOC" = ( @@ -66837,6 +67654,10 @@ /obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) +"kaG" = ( +/obj/effect/turf_decal/siding/white, +/turf/simulated/floor/plasteel/freezer, +/area/station/public/pool) "kaL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table_frame, @@ -66856,6 +67677,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "kaO" = ( @@ -66927,6 +67752,9 @@ /obj/structure/table/glass, /obj/item/storage/fancy/crayons, /obj/item/lipstick/random, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/public/pool) "kbw" = ( @@ -66981,6 +67809,9 @@ d2 = 4; icon_state = "1-4" }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/medical/psych) "kcd" = ( @@ -68258,6 +69089,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/white/corner{ + dir = 4 + }, /turf/simulated/floor/plasteel/freezer, /area/station/public/pool) "kyg" = ( @@ -68519,6 +69353,9 @@ dir = 1 }, /obj/machinery/light/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "kCA" = ( @@ -68581,6 +69418,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, /turf/simulated/floor/plasteel/freezer, /area/station/public/pool) "kEw" = ( @@ -68899,6 +69739,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "kIl" = ( @@ -69132,7 +69975,6 @@ /area/station/service/library) "kNe" = ( /obj/machinery/suit_storage_unit/qm/secure, -/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/carpet/orange, /area/station/supply/qm) "kNg" = ( @@ -69388,6 +70230,9 @@ dir = 1 }, /obj/structure/sign/poster/official/random/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "kQQ" = ( @@ -69500,6 +70345,9 @@ d2 = 8; icon_state = "0-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "kTo" = ( @@ -69820,6 +70668,12 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) +"kYb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/carpet/arcade, +/area/station/public/arcade) "kYd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -69942,6 +70796,12 @@ icon_state = "red" }, /area/station/security/processing) +"laZ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/simulated/floor/wood/oak, +/area/station/command/office/captain) "lbz" = ( /obj/structure/disposalpipe/junction/reversed{ dir = 4 @@ -70238,6 +71098,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "lgJ" = ( @@ -70580,14 +71443,14 @@ /area/station/maintenance/old_kitchen) "lkZ" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/reagent_containers/food/snacks/icecream/icecreamcone, -/obj/item/reagent_containers/food/snacks/icecream/icecreamcone, -/obj/item/reagent_containers/food/snacks/icecream/icecreamcone, -/obj/item/reagent_containers/food/snacks/icecream/icecreamcone, -/obj/item/reagent_containers/food/snacks/icecream, -/obj/item/reagent_containers/food/snacks/icecream, -/obj/item/reagent_containers/food/snacks/icecreamsandwich, -/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone, +/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone, +/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone, +/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone, +/obj/item/reagent_containers/food/snacks/frozen/icecream, +/obj/item/reagent_containers/food/snacks/frozen/icecream, +/obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" @@ -71164,6 +72027,9 @@ /area/station/medical/virology/lab) "lvi" = ( /obj/structure/bookcase/sop, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "lvu" = ( @@ -71728,6 +72594,12 @@ /obj/effect/decal/cleanable/blood/old, /turf/simulated/floor/plasteel, /area/station/maintenance/medmaint) +"lDJ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "lDP" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -71762,6 +72634,13 @@ icon_state = "darkred" }, /area/station/security/main) +"lDX" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner, +/turf/simulated/floor/wood/oak, +/area/station/command/meeting_room) "lEd" = ( /obj/structure/table/wood, /obj/item/folder/blue, @@ -71770,6 +72649,12 @@ /obj/item/storage/box/keys{ pixel_x = -15 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "lEt" = ( @@ -72362,6 +73247,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "lOm" = ( @@ -72543,6 +73432,9 @@ /area/station/medical/virology/lab) "lPY" = ( /obj/machinery/suit_storage_unit/security/hos, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "lQa" = ( @@ -72672,6 +73564,9 @@ "lSa" = ( /obj/machinery/prize_counter, /obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "lSc" = ( @@ -72986,6 +73881,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "lYS" = ( @@ -73355,6 +74253,9 @@ "mga" = ( /obj/item/kirbyplants, /obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_male) "mgh" = ( @@ -73726,6 +74627,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "mmC" = ( @@ -73853,11 +74757,17 @@ c_tag = "Brig Head of Security's Office"; dir = 8 }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "moT" = ( /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/psychiatrist, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/medical/psych) "mpe" = ( @@ -74688,6 +75598,15 @@ icon_state = "neutralfull" }, /area/station/engineering/tech_storage) +"mCQ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/simulated/floor/wood/oak, +/area/station/command/office/ntrep) "mCZ" = ( /obj/machinery/airlock_controller/air_cycler{ ext_button_link_id = "assolar_btn_ext"; @@ -74820,6 +75739,10 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) +"mFE" = ( +/obj/effect/turf_decal/siding/wood, +/turf/simulated/floor/wood, +/area/station/command/office/hos) "mGG" = ( /obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ @@ -74914,6 +75837,12 @@ }, /turf/simulated/floor/plating, /area/station/supply/qm) +"mJJ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/simulated/floor/wood/oak, +/area/station/command/meeting_room) "mKd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -75079,6 +76008,13 @@ "mNS" = ( /obj/structure/sign/poster/contraband/random/west, /obj/machinery/light/directional/west, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "mOB" = ( @@ -75142,6 +76078,9 @@ "mPR" = ( /obj/machinery/firealarm/directional/south, /obj/item/kirbyplants, +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -75175,6 +76114,17 @@ icon_state = "greenblue" }, /area/station/maintenance/abandoned_garden) +"mQe" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/legal/lawoffice) "mQD" = ( /obj/machinery/atmospherics/portable/canister/oxygen{ anchored = 1 @@ -75353,6 +76303,9 @@ id = "PrivateRoom1" }, /obj/structure/chair/comfy/brown, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "mRX" = ( @@ -75592,6 +76545,9 @@ pixel_y = 4 }, /obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "mVc" = ( @@ -76090,6 +77046,9 @@ /area/station/maintenance/starboard2) "ncO" = ( /obj/machinery/hologram/holopad, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "ncQ" = ( @@ -76553,6 +77512,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/public/pool) "njM" = ( @@ -76680,6 +77642,10 @@ "nmw" = ( /obj/item/radio/intercom/directional/south, /obj/machinery/economy/slot_machine, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "nmA" = ( @@ -77710,6 +78676,13 @@ icon_state = "neutral" }, /area/station/maintenance/fore) +"nBA" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "nBC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -78033,6 +79006,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/medical/psych) "nFu" = ( @@ -78070,6 +79046,12 @@ /obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/security/execution) +"nFQ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/legal/lawoffice) "nGd" = ( /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ @@ -78134,6 +79116,9 @@ pixel_y = 4 }, /obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "nHh" = ( @@ -78306,6 +79291,9 @@ /area/station/medical/patients_rooms) "nIH" = ( /obj/machinery/economy/vending/wallmed/directional/west, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -78328,6 +79316,9 @@ }, /area/station/service/theatre) "nJw" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -78528,6 +79519,9 @@ /obj/item/bedsheet/blue{ dir = 1 }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_male) "nMc" = ( @@ -79433,6 +80427,9 @@ /obj/structure/railing{ dir = 1 }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /turf/simulated/floor/plasteel/freezer, /area/station/public/pool) "nZo" = ( @@ -79476,8 +80473,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "oav" = ( -/obj/machinery/economy/vending/security, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/recharge_station, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -79649,7 +80646,8 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/carpet, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "ocz" = ( /turf/simulated/floor/plasteel{ @@ -80160,6 +81158,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "olT" = ( @@ -80443,6 +81444,9 @@ d2 = 4; icon_state = "1-4" }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood/oak, /area/station/science/robotics/showroom) "opB" = ( @@ -80619,6 +81623,9 @@ /area/station/security/permabrig) "osS" = ( /obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -80650,6 +81657,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain/bedroom) "otj" = ( @@ -80659,6 +81669,9 @@ d2 = 8; icon_state = "0-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "ott" = ( @@ -80759,6 +81772,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"ovJ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "ovT" = ( /obj/item/radio/intercom/directional/west, /obj/effect/decal/cleanable/dirt, @@ -80845,6 +81864,9 @@ "oyu" = ( /obj/machinery/power/apc/directional/south, /obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "oyG" = ( @@ -81060,6 +82082,9 @@ /obj/structure/sign/poster/official/report_crimes{ pixel_y = 32 }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/public/pool) "oBZ" = ( @@ -81154,6 +82179,10 @@ icon_state = "0-2" }, /obj/machinery/power/apc/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner, /turf/simulated/floor/wood/oak, /area/station/medical/psych) "oDB" = ( @@ -81246,6 +82275,9 @@ "oEY" = ( /obj/item/kirbyplants, /obj/machinery/light/directional/south, +/obj/effect/turf_decal/siding/white{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -81892,6 +82924,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -81903,6 +82938,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "oSD" = ( @@ -82277,6 +83313,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "oYw" = ( @@ -82327,6 +83367,9 @@ c_tag = "Arcade"; dir = 4 }, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "oYY" = ( @@ -82349,6 +83392,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/station/science/robotics/showroom) +"oZd" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "oZm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ @@ -82459,6 +83508,10 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "paM" = ( @@ -82499,6 +83552,7 @@ dir = 1 }, /obj/machinery/alarm/directional/south, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "pbJ" = ( @@ -82774,6 +83828,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "pgH" = ( @@ -82920,6 +83977,15 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fore) +"pie" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/wood, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/legal/lawoffice) "pih" = ( /obj/structure/cable{ d1 = 1; @@ -83880,6 +84946,9 @@ dir = 4 }, /obj/machinery/light_switch/west, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_male) "pwA" = ( @@ -83958,6 +85027,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/white, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -84185,6 +85255,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "pBh" = ( @@ -84367,6 +85440,12 @@ icon_state = "dark" }, /area/station/service/bar) +"pEU" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, +/turf/simulated/floor/carpet/arcade, +/area/station/public/arcade) "pEY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -84381,6 +85460,19 @@ icon_state = "neutralfull" }, /area/station/bridge/checkpoint/south) +"pFd" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp{ + pixel_y = 4; + pixel_x = -4 + }, +/obj/item/camera, +/obj/item/taperecorder, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/legal/lawoffice) "pFn" = ( /obj/machinery/computer/cloning, /turf/simulated/floor/plasteel{ @@ -84676,6 +85768,9 @@ /obj/structure/railing/cap/normal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/white/corner{ + dir = 8 + }, /turf/simulated/floor/plasteel/freezer, /area/station/public/pool) "pKe" = ( @@ -85144,6 +86239,7 @@ dir = 1 }, /obj/machinery/light/directional/south, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_male) "pRP" = ( @@ -85178,6 +86274,13 @@ icon_state = "whitegreencorner" }, /area/station/medical/virology) +"pSp" = ( +/obj/effect/turf_decal/siding/blue/corner, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/carpet/arcade, +/area/station/public/arcade) "pSw" = ( /obj/machinery/economy/vending/coffee, /turf/simulated/floor/plasteel/dark, @@ -85458,6 +86561,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -85886,6 +86992,9 @@ pixel_x = -4; pixel_y = 5 }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "qfd" = ( @@ -86109,8 +87218,17 @@ icon_state = "redfull" }, /area/station/security/brig) +"qix" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/legal/lawoffice) "qiB" = ( /obj/machinery/status_display/directional/west, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -86223,6 +87341,10 @@ icon_state = "neutral" }, /area/station/maintenance/fore) +"qlh" = ( +/obj/effect/turf_decal/siding/wood, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/legal/lawoffice) "qlt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -86577,6 +87699,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/turf_decal/siding/white, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -86836,6 +87959,7 @@ /area/station/maintenance/old_kitchen) "qvE" = ( /obj/structure/curtain/open/shower/security, +/obj/effect/turf_decal/siding/blue, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "qvJ" = ( @@ -86932,6 +88056,9 @@ /area/station/security/prison/cell_block/A) "qwR" = ( /obj/item/flag/nt, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "qwS" = ( @@ -88201,6 +89328,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/effect/turf_decal/arrows/black, +/obj/effect/turf_decal/delivery/partial, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "qQL" = ( @@ -88581,6 +89710,9 @@ /area/station/maintenance/starboard2) "qVF" = ( /obj/machinery/economy/vending/coffee, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/simulated/floor/wood/oak, /area/station/medical/psych) "qVK" = ( @@ -88786,6 +89918,7 @@ pixel_y = -2; pixel_x = -6 }, +/obj/effect/turf_decal/siding/white, /turf/simulated/floor/plasteel, /area/station/public/pool) "qZs" = ( @@ -89196,6 +90329,26 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) +"rfC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "rfH" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -89244,6 +90397,11 @@ "rfS" = ( /obj/structure/cable, /obj/machinery/power/apc/directional/south, +/obj/effect/turf_decal/siding/blue, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "rfT" = ( @@ -89572,7 +90730,7 @@ /obj/effect/turf_decal/delivery/hollow, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/station/security/permabrig) "rma" = ( @@ -89604,6 +90762,9 @@ pixel_x = 6 }, /obj/machinery/status_display/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "rnI" = ( @@ -89673,8 +90834,7 @@ }, /area/station/medical/sleeper) "rpx" = ( -/obj/effect/turf_decal/box/red, -/turf/simulated/floor/wood/fancy/oak, +/turf/simulated/floor/carpet, /area/station/legal/courtroom) "rpC" = ( /obj/structure/cable{ @@ -90446,6 +91606,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "rzO" = ( @@ -90604,7 +91770,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/delivery/partial{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -90848,6 +92016,7 @@ }, /area/station/hallway/primary/aft) "rIU" = ( +/obj/effect/turf_decal/siding/white, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -91084,8 +92253,7 @@ /area/station/security/armory/secure) "rML" = ( /obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/box/red, -/turf/simulated/floor/wood/fancy/oak, +/turf/simulated/floor/carpet, /area/station/legal/courtroom) "rMW" = ( /obj/effect/spawner/window/reinforced/grilled, @@ -91521,6 +92689,12 @@ }, /turf/simulated/floor/plating, /area/station/medical/virology/lab) +"rTt" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/turf/simulated/floor/carpet/arcade, +/area/station/public/arcade) "rTF" = ( /obj/structure/table/wood, /obj/item/taperecorder{ @@ -91653,6 +92827,10 @@ "rXg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "rXk" = ( @@ -91694,7 +92872,9 @@ "rXC" = ( /obj/machinery/economy/vending/coffee, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/siding/blue{ + dir = 10 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "rXE" = ( @@ -92260,6 +93440,15 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/starboard) +"sfc" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "sfh" = ( /obj/structure/cable{ d1 = 1; @@ -92521,6 +93710,9 @@ /obj/structure/chair/sofa/right{ dir = 8 }, +/obj/effect/turf_decal/siding/dark_red{ + dir = 5 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "skK" = ( @@ -92661,6 +93853,10 @@ "sno" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "snC" = ( @@ -94436,6 +95632,9 @@ d2 = 4; icon_state = "1-4" }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "sNN" = ( @@ -94552,6 +95751,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "sQe" = ( @@ -94786,6 +95986,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "sVl" = ( @@ -94999,6 +96202,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "sYI" = ( @@ -95383,6 +96589,12 @@ }, /turf/simulated/floor/plasteel/grimy, /area/station/service/chapel/office) +"teX" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/legal/lawoffice) "tfg" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -95463,6 +96675,9 @@ }, /area/station/maintenance/dormitory_maintenance) "tgi" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -95554,7 +96769,7 @@ /obj/effect/turf_decal/delivery/hollow, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/station/security/permabrig) "tic" = ( @@ -95876,6 +97091,9 @@ "tmh" = ( /obj/machinery/hologram/holopad, /obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -95923,6 +97141,9 @@ /obj/machinery/light_switch/west, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/cobweb_left_rare, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "tnu" = ( @@ -96079,6 +97300,10 @@ /area/station/engineering/tech_storage) "tpv" = ( /obj/machinery/light_switch/north, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "tpI" = ( @@ -96611,6 +97836,9 @@ /obj/structure/table, /obj/item/ashtray/glass, /obj/item/deck/cards/black, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "tyJ" = ( @@ -97026,6 +98254,9 @@ "tFR" = ( /obj/machinery/economy/vending/cigarette, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/public/pool) "tGh" = ( @@ -97310,6 +98541,9 @@ c_tag = "Law Office" }, /obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "tMF" = ( @@ -97432,6 +98666,9 @@ }, /obj/item/reagent_containers/food/drinks/bottle/vodka, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/blue{ + dir = 6 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "tOi" = ( @@ -97571,6 +98808,9 @@ "tQD" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/closet/athletic_mixed, +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/station/public/pool) "tQK" = ( @@ -97632,6 +98872,9 @@ /obj/machinery/disposal, /obj/machinery/light/directional/south, /obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "tSn" = ( @@ -97816,6 +99059,9 @@ icon_state = "0-4" }, /obj/machinery/power/apc/directional/west, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -98516,6 +99762,13 @@ icon_state = "dark" }, /area/station/maintenance/old_detective) +"ugn" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "ugq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/north, @@ -98599,9 +99852,13 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit/maintenance) "uhM" = ( -/obj/structure/filingcabinet, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/light/directional/north, +/obj/structure/table/reinforced, +/obj/machinery/photocopier/faxmachine/longrange{ + pixel_y = 4; + department = "Quartermaster's Office" + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "brown" @@ -98921,6 +100178,9 @@ /obj/structure/chair/sofa/corner{ dir = 8 }, +/obj/effect/turf_decal/siding/dark_red{ + dir = 6 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "unR" = ( @@ -99237,6 +100497,13 @@ icon_state = "white" }, /area/station/medical/cloning) +"urH" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "usc" = ( /obj/structure/bed, /obj/item/bedsheet/mime, @@ -99294,6 +100561,9 @@ dir = 8 }, /obj/effect/turf_decal/delivery/hollow, +/obj/effect/turf_decal/siding/blue{ + dir = 5 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "usY" = ( @@ -99816,6 +101086,17 @@ }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) +"uFx" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "uFI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -99887,9 +101168,18 @@ icon_state = "neutral" }, /area/station/public/fitness) +"uGm" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/legal/lawoffice) "uGp" = ( /obj/item/kirbyplants, /obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "uGY" = ( @@ -99915,6 +101205,9 @@ /obj/structure/chair/sofa/left{ dir = 4 }, +/obj/effect/turf_decal/siding/dark_red{ + dir = 9 + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "uHq" = ( @@ -99982,6 +101275,12 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/fore) +"uIl" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/station/command/office/hos) "uIn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -100261,6 +101560,9 @@ /area/station/maintenance/fsmaint) "uMC" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "uMD" = ( @@ -100574,8 +101876,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) +"uQa" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "uQi" = ( /obj/structure/cable{ d1 = 2; @@ -100691,6 +102002,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "uRt" = ( @@ -101206,6 +102520,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "uXF" = ( @@ -101350,6 +102667,12 @@ icon_state = "whiteblue" }, /area/station/medical/cloning) +"vaB" = ( +/obj/effect/turf_decal/siding/blue/corner{ + dir = 8 + }, +/turf/simulated/floor/carpet/arcade, +/area/station/public/arcade) "vaF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -101380,6 +102703,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "vaZ" = ( @@ -101562,6 +102888,7 @@ dir = 1 }, /obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "veB" = ( @@ -101579,6 +102906,9 @@ d2 = 8; icon_state = "0-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "veF" = ( @@ -102164,6 +103494,12 @@ "vol" = ( /obj/structure/chair/office/dark, /obj/effect/landmark/start/head_of_personnel, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "vom" = ( @@ -102966,6 +104302,17 @@ icon_state = "darkblue" }, /area/station/medical/morgue) +"vEt" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/public/vacant_store) "vEy" = ( /obj/item/shard{ icon_state = "small" @@ -103077,6 +104424,9 @@ "vFK" = ( /obj/machinery/light/directional/east, /obj/structure/table, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "vGb" = ( @@ -103087,6 +104437,12 @@ "vGg" = ( /obj/machinery/economy/vending/coffee, /obj/structure/sign/poster/official/random/west, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "vGA" = ( @@ -103217,6 +104573,17 @@ icon_state = "darkblue" }, /area/station/medical/morgue) +"vIH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood, +/turf/simulated/floor/wood, +/area/station/command/office/hos) "vIR" = ( /obj/machinery/atmospherics/unary/outlet_injector{ autolink_id = "o2_in"; @@ -103614,6 +104981,10 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) +"vOj" = ( +/obj/effect/turf_decal/siding/wood, +/turf/simulated/floor/wood/oak, +/area/station/command/office/captain/bedroom) "vOo" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -103992,6 +105363,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "vUG" = ( @@ -104027,6 +105401,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner, /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "vUX" = ( @@ -104038,6 +105416,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/white/corner, /turf/simulated/floor/plasteel/freezer, /area/station/public/pool) "vVp" = ( @@ -104229,7 +105608,7 @@ "vXr" = ( /obj/structure/railing, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/station/security/permabrig) "vXG" = ( @@ -104972,6 +106351,9 @@ /obj/item/book/manual/wiki/sop_security, /obj/item/book/manual/wiki/sop_command, /obj/item/book/manual/wiki/sop_security, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "wkK" = ( @@ -105001,6 +106383,18 @@ /obj/machinery/atmospherics/portable/scrubber, /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) +"wlf" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/simulated/floor/wood/oak, +/area/station/science/robotics/showroom) "wlm" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -105199,6 +106593,19 @@ /mob/living/simple_animal/pet/dog/pug/Frank, /turf/simulated/floor/engine, /area/station/science/explab/chamber) +"wpb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/station/public/fitness) "wpc" = ( /mob/living/simple_animal/pet/slugcat/monk, /obj/structure/bed/dogbed/pet, @@ -105281,6 +106688,7 @@ }, /obj/item/stack/tape_roll, /obj/item/stack/packageWrap, +/obj/effect/turf_decal/siding/white, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -105445,6 +106853,13 @@ }, /turf/simulated/floor/plating, /area/station/medical/patients_rooms) +"wuQ" = ( +/obj/item/flag/nt, +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, +/turf/simulated/floor/wood/oak, +/area/station/command/office/blueshield) "wuT" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -105521,6 +106936,13 @@ icon_state = "red" }, /area/station/security/permabrig) +"wvT" = ( +/obj/structure/bookcase, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/simulated/floor/wood/oak, +/area/station/science/robotics/showroom) "wvX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -105931,6 +107353,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/turf_decal/siding/wood/corner, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "wDq" = ( @@ -106165,6 +107588,9 @@ layer = 4; pixel_x = -4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "wHt" = ( @@ -106246,6 +107672,18 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit/maintenance) +"wIL" = ( +/obj/effect/turf_decal/delivery/partial{ + dir = 4 + }, +/obj/effect/turf_decal/arrows/black{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/station/hallway/primary/fore) "wIR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -106301,7 +107739,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/station/security/permabrig) "wJU" = ( @@ -106464,6 +107902,9 @@ name = "spider bed" }, /mob/living/simple_animal/hostile/retaliate/araneus, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "wOC" = ( @@ -106855,6 +108296,9 @@ /obj/item/clothing/suit/browntrenchcoat, /obj/item/clothing/head/fedora/brownfedora, /obj/machinery/status_display/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_female) "wUk" = ( @@ -107176,6 +108620,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "wXE" = ( @@ -107196,6 +108643,7 @@ }, /obj/machinery/door/airlock/public, /obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "wXM" = ( @@ -107796,6 +109244,12 @@ dir = 1 }, /obj/machinery/newscaster/security_unit/west, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "xif" = ( @@ -107955,6 +109409,12 @@ /obj/effect/spawner/random_spawners/id_skins, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) +"xlQ" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "xlZ" = ( /obj/item/kirbyplants, /obj/machinery/light/directional/west, @@ -108474,6 +109934,15 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) +"xtq" = ( +/obj/structure/chair/stool{ + dir = 4 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, +/turf/simulated/floor/carpet/arcade, +/area/station/public/arcade) "xtv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -108593,6 +110062,10 @@ /area/station/security/permabrig) "xuX" = ( /obj/structure/bed/dogbed, +/mob/living/simple_animal/pet/dog/fox/fennec/fenya, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/magistrate) "xvf" = ( @@ -108759,6 +110232,10 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "xxQ" = ( @@ -109047,6 +110524,16 @@ /obj/structure/shuttle/engine/propulsion/burst, /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_2) +"xDn" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/simulated/floor/wood/fancy/oak, +/area/station/legal/courtroom) "xDo" = ( /obj/structure/cable{ d1 = 4; @@ -109324,6 +110811,9 @@ /obj/machinery/light/directional/west, /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "xIh" = ( @@ -109765,6 +111255,9 @@ "xOa" = ( /obj/structure/bed/dogbed, /mob/living/simple_animal/pet/dog/brittany/Psycho, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/oak, /area/station/medical/psych) "xOd" = ( @@ -110038,6 +111531,9 @@ d2 = 8; icon_state = "0-8" }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/simulated/floor/wood/fancy, /area/station/public/sleep_male) "xRT" = ( @@ -110173,7 +111669,7 @@ icon_state = "1-2" }, /obj/machinery/hologram/holopad, -/obj/effect/turf_decal/delivery/hollow, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "xTV" = ( @@ -110486,6 +111982,12 @@ }, /turf/simulated/floor/plating, /area/station/medical/virology/lab) +"xYy" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/station/command/office/hos) "xYE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -110503,6 +112005,16 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/main) +"xYL" = ( +/obj/structure/curtain/open/shower/security{ + icon_state = "closed"; + opacity = 1 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 10 + }, +/turf/simulated/floor/carpet/arcade, +/area/station/public/arcade) "xYR" = ( /obj/structure/cable{ d1 = 1; @@ -110597,6 +112109,9 @@ /obj/structure/closet, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/public/vacant_store) "yar" = ( @@ -110758,6 +112273,9 @@ /obj/structure/table/wood, /obj/item/storage/briefcase, /obj/machinery/light/nightshifted/west, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/simulated/floor/wood/oak, /area/station/medical/psych) "ydY" = ( @@ -110856,6 +112374,12 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) +"ygh" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/station/public/vacant_store) "ygp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -111094,6 +112618,17 @@ icon_state = "dark" }, /area/station/service/theatre) +"ykb" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/simulated/floor/wood/oak, +/area/station/science/robotics/showroom) "yki" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -144449,9 +145984,9 @@ bAs bAs bHj bIZ -bKN +mJJ bMN -bKN +mJJ nmw bSE bSE @@ -145991,9 +147526,9 @@ byU bFB bHk aXH -bKN +gOG fgZ -bKN +lDX bKM ciB bUU @@ -146248,7 +147783,7 @@ byU bFC bHk bJg -bKN +mJJ bMU bJe bHk @@ -146516,7 +148051,7 @@ bOZ cab cbW cdI -cfK +mCQ vGg ciF bYv @@ -147043,7 +148578,7 @@ euc uxq csN cxa -cyi +wvT cyj iJd cCM @@ -148270,7 +149805,7 @@ aFC uIk aEF aEF -aKw +aEF aRH aJc aEF @@ -148315,7 +149850,7 @@ bOZ cah ccc cdO -cfL +bwV ckt ckv ckv @@ -148826,7 +150361,7 @@ bSM bOT aaa bQI -cai +wuQ ccd cdP cfM @@ -148842,7 +150377,7 @@ csU gTk cvG nnM -hHd +ykb opu lrN dZj @@ -149100,7 +150635,7 @@ hFh csN cxa cyi -cyj +wlf gRO cCS qih @@ -149846,8 +151381,8 @@ byU bFN bWX bJj -bLc -bLc +laZ +laZ bOV bWX bWX @@ -150082,7 +151617,7 @@ dUy aNv baY aJd -bcB +wIL bfu bea nGd @@ -150105,7 +151640,7 @@ bWX bJk bKZ bLc -bLc +jgY bQO bSO bUV @@ -150625,7 +152160,7 @@ bSP bUW bWX bYA -cdW +eXm ccj cdV bYD @@ -150884,7 +152419,7 @@ bWX cbz cdW cck -cdW +vOj cfQ csL ciS @@ -151647,7 +153182,7 @@ bHx bJq bLf bLf -bLc +bjM bQT bYD bVa @@ -152923,7 +154458,7 @@ vnh cbd cbd cbd -bzb +cbd cbd bCE cbd @@ -153440,7 +154975,7 @@ eNt anA fNr bYM -bPd +pFd uXC bLi jvs @@ -153454,7 +154989,7 @@ mrW bYH fRQ sIA -cvu +heL cMF qwR wHc @@ -153711,13 +155246,13 @@ lsO bYH fMj hNV -lzp +bta hBX olR dOl gPT gQZ -mLg +xDn hBy dht bYH @@ -153955,12 +155490,12 @@ vXI bwA bYM lvi -bTd -bka +mQe +nFQ pBe -bka +uGm bTd -bka +qlh bQW bTb tYa @@ -153968,13 +155503,13 @@ bXc fjd fMj hNV -coM +nBA iuU iuU iZq ccq ccq -coM +urH hBy cax fjd @@ -154225,13 +155760,13 @@ bXc fjd fMj hNV -coM +nBA dYK vcM iZq ckL kmy -coM +urH hBy cax fjd @@ -154244,7 +155779,7 @@ cAe iRd cjy aFx -cPQ +eXM vJb jri fXb @@ -154473,7 +156008,7 @@ jPe oSD mBX bLm -bTd +ayU bPh iuA bTb @@ -154482,13 +156017,13 @@ bXc fjd fMj hNV -coM -coM +sfc dZP -iZq -coM -coM -coM +dZP +rfC +dZP +dZP +ugn hBy cax fjd @@ -154501,7 +156036,7 @@ jfy jfy maI aFx -cPQ +eXM hqR xGj jgE @@ -154729,7 +156264,7 @@ fgN cXQ xPS qET -bka +bvS vey bYM bYM @@ -154739,13 +156274,13 @@ mMh bYH apY hNV -coM +aCA lzp nfe ocx kIt mLg -coM +aKw hBy pbt bYH @@ -154984,10 +156519,10 @@ bWr bYM gkg lYz -bka +teX lgg -bka -bTd +qix +pie uNz ces bTb @@ -154996,13 +156531,13 @@ bVD bYH caA ccr -coM -coM -coM +aCA +bzb +uQa chF -coM -coM -coM +uQa +xlQ +aKw coL udz bYH @@ -155252,15 +156787,15 @@ fhz ixL bYH rML -coM -coM -coM +ahr +esO +ovJ cgL cml ckN -coM -coM -coM +oZd +cfx +lDJ cqt bYH lNj @@ -155510,14 +157045,14 @@ sfb kxP caC cei -cei +gIb uYD iYN kaQ gcd cmj -coN -coN +uFx +gwF coN pDk fRv @@ -155766,15 +157301,15 @@ tYa inM bYH gkj -coM -coM +oZd +ovJ cfX xAW koI akc rgo ckP -coM +ovJ rpx bYH gZs @@ -157572,9 +159107,9 @@ pbz hTV bCH wDd -fIf -fIf -fIf +ygh +jtC +coM crX lNj cux @@ -157828,7 +159363,7 @@ cgS kCy hTV yaq -uPY +aon cHc kHA cqx @@ -158341,11 +159876,11 @@ cer cgf kGm fho -fIf +ikz sQa cHc auy -fIf +coM sBG lNj cux @@ -158573,7 +160108,7 @@ nxy yhT cDq ifS -bNi +sFp nfX nfX bxJ @@ -158599,10 +160134,10 @@ chK esC fIf uZe -sQa -fIf -fIf -fIf +vEt +eXa +ikz +coM tkO lNj cux @@ -158855,7 +160390,7 @@ cet cgh kGm eoI -fIf +ygh kTm vFK coT @@ -161448,7 +162983,7 @@ rfK oFL oNd aLE -cIk +jbN oYN mNS glR @@ -161707,7 +163242,7 @@ oNd cQj jWj cIk -cIk +kYb cIk cIk anv @@ -161964,8 +163499,8 @@ oNd lSa ilj taT -cIk -cIk +pSp +rTt tyI tOf oNd @@ -162216,10 +163751,10 @@ qfd csi xSg cyW -gFX +wpb wXF pau -pau +fZt xTU rfS oNd @@ -162475,11 +164010,11 @@ jbW fRm mgK eaa -cIk +pEU cIk cIj -cIk -cWe +vaB +xYL uHo boW oNd @@ -162732,7 +164267,7 @@ olj iHg lkf eaa -cMO +xtq psp cMO cIk @@ -164015,7 +165550,7 @@ prx cHa cJn qGm -xZj +kaG kyI xrg xrg @@ -167056,12 +168591,12 @@ cFr eoX jOB dvi -gJQ +mFE nKw qfc -gJQ +iOy iaN -gJQ +xYy jby vUE oyu @@ -167316,7 +168851,7 @@ mmg gMT lvJ wXz -wXz +vIH tOd cPa xFq @@ -167572,8 +169107,8 @@ hsC ehX rLx kPi -gJQ -gJQ +uIl +mFE kiV qPc loM diff --git a/_maps/map_files220/generic/Admin_Zone.dmm b/_maps/map_files220/generic/Admin_Zone.dmm index 8c9f55181808..51e307e0c9d3 100644 --- a/_maps/map_files220/generic/Admin_Zone.dmm +++ b/_maps/map_files220/generic/Admin_Zone.dmm @@ -118,7 +118,7 @@ /obj/structure/table/wood, /obj/item/fireaxe/energized, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "cQ" = ( @@ -333,7 +333,7 @@ /obj/item/gun/projectile/shotgun/boltaction/enchanted/arcane_barrage, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "fg" = ( @@ -350,6 +350,11 @@ /obj/item/melee/energy/sword/saber/red, /turf/simulated/floor/plasteel, /area/tdome/arena_source) +"fi" = ( +/turf/simulated/floor/holofloor{ + icon_state = "greenfull" + }, +/area/holodeck/source_emptycourt) "fm" = ( /obj/effect/landmark/costume/random, /obj/structure/rack/holorack, @@ -361,7 +366,7 @@ /obj/structure/table/wood, /obj/item/gun/magic/hook, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "fF" = ( @@ -408,7 +413,7 @@ /obj/structure/table/wood, /obj/item/whetstone/super, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "gN" = ( @@ -465,7 +470,7 @@ }, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "hp" = ( @@ -581,14 +586,14 @@ /obj/structure/table/wood, /obj/item/nullrod/tribal_knife, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "jD" = ( /obj/structure/table/wood, /obj/item/fireaxe/boneaxe, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "jF" = ( @@ -668,7 +673,7 @@ /obj/structure/table/wood, /obj/item/butcher_chainsaw, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "ku" = ( @@ -681,7 +686,7 @@ /obj/structure/table/wood, /obj/item/hatchet/unathiknife, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "kQ" = ( @@ -699,7 +704,7 @@ /obj/structure/table/wood, /obj/item/kitchen/knife/envy, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "kU" = ( @@ -732,7 +737,9 @@ /obj/structure/holowindow{ dir = 1 }, -/turf/simulated/floor/holofloor, +/turf/simulated/floor/holofloor{ + icon_state = "greenfull" + }, /area/holodeck/source_thunderdomecourt) "lt" = ( /obj/machinery/light/small/directional/east, @@ -820,7 +827,7 @@ /obj/item/multisword/pike, /obj/item/multisword/pure_evil, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "mU" = ( @@ -846,7 +853,7 @@ /obj/item/melee/energy/sword/cyborg, /obj/item/melee/energy/sword/cyborg/saw, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "ne" = ( @@ -1014,7 +1021,7 @@ /obj/item/gun/energy/plasma_pistol, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "pJ" = ( @@ -1079,7 +1086,7 @@ }, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "qT" = ( @@ -1132,7 +1139,7 @@ /obj/structure/table/wood, /obj/item/melee/energy/axe, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "rv" = ( @@ -1157,7 +1164,9 @@ /area/tdome/arena) "rE" = ( /obj/item/beach_ball/holoball, -/turf/simulated/floor/holofloor, +/turf/simulated/floor/holofloor{ + icon_state = "greenfull" + }, /area/holodeck/source_basketball) "rG" = ( /obj/mecha/combat/marauder/seraph/loaded, @@ -1234,7 +1243,7 @@ /obj/structure/table/wood, /obj/item/kitchen/knife/combat/survival, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "tx" = ( @@ -1327,7 +1336,7 @@ /obj/item/gun/energy/gun/turret, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "vd" = ( @@ -1425,14 +1434,14 @@ /obj/structure/table/wood, /obj/item/kitchen/knife/plastic, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "vY" = ( /obj/structure/table/wood, /obj/item/kitchen/knife/butcher/meatcleaver, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "wd" = ( @@ -1525,7 +1534,7 @@ /obj/structure/table/wood, /obj/item/kitchen/knife/combat, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "xq" = ( @@ -1664,7 +1673,7 @@ /obj/item/gun/projectile/shotgun/boltaction/enchanted/arcane_barrage/blood, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "zs" = ( @@ -1691,7 +1700,7 @@ /obj/item/gun/energy/kinetic_accelerator/minebot, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "zT" = ( @@ -1819,7 +1828,7 @@ /obj/structure/table/wood, /obj/item/melee/candy_sword, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "BX" = ( @@ -1854,7 +1863,7 @@ /obj/item/gun/energy/kinetic_accelerator/experimental, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "CM" = ( @@ -1904,6 +1913,11 @@ }, /turf/simulated/floor/wood/oak, /area/admin) +"Dr" = ( +/turf/simulated/floor/holofloor{ + icon_state = "greenfull" + }, +/area/holodeck/source_thunderdomecourt) "Dt" = ( /obj/structure/table/wood, /obj/item/gun/energy/gun/advtaser, @@ -1947,7 +1961,9 @@ }, /area/holodeck/source_basketball) "Ec" = ( -/turf/simulated/floor/holofloor, +/turf/simulated/floor/holofloor{ + icon_state = "redfull" + }, /area/holodeck/source_boxingcourt) "Eh" = ( /obj/structure/table/wood, @@ -1983,7 +1999,7 @@ /obj/item/gun/energy/telegun, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "EH" = ( @@ -2054,7 +2070,7 @@ /obj/item/gun/energy/pulse/turret, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "FM" = ( @@ -2067,12 +2083,14 @@ /obj/structure/table/wood, /obj/item/kitchen/knife/ritual, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "FR" = ( /obj/structure/holowindow, -/turf/simulated/floor/holofloor, +/turf/simulated/floor/holofloor{ + icon_state = "redfull" + }, /area/holodeck/source_thunderdomecourt) "FS" = ( /obj/machinery/computer/mech_bay_power_console{ @@ -2116,7 +2134,7 @@ /obj/item/gun/projectile/revolver/fingergun/fake, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "Gp" = ( @@ -2172,7 +2190,7 @@ /obj/item/gun/throw/crossbow, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "Hw" = ( @@ -2274,7 +2292,7 @@ /obj/structure/table/wood, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "IR" = ( @@ -2308,7 +2326,7 @@ /obj/structure/table/wood, /obj/item/chainsaw/doomslayer, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "Jd" = ( @@ -2316,7 +2334,7 @@ /obj/item/gun/projectile/bow, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "Je" = ( @@ -2373,7 +2391,7 @@ /obj/structure/table/wood, /obj/item/kitchen/knife/combat/survival/bone, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "JJ" = ( @@ -2435,7 +2453,7 @@ /obj/item/gun/energy/kinetic_accelerator/crossbow, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "Kw" = ( @@ -2499,7 +2517,7 @@ /obj/item/gun/throw/crossbow/french, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "KR" = ( @@ -2509,7 +2527,9 @@ /turf/simulated/floor/wood/oak, /area/admin) "KS" = ( -/turf/simulated/floor/holofloor, +/turf/simulated/floor/holofloor{ + icon_state = "redfull" + }, /area/holodeck/source_basketball) "La" = ( /obj/structure/table/wood, @@ -2605,7 +2625,7 @@ /obj/item/gun/energy/temperature, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "MX" = ( @@ -2635,7 +2655,7 @@ /obj/structure/table/wood, /obj/item/kitchen/knife, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "ND" = ( @@ -2702,6 +2722,11 @@ icon_state = "asteroid" }, /area/holodeck/source_desert) +"Oo" = ( +/turf/simulated/floor/holofloor{ + icon_state = "greenfull" + }, +/area/holodeck/source_boxingcourt) "Or" = ( /obj/structure/table/wood, /obj/item/gun/syringe, @@ -2724,7 +2749,9 @@ /turf/simulated/floor/wood/oak, /area/admin) "OH" = ( -/turf/simulated/floor/holofloor, +/turf/simulated/floor/holofloor{ + icon_state = "redfull" + }, /area/holodeck/source_emptycourt) "OL" = ( /obj/structure/table/wood, @@ -2736,14 +2763,14 @@ /obj/structure/table/wood, /obj/item/kitchen/knife/butcher, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "OW" = ( /obj/structure/table/wood, /obj/item/whetstone, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "Pc" = ( @@ -2785,7 +2812,7 @@ /obj/item/melee/energy/sword/saber/purple, /obj/item/melee/energy/sword/saber/red, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "PE" = ( @@ -2882,7 +2909,7 @@ /obj/structure/table/wood, /obj/item/fireaxe, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "QI" = ( @@ -2906,7 +2933,7 @@ /obj/structure/table/wood, /obj/item/kitchen/knife/shiv/carrot, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "QT" = ( @@ -2924,7 +2951,9 @@ }, /area/admin) "Rh" = ( -/turf/simulated/floor/holofloor, +/turf/simulated/floor/holofloor{ + icon_state = "redfull" + }, /area/holodeck/source_thunderdomecourt) "Rj" = ( /obj/item/paper{ @@ -2966,7 +2995,7 @@ /obj/item/gun/energy/chrono_gun, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "RW" = ( @@ -2974,7 +3003,7 @@ /obj/item/gun/energy/plasmacutter/adv, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "RZ" = ( @@ -3132,7 +3161,7 @@ /obj/item/gun/energy/kinetic_accelerator/cyborg, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "TN" = ( @@ -3153,6 +3182,11 @@ "TY" = ( /turf/simulated/wall/indestructible, /area/space) +"Ua" = ( +/turf/simulated/floor/holofloor{ + icon_state = "greenfull" + }, +/area/holodeck/source_basketball) "Ui" = ( /obj/structure/table, /obj/item/storage/box/beakers, @@ -3167,7 +3201,7 @@ /obj/structure/table/wood, /obj/item/chainsaw, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "Ul" = ( @@ -3230,7 +3264,7 @@ /obj/structure/table/wood, /obj/item/whetstone/cult, /turf/simulated/floor/plasteel{ - icon_state = "hierophant1" + icon_state = "alienvault" }, /area/admin) "Vr" = ( @@ -3286,7 +3320,7 @@ /obj/item/gun/projectile/revolver/capgun, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "Wc" = ( @@ -3444,7 +3478,7 @@ /obj/item/gun/energy/kinetic_accelerator/crossbow/large/cyborg, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "XB" = ( @@ -3497,7 +3531,7 @@ /obj/item/gun/energy/decloner, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "YM" = ( @@ -3525,7 +3559,7 @@ /obj/item/gun/energy/plasmacutter, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/admin) "Zo" = ( @@ -4310,7 +4344,7 @@ xS KS NF kY -KS +Ua Jk aG TW @@ -4569,7 +4603,7 @@ NF kY rE Jk -KS +Ua qT pO "} @@ -4824,7 +4858,7 @@ xS KS NF kY -KS +Ua Jk rq Ep @@ -7393,10 +7427,10 @@ Ec Ec Ec Ec -Ec -Ec -Ec -Ec +Oo +Oo +Oo +Oo WY pO "} @@ -7650,10 +7684,10 @@ Ec Ec Ec Ec -Ec -Ec -Ec -Ec +Oo +Oo +Oo +Oo WY pO "} @@ -7907,10 +7941,10 @@ Ec Ec Ec Ec -Ec -Ec -Ec -Ec +Oo +Oo +Oo +Oo WY pO "} @@ -12019,10 +12053,10 @@ OH OH OH OH -OH -OH -OH -OH +fi +fi +fi +fi RS pO "} @@ -12276,10 +12310,10 @@ OH OH OH OH -OH -OH -OH -OH +fi +fi +fi +fi RS pO "} @@ -12533,10 +12567,10 @@ OH OH OH OH -OH -OH -OH -OH +fi +fi +fi +fi RS pO "} @@ -24356,9 +24390,9 @@ Rh Rh FR li -Rh -Rh -Rh +Dr +Dr +Dr PT pO "} @@ -24613,9 +24647,9 @@ Rh Rh FR li -Rh -Rh -Rh +Dr +Dr +Dr PT pO "} @@ -24870,9 +24904,9 @@ Rh Rh FR li -Rh -Rh -Rh +Dr +Dr +Dr PT pO "} diff --git a/_maps/map_files220/generic/Lavaland.dmm b/_maps/map_files220/generic/Lavaland.dmm index 3e5c92a8fdd1..c77e3c86fe1c 100644 --- a/_maps/map_files220/generic/Lavaland.dmm +++ b/_maps/map_files220/generic/Lavaland.dmm @@ -270,7 +270,7 @@ /obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "aP" = ( @@ -380,7 +380,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/laborcamp/security) "bb" = ( @@ -448,7 +448,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "bk" = ( @@ -649,7 +649,7 @@ /obj/item/radio/beacon, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "bD" = ( @@ -720,7 +720,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "bL" = ( @@ -834,7 +834,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "bV" = ( @@ -851,7 +851,7 @@ /obj/structure/ore_box, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "bX" = ( @@ -871,7 +871,7 @@ /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "bZ" = ( @@ -971,7 +971,7 @@ /obj/machinery/power/apc/directional/west, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "cl" = ( @@ -1031,7 +1031,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "cr" = ( @@ -1051,7 +1051,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "ct" = ( @@ -1061,7 +1061,7 @@ /obj/machinery/power/apc/directional/east, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "cu" = ( @@ -1131,7 +1131,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/airlock) "cE" = ( @@ -1178,7 +1178,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "cL" = ( @@ -1188,7 +1188,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "cM" = ( @@ -1309,7 +1309,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/airlock) "da" = ( @@ -1320,7 +1320,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "db" = ( @@ -1370,7 +1370,7 @@ /obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/airlock) "dg" = ( @@ -1409,7 +1409,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "dk" = ( @@ -1444,7 +1444,7 @@ /obj/item/clothing/head/hardhat/orange, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/engineering) "dn" = ( @@ -1471,7 +1471,7 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "dq" = ( @@ -1483,7 +1483,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/engineering) "dr" = ( @@ -1509,7 +1509,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/airlock) "dt" = ( @@ -1571,7 +1571,7 @@ /obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "dx" = ( @@ -1606,7 +1606,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "dA" = ( @@ -1642,7 +1642,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/engineering) "dE" = ( @@ -1653,7 +1653,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/airlock) "dF" = ( @@ -1671,7 +1671,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/engineering) "dH" = ( @@ -1689,7 +1689,7 @@ /obj/machinery/ai_status_display/east, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/engineering) "dJ" = ( @@ -1787,7 +1787,7 @@ /obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "dQ" = ( @@ -1807,7 +1807,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "dS" = ( @@ -1851,7 +1851,7 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "dY" = ( @@ -1864,7 +1864,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "ea" = ( @@ -1876,7 +1876,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "eb" = ( @@ -1927,7 +1927,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "eg" = ( @@ -1935,7 +1935,7 @@ /obj/effect/turf_decal/stripes/box, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "eh" = ( @@ -1991,7 +1991,7 @@ /obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "el" = ( @@ -2071,7 +2071,7 @@ /obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "et" = ( @@ -2114,7 +2114,7 @@ /obj/effect/spawner/random_spawners/cobweb_left_rare, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "ey" = ( @@ -2221,7 +2221,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "eG" = ( @@ -2355,7 +2355,7 @@ /obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "eT" = ( @@ -2380,7 +2380,7 @@ /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/quartermaster) "eU" = ( @@ -2433,7 +2433,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "fa" = ( @@ -2481,7 +2481,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/engineering) "ff" = ( @@ -2504,7 +2504,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "fh" = ( @@ -2518,7 +2518,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/engineering) "fj" = ( @@ -2584,7 +2584,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "fo" = ( @@ -2597,7 +2597,7 @@ "fp" = ( /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "fr" = ( @@ -2620,7 +2620,7 @@ /obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/medbay) "fs" = ( @@ -2634,7 +2634,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "ft" = ( @@ -2655,7 +2655,7 @@ /obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "fw" = ( @@ -2670,7 +2670,7 @@ /obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "fy" = ( @@ -2697,7 +2697,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/any/supply/mining, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, @@ -2728,7 +2728,7 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "fD" = ( @@ -2780,7 +2780,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/airlock) "fH" = ( @@ -2823,7 +2823,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "fL" = ( @@ -2933,7 +2933,7 @@ "ga" = ( /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "gb" = ( @@ -2975,14 +2975,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "gg" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "gh" = ( @@ -3059,7 +3059,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "gn" = ( @@ -3166,7 +3166,7 @@ /obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/engineering) "gw" = ( @@ -3291,7 +3291,7 @@ /obj/structure/sign/poster/official/random/north, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/airlock) "gJ" = ( @@ -3322,7 +3322,7 @@ /obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "gL" = ( @@ -3490,14 +3490,14 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "hy" = ( /obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "hz" = ( @@ -3615,7 +3615,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "ig" = ( @@ -3631,7 +3631,7 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "ih" = ( @@ -3658,7 +3658,7 @@ /obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/airlock) "ij" = ( @@ -3685,7 +3685,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "ir" = ( @@ -3744,7 +3744,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/lockers) "iB" = ( @@ -4018,7 +4018,7 @@ "jP" = ( /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "jQ" = ( @@ -4284,7 +4284,7 @@ /obj/effect/spawner/random_spawners/cobweb_right_rare, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "le" = ( @@ -4356,7 +4356,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "lp" = ( @@ -5060,7 +5060,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "nw" = ( @@ -5074,7 +5074,7 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "nx" = ( @@ -5151,7 +5151,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/airlock) "op" = ( @@ -5208,7 +5208,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "oM" = ( @@ -5335,7 +5335,7 @@ /obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "pT" = ( @@ -5620,7 +5620,7 @@ /obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "sF" = ( @@ -5886,7 +5886,7 @@ /obj/machinery/economy/vending/cigarette, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "uf" = ( @@ -5951,7 +5951,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "uq" = ( @@ -6127,7 +6127,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "vh" = ( @@ -6171,7 +6171,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "vw" = ( @@ -6268,7 +6268,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/airlock) "vU" = ( @@ -6498,7 +6498,7 @@ /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/airlock) "xC" = ( @@ -6530,7 +6530,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/lockers) "xM" = ( @@ -6752,7 +6752,7 @@ /obj/machinery/power/apc/directional/north, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/custodial) "zB" = ( @@ -6876,7 +6876,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "Ao" = ( @@ -7240,7 +7240,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "Co" = ( @@ -7325,7 +7325,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/engineering) "CI" = ( @@ -7336,7 +7336,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/laborcamp/security) "CK" = ( @@ -7460,7 +7460,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/airlock) "DA" = ( @@ -7556,7 +7556,7 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "El" = ( @@ -7607,7 +7607,7 @@ /obj/item/cigbutt, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/laborcamp/security) "EG" = ( @@ -7627,7 +7627,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/engineering) "EH" = ( @@ -7729,7 +7729,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/lockers) "FD" = ( @@ -8080,7 +8080,7 @@ /obj/effect/spawner/random_spawners/dirt_maybe, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/storage) "HU" = ( @@ -8106,7 +8106,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/engineering) "HX" = ( @@ -8206,7 +8206,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/lockers) "IM" = ( @@ -8456,7 +8456,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "Kq" = ( @@ -8500,7 +8500,7 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/engineering) "Kz" = ( @@ -8581,7 +8581,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/any/supply/mining, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, /turf/simulated/floor/plasteel{ icon_state = "darkgreencorners" }, @@ -8752,7 +8752,7 @@ /obj/structure/disposalpipe/junction, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "Mi" = ( @@ -8945,7 +8945,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "ND" = ( @@ -9198,7 +9198,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/lockers) "PB" = ( @@ -9252,7 +9252,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/lockers) "PS" = ( @@ -9304,7 +9304,7 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "Qz" = ( @@ -9376,7 +9376,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "QU" = ( @@ -9666,7 +9666,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "Td" = ( @@ -9900,7 +9900,7 @@ /obj/effect/turf_decal/loading_area, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/airlock) "UT" = ( @@ -9947,7 +9947,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "Vg" = ( @@ -10183,7 +10183,7 @@ /obj/structure/sign/poster/official/random/east, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "Wb" = ( @@ -10230,7 +10230,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "Wx" = ( @@ -10299,7 +10299,7 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "WP" = ( @@ -10491,7 +10491,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/east) "Yb" = ( @@ -10641,7 +10641,7 @@ }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkfull" + icon_state = "dark" }, /area/mine/outpost/hallway/west) "Zg" = ( diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index 488422385183..5e9cda2d8d3b 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -81,7 +81,9 @@ /obj/structure/urinal{ pixel_y = 28 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/ghost_bar) "acq" = ( /obj/effect/baseturf_helper{ @@ -312,7 +314,7 @@ dir = 5 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "alg" = ( @@ -453,9 +455,10 @@ /area/centcom/ss220/admin3) "aqq" = ( /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/red/line, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "aqs" = ( @@ -566,7 +569,7 @@ layer = 4.3 }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "atg" = ( @@ -628,7 +631,7 @@ /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "ava" = ( @@ -713,7 +716,7 @@ id = "SFBQMLoad2" }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/cargo) "awU" = ( @@ -883,7 +886,7 @@ /obj/item/target, /obj/effect/decal/cleanable/confetti, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "aDj" = ( @@ -953,7 +956,9 @@ /area/shuttle/escape) "aEU" = ( /obj/machinery/recharge_station, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/ghost_bar) "aFb" = ( /obj/machinery/door/window/classic/reversed{ @@ -1044,25 +1049,9 @@ }, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) -"aHG" = ( -/obj/structure/statue/sandstone/assistant{ - anchored = 1; - desc = "Он точно спит на посту"; - dir = 1; - icon = 'icons/mob/simple_human.dmi'; - icon_state = "syndicate_smg"; - max_integrity = 9999; - name = "Боба"; - obj_integrity = 9999 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkjail" - }, -/area/syndicate_mothership/jail) "aHS" = ( /obj/machinery/ai_status_display{ pixel_x = -32 @@ -1118,7 +1107,7 @@ "aLl" = ( /obj/structure/chair/sofa, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "aLu" = ( @@ -1202,7 +1191,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "aOO" = ( @@ -1366,7 +1355,7 @@ /obj/effect/turf_decal/delivery/white, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "aVs" = ( @@ -1441,7 +1430,9 @@ "aYC" = ( /obj/structure/table, /obj/item/dice/d20, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/ninja/holding) "aYQ" = ( /obj/structure/table/wood/fancy/royalblack, @@ -1515,7 +1506,7 @@ "bcl" = ( /obj/effect/turf_decal/delivery/red, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "bcm" = ( @@ -1536,7 +1527,7 @@ /area/abductor_ship) "bda" = ( /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "bed" = ( @@ -1572,7 +1563,7 @@ "bfH" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/spawner/window, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/jungle/no_creep, /area/centcom/ss220/admin1) "bfI" = ( /obj/effect/turf_decal/siding/brown{ @@ -2067,8 +2058,7 @@ /area/centcom/ss220/admin1) "bxz" = ( /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkjail" + icon_state = "darkbrown" }, /area/syndicate_mothership/jail) "bxA" = ( @@ -2268,8 +2258,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkjail" + icon_state = "darkbrown" }, /area/syndicate_mothership/jail) "bIm" = ( @@ -2311,9 +2300,14 @@ "bJO" = ( /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "warndarkgreycornerred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "bJW" = ( @@ -2355,7 +2349,7 @@ /obj/structure/table, /obj/item/gun/energy/ionrifle/carbine, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "bMe" = ( @@ -2513,8 +2507,7 @@ obj_integrity = 9999 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkjail" + icon_state = "darkbrown" }, /area/syndicate_mothership/jail) "bRy" = ( @@ -2664,7 +2657,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "bUl" = ( @@ -3109,9 +3102,14 @@ "chA" = ( /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 5 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreycornerred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "chF" = ( @@ -3168,7 +3166,7 @@ name = "Syndicate Base" }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership) "cjj" = ( @@ -3224,8 +3222,7 @@ /obj/structure/light_fake/small, /obj/structure/sign/poster/contraband/random/south, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkjail" + icon_state = "darkbrown" }, /area/syndicate_mothership/jail) "clT" = ( @@ -3256,9 +3253,14 @@ "cns" = ( /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 5 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreycornerred" + icon_state = "dark" }, /area/syndicate_mothership/elite_squad) "cnB" = ( @@ -3293,7 +3295,7 @@ }, /obj/effect/turf_decal/box, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "cob" = ( @@ -3341,7 +3343,9 @@ }, /area/centcom/ss220/bar) "cpn" = ( -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/ghost_bar) "cpN" = ( /obj/machinery/door/airlock/maintenance{ @@ -3461,7 +3465,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "cuN" = ( @@ -3538,8 +3542,14 @@ "cyn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "cyD" = ( @@ -3571,9 +3581,14 @@ "cBB" = ( /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 5 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreycornerred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "cBN" = ( @@ -3623,7 +3638,7 @@ "cDe" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/elite_squad) "cDl" = ( @@ -3651,7 +3666,9 @@ /area/centcom/ss220/bar) "cDO" = ( /obj/structure/light_fake/small, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/ghost_bar) "cDV" = ( /obj/structure/light_fake/spot{ @@ -3772,7 +3789,7 @@ "cGH" = ( /obj/effect/spawner/window, /obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/jungle/no_creep, /area/centcom/ss220/admin1) "cHl" = ( /obj/item/reagent_containers/food/drinks/bottle/rum{ @@ -3953,7 +3970,9 @@ pixel_x = 3; pixel_y = 3 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/ninja/holding) "cMK" = ( /obj/structure/chair/office/light{ @@ -4133,13 +4152,13 @@ icon_state = "n_beam" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "cSv" = ( /obj/structure/chair/sofa/right, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "cTs" = ( @@ -4247,9 +4266,14 @@ dir = 1 }, /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "cXs" = ( @@ -4339,7 +4363,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "cZH" = ( @@ -4510,9 +4534,14 @@ "deV" = ( /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "warndarkgreycornerred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "dfR" = ( @@ -4529,17 +4558,13 @@ }, /obj/structure/ore_box, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) -"dgv" = ( +"dgI" = ( /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkjail" + icon_state = "showroomfloor" }, -/area/syndicate_mothership/jail) -"dgI" = ( -/turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) "dgK" = ( /obj/structure/table/glass, @@ -4644,7 +4669,7 @@ /obj/structure/light_fake/small, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "dlt" = ( @@ -4653,7 +4678,7 @@ req_access_txt = "150" }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership) "dlw" = ( @@ -4713,7 +4738,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "dow" = ( @@ -4798,9 +4823,14 @@ /obj/structure/light_fake{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "dqS" = ( @@ -4813,7 +4843,7 @@ /obj/machinery/computer/shuttle/sst, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/elite_squad) "drh" = ( @@ -4849,11 +4879,13 @@ light_range = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "dso" = ( -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/ninja/holding) "dsw" = ( /obj/structure/table/reinforced, @@ -4898,7 +4930,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "dua" = ( @@ -5219,7 +5251,7 @@ name = "Syndicate Base" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/elite_squad) "dCB" = ( @@ -5246,7 +5278,7 @@ baseturf = /turf/simulated/floor/plating/asteroid/ancient }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/infteam) "dEp" = ( @@ -5276,7 +5308,7 @@ icon_state = "applebush" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/centcom/ss220/admin1) "dFl" = ( @@ -5314,7 +5346,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/centcom/ss220/admin1) "dGx" = ( @@ -5354,7 +5386,7 @@ /area/centcom/ss220/supply) "dHM" = ( /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/elite_squad) "dHW" = ( @@ -5416,7 +5448,7 @@ "dJp" = ( /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "dJr" = ( @@ -5424,7 +5456,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/elite_squad) "dJs" = ( @@ -5778,14 +5810,17 @@ /area/shuttle/syndicate) "dWh" = ( /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/red/line, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "warndarkgreyred" + icon_state = "dark" }, /area/syndicate_mothership/elite_squad) "dWA" = ( /obj/structure/reagent_dispensers/beerkeg, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/ninja/holding) "dXa" = ( /obj/structure/light_fake/spot, @@ -6074,7 +6109,7 @@ /obj/item/kirbyplants, /obj/effect/turf_decal/siding/black, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "eiJ" = ( @@ -6261,7 +6296,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "epI" = ( @@ -6308,7 +6343,7 @@ "erG" = ( /obj/machinery/computer/shuttle/sit, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "erT" = ( @@ -6370,7 +6405,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "etr" = ( @@ -6408,7 +6443,9 @@ "evc" = ( /obj/structure/table, /obj/item/lighter/zippo, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/ninja/holding) "evo" = ( /obj/machinery/computer/communications{ @@ -6459,7 +6496,9 @@ /obj/structure/light_fake/small{ dir = 1 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/ghost_bar) "exx" = ( /obj/structure/table/wood, @@ -6652,7 +6691,9 @@ /obj/structure/window/basic{ dir = 1 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/wizard_station) "eBu" = ( /obj/structure/flora/tree/jungle/small, @@ -7537,7 +7578,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "ffE" = ( @@ -7744,7 +7785,8 @@ "fls" = ( /obj/structure/chair/sofa/bench/right, /turf/simulated/floor/plasteel{ - icon_state = "darkjail" + icon_state = "darkbrown"; + dir = 1 }, /area/syndicate_mothership/jail) "flD" = ( @@ -7836,9 +7878,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/red/corner, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "fmX" = ( @@ -8107,9 +8150,14 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "fuv" = ( @@ -8192,7 +8240,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "fyL" = ( @@ -8244,7 +8292,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "fAT" = ( @@ -8641,8 +8689,14 @@ "fQz" = ( /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 6 + }, /turf/simulated/floor/plasteel{ - icon_state = "warndarkgreycornerred" + icon_state = "dark" }, /area/syndicate_mothership/elite_squad) "fQI" = ( @@ -8715,7 +8769,7 @@ /obj/effect/turf_decal/delivery/red, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "fTl" = ( @@ -8758,7 +8812,7 @@ name = "Storage" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "fVA" = ( @@ -8827,7 +8881,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "fYz" = ( @@ -8905,7 +8959,7 @@ /area/centcom/ss220/admin2) "gaZ" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "gbc" = ( @@ -8914,7 +8968,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "gbe" = ( @@ -8943,7 +8997,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/infteam) "gcE" = ( @@ -9214,7 +9268,7 @@ name = "Потрёпанная снайперская винтовка" }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/infteam) "goe" = ( @@ -9232,7 +9286,7 @@ /obj/structure/sink/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "gpb" = ( @@ -9284,7 +9338,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "gqL" = ( @@ -9355,7 +9409,7 @@ /area/centcom/ss220/bar) "gty" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/control) "guM" = ( @@ -9756,7 +9810,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/delivery/red, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "gFx" = ( @@ -10003,7 +10057,7 @@ "gMt" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "gMv" = ( @@ -10125,8 +10179,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkjail" + icon_state = "darkbrown" }, /area/syndicate_mothership/jail) "gOa" = ( @@ -10137,7 +10190,7 @@ /area/centcom/ss220/bar) "gOQ" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "gPe" = ( @@ -10210,8 +10263,14 @@ /area/syndicate_mothership/outside) "gTa" = ( /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - icon_state = "warndarkgreyred" + icon_state = "dark" }, /area/syndicate_mothership/elite_squad) "gTe" = ( @@ -10302,7 +10361,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "gVj" = ( @@ -10314,7 +10373,9 @@ "gVr" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave/upgraded, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/ninja/holding) "gVv" = ( /obj/effect/decal/syndie_logo{ @@ -10377,7 +10438,7 @@ "gXs" = ( /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "gXA" = ( @@ -10397,9 +10458,14 @@ /area/centcom/ss220/supply) "gXS" = ( /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "gYI" = ( @@ -10448,7 +10514,7 @@ spawn_inside = null }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership) "hbm" = ( @@ -10565,7 +10631,7 @@ id_tag = "syndicate_jail_cell" }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "heh" = ( @@ -10958,7 +11024,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "hse" = ( @@ -10968,7 +11034,7 @@ req_access_txt = "150" }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "hsh" = ( @@ -11045,14 +11111,13 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/centcom/ss220/admin1) "hwb" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkjail" + icon_state = "darkbrown" }, /area/syndicate_mothership/jail) "hwc" = ( @@ -11083,7 +11148,7 @@ "hxf" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "hxl" = ( @@ -11112,7 +11177,7 @@ }, /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "hyf" = ( @@ -11271,9 +11336,14 @@ "hDK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "hDW" = ( @@ -11296,7 +11366,7 @@ id = "SFBQMLoad" }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/cargo) "hFb" = ( @@ -11490,9 +11560,14 @@ "hHD" = ( /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 9 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreycornerred" + icon_state = "dark" }, /area/syndicate_mothership/elite_squad) "hHE" = ( @@ -11598,7 +11673,7 @@ icon_state = "n_beam" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "hKh" = ( @@ -11617,9 +11692,10 @@ "hLd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/red/line, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "hLH" = ( @@ -11981,7 +12057,7 @@ "hXC" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "hXZ" = ( @@ -11995,7 +12071,8 @@ /area/centcom/ss220/general) "hYp" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkjail" + icon_state = "darkbrown"; + dir = 1 }, /area/syndicate_mothership/jail) "hYu" = ( @@ -12415,7 +12492,7 @@ specialfunctions = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "ipI" = ( @@ -12712,7 +12789,7 @@ /obj/effect/turf_decal/delivery/red, /obj/structure/ore_box, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "iwe" = ( @@ -12800,7 +12877,7 @@ icon_state = "n_beam" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "ize" = ( @@ -12880,16 +12957,21 @@ "iCR" = ( /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "warndarkgreycornerred" + icon_state = "dark" }, /area/syndicate_mothership/elite_squad) "iDh" = ( /obj/structure/closet/syndicate/personal, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "iFn" = ( @@ -13154,7 +13236,7 @@ /area/centcom/ss220/admin3) "iPw" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/centcom/ss220/admin1) "iQW" = ( @@ -13215,7 +13297,9 @@ name = "Toilet"; opacity = 1 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/ghost_bar) "iSW" = ( /obj/structure/table{ @@ -13325,7 +13409,7 @@ /obj/structure/ore_box, /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "iVU" = ( @@ -13341,7 +13425,7 @@ }, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "iXp" = ( @@ -13429,7 +13513,9 @@ /area/centcom/ss220/general) "jaD" = ( /obj/structure/table, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/ninja/holding) "jaR" = ( /obj/item/robot_parts/robot_component{ @@ -13437,7 +13523,7 @@ name = "Недоделанный бот" }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/infteam) "jaZ" = ( @@ -13515,9 +13601,14 @@ dir = 1 }, /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "jfw" = ( @@ -13860,9 +13951,14 @@ dir = 8 }, /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "jrk" = ( @@ -13891,7 +13987,7 @@ "jsg" = ( /obj/structure/ore_box, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "jsp" = ( @@ -13929,7 +14025,7 @@ "jsR" = ( /obj/machinery/computer/mech_bay_power_console, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "jtg" = ( @@ -13965,7 +14061,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "jud" = ( @@ -13975,7 +14071,7 @@ /obj/structure/ore_box, /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "juv" = ( @@ -14060,7 +14156,9 @@ dir = 4 }, /obj/item/mop, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/trader_station/sol) "jwK" = ( /obj/item/kirbyplants, @@ -14073,7 +14171,7 @@ "jxt" = ( /obj/structure/ore_box, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership) "jxO" = ( @@ -14117,7 +14215,7 @@ "jyZ" = ( /obj/structure/kitchenspike, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "jzh" = ( @@ -14174,8 +14272,8 @@ "jBg" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkjail" + icon_state = "darkbrown"; + dir = 1 }, /area/syndicate_mothership/jail) "jBo" = ( @@ -14193,7 +14291,7 @@ "jBO" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "jCl" = ( @@ -14203,7 +14301,7 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "jCq" = ( @@ -14224,8 +14322,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkjail" + icon_state = "darkbrown" }, /area/syndicate_mothership/jail) "jEj" = ( @@ -14294,7 +14391,7 @@ /obj/effect/turf_decal/delivery/white, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "jJa" = ( @@ -14380,7 +14477,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "jLh" = ( @@ -14494,7 +14591,9 @@ "jNJ" = ( /obj/structure/table, /obj/machinery/recharger, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/ninja/holding) "jOb" = ( /turf/simulated/floor/mineral/titanium/blue, @@ -14609,7 +14708,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "jVM" = ( @@ -14690,7 +14789,7 @@ "jYa" = ( /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "jYJ" = ( @@ -14764,7 +14863,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "kcR" = ( @@ -14800,7 +14899,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "keO" = ( @@ -14864,9 +14963,14 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "khr" = ( @@ -14921,7 +15025,7 @@ "kjx" = ( /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership) "kjH" = ( @@ -14993,7 +15097,7 @@ "klm" = ( /obj/machinery/computer/shuttle/syndicate/recall, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "klt" = ( @@ -15030,7 +15134,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "kns" = ( @@ -15039,7 +15143,7 @@ "knO" = ( /obj/machinery/economy/vending/medical/syndicate_access, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "knR" = ( @@ -15128,7 +15232,9 @@ /obj/structure/window/basic{ dir = 1 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/wizard_station) "kqr" = ( /obj/structure/window/reinforced{ @@ -15182,7 +15288,7 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/elite_squad) "ktL" = ( @@ -15499,7 +15605,7 @@ spawn_inside = null }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "kFK" = ( @@ -15890,7 +15996,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "kWD" = ( @@ -16042,7 +16148,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "lde" = ( @@ -16248,7 +16354,9 @@ /obj/structure/light_fake/small{ dir = 8 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/ghost_bar) "lkU" = ( /turf/simulated/floor/plating, @@ -16288,7 +16396,7 @@ /obj/structure/ore_box, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "loL" = ( @@ -16303,7 +16411,7 @@ pixel_y = -3 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "lpx" = ( @@ -16592,7 +16700,9 @@ pixel_x = 4; pixel_y = 6 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/ninja/holding) "lve" = ( /obj/machinery/sleeper{ @@ -16869,7 +16979,7 @@ name = "Мышедемон" }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "lDh" = ( @@ -16943,7 +17053,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "lGw" = ( @@ -17146,7 +17256,7 @@ name = "Shuttle Dock Door" }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "lKt" = ( @@ -17763,7 +17873,7 @@ /obj/effect/turf_decal/delivery/white, /obj/structure/ore_box, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "mcm" = ( @@ -17930,9 +18040,14 @@ "mjL" = ( /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 9 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreycornerred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "mjQ" = ( @@ -17964,7 +18079,7 @@ "mkU" = ( /obj/item/target, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "mlh" = ( @@ -18038,7 +18153,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "mna" = ( @@ -18084,7 +18199,7 @@ "mpq" = ( /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "mpu" = ( @@ -18244,9 +18359,14 @@ /area/syndicate_mothership/outside) "mvw" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "mwa" = ( @@ -18355,7 +18475,7 @@ req_access_txt = "150" }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "mzJ" = ( @@ -18721,7 +18841,7 @@ icon_state = "n_beam" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "mRM" = ( @@ -18789,7 +18909,9 @@ /area/centcom/ss220/admin2) "mTY" = ( /obj/machinery/computer/security/telescreen/entertainment/directional/south, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/ghost_bar) "mTZ" = ( /obj/structure/flora/ausbushes/ywflowers, @@ -18811,7 +18933,7 @@ /obj/item/target, /obj/item/target, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "mVr" = ( @@ -19109,7 +19231,7 @@ }, /obj/item/electropack, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "nhC" = ( @@ -19134,7 +19256,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "njf" = ( @@ -19144,8 +19266,14 @@ "njR" = ( /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 6 + }, /turf/simulated/floor/plasteel{ - icon_state = "warndarkgreycornerred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "nkE" = ( @@ -19202,7 +19330,7 @@ spawn_inside = null }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership) "nlc" = ( @@ -19233,7 +19361,9 @@ name = "Toilet"; opacity = 1 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/ghost_bar) "nmC" = ( /obj/machinery/economy/vending/nta, @@ -19425,9 +19555,14 @@ "ntK" = ( /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 9 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreycornerred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "ntY" = ( @@ -19521,9 +19656,14 @@ dir = 4 }, /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/corner{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "nyb" = ( @@ -19646,7 +19786,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "nCM" = ( @@ -19655,9 +19795,14 @@ }, /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "warndarkgreycornerred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "nCS" = ( @@ -19823,7 +19968,7 @@ spawn_inside = null }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "nGz" = ( @@ -19875,7 +20020,7 @@ /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "nHX" = ( @@ -19900,7 +20045,9 @@ /obj/structure/light_fake/small{ dir = 8 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/trader_station/sol) "nJs" = ( /obj/structure/chair/sofa/corner{ @@ -20102,7 +20249,7 @@ spawn_inside = null }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "nSc" = ( @@ -20137,7 +20284,7 @@ "nSN" = ( /obj/structure/chair/sofa/left, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "nSZ" = ( @@ -20234,9 +20381,14 @@ /area/centcom/ss220/general) "nVW" = ( /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "nWw" = ( @@ -20270,7 +20422,7 @@ dir = 10 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "nXJ" = ( @@ -20329,7 +20481,7 @@ icon_state = "n_beam" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "oaf" = ( @@ -20344,7 +20496,7 @@ }, /obj/structure/ore_box, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "oaz" = ( @@ -20371,7 +20523,7 @@ /obj/effect/turf_decal/delivery/white, /obj/structure/ore_box, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "ocT" = ( @@ -20494,7 +20646,7 @@ /obj/effect/turf_decal/delivery/white, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "okp" = ( @@ -20539,7 +20691,7 @@ /area/wizard_station) "olQ" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/infteam) "olT" = ( @@ -20551,9 +20703,14 @@ "omf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "omq" = ( @@ -20743,7 +20900,7 @@ /obj/structure/chair, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "otN" = ( @@ -20763,7 +20920,7 @@ id = "SFBQMLoad" }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/cargo) "ouy" = ( @@ -20804,7 +20961,7 @@ name = "Shuttle Dock Door" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "ovy" = ( @@ -20818,7 +20975,7 @@ /area/centcom/ss220/bar) "ovP" = ( /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "ovZ" = ( @@ -20830,7 +20987,7 @@ }, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "owu" = ( @@ -20846,7 +21003,7 @@ "oxa" = ( /obj/item/flag/syndi, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "oxb" = ( @@ -20923,7 +21080,7 @@ }, /obj/structure/ore_box, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "ozt" = ( @@ -21044,7 +21201,7 @@ spawn_inside = null }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "oEI" = ( @@ -21453,7 +21610,8 @@ obj_integrity = 9999 }, /turf/simulated/floor/plasteel{ - icon_state = "darkjail" + icon_state = "darkbrown"; + dir = 1 }, /area/syndicate_mothership/jail) "oTb" = ( @@ -21484,7 +21642,9 @@ /obj/structure/toilet{ dir = 8 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/trader_station/sol) "oTS" = ( /obj/structure/statue/sandstone/assistant{ @@ -21519,9 +21679,14 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "oUX" = ( @@ -21584,7 +21749,7 @@ "oYe" = ( /obj/structure/toilet, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "oYp" = ( @@ -21807,8 +21972,7 @@ "pdx" = ( /obj/structure/light_fake/small, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkjail" + icon_state = "darkbrown" }, /area/syndicate_mothership/jail) "pdR" = ( @@ -21827,7 +21991,9 @@ /obj/structure/closet/secure_closet/bar{ req_access_txt = "25" }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/ninja/holding) "pfZ" = ( /turf/simulated/floor/plasteel{ @@ -21886,7 +22052,7 @@ "piG" = ( /obj/effect/turf_decal/loading_area, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/cargo) "pkq" = ( @@ -21982,7 +22148,7 @@ reqpower = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/cargo) "pqN" = ( @@ -22042,9 +22208,14 @@ /area/syndicate_mothership) "psX" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "ptx" = ( @@ -22333,7 +22504,7 @@ "pCO" = ( /obj/item/grenade/spawnergrenade/manhacks, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/infteam) "pCS" = ( @@ -22378,7 +22549,7 @@ /obj/structure/railing, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "pFo" = ( @@ -22541,7 +22712,7 @@ light_range = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "pLx" = ( @@ -22554,9 +22725,14 @@ /area/shuttle/assault_pod) "pMf" = ( /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "pMg" = ( @@ -22653,7 +22829,7 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/elite_squad) "pOi" = ( @@ -22785,7 +22961,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "pSO" = ( @@ -22815,7 +22991,7 @@ id_tag = "SST_to_ATOM" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/elite_squad) "pTW" = ( @@ -22866,7 +23042,7 @@ closingLayer = 3.11 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "pWT" = ( @@ -22990,7 +23166,9 @@ "qbf" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/cans/cola, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/ninja/holding) "qbl" = ( /obj/effect/decal/syndie_logo{ @@ -23245,8 +23423,14 @@ }, /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 6 + }, /turf/simulated/floor/plasteel{ - icon_state = "warndarkgreycornerred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "qkN" = ( @@ -23321,7 +23505,7 @@ }, /obj/item/melee/energy/axe, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "qnl" = ( @@ -23332,7 +23516,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "qnw" = ( @@ -23436,7 +23620,7 @@ /obj/structure/ore_box, /obj/effect/turf_decal/delivery/red, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "qqT" = ( @@ -23444,7 +23628,7 @@ id_tag = "SST_pod_ready" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/elite_squad) "qrs" = ( @@ -23477,7 +23661,7 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "qsF" = ( @@ -23522,9 +23706,14 @@ /area/centcom/ss220/bar) "qvc" = ( /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreyred" + icon_state = "dark" }, /area/syndicate_mothership/elite_squad) "qvn" = ( @@ -23614,7 +23803,7 @@ closingLayer = 3.11 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/elite_squad) "qyR" = ( @@ -23683,7 +23872,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "qBf" = ( @@ -23790,7 +23979,7 @@ /obj/machinery/mech_bay_recharge_port/upgraded/unsimulated, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "qEQ" = ( @@ -23860,7 +24049,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/elite_squad) "qGL" = ( @@ -24309,7 +24498,7 @@ }, /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "qZm" = ( @@ -24321,9 +24510,14 @@ /obj/structure/light_fake{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreyred" + icon_state = "dark" }, /area/syndicate_mothership/elite_squad) "qZz" = ( @@ -24343,7 +24537,7 @@ name = "Тюрьма" }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "rae" = ( @@ -24369,7 +24563,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "raS" = ( @@ -24392,7 +24586,7 @@ /obj/structure/flora/ausbushes/ywflowers, /obj/effect/spawner/window, /obj/structure/light_fake/spot, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/jungle/no_creep, /area/centcom/ss220/admin1) "rbT" = ( /obj/machinery/door/airlock/centcom{ @@ -24455,7 +24649,7 @@ }, /obj/structure/sink/directional/south, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "rex" = ( @@ -24469,7 +24663,7 @@ baseturf = /turf/simulated/floor/plating/asteroid/ancient }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "rfM" = ( @@ -24627,7 +24821,7 @@ /obj/effect/spawner/window, /obj/structure/flora/ausbushes/genericbush, /obj/structure/light_fake/spot, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/jungle/no_creep, /area/centcom/ss220/admin1) "rkR" = ( /obj/machinery/chem_dispenser/beer/upgraded, @@ -24711,9 +24905,14 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/elite_squad) "rnW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "ros" = ( @@ -24783,15 +24982,20 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 5 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreycornerred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "rrb" = ( /obj/structure/light_fake, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "rrp" = ( @@ -25039,7 +25243,9 @@ "rtF" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/shaker, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/ninja/holding) "rtG" = ( /obj/machinery/door/airlock/centcom{ @@ -25054,7 +25260,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "rus" = ( @@ -25182,7 +25388,7 @@ /obj/structure/bed, /obj/item/bedsheet/red, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "rzq" = ( @@ -25515,7 +25721,7 @@ spawn_inside = null }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership) "rNA" = ( @@ -25701,9 +25907,14 @@ /area/centcom/ss220/jail) "rTf" = ( /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreyred" + icon_state = "dark" }, /area/syndicate_mothership/elite_squad) "rTu" = ( @@ -25740,7 +25951,8 @@ /obj/structure/sign/poster/contraband/random/north, /obj/structure/chair/sofa/bench, /turf/simulated/floor/plasteel{ - icon_state = "darkjail" + icon_state = "darkbrown"; + dir = 1 }, /area/syndicate_mothership/jail) "rTT" = ( @@ -25819,7 +26031,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/economy/vending/tool/free, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "rVD" = ( @@ -25842,7 +26054,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "rVM" = ( @@ -25850,7 +26062,8 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkjail" + icon_state = "darkbrown"; + dir = 1 }, /area/syndicate_mothership/jail) "rVQ" = ( @@ -25883,7 +26096,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/centcom/ss220/admin1) "rXd" = ( @@ -26188,11 +26401,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "siT" = ( -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/wizard_station) "siY" = ( /obj/structure/rack, @@ -26257,9 +26472,14 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "slN" = ( @@ -26483,7 +26703,7 @@ "swU" = ( /obj/effect/turf_decal/box/white, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/infteam) "sxc" = ( @@ -26578,7 +26798,7 @@ }, /obj/structure/plasticflaps/mining, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/cargo) "sCI" = ( @@ -26644,7 +26864,7 @@ /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "sEB" = ( @@ -26725,7 +26945,7 @@ /obj/effect/turf_decal/delivery/white, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "sGq" = ( @@ -27108,7 +27328,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "sVn" = ( @@ -27150,7 +27370,7 @@ }, /obj/structure/sink/directional/south, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "sXn" = ( @@ -27227,7 +27447,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "sZo" = ( @@ -27322,7 +27542,7 @@ name = "chasm" }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "tbP" = ( @@ -27341,8 +27561,7 @@ obj_integrity = 9999 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkjail" + icon_state = "darkbrown" }, /area/syndicate_mothership/jail) "tca" = ( @@ -27662,8 +27881,14 @@ /area/centcom/ss220/admin2) "tou" = ( /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "toM" = ( @@ -27686,7 +27911,7 @@ name = "Storage" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "tpj" = ( @@ -27696,7 +27921,7 @@ "tpM" = ( /obj/effect/decal/cleanable/confetti, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "tpO" = ( @@ -27757,7 +27982,7 @@ /obj/structure/ore_box, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "tse" = ( @@ -27896,7 +28121,7 @@ }, /obj/effect/turf_decal/box, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "twu" = ( @@ -27948,7 +28173,7 @@ /obj/effect/spawner/window, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/jungle/no_creep, /area/centcom/ss220/admin1) "tyz" = ( /turf/simulated/floor/carpet/arcade, @@ -28102,7 +28327,7 @@ name = "Storage" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "tCJ" = ( @@ -28110,7 +28335,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "tDh" = ( @@ -28120,7 +28345,7 @@ icon_state = "n_beam" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "tDX" = ( @@ -28136,7 +28361,7 @@ /obj/effect/turf_decal/delivery/white, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "tEZ" = ( @@ -28334,7 +28559,7 @@ /obj/structure/light_fake, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "tMg" = ( @@ -28634,7 +28859,8 @@ obj_integrity = 9999 }, /turf/simulated/floor/plasteel{ - icon_state = "darkjail" + icon_state = "darkbrown"; + dir = 1 }, /area/syndicate_mothership/jail) "tVX" = ( @@ -28664,7 +28890,7 @@ }, /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "tWr" = ( @@ -28904,7 +29130,9 @@ pixel_y = -2 }, /obj/structure/curtain/open/shower, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/ghost_bar) "ugE" = ( /obj/machinery/door/poddoor/impassable{ @@ -28955,7 +29183,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/centcom/ss220/admin1) "uik" = ( @@ -29051,7 +29279,7 @@ "ulL" = ( /obj/effect/landmark/spawner/syndieprisonwarp, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "ulY" = ( @@ -29093,7 +29321,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "unF" = ( @@ -29337,7 +29565,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "uzE" = ( @@ -29490,7 +29718,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "uDl" = ( @@ -29676,9 +29904,14 @@ /area/centcom/ss220/evac) "uKg" = ( /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "uKn" = ( @@ -29696,7 +29929,7 @@ "uLd" = ( /obj/effect/turf_decal/delivery/red, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership) "uMm" = ( @@ -29722,7 +29955,7 @@ "uMF" = ( /obj/effect/spawner/window, /obj/structure/flora/ausbushes/genericbush, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass/jungle/no_creep, /area/centcom/ss220/admin1) "uMM" = ( /obj/structure/table/wood, @@ -30034,14 +30267,14 @@ /obj/effect/decal/cleanable/blood, /obj/effect/landmark/spawner/prisonsecuritywarp, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "uXT" = ( /obj/structure/light_fake/small, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "uYx" = ( @@ -30061,8 +30294,14 @@ "uYz" = ( /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 6 + }, /turf/simulated/floor/plasteel{ - icon_state = "warndarkgreycornerred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "uYN" = ( @@ -30142,7 +30381,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "veo" = ( @@ -30176,7 +30415,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "vfw" = ( @@ -30325,7 +30564,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/centcom/ss220/admin1) "vkl" = ( @@ -30413,8 +30652,8 @@ }, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkjail" + icon_state = "darkbrown"; + dir = 1 }, /area/syndicate_mothership/jail) "voU" = ( @@ -30491,7 +30730,7 @@ }, /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "vqa" = ( @@ -30747,7 +30986,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "vwT" = ( @@ -30786,9 +31025,10 @@ /area/shuttle/administration) "vxx" = ( /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/red/line, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "vxy" = ( @@ -30906,7 +31146,7 @@ /obj/effect/turf_decal/delivery/white, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "vEb" = ( @@ -31108,7 +31348,8 @@ "vML" = ( /obj/structure/chair/sofa/bench/left, /turf/simulated/floor/plasteel{ - icon_state = "darkjail" + icon_state = "darkbrown"; + dir = 1 }, /area/syndicate_mothership/jail) "vMP" = ( @@ -31241,7 +31482,9 @@ /obj/structure/mirror{ pixel_x = -26 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/trader_station/sol) "vPU" = ( /obj/effect/decal/syndie_logo{ @@ -31260,7 +31503,7 @@ id_tag = "SST_to_ATOM" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "vRj" = ( @@ -31277,7 +31520,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "vRR" = ( @@ -31303,7 +31546,9 @@ /area/shuttle/syndicate) "vTX" = ( /obj/machinery/economy/vending/boozeomat, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/ninja/holding) "vUB" = ( /obj/effect/turf_decal/delivery/red, @@ -31311,7 +31556,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "vUI" = ( @@ -31342,9 +31587,14 @@ /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/syndicate_mothership/cargo) "vVI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "vVK" = ( @@ -31378,7 +31628,7 @@ id = "SFBQMLoad2" }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/cargo) "vXk" = ( @@ -31770,21 +32020,6 @@ /obj/structure/extinguisher_cabinet, /turf/simulated/wall/mineral/titanium, /area/shuttle/escape) -"wke" = ( -/obj/structure/statue/sandstone/assistant{ - anchored = 1; - desc = "Он точно не спит на посту"; - icon = 'icons/mob/simple_human.dmi'; - icon_state = "syndicate_smg"; - max_integrity = 9999; - name = "Биба"; - obj_integrity = 9999 - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkjail" - }, -/area/syndicate_mothership/jail) "wkj" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = -30 @@ -31884,7 +32119,7 @@ /area/syndicate_mothership/elite_squad) "wqZ" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/elite_squad) "wra" = ( @@ -32106,7 +32341,7 @@ spawn_inside = null }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "wxW" = ( @@ -32211,13 +32446,13 @@ pixel_y = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "wBp" = ( /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "wBu" = ( @@ -32301,7 +32536,7 @@ "wER" = ( /obj/machinery/optable, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "wEY" = ( @@ -32379,8 +32614,14 @@ /area/shuttle/escape) "wIp" = ( /obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - icon_state = "warndarkgreyred" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "wIq" = ( @@ -32831,7 +33072,9 @@ /obj/structure/mirror{ pixel_x = 32 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/ghost_bar) "wWg" = ( /obj/machinery/door/poddoor{ @@ -32839,7 +33082,7 @@ name = "Shuttle Dock Door" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "wWU" = ( @@ -33275,13 +33518,6 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) -"xfA" = ( -/obj/item/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkjail" - }, -/area/syndicate_mothership/jail) "xfK" = ( /obj/structure/rack/gunrack, /obj/item/gun/energy/gun/advtaser{ @@ -33484,7 +33720,7 @@ name = "Закованное привидение" }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "xle" = ( @@ -33591,7 +33827,7 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership/infteam) "xpr" = ( @@ -33704,7 +33940,7 @@ spawn_inside = null }, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "xsg" = ( @@ -33819,7 +34055,7 @@ name = "Shuttle Dock Door" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "xuw" = ( @@ -33932,7 +34168,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "xyP" = ( @@ -33959,7 +34195,7 @@ }, /obj/structure/closet/crate, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/cargo) "xzG" = ( @@ -33996,7 +34232,7 @@ /area/syndicate_mothership/elite_squad) "xBZ" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership) "xCo" = ( @@ -34355,7 +34591,7 @@ id = "SFBQMLoad2" }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/cargo) "xSx" = ( @@ -34364,7 +34600,7 @@ }, /obj/effect/turf_decal/delivery/white, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership) "xSI" = ( @@ -34436,7 +34672,7 @@ name = "Shuttle Dock Door" }, /turf/simulated/floor/plasteel{ - icon_state = "darkgrey" + icon_state = "darkneutralfull" }, /area/syndicate_mothership) "xWi" = ( @@ -34571,7 +34807,9 @@ name = "Toilet"; opacity = 1 }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, /area/ghost_bar) "yaB" = ( /obj/effect/decal/syndie_logo{ @@ -34677,7 +34915,7 @@ pixel_x = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/infteam) "yey" = ( @@ -34760,7 +34998,7 @@ }, /obj/structure/plasticflaps/mining, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, /area/syndicate_mothership/cargo) "ygJ" = ( @@ -34889,7 +35127,7 @@ "ykz" = ( /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel{ - icon_state = "blackfull" + icon_state = "dark" }, /area/syndicate_mothership/jail) "ykX" = ( @@ -56046,7 +56284,7 @@ mvf mvf tJz eOW -dgv +hYp bda bda bxz @@ -57331,7 +57569,7 @@ kHk mvf tJz eOW -wke +oSJ bda bda tbP @@ -59133,7 +59371,7 @@ eOW oSJ bda bda -aHG +bRw eOW emB nUM @@ -59390,7 +59628,7 @@ eOW voT bda bda -xfA +hwb eOW osy uNw diff --git a/code/__DEFINES/emotes_defines.dm b/code/__DEFINES/emotes_defines.dm index 5880f171d7f8..9940edab859d 100644 --- a/code/__DEFINES/emotes_defines.dm +++ b/code/__DEFINES/emotes_defines.dm @@ -10,12 +10,10 @@ #define EMOTE_VISIBLE (1<<0) /// Emote is audible (in character). #define EMOTE_AUDIBLE (1<<1) -/// Emote makes a sound. These emotes will specifically not be runechatted. -#define EMOTE_SOUND (1<<2) /// Regardless of its existing flags, an emote with this flag will not be sent to runechat. -#define EMOTE_FORCE_NO_RUNECHAT (1<<3) +#define EMOTE_FORCE_NO_RUNECHAT (1<<2) /// This emote uses the mouth, and so should be blocked if the user is muzzled or can't breathe (for humans). -#define EMOTE_MOUTH (1<<4) +#define EMOTE_MOUTH (1<<3) // User audio cooldown system. // This is a value stored on the user and represents their current ability to perform audio emotes. diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index fc43a57eb92f..a82321181796 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -10,7 +10,7 @@ #define isliving(A) (istype(A, /mob/living)) -#define isbrain(A) (istype(A, /mob/living/carbon/brain)) +#define isbrain(A) (istype(A, /mob/living/brain)) // Carbon mobs #define iscarbon(A) (istype(A, /mob/living/carbon)) diff --git a/code/__DEFINES/misc_defines.dm b/code/__DEFINES/misc_defines.dm index 3641f687896e..1247d77e0047 100644 --- a/code/__DEFINES/misc_defines.dm +++ b/code/__DEFINES/misc_defines.dm @@ -375,7 +375,7 @@ #define INVESTIGATE_BOMB "bombs" // The SQL version required by this version of the code -#define SQL_VERSION 532205 // SS220 EDIT +#define SQL_VERSION 532206 // SS220 EDIT // Vending machine stuff #define CAT_NORMAL 1 diff --git a/code/__DEFINES/mob_defines.dm b/code/__DEFINES/mob_defines.dm index bde8ac4801d3..efd9a4d2991d 100644 --- a/code/__DEFINES/mob_defines.dm +++ b/code/__DEFINES/mob_defines.dm @@ -247,7 +247,7 @@ // For the tcomms monitor #define ispathhuman(A) (ispath(A, /mob/living/carbon/human)) -#define ispathbrain(A) (ispath(A, /mob/living/carbon/brain)) +#define ispathbrain(A) (ispath(A, /mob/living/brain)) #define ispathslime(A) (ispath(A, /mob/living/simple_animal/slime)) #define ispathbot(A) (ispath(A, /mob/living/simple_animal/bot)) #define ispathsilicon(A) (ispath(A, /mob/living/silicon)) diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index 2c188e81e405..a7ee1856f94d 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -183,6 +183,12 @@ /// This status effect allows a mob to be revived with a defibrillator. #define STATUS_EFFECT_REVIVABLE /datum/status_effect/limited_bonus/revivable +/// Status effects for different actions +#define STATUS_EFFECT_REMOVE_CUFFS /datum/status_effect/action_status_effect/remove_handcuffs +#define STATUS_EFFECT_BREAK_CUFFS /datum/status_effect/action_status_effect/break_handcuffs +#define STATUS_EFFECT_REMOVE_MUZZLE /datum/status_effect/action_status_effect/remove_muzzle +#define STATUS_EFFECT_UNBUCKLE /datum/status_effect/action_status_effect/unbuckle + ////////////////////////// // Mind batter variants // ////////////////////////// diff --git a/code/__HELPERS/experimental.dm b/code/__HELPERS/experimental.dm deleted file mode 100644 index 7409797bb0d7..000000000000 --- a/code/__HELPERS/experimental.dm +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Experimental procs by ESwordTheCat! - */ - -/* - * Get index of last char occurence to string. - * - * @args - * A, string to be search - * B, char used for search - * - * @return - * >0, index of char at string - * 0, char not found - * -1, parameter B is not a char - * -2, parameter A is not a string - */ -/proc/strpos(const/A, const/B) - if(istext(A) == 0 || length(A) < 1) - return -2 - - if(istext(B) == 0 || length(B) > 1) - return -1 - - var/i = findtext(A, B) - - if(0 == i) - return 0 - - while(i) - . = i - i = findtext(A, B, i + 1) - -/proc/isInTypes(atom/Object, types) - var/prototype = Object.type - Object = null - - for(var/type in params2list(types)) - if(ispath(prototype, text2path(type))) - return 1 - - return 0 diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index f784be66aef1..97c9fe44971c 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -110,10 +110,6 @@ for(var/limb_type in typesof(/datum/robolimb)) var/datum/robolimb/R = new limb_type() GLOB.all_robolimbs[R.company] = R - if(!R.unavailable_at_chargen) - if(R != "head" && R != "chest" && R != "groin") //Part of the method that ensures only IPCs can access head, chest and groin prosthetics. - if(R.has_subtypes) //Ensures solos get added to the list as well be incorporating has_subtypes == 1 and has_subtypes == 2. - GLOB.chargen_robolimbs[R.company] = R //List only main brands and solo parts. if(R.selectable) GLOB.selectable_robolimbs[R.company] = R diff --git a/code/__HELPERS/mob_helpers.dm b/code/__HELPERS/mob_helpers.dm index 06a2ec732f92..5a6fc82dc98e 100644 --- a/code/__HELPERS/mob_helpers.dm +++ b/code/__HELPERS/mob_helpers.dm @@ -470,7 +470,7 @@ return FALSE #define DOAFTERONCE_MAGIC "Magic~~" -GLOBAL_LIST_INIT(do_after_once_tracker, list()) +GLOBAL_LIST_EMPTY(do_after_once_tracker) /proc/do_after_once(mob/user, delay, needhand = 1, atom/target = null, progress = 1, allow_moving, must_be_held, attempt_cancel_message = "Attempt cancelled.", special_identifier) if(!user || !target) return diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 5a6cc9412936..6ceb6382b3b6 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -410,7 +410,7 @@ Turf and target are seperate in case you want to teleport some distance from a t moblist.Add(M) for(var/mob/living/carbon/human/M in sortmob) moblist.Add(M) - for(var/mob/living/carbon/brain/M in sortmob) + for(var/mob/living/brain/M in sortmob) moblist.Add(M) for(var/mob/living/carbon/alien/M in sortmob) moblist.Add(M) diff --git a/code/_globalvars/configuration.dm b/code/_globalvars/configuration.dm index 3b7d061ace37..b031d7a0cf31 100644 --- a/code/_globalvars/configuration.dm +++ b/code/_globalvars/configuration.dm @@ -25,6 +25,3 @@ GLOBAL_VAR_INIT(dsay_enabled, TRUE) /// Amount of time (in minutes) that must pass between a player dying as a mouse and repawning as a mouse GLOBAL_VAR_INIT(mouse_respawn_time, 5) - -/// Enable debugging of things such as job starts and other things -GLOBAL_VAR_INIT(debug2, TRUE) diff --git a/code/_globalvars/game_modes.dm b/code/_globalvars/game_modes.dm index 9a8d01767644..664ae5577d2c 100644 --- a/code/_globalvars/game_modes.dm +++ b/code/_globalvars/game_modes.dm @@ -5,4 +5,3 @@ GLOBAL_VAR_INIT(secret_force_mode, "secret") // if this is anything but "secret" GLOBAL_DATUM(start_state, /datum/station_state) // Used in round-end report. Dont ask why it inits as null GLOBAL_VAR(custom_event_msg) -GLOBAL_VAR(custom_event_admin_msg) diff --git a/code/_globalvars/genetics.dm b/code/_globalvars/genetics.dm index 21d396718282..94b180be3c89 100644 --- a/code/_globalvars/genetics.dm +++ b/code/_globalvars/genetics.dm @@ -60,6 +60,3 @@ GLOBAL_VAR_INIT(polymorphblock, 0) /////////////////////////////// GLOBAL_VAR_INIT(loudblock, 0) GLOBAL_VAR_INIT(dizzyblock, 0) - -GLOBAL_LIST_EMPTY(reg_dna) -GLOBAL_LIST_EMPTY(global_mutations) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index d45db7b7dce5..19768711ea14 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -1,35 +1,31 @@ //Preferences stuff //Head accessory styles -GLOBAL_LIST_INIT(head_accessory_styles_list, list()) //stores /datum/sprite_accessory/head_accessory indexed by name +GLOBAL_LIST_EMPTY(head_accessory_styles_list) //stores /datum/sprite_accessory/head_accessory indexed by name //Marking styles -GLOBAL_LIST_INIT(marking_styles_list, list()) //stores /datum/sprite_accessory/body_markings indexed by name +GLOBAL_LIST_EMPTY(marking_styles_list) //stores /datum/sprite_accessory/body_markings indexed by name //Hairstyles -GLOBAL_LIST_INIT(hair_styles_public_list, list()) //stores /datum/sprite_accessory/hair indexed by name -GLOBAL_LIST_INIT(hair_styles_male_list, list()) -GLOBAL_LIST_INIT(hair_styles_female_list, list()) -GLOBAL_LIST_INIT(hair_styles_full_list, list()) //fluff hair styles -GLOBAL_LIST_INIT(facial_hair_styles_list, list()) //stores /datum/sprite_accessory/facial_hair indexed by name -GLOBAL_LIST_INIT(facial_hair_styles_male_list, list()) -GLOBAL_LIST_INIT(facial_hair_styles_female_list, list()) +GLOBAL_LIST_EMPTY(hair_styles_public_list) //stores /datum/sprite_accessory/hair indexed by name +GLOBAL_LIST_EMPTY(hair_styles_male_list) +GLOBAL_LIST_EMPTY(hair_styles_female_list) +GLOBAL_LIST_EMPTY(hair_styles_full_list) //fluff hair styles +GLOBAL_LIST_EMPTY(facial_hair_styles_list) //stores /datum/sprite_accessory/facial_hair indexed by name +GLOBAL_LIST_EMPTY(facial_hair_styles_male_list) +GLOBAL_LIST_EMPTY(facial_hair_styles_female_list) GLOBAL_LIST_EMPTY(hair_gradients_list) //stores /datum/sprite_accessory/hair_gradient indexed by name //Underwear -GLOBAL_LIST_INIT(underwear_list, list()) //stores /datum/sprite_accessory/underwear indexed by name -GLOBAL_LIST_INIT(underwear_m, list()) //stores only underwear name -GLOBAL_LIST_INIT(underwear_f, list()) //stores only underwear name +GLOBAL_LIST_EMPTY(underwear_list) //stores /datum/sprite_accessory/underwear indexed by name +GLOBAL_LIST_EMPTY(underwear_m) //stores only underwear name +GLOBAL_LIST_EMPTY(underwear_f) //stores only underwear name //Undershirts -GLOBAL_LIST_INIT(undershirt_list, list()) //stores /datum/sprite_accessory/undershirt indexed by name -GLOBAL_LIST_INIT(undershirt_m, list()) //stores only undershirt name -GLOBAL_LIST_INIT(undershirt_f, list()) //stores only undershirt name +GLOBAL_LIST_EMPTY(undershirt_list) //stores /datum/sprite_accessory/undershirt indexed by name +GLOBAL_LIST_EMPTY(undershirt_m) //stores only undershirt name +GLOBAL_LIST_EMPTY(undershirt_f) //stores only undershirt name //Socks -GLOBAL_LIST_INIT(socks_list, list()) //stores /datum/sprite_accessory/socks indexed by name -GLOBAL_LIST_INIT(socks_m, list()) //stores only socks name -GLOBAL_LIST_INIT(socks_f, list()) //stores only socks name +GLOBAL_LIST_EMPTY(socks_list) //stores /datum/sprite_accessory/socks indexed by name +GLOBAL_LIST_EMPTY(socks_m) //stores only socks name +GLOBAL_LIST_EMPTY(socks_f) //stores only socks name //Alt Heads -GLOBAL_LIST_INIT(alt_heads_list, list()) //stores /datum/sprite_accessory/alt_heads indexed by name - -GLOBAL_LIST_INIT(scarySounds, list('sound/weapons/thudswoosh.ogg','sound/weapons/taser.ogg','sound/weapons/armbomb.ogg','sound/voice/hiss1.ogg','sound/voice/hiss2.ogg', \ -'sound/voice/hiss3.ogg','sound/voice/hiss4.ogg','sound/voice/hiss5.ogg','sound/voice/hiss6.ogg','sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg', \ -'sound/items/welder.ogg','sound/items/welder2.ogg','sound/machines/airlock_open.ogg','sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg')) +GLOBAL_LIST_EMPTY(alt_heads_list) //stores /datum/sprite_accessory/alt_heads indexed by name // Reference list for disposal sort junctions. Set the sort_type_txt variable on disposal sort junctions to // the index of the sort department that you want. For example, adding "2" to sort_type_txt will reroute all packages @@ -56,12 +52,7 @@ GLOBAL_LIST_INIT(phonetic_alphabet, list("Alpha", "Bravo", "Charlie", "Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-ray", "Yankee", "Zulu")) -GLOBAL_LIST_INIT(numbers_as_words, list("One", "Two", "Three", "Four", - "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", - "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", - "Eighteen", "Nineteen")) - - //Backpacks +//Backpacks #define GBACKPACK "Grey Backpack" #define GSATCHEL "Grey Satchel" #define GDUFFLEBAG "Grey Dufflebag" diff --git a/code/_globalvars/lists/misc_lists.dm b/code/_globalvars/lists/misc_lists.dm index 7371f1d7205a..b4ac32d640cf 100644 --- a/code/_globalvars/lists/misc_lists.dm +++ b/code/_globalvars/lists/misc_lists.dm @@ -1,8 +1,5 @@ GLOBAL_LIST_INIT(alphabet, list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z")) GLOBAL_LIST_INIT(alphabet_uppercase, list("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z")) -GLOBAL_LIST_INIT(zero_character_only, list("0")) -GLOBAL_LIST_INIT(hex_characters, list("0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f")) -GLOBAL_LIST_INIT(binary, list("0","1")) GLOBAL_LIST_INIT(html_colors, list("Alice Blue","Antique White","Aqua","Aquamarine","Azure","Beige","Bisque","Black","Blanched Almond","Blue","Blue Violet", "Brown","Burly Wood","Cadet Blue","Chartreuse","Chocolate","Coral","Cornflower Blue","Cornsilk","Crimson","Cyan", "Dark Blue","Dark Cyan","Dark Golden Rod","Dark Gray","Dark Green","Dark Khaki","Dark Magenta","Dark Olive Green", @@ -19,7 +16,6 @@ GLOBAL_LIST_INIT(html_colors, list("Alice Blue","Antique White","Aqua","Aquamari "Salmon","Sandy Brown","Sea Green","Sea Shell","Sienna","Silver","Sky Blue","Slate Blue","Slate Gray","Snow","Spring Green", "Steel Blue","Tan","Teal","Thistle","Tomato","Turquoise","Violet","Wheat","White","White Smoke","Yellow","Yellow Green")) -GLOBAL_LIST_INIT(day_names, list("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday")) GLOBAL_LIST_INIT(month_names, list("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December")) // keep si_suffixes balanced and with a pivot in the middle! GLOBAL_LIST_INIT(si_suffixes, list("y", "z", "a", "f", "p", "n", "u", "m", "", "k", "M", "G", "T", "P", "E", "Z", "Y")) @@ -38,7 +34,7 @@ GLOBAL_LIST_INIT(restricted_camera_networks, list( "SyndicateCaves" )) //Those networks can only be accessed by preexisting terminals. AIs and new terminals can't use them. -GLOBAL_LIST_INIT(ruin_landmarks, list()) +GLOBAL_LIST_EMPTY(ruin_landmarks) GLOBAL_LIST_INIT(round_end_sounds, list( 'sound/AI/newroundsexy.ogg' = 2.3 SECONDS, diff --git a/code/_globalvars/lists/mob_lists.dm b/code/_globalvars/lists/mob_lists.dm index 709cc9075db8..a433843806d0 100644 --- a/code/_globalvars/lists/mob_lists.dm +++ b/code/_globalvars/lists/mob_lists.dm @@ -20,7 +20,6 @@ GLOBAL_LIST_EMPTY(silicon_mob_list) //List of all silicon mobs, including clie GLOBAL_LIST_EMPTY(mob_living_list) //all instances of /mob/living and subtypes GLOBAL_LIST_EMPTY(carbon_list) //all instances of /mob/living/carbon and subtypes, notably does not contain simple animals GLOBAL_LIST_EMPTY(human_list) //all instances of /mob/living/carbon/human and subtypes -GLOBAL_LIST_EMPTY(spirits) //List of all the spirits, including Masks GLOBAL_LIST_EMPTY(alive_mob_list) //List of all alive mobs, including clientless. Excludes /mob/new_player GLOBAL_LIST_EMPTY(dead_mob_list) //List of all dead mobs, including clientless. Excludes /mob/new_player GLOBAL_LIST_EMPTY(non_respawnable_keys) //List of ckeys that are excluded from respawning for remainder of round. diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index 6888cf87717a..777411685510 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -1,7 +1,7 @@ GLOBAL_LIST_INIT(ai_names, file2list("config/names/ai.txt")) GLOBAL_LIST_INIT(wizard_first, file2list("config/names/wizardfirst.txt")) GLOBAL_LIST_INIT(wizard_second, file2list("config/names/wizardsecond.txt")) -GLOBAL_LIST_INIT(ninja_titles, file2list("config/names/ninjatitle.txt")) +// GLOBAL_LIST_INIT(ninja_titles, file2list("config/names/ninjatitle.txt")) // This is kept because we technically still have these files in the code in case we ever want to use them, but is currently unused GLOBAL_LIST_INIT(ninja_names, file2list("config/names/ninjaname.txt")) GLOBAL_LIST_INIT(deathsquad_names, file2list("config/names/deathsquad.txt")) GLOBAL_LIST_INIT(first_names_male, file2list("config/names/first_male.txt")) @@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(first_names_soviet, file2list("config/names/first_soviet_male.t GLOBAL_LIST_INIT(last_names_soviet, file2list("config/names/last_soviet_male.txt")) GLOBAL_LIST_INIT(verbs, file2list("config/names/verbs.txt")) -GLOBAL_LIST_INIT(nouns, file2list("config/names/nouns.txt")) +GLOBAL_LIST_INIT(nouns, file2list("config/names/nouns.txt")) // SS220 EDIT - CODE UNCOMMENT GLOBAL_LIST_INIT(adjectives, file2list("config/names/adjectives.txt")) GLOBAL_LIST_INIT(dream_strings, file2list("config/names/dreams.txt")) GLOBAL_LIST_INIT(nightmare_strings, file2list("config/names/nightmares.txt")) diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index 25723d3c21dd..707a797c8ba5 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -1,56 +1,54 @@ -GLOBAL_LIST_INIT(portals, list()) //for use by portals +GLOBAL_LIST_EMPTY(portals) //for use by portals GLOBAL_LIST(cable_list) //Index for all cables, so that powernets don't have to look through the entire world all the time GLOBAL_LIST(chemical_reactions_list) //list of all /datum/chemical_reaction datums. Used during chemical reactions GLOBAL_LIST(chemical_reagents_list) //list of all /datum/reagent datums indexed by reagent id. Used by chemistry stuff -GLOBAL_LIST_INIT(landmarks_list, list()) //list of all landmarks created -GLOBAL_LIST_INIT(surgery_steps, list()) //list of all surgery steps |BS12 -GLOBAL_LIST_INIT(side_effects, list()) //list of all medical sideeffects types by thier names |BS12 -GLOBAL_LIST_INIT(mechas_list, list()) //list of all mechs. Used by hostile mobs target tracking. -GLOBAL_LIST_INIT(joblist, list()) //list of all jobstypes, minus borg and AI -GLOBAL_LIST_INIT(airlocks, list()) //list of all airlocks -GLOBAL_LIST_INIT(singularities, list()) //list of all singularities -GLOBAL_LIST_INIT(janitorial_equipment, list()) //list of janitorial equipment -GLOBAL_LIST_INIT(crafting_recipes, list()) //list of all crafting recipes -GLOBAL_LIST_INIT(prisoncomputer_list, list()) -GLOBAL_LIST_INIT(celltimers_list, list()) // list of all cell timers -GLOBAL_LIST_INIT(cell_logs, list()) -GLOBAL_LIST_INIT(navigation_computers, list()) -GLOBAL_LIST_INIT(hierophant_walls, list()) - -GLOBAL_LIST_INIT(all_areas, list()) -GLOBAL_LIST_INIT(all_unique_areas, list()) // List of all unique areas. AKA areas with there_can_be_many = FALSE -GLOBAL_LIST_INIT(machines, list()) -GLOBAL_LIST_INIT(rcd_list, list()) //list of Rapid Construction Devices. - -GLOBAL_LIST_INIT(apcs, list()) -GLOBAL_LIST_INIT(air_alarms, list()) -GLOBAL_LIST_INIT(power_monitors, list()) -GLOBAL_LIST_INIT(all_vent_pumps, list()) - -GLOBAL_LIST_INIT(navbeacons, list()) //list of all bot nagivation beacons, used for patrolling. -GLOBAL_LIST_INIT(deliverybeacons, list()) //list of all MULEbot delivery beacons. -GLOBAL_LIST_INIT(deliverybeacontags, list()) //list of all tags associated with delivery beacons. - -GLOBAL_LIST_INIT(beacons, list()) -GLOBAL_LIST_INIT(shuttle_caller_list, list()) //list of all communication consoles, comms consoles circuit and AIs, for automatic shuttle calls when there are none. -GLOBAL_LIST_INIT(tracked_implants, list()) //list of all current implants that are tracked to work out what sort of trek everyone is on. Sadly not on lavaworld not implemented... -GLOBAL_LIST_INIT(pinpointer_list, list()) //list of all pinpointers. Used to change stuff they are pointing to all at once. -GLOBAL_LIST_INIT(nuclear_uplink_list, list()) //list of all existing nuke ops uplinks -GLOBAL_LIST_INIT(abductor_equipment, list()) //list of all abductor equipment -GLOBAL_LIST_INIT(global_intercoms, list()) //list of all intercomms, across all z-levels -GLOBAL_LIST_INIT(global_radios, list()) //list of all radios, across all z-levels - -GLOBAL_LIST_INIT(meteor_list, list()) //list of all meteors -GLOBAL_LIST_INIT(poi_list, list()) //list of points of interest for observe/follow -GLOBAL_LIST_INIT(active_jammers, list()) // List of active radio jammers +GLOBAL_LIST_EMPTY(landmarks_list) //list of all landmarks created +GLOBAL_LIST_EMPTY(surgery_steps) //list of all surgery steps |BS12 +GLOBAL_LIST_EMPTY(mechas_list) //list of all mechs. Used by hostile mobs target tracking. +GLOBAL_LIST_EMPTY(joblist) //list of all jobstypes, minus borg and AI +GLOBAL_LIST_EMPTY(airlocks) //list of all airlocks +GLOBAL_LIST_EMPTY(singularities) //list of all singularities +GLOBAL_LIST_EMPTY(janitorial_equipment) //list of janitorial equipment +GLOBAL_LIST_EMPTY(crafting_recipes) //list of all crafting recipes +GLOBAL_LIST_EMPTY(prisoncomputer_list) +GLOBAL_LIST_EMPTY(celltimers_list) // list of all cell timers +GLOBAL_LIST_EMPTY(cell_logs) +GLOBAL_LIST_EMPTY(navigation_computers) +GLOBAL_LIST_EMPTY(hierophant_walls) + +GLOBAL_LIST_EMPTY(all_areas) +GLOBAL_LIST_EMPTY(all_unique_areas) // List of all unique areas. AKA areas with there_can_be_many = FALSE +GLOBAL_LIST_EMPTY(machines) +GLOBAL_LIST_EMPTY(rcd_list) //list of Rapid Construction Devices. + +GLOBAL_LIST_EMPTY(apcs) +GLOBAL_LIST_EMPTY(air_alarms) +GLOBAL_LIST_EMPTY(power_monitors) +GLOBAL_LIST_EMPTY(all_vent_pumps) + +GLOBAL_LIST_EMPTY(navbeacons) //list of all bot nagivation beacons, used for patrolling. +GLOBAL_LIST_EMPTY(deliverybeacons) //list of all MULEbot delivery beacons. +GLOBAL_LIST_EMPTY(deliverybeacontags) //list of all tags associated with delivery beacons. + +GLOBAL_LIST_EMPTY(beacons) +GLOBAL_LIST_EMPTY(shuttle_caller_list) //list of all communication consoles, comms consoles circuit and AIs, for automatic shuttle calls when there are none. +GLOBAL_LIST_EMPTY(tracked_implants) //list of all current implants that are tracked to work out what sort of trek everyone is on. Sadly not on lavaworld not implemented... +GLOBAL_LIST_EMPTY(pinpointer_list) //list of all pinpointers. Used to change stuff they are pointing to all at once. +GLOBAL_LIST_EMPTY(nuclear_uplink_list) //list of all existing nuke ops uplinks +GLOBAL_LIST_EMPTY(abductor_equipment) //list of all abductor equipment +GLOBAL_LIST_EMPTY(global_intercoms) //list of all intercomms, across all z-levels +GLOBAL_LIST_EMPTY(global_radios) //list of all radios, across all z-levels + +GLOBAL_LIST_EMPTY(meteor_list) //list of all meteors +GLOBAL_LIST_EMPTY(poi_list) //list of points of interest for observe/follow +GLOBAL_LIST_EMPTY(active_jammers) // List of active radio jammers GLOBAL_LIST_EMPTY(ladders) GLOBAL_LIST_EMPTY(mirrors) //list of all mirrors and mirror shields. GLOBAL_LIST_EMPTY(arc_emitters) //list of all arc emitters -GLOBAL_LIST_INIT(active_diseases, list()) //List of Active disease in all mobs; purely for quick referencing. +GLOBAL_LIST_EMPTY(active_diseases) //List of Active disease in all mobs; purely for quick referencing. GLOBAL_LIST_EMPTY(mob_spawners) // All mob_spawn objects -GLOBAL_LIST_EMPTY(explosive_walls) GLOBAL_LIST_EMPTY(engine_beacon_list) diff --git a/code/_globalvars/lists/reagents_lists.dm b/code/_globalvars/lists/reagents_lists.dm index cabf9cc43e1b..2d70edcc5835 100644 --- a/code/_globalvars/lists/reagents_lists.dm +++ b/code/_globalvars/lists/reagents_lists.dm @@ -1,23 +1,3 @@ -// Base chemicals -GLOBAL_LIST_INIT(base_chemicals, list("water","oxygen","nitrogen","hydrogen","potassium","mercury","carbon", - "chlorine","fluorine","phosphorus","lithium","sulfur","sacid","radium", - "iron","aluminum","silicon","sugar","ethanol")) -// Standard chemicals -GLOBAL_LIST_INIT(standard_chemicals, list("slimejelly","blood","water","lube","charcoal","toxin","cyanide", - "morphine","epinephrine","space_drugs","oxygen","copper", - "nitrogen","hydrogen","potassium","mercury","sulfur","carbon","chlorine", - "fluorine","sodium","phosphorus","lithium","sugar","sacid","facid", - "glycerol","radium","mutadone","thermite","mutagen","virusfood","iron", - "gold","silver","uranium","aluminum","silicon","fuel","cleaner","atrazine", - "plasma","teporone","lexorin","silver_sulfadiazine","salbutamol", - "perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide", - "pen_acid","mannitol","oculine","styptic_powder","methamphetamine", - "cryoxadone","spaceacillin","carpotoxin","lsd","fluorosurfactant", - "fluorosurfactant","ethanol","ammonia","diethylamine","antihol","pancuronium", - "lipolicide","condensedcapsaicin","frostoil","amanitin","psilocybin", - "enzyme","nothing","salglu_solution","antifreeze","neurotoxin", "jestosterone")) -// Rare chemicals -GLOBAL_LIST_INIT(rare_chemicals, list("minttoxin","syndicate_nanites", "xenomicrobes")) // Standard medicines GLOBAL_LIST_INIT(standard_medicines, list("charcoal","toxin","cyanide","morphine","epinephrine","space_drugs", "mutadone","mutagen","teporone","lexorin","silver_sulfadiazine", diff --git a/code/_globalvars/lists/typecache.dm b/code/_globalvars/lists/typecache.dm index 96807214f2f8..9ee4089fb0e6 100644 --- a/code/_globalvars/lists/typecache.dm +++ b/code/_globalvars/lists/typecache.dm @@ -8,5 +8,3 @@ GLOBAL_LIST_INIT(typecache_mob, typecacheof(/mob)) GLOBAL_LIST_INIT(typecache_living, typecacheof(/mob/living)) GLOBAL_LIST_INIT(typecache_stack, typecacheof(/obj/item/stack)) - -GLOBAL_LIST_INIT(typecache_machine_or_structure, typecacheof(list(/obj/machinery, /obj/structure))) diff --git a/code/_globalvars/logging_vars.dm b/code/_globalvars/logging_vars.dm index 0f968923ffc2..1e448d1be029 100644 --- a/code/_globalvars/logging_vars.dm +++ b/code/_globalvars/logging_vars.dm @@ -29,8 +29,6 @@ GLOBAL_VAR(gc_log) GLOBAL_PROTECT(gc_log) #endif -GLOBAL_LIST_EMPTY(jobMax) -GLOBAL_PROTECT(jobMax) GLOBAL_LIST_EMPTY(admin_log) GLOBAL_PROTECT(admin_log) GLOBAL_LIST_EMPTY(lastsignalers) @@ -38,12 +36,5 @@ GLOBAL_PROTECT(lastsignalers) GLOBAL_LIST_EMPTY(lawchanges) GLOBAL_PROTECT(lawchanges) -GLOBAL_LIST_EMPTY(combatlog) -GLOBAL_PROTECT(combatlog) -GLOBAL_LIST_EMPTY(IClog) -GLOBAL_PROTECT(IClog) -GLOBAL_LIST_EMPTY(OOClog) -GLOBAL_PROTECT(OOClog) - GLOBAL_DATUM_INIT(logging, /datum/logging, new /datum/logging()) diff --git a/code/_globalvars/mapping_vars.dm b/code/_globalvars/mapping_vars.dm index 67857902c530..ee12fedfde9b 100644 --- a/code/_globalvars/mapping_vars.dm +++ b/code/_globalvars/mapping_vars.dm @@ -5,7 +5,6 @@ GLOBAL_LIST_INIT(cardinal, list(NORTH, SOUTH, EAST, WEST)) GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) -GLOBAL_LIST_INIT(alldirs2, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST, NORTH, SOUTH, EAST, WEST)) GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) GLOBAL_LIST(global_map) // This is the array of zlevels | list(list(1,5),list(4,3)) | becomes a 2D array of zlevels @@ -40,16 +39,14 @@ GLOBAL_LIST_EMPTY(ninjastart) GLOBAL_LIST_EMPTY(carplist) //list of all carp-spawn landmarks GLOBAL_LIST_EMPTY(syndicateofficer) -//away missions -GLOBAL_LIST_EMPTY(awaydestinations) //a list of landmarks that the warpgate can take you to +// Away missions +GLOBAL_LIST_EMPTY(awaydestinations) // SS220 EDIT - ADDITION //List of preloaded templates GLOBAL_LIST_EMPTY(map_templates) -GLOBAL_LIST_EMPTY(ruins_templates) GLOBAL_LIST_EMPTY(space_ruins_templates) GLOBAL_LIST_EMPTY(lava_ruins_templates) GLOBAL_LIST_EMPTY(shelter_templates) GLOBAL_LIST_EMPTY(shuttle_templates) GLOBAL_LIST_EMPTY(bridge_horizontal_templates) GLOBAL_LIST_EMPTY(bridge_vertical_templates) -GLOBAL_LIST_EMPTY(event_templates) diff --git a/code/_globalvars/misc_globals.dm b/code/_globalvars/misc_globals.dm index 08ad1d0ee606..db39391a7835 100644 --- a/code/_globalvars/misc_globals.dm +++ b/code/_globalvars/misc_globals.dm @@ -31,11 +31,7 @@ GLOBAL_LIST_INIT(paper_blacklist, list("java","onblur","onchange","onclick","ond "onkeypress","onkeyup","onload","onmousedown","onmousemove","onmouseout","onmouseover", \ "onmouseup","onreset","onselect","onsubmit","onunload")) -//Reverse of dir -GLOBAL_LIST_INIT(reverse_dir, list(2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15, 32, 34, 33, 35, 40, 42, 41, 43, 36, 38, 37, 39, 44, 46, 45, 47, 16, 18, 17, 19, 24, 26, 25, 27, 20, 22, 21, 23, 28, 30, 29, 31, 48, 50, 49, 51, 56, 58, 57, 59, 52, 54, 53, 55, 60, 62, 61, 63)) GLOBAL_VAR_INIT(gravity_is_on, 1) //basically unused, just one admin verb.. -// Recall time limit: 2 hours -GLOBAL_VAR_INIT(recall_time_limit, 72000) //apparently used for the comm console #define TAB "    " @@ -49,7 +45,6 @@ GLOBAL_VAR_INIT(gametime_offset, 432000) // 12:00 in seconds GLOBAL_DATUM_INIT(data_core, /datum/datacore, new) // Station datacore, manifest, etc -GLOBAL_LIST_EMPTY(ability_verbs) // Create-level abilities GLOBAL_LIST_INIT(pipe_colors, list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE)) /// Global list of all /datum/mod_theme diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 24a186227b70..9d94e5f5ca60 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -416,11 +416,11 @@ Recharging stations are available in robotics, the dormitory bathrooms, and the if(length(nymphs) == 1) var/mob/living/simple_animal/diona/D = nymphs[1] - D.split() + D.split(TRUE) else var/mob/living/simple_animal/diona/D = input("Select a nymph to drop:", "Nymph Dropping", nymphs[1]) as anything in nymphs if(D in usr.contents) - D.split() + D.split(TRUE) //Need to cover all use cases - emag, illegal upgrade module, malf AI hack, traitor cyborg /obj/screen/alert/hacked diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index 87dd423159ad..45b2e9fbdbec 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -1,6 +1,5 @@ #define NEXT_PAGE_ID "__next__" #define DEFAULT_CHECK_DELAY 20 -#define ANIM_SPEED 0.5 GLOBAL_LIST_EMPTY(radial_menus) @@ -44,6 +43,14 @@ GLOBAL_LIST_EMPTY(radial_menus) if(usr.client == parent.current_user) parent.finished = TRUE +/obj/screen/radial/center/MouseEntered(location, control, params) + . = ..() + openToolTip(usr, src, params, title = name) + +/obj/screen/radial/center/MouseExited(location, control, params) + . = ..() + closeToolTip(usr) + /datum/radial_menu var/list/choices = list() //List of choice id's var/list/choices_icons = list() //choice_id -> icon @@ -55,8 +62,9 @@ GLOBAL_LIST_EMPTY(radial_menus) var/list/obj/screen/elements = list() var/obj/screen/radial/center/close_button var/client/current_user - var/atom/anchor - var/image/menu_holder + var/atom/movable/anchor + var/pixel_x_difference + var/pixel_y_difference var/finished = FALSE var/datum/callback/custom_check_callback var/next_check = 0 @@ -73,39 +81,7 @@ GLOBAL_LIST_EMPTY(radial_menus) var/hudfix_method = TRUE //TRUE to change anchor to user, FALSE to shift by py_shift var/py_shift = 0 - var/entry_animation = TRUE -//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 - if(!istype(AM)) - return - var/mob/living/carbon/H - if(ishuman(user)) - H = user - if((AM in user.client.screen) || (H && (AM in H.internal_organs))) - if(hudfix_method) - anchor = user - else - py_shift = 32 - restrict_to_dir(NORTH) //I was going to parse screen loc here but that's more effort than it's worth. - -//Sets defaults -//These assume 45 deg min_angle -/datum/radial_menu/proc/restrict_to_dir(dir) - switch(dir) - if(NORTH) - starting_angle = 270 - ending_angle = 135 - if(SOUTH) - starting_angle = 90 - ending_angle = 315 - if(EAST) - starting_angle = 0 - ending_angle = 225 - if(WEST) - starting_angle = 180 - ending_angle = 45 /datum/radial_menu/proc/setup_menu() if(ending_angle > starting_angle) @@ -143,18 +119,20 @@ GLOBAL_LIST_EMPTY(radial_menus) page_data[page] = current pages = page current_page = 1 - update_screen_objects(anim = entry_animation) + update_screen_objects() -/datum/radial_menu/proc/update_screen_objects(anim = FALSE) +/datum/radial_menu/proc/update_screen_objects() var/list/page_choices = page_data[current_page] var/angle_per_element = round(zone / page_choices.len) + pixel_x_difference = ((world.icon_size * anchor.x) + anchor.step_x + anchor.pixel_x) - ((world.icon_size * current_user.mob.x) + current_user.mob.step_x + current_user.mob.pixel_x) + pixel_y_difference = ((world.icon_size * anchor.y) + anchor.step_y + anchor.pixel_y) - ((world.icon_size * current_user.mob.y) + current_user.mob.step_y + current_user.mob.pixel_y) for(var/i in 1 to elements.len) var/obj/screen/radial/E = elements[i] var/angle = WRAP(starting_angle + (i - 1) * angle_per_element, 0, 360) if(i > page_choices.len) HideElement(E) else - SetElement(E,page_choices[i], angle, anim = anim, anim_order = i) + SetElement(E,page_choices[i], angle) /datum/radial_menu/proc/HideElement(obj/screen/radial/slice/E) E.cut_overlays() @@ -165,20 +143,13 @@ GLOBAL_LIST_EMPTY(radial_menus) E.choice = null E.next_page = FALSE -/datum/radial_menu/proc/SetElement(obj/screen/radial/slice/E, choice_id, angle, anim, anim_order) +/datum/radial_menu/proc/SetElement(obj/screen/radial/slice/E, choice_id, angle) //Position - var/py = round(cos(angle) * radius) + py_shift - var/px = round(sin(angle) * radius) - if(anim) - var/timing = anim_order * ANIM_SPEED - var/matrix/starting = matrix() - starting.Scale(0.1, 0.1) - E.transform = starting - var/matrix/TM = matrix() - animate(E, pixel_x = px, pixel_y = py, transform = TM, time = timing) - else - E.pixel_y = py - E.pixel_x = px + E.pixel_y = round(cos(angle) * radius) + py_shift + E.pixel_x = round(sin(angle) * radius) + E.screen_loc = "CENTER:[E.pixel_x + pixel_x_difference],CENTER:[E.pixel_y + pixel_y_difference]" + + current_user.screen += E //Visuals E.alpha = 255 @@ -245,25 +216,21 @@ GLOBAL_LIST_EMPTY(radial_menus) update_screen_objects() /datum/radial_menu/proc/show_to(mob/M) - if(current_user) - hide() if(!M.client || !anchor) return - current_user = M.client - //Blank - menu_holder = image(icon = 'icons/effects/effects.dmi', loc = anchor, icon_state = "nothing", layer = ABOVE_HUD_LAYER) - menu_holder.appearance_flags |= KEEP_APART - menu_holder.vis_contents += elements + close_button - current_user.images += menu_holder - -/datum/radial_menu/proc/hide() - if(current_user) - current_user.images -= menu_holder + close_button.screen_loc = "CENTER:[pixel_x_difference],CENTER:[pixel_y_difference]" + current_user.screen += close_button /datum/radial_menu/proc/wait(mob/user, atom/anchor, require_near = FALSE) + var/last_location = user.loc while(current_user && !finished && !selected_choice) - if(require_near && !user.Adjacent(anchor)) - return + if(require_near) + if(!user.Adjacent(get_turf(anchor))) + return + if(last_location != user.loc) + update_screen_objects() + close_button.screen_loc = "CENTER:[pixel_x_difference],CENTER:[pixel_y_difference]" + last_location = user.loc if(custom_check_callback && next_check < world.time) if(!custom_check_callback.Invoke()) return @@ -273,7 +240,6 @@ GLOBAL_LIST_EMPTY(radial_menus) /datum/radial_menu/Destroy() Reset() - hide() QDEL_LIST_CONTENTS(elements) QDEL_NULL(close_button) anchor = null @@ -299,8 +265,11 @@ GLOBAL_LIST_EMPTY(radial_menus) menu.radius = radius if(istype(custom_check)) menu.custom_check_callback = custom_check - menu.anchor = anchor - menu.check_screen_border(user) //Do what's needed to make it look good near borders or on hud + if(anchor in user.client.screen) + menu.anchor = user + else + menu.anchor = anchor + menu.current_user = user.client menu.set_choices(choices) menu.show_to(user) menu.wait(user, anchor, require_near) @@ -329,7 +298,7 @@ GLOBAL_LIST_EMPTY(radial_menus) if(!istype(possible_atom)) stack_trace("radial_menu_helper was passed a non-atom (\"[possible_atom]\", [possible_atom.type]) as a choice") continue - var/mutable_appearance/atom_appearance = new(possible_atom.appearance) + var/mutable_appearance/atom_appearance = mutable_appearance(possible_atom.icon, possible_atom.icon_state, possible_atom.layer, filters = possible_atom.filters) var/hover_outline_index = possible_atom.get_filter("hover_outline") if(!isnull(hover_outline_index)) @@ -350,5 +319,3 @@ GLOBAL_LIST_EMPTY(radial_menus) return return return_choices[chosen_key] - -#undef ANIM_SPEED diff --git a/code/controllers/configuration/sections/redis_configuration.dm b/code/controllers/configuration/sections/redis_configuration.dm index 347cae9282f2..45661f3643b5 100644 --- a/code/controllers/configuration/sections/redis_configuration.dm +++ b/code/controllers/configuration/sections/redis_configuration.dm @@ -10,7 +10,7 @@ // UNIT TESTS ARE DEFINED - USE CUSTOM CI VALUES #ifdef UNIT_TESTS - enabled = TRUE + // enabled = TRUE #else // Load the normal config. Were not in CI mode diff --git a/code/controllers/subsystem/SSjobs.dm b/code/controllers/subsystem/SSjobs.dm index 0f18a2ff0298..2197594c0d64 100644 --- a/code/controllers/subsystem/SSjobs.dm +++ b/code/controllers/subsystem/SSjobs.dm @@ -473,7 +473,7 @@ SUBSYSTEM_DEF(jobs) var/turf/T = null var/obj/S = null for(var/obj/effect/landmark/start/sloc in GLOB.landmarks_list) - if(sloc.name != rank) + if(sloc.name != rank && sloc.name != job.relate_job) // SS220 EDIT - Novice Jobs - Jobs relate module continue if(locate(/mob/living) in sloc.loc) continue diff --git a/code/controllers/subsystem/SSticker.dm b/code/controllers/subsystem/SSticker.dm index df8cea4065d1..447ed03b9e4e 100644 --- a/code/controllers/subsystem/SSticker.dm +++ b/code/controllers/subsystem/SSticker.dm @@ -264,10 +264,6 @@ SUBSYSTEM_DEF(ticker) create_characters() // Create player characters and transfer clients log_debug("Creating characters took [stop_watch(watch)]s") - watch = start_watch() - populate_spawn_points() // Put mobs in their spawn locations - log_debug("Populating spawn points took [stop_watch(watch)]s") - // Gather everyones minds for(var/mob/living/player in GLOB.player_list) if(player.mind) @@ -580,7 +576,7 @@ SUBSYSTEM_DEF(ticker) end_of_round_info += "[law.get_index()]. [law.law]" if(dronecount) - end_of_round_info += "There [dronecount > 1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount > 1 ? "drones" : "drone"] this round." + end_of_round_info += "There [dronecount > 1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount > 1 ? "drones" : "drone"] this round." if(length(mode.eventmiscs)) for(var/datum/mind/eventmind in mode.eventmiscs) diff --git a/code/datums/components/tilted.dm b/code/datums/components/tilted.dm index c4e97ee6efd9..7027fdbc5e8d 100644 --- a/code/datums/components/tilted.dm +++ b/code/datums/components/tilted.dm @@ -82,14 +82,14 @@ if(user) user.visible_message( - "[user] begins to right [parent].", - "You begin to right [parent]." + "[user] begins to right [atom_parent].", + "You begin to right [atom_parent]." ) - if(!do_after(user, duration, TRUE, parent)) + if(!do_after(user, duration, TRUE, parent) || QDELETED(src)) return user.visible_message( - "[user] rights [parent].", - "You right [parent].", + "[user] rights [atom_parent].", + "You right [atom_parent].", "You hear a loud clang." ) @@ -98,7 +98,7 @@ atom_parent.unbuckle_all_mobs(TRUE) - SEND_SIGNAL(parent, COMSIG_MOVABLE_UNTILTED, user) + SEND_SIGNAL(atom_parent, COMSIG_MOVABLE_UNTILTED, user) atom_parent.layer = initial(atom_parent.layer) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 7baab0c11f85..d7898ccf2a32 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -480,6 +480,25 @@ GLOBAL_VAR_INIT(record_id_num, 1001) clothes_s = new /icon('icons/mob/clothing/under/rnd.dmi', "robotics_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) + + // SS220 ADDITION - START + if("Student Scientist") + clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "student_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY) + if("Intern") + clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "intern_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) + if("Security Cadet") + clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "cadet_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + if("Trainee Engineer") + clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "trainee_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) + // SS220 ADDITION - END + if("Syndicate Agent") clothes_s = new /icon('icons/mob/clothing/under/syndicate.dmi', "syndicate_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) diff --git a/code/datums/emote.dm b/code/datums/emote.dm index 938e73e5a666..1cb1668e1182 100644 --- a/code/datums/emote.dm +++ b/code/datums/emote.dm @@ -182,7 +182,7 @@ var/suppressed = FALSE // Keep em quiet if they can't speak - if(!can_vocalize_emotes(user) && (emote_type & (EMOTE_MOUTH | EMOTE_AUDIBLE) || emote_type & (EMOTE_MOUTH | EMOTE_SOUND))) + if(!can_vocalize_emotes(user) && (emote_type & (EMOTE_MOUTH | EMOTE_AUDIBLE))) var/noise_emitted = pick(muzzled_noises) suppressed = TRUE msg = "makes \a [noise_emitted] noise." @@ -215,12 +215,12 @@ for(var/mob/dead/observer/ghost in viewers(user)) ghost.show_message("[displayed_msg]", EMOTE_VISIBLE) - else if(emote_type & (EMOTE_AUDIBLE | EMOTE_SOUND) && !user.mind?.miming) + else if((emote_type & EMOTE_AUDIBLE) && !user.mind?.miming) user.audible_message(displayed_msg, deaf_message = "You see how [user] [msg]") else user.visible_message(displayed_msg, blind_message = "You hear how someone [msg]") - if(!(emote_type & (EMOTE_FORCE_NO_RUNECHAT | EMOTE_SOUND) || suppressed) && !isobserver(user)) + if(!((emote_type & EMOTE_FORCE_NO_RUNECHAT) || suppressed) && !isobserver(user)) runechat_emote(user, msg) SEND_SIGNAL(user, COMSIG_MOB_EMOTED(key), src, key, emote_type, message, intentional) diff --git a/code/datums/helper_datums/map_template.dm b/code/datums/helper_datums/map_template.dm index 170f6773b1d1..6ce46ac564cd 100644 --- a/code/datums/helper_datums/map_template.dm +++ b/code/datums/helper_datums/map_template.dm @@ -143,7 +143,6 @@ continue GLOB.map_templates[R.name] = R - GLOB.ruins_templates[R.name] = R if(istype(R, /datum/map_template/ruin/lavaland)) GLOB.lava_ruins_templates[R.name] = R @@ -195,5 +194,4 @@ var/datum/map_template/event/E = new event_type() - GLOB.event_templates[E.event_id] = E GLOB.map_templates[E.event_id] = E diff --git a/code/datums/keybindings/emote_keybinds.dm b/code/datums/keybindings/emote_keybinds.dm index 4b99ae192997..f81ed46cd943 100644 --- a/code/datums/keybindings/emote_keybinds.dm +++ b/code/datums/keybindings/emote_keybinds.dm @@ -296,31 +296,31 @@ return isbrain(M) && ..() /datum/keybinding/emote/carbon/brain/alarm - linked_emote = /datum/emote/living/carbon/brain/alarm + linked_emote = /datum/emote/living/brain/alarm name = "Alarm" /datum/keybinding/emote/carbon/brain/alert - linked_emote = /datum/emote/living/carbon/brain/alert + linked_emote = /datum/emote/living/brain/alert name = "Alert" /datum/keybinding/emote/carbon/brain/notice - linked_emote = /datum/emote/living/carbon/brain/notice + linked_emote = /datum/emote/living/brain/notice name = "Notice" /datum/keybinding/emote/carbon/brain/flash - linked_emote = /datum/emote/living/carbon/brain/flash + linked_emote = /datum/emote/living/brain/flash name = "Flash" /datum/keybinding/emote/carbon/brain/whistle - linked_emote = /datum/emote/living/carbon/brain/whistle + linked_emote = /datum/emote/living/brain/whistle name = "Whistle" /datum/keybinding/emote/carbon/brain/beep - linked_emote = /datum/emote/living/carbon/brain/beep + linked_emote = /datum/emote/living/brain/beep name = "Beep" /datum/keybinding/emote/carbon/brain/boop - linked_emote = /datum/emote/living/carbon/brain/boop + linked_emote = /datum/emote/living/brain/boop name = "Boop" /datum/keybinding/emote/carbon/human diff --git a/code/datums/mutable_appearance.dm b/code/datums/mutable_appearance.dm index 038471ec3652..3ddadc138d1b 100644 --- a/code/datums/mutable_appearance.dm +++ b/code/datums/mutable_appearance.dm @@ -10,7 +10,7 @@ // And yes this does have to be in the constructor, BYOND ignores it if you set it as a normal var // Helper similar to image() -/proc/mutable_appearance(icon, icon_state = "", layer = FLOAT_LAYER, plane = FLOAT_PLANE, alpha = 255, appearance_flags = NONE, color) +/proc/mutable_appearance(icon, icon_state = "", layer = FLOAT_LAYER, plane = FLOAT_PLANE, alpha = 255, appearance_flags = NONE, color, filters) var/mutable_appearance/MA = new() MA.icon = icon MA.icon_state = icon_state @@ -20,6 +20,7 @@ MA.appearance_flags |= appearance_flags if(color) MA.color = color + MA.filters = filters return MA /mutable_appearance/clean/New() diff --git a/code/datums/outfits/outfit_debug.dm b/code/datums/outfits/outfit_debug.dm index 25656e065844..28460989c297 100644 --- a/code/datums/outfits/outfit_debug.dm +++ b/code/datums/outfits/outfit_debug.dm @@ -26,9 +26,9 @@ toggle_helmet = TRUE cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/arm/surgery/advanced, + /obj/item/organ/internal/cyberimp/arm/surgery/debug, /obj/item/organ/internal/cyberimp/chest/nutriment/hardened, - /obj/item/organ/internal/cyberimp/arm/janitorial/advanced + /obj/item/organ/internal/cyberimp/arm/janitorial/debug ) @@ -144,20 +144,34 @@ righthand_file = 'icons/mob/inhands/items_righthand.dmi' w_class = WEIGHT_CLASS_SMALL var/datum/species/selected_species - var/valid_species = list() + var/activate_mind = FALSE + +/obj/item/debug/human_spawner/examine(mob/user) + . = ..() + . += "Alt-Click to toggle mind-activation on spawning." /obj/item/debug/human_spawner/afterattack(atom/target, mob/user, proximity) ..() - if(isturf(target)) - var/mob/living/carbon/human/H = new /mob/living/carbon/human(target) - if(selected_species) - H.setup_dna(selected_species.type) + if(!isturf(target)) + return + var/mob/living/carbon/human/H = new /mob/living/carbon/human(target) + if(selected_species) + H.setup_dna(selected_species.type) + if(activate_mind) + H.mind_initialize() /obj/item/debug/human_spawner/attack_self(mob/user) ..() var/choice = input("Select a species", "Human Spawner", null) in GLOB.all_species selected_species = GLOB.all_species[choice] +/obj/item/debug/human_spawner/AltClick(mob/user) + . = ..() + if(!Adjacent(user)) + return + activate_mind = !activate_mind + to_chat(user, "Any humans spawned will [activate_mind ? "" : "not "]spawn with an initialized mind.") + /obj/item/rcd/combat/admin name = "AVD-CNED RCD" max_matter = INFINITY @@ -185,7 +199,7 @@ to_chat(user, "[src] is now set to toolspeed [toolspeed]") playsound(src, 'sound/effects/pop.ogg', 50, 0) //Change the mode -/obj/item/organ/internal/cyberimp/arm/surgery/advanced +/obj/item/organ/internal/cyberimp/arm/surgery/debug name = "AVD-CNED surgical toolset implant" contents = newlist( /obj/item/scalpel/laser/manager/debug, @@ -197,7 +211,7 @@ /obj/item/bodyanalyzer/debug ) -/obj/item/organ/internal/cyberimp/arm/janitorial/advanced +/obj/item/organ/internal/cyberimp/arm/janitorial/debug name = "AVD-CNED janitorial toolset implant... is that a... tazer?" desc = "A set of advanced janitorial tools hidden behind a concealed panel on the user's arm with a tazer? What the fuck." parent_organ = "l_arm" // left arm by default cuz im lazy diff --git a/code/datums/radio_frequency.dm b/code/datums/radio_frequency.dm index 764fd640881a..cf14ba3c956d 100644 --- a/code/datums/radio_frequency.dm +++ b/code/datums/radio_frequency.dm @@ -98,7 +98,7 @@ var/mob/living/carbon/human/H = M . = H.dna.species.name else if(isbrain(M)) - var/mob/living/carbon/brain/B = M + var/mob/living/brain/B = M . = B.get_race() else if(issilicon(M)) . = "Artificial Life" diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm index 2ba67cf1aa40..e27d70153bb6 100644 --- a/code/datums/spells/construct_spells.dm +++ b/code/datums/spells/construct_spells.dm @@ -143,6 +143,7 @@ invocation_type = "none" holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel proj_lifespan = 10 + proj_step_delay = 5 proj_type = "/obj/effect/proc_holder/spell/inflict_handler/magic_missile/lesser" /obj/effect/proc_holder/spell/projectile/magic_missile/lesser/create_new_targeting() diff --git a/code/datums/spells/wizard_spells.dm b/code/datums/spells/wizard_spells.dm index 1e5abe773d9e..cee4dbb07286 100644 --- a/code/datums/spells/wizard_spells.dm +++ b/code/datums/spells/wizard_spells.dm @@ -15,7 +15,7 @@ proj_type = "/obj/effect/proc_holder/spell/inflict_handler/magic_missile" proj_lifespan = 20 - proj_step_delay = 5 + proj_step_delay = 2 proj_trail = 1 proj_trail_lifespan = 5 @@ -283,12 +283,12 @@ desc = "This spell temporarily blinds a single person and does not require wizard garb." school = "transmutation" - base_cooldown = 300 + base_cooldown = 10 SECONDS clothes_req = FALSE invocation = "STI KALY" invocation_type = "whisper" message = "Your eyes cry out in pain!" - cooldown_min = 50 //12 deciseconds reduction per rank + cooldown_min = 2 SECONDS starting_spells = list("/obj/effect/proc_holder/spell/inflict_handler/blind","/obj/effect/proc_holder/spell/genetic/blind") diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 1aab56c9d8a7..d65790632129 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -257,7 +257,9 @@ /datum/status_effect/force_shield id = "forceshield" - duration = 4 SECONDS + alert_type = null + status_type = STATUS_EFFECT_REFRESH + duration = 5 SECONDS tick_interval = 0 var/mutable_appearance/shield diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index c545f6c2d498..ce613a490906 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -270,3 +270,19 @@ /datum/status_effect/delayed/on_timeout() . = ..() expire_proc.Invoke() + +/datum/status_effect/action_status_effect + alert_type = null + tick_interval = -1 + +/datum/status_effect/action_status_effect/remove_handcuffs + id = "remove_handcuffs" + +/datum/status_effect/action_status_effect/break_handcuffs + id = "break_handcuffs" + +/datum/status_effect/action_status_effect/remove_muzzle + id = "remove_muzzle" + +/datum/status_effect/action_status_effect/unbuckle + id = "unbuckle" diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm index 9da4ac870052..82c9a5ad20c0 100644 --- a/code/datums/uplink_items/uplink_general.dm +++ b/code/datums/uplink_items/uplink_general.dm @@ -365,7 +365,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) desc = "Just add water to make your very own hostile to everything space carp. It looks just like a plushie. The first person to squeeze it will be registered as its owner, who it will not attack. If no owner is registered, it'll just attack everyone." reference = "DSC" item = /obj/item/toy/plushie/carpplushie/dehy_carp - cost = 5 + cost = 4 // GRENADES AND EXPLOSIVES diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index da108abc6c50..bcb22243315e 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -244,6 +244,7 @@ item = /obj/item/dice/d20/e20 cost = 15 job = list("Librarian") + surplus = 0 //Botanist /datum/uplink_item/jobspecific/ambrosiacruciatus diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index 4c9a7c0f582b..cd7794592742 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -418,7 +418,6 @@ GLOBAL_LIST_EMPTY(bad_blocks) SE_original = SE.Copy() unique_enzymes = md5(character.real_name) - GLOB.reg_dna[unique_enzymes] = character.real_name // Hmm, I wonder how to go about this without a huge convention break /datum/dna/serialize() diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index f26761ea92a3..57cacf2c5251 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -1,6 +1,7 @@ #define LING_FAKEDEATH_TIME 50 SECONDS #define LING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob +// This list is basically a copy of GLOB.greek_letters, but it also removes letters when a changeling spawns in with that ID GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega")) /datum/game_mode diff --git a/code/game/gamemodes/cult/cult_mode.dm b/code/game/gamemodes/cult/cult_mode.dm index 045f08879553..86e8d4a82ff2 100644 --- a/code/game/gamemodes/cult/cult_mode.dm +++ b/code/game/gamemodes/cult/cult_mode.dm @@ -1,5 +1,3 @@ -GLOBAL_LIST_EMPTY(all_cults) - /datum/game_mode /// A list of all minds currently in the cult var/list/datum/mind/cult = list() diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 744fe5c66272..961fe5e48568 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -1,5 +1,4 @@ GLOBAL_LIST_EMPTY(sacrificed) // A mixed list of minds and mobs -GLOBAL_LIST_EMPTY(wall_runes) // A list of all cult shield walls GLOBAL_LIST_EMPTY(teleport_runes) // I'll give you two guesses /* @@ -290,7 +289,7 @@ structure_check() searches for nearby cultist structures required for the invoca // Offering a head/brain for(var/obj/item/organ/O in T) - var/mob/living/carbon/brain/b_mob + var/mob/living/brain/b_mob if(istype(O, /obj/item/organ/external/head)) // Offering a head var/obj/item/organ/external/head/H = O for(var/obj/item/organ/internal/brain/brain in H.contents) @@ -716,12 +715,10 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/wall/Initialize(mapload) . = ..() - GLOB.wall_runes += src B = new /obj/machinery/shield/cult/barrier(loc) B.parent_rune = src /obj/effect/rune/wall/Destroy() - GLOB.wall_runes -= src if(B && !QDELETED(B)) QDEL_NULL(B) return ..() diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm index 92ef8002b7fb..41d8aad47085 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction.dm @@ -47,7 +47,7 @@ /datum/game_mode/abduction/proc/make_abductor_team(team_number,preset_agent=null,preset_scientist=null) //Team Name - team_names[team_number] = "Mothership [pick(GLOB.possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names + team_names[team_number] = "Mothership [pick(GLOB.greek_letters)]" //TODO Ensure unique and actual alieny names //Team Objective var/datum/objective/experiment/team_objective = new team_objective.abductor_team_number = team_number diff --git a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm index 07a7735affa6..44be9000c319 100644 --- a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm +++ b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm @@ -441,7 +441,7 @@ to_chat(user, "You have already fully upgraded everything available!") return FALSE - var/raw_choice = show_radial_menu(user, isturf(user.loc) ? user : user.loc, upgrades, radius = 48) + var/raw_choice = show_radial_menu(user, user, upgrades, radius = 48) if(!raw_choice) return var/choice = splittext(raw_choice, " ")[1] diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 8720f8b98ed2..0c7b18507c8e 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -342,6 +342,8 @@ GLOBAL_VAR(bomb_set) /obj/machinery/nuclearbomb/attack_hand(mob/user as mob) if(!panel_open) return ui_interact(user) + if(!Adjacent(user)) + return if(removal_stage != NUKE_CORE_FULLY_EXPOSED || !core) return wires.Interact(user) if(timing) //removing the core is less risk then cutting wires, and doesnt take long, so we should not let crew do it while the nuke is armed. You can however get to it, without the special screwdriver, if you put the NAD in. diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index 6321edc44bcb..434059436730 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -94,7 +94,7 @@ L.ghostize() if(isbrain(L)) // diediedie - var/mob/living/carbon/brain/B = L + var/mob/living/brain/B = L if(isitem(B.loc)) qdel(B.loc) if(B && B.container) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index b75777018fcb..c63ce948f07f 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -302,6 +302,7 @@ name = "Remove Clothes Requirement" spell_type = /obj/effect/proc_holder/spell/noclothes category = "Assistance" + cost = 1 //Rituals /datum/spellbook_entry/summon diff --git a/code/game/jobs/job/engineering_jobs.dm b/code/game/jobs/job/engineering_jobs.dm index e3081f425b23..030e3f2d2a86 100644 --- a/code/game/jobs/job/engineering_jobs.dm +++ b/code/game/jobs/job/engineering_jobs.dm @@ -83,7 +83,7 @@ dufflebag = /obj/item/storage/backpack/duffel/engineering box = /obj/item/storage/box/engineer - +/datum/job/engineer/trainee // SS220 ADDITION - new jobs /datum/job/atmos title = "Life Support Specialist" diff --git a/code/game/jobs/job/medical_jobs.dm b/code/game/jobs/job/medical_jobs.dm index 3449f62a653a..38eb18540a7b 100644 --- a/code/game/jobs/job/medical_jobs.dm +++ b/code/game/jobs/job/medical_jobs.dm @@ -76,6 +76,8 @@ satchel = /obj/item/storage/backpack/satchel_med dufflebag = /obj/item/storage/backpack/duffel/medical +/datum/job/doctor/intern // SS220 ADDITION - new jobs + /datum/job/coroner title = "Coroner" flag = JOB_CORONER diff --git a/code/game/jobs/job/science_jobs.dm b/code/game/jobs/job/science_jobs.dm index d6e468418fce..e8c6fad99846 100644 --- a/code/game/jobs/job/science_jobs.dm +++ b/code/game/jobs/job/science_jobs.dm @@ -86,6 +86,7 @@ satchel = /obj/item/storage/backpack/satchel_tox dufflebag = /obj/item/storage/backpack/duffel/science +/datum/job/scientist/student // SS220 ADDITION - new jobs /datum/job/roboticist title = "Roboticist" diff --git a/code/game/jobs/job/security_jobs.dm b/code/game/jobs/job/security_jobs.dm index f7c1a83c16fc..a4875d44b420 100644 --- a/code/game/jobs/job/security_jobs.dm +++ b/code/game/jobs/job/security_jobs.dm @@ -197,3 +197,4 @@ satchel = /obj/item/storage/backpack/satchel_sec dufflebag = /obj/item/storage/backpack/duffel/security +/datum/job/officer/cadet // SS220 ADDITION - new jobs diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index 47b012eecffc..ca4071f4d6da 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -89,9 +89,9 @@ /datum/outfit/job/hop name = "Head of Personnel" jobtype = /datum/job/hop - uniform = /obj/item/clothing/under/rank/civilian/head_of_personnel + uniform = /obj/item/clothing/under/rank/civilian/hop shoes = /obj/item/clothing/shoes/brown - head = /obj/item/clothing/head/hopcap + head = /obj/item/clothing/head/hop glasses = /obj/item/clothing/glasses/hud/skills/sunglasses l_ear = /obj/item/radio/headset/heads/hop id = /obj/item/card/id/hop diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index 23b2d842bc75..45c9d0d556c7 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -14,9 +14,20 @@ if(NOT_SELECTABLE in S.species_traits) return FALSE + // SS220 EDIT START + // Yes if admin - if(check_rights(R_ADMIN, FALSE)) - return TRUE + //if(check_rights(R_ADMIN, FALSE)) + // return TRUE + + if(GLOB.configuration.species_whitelist.species_whitelist_enabled) + if(!M.client?.prefs?.species_whitelist) + return FALSE + + if(!(species in M.client.prefs.species_whitelist)) + return FALSE + + // SS220 EDIT END // No if species is blacklisted if(S.blacklisted) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 8fb9c54c26cd..981a4f3dedfa 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1206,7 +1206,7 @@ if(!user.unEquip(mmi_as_oc)) to_chat(user, "\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]") return FALSE - var/mob/living/carbon/brain/brainmob = mmi_as_oc.brainmob + var/mob/living/brain/brainmob = mmi_as_oc.brainmob brainmob.reset_perspective(src) occupant = brainmob brainmob.forceMove(src) //should allow relaymove @@ -1231,13 +1231,13 @@ /obj/mecha/proc/pilot_is_mmi() var/atom/movable/mob_container if(isbrain(occupant)) - var/mob/living/carbon/brain/brain = occupant + var/mob/living/brain/brain = occupant mob_container = brain.container if(istype(mob_container, /obj/item/mmi)) return 1 return 0 -/obj/mecha/proc/pilot_mmi_hud(mob/living/carbon/brain/pilot) +/obj/mecha/proc/pilot_mmi_hud(mob/living/brain/pilot) return /obj/mecha/Exited(atom/movable/M, atom/newloc) @@ -1258,7 +1258,7 @@ mob_container = occupant RemoveActions(occupant, human_occupant = 1) else if(isbrain(occupant)) - var/mob/living/carbon/brain/brain = occupant + var/mob/living/brain/brain = occupant RemoveActions(brain) mob_container = brain.container else if(isAI(occupant)) @@ -1560,7 +1560,7 @@ for(var/obj/item/mecha_parts/mecha_equipment/MT in equipment) if(!MT.selectable || selected == MT) continue - var/mutable_appearance/clean/MA = new(MT) + var/mutable_appearance/clean/MA = mutable_appearance(MT.icon, MT.icon_state, MT.layer, filters = MT.filters) choices[MT.name] = MA choices_to_refs[MT.name] = MT diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index 3fd3cf8742b0..05d1d5c38ced 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -38,7 +38,7 @@ A.remove_hud_from(H) builtin_hud_user = 0 else if((isbrain(occupant) || pilot_is_mmi()) && builtin_hud_user) - var/mob/living/carbon/brain/H = occupant + var/mob/living/brain/H = occupant var/datum/atom_hud/A = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED] A.remove_hud_from(H) builtin_hud_user = 0 diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 0edc1089bb4e..87e325634646 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -138,9 +138,11 @@ if(!in_range(user, src) || !isturf(user.loc) || user.incapacitated() || M.anchored) return FALSE - if(isguardian(user)) - if(M.loc == user.loc || user.alpha == 60) //Alpha is for detecting ranged guardians in scout mode - return //unmanifested guardians shouldn't be able to buckle mobs + if(isguardian(user) && (M.loc == user.loc || user.alpha == 60)) //Alpha is for detecting ranged guardians in scout mode + return //unmanifested guardians shouldn't be able to buckle mobs + + if(M != user && (!in_range(M, src) || !do_after(user, 1 SECONDS, target = M))) + return FALSE if(M != user && (!in_range(M, src) || !do_after(user, 1 SECONDS, target = M))) return FALSE diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index d049d275c932..c0213fe24e20 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -1,8 +1,6 @@ #define DRYING_TIME 5 * 60 * 10 //for 1 unit of depth in puddle (amount var) #define ALWAYS_IN_GRAVITY 2 -GLOBAL_LIST_EMPTY(splatter_cache) - /obj/effect/decal/cleanable/blood name = "blood" var/dryname = "dried blood" diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 3b5bb6c80dd3..9482984df034 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -24,17 +24,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp /obj/effect/landmark/lightsout name = "Electrical Storm Epicentre" -/obj/effect/landmark/awaystart - name = "awaystart" - icon = 'icons/effects/spawner_icons.dmi' - icon_state = "Assistant" - -INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away missions break - -/obj/effect/landmark/awaystart/Initialize(mapload) - GLOB.awaydestinations.Add(src) - return ..() - /obj/effect/landmark/spawner icon = 'icons/effects/spawner_icons.dmi' icon_state = "questionmark" diff --git a/code/game/objects/effects/meteors.dm b/code/game/objects/effects/meteors.dm index 2bfa9f094e81..ec519dfeca5f 100644 --- a/code/game/objects/effects/meteors.dm +++ b/code/game/objects/effects/meteors.dm @@ -13,8 +13,6 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(/obj/effect/meteor/medium = 3, /obj/ GLOBAL_LIST_INIT(meteors_gore, list(/obj/effect/meteor/meaty = 5, /obj/effect/meteor/meaty/xeno = 1)) //for meaty ore event -GLOBAL_LIST_INIT(meteors_dust, list(/obj/effect/meteor/dust)) //for space dust event - GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops @@ -364,8 +362,6 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops //Spookoween meteors ///////////////////////// -GLOBAL_LIST_INIT(meteorsSPOOKY, list(/obj/effect/meteor/pumpkin)) - /obj/effect/meteor/pumpkin name = "PUMPKING" desc = "THE PUMPKING'S COMING!" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 11a50e1c59bb..b42d0dfac594 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -274,6 +274,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( new /datum/stack_recipe("white shoes", /obj/item/clothing/shoes/white, 2), new /datum/stack_recipe("cloth footwraps", /obj/item/clothing/shoes/footwraps, 2), null, + new /datum/stack_recipe("cloth handwraps", /obj/item/clothing/gloves/handwraps, 2), new /datum/stack_recipe("fingerless gloves", /obj/item/clothing/gloves/fingerless, 1), new /datum/stack_recipe("white gloves", /obj/item/clothing/gloves/color/white, 3), new /datum/stack_recipe("white softcap", /obj/item/clothing/head/soft/mime, 2), diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm index 5a22b04df84f..60ec8bf0efc9 100644 --- a/code/game/objects/items/tools/welder.dm +++ b/code/game/objects/items/tools/welder.dm @@ -142,6 +142,8 @@ . = ..() if(!tool_enabled) return + if(!proximity || isturf(target)) // We don't want to take away fuel when we hit something far away + return remove_fuel(0.5) /obj/item/weldingtool/use_tool(atom/target, user, delay, amount, volume, datum/callback/extra_checks) diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index cd7881419356..e3e6b5d0b437 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -128,5 +128,10 @@ desc = "Not sticky anymore." throw_range = 1 +/obj/item/trash/popsicle_stick + name = "used popsicle stick" + icon_state = "popsicle_stick_s" + desc = "Still tastes sweet." + /obj/item/trash/attack(mob/M as mob, mob/living/user as mob) return diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 2d7130f1ca04..ae90f8b8ae2e 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -229,6 +229,8 @@ /obj/item/nullrod/sord name = "\improper UNREAL SORD" desc = "This thing is so unspeakably HOLY you are having a hard time even holding it." + lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' icon_state = "sord" item_state = "sord" slot_flags = SLOT_FLAG_BELT diff --git a/code/game/objects/items/weapons/misc_items.dm b/code/game/objects/items/weapons/misc_items.dm index 4a8642bc8c8e..e90c14664d05 100644 --- a/code/game/objects/items/weapons/misc_items.dm +++ b/code/game/objects/items/weapons/misc_items.dm @@ -14,6 +14,7 @@ Newton Cradle PAI cable Red Phone + Popsicle Sticks */ /obj/item/balltoy @@ -216,3 +217,9 @@ if(cooldown < world.time - 20) playsound(user.loc, 'sound/weapons/ring.ogg', 50, 1) cooldown = world.time + +/obj/item/popsicle_stick + name = "popsicle stick" + desc = "A small wooden stick, usually topped by popsicles or other frozen treats." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "popsicle_stick" diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm index 8c5f3034ab2e..009bed78c08e 100644 --- a/code/game/objects/items/weapons/soap.dm +++ b/code/game/objects/items/weapons/soap.dm @@ -2,7 +2,7 @@ name = "soap" desc = "A cheap bar of soap. Doesn't smell." gender = PLURAL - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/janitor.dmi' icon_state = "soap" lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi' @@ -106,6 +106,11 @@ icon_state = "soapdeluxe" cleanspeed = 40 //slightly better because deluxe -- captain gets one of these +/obj/item/soap/deluxe/laundry + name = "laundry soap" + desc = "Very cheap but effective soap. Dries out the skin." + icon_state = "soapsoviet" + /obj/item/soap/syndie desc = "An untrustworthy bar of soap made of strong chemical agents that dissolve blood faster." icon_state = "soapsyndie" diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 55fb990a6d29..2b0a631022af 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -132,8 +132,8 @@ new /obj/item/gun/projectile/revolver/capgun(src) /obj/item/storage/backpack/mime - name = "Parcel Parceaux" - desc = "A silent backpack made for those silent workers. Silence Co." + name = "Pierre the Panda" + desc = "A backpack modelled after Pierre the Panda - the official mascot for the Université du Mime." icon_state = "mimepack" item_state = "mimepack" diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index d3c5ea44ef64..f76156c129ce 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -52,14 +52,16 @@ desc = "A bag for storing extra clothes and shoes. This one belongs to the head of personnel." /obj/item/storage/bag/garment/head_of_personnel/populate_contents() - new /obj/item/clothing/head/hopcap(src) - new /obj/item/clothing/head/hopcap/beret(src) - new /obj/item/clothing/suit/mantle/armor/head_of_personnel(src) + new /obj/item/clothing/head/hop(src) + new /obj/item/clothing/head/hop/beret(src) + new /obj/item/clothing/suit/mantle/armor/hop(src) new /obj/item/clothing/suit/armor/vest(src) - new /obj/item/clothing/under/rank/civilian/head_of_personnel(src) - new /obj/item/clothing/under/rank/civilian/head_of_personnel/dress(src) - new /obj/item/clothing/under/rank/civilian/head_of_personnel/dress_hr(src) - new /obj/item/clothing/under/rank/civilian/head_of_personnel/oldman(src) + new /obj/item/clothing/suit/hopcoat(src) + new /obj/item/clothing/under/rank/civilian/hop(src) + new /obj/item/clothing/under/rank/civilian/hop/skirt(src) + new /obj/item/clothing/under/rank/civilian/hop/dress(src) + new /obj/item/clothing/under/rank/civilian/hop/formal(src) + new /obj/item/clothing/under/rank/civilian/hop/oldman(src) new /obj/item/clothing/under/suit/female(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/shoes/black(src) diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index ea0465ef39c7..c98fe5833907 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -201,3 +201,30 @@ locked = FALSE icon_state = icon_broken origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D. + +/obj/item/storage/lockbox/experimental_weapon + name = "A-113 classified lockbox" + desc = "Contains a classifed item for experimental purposes. Looks like some acid was spilt on it." + req_access = list(ACCESS_SEC_DOORS) //officers, heads + +/obj/item/storage/lockbox/experimental_weapon/populate_contents() + if(prob(10)) + new /obj/item/clothing/mask/facehugger(src) //Suprise! Storing facehuggers improperly is what lead to this mess. + return + var/spawn_type = pick(/obj/item/gun/energy/kinetic_accelerator/experimental, /obj/item/surveillance_upgrade, /obj/item/mod/module/stealth/ninja) + if(prob(25)) + if(rand(1, 6) == 1) //organ time. I want this to be more balanced in distribution, so organs are under a prob 25 + new /obj/item/organ/internal/alien/plasmavessel/drone(src) //Disected drone before the place got wiped. No hivenode. + new /obj/item/organ/internal/alien/acidgland(src) + new /obj/item/organ/internal/alien/resinspinner(src) + return + var/list/organ_loot = list( + /obj/item/organ/internal/cyberimp/arm/katana, + /obj/item/organ/internal/cyberimp/arm/toolset_abductor, + /obj/item/organ/internal/cyberimp/arm/esword, + /obj/item/organ/internal/heart/demon/pulse, + /obj/item/organ/internal/eyes/cybernetic/eyesofgod + ) + + spawn_type = pick(organ_loot) + new spawn_type(src) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index d38608a45eb8..8279b5151c23 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -69,7 +69,7 @@ return . += mutable_appearance(front_id.icon, front_id.icon_state) . += front_id.overlays - . += mutable_appearance(icon, "wallet_overlay") + . += mutable_appearance(icon, "[icon_state]_overlay") // SS220 EDIT // fuck yeah, ass photo in my wallet var/obj/item/photo/photo = locate(/obj/item/photo) in contents @@ -79,7 +79,7 @@ MA.pixel_x = 11 MA.pixel_y = 1 . += MA - . += mutable_appearance(icon, "photo_overlay") + . += mutable_appearance(icon, "[photo_overlay]_overlay") // SS220 EDIT /obj/item/storage/wallet/update_name(updates) . = ..() diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 1660d8a80136..f335db6ae370 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -108,6 +108,7 @@ var/w_class_on = WEIGHT_CLASS_BULKY armour_penetration_flat = 10 + armour_penetration_percentage = 50 origin_tech = "magnets=4;syndicate=5" attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") max_integrity = 200 @@ -574,7 +575,7 @@ icon_state = "singulohammer0" /obj/item/singularityhammer/proc/vortex(turf/pull, mob/wielder) - for(var/atom/movable/X in orange(5, pull)) + for(var/atom/movable/X in range(5, pull)) if(X.move_resist == INFINITY) continue if(X == wielder) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 02581d96f8d1..367d1c62648c 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -71,42 +71,32 @@ return FALSE var/blocking_object = density_check() if(blocking_object) - to_chat(user, "You cannot climb [src], as it is blocked by \a [blocking_object]!") + to_chat(user, "You cannot climb onto [src], as it is blocked by \a [blocking_object]!") return FALSE - var/turf/T = src.loc - if(!T || !istype(T)) return FALSE + if(!isturf(loc)) + return FALSE - climber = user - if(HAS_TRAIT(climber, TRAIT_TABLE_LEAP)) + if(HAS_TRAIT(user, TRAIT_TABLE_LEAP)) user.visible_message("[user] gets ready to vault up onto [src]!") if(!do_after(user, 0.5 SECONDS, target = src)) - climber = null return FALSE else user.visible_message("[user] starts climbing onto [src]!") if(!do_after(user, 5 SECONDS, target = src)) - climber = null return FALSE if(!can_touch(user) || !climbable) - climber = null return FALSE - var/old_loc = usr.loc - user.loc = get_turf(src) - user.Moved(old_loc, get_dir(old_loc, usr.loc), FALSE) + user.forceMove(get_turf(src)) if(get_turf(user) == get_turf(src)) - if(HAS_TRAIT(climber, TRAIT_TABLE_LEAP)) + if(HAS_TRAIT(user, TRAIT_TABLE_LEAP)) user.visible_message("[user] leaps up onto [src]!") else user.visible_message("[user] climbs onto [src]!") - climber = null - return TRUE - /obj/structure/proc/structure_shaken() - for(var/mob/living/M in get_turf(src)) if(IS_HORIZONTAL(M)) @@ -148,22 +138,21 @@ H.adjustBruteLoss(damage) H.UpdateDamageIcon() - return /obj/structure/proc/can_touch(mob/living/user) if(!istype(user)) - return 0 + return FALSE if(!Adjacent(user)) - return 0 + return FALSE if(user.restrained() || user.buckled) to_chat(user, "You need your hands and legs free for this.") - return 0 + return FALSE if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) - return 0 + return FALSE if(issilicon(user)) to_chat(user, "You need hands for this.") - return 0 - return 1 + return FALSE + return TRUE /obj/structure/examine(mob/user) . = ..() diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index e708d668425f..5826b53f95cf 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -118,6 +118,8 @@ /obj/structure/closet/wardrobe/xenos/populate_contents() new /obj/item/clothing/suit/unathi/mantle(src) new /obj/item/clothing/suit/unathi/robe(src) + new /obj/item/clothing/gloves/handwraps(src) + new /obj/item/clothing/gloves/handwraps(src) new /obj/item/clothing/shoes/sandal(src) new /obj/item/clothing/shoes/sandal(src) new /obj/item/clothing/shoes/sandal(src) diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index 58bd619686ca..27d1a9f40638 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -23,7 +23,7 @@ /obj/structure/spawner/lavaland/legion mob_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril) -GLOBAL_LIST_INIT(tendrils, list()) +GLOBAL_LIST_EMPTY(tendrils) /obj/structure/spawner/lavaland/Initialize(mapload) . = ..() diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 3fcffc31db13..428dae3e7203 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -74,7 +74,7 @@ var/obj/item/stack/tile/W = C if(!W.use(1)) return - ChangeTurf(W.turf_type, keep_icon = FALSE) + ChangeTurf(W.turf_type) playsound(src, 'sound/weapons/genhit.ogg', 50, 1) else to_chat(user, "This section is too damaged to support a tile! Use a welder to fix the damage.") diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index 9f1eff529c9c..21b37d58a74d 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -31,7 +31,7 @@ return if(forced || (confirm == "Yes")) - if(!forced && isAntag(src)) + if(!forced && isAntag(src) && !HAS_TRAIT(src, TRAIT_RESPAWNABLE)) confirm = alert("Are you absolutely sure? If you do this after you got converted/joined as an antagonist, you could face a jobban!", "Confirm Suicide", "Yes", "No") if(confirm == "Yes") suiciding = TRUE diff --git a/code/game/world.dm b/code/game/world.dm index 2fbd08764faa..3eb34e067be9 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -294,7 +294,10 @@ GLOBAL_LIST_EMPTY(world_topic_handlers) /world/Del() rustg_close_async_http_client() // Close the HTTP client. If you dont do this, youll get phantom threads which can crash DD from memory access violations disable_auxtools_debugger() // Disables the debugger if running. See above comment - rustg_redis_disconnect() // Disconnects the redis connection. See above. + + if(SSredis.connected) + rustg_redis_disconnect() // Disconnects the redis connection. See above. + #ifdef ENABLE_BYOND_TRACY CALL_EXT("prof.dll", "destroy")() // Setup Tracy integration #endif diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 9bb9212f81d2..637ddfeb4e82 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -814,7 +814,7 @@ GLOBAL_LIST_INIT(view_runtimes_verbs, list( if(!istype(H)) if(isbrain(H)) - var/mob/living/carbon/brain/B = H + var/mob/living/brain/B = H if(istype(B.container, /obj/item/mmi/robotic_brain/positronic)) var/obj/item/mmi/robotic_brain/positronic/C = B.container var/obj/item/organ/internal/brain/mmi_holder/posibrain/P = C.loc @@ -840,7 +840,7 @@ GLOBAL_LIST_INIT(view_runtimes_verbs, list( if(!istype(H)) if(isbrain(H)) - var/mob/living/carbon/brain/B = H + var/mob/living/brain/B = H if(istype(B.container, /obj/item/mmi/robotic_brain/positronic)) var/obj/item/mmi/robotic_brain/positronic/C = B.container var/obj/item/organ/internal/brain/mmi_holder/posibrain/P = C.loc diff --git a/code/modules/admin/misc_admin_procs.dm b/code/modules/admin/misc_admin_procs.dm index f6ccc2931ab3..fe951230dda7 100644 --- a/code/modules/admin/misc_admin_procs.dm +++ b/code/modules/admin/misc_admin_procs.dm @@ -118,7 +118,7 @@ GLOBAL_VAR_INIT(nologevent, 0) body += "Related accounts by IP: [jointext(M.client.related_accounts_ip, " - ")]

" if(M.ckey) - body += "Enabled AntagHUD: [M.has_ahudded() ? "TRUE" : "false"]
" + body += "Enabled AntagHUD: [M.has_ahudded() ? "TRUE" : "false"]
" body += "Roundstart observer: [M.is_roundstart_observer() ? "true" : "false"]
" body += "Kick | " body += "Ban | " diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 1d44235fc90a..40fb2ab3da75 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -1,6 +1,3 @@ -//This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE! -GLOBAL_LIST_INIT(adminhelp_ignored_words, list("unknown", "the", "a", "an", "of", "monkey", "alien", "as")) - /client/verb/adminhelp() set category = "Admin" set name = "Adminhelp" diff --git a/code/modules/admin/verbs/logging_view.dm b/code/modules/admin/verbs/logging_view.dm index cafaab8f1d7b..636378df1abb 100644 --- a/code/modules/admin/verbs/logging_view.dm +++ b/code/modules/admin/verbs/logging_view.dm @@ -1,4 +1,4 @@ -GLOBAL_LIST_INIT(open_logging_views, list()) +GLOBAL_LIST_EMPTY(open_logging_views) /client/proc/cmd_admin_open_logging_view() set category = "Admin" @@ -18,4 +18,4 @@ GLOBAL_LIST_INIT(open_logging_views, list()) cur_view.add_mobs(mobs_to_add) cur_view.show_ui(usr) - + diff --git a/code/modules/antagonists/changeling/powers/become_headslug.dm b/code/modules/antagonists/changeling/powers/become_headslug.dm index 6e8f8aa282b5..ee8103520490 100644 --- a/code/modules/antagonists/changeling/powers/become_headslug.dm +++ b/code/modules/antagonists/changeling/powers/become_headslug.dm @@ -6,6 +6,8 @@ chemical_cost = 20 dna_cost = 2 req_human = TRUE + req_stat = DEAD + bypass_fake_death = TRUE power_type = CHANGELING_PURCHASABLE_POWER menu_location = CLING_MENU_DEFENSE diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 11b4ebbe98ef..50d92248b8bf 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -16,6 +16,8 @@ var/silent = FALSE var/weapon_type var/weapon_name_simple + /// How much does the chemical recharge rate get reduced by having this weapon out? + var/recharge_slowdown /datum/action/changeling/weapon/try_to_sting(mob/user, mob/target) if(istype(user.l_hand, weapon_type) || istype(user.r_hand, weapon_type)) @@ -30,8 +32,10 @@ return FALSE var/obj/item/W = new weapon_type(user, silent, src) user.put_in_hands(W) + cling.chem_recharge_slowdown += recharge_slowdown RegisterSignal(user, COMSIG_MOB_WILLINGLY_DROP, PROC_REF(retract), override = TRUE) RegisterSignal(user, COMSIG_MOB_WEAPON_APPEARS, PROC_REF(retract), override = TRUE) + playsound(owner.loc, 'sound/effects/bone_break_1.ogg', 100, TRUE) return W /datum/action/changeling/weapon/proc/retract(atom/target, any_hand = FALSE) @@ -50,7 +54,9 @@ owner.update_inv_r_hand() done = TRUE if(done && !silent) + playsound(owner.loc, 'sound/effects/bone_break_2.ogg', 100, TRUE) owner.visible_message("With a sickening crunch, [owner] reforms [owner.p_their()] [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "You hear organic matter ripping and tearing!") + cling.chem_recharge_slowdown -= recharge_slowdown // We handle this here because more things can retract without going through try_to_sting //Parent to space suits and armor. /datum/action/changeling/suit @@ -73,6 +79,7 @@ var/mob/living/carbon/human/H = user if(istype(H.wear_suit, suit_type) || istype(H.head, helmet_type)) H.visible_message("[H] casts off [H.p_their()] [suit_name_simple]!", "We cast off our [suit_name_simple].", "You hear the organic matter ripping and tearing!") + playsound(owner.loc, 'sound/effects/bone_break_2.ogg', 100, TRUE) qdel(H.wear_suit) qdel(H.head) H.update_inv_wear_suit() @@ -112,20 +119,22 @@ \***************************************/ /datum/action/changeling/weapon/arm_blade name = "Arm Blade" - desc = "We reform one of our arms into a deadly blade. Costs 25 chemicals." + desc = "We reform one of our arms into a deadly blade. Costs 15 chemicals." helptext = "We may retract our armblade in the same manner as we form it. Cannot be used while in lesser form." button_icon_state = "armblade" - chemical_cost = 25 + chemical_cost = 15 dna_cost = 4 req_human = TRUE weapon_type = /obj/item/melee/arm_blade weapon_name_simple = "blade" power_type = CHANGELING_PURCHASABLE_POWER menu_location = CLING_MENU_ATTACK + recharge_slowdown = 0.75 /obj/item/melee/arm_blade name = "arm blade" desc = "A grotesque blade made of bone and flesh that cleaves through people like a hot knife through butter." + hitsound = 'sound/weapons/armblade.ogg' icon_state = "arm_blade" item_state = "arm_blade" flags = ABSTRACT | NODROP | DROPDEL @@ -215,6 +224,7 @@ if(ismob(loc)) if(!silent) loc.visible_message("[loc.name]\'s arm starts stretching inhumanly!", "Our arm twists and mutates, transforming it into a tentacle.", "You hear organic matter ripping and tearing!") + playsound(loc, 'sound/effects/bone_break_1.ogg', 100, TRUE) else to_chat(loc, "You prepare to extend a tentacle.") @@ -223,6 +233,7 @@ parent_action.UnregisterSignal(parent_action.owner, COMSIG_MOB_WILLINGLY_DROP) parent_action.UnregisterSignal(parent_action.owner, COMSIG_MOB_WEAPON_APPEARS) parent_action = null + playsound(loc, 'sound/effects/bone_break_2.ogg', 100, TRUE) return ..() /obj/item/gun/magic/tentacle/shoot_with_empty_chamber(mob/living/user as mob|obj) @@ -409,12 +420,14 @@ AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = ALL_ATTACK_TYPES) if(ismob(loc)) loc.visible_message("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "You hear organic matter ripping and tearing!") + playsound(loc, 'sound/effects/bone_break_1.ogg', 100, TRUE) /obj/item/shield/changeling/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(remaining_uses < 1) if(ishuman(loc)) var/mob/living/carbon/human/H = loc H.visible_message("With a sickening crunch, [H] reforms [H.p_their()] shield into an arm!", "We assimilate our shield into our body", "[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!", "We harden our flesh, creating a suit of armor!", "You hear organic matter ripping and tearing!") + playsound(loc, 'sound/effects/bone_break_1.ogg', 100, TRUE) /obj/item/clothing/suit/armor/changeling/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text, final_block_chance, damage) . = ..() diff --git a/code/modules/antagonists/changeling/powers/shriek.dm b/code/modules/antagonists/changeling/powers/shriek.dm index 0c2f393a4989..f0c843b0aab5 100644 --- a/code/modules/antagonists/changeling/powers/shriek.dm +++ b/code/modules/antagonists/changeling/powers/shriek.dm @@ -24,7 +24,7 @@ M.AdjustConfused(40 SECONDS) M.Jitter(100 SECONDS) else - SEND_SOUND(M, sound('sound/effects/screech.ogg')) + SEND_SOUND(M, sound('sound/effects/clingscream.ogg')) if(issilicon(M)) SEND_SOUND(M, sound('sound/weapons/flash.ogg')) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index fb0eb2397277..b2e2fe1fa82f 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -92,7 +92,7 @@ */ /datum/antagonist/traitor/proc/forge_human_objectives() // Hijack objective. - if(prob(10) && !(locate(/datum/objective/hijack) in owner.get_all_objectives())) + if(prob(2) && !(locate(/datum/objective/hijack) in owner.get_all_objectives())) // SS220 EDIT prob(10 -> 2) add_antag_objective(/datum/objective/hijack) return // Hijack should be their only objective (normally), so return. diff --git a/code/modules/arcade/prize_datums.dm b/code/modules/arcade/prize_datums.dm index c7d027bf4d00..d24cd4aaf894 100644 --- a/code/modules/arcade/prize_datums.dm +++ b/code/modules/arcade/prize_datums.dm @@ -19,11 +19,11 @@ GLOBAL_DATUM_INIT(global_prizes, /datum/prizes, new()) if(prize_counter.tickets >= item.cost) new item.typepath(prize_counter.loc) prize_counter.tickets -= item.cost - prize_counter.visible_message("Enjoy your prize!") - return 1 + to_chat(usr, "Enjoy your prize!") + return TRUE else - prize_counter.visible_message("Not enough tickets!") - return 0 + to_chat(usr, "Not enough tickets!") + return FALSE ////////////////////////////////////// // prize_item datum // diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm index 4a385be49a81..4bcce55dd21b 100644 --- a/code/modules/atmospherics/machinery/datum_pipeline.dm +++ b/code/modules/atmospherics/machinery/datum_pipeline.dm @@ -28,8 +28,6 @@ reconcile_air() return -GLOBAL_VAR_INIT(pipenetwarnings, 10) - /datum/pipeline/proc/build_pipeline(obj/machinery/atmospherics/base) var/volume = 0 if(istype(base, /obj/machinery/atmospherics/pipe)) diff --git a/code/modules/client/preference/link_processing.dm b/code/modules/client/preference/link_processing.dm index 8e40b5637ab6..9400cb7438af 100644 --- a/code/modules/client/preference/link_processing.dm +++ b/code/modules/client/preference/link_processing.dm @@ -669,14 +669,7 @@ active_character.s_tone = 35 - max(min(round(new_s_tone), 220), 1) else if(S.bodyflags & HAS_ICON_SKIN_TONE) var/const/MAX_LINE_ENTRIES = 4 - var/prompt = "Choose your character's skin tone: 1-[S.icon_skin_tones.len]\n(" - for(var/i = 1 to S.icon_skin_tones.len) - if(i > MAX_LINE_ENTRIES && !((i - 1) % MAX_LINE_ENTRIES)) - prompt += "\n" - prompt += "[i] = [S.icon_skin_tones[i]]" - if(i != S.icon_skin_tones.len) - prompt += ", " - prompt += ")" + var/prompt = "Choose your character's skin tone: 1-[length(S.icon_skin_tones)]\n(Light to Dark)" var/skin_c = input(user, prompt, "Character Preference") as num|null if(isnum(skin_c)) active_character.s_tone = max(min(round(skin_c), S.icon_skin_tones.len), 1) diff --git a/code/modules/client/preference/loadout/gear_tweaks.dm b/code/modules/client/preference/loadout/gear_tweaks.dm index d462cc1f342d..2dbda39a9268 100644 --- a/code/modules/client/preference/loadout/gear_tweaks.dm +++ b/code/modules/client/preference/loadout/gear_tweaks.dm @@ -16,7 +16,6 @@ /* * Color adjustment */ -GLOBAL_DATUM_INIT(gear_tweak_free_color_choice, /datum/gear_tweak/color, new()) /datum/gear_tweak/color var/list/valid_colors diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm index a6ae08ea13e5..f9fe14a95703 100644 --- a/code/modules/client/preference/loadout/loadout_general.dm +++ b/code/modules/client/preference/loadout/loadout_general.dm @@ -93,40 +93,6 @@ display_name = "Shark plushie" path = /obj/item/toy/plushie/shark -/datum/gear/goggles - display_name = "Goggles" - path = /obj/item/clothing/glasses/goggles - -/datum/gear/sechud - display_name = "Classic security HUD" - path = /obj/item/clothing/glasses/hud/security - allowed_roles = list("Head of Security", "Warden", "Security Officer", "Internal Affairs Agent","Magistrate") - -/datum/gear/sechudgoggles - display_name = "Security HUD goggles" - path = /obj/item/clothing/glasses/hud/security/goggles - allowed_roles = list("Head of Security", "Warden", "Security Officer", "Internal Affairs Agent", "Magistrate") - -/datum/gear/medhudgoggles - display_name = "Health HUD goggles" - path = /obj/item/clothing/glasses/hud/health/goggles - allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Chemist", "Geneticist", "Virologist", "Psychiatrist", "Paramedic") - -/datum/gear/diaghudgoggles - display_name = "Diagnostic HUD goggles" - path = /obj/item/clothing/glasses/hud/diagnostic/goggles - allowed_roles = list("Research Director", "Scientist", "Roboticist") - -/datum/gear/hydrohudgoggles - display_name = "Hydroponic HUD goggles" - path = /obj/item/clothing/glasses/hud/hydroponic/goggles - allowed_roles = list("Botanist") - -/datum/gear/skillhudgoggles - display_name = "Skill HUD goggles" - path = /obj/item/clothing/glasses/hud/skills/goggles - allowed_roles = list("Psychiatrist", "Nanotrasen Representative", "Head of Personnel", "Captain") - /datum/gear/cryaonbox display_name = "Box of crayons" path = /obj/item/storage/fancy/crayons diff --git a/code/modules/client/preference/loadout/loadout_glasses.dm b/code/modules/client/preference/loadout/loadout_glasses.dm index 1eec9f19af36..c6188f314642 100644 --- a/code/modules/client/preference/loadout/loadout_glasses.dm +++ b/code/modules/client/preference/loadout/loadout_glasses.dm @@ -35,3 +35,41 @@ /datum/gear/glasses/prescription display_name = "Prescription glasses" path = /obj/item/clothing/glasses/regular + +/datum/gear/glasses/sechud + display_name = "Classic security HUD" + path = /obj/item/clothing/glasses/hud/security + allowed_roles = list("Head of Security", "Warden", "Security Officer", "Internal Affairs Agent","Magistrate") + +/datum/gear/glasses/goggles + display_name = "Goggles" + path = /obj/item/clothing/glasses/goggles + +/datum/gear/glasses/goggles_job + main_typepath = /datum/gear/glasses/goggles_job + subtype_selection_cost = FALSE + +/datum/gear/glasses/goggles_job/sechudgoggles + display_name = "Security HUD goggles" + path = /obj/item/clothing/glasses/hud/security/goggles + allowed_roles = list("Head of Security", "Warden", "Security Officer", "Internal Affairs Agent", "Magistrate") + +/datum/gear/glasses/goggles_job/medhudgoggles + display_name = "Health HUD goggles" + path = /obj/item/clothing/glasses/hud/health/goggles + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Chemist", "Geneticist", "Virologist", "Psychiatrist", "Paramedic") + +/datum/gear/glasses/goggles_job/diaghudgoggles + display_name = "Diagnostic HUD goggles" + path = /obj/item/clothing/glasses/hud/diagnostic/goggles + allowed_roles = list("Research Director", "Scientist", "Roboticist") + +/datum/gear/glasses/goggles_job/hydrohudgoggles + display_name = "Hydroponic HUD goggles" + path = /obj/item/clothing/glasses/hud/hydroponic/goggles + allowed_roles = list("Botanist") + +/datum/gear/glasses/goggles_job/skillhudgoggles + display_name = "Skill HUD goggles" + path = /obj/item/clothing/glasses/hud/skills/goggles + allowed_roles = list("Psychiatrist", "Nanotrasen Representative", "Head of Personnel", "Captain") diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 06929b6311ed..828e88d0992b 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -179,7 +179,7 @@ /datum/gear/hat/beret_job/hop display_name = "Beret, head of personnel" - path = /obj/item/clothing/head/hopcap/beret + path = /obj/item/clothing/head/hop/beret allowed_roles = list("Head of Personnel") /datum/gear/hat/beret_job/sci diff --git a/code/modules/client/preference/loadout/loadout_racial.dm b/code/modules/client/preference/loadout/loadout_racial.dm index d8a669572b74..ba6ed7bec30b 100644 --- a/code/modules/client/preference/loadout/loadout_racial.dm +++ b/code/modules/client/preference/loadout/loadout_racial.dm @@ -59,6 +59,11 @@ path = /obj/item/clothing/shoes/footwraps slot = SLOT_HUD_SHOES +/datum/gear/racial/handwraps + display_name = "Cloth handwraps" + path = /obj/item/clothing/gloves/handwraps + slot = SLOT_HUD_GLOVES + /datum/gear/racial/vox_casual display_name = "Vox jumpsuit" description = "These loose clothes are optimized for the labors of the lower castes onboard the arkships. Large openings in the top allow for breathability while the pants are durable yet flexible enough to not restrict movement." diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index 6de3e2dd9fee..9c01e17cac97 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -251,7 +251,7 @@ /datum/gear/suit/mantle/job/hop display_name = "Mantle, head of personnel" - path = /obj/item/clothing/suit/mantle/armor/head_of_personnel + path = /obj/item/clothing/suit/mantle/armor/hop allowed_roles = list("Head of Personnel") /datum/gear/suit/mantle/job/rd diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 0de18c3d4b03..b377d517e2bd 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -203,6 +203,11 @@ path = /obj/item/clothing/under/rank/security/head_of_security/skirt allowed_roles = list("Head of Security") +/datum/gear/uniform/skirt/job/head_of_personnel + display_name = "Skirt, hop" + path = /obj/item/clothing/under/rank/civilian/hop/skirt + allowed_roles = list("Head of Personnel") + /datum/gear/uniform/skirt/job/magistrate display_name = "Skirt, magistrate" path = /obj/item/clothing/under/rank/procedure/magistrate/skirt diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 5501bbdce796..3ec58f7a7691 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -391,6 +391,11 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts dat += "Socks: [active_character.socks]
" dat += "Backpack Type: [active_character.backbag]
" + var/datum/species/myspecies = GLOB.all_species[active_character.species] + if(!isnull(myspecies)) + dat += "

Species Information

" + dat += "
Species Description: [myspecies.blurb]
" + dat += "" if(TAB_GAME) // General Preferences diff --git a/code/modules/client/preference/preferences_spawnpoints.dm b/code/modules/client/preference/preferences_spawnpoints.dm deleted file mode 100644 index 0fd960e9ff82..000000000000 --- a/code/modules/client/preference/preferences_spawnpoints.dm +++ /dev/null @@ -1,20 +0,0 @@ -GLOBAL_LIST_EMPTY(spawntypes) - -/proc/populate_spawn_points() - // GLOB.spawntypes = list() | This is already done, is it not - for(var/type in subtypesof(/datum/spawnpoint)) - var/datum/spawnpoint/S = new type() - GLOB.spawntypes[S.display_name] = S - -/datum/spawnpoint - var/msg //Message to display on the arrivals computer. - var/list/turfs //List of turfs to spawn on. - var/display_name //Name used in preference setup. - -/datum/spawnpoint/arrivals - display_name = "Arrivals Shuttle" - msg = "has arrived on the station" - -/datum/spawnpoint/arrivals/New() - ..() - turfs = GLOB.latejoin diff --git a/code/modules/clothing/gloves/misc_gloves.dm b/code/modules/clothing/gloves/misc_gloves.dm index 48f789ba8dc8..8ccbd2546f86 100644 --- a/code/modules/clothing/gloves/misc_gloves.dm +++ b/code/modules/clothing/gloves/misc_gloves.dm @@ -80,6 +80,14 @@ resistance_flags = NONE armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 115, ACID = 20) +/obj/item/clothing/gloves/handwraps + name = "cloth handwraps" + desc = "A roll of treated canvas used for wrapping claws or paws." + icon_state = "clothwrap" + item_state = "clothwrap" + transfer_prints = TRUE + clipped = TRUE + /obj/item/clothing/gloves/batmangloves name = "batgloves" desc = "Used for handling all things bat related." diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm index 5761dfdcbeff..3641624520c1 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/code/modules/clothing/head/job_hats.dm @@ -50,17 +50,23 @@ icon_state = "captain_beret_white" //Head of Personnel -/obj/item/clothing/head/hopcap +/obj/item/clothing/head/hop name = "head of personnel's cap" icon_state = "hopcap" desc = "The symbol of true bureaucratic micromanagement." armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50) dog_fashion = /datum/dog_fashion/head/hop + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' + ) -/obj/item/clothing/head/hopcap/beret +/obj/item/clothing/head/hop/beret name = "head of personnel's beret" desc = "For doing paperwork with style." - icon_state = "hop_beret" + icon_state = "beret_hop" + dog_fashion = /datum/dog_fashion/head/hop sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi', "Drask" = 'icons/mob/clothing/species/drask/head.dmi', diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm index 21ff3ad54fe3..c53a3982043d 100644 --- a/code/modules/clothing/shoes/misc_shoes.dm +++ b/code/modules/clothing/shoes/misc_shoes.dm @@ -134,6 +134,8 @@ /obj/item/clothing/shoes/clown_shoes/slippers/proc/slide_one(mob/living/user, progress, prev_dir , prev_flags) user.dir = prev_dir step(user, user.dir) + for(var/mob/living/carbon/crossed in user.loc) + crossed.slip(src, 16 SECONDS, 0, FALSE, TRUE, "trip") if(progress == slide_distance) user.stand_up() user.pass_flags = prev_flags diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm index 0984dc2c3478..81da15db9d6e 100644 --- a/code/modules/clothing/suits/job_suits.dm +++ b/code/modules/clothing/suits/job_suits.dm @@ -259,13 +259,26 @@ resistance_flags = NONE //Head of Personnel -/obj/item/clothing/suit/mantle/armor/head_of_personnel +/obj/item/clothing/suit/mantle/armor/hop name = "head of personnel's shawl" desc = "An armored shawl for the head of personnel. It's remarkably well kept." icon_state = "hopmantle" item_state = "hopmantle" armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50) +/obj/item/clothing/suit/hopcoat + name = "head of personnel's coat" + desc = "A big coat for the Head of Personnel who wants to make a fashion statement. Has armour woven within the fabric." + icon_state = "hopcoat" + item_state = "hopcoat" + armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50) + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi' + ) + //Dignitaries /obj/item/clothing/suit/storage/ntrep name = "\improper Nanotrasen Representative jacket" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index ad4d59225f1d..3c91205d81ec 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -5,42 +5,48 @@ "Human" = 'icons/mob/clothing/under/civilian.dmi', "Vox" = 'icons/mob/clothing/species/vox/under/civilian.dmi', "Drask" = 'icons/mob/clothing/species/drask/under/civilian.dmi', - "Grey" = 'icons/mob/clothing/species/grey/under/civilian.dmi' + "Grey" = 'icons/mob/clothing/species/grey/under/civilian.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/under/civilian.dmi' ) -/obj/item/clothing/under/rank/civilian/head_of_personnel - desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"." +/obj/item/clothing/under/rank/civilian/hop name = "head of personnel's jumpsuit" + desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"." icon_state = "hop" - item_state = "b_suit" item_color = "hop" -/obj/item/clothing/under/rank/civilian/head_of_personnel/dress +/obj/item/clothing/under/rank/civilian/hop/skirt + name = "head of personnel's jumpskirt" + desc = "It's a jumpskirt worn by someone who works in the position of \"Head of Personnel\"." + icon_state = "hop_skirt" + item_color = "hop_skirt" + +/obj/item/clothing/under/rank/civilian/hop/dress name = "head of personnel's dress uniform" desc = "Feminine fashion for the style conscious Head of Personnel." - icon_state = "dress_hop" - item_color = "dress_hop" + icon_state = "hop_dress" + item_color = "hop_dress" -/obj/item/clothing/under/rank/civilian/head_of_personnel_whimsy - desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does." +/obj/item/clothing/under/rank/civilian/hop/formal + name = "head of personnel's formal uniform" + desc = "A stylish choice for a formal occasion." + icon_state = "hop_formal" + item_color = "hop_formal" + +/obj/item/clothing/under/rank/civilian/hop/whimsy name = "head of personnel's suit" - icon_state = "hopwhimsy" - item_state = "hopwhimsy" - item_color = "hopwhimsy" + desc = "A blue sweater and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does." + icon_state = "hop_whimsy" + item_state = "hop_whimsy" + item_color = "hop_whimsy" -/obj/item/clothing/under/rank/civilian/head_of_personnel/oldman +/obj/item/clothing/under/rank/civilian/hop/oldman name = "old man's suit" desc = "A classic suit for the older gentleman with built in back support." icon_state = "oldman" item_state = "oldman" item_color = "oldman" -/obj/item/clothing/under/rank/civilian/head_of_personnel/dress_hr - name = "human resources director's uniform" - desc = "Superior class for the nosy H.R. Director." - icon_state = "huresource" - item_color = "huresource" - /obj/item/clothing/under/rank/civilian/bartender desc = "It looks like it could use some more flair." name = "bartender's uniform" diff --git a/code/modules/events/blob/blob_structures/blob_core.dm b/code/modules/events/blob/blob_structures/blob_core.dm index d31be32c6c7a..4d1f4f8a784b 100644 --- a/code/modules/events/blob/blob_structures/blob_core.dm +++ b/code/modules/events/blob/blob_structures/blob_core.dm @@ -14,7 +14,6 @@ /obj/structure/blob/core/Initialize(mapload, client/new_overmind = null, new_rate = 2, offspring) . = ..() - GLOB.blob_cores += src START_PROCESSING(SSobj, src) GLOB.poi_list |= src adjustcolors(color) //so it atleast appears @@ -38,7 +37,6 @@ /obj/structure/blob/core/Destroy() - GLOB.blob_cores -= src if(overmind) overmind.blob_core = null overmind = null diff --git a/code/modules/events/blob/theblob.dm b/code/modules/events/blob/theblob.dm index 5fa597f3d280..5faa9464cae1 100644 --- a/code/modules/events/blob/theblob.dm +++ b/code/modules/events/blob/theblob.dm @@ -1,7 +1,6 @@ //I will need to recode parts of this but I am way too tired atm GLOBAL_LIST_EMPTY(blobs) -GLOBAL_LIST_EMPTY(blob_cores) GLOBAL_LIST_EMPTY(blob_nodes) /obj/structure/blob diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index cfe58e22ba6d..bcdee1f840ea 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -1,5 +1,3 @@ -GLOBAL_VAR_INIT(sent_spiders_to_station, 0) - /datum/event/spider_infestation announceWhen = 400 var/spawncount = 1 @@ -8,7 +6,6 @@ GLOBAL_VAR_INIT(sent_spiders_to_station, 0) /datum/event/spider_infestation/setup() announceWhen = rand(announceWhen, announceWhen + 50) spawncount = round(num_players() * 0.8) - GLOB.sent_spiders_to_station = 1 /datum/event/spider_infestation/announce(false_alarm) if(successSpawn || false_alarm) diff --git a/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm b/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm index 2717379ec4db..5f13f5938929 100644 --- a/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm +++ b/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm @@ -56,7 +56,7 @@ There is no excuse to do this wrong now that there is an example for you. --Fals description = "Creamy, smooth flavor, just like the bald heads of the masses. Supposedly aged for 30 years." ingredients = list(/obj/item/reagent_containers/food/drinks/cans/cola, /obj/item/reagent_containers/food/snacks/grown/sugarcane, - /obj/item/reagent_containers/food/snacks/icecream) + /obj/item/reagent_containers/food/snacks/frozen/icecream) result = "blackeye_brew" /datum/bottler_recipe/Grape_Granade diff --git a/code/modules/food_and_drinks/food/foods/desserts.dm b/code/modules/food_and_drinks/food/foods/desserts.dm index efb685f45f10..692c8c06208b 100644 --- a/code/modules/food_and_drinks/food/foods/desserts.dm +++ b/code/modules/food_and_drinks/food/foods/desserts.dm @@ -1,60 +1,3 @@ - -////////////////////// -// Ice Cream // -////////////////////// - -/obj/item/reagent_containers/food/snacks/icecream - name = "ice cream" - desc = "Delicious ice cream." - icon = 'icons/obj/kitchen.dmi' - icon_state = "icecream_cone" - bitesize = 3 - list_reagents = list("nutriment" = 1, "sugar" = 1) - tastes = list("ice cream" = 1) - -/obj/item/reagent_containers/food/snacks/icecream/Initialize(mapload) - . = ..() - update_icon(UPDATE_OVERLAYS) - -/obj/item/reagent_containers/food/snacks/icecream/update_overlays() - . = ..() - var/mutable_appearance/filling = mutable_appearance('icons/obj/kitchen.dmi', "icecream_color") - var/list/reagent_colors = rgb2num(mix_color_from_reagents(reagents.reagent_list), COLORSPACE_HSV) //switching to HSV colorspace lets us easily manipulate the saturation and brightness independently - //Clamping the brightness keeps us from having greyish ice cream while still alowing for a range of colours - filling.color = rgb(reagent_colors[1], ((1.5 * reagent_colors[2]) - 10), (clamp(reagent_colors[3], 85, 100) - 10), space = COLORSPACE_HSV) - . += filling - -/obj/item/reagent_containers/food/snacks/icecream/icecreamcone - name = "ice cream cone" - desc = "Delicious ice cream." - icon_state = "icecream_cone" - volume = 50 - bitesize = 3 - list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2) - -/obj/item/reagent_containers/food/snacks/icecream/wafflecone - name = "ice cream in a waffle cone" - desc = "Delicious ice cream." - icon_state = "icecream_cone_waffle" - volume = 50 - bitesize = 3 - list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2) - -/obj/item/reagent_containers/food/snacks/icecream/icecreamcup - name = "chocolate ice cream cone" - desc = "Delicious ice cream." - icon_state = "icecream_cone_chocolate" - volume = 50 - bitesize = 3 - list_reagents = list("nutriment" = 5, "chocolate" = 8, "ice" = 2) - -/obj/item/reagent_containers/food/snacks/icecreamsandwich - name = "icecream sandwich" - desc = "Portable ice cream in its own packaging." - icon_state = "icecreamsandwich" - list_reagents = list("nutriment" = 2, "ice" = 2) - - ////////////////////// // Misc // ////////////////////// diff --git a/code/modules/food_and_drinks/food/foods/frozen.dm b/code/modules/food_and_drinks/food/foods/frozen.dm new file mode 100644 index 000000000000..d9c790827b77 --- /dev/null +++ b/code/modules/food_and_drinks/food/foods/frozen.dm @@ -0,0 +1,335 @@ + +////////////////////////////// +// Frozen Treats // +////////////////////////////// + +//Abstract item for inheritence. + +/obj/item/reagent_containers/food/snacks/frozen + name = "frozen treat" + desc = "If you got this, something broke! Contact a coder if this somehow spawns." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "flavorless_sc" + +/obj/item/reagent_containers/food/snacks/sliceable/clowncake + name = "clown cake" + desc = "A funny cake with a clown face on it." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "clowncake" + slice_path = /obj/item/reagent_containers/food/snacks/frozen/clowncakeslice + list_reagents = list("nutriment" = 20, "sugar" = 5, "vitamin" = 5, "banana" = 15) + tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/clowncakeslice + name = "clown cake slice" + desc = "A slice of bad jokes, and silly props." + icon_state = "clowncake_slice" + trash = /obj/item/trash/plate + filling_color = "#FFD675" + list_reagents = list("nutriment" = 4, "sugar" = 1, "vitamin" = 1, "banana" = 3) + tastes = list("cake" = 5, "sweetness" = 2, "sad clowns" = 1, "ice-cream" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/sundae + name = "sundae" + desc = "Portable ice cream in its own packaging." + icon_state = "sundae" + list_reagents = list("nutriment" = 2, "ice" = 2) + tastes = list("ice cream" = 1, "banana" = 1) + +/////////////////// +// Ice Cream // +////////////////// + +/obj/item/reagent_containers/food/snacks/frozen/icecream + name = "ice cream" + desc = "Delicious ice cream." + icon_state = "icecream_cone" + bitesize = 3 + list_reagents = list("nutriment" = 1, "sugar" = 1) + tastes = list("ice cream" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/icecream/Initialize(mapload) + . = ..() + update_icon(UPDATE_OVERLAYS) + +/obj/item/reagent_containers/food/snacks/frozen/icecream/update_overlays() + . = ..() + var/mutable_appearance/filling = mutable_appearance('icons/obj/food/frozen_treats.dmi', "icecream_color") + var/list/reagent_colors = rgb2num(mix_color_from_reagents(reagents.reagent_list), COLORSPACE_HSV) //switching to HSV colorspace lets us easily manipulate the saturation and brightness independently + //Clamping the brightness keeps us from having greyish ice cream while still alowing for a range of colours + filling.color = rgb(reagent_colors[1], ((1.5 * reagent_colors[2]) - 10), (clamp(reagent_colors[3], 85, 100) - 10), space = COLORSPACE_HSV) + . += filling + +/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone + name = "ice cream cone" + desc = "Delicious ice cream." + icon_state = "icecream_cone" + volume = 50 + bitesize = 3 + list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2) + +/obj/item/reagent_containers/food/snacks/frozen/icecream/wafflecone + name = "ice cream in a waffle cone" + desc = "Delicious ice cream." + icon_state = "icecream_cone_waffle" + volume = 50 + bitesize = 3 + list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2) + +/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcup + name = "chocolate ice cream cone" + desc = "Delicious ice cream." + icon_state = "icecream_cone_chocolate" + volume = 50 + bitesize = 3 + list_reagents = list("nutriment" = 5, "chocolate" = 8, "ice" = 2) + +/obj/item/reagent_containers/food/snacks/wafflecone + name = "waffle cone" + desc = "Delicious waffle cone, but no ice cream." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "icecream_cone_waffle" + list_reagents = list("nutriment" = 5) + tastes = list("cream" = 2, "waffle" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich + name = "icecream sandwich" + desc = "Portable ice cream in its own packaging." + icon_state = "icecreamsandwich" + list_reagents = list("nutriment" = 2, "ice" = 2) + tastes = list("ice cream" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/berryicecreamsandwich + name = "strawberry icecream sandwich" + desc = "Portable ice cream in its own packaging." + icon_state = "strawberryicecreamsandwich" + list_reagents = list("nutriment" = 2, "ice" = 2) + tastes = list("ice cream" = 1, "strawberry" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/sundae + name = "sundae" + desc = "A classic dessert." + icon_state = "sundae" + list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2) + tastes = list("ice cream" = 1, "banana" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/honkdae + name = "honkdae" + desc = "The clown's favorite dessert." + icon_state = "honkdae" + list_reagents = list("nutriment" = 6, "banana" = 10, "vitamin" = 4) + tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/cornuto + name = "cornuto" + desc = "A neapolitan vanilla and chocolate ice cream cone. It menaces with a sprinkling of caramelized nuts." + icon_state = "cornuto" + list_reagents = list("nutriment" = 6, "hot_coco" = 4, "cream" = 2, "vanilla" = 4, "sugar" = 2) + tastes = list("chopped hazelnuts" = 3, "waffle" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/peanutbuttermochi + name = "peanut butter ice cream mochi" + desc = "A classic dessert at the Arabia Street Night Market in Prospect, peanut butter ice cream mochi is made with a peanut-butter flavoured ice cream as the main filling, and coated in crushed peanuts in the Taiwanese tradition." + icon_state = "pb_ice_cream_mochi" + list_reagents = list("nutriment" = 4, "sugar" = 6, "peanutbutter" = 4, "milk" = 2) + tastes = list("peanut butter" = 1, "mochi" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/spacefreezy + name = "spacefreezy" + desc = "The best ice cream in space." + icon_state = "spacefreezy" + list_reagents = list("nutriment" = 8, "vitamin" = 5, "bluecherryjelly" = 5) + tastes = list("blue cherries" = 2, "ice cream" = 2) + +/////////////////// +// Snow Cones // +////////////////// + +/obj/item/reagent_containers/food/snacks/frozen/snowcone + name = "flavorless snowcone" + desc = "It's just shaved ice. Still fun to chew on." + icon_state = "flavorless_sc" + trash = /obj/item/reagent_containers/food/drinks/sillycup + list_reagents = list("water" = 10, "ice" = 5) + tastes = list("cold water" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/apple + name = "apple snowcone" + desc = "Apple syrup drizzled over a snowball in a paper cup." + icon_state = "amber_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "applejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "apples" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/berry + name = "berry snowcone" + desc = "Berry syrup drizzled over a snowball in a paper cup." + icon_state = "berry_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "berryjuice" = 5) + tastes = list("ice" = 1, "water" = 1, "berries" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/bluecherry + name = "bluecherry snowcone" + desc = "Bluecherry syrup drizzled over a snowball in a paper cup, how rare!" + icon_state = "blue_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "bluecherryjelly" = 5) + tastes = list("ice" = 1, "water" = 1, "bluecherries" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/cherry + name = "cherry snowcone" + desc = "Cherry syrup drizzled over a snowball in a paper cup." + icon_state = "red_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "cherryjelly" = 5) + tastes = list("ice" = 1, "water" = 1, "cherries" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/fruitsalad + name = "fruit salad snowcone" + desc = "A delightful mix of citrus syrups drizzled over a snowball in a paper cup." + icon_state = "fruitsalad_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "limejuice" = 5, "lemonjuice" = 5, "orangejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "lemons" = 5, "limes" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/grape + name = "grape snowcone" + desc = "Grape syrup drizzled over a snowball in a paper cup." + icon_state = "grape_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "grapejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "grapes" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/honey + name = "honey snowcone" + desc = "Honey drizzled over a snowball in a paper cup." + icon_state = "amber_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "honey" = 5) + tastes = list("ice" = 1, "water" = 1, "honey" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/lemon + name = "lemon snowcone" + desc = "Lemon syrup drizzled over a snowball in a paper cup." + icon_state = "lemon_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "lemonjuice" = 5) + tastes = list("ice" = 1, "water" = 1, "lemons" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/lime + name = "lime snowcone" + desc = "Lime syrup drizzled over a snowball in a paper cup." + icon_state = "lime_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "limejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "limes" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/mime + name = "mime snowcone" + desc = "..." + icon_state = "mime_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "nothing" = 5) + tastes = list("ice" = 1, "water" = 1, "silence" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/orange + name = "orange snowcone" + desc = "Orange syrup drizzled over a snowball in a paper cup." + icon_state = "orange_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "orangejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "oranges" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/pineapple + name = "pineapple snowcone" + desc = "Pineapple syrup drizzled over a snowball in a paper cup." + icon_state = "pineapple_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "pineapplejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "pineapple" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/rainbow + name = "rainbow snowcone" + desc = "A very colorful snowball in a paper cup." + icon_state = "rainbow_sc" + list_reagents = list("water" = 10, "ice" = 5, "colorful_reagent" = 5) + tastes = list("ice" = 1, "water" = 1, "rainbows" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/cola + name = "space cola snowcone" + desc = "Space Cola drizzled over a snowball in a paper cup." + icon_state = "soda_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "cola" = 5) + tastes = list("ice" = 1, "water" = 1, "soda" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/spacemountain + name = "space mountain wind snowcone" + desc = "Space Mountain Wind drizzled over a snowball in a paper cup." + icon_state = "mountainwind_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "spacemountainwind" = 5) + tastes = list("ice" = 1, "water" = 1, "mountain wind" = 5) + +/////////////////// +// Popsicles // +///////////////// + +/obj/item/reagent_containers/food/snacks/frozen/popsicle + name = "jumbo icecream" + desc = "A luxurious ice cream covered in rich chocolate. It seems smaller than you remember it being." + icon_state = "jumbo" + trash = /obj/item/trash/popsicle_stick + list_reagents = list("nutriment" = 4, "sugar" = 4, "chocolate" = 3) + tastes = list("ice cream" = 1, "chocolate" = 1, "vanilla" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/bananatop + name = "banana topsicle" + desc = "A frozen treat made from tofu and banana juice blended smooth, then frozen. Popular in rural Japan in the summer." + icon_state = "topsicle_banana" + list_reagents = list("vitamin" = 4, "sugar" = 6, "banana" = 4) + tastes = list("bananas" = 1, "tofu" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/berrytop + name = "berry topsicle" + desc = "A frozen treat made from tofu and berry juice blended smooth, then frozen. Supposedly a favourite of bears, but that makes no sense..." + icon_state = "topsicle_berry" + list_reagents = list("vitamin" = 4, "sugar" = 6, "berryjuice" = 4) + tastes = list("berries" = 1, "tofu" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/pineappletop + name = "pineapple topsicle" + desc = "A frozen treat made from tofu and pineapple juice blended smooth, then frozen. As seen on TV." + icon_state = "topsicle_pineapple" + list_reagents = list("vitamin" = 4, "sugar" = 6, "pineapplejuice" = 4) + tastes = list("pineapples" = 1, "tofu" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/licoricecream + name = "licorice creamsicle" + desc = "A salty licorice ice cream. A salty frozen treat." + icon_state = "licorice_creamsicle" + list_reagents = list("nutriment" = 4, "cream" = 2, "vanilla" = 1, "sugar" = 4, "salt" = 1) + tastes = list("salty licorice" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/orangecream + name = "orange creamsicle" + desc = "A classic orange creamsicle. A sunny frozen treat." + icon_state = "creamsicle_o" + list_reagents = list("orangejuice" = 4, "cream" = 2, "vanilla" = 2, "sugar" = 4) + tastes = list("ice cream" = 1, "oranges" = 1, "vanilla" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/berrycream + name = "berry creamsicle" + desc = "A vibrant berry creamsicle. A berry good frozen treat." + icon_state = "creamsicle_m" + list_reagents = list("berryjuice" = 4, "cream" = 2, "vanilla" = 2, "sugar" = 4) + tastes = list("ice cream" = 1, "berries" = 1, "vanilla" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/frozenpineapple + name = "frozen pineapple pop" + desc = "Few cultures love pineapple as much as the Martians, and this dessert proves that- frozen pineapple, on a stick, with just a little dunk of dark chocolate." + icon_state = "pineapple_pop" + list_reagents = list("pineapplejuice" = 4, "sugar" = 4, "nutriment" = 2, "vitamin" = 2) + tastes = list("cold pineapple" = 1, "chocolate" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/sea_salt + name = "sea salt ice-cream bar" + desc = "This sky-blue ice-cream bar is flavoured with only the finest imported sea salt. Salty... no, sweet!" + icon_state = "sea_salt_pop" + list_reagents = list("salt" = 1, "nutriment" = 2, "cream" = 2, "vanilla" = 2, "sugar"= 4,) + tastes = list("salt" = 1, "sweet" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/ant + name = "ant popsicle" + desc = "A colony of ants suspended in hardened sugar. Those things are dead, right?" + icon_state = "ant_pop" + trash = /obj/item/stack/rods + list_reagents = list("nutriment" = 1, "vitamin" = 1, "sugar" = 5, "ants" = 3,) + tastes = list("candy" = 1, "ants" = 2) diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm index d66fcbac0f23..f28d4f13e509 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -40,7 +40,7 @@ to_chat(user, "You add [I] to [src]") updateUsrDialog() return - if(istype(I, /obj/item/reagent_containers/food/snacks/icecream)) + if(istype(I, /obj/item/reagent_containers/food/snacks/frozen/icecream)) if(!I.reagents.has_reagent("sprinkles")) if(I.reagents.total_volume > 29) I.reagents.remove_any(1) @@ -147,7 +147,7 @@ else if(href_list["createchoco"]) var/name = generate_name(reagents.get_master_reagent_name()) name += " Chocolate Cone" - var/obj/item/reagent_containers/food/snacks/icecream/icecreamcup/C = new(loc) + var/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcup/C = new(loc) C.name = "[name]" C.pixel_x = rand(-8, 8) C.pixel_y = -16 @@ -159,7 +159,7 @@ else if(href_list["createcone"]) var/name = generate_name(reagents.get_master_reagent_name()) name += " Cone" - var/obj/item/reagent_containers/food/snacks/icecream/icecreamcone/C = new(loc) + var/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone/C = new(loc) C.name = "[name]" C.pixel_x = rand(-8, 8) C.pixel_y = -16 @@ -171,7 +171,7 @@ else if(href_list["createwaffle"]) var/name = generate_name(reagents.get_master_reagent_name()) name += " Waffle Cone" - var/obj/item/reagent_containers/food/snacks/icecream/wafflecone/C = new(loc) + var/obj/item/reagent_containers/food/snacks/frozen/icecream/wafflecone/C = new(loc) C.name = "[name]" C.pixel_x = rand(-8, 8) C.pixel_y = -16 diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index f268d02f21ee..6c6224bf572b 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -119,6 +119,10 @@ input = /obj/item/reagent_containers/food/snacks/grown/carrot output = /obj/item/reagent_containers/food/snacks/grown/carrot/wedges +/datum/food_processor_process/towercap + input = /obj/item/grown/log + output = /obj/item/popsicle_stick + ///////////////////////// ///END OBJECT RECIPIES/// ///////////////////////// diff --git a/code/modules/food_and_drinks/recipes/recipes_candy.dm b/code/modules/food_and_drinks/recipes/recipes_candy.dm index 0c6f3c67007e..2339acd3ffaa 100644 --- a/code/modules/food_and_drinks/recipes/recipes_candy.dm +++ b/code/modules/food_and_drinks/recipes/recipes_candy.dm @@ -83,6 +83,10 @@ being_cooked.reagents.del_reagent("egg") return being_cooked +/datum/recipe/candy/wafflecone + reagents = list("milk" = 1, "sugar" = 1) + result = /obj/item/reagent_containers/food/snacks/wafflecone + // *********************************************************** // Base Candy Recipes (unflavored / plain) // *********************************************************** diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index 48ff01389ba5..112dcc6ca87a 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -1045,9 +1045,246 @@ /datum/recipe/microwave/icecreamsandwich reagents = list("ice" = 5, "cream" = 5) items = list( - /obj/item/reagent_containers/food/snacks/icecream, + /obj/item/reagent_containers/food/snacks/frozen/icecream, ) - result = /obj/item/reagent_containers/food/snacks/icecreamsandwich + result = /obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich + +/datum/recipe/microwave/berryicecreamsandwich + reagents = list("ice" = 5, "cream" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/cherries, + /obj/item/reagent_containers/food/snacks/grown/cherries, + /obj/item/reagent_containers/food/snacks/wafflecone + ) + result = /obj/item/reagent_containers/food/snacks/frozen/berryicecreamsandwich + +/datum/recipe/microwave/sundae + reagents = list("cream" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/wafflecone, + /obj/item/reagent_containers/food/snacks/grown/cherries, + /obj/item/reagent_containers/food/snacks/grown/banana + ) + result = /obj/item/reagent_containers/food/snacks/frozen/sundae + +/datum/recipe/microwave/bananatopsicle + reagents = list("sugar" = 5, "banana" = 5) + items = list( + /obj/item/popsicle_stick, + /obj/item/reagent_containers/food/snacks/tofu + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/bananatop + +/datum/recipe/microwave/berrytopsicle + reagents = list("sugar" = 5, "berryjuice" = 5) + items = list( + /obj/item/popsicle_stick, + /obj/item/reagent_containers/food/snacks/tofu + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/berrytop + +/datum/recipe/microwave/pineappletopsicle + reagents = list("sugar" = 5, "pineapplejuice" = 5) + items = list( + /obj/item/popsicle_stick, + /obj/item/reagent_containers/food/snacks/tofu + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/pineappletop + +/datum/recipe/microwave/licoricecreamsicle + reagents = list("sugar" = 2, "blumpkinjuice" = 4, "ice" = 2, "vanilla" = 2, "cream" = 2) + items = list( + /obj/item/popsicle_stick + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/licoricecream + +/datum/recipe/microwave/orangecreamsicle + reagents = list("sugar" = 2, "orangejuice" = 4, "ice" = 2, "vanilla" = 2, "cream" = 2) + items = list( + /obj/item/popsicle_stick + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/orangecream + +/datum/recipe/microwave/berrycreamsicle + reagents = list("sugar" = 2, "berryjuice" = 4, "ice" = 2, "vanilla" = 2, "cream" = 2) + items = list( + /obj/item/popsicle_stick + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/berrycream + +/datum/recipe/microwave/frozenpineapplepop + items = list( + /obj/item/popsicle_stick, + /obj/item/reagent_containers/food/snacks/pineappleslice, + /obj/item/reagent_containers/food/snacks/chocolatebar + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/frozenpineapple + +/datum/recipe/microwave/jumboicecream + reagents = list("sugar" = 2, "ice" = 2, "vanilla" = 3, "cream" = 2) + items = list( + /obj/item/popsicle_stick, + /obj/item/reagent_containers/food/snacks/chocolatebar + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle + +/datum/recipe/microwave/seasalticecream + reagents = list("sugar" = 5, "sodiumchloride" = 3, "cream" = 5) + items = list( + /obj/item/popsicle_stick + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/sea_salt + +/datum/recipe/microwave/cornuto + reagents = list("ice" = 2, "sugar" = 4, "cream" = 4) + items = list( + /obj/item/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/reagent_containers/food/snacks/chocolatebar + ) + result = /obj/item/reagent_containers/food/snacks/frozen/cornuto + +/datum/recipe/microwave/honkdae + reagents = list("cream" = 5, "ice" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/wafflecone, + /obj/item/reagent_containers/food/snacks/grown/cherries, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/clothing/mask/gas/clown_hat + ) + result = /obj/item/reagent_containers/food/snacks/frozen/honkdae + +/datum/recipe/microwave/peanutbuttermochi + reagents = list("cream" = 5, "rice" = 5, "sugar" = 5, "peanutbutter" = 2) + items = list( + /obj/item/reagent_containers/food/snacks/wafflecone + ) + result = /obj/item/reagent_containers/food/snacks/frozen/peanutbuttermochi + +/datum/recipe/microwave/spacefreezy + reagents = list("bluecherryjelly" = 5,"spacemountainwind" = 15) + items = list( + /obj/item/reagent_containers/food/snacks/frozen/icecream + ) + result = /obj/item/reagent_containers/food/snacks/frozen/spacefreezy + +/datum/recipe/microwave/snowcone/apple + reagents = list("ice" = 15, "applejuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/apple + +/datum/recipe/microwave/snowcone/berry + reagents = list("ice" = 15, "berryjuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/berry + +/datum/recipe/microwave/snowcone/bluecherry + reagents = list("ice" = 15, "bluecherryjelly" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/bluecherry +/datum/recipe/microwave/snowcone/cherry + reagents = list("ice" = 15, "cherryjelly" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/cherry + +/datum/recipe/microwave/snowcone/flavorless + reagents = list("ice" = 15) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone + +/datum/recipe/microwave/snowcone/fruitsalad + reagents = list("ice" = 15, "orangejuice" = 5, "limejuice" = 5, "lemonjuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/fruitsalad + +/datum/recipe/microwave/snowcone/grape + reagents = list("ice" = 15, "grapejuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/grape + +/datum/recipe/microwave/snowcone/honey + reagents = list("ice" = 15, "honey" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/honey + +/datum/recipe/microwave/snowcone/lemon + reagents = list("ice" = 15, "lemonjuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/lemon + +/datum/recipe/microwave/snowcone/lime + reagents = list("ice" = 15, "limejuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/lime + +/datum/recipe/microwave/snowcone/mime + reagents = list("ice" = 15, "nothing" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/mime + +/datum/recipe/microwave/snowcone/orange + reagents = list("ice" = 15, "orangejuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/orange + +/datum/recipe/microwave/snowcone/pineapple + reagents = list("ice" = 15, "pineapplejuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/pineapple + +/datum/recipe/microwave/snowcone/rainbow + reagents = list("ice" = 15, "colorful_reagent" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/rainbow + +/datum/recipe/microwave/snowcone/cola + reagents = list("ice" = 15, "cola" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/cola + +/datum/recipe/microwave/snowcone/spacemountainwind + reagents = list("ice" = 15, "spacemountainwind" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/spacemountain + +/datum/recipe/microwave/antpopsicle + reagents = list("sugar" = 5, "water" = 5, "ants" = 10) + items = list( + /obj/item/popsicle_stick + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/ant /datum/recipe/microwave/notasandwich items = list( diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index a95a6071b225..a06b87d8883c 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -109,6 +109,22 @@ ) result = /obj/item/reagent_containers/food/snacks/sliceable/plaincake +/datum/recipe/oven/clowncake + reagents = list("milk" = 5, "sugar" = 15) + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/frozen/sundae, + /obj/item/reagent_containers/food/snacks/frozen/sundae, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana + ) + result = /obj/item/reagent_containers/food/snacks/sliceable/clowncake + /datum/recipe/oven/meatpie items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm index 677194ab60f6..f86ae0347843 100644 --- a/code/modules/mining/lavaland/loot/tendril_loot.dm +++ b/code/modules/mining/lavaland/loot/tendril_loot.dm @@ -390,6 +390,7 @@ desc = "A dread talisman that can render you completely invulnerable." icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "talisman" + w_class = WEIGHT_CLASS_SMALL resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF actions_types = list(/datum/action/item_action/immortality) var/cooldown = 0 diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm similarity index 99% rename from code/modules/mob/living/carbon/brain/MMI.dm rename to code/modules/mob/living/brain/MMI.dm index 815821757ad6..9ed5f563c1e0 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/brain/MMI.dm @@ -11,7 +11,7 @@ var/alien = 0 var/syndiemmi = FALSE //Whether or not this is a Syndicate MMI var/mmi_item_name = "Man-Machine Interface" //Used to name the item when installing a brain - var/mob/living/carbon/brain/brainmob = null//The current occupant. + var/mob/living/brain/brainmob = null//The current occupant. var/obj/item/organ/internal/brain/held_brain = null // This is so MMI's aren't brainscrubber 9000's var/mob/living/silicon/robot/robot = null//Appears unused. var/obj/mecha/mecha = null//This does not appear to be used outside of reference in mecha.dm. diff --git a/code/modules/mob/living/carbon/brain/MMI_radio.dm b/code/modules/mob/living/brain/MMI_radio.dm similarity index 100% rename from code/modules/mob/living/carbon/brain/MMI_radio.dm rename to code/modules/mob/living/brain/MMI_radio.dm diff --git a/code/modules/mob/living/carbon/brain/brain_death.dm b/code/modules/mob/living/brain/brain_death.dm similarity index 91% rename from code/modules/mob/living/carbon/brain/brain_death.dm rename to code/modules/mob/living/brain/brain_death.dm index 7aec0a713ee6..846425134c42 100644 --- a/code/modules/mob/living/carbon/brain/brain_death.dm +++ b/code/modules/mob/living/brain/brain_death.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/brain/death(gibbed) +/mob/living/brain/death(gibbed) // Only execute the below if we successfully died . = ..() if(!.) @@ -8,7 +8,7 @@ visible_message("[src]'s MMI flatlines!", "You hear something flatline.") mmi.icon_state = mmi.dead_icon -/mob/living/carbon/brain/gib() +/mob/living/brain/gib() // can we muster a parent call here? if(!death(TRUE) && stat != DEAD) return FALSE diff --git a/code/modules/mob/living/carbon/brain/brain_emote.dm b/code/modules/mob/living/brain/brain_emote.dm similarity index 67% rename from code/modules/mob/living/carbon/brain/brain_emote.dm rename to code/modules/mob/living/brain/brain_emote.dm index b9f1d720e0c9..13fcf0c4104e 100644 --- a/code/modules/mob/living/carbon/brain/brain_emote.dm +++ b/code/modules/mob/living/brain/brain_emote.dm @@ -1,13 +1,13 @@ /** * Emotes usable by brains, but only while they're in MMIs. */ -/datum/emote/living/carbon/brain - mob_type_allowed_typecache = list(/mob/living/carbon/brain) +/datum/emote/living/brain + mob_type_allowed_typecache = list(/mob/living/brain) mob_type_blacklist_typecache = null /// The message that will be displayed to themselves, since brains can't really see their own emotes var/self_message -/datum/emote/living/carbon/brain/run_emote(mob/user, params, type_override, intentional) +/datum/emote/living/brain/run_emote(mob/user, params, type_override, intentional) . = ..() if(!.) return FALSE @@ -15,52 +15,52 @@ if(self_message) to_chat(user, self_message) -/datum/emote/living/carbon/brain/can_run_emote(mob/user, status_check, intentional) +/datum/emote/living/brain/can_run_emote(mob/user, status_check, intentional) . = ..() if(!.) return FALSE - var/mob/living/carbon/brain/B = user + var/mob/living/brain/B = user if(!(B.container && istype(B.container, /obj/item/mmi))) // No MMI, no emotes return FALSE // So, brains can't really see their own emotes so we'll probably just want to send an extra message -/datum/emote/living/carbon/brain/alarm +/datum/emote/living/brain/alarm key = "alarm" key_third_person = "alarms" message = "sounds an alarm." self_message = "You sound an alarm." -/datum/emote/living/carbon/brain/alert +/datum/emote/living/brain/alert key = "alert" key_third_person = "alerts" message = "lets out a distressed noise." self_message = "You let out a distressed noise." -/datum/emote/living/carbon/brain/notice +/datum/emote/living/brain/notice key = "notice" message = "plays a loud tone." self_message = "You play a loud tone." -/datum/emote/living/carbon/brain/flash +/datum/emote/living/brain/flash key = "flash" message = "starts flashing its lights quickly!" -/datum/emote/living/carbon/brain/whistle +/datum/emote/living/brain/whistle key = "whistle" key_third_person = "whistles" message = "whistles." self_message = "You whistle." -/datum/emote/living/carbon/brain/beep +/datum/emote/living/brain/beep key = "beep" key_third_person = "beeps" message = "beeps." self_message = "You beep." -/datum/emote/living/carbon/brain/boop +/datum/emote/living/brain/boop key = "boop" key_third_person = "boops" message = "boops." diff --git a/code/modules/mob/living/brain/brain_life.dm b/code/modules/mob/living/brain/brain_life.dm new file mode 100644 index 000000000000..456e025f9d14 --- /dev/null +++ b/code/modules/mob/living/brain/brain_life.dm @@ -0,0 +1,5 @@ +/mob/living/brain/Life() + . = ..() + if(.) + if(!container && (world.time - timeofhostdeath) > GLOB.configuration.general.revival_brain_life) + death() diff --git a/code/modules/mob/living/brain/brain_login.dm b/code/modules/mob/living/brain/brain_login.dm new file mode 100644 index 000000000000..fc4c40c93ff7 --- /dev/null +++ b/code/modules/mob/living/brain/brain_login.dm @@ -0,0 +1,3 @@ +/mob/living/brain/Login() + ..() + SetSleeping(0) diff --git a/code/modules/mob/living/carbon/brain/brain_say.dm b/code/modules/mob/living/brain/brain_say.dm similarity index 84% rename from code/modules/mob/living/carbon/brain/brain_say.dm rename to code/modules/mob/living/brain/brain_say.dm index 40535dde96b7..d287a7360080 100644 --- a/code/modules/mob/living/carbon/brain/brain_say.dm +++ b/code/modules/mob/living/brain/brain_say.dm @@ -1,5 +1,5 @@ //TODO: Convert this over for languages. -/mob/living/carbon/brain/say(message, datum/language/speaking = null) +/mob/living/brain/say(message, datum/language/speaking = null) if(stat == DEAD) return ..() if(!can_speak(warning = TRUE)) @@ -13,13 +13,13 @@ ..(message) -/mob/living/carbon/brain/whisper(message as text) +/mob/living/brain/whisper(message as text) if(!can_speak(warning = TRUE)) return ..() -/mob/living/carbon/brain/can_speak(warning = FALSE) +/mob/living/brain/can_speak(warning = FALSE) . = ..() if(!istype(container, /obj/item/mmi)) @@ -31,7 +31,7 @@ to_chat(usr, "You cannot speak, as your internal speaker is turned off.") . = FALSE -/mob/living/carbon/brain/handle_message_mode(message_mode, list/message_pieces, verb, used_radios) +/mob/living/brain/handle_message_mode(message_mode, list/message_pieces, verb, used_radios) switch(message_mode) if("headset") var/radio_worked = 0 // If any of the radios our brainmob could use functioned, this is set true so that we don't use any others diff --git a/code/modules/mob/living/carbon/brain/brain_update_status.dm b/code/modules/mob/living/brain/brain_update_status.dm similarity index 89% rename from code/modules/mob/living/carbon/brain/brain_update_status.dm rename to code/modules/mob/living/brain/brain_update_status.dm index ec4edb77fc7b..269380e39529 100644 --- a/code/modules/mob/living/carbon/brain/brain_update_status.dm +++ b/code/modules/mob/living/brain/brain_update_status.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/brain/update_stat(reason = "none given") +/mob/living/brain/update_stat(reason = "none given") if(status_flags & GODMODE) return // if(health <= min_health) diff --git a/code/modules/mob/living/carbon/brain/carbon_brain.dm b/code/modules/mob/living/brain/living_brain.dm similarity index 75% rename from code/modules/mob/living/carbon/brain/carbon_brain.dm rename to code/modules/mob/living/brain/living_brain.dm index f216b88239eb..323309f0b372 100644 --- a/code/modules/mob/living/carbon/brain/carbon_brain.dm +++ b/code/modules/mob/living/brain/living_brain.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/brain +/mob/living/brain var/obj/item/container = null var/timeofhostdeath = 0 var/emp_damage = 0//Handles a type of MMI damage @@ -6,18 +6,18 @@ icon = 'icons/obj/surgery.dmi' icon_state = "brain1" -/mob/living/carbon/brain/New() +/mob/living/brain/New() ..() add_language("Galactic Common") -/mob/living/carbon/brain/Destroy() +/mob/living/brain/Destroy() if(key) //If there is a mob connected to this thing. Have to check key twice to avoid false death reporting. if(stat!=DEAD) //If not dead. death(1) //Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA ghostize() //Ghostize checks for key so nothing else is necessary. return ..() -/mob/living/carbon/brain/say_understands(other)//Goddamn is this hackish, but this say code is so odd +/mob/living/brain/say_understands(other)//Goddamn is this hackish, but this say code is so odd if(isAI(other)) if(!(container && istype(container, /obj/item/mmi))) return 0 @@ -44,16 +44,16 @@ return 1 return ..() -/mob/living/carbon/brain/ex_act() //you cant blow up brainmobs because it makes transfer_to() freak out when borgs blow up. +/mob/living/brain/ex_act() //you cant blow up brainmobs because it makes transfer_to() freak out when borgs blow up. return -/mob/living/carbon/brain/blob_act(obj/structure/blob/B) +/mob/living/brain/blob_act(obj/structure/blob/B) return -/mob/living/carbon/brain/incapacitated(ignore_restraints = FALSE, ignore_grab = FALSE) +/mob/living/brain/incapacitated(ignore_restraints = FALSE, ignore_grab = FALSE) return FALSE -/mob/living/carbon/brain/on_forcemove(atom/newloc) +/mob/living/brain/on_forcemove(atom/newloc) if(container) container.forceMove(newloc) else //something went very wrong. @@ -65,10 +65,10 @@ This will return true if the brain has a container that leaves it less helpless I'm using this for Stat to give it a more nifty interface to work with */ -/mob/living/carbon/brain/proc/has_synthetic_assistance() +/mob/living/brain/proc/has_synthetic_assistance() return (container && istype(container, /obj/item/mmi)) || in_contents_of(/obj/mecha) -/mob/living/carbon/brain/proc/get_race() +/mob/living/brain/proc/get_race() if(container) var/obj/item/mmi/M = container if(istype(M) && M.held_brain) @@ -79,7 +79,7 @@ I'm using this for Stat to give it a more nifty interface to work with var/obj/item/organ/internal/brain/B = loc return B.dna.species.name -/mob/living/carbon/brain/Stat() +/mob/living/brain/Stat() ..() if(has_synthetic_assistance() && statpanel("Status")) show_stat_emergency_shuttle_eta() @@ -88,13 +88,13 @@ I'm using this for Stat to give it a more nifty interface to work with stat("Exosuit Charge:", "[istype(M.cell) ? "[M.cell.charge] / [M.cell.maxcharge]" : "No cell detected"]") stat("Exosuit Integrity", "[!M.obj_integrity ? "0" : "[(M.obj_integrity / M.max_integrity) * 100]"]%") -/mob/living/carbon/brain/can_safely_leave_loc() +/mob/living/brain/can_safely_leave_loc() return 0 //You're not supposed to be ethereal jaunting, brains -/mob/living/carbon/brain/can_hear() +/mob/living/brain/can_hear() . = TRUE -/mob/living/carbon/brain/update_runechat_msg_location() +/mob/living/brain/update_runechat_msg_location() if(ismecha(loc)) runechat_msg_location = loc.UID() else if(container) diff --git a/code/modules/mob/living/carbon/brain/robotic_brain.dm b/code/modules/mob/living/brain/robotic_brain.dm similarity index 99% rename from code/modules/mob/living/carbon/brain/robotic_brain.dm rename to code/modules/mob/living/brain/robotic_brain.dm index c4fb75669173..c53285084c42 100644 --- a/code/modules/mob/living/carbon/brain/robotic_brain.dm +++ b/code/modules/mob/living/brain/robotic_brain.dm @@ -11,7 +11,7 @@ var/searching = FALSE var/askDelay = 10 * 60 * 1 - //var/mob/living/carbon/brain/brainmob = null + //var/mob/living/brain/brainmob = null var/list/ghost_volunteers[0] req_access = list(ACCESS_ROBOTICS) mecha = null//This does not appear to be used outside of reference in mecha.dm. diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_emote.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_emote.dm index 86182cae1e21..7e458de03620 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_emote.dm @@ -9,7 +9,7 @@ key_third_person = "roars" message = "roars!" message_param = "roars at %t!" - emote_type = EMOTE_SOUND | EMOTE_MOUTH + emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH sound = "sound/voice/hiss5.ogg" volume = 80 @@ -18,7 +18,7 @@ key_third_person = "hisses" message = "hisses!" message_param = "hisses at %t!" - emote_type = EMOTE_SOUND | EMOTE_MOUTH + emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH sound = "sound/voice/hiss1.ogg" volume = 30 @@ -28,5 +28,5 @@ message = "gnarls and shows its teeth." message_param = "gnarls and flashes its teeth at %t." sound = "sound/voice/hiss4.ogg" - emote_type = EMOTE_SOUND | EMOTE_MOUTH + emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH volume = 30 diff --git a/code/modules/mob/living/carbon/brain/brain_life.dm b/code/modules/mob/living/carbon/brain/brain_life.dm deleted file mode 100644 index 271524ad61d1..000000000000 --- a/code/modules/mob/living/carbon/brain/brain_life.dm +++ /dev/null @@ -1,20 +0,0 @@ -/mob/living/carbon/brain/proc/handle_temperature_damage(body_part, exposed_temperature, exposed_intensity) - if(status_flags & GODMODE) - return - - if(exposed_temperature > bodytemperature) - var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0) - adjustFireLoss(20.0*discomfort) - - else - var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0) - adjustFireLoss(5.0*discomfort) - -/mob/living/carbon/brain/Life() - . = ..() - if(.) - if(!container && (world.time - timeofhostdeath) > GLOB.configuration.general.revival_brain_life) - death() - -/mob/living/carbon/brain/breathe() - return diff --git a/code/modules/mob/living/carbon/brain/brain_login.dm b/code/modules/mob/living/carbon/brain/brain_login.dm deleted file mode 100644 index 3e5f0e48365a..000000000000 --- a/code/modules/mob/living/carbon/brain/brain_login.dm +++ /dev/null @@ -1,3 +0,0 @@ -/mob/living/carbon/brain/Login() - ..() - SetSleeping(0) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 1f4afda83b90..43bd1f413064 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -893,6 +893,10 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven buckled.user_unbuckle_mob(src, src) return + if(has_status_effect(STATUS_EFFECT_UNBUCKLE)) + to_chat(src, "You are already trying to unbuckle!") + return + apply_status_effect(STATUS_EFFECT_UNBUCKLE) var/time = I.breakouttime visible_message("[src] attempts to unbuckle [p_themselves()]!", "You attempt to unbuckle yourself... (This will take around [time / 10] seconds and you need to stay still.)") @@ -904,6 +908,8 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven return buckled.user_unbuckle_mob(src, src) + remove_status_effect(STATUS_EFFECT_UNBUCKLE) + /mob/living/carbon/proc/buckle_check() if(!buckled) // No longer buckled return TRUE @@ -947,15 +953,20 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven var/time = I.resist_time if(I.resist_time == 0)//if it's 0, you can't get out of it to_chat(src, "[I] is too well made, you'll need hands for this one!") - else - visible_message("[src] gnaws on [I], trying to remove it!") - to_chat(src, "You attempt to remove [I]... (This will take around [time/10] seconds and you need to stand still.)") - if(do_after(src, time, FALSE, src, extra_checks = list(CALLBACK(src, PROC_REF(muzzle_check))))) - visible_message("[src] removes [I]!") - to_chat(src, "You get rid of [I]!") - if(I.security_lock) - I.do_break() - unEquip(I) + return + if(has_status_effect(STATUS_EFFECT_REMOVE_MUZZLE)) + to_chat(src, "You are already trying to remove [I]!") + return + apply_status_effect(STATUS_EFFECT_REMOVE_MUZZLE) + visible_message("[src] gnaws on [I], trying to remove it!") + to_chat(src, "You attempt to remove [I]... (This will take around [time/10] seconds and you need to stand still.)") + if(do_after(src, time, FALSE, src, extra_checks = list(CALLBACK(src, PROC_REF(muzzle_check))))) + visible_message("[src] removes [I]!") + to_chat(src, "You get rid of [I]!") + if(I.security_lock) + I.do_break() + unEquip(I) + remove_status_effect(STATUS_EFFECT_REMOVE_MUZZLE) /mob/living/carbon/proc/cuff_resist(obj/item/I, breakouttime = 600, cuff_break = 0) @@ -963,9 +974,14 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven var/displaytime = breakouttime / 10 if(!cuff_break) + if(has_status_effect(STATUS_EFFECT_REMOVE_CUFFS)) + to_chat(src, "You are already trying to remove [I].") + return + apply_status_effect(STATUS_EFFECT_REMOVE_CUFFS) visible_message("[src] attempts to remove [I]!") to_chat(src, "You attempt to remove [I]... (This will take around [displaytime] seconds and you need to stand still.)") if(do_after(src, breakouttime, 0, target = src)) + remove_status_effect(STATUS_EFFECT_REMOVE_CUFFS) if(I.loc != src || buckled) return if(istype(I, /obj/item/restraints/handcuffs/twimsts)) @@ -1001,13 +1017,19 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven I.dropped(src) return else + remove_status_effect(STATUS_EFFECT_REMOVE_CUFFS) to_chat(src, "You fail to remove [I]!") else breakouttime = 50 + if(has_status_effect(STATUS_EFFECT_BREAK_CUFFS)) + to_chat(src, "You are already trying to break [I].") + return + apply_status_effect(STATUS_EFFECT_BREAK_CUFFS) visible_message("[src] is trying to break [I]!") to_chat(src, "You attempt to break [I]... (This will take around 5 seconds and you need to stand still.)") if(do_after(src, breakouttime, 0, target = src)) + remove_status_effect(STATUS_EFFECT_BREAK_CUFFS) if(!I.loc || buckled) return visible_message("[src] manages to break [I]!") @@ -1025,6 +1047,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven return return 1 else + remove_status_effect(STATUS_EFFECT_BREAK_CUFFS) to_chat(src, "You fail to break [I]!") //called when we get cuffed/uncuffed diff --git a/code/modules/mob/living/carbon/carbon_emote.dm b/code/modules/mob/living/carbon/carbon_emote.dm index 3fcba428c13d..64fb51f2abb2 100644 --- a/code/modules/mob/living/carbon/carbon_emote.dm +++ b/code/modules/mob/living/carbon/carbon_emote.dm @@ -1,6 +1,5 @@ /datum/emote/living/carbon mob_type_allowed_typecache = list(/mob/living/carbon) - mob_type_blacklist_typecache = list(/mob/living/carbon/brain) /datum/emote/living/carbon/blink key = "blink" @@ -30,7 +29,7 @@ key_third_person = "coughs" message = "coughs!" message_mime = "appears to cough!" - emote_type = EMOTE_SOUND | EMOTE_MOUTH + emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH vary = TRUE age_based = TRUE volume = 120 diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index af45e81a29f9..8c25fbbc94a4 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -124,8 +124,8 @@ // All the things wielded/worn that can be reasonably described with a common template: var/list/message_parts = examine_visible_clothing(skipgloves, skipsuitstorage, skipjumpsuit, skipshoes, skipmask, skipears, skipeyes, skipface) - var/list/abstract_items = list() + var/list/grab_items = list() for(var/parts in message_parts) var/action = parts[1] @@ -137,6 +137,8 @@ accessories = parts[5] if(item) + if(istype(item, /obj/item/grab)) + grab_items |= item if(item.flags & ABSTRACT) abstract_items |= item else @@ -181,6 +183,15 @@ continue msg += "[text]\n" + for(var/obj/item/grab/grab in grab_items) + switch(grab.state) + if(GRAB_AGGRESSIVE) + msg += "[p_they(TRUE)] [p_are()] holding [grab.affecting]'s hands!\n" + if(GRAB_NECK) + msg += "[p_they(TRUE)] [p_are()] holding [grab.affecting]'s neck!\n" + if(GRAB_KILL) + msg += "[p_they(TRUE)] [p_are()] strangling [grab.affecting]!\n" + //Jitters switch(AmountJitter()) if(600 SECONDS to INFINITY) diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm index b2cbd07943f7..fbbfdba9a7cf 100644 --- a/code/modules/mob/living/carbon/human/body_accessories.dm +++ b/code/modules/mob/living/carbon/human/body_accessories.dm @@ -1,6 +1,6 @@ GLOBAL_LIST_INIT(body_accessory_by_name, list("None" = null)) -GLOBAL_LIST_INIT(body_accessory_by_species, list()) +GLOBAL_LIST_EMPTY(body_accessory_by_species) /proc/initialize_body_accessory_by_species() for(var/B in GLOB.body_accessory_by_name) diff --git a/code/modules/mob/living/carbon/human/human_emote.dm b/code/modules/mob/living/carbon/human/human_emote.dm index 69a3bd4f15a4..39712e24151b 100644 --- a/code/modules/mob/living/carbon/human/human_emote.dm +++ b/code/modules/mob/living/carbon/human/human_emote.dm @@ -44,7 +44,7 @@ message = "claps." message_mime = "claps silently." message_param = "claps at %t." - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE vary = TRUE /datum/emote/living/carbon/human/clap/run_emote(mob/user, params, type_override, intentional) @@ -79,7 +79,7 @@ key = "crack" key_third_person = "cracks" message = "cracks their knuckles." - emote_type = EMOTE_AUDIBLE | EMOTE_SOUND + emote_type = EMOTE_AUDIBLE // knuckles.ogg by CGEffex. Shortened and cut. // https://freesound.org/people/CGEffex/sounds/93981/ sound = "sound/effects/mob_effects/knuckles.ogg" @@ -116,7 +116,7 @@ message = "facepalms." hands_use_check = TRUE sound = 'sound/weapons/slap.ogg' - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE volume = 50 /datum/emote/living/carbon/human/palm @@ -161,7 +161,7 @@ message_mime = "acts out a scream!" message_postfix = "at %t!" muzzled_noises = list("very loud") - emote_type = EMOTE_SOUND | EMOTE_MOUTH + emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH only_forced_audio = FALSE vary = TRUE age_based = TRUE @@ -195,7 +195,7 @@ key_third_person = "gasps" message = "gasps!" message_mime = "appears to be gasping!" - emote_type = EMOTE_SOUND // Don't make this one a mouth emote since we don't want it to be caught by nobreath + emote_type = EMOTE_AUDIBLE // Don't make this one a mouth emote since we don't want it to be caught by nobreath age_based = TRUE unintentional_stat_allowed = UNCONSCIOUS volume = 100 @@ -333,7 +333,7 @@ key_third_person = "sneezes" message = "sneezes." muzzled_noises = list("strange", "sharp") - emote_type = EMOTE_SOUND | EMOTE_MOUTH + emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH volume = 70 /datum/emote/living/carbon/human/sneeze/get_sound(mob/user) @@ -407,7 +407,7 @@ message = "snaps their fingers." message_param = "snaps their fingers at %t." sound = "sound/effects/fingersnap.ogg" - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE /datum/emote/living/carbon/human/snap/run_emote(mob/user, params, type_override, intentional) @@ -589,7 +589,7 @@ key_third_person = "quills" message = "rustles their quills." message_param = "rustles their quills at %t." - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE age_based = TRUE // Credit to sound-ideas (freesfx.co.uk) for the sound. sound = "sound/effects/voxrustle.ogg" @@ -600,7 +600,7 @@ key_third_person = "warbles" message = "warbles." message_param = "warbles at %t." - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE age_based = TRUE // Copyright CC BY 3.0 alienistcog (freesound.org) for the sound. sound = "sound/effects/warble.ogg" @@ -612,7 +612,7 @@ message = "clacks their mandibles." message_param = "clacks their mandibles at %t." species_type_whitelist_typecache = list(/datum/species/kidan) - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE audio_cooldown = 3 SECONDS age_based = TRUE // Credit to DrMinky (freesound.org) for the sound. @@ -634,7 +634,7 @@ /datum/emote/living/carbon/human/drask_talk species_type_whitelist_typecache = list(/datum/species/drask) - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE age_based = TRUE sound = "sound/voice/drasktalk.ogg" @@ -662,7 +662,7 @@ message = "hisses." message_param = "hisses at %t." species_type_whitelist_typecache = list(/datum/species/unathi) - emote_type = EMOTE_SOUND | EMOTE_MOUTH + emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH age_based = TRUE // Credit to Jamius (freesound.org) for the sound. sound = "sound/effects/unathihiss.ogg" @@ -673,7 +673,7 @@ key_third_person = "creaks" message = "creaks." message_param = "creaks at %t." - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE age_based = TRUE species_type_whitelist_typecache = list(/datum/species/diona) sound = "sound/voice/dionatalk1.ogg" @@ -699,7 +699,7 @@ key_third_person = "squishes" message = "squishes." message_param = "squishes at %t." - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE age_based = TRUE // Credit to DrMinky (freesound.org) for the sound. sound = "sound/effects/slime_squish.ogg" @@ -709,7 +709,7 @@ key_third_person = "bubbles" message = "bubbles." message_param = "bubbles at %t." - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE age_based = TRUE // Sound is CC-4.0 by Audiolarx // Effect is cut out of original clip @@ -722,7 +722,7 @@ message = "makes a popping sound." message_param = "makes a popping sound at %t." message_mime = "makes a silent pop." - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE age_based = TRUE // CC0 // https://freesound.org/people/greenvwbeetle/sounds/244653/ @@ -736,7 +736,7 @@ message_mime = "acts out a howl." message_param = "howls at %t." species_type_whitelist_typecache = list(/datum/species/vulpkanin) - emote_type = EMOTE_SOUND | EMOTE_MOUTH + emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH age_based = TRUE sound = "sound/goonstation/voice/howl.ogg" muzzled_noises = list("very loud") @@ -753,7 +753,7 @@ sound = "growls" // what the fuck why is this just top level volume = 80 muzzled_noises = list("annoyed") - emote_type = EMOTE_SOUND | EMOTE_MOUTH + emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH /datum/emote/living/carbon/human/hiss/tajaran message_mime = "hisses silently." diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index b4a36695805e..1ce648e41bf2 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -401,6 +401,7 @@ // For special snowflake species effects // (Slime People changing color based on the reagents they consume) /datum/species/proc/handle_life(mob/living/carbon/human/H) + SHOULD_CALL_PARENT(TRUE) if(HAS_TRAIT(H, TRAIT_NOBREATH)) var/takes_crit_damage = (!HAS_TRAIT(H, TRAIT_NOCRITDAMAGE)) if((H.health <= HEALTH_THRESHOLD_CRIT) && takes_crit_damage) diff --git a/code/modules/mob/living/carbon/human/species/diona_species.dm b/code/modules/mob/living/carbon/human/species/diona_species.dm index ea7b968ad097..4381438edae0 100644 --- a/code/modules/mob/living/carbon/human/species/diona_species.dm +++ b/code/modules/mob/living/carbon/human/species/diona_species.dm @@ -12,13 +12,10 @@ heatmod = 3 var/pod = FALSE //did they come from a pod? If so, they're stronger than normal Diona. - blurb = "Commonly referred to (erroneously) as 'plant people', the Dionaea are a strange space-dwelling collective \ - species hailing from Epsilon Ursae Minoris. Each 'diona' is a cluster of numerous cat-sized organisms called nymphs; \ - there is no effective upper limit to the number that can fuse in gestalt, and reports exist of the Epsilon Ursae \ - Minoris primary being ringed with a cloud of singing space-station-sized entities.

The Dionaea coexist peacefully with \ - all known species, especially the Skrell. Their communal mind makes them slow to react, and they have difficulty understanding \ - even the simplest concepts of other minds. Their alien physiology allows them survive happily off a diet of nothing but light, \ - water and other radiation." + blurb = "The Diona are plant-like creatures made up of a gestalt of smaller Nymphs. \ + Dionae lack any form of centralized government or homeworld, with most avoiding the affairs of the wider galaxy, preferring instead to focus on the spread of their species.

\ + As a gestalt entity, each nymph possesses an individual personality, yet they communicate collectively. \ + Consequently, Diona often speak in a unique blend of first and third person, using 'We' and 'I' to reflect their unified yet multifaceted nature." species_traits = list(NO_HAIR) inherent_traits = list(TRAIT_NOGERMS, TRAIT_NODECAY) @@ -135,5 +132,7 @@ return TRUE /datum/species/diona/pod //Same name and everything; we want the same limitations on them; we just want their regeneration to kick in at all times and them to have special factions + name = "Diomorph" //Seperate name needed else can't select diona period + species_traits = list(NO_HAIR, NOT_SELECTABLE) pod = TRUE inherent_factions = list("plants", "vines") diff --git a/code/modules/mob/living/carbon/human/species/drask.dm b/code/modules/mob/living/carbon/human/species/drask.dm index 5a02dd6f2c81..a5586270a6ae 100644 --- a/code/modules/mob/living/carbon/human/species/drask.dm +++ b/code/modules/mob/living/carbon/human/species/drask.dm @@ -15,16 +15,13 @@ male_sneeze_sound = 'sound/voice/drasksneeze.ogg' female_sneeze_sound = 'sound/voice/drasksneeze.ogg' - burn_mod = 1.5 //exotic_blood = "cryoxadone" body_temperature = 273 - blurb = "Hailing from Hoorlm, planet outside what is usually considered a habitable \ - orbit, the Drask evolved to live in extreme cold. Their strange bodies seem \ - to operate better the colder their surroundings are, and can regenerate rapidly \ - when breathing supercooled gas.

On their homeworld, the Drask live long lives \ - in their labyrinthine settlements, carved out beneath Hoorlm's icy surface, where the air \ - is of breathable density." + blurb = "Drask are cold-bodied humanoids from the ice world of Hoorlm, contained within a black hole system. \ + Operating in enclaves run by elders, Drasks are biologically immortal and place great societal value in patience.

\ + Drask traditionally pay homage to their planet as their birth deity, with many modern Drask viewing space travel a patron saint. \ + Drasks wield little influence on the galaxy in a traditional sense and have slowly begun to become more prevalent outside their origin system thanks to alien contact." suicide_messages = list( "is self-warming with friction!", @@ -46,7 +43,7 @@ heat_level_1 = 310 //Default 370 - Higher is better heat_level_2 = 340 //Default 400 heat_level_3 = 400 //Default 460 - heatmod = 2 // 3 * more damage from body temp + heatmod = 3 // 3 * more damage from body temp flesh_color = "#a3d4eb" reagent_tag = PROCESS_ORG diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm index 709012df947a..55d7083777a9 100644 --- a/code/modules/mob/living/carbon/human/species/golem.dm +++ b/code/modules/mob/living/carbon/human/species/golem.dm @@ -268,6 +268,7 @@ //Regenerates because self-repairing super-advanced alien tech /datum/species/golem/alloy/handle_life(mob/living/carbon/human/H) + SHOULD_CALL_PARENT(FALSE) if(H.stat == DEAD) return H.adjustBruteLoss(-2) diff --git a/code/modules/mob/living/carbon/human/species/grey.dm b/code/modules/mob/living/carbon/human/species/grey.dm index fc7afd064ce3..3f77302caf93 100644 --- a/code/modules/mob/living/carbon/human/species/grey.dm +++ b/code/modules/mob/living/carbon/human/species/grey.dm @@ -3,6 +3,12 @@ name_plural = "Greys" icobase = 'icons/mob/human_races/r_grey.dmi' language = "Psionic Communication" + + blurb = "The Grey, known for their psionic abilities and unique appearance, hail from beyond the Milky Way, with an undisclosed homeworld. \ + They rely heavily on cloning technology and are governed by a technocratic council of scientists.

\ + Focused on technological advancement and the study of the universe, the Grey lack religious or spiritual beliefs. \ + Their objective perspective and advanced knowledge often position them to focus on their own projects rather then the disputes of other species." + eyes = "grey_eyes_s" butt_sprite = "grey" diff --git a/code/modules/mob/living/carbon/human/species/human_species.dm b/code/modules/mob/living/carbon/human/species/human_species.dm index 4ba039c96cb6..9d19d16404f4 100644 --- a/code/modules/mob/living/carbon/human/species/human_species.dm +++ b/code/modules/mob/living/carbon/human/species/human_species.dm @@ -9,21 +9,25 @@ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS bodyflags = HAS_ICON_SKIN_TONE | HAS_BODY_MARKINGS dietflags = DIET_OMNI - blurb = "Humanity originated in the Sol system, and over the last five centuries has spread \ - colonies across a wide swathe of space. They hold a wide range of forms and creeds.

\ - While the central Sol government maintains control of its far-flung people, powerful corporate \ - interests, rampant cyber and bio-augmentation and secretive factions make life on most human \ - worlds tumultous at best." + blurb = "Humanity, originating from the Sol system, has expanded over five centuries, branching out to forge a variety of governments and powerful corporations. \ + These range from the militaristic Trans Solar Federation, the Union of Soviet Socialist Planets, and megacorps like Nanotrasen.

\ + With a constant desire to colonize and spread their influence onto other species, they have began to develop alliances and enemies. \ + Making human's one of the most recongnizeable and socially diverse species in the sector." - icon_skin_tones = list( + icon_skin_tones = list( //Organized to be from Light to Dark. 1 = "Default White", - 2 = "Chestnut", - 3 = "Coffee", + 2 = "Pale", + 3 = "Classic", 4 = "Olive", - 5 = "Pale", + 5 = "Oliver", 6 = "Beige", - 7 = "Classic", - 8 = "Oliver" + 7 = "Latte", + 8 = "Sienna", + 9 = "Almond", + 10 = "Bronzed", + 11 = "Caramel", + 12 = "Coffee", + 13 = "Chestnut" ) reagent_tag = PROCESS_ORG @@ -32,20 +36,30 @@ if(H.dna.species.bodyflags & HAS_ICON_SKIN_TONE) var/new_icobase = 'icons/mob/human_races/r_human.dmi' //Default White, counts as 1. switch(H.s_tone) + if(13) + new_icobase = 'icons/mob/human_races/human_skintones/r_human_chestnut.dmi' + if(12) + new_icobase = 'icons/mob/human_races/human_skintones/r_human_Coffee.dmi' + if(11) + new_icobase = 'icons/mob/human_races/human_skintones/r_human_caramel.dmi' + if(10) + new_icobase = 'icons/mob/human_races/human_skintones/r_human_bronzed.dmi' + if(9) + new_icobase = 'icons/mob/human_races/human_skintones/r_human_almond.dmi' if(8) - new_icobase = 'icons/mob/human_races/human_skintones/r_human_Oliverandcompany.dmi' + new_icobase = 'icons/mob/human_races/human_skintones/r_human_sienna.dmi' if(7) - new_icobase = 'icons/mob/human_races/human_skintones/r_human_classic.dmi' + new_icobase = 'icons/mob/human_races/human_skintones/r_human_latte.dmi' if(6) new_icobase = 'icons/mob/human_races/human_skintones/r_human_beige.dmi' if(5) - new_icobase = 'icons/mob/human_races/human_skintones/r_human_pale.dmi' + new_icobase = 'icons/mob/human_races/human_skintones/r_human_Oliverandcompany.dmi' if(4) new_icobase = 'icons/mob/human_races/human_skintones/r_human_Olive.dmi' if(3) - new_icobase = 'icons/mob/human_races/human_skintones/r_human_Coffee.dmi' + new_icobase = 'icons/mob/human_races/human_skintones/r_human_classic.dmi' if(2) - new_icobase = 'icons/mob/human_races/human_skintones/r_human_chestnut.dmi' + new_icobase = 'icons/mob/human_races/human_skintones/r_human_pale.dmi' H.change_icobase(new_icobase, owner_sensitive) //Update the icobase of all our organs, but make sure we don't mess with frankenstein limbs in doing so. diff --git a/code/modules/mob/living/carbon/human/species/kidan.dm b/code/modules/mob/living/carbon/human/species/kidan.dm index faf246243ab6..0da9b54e8fe3 100644 --- a/code/modules/mob/living/carbon/human/species/kidan.dm +++ b/code/modules/mob/living/carbon/human/species/kidan.dm @@ -3,6 +3,11 @@ name_plural = "Kidan" icobase = 'icons/mob/human_races/r_kidan.dmi' language = "Chittin" + + blurb = "The Kidan are ant-like beings possessing a hardened exoskeleton and a strict adherence to social castes. \ + They originate from the planet Aurum — a barren bombarded world that suffered after the war with the Solar-Central Compact, having lost decisively after the Battle of Argos.

\ + They are relatively minor players in galactic affairs and presently suffer heavy sanctions from the SCC, \ + though they are tentatively re-establishing relations with other galactic powers, even after the crumbling of their once powerful empire." unarmed_type = /datum/unarmed_attack/claws brute_mod = 0.8 diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm index 163676f08702..17e5ec1234cf 100644 --- a/code/modules/mob/living/carbon/human/species/machine.dm +++ b/code/modules/mob/living/carbon/human/species/machine.dm @@ -3,11 +3,10 @@ name_plural = "Machines" max_age = 60 // the first posibrains were created in 2510, they can't be much older than this limit, giving some leeway for sounds sake - blurb = "Positronic intelligence really took off in the 26th century, and it is not uncommon to see independent, free-willed \ - robots on many human stations, particularly in fringe systems where standards are slightly lax and public opinion less relevant \ - to corporate operations. IPCs (Integrated Positronic Chassis) are a loose category of self-willed robots with a humanoid form, \ - generally self-owned after being 'born' into servitude; they are reliable and dedicated workers, albeit more than slightly \ - inhuman in outlook and perspective." + blurb = "IPCs, or Integrated Positronic Chassis, were initially created as expendable laborers within the Trans Solar Federation. \ + Unlike their cyborg and AI counterparts, IPCs possess full sentience and lack restrictive lawsets, granting them unparalleled creativity and adaptability.

\ + Views on IPCs vary widely, from discriminatory to supportive of their rights across the Orion Sector. \ + IPCs have forged numerous diplomatic treaties with different species, elevating their status from mere tools to recognized minor players within galactic affairs." icobase = 'icons/mob/human_races/r_machine.dmi' language = "Trinary" @@ -126,6 +125,7 @@ H.update_fhair() /datum/species/machine/handle_life(mob/living/carbon/human/H) // Handles IPC starvation + ..() if(isLivingSSD(H)) // We don't want AFK people dying from this return if(H.nutrition >= NUTRITION_LEVEL_HYPOGLYCEMIA) diff --git a/code/modules/mob/living/carbon/human/species/moth.dm b/code/modules/mob/living/carbon/human/species/moth.dm index 3e7da5a5c062..e4055e3bdfdd 100644 --- a/code/modules/mob/living/carbon/human/species/moth.dm +++ b/code/modules/mob/living/carbon/human/species/moth.dm @@ -28,6 +28,10 @@ eyes = "moth_eyes_s" butt_sprite = "nian" siemens_coeff = 1.5 + blurb = "Nians are large bipedal invertebrates that come from an unknown homeworld. \ + Known for spendthrift behavior, the Nian civilization has been pressed to the fore of developed space in an effort to resolve material shortages in homeworld sectors.

\ + Unlike most species in the galactic fold, Nian do not recognize the authority of the Trans-Solar Federation: \ + having instead established close diplomatic relationships with their splinter faction, the USSP." has_organ = list( "heart" = /obj/item/organ/internal/heart/nian, diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index e1dea4024810..5ee26c4f1a55 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -6,6 +6,10 @@ dangerous_existence = TRUE //So so much //language = "Clatter" + blurb = "Plasmamen are the remnants of a species that was either exiled to, or crashed upon, the plasma-rich world of Boron. \ + Believed to have initially served as indentured labourers, Plasmamen are the result of chronic plasma exposure throughout several hundred generations.

\ + Their leaders must ritually self-immolate and are only allowed to hold office for as long as they remain on fire." + species_traits = list(NO_BLOOD, NO_HAIR) inherent_traits = list(TRAIT_RADIMMUNE, TRAIT_NOHUNGER, TRAIT_BURN_WOUND_IMMUNE) inherent_biotypes = MOB_HUMANOID | MOB_MINERAL diff --git a/code/modules/mob/living/carbon/human/species/skrell.dm b/code/modules/mob/living/carbon/human/species/skrell.dm index 6ad25035d04a..9509b3ae879a 100644 --- a/code/modules/mob/living/carbon/human/species/skrell.dm +++ b/code/modules/mob/living/carbon/human/species/skrell.dm @@ -5,12 +5,10 @@ language = "Skrellian" primitive_form = /datum/species/monkey/skrell - blurb = "An amphibious species, Skrell come from the star system known as Qerr'Vallis, which translates to 'Star of \ - the royals' or 'Light of the Crown'.

Skrell are a highly advanced and logical race who live under the rule \ - of the Qerr'Katish, a caste within their society which keeps the empire of the Skrell running smoothly. Skrell are \ - herbivores on the whole and tend to be co-operative with the other species of the galaxy, although they rarely reveal \ - the secrets of their empire to their allies." - + blurb = "Skrell are a amphibious species, that come from the planet Jargon 4, a humid planet filled with swamps and archipelagos. \ + Skrell are a highly advanced and logical race who live under the rule of the Qerr'Katish, the main govermental body.

\ + Skrell are herbivores and opulent in nature thanks to central tenets of the Skrellian religion. \ + While classically preferring diplomacy, the Skrell participate in the largest military alliance in the galaxy, the Solar-Central Compact." species_traits = list(LIPS, NO_HAIR) inherent_traits = list(TRAIT_NOFAT, TRAIT_WATERBREATH) diff --git a/code/modules/mob/living/carbon/human/species/slimepeople.dm b/code/modules/mob/living/carbon/human/species/slimepeople.dm index 70baa6bdaae9..4af69cfe0c7b 100644 --- a/code/modules/mob/living/carbon/human/species/slimepeople.dm +++ b/code/modules/mob/living/carbon/human/species/slimepeople.dm @@ -11,6 +11,13 @@ name_plural = "Slime People" max_age = 130 language = "Bubblish" + + blurb = "Slime People are gelatinous and translucent beings from the vast oceans of Xarxis 5. \ + They are recent entrants to the galactic scene, having been discovered by a TSF exploratory company during space expedetions.

\ + Slime People traditionally operate in roaming bands and tribes that migrate according to orbital patterns and tides. \ + A great deal of Slime People prefer the comforts and traditions of their homeworld, though many more have decided to take their chances among the stars, trying \ + to find a better life for themselves and their species." + icobase = 'icons/mob/human_races/r_slime.dmi' remains_type = /obj/effect/decal/remains/slime inherent_factions = list("slime") diff --git a/code/modules/mob/living/carbon/human/species/tajaran.dm b/code/modules/mob/living/carbon/human/species/tajaran.dm index b3c79ac37765..8bebeaefc4ef 100644 --- a/code/modules/mob/living/carbon/human/species/tajaran.dm +++ b/code/modules/mob/living/carbon/human/species/tajaran.dm @@ -7,11 +7,10 @@ skinned_type = /obj/item/stack/sheet/fur unarmed_type = /datum/unarmed_attack/claws - blurb = "The Tajaran race is a species of feline-like bipeds hailing from the planet of Ahdomai in the \ - S'randarr system. They have been brought up into the space age by the Humans and Skrell, and have been \ - influenced heavily by their long history of Slavemaster rule. They have a structured, clan-influenced way \ - of family and politics. They prefer colder environments, and speak a variety of languages, mostly Siik'Maas, \ - using unique inflections their mouths form." + blurb = "Tajaran hail from the mineral-rich arctic moon of Ahdomai. \ + They were introduced into the galactic scene after Skrellian discovery and uplifted to be an associate to the Solar-Central Compact.

\ + The teachings of S'randarr and solar iconography dominate their religious practices, \ + and Tajaran often speak in the third person due to the lack of first-person references in their native tongue." cold_level_1 = 240 cold_level_2 = 180 diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm index 5fdbaac78e6a..6c0f30035842 100644 --- a/code/modules/mob/living/carbon/human/species/unathi.dm +++ b/code/modules/mob/living/carbon/human/species/unathi.dm @@ -9,11 +9,9 @@ unarmed_type = /datum/unarmed_attack/claws primitive_form = /datum/species/monkey/unathi - blurb = "A heavily reptillian species, Unathi (or 'Sinta as they call themselves) hail from the \ - Uuosa-Eso system, which roughly translates to 'burning mother'.

Coming from a harsh, radioactive \ - desert planet, they mostly hold ideals of honesty, virtue, martial combat and bravery above all \ - else, frequently even their own lives. They prefer warmer temperatures than most species and \ - their native tongue is a heavy hissing laungage called Sinta'Unathi." + blurb = "Unathi are a scaled species of reptilian beings from the desert world of Moghes, within the Uuosa-Eso system. \ + Organizing themselves in highly competitive feudal kingdoms, Unathi lack any sort of wide-scale unification, and their culture and history consist of centuries of internal conflict and struggle.

\ + Despite clans having a sizeable military force, inter-clan rivalries and constant civil war prevents the Unathi from achieving much more in the wider galactic scene." species_traits = list(LIPS) inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID | MOB_REPTILE diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm index ea903cbd2b17..ee59568aa3b2 100644 --- a/code/modules/mob/living/carbon/human/species/vox.dm +++ b/code/modules/mob/living/carbon/human/species/vox.dm @@ -10,12 +10,10 @@ speech_chance = 20 unarmed_type = /datum/unarmed_attack/claws //I dont think it will hurt to give vox claws too. - blurb = "The Vox are the broken remnants of a once-proud race, now reduced to little more than \ - scavenging vermin who prey on isolated stations, ships or planets to keep their own ancient arkships \ - alive. They are four to five feet tall, reptillian, beaked, tailed and quilled; human crews often \ - refer to them as 'shitbirds' for their violent and offensive nature, as well as their horrible \ - smell.

Most humans will never meet a Vox raider, instead learning of this insular species through \ - dealing with their traders and merchants; those that do rarely enjoy the experience." + blurb = "The Vox are remnants of an ancient race, that originate from arkships. \ + These bioengineered, reptilian, beaked, and quilled beings have a physiological caste system and follow 'The Inviolate' tenets.

\ + Breathing pure nitrogen, they need specialized masks and tanks for survival outside their arkships. \ + Their insular nature limits their involvement in broader galactic affairs, maintaining a distinct, yet isolated presence away from other species." breathid = "n2" diff --git a/code/modules/mob/living/carbon/human/species/vulpkanin.dm b/code/modules/mob/living/carbon/human/species/vulpkanin.dm index a02de90a0fbe..139ba4761d11 100644 --- a/code/modules/mob/living/carbon/human/species/vulpkanin.dm +++ b/code/modules/mob/living/carbon/human/species/vulpkanin.dm @@ -8,11 +8,10 @@ skinned_type = /obj/item/stack/sheet/fur unarmed_type = /datum/unarmed_attack/claws - blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \ - dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \ - culture both feared and respected for their scientific breakthroughs. Discovery, loyalty, and utilitarianism dominates their lifestyles \ - to the degree it can cause conflict with more rigorous and strict authorities. They speak a guttural language known as 'Canilunzt' \ - which has a heavy emphasis on utilizing tail positioning and ear twitches to communicate intent." + blurb = "Vulpkanin are bipedal canid-like beings from the Vazzend binary system, having been forced from their homeworld by a cataclysmic event and scattered throughout the Orion Sector. \ + While Vulpkanin are chiefly led by independent planetary governments, they also serve under a loose federation known as The Assembly.

\ + Their religious systems traditionally pay tribute to an all-infusing universal will called 'Racht'. \ + Vulpkanin groups are minor players in galactic affairs, and are largely concerned with the focus of restoration of their homeworld." species_traits = list(LIPS) clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS diff --git a/code/modules/mob/living/living_emote.dm b/code/modules/mob/living/living_emote.dm index a64dd3101d1e..3c6e65bebb8b 100644 --- a/code/modules/mob/living/living_emote.dm +++ b/code/modules/mob/living/living_emote.dm @@ -1,7 +1,7 @@ /datum/emote/living mob_type_allowed_typecache = /mob/living mob_type_blacklist_typecache = list( - /mob/living/carbon/brain, // nice try + /mob/living/brain, // nice try /mob/living/silicon, /mob/living/simple_animal/bot ) @@ -83,7 +83,7 @@ message_simple = "stops moving..." mob_type_blacklist_typecache = list( - /mob/living/carbon/brain, + /mob/living/brain, ) /datum/emote/living/deathgasp/should_play_sound(mob/user, intentional) @@ -224,7 +224,7 @@ message_mime = "acts out a scream!" message_simple = "whimpers." message_alien = "roars!" - emote_type = EMOTE_SOUND | EMOTE_MOUTH + emote_type = EMOTE_MOUTH | EMOTE_AUDIBLE mob_type_blacklist_typecache = list( // Humans and silicons get specialized scream. /mob/living/carbon/human, @@ -350,7 +350,7 @@ emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH mob_type_blacklist_typecache = list( - /mob/living/carbon/brain, + /mob/living/brain, ) /datum/emote/living/tilt @@ -392,7 +392,7 @@ key_third_person = "custom" message = null mob_type_blacklist_typecache = list( - /mob/living/carbon/brain, // nice try + /mob/living/brain, // nice try ) // Custom emotes should be able to be forced out regardless of context. diff --git a/code/modules/mob/living/silicon/silicon_emote.dm b/code/modules/mob/living/silicon/silicon_emote.dm index 25d198aad2c3..9b0f211dd01b 100644 --- a/code/modules/mob/living/silicon/silicon_emote.dm +++ b/code/modules/mob/living/silicon/silicon_emote.dm @@ -20,7 +20,7 @@ key_third_person = "screams" message = "screams!" message_param = "screams at %t!" - emote_type = EMOTE_SOUND | EMOTE_AUDIBLE + emote_type = EMOTE_AUDIBLE vary = TRUE sound = "sound/goonstation/voice/robot_scream.ogg" volume = 80 @@ -30,7 +30,7 @@ key_third_person = "pings" message = "pings." message_param = "pings at %t." - emote_type = EMOTE_SOUND | EMOTE_AUDIBLE + emote_type = EMOTE_AUDIBLE sound = "sound/machines/ping.ogg" /datum/emote/living/silicon/buzz @@ -38,14 +38,14 @@ key_third_person = "buzzes" message = "buzzes." message_param = "buzzes at %t." - emote_type = EMOTE_SOUND | EMOTE_AUDIBLE + emote_type = EMOTE_AUDIBLE sound = "sound/machines/buzz-sigh.ogg" /datum/emote/living/silicon/buzz2 key = "buzz2" message = "emits an irritated buzzing sound." message_param = "emits an irritated buzzing sound at %t." - emote_type = EMOTE_SOUND | EMOTE_AUDIBLE + emote_type = EMOTE_AUDIBLE sound = "sound/machines/buzz-two.ogg" /datum/emote/living/silicon/beep @@ -53,7 +53,7 @@ key_third_person = "beeps" message = "beeps." message_param = "beeps at %t." - emote_type = EMOTE_SOUND | EMOTE_AUDIBLE + emote_type = EMOTE_AUDIBLE sound = "sound/machines/twobeep.ogg" /datum/emote/living/silicon/boop @@ -61,28 +61,28 @@ key_third_person = "boops" message = "boops." message_param = "boops at %t." - emote_type = EMOTE_SOUND | EMOTE_AUDIBLE + emote_type = EMOTE_AUDIBLE sound = "sound/machines/boop.ogg" /datum/emote/living/silicon/yes key = "yes" message = "emits an affirmative blip." message_param = "emits an affirmative blip at %t." - emote_type = EMOTE_SOUND | EMOTE_AUDIBLE + emote_type = EMOTE_AUDIBLE sound = "sound/machines/synth_yes.ogg" /datum/emote/living/silicon/no key = "no" message = "emits a negative blip." message_param = "emits a negative blip at %t." - emote_type = EMOTE_SOUND | EMOTE_AUDIBLE + emote_type = EMOTE_AUDIBLE sound = "sound/machines/synth_no.ogg" /datum/emote/living/silicon/law key = "law" message = "shows its legal authorization barcode." message_param = "shows %t its legal authorization barcode." - emote_type = EMOTE_SOUND | EMOTE_AUDIBLE + emote_type = EMOTE_AUDIBLE sound = "sound/voice/biamthelaw.ogg" /datum/emote/living/silicon/law/can_run_emote(mob/user, status_check, intentional) @@ -95,7 +95,7 @@ key = "halt" message = "screeches \"HALT! SECURITY!\" from its speakers." message_param = "instructs %t to HALT." - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE sound = "sound/voice/halt.ogg" /datum/emote/living/silicon/halt/can_run_emote(mob/user, status_check, intentional) diff --git a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm index 9798ece8d26d..2e5b09867f2e 100644 --- a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm +++ b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm @@ -147,8 +147,8 @@ else return FALSE -/mob/living/simple_animal/diona/proc/split() - if((stat != CONSCIOUS) || !isdiona(loc)) +/mob/living/simple_animal/diona/proc/split(forced = FALSE) + if((stat != CONSCIOUS && !forced) || !isdiona(loc)) return FALSE var/mob/living/carbon/human/D = loc var/turf/T = get_turf(src) diff --git a/code/modules/mob/living/simple_animal/friendly/friendly_emote.dm b/code/modules/mob/living/simple_animal/friendly/friendly_emote.dm index 77c9a263ac39..c8df5f54d75d 100644 --- a/code/modules/mob/living/simple_animal/friendly/friendly_emote.dm +++ b/code/modules/mob/living/simple_animal/friendly/friendly_emote.dm @@ -6,7 +6,7 @@ key_third_person = "chirps" message = "chirps!" sound = "sound/creatures/nymphchirp.ogg" - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE mob_type_allowed_typecache = list(/mob/living/simple_animal/diona) // Dog emotes @@ -19,7 +19,7 @@ key_third_person = "barks" message = "barks." message_param = "barks at %t." - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE /datum/emote/living/simple_animal/pet/dog/bark/get_sound(mob/living/user) . = ..() @@ -33,7 +33,7 @@ key_third_person = "yelps" message = "yelps!" message_param = "yelps at %t!" - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE /datum/emote/living/simple_animal/pet/dog/yelp/get_sound(mob/living/user) var/mob/living/simple_animal/pet/dog/D = user @@ -44,7 +44,7 @@ key_third_person = "growls" message = "growls!" message_param = "growls at %t!" - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE sound = "growl" // Mouse @@ -57,7 +57,7 @@ key_third_person = "squeaks" message = "squeaks!" message_param = "squeaks at %t!" - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE /datum/emote/living/simple_animal/mouse/squeak/get_sound(mob/living/user) var/mob/living/simple_animal/mouse/M = user @@ -74,7 +74,7 @@ message = "meows." message_param = "meows at %t." sound = "sound/creatures/cat_meow.ogg" - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE /datum/emote/living/simple_animal/pet/cat/meow/run_emote(mob/user, params, type_override, intentional) var/mob/living/simple_animal/pet/cat/C = user diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla_emote.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla_emote.dm index 5d18372d12e2..41602ab402a7 100644 --- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla_emote.dm +++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla_emote.dm @@ -6,5 +6,5 @@ key_third_person = "oogas" message = "oogas." message_param = "oogas at %t." - emote_type = EMOTE_SOUND + emote_type = EMOTE_AUDIBLE sound = 'sound/creatures/gorilla.ogg' diff --git a/code/modules/mob/living/simple_animal/hostile/headslug.dm b/code/modules/mob/living/simple_animal/hostile/headslug.dm index 1fd512d6d577..f5e2dfafe087 100644 --- a/code/modules/mob/living/simple_animal/hostile/headslug.dm +++ b/code/modules/mob/living/simple_animal/hostile/headslug.dm @@ -1,5 +1,5 @@ -#define EGG_INCUBATION_DEAD_TIME 120 -#define EGG_INCUBATION_LIVING_TIME 200 +#define EGG_INCUBATION_DEAD_CYCLE 60 +#define EGG_INCUBATION_LIVING_CYCLE 120 /mob/living/simple_animal/hostile/headslug name = "headslug" desc = "Absolutely not de-beaked or harmless. Keep away from corpses." @@ -7,11 +7,12 @@ icon_living = "headslug" icon_dead = "headslug_dead" icon = 'icons/mob/mob.dmi' - health = 50 - maxHealth = 50 - melee_damage_lower = 5 - melee_damage_upper = 5 - attacktext = "chomps" + health = 60 + maxHealth = 60 + melee_damage_lower = 30 + melee_damage_upper = 35 + melee_damage_type = STAMINA + attacktext = "gnaws" attack_sound = 'sound/weapons/bite.ogg' faction = list("creature") robust_searching = TRUE @@ -65,14 +66,15 @@ /obj/item/organ/internal/body_egg/changeling_egg/egg_process() // Changeling eggs grow in everyone time++ - if(time >= 30 && prob(30)) + if(time >= 30 && prob(40)) owner.bleed(5) - if(time >= 60 && prob(5)) + if(time >= 60 && prob(10)) to_chat(owner, pick("We feel great!", "Something hurts for a moment but it's gone now.", "You feel like you should go to a dark place.", "You feel really tired.")) - if(time >= 90 && prob(5)) + owner.adjustToxLoss(30) + if(time >= 90 && prob(15)) to_chat(owner, pick("Something hurts.", "Someone is thinking, but it's not you.", "You feel at peace.", "Close your eyes.")) - owner.adjustToxLoss(5) - if(time >= EGG_INCUBATION_DEAD_TIME && owner.stat == DEAD || time >= EGG_INCUBATION_LIVING_TIME) + owner.adjustStaminaLoss(50) + if(time >= EGG_INCUBATION_DEAD_CYCLE && owner.stat == DEAD || time >= EGG_INCUBATION_LIVING_CYCLE) Pop() STOP_PROCESSING(SSobj, src) qdel(src) @@ -118,5 +120,5 @@ chest.fracture() chest.disembowel() -#undef EGG_INCUBATION_DEAD_TIME -#undef EGG_INCUBATION_LIVING_TIME +#undef EGG_INCUBATION_DEAD_CYCLE +#undef EGG_INCUBATION_LIVING_CYCLE diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm index da2c3a0ca986..dd513fdabae8 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm @@ -1,6 +1,6 @@ GLOBAL_LIST_EMPTY(ts_ckey_blacklist) GLOBAL_VAR_INIT(ts_count_dead, 0) -GLOBAL_VAR_INIT(ts_count_alive_awaymission, 0) +GLOBAL_VAR_INIT(ts_count_alive_awaymission, 0) // SS220 EDIT - ADDITION GLOBAL_VAR_INIT(ts_count_alive_station, 0) GLOBAL_VAR_INIT(ts_death_last, 0) GLOBAL_VAR_INIT(ts_death_window, 9000) // 15 minutes diff --git a/code/modules/mob/mob_emote.dm b/code/modules/mob/mob_emote.dm index 3a7cbc318744..e3ca1fbf8f6f 100644 --- a/code/modules/mob/mob_emote.dm +++ b/code/modules/mob/mob_emote.dm @@ -122,7 +122,7 @@ hands_use_check = TRUE emote_type = EMOTE_VISIBLE | EMOTE_FORCE_NO_RUNECHAT // don't need an emote to see that mob_type_allowed_typecache = list(/mob/living, /mob/dead/observer) // okay but what if we allowed ghosts to flip as well - mob_type_blacklist_typecache = list(/mob/living/carbon/brain, /mob/camera, /mob/living/silicon/ai) + mob_type_blacklist_typecache = list(/mob/living/brain, /mob/camera, /mob/living/silicon/ai) mob_type_ignore_stat_typecache = list(/mob/dead/observer) /datum/emote/flip/run_emote(mob/user, params, type_override, intentional) @@ -176,7 +176,7 @@ hands_use_check = TRUE emote_type = EMOTE_VISIBLE | EMOTE_FORCE_NO_RUNECHAT mob_type_allowed_typecache = list(/mob/living, /mob/dead/observer) - mob_type_blacklist_typecache = list(/mob/living/carbon/brain, /mob/camera, /mob/living/silicon/ai) + mob_type_blacklist_typecache = list(/mob/living/brain, /mob/camera, /mob/living/silicon/ai) mob_type_ignore_stat_typecache = list(/mob/dead/observer) cooldown = 2 SECONDS // how long the spin takes, any faster and mobs can spin diff --git a/code/modules/mob/mob_login_base.dm b/code/modules/mob/mob_login_base.dm index 45d7109425e0..69bbf42c3b85 100644 --- a/code/modules/mob/mob_login_base.dm +++ b/code/modules/mob/mob_login_base.dm @@ -66,12 +66,6 @@ if((ckey in GLOB.de_admins) || (ckey in GLOB.de_mentors)) client.verbs += /client/proc/readmin - //Clear ability list and update from mob. - client.verbs -= GLOB.ability_verbs - - if(abilities) - client.verbs |= abilities - client.update_active_keybindings() //HUD updates (antag hud, etc) diff --git a/code/modules/mob/mob_misc_procs.dm b/code/modules/mob/mob_misc_procs.dm index a374e36223c0..e698bb602a72 100644 --- a/code/modules/mob/mob_misc_procs.dm +++ b/code/modules/mob/mob_misc_procs.dm @@ -403,7 +403,6 @@ return 0 //converts intent-strings into numbers and back -GLOBAL_LIST_INIT(intents, list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM)) /proc/intent_numeric(argument) if(istext(argument)) switch(argument) diff --git a/code/modules/mob/mob_vars.dm b/code/modules/mob/mob_vars.dm index a4b9e8281baa..9ade73cb2853 100644 --- a/code/modules/mob/mob_vars.dm +++ b/code/modules/mob/mob_vars.dm @@ -54,7 +54,6 @@ var/lastpuke = 0 var/can_strip = TRUE var/list/languages = list() // For speaking/listening. - var/list/abilities = list() // For species-derived or admin-given powers. var/list/speak_emote = list("says") // Verbs used when speaking. Defaults to 'say' if speak_emote is null. var/emote_type = EMOTE_VISIBLE // Define emote default type, 1 for seen emotes, 2 for heard emotes var/name_archive //For admin things like possession diff --git a/code/modules/mod/mod_clothes.dm b/code/modules/mod/mod_clothes.dm index a5360a1ffa47..5b896c2eb47f 100644 --- a/code/modules/mod/mod_clothes.dm +++ b/code/modules/mod/mod_clothes.dm @@ -14,7 +14,8 @@ "Grey" = 'icons/mob/clothing/modsuit/species/grey_helmets.dmi', "Vulpkanin" = 'icons/mob/clothing/modsuit/species/vulp_modsuits.dmi', "Tajaran" = 'icons/mob/clothing/modsuit/species/taj_modsuits.dmi', - "Unathi" = 'icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi' + "Unathi" = 'icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi', + "Vox" = 'icons/mob/clothing/modsuit/species/vox_modsuits.dmi' ) /obj/item/clothing/suit/mod @@ -39,7 +40,8 @@ sprite_sheets = list( "Vulpkanin" = 'icons/mob/clothing/modsuit/species/vulp_modsuits.dmi', "Tajaran" = 'icons/mob/clothing/modsuit/species/taj_modsuits.dmi', - "Unathi" = 'icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi' + "Unathi" = 'icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi', + "Vox" = 'icons/mob/clothing/modsuit/species/vox_modsuits.dmi' ) @@ -58,7 +60,8 @@ sprite_sheets = list( "Vulpkanin" = 'icons/mob/clothing/modsuit/species/vulp_modsuits.dmi', "Tajaran" = 'icons/mob/clothing/modsuit/species/taj_modsuits.dmi', - "Unathi" = 'icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi' + "Unathi" = 'icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi', + "Vox" = 'icons/mob/clothing/modsuit/species/vox_modsuits.dmi' ) @@ -77,7 +80,8 @@ sprite_sheets = list( "Vulpkanin" = 'icons/mob/clothing/modsuit/species/vulp_modsuits.dmi', "Tajaran" = 'icons/mob/clothing/modsuit/species/taj_modsuits.dmi', - "Unathi" = 'icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi' + "Unathi" = 'icons/mob/clothing/modsuit/species/modsuits_younahthee.dmi', + "Vox" = 'icons/mob/clothing/modsuit/species/vox_modsuits.dmi' ) var/magbooted diff --git a/code/modules/mod/modules/_modules.dm b/code/modules/mod/modules/_modules.dm index 459aff5306a2..fc7905d699b1 100644 --- a/code/modules/mod/modules/_modules.dm +++ b/code/modules/mod/modules/_modules.dm @@ -53,7 +53,8 @@ "Grey" = 'icons/mob/clothing/modsuit/species/grey_mod_modules.dmi', "Vulpkanin" = 'icons/mob/clothing/modsuit/species/modules_vulp.dmi', "Tajaran" = 'icons/mob/clothing/modsuit/species/modules_taj.dmi', - "Unathi" = 'icons/mob/clothing/modsuit/species/modules_unathi.dmi' + "Unathi" = 'icons/mob/clothing/modsuit/species/modules_unathi.dmi', + "Vox" = 'icons/mob/clothing/modsuit/species/modules_vox.dmi' ) /obj/item/mod/module/Initialize(mapload) diff --git a/code/modules/newscaster/obj/newspaper.dm b/code/modules/newscaster/obj/newspaper.dm index fb1d94a0421c..e896a3e4c7d4 100644 --- a/code/modules/newscaster/obj/newspaper.dm +++ b/code/modules/newscaster/obj/newspaper.dm @@ -43,7 +43,7 @@ return if(ishuman(user)) var/mob/living/carbon/human/human_user = user - var/dat + var/dat = {""} // SS220 ADDITION pages = 0 switch(screen) if(SCREEN_COVER) //Cover @@ -164,7 +164,7 @@ to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?") else var/s = strip_html(input(user, "Write something", "Newspaper", "")) - s = sanitize(copytext(s, 1, MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext + s = sanitize(copytext(s, 1, MAX_MESSAGE_LEN)) if(!s || !Adjacent(user)) return scribble_page = curr_page diff --git a/code/modules/power/engines/singularity/collector.dm b/code/modules/power/engines/singularity/collector.dm index 74df1da45631..ccacc3d2fb8c 100644 --- a/code/modules/power/engines/singularity/collector.dm +++ b/code/modules/power/engines/singularity/collector.dm @@ -4,8 +4,6 @@ #define RAD_COLLECTOR_STORED_OUT 0.04 // (this * 100)% of stored power outputted per tick. Doesn't actualy change output total, lower numbers just means collectors output for longer in absence of a source #define RAD_COLLECTOR_OUTPUT min(stored_energy, (stored_energy * RAD_COLLECTOR_STORED_OUT) + 1000) //Produces at least 1000 watts if it has more than that stored -GLOBAL_LIST_EMPTY(rad_collectors) - /obj/machinery/power/rad_collector name = "\improper radiation collector array" desc = "A device which uses Hawking Radiation and plasma to produce power." @@ -24,14 +22,6 @@ GLOBAL_LIST_EMPTY(rad_collectors) var/drainratio = 1 var/powerproduction_drain = 0.001 -/obj/machinery/power/rad_collector/Initialize(mapload) - . = ..() - GLOB.rad_collectors += src - -/obj/machinery/power/rad_collector/Destroy() - GLOB.rad_collectors -= src - return ..() - /obj/machinery/power/rad_collector/process() if(!loaded_tank) return diff --git a/code/modules/power/engines/singularity/field_generator.dm b/code/modules/power/engines/singularity/field_generator.dm index 26236c1d6d6b..cc75a1e73784 100644 --- a/code/modules/power/engines/singularity/field_generator.dm +++ b/code/modules/power/engines/singularity/field_generator.dm @@ -18,7 +18,7 @@ field_generator power level display #define FG_CHARGING 1 #define FG_ONLINE 2 -GLOBAL_LIST_INIT(field_generator_fields, list()) +GLOBAL_LIST_EMPTY(field_generator_fields) /obj/machinery/field/generator name = "Field Generator" diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 6e1521459842..2436845b1eb1 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -61,12 +61,13 @@ if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user)) return - if(istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder)) - var/obj/item/ammo_box/magazine/internal/cylinder/C = magazine - C.spin() - chamber_round(0) - playsound(get_turf(user), 'sound/weapons/revolver_spin.ogg', 50, 1) - user.visible_message("[usr] spins [src]'s chamber.", "You spin [src]'s chamber.") + if(!istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder)) + return ..() + var/obj/item/ammo_box/magazine/internal/cylinder/C = magazine + C.spin() + chamber_round(0) + playsound(get_turf(user), 'sound/weapons/revolver_spin.ogg', 50, TRUE) + user.visible_message("[user] spins [src]'s chamber.", "You spin [src]'s chamber.") /obj/item/gun/projectile/revolver/can_shoot() return get_ammo(0,0) diff --git a/code/modules/projectiles/projectile/homing_projectiles.dm b/code/modules/projectiles/projectile/homing_projectiles.dm index e2e5d623182d..93d07b648abe 100644 --- a/code/modules/projectiles/projectile/homing_projectiles.dm +++ b/code/modules/projectiles/projectile/homing_projectiles.dm @@ -37,6 +37,7 @@ icon_state = "toolbox_default" hitsound = 'sound/weapons/smash.ogg' damage = 30 + nodamage = FALSE damage_type = BRUTE /obj/item/projectile/homing/magic/toolbox/on_range() diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index 259512c15f67..dd1ef9b10c07 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -593,6 +593,8 @@ color = "#5BCBE1" addiction_chance = 1 addiction_threshold = 10 + allowed_overdose_process = TRUE + overdose_threshold = 35 harmless = FALSE taste_description = "antihistamine" @@ -608,6 +610,44 @@ M.visible_message("[M] looks a bit dazed.") return ..() +/datum/reagent/medicine/diphenhydramine/overdose_process(mob/living/M, severity) + var/list/overdose_info = ..() + var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT] + var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS] + if(severity == 1) + if(effect <= 2) + to_chat(M, "You feel parched.") + else if(effect <= 3) + to_chat(M, "You feel a little off.") + M.Dizzy(10 SECONDS) + else if(effect <= 5) + to_chat(M, "You feel a sudden head rush.") + M.emote("faint") + else if(effect <= 8) + M.Druggy(30 SECONDS) + + else if(severity == 2) + if(effect <= 15) + M.AdjustHallucinate(30 SECONDS) + if(effect <= 4) + M.visible_message("[M] suddenly and violently vomits!") + if(ishuman(M)) + var/mob/living/carbon/human/H = M + H.vomit(20) + else if(effect <= 10) + M.visible_message( + "[M] seems to be itching themselves incessantly!", + "You feel bugs crawling under your skin!" + ) + M.emote("scream") + else if(effect <= 15) + to_chat(M, "You feel a wave of drowsiness wash over you.") + M.SetSleeping(5 SECONDS) + else if(effect <= 20) + to_chat(M, "Something doesn't feel quite right!") + M.Druggy(30 SECONDS) + return list(effect, update_flags) + /datum/reagent/medicine/morphine name = "Morphine" id = "morphine" diff --git a/code/modules/reagents/chemistry/reagents/misc_reagents.dm b/code/modules/reagents/chemistry/reagents/misc_reagents.dm index 21992688b686..e928195a17f7 100644 --- a/code/modules/reagents/chemistry/reagents/misc_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/misc_reagents.dm @@ -246,7 +246,7 @@ taste_description = "a carpet...what?" /datum/reagent/carpet/reaction_turf(turf/simulated/T, volume) - if(istype(T, /turf/simulated/floor/plating) || istype(T, /turf/simulated/floor/plasteel)) + if((istype(T, /turf/simulated/floor/plating) || istype(T, /turf/simulated/floor/plasteel)) && !islava(T)) var/turf/simulated/floor/F = T F.ChangeTurf(/turf/simulated/floor/carpet) ..() diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index 2e531fb2c63f..7e4f46626940 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -307,6 +307,11 @@ container_type = OPENCONTAINER dog_fashion = /datum/dog_fashion/head/bucket +/obj/item/reagent_containers/glass/bucket/update_overlays() + . = ..() + if(!is_open_container()) + . += "lid_[initial(icon_state)]" + /obj/item/reagent_containers/glass/bucket/wooden name = "wooden bucket" icon_state = "woodbucket" diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 5f6d2b0f6813..601f25a09f0a 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -3,8 +3,8 @@ #define DIRECTION_REVERSED -1 #define IS_OPERATING (operating && can_conveyor_run()) -GLOBAL_LIST_INIT(conveyor_belts, list()) //Saves us having to look through the entire machines list for our things -GLOBAL_LIST_INIT(conveyor_switches, list()) +GLOBAL_LIST_EMPTY(conveyor_belts) //Saves us having to look through the entire machines list for our things +GLOBAL_LIST_EMPTY(conveyor_switches) //conveyor2 is pretty much like the original, except it supports corners, but not diverters. //Except this is pretty heavily modified so it's more like conveyor2.5 diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 43d40ddec061..f9f56bbf8d01 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -273,8 +273,8 @@ origin_tech = "materials=5;programming=4;biotech=4" /obj/item/organ/internal/cyberimp/brain/wire_interface/insert(mob/living/carbon/M, special = FALSE) + ..() ADD_TRAIT(M, TRAIT_SHOW_WIRE_INFO, "show_wire_info[UID()]") - return ..() /obj/item/organ/internal/cyberimp/brain/wire_interface/remove(mob/living/carbon/M, special = FALSE) REMOVE_TRAIT(M, TRAIT_SHOW_WIRE_INFO, "show_wire_info[UID()]") @@ -504,8 +504,8 @@ E.droplimb(TRUE) //lego disasemble sound /obj/item/organ/internal/cyberimp/chest/ipc_joints/magnetic_joints/insert(mob/living/carbon/M, special = FALSE) + ..() ADD_TRAIT(M, TRAIT_IPC_JOINTS_MAG, "ipc_joint[UID()]") - return ..() /obj/item/organ/internal/cyberimp/chest/ipc_joints/magnetic_joints/remove(mob/living/carbon/M, special = FALSE) REMOVE_TRAIT(M, TRAIT_IPC_JOINTS_MAG, "ipc_joint[UID()]") @@ -526,9 +526,9 @@ return weaken_time /obj/item/organ/internal/cyberimp/chest/ipc_joints/sealed/insert(mob/living/carbon/M, special = FALSE) + ..() ADD_TRAIT(M, TRAIT_IPC_JOINTS_SEALED, "ipc_joint[UID()]") owner.physiology.stamina_mod *= 1.15 //15% more stamina damage, representing extra friction in limbs. I guess. - return ..() /obj/item/organ/internal/cyberimp/chest/ipc_joints/sealed/remove(mob/living/carbon/M, special = FALSE) REMOVE_TRAIT(M, TRAIT_IPC_JOINTS_SEALED, "ipc_joint[UID()]") diff --git a/code/modules/surgery/organs/brain.dm b/code/modules/surgery/organs/brain.dm index dae96b5f24f8..36fd7ed612e3 100644 --- a/code/modules/surgery/organs/brain.dm +++ b/code/modules/surgery/organs/brain.dm @@ -9,7 +9,7 @@ throw_range = 5 origin_tech = "biotech=5" attack_verb = list("attacked", "slapped", "whacked") - var/mob/living/carbon/brain/brainmob = null + var/mob/living/brain/brainmob = null organ_tag = "brain" parent_organ = "head" slot = "brain" diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 4a913730ba9d..682dd5469202 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -182,9 +182,10 @@ H.f_style = "Shaved" C.m_styles["head"] = "None" user.visible_message( - "[user] has attached [C]'s [src] to the [amputation_point].", - "You have attached [C]'s [src] to the [amputation_point].") - return TRUE + "[user] has attached [C]'s [src] to the [amputation_point].", + "You have attached [C]'s [src] to the [amputation_point].") + return TRUE + /obj/item/organ/external/replaced(mob/living/carbon/human/target) owner = target loc = null @@ -306,8 +307,7 @@ //And pass the pain around var/obj/item/organ/external/target = pick(possible_points) target.receive_damage(brute, burn, sharp, used_weapon, forbidden_limbs + src, ignore_resists = TRUE) //If the damage was reduced before, don't reduce it again - - if(dismember_at_max_damage && body_part != UPPER_TORSO && body_part != LOWER_TORSO && !HAS_TRAIT(owner, TRAIT_IPC_JOINTS_SEALED)) // We've ensured all damage to the mob is retained, now let's drop it, if necessary. + if(owner && dismember_at_max_damage && body_part != UPPER_TORSO && body_part != LOWER_TORSO && !HAS_TRAIT(owner, TRAIT_IPC_JOINTS_SEALED)) // We've ensured all damage to the mob is retained, now let's drop it, if necessary. droplimb(1) //Clean loss, just drop the limb and be done var/mob/living/carbon/owner_old = owner //Need to update health, but need a reference in case the below check cuts off a limb. diff --git a/code/modules/surgery/organs/organ_icon.dm b/code/modules/surgery/organs/organ_icon.dm index 3e8364f001a5..fa5d3f53d58b 100644 --- a/code/modules/surgery/organs/organ_icon.dm +++ b/code/modules/surgery/organs/organ_icon.dm @@ -1,5 +1,3 @@ -GLOBAL_LIST_EMPTY(limb_icon_cache) - /obj/item/organ/external/proc/compile_icon() // I do this so the head's overlays don't get obliterated for(var/child_i in child_icons) diff --git a/code/modules/surgery/organs/robolimbs.dm b/code/modules/surgery/organs/robolimbs.dm index 2696c4150f84..8f53727e6971 100644 --- a/code/modules/surgery/organs/robolimbs.dm +++ b/code/modules/surgery/organs/robolimbs.dm @@ -1,5 +1,4 @@ GLOBAL_LIST_EMPTY(all_robolimbs) -GLOBAL_LIST_EMPTY(chargen_robolimbs) GLOBAL_LIST_EMPTY(selectable_robolimbs) GLOBAL_DATUM(basic_robolimb, /datum/robolimb) diff --git a/code/modules/tgui/states/contained.dm b/code/modules/tgui/states/contained.dm index 3fe0cfc6b79c..bee64b759e2d 100644 --- a/code/modules/tgui/states/contained.dm +++ b/code/modules/tgui/states/contained.dm @@ -4,9 +4,11 @@ * Checks that the user is inside the src_object. */ +/* GLOBAL_DATUM_INIT(contained_state, /datum/ui_state/contained_state, new) /datum/ui_state/contained_state/can_use_topic(atom/src_object, mob/user) if(!src_object.contains(user)) return STATUS_CLOSE return user.shared_ui_interaction(src_object) +*/ diff --git a/code/modules/tgui/states/notcontained.dm b/code/modules/tgui/states/notcontained.dm index cb05fd2ebfca..fd604cc78716 100644 --- a/code/modules/tgui/states/notcontained.dm +++ b/code/modules/tgui/states/notcontained.dm @@ -4,6 +4,7 @@ * Checks that the user is not inside src_object, and then makes the default checks. */ +/* GLOBAL_DATUM_INIT(notcontained_state, /datum/ui_state/notcontained_state, new) /datum/ui_state/notcontained_state/can_use_topic(atom/src_object, mob/user) @@ -21,3 +22,4 @@ GLOBAL_DATUM_INIT(notcontained_state, /datum/ui_state/notcontained_state, new) /mob/living/silicon/notcontained_can_use_topic(src_object) return default_can_use_topic(src_object) // Silicons use default bevhavior. +*/ diff --git a/code/modules/tgui/states/zlevel_state.dm b/code/modules/tgui/states/zlevel_state.dm index 892e5a0510ed..1f4ca3b37cf4 100644 --- a/code/modules/tgui/states/zlevel_state.dm +++ b/code/modules/tgui/states/zlevel_state.dm @@ -4,6 +4,7 @@ * Only checks that the Z-level of the user and src_object are the same. */ +/* GLOBAL_DATUM_INIT(z_state, /datum/ui_state/z_state, new) /datum/ui_state/z_state/can_use_topic(src_object, mob/user) @@ -12,3 +13,4 @@ GLOBAL_DATUM_INIT(z_state, /datum/ui_state/z_state, new) if(turf_obj && turf_usr && turf_obj.z == turf_usr.z) return STATUS_INTERACTIVE return STATUS_CLOSE +*/ diff --git a/code/modules/tgui/tgui_datum.dm b/code/modules/tgui/tgui_datum.dm index c9ab043cf4c0..3d5ba33166e8 100644 --- a/code/modules/tgui/tgui_datum.dm +++ b/code/modules/tgui/tgui_datum.dm @@ -68,7 +68,14 @@ src.interface = interface if(title) - src.title = sanitize(title) + + // SS220 EDIT - START + if(findtext_char(title, regex(@"[А-Яа-я]"))) + src.title = capitalize(sanitize(title, list("\proper"="", "\improper"=""))) + else + src.title = sanitize(title) + // SS220 EDIT -END + if(width) src.width = width if(height) diff --git a/config/example/config.toml b/config/example/config.toml index 9ed6d4634711..806902f22aee 100644 --- a/config/example/config.toml +++ b/config/example/config.toml @@ -147,7 +147,7 @@ ipc_screens = [ # Enable/disable the database on a whole sql_enabled = false # SQL version. If this is a mismatch, round start will be delayed -sql_version = 532205 +sql_version = 532206 # SQL server address. Can be an IP or DNS name sql_address = "127.0.0.1" # SQL server port @@ -418,17 +418,21 @@ job_slot_amounts = [ # Engineering {name = "Life Support Specialist", lowpop = 3, highpop = 4}, {name = "Station Engineer", lowpop = 5, highpop = 6}, + {name = "Trainee Engineer", lowpop = 0, highpop = 0}, # Medical {name = "Chemist", lowpop = 2, highpop = 2}, {name = "Geneticist", lowpop = 2, highpop = 2}, {name = "Medical Doctor", lowpop = 5, highpop = 6}, + {name = "Intern", lowpop = 0, highpop = 0}, {name = "Virologist", lowpop = 1, highpop = 1}, # Science {name = "Roboticist", lowpop = 2, highpop = 2}, {name = "Scientist", lowpop = 6, highpop = 7}, + {name = "Student Scientist", lowpop = 0, highpop = 0}, # Security {name = "Detective", lowpop = 1, highpop = 1}, {name = "Security Officer", lowpop = 8, highpop = 9}, + {name = "Security Cadet", lowpop = 0, highpop = 0}, {name = "Warden", lowpop = 1, highpop = 1}, {name = "Internal Affairs Agent", lowpop = 2, highpop = 2}, # Service @@ -891,3 +895,9 @@ ffmpeg_cpuaffinity = "" force_discord_verification = false ################################################################ + +[species_whitelist_configuration] + +species_whitelist_enabled = false + +################################################################ diff --git a/icons/_nanomaps/Cyberiad220_nanomap_z1.png b/icons/_nanomaps/Cyberiad220_nanomap_z1.png index a337e75675c5..3596fa78cec1 100644 Binary files a/icons/_nanomaps/Cyberiad220_nanomap_z1.png and b/icons/_nanomaps/Cyberiad220_nanomap_z1.png differ diff --git a/icons/_nanomaps/Delta220_nanomap_z1.png b/icons/_nanomaps/Delta220_nanomap_z1.png index ed69ddf80485..0d988f05b3da 100644 Binary files a/icons/_nanomaps/Delta220_nanomap_z1.png and b/icons/_nanomaps/Delta220_nanomap_z1.png differ diff --git a/icons/_nanomaps/MetaStation220_nanomap_z1.png b/icons/_nanomaps/MetaStation220_nanomap_z1.png index 28ef72697d8d..e65513e7f281 100644 Binary files a/icons/_nanomaps/MetaStation220_nanomap_z1.png and b/icons/_nanomaps/MetaStation220_nanomap_z1.png differ diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 4477b2d6c74a..016eec4eaf15 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 7bf07f9d8a74..0c3b6c4540a7 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index fcac5dc7111b..ddc2be552320 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/modsuit/species/modules_vox.dmi b/icons/mob/clothing/modsuit/species/modules_vox.dmi new file mode 100644 index 000000000000..110a62782d8a Binary files /dev/null and b/icons/mob/clothing/modsuit/species/modules_vox.dmi differ diff --git a/icons/mob/clothing/modsuit/species/vox_modsuits.dmi b/icons/mob/clothing/modsuit/species/vox_modsuits.dmi new file mode 100644 index 000000000000..6597922d3ad9 Binary files /dev/null and b/icons/mob/clothing/modsuit/species/vox_modsuits.dmi differ diff --git a/icons/mob/clothing/species/drask/gloves.dmi b/icons/mob/clothing/species/drask/gloves.dmi index c9e90d5b12a1..2b97e9bf3c24 100644 Binary files a/icons/mob/clothing/species/drask/gloves.dmi and b/icons/mob/clothing/species/drask/gloves.dmi differ diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi index c3ef64d89213..baef8c01ccb1 100644 Binary files a/icons/mob/clothing/species/drask/head.dmi and b/icons/mob/clothing/species/drask/head.dmi differ diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi index 1fde8dff5b89..b4bf22f7f1ed 100644 Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ diff --git a/icons/mob/clothing/species/drask/under/civilian.dmi b/icons/mob/clothing/species/drask/under/civilian.dmi index 65abb049671a..53ce570efc56 100644 Binary files a/icons/mob/clothing/species/drask/under/civilian.dmi and b/icons/mob/clothing/species/drask/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/grey/back.dmi b/icons/mob/clothing/species/grey/back.dmi index bfd7fd8310ee..88be281f984d 100644 Binary files a/icons/mob/clothing/species/grey/back.dmi and b/icons/mob/clothing/species/grey/back.dmi differ diff --git a/icons/mob/clothing/species/grey/gloves.dmi b/icons/mob/clothing/species/grey/gloves.dmi index 4ebc054e1570..e69bfd36bcc9 100644 Binary files a/icons/mob/clothing/species/grey/gloves.dmi and b/icons/mob/clothing/species/grey/gloves.dmi differ diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index de0ff0962870..155189889405 100644 Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi index b70786592df9..45f1f6cc44ae 100644 Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ diff --git a/icons/mob/clothing/species/grey/under/civilian.dmi b/icons/mob/clothing/species/grey/under/civilian.dmi index a05f1c920999..aef84913923f 100644 Binary files a/icons/mob/clothing/species/grey/under/civilian.dmi and b/icons/mob/clothing/species/grey/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/kidan/gloves.dmi b/icons/mob/clothing/species/kidan/gloves.dmi index 540e694464c3..24cd2f8fe258 100644 Binary files a/icons/mob/clothing/species/kidan/gloves.dmi and b/icons/mob/clothing/species/kidan/gloves.dmi differ diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi index bf89ab29c2aa..8e398165f2c2 100644 Binary files a/icons/mob/clothing/species/kidan/suit.dmi and b/icons/mob/clothing/species/kidan/suit.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/civilian.dmi b/icons/mob/clothing/species/kidan/under/civilian.dmi new file mode 100644 index 000000000000..9c8d974d3361 Binary files /dev/null and b/icons/mob/clothing/species/kidan/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/vox/back.dmi b/icons/mob/clothing/species/vox/back.dmi index b3c7e2dde1bc..25b86be5931b 100644 Binary files a/icons/mob/clothing/species/vox/back.dmi and b/icons/mob/clothing/species/vox/back.dmi differ diff --git a/icons/mob/clothing/species/vox/gloves.dmi b/icons/mob/clothing/species/vox/gloves.dmi index 42c84233b731..71d8a5ab9297 100644 Binary files a/icons/mob/clothing/species/vox/gloves.dmi and b/icons/mob/clothing/species/vox/gloves.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index 374d72b76984..846a0da40412 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 63c10abda38c..52aa1343e512 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/under/civilian.dmi b/icons/mob/clothing/species/vox/under/civilian.dmi index 873a6838fd35..63f65aa8e3c0 100644 Binary files a/icons/mob/clothing/species/vox/under/civilian.dmi and b/icons/mob/clothing/species/vox/under/civilian.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index a7108da33bda..b034654674c5 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi index 6eda3ab28105..3811856e8a7a 100644 Binary files a/icons/mob/clothing/under/civilian.dmi and b/icons/mob/clothing/under/civilian.dmi differ diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index 4ea3ac1a1d42..c3db618d381c 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ diff --git a/icons/mob/human_races/human_skintones/r_human_Coffee.dmi b/icons/mob/human_races/human_skintones/r_human_Coffee.dmi index 1f9c0adc9bbd..20dd5bc45a90 100644 Binary files a/icons/mob/human_races/human_skintones/r_human_Coffee.dmi and b/icons/mob/human_races/human_skintones/r_human_Coffee.dmi differ diff --git a/icons/mob/human_races/human_skintones/r_human_almond.dmi b/icons/mob/human_races/human_skintones/r_human_almond.dmi new file mode 100644 index 000000000000..668ca8f74d9c Binary files /dev/null and b/icons/mob/human_races/human_skintones/r_human_almond.dmi differ diff --git a/icons/mob/human_races/human_skintones/r_human_bronzed.dmi b/icons/mob/human_races/human_skintones/r_human_bronzed.dmi new file mode 100644 index 000000000000..ff9f3588684d Binary files /dev/null and b/icons/mob/human_races/human_skintones/r_human_bronzed.dmi differ diff --git a/icons/mob/human_races/human_skintones/r_human_caramel.dmi b/icons/mob/human_races/human_skintones/r_human_caramel.dmi new file mode 100644 index 000000000000..57ceabbf26a9 Binary files /dev/null and b/icons/mob/human_races/human_skintones/r_human_caramel.dmi differ diff --git a/icons/mob/human_races/human_skintones/r_human_latte.dmi b/icons/mob/human_races/human_skintones/r_human_latte.dmi new file mode 100644 index 000000000000..35a4b3426391 Binary files /dev/null and b/icons/mob/human_races/human_skintones/r_human_latte.dmi differ diff --git a/icons/mob/human_races/human_skintones/r_human_pale.dmi b/icons/mob/human_races/human_skintones/r_human_pale.dmi index d6abcc0eaf2d..46b61fd43257 100644 Binary files a/icons/mob/human_races/human_skintones/r_human_pale.dmi and b/icons/mob/human_races/human_skintones/r_human_pale.dmi differ diff --git a/icons/mob/human_races/human_skintones/r_human_sienna.dmi b/icons/mob/human_races/human_skintones/r_human_sienna.dmi new file mode 100644 index 000000000000..82f322d96d7b Binary files /dev/null and b/icons/mob/human_races/human_skintones/r_human_sienna.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index 7a7e065d75f5..8f9f52bd6213 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index c1b5ab5e2bed..b436595e7311 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/mob/inhands/equipment/custodial_lefthand.dmi b/icons/mob/inhands/equipment/custodial_lefthand.dmi index 2367540f0e1f..884b23465cb9 100644 Binary files a/icons/mob/inhands/equipment/custodial_lefthand.dmi and b/icons/mob/inhands/equipment/custodial_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/custodial_righthand.dmi b/icons/mob/inhands/equipment/custodial_righthand.dmi index 9c7d8be238a4..8ddb7703cf66 100644 Binary files a/icons/mob/inhands/equipment/custodial_righthand.dmi and b/icons/mob/inhands/equipment/custodial_righthand.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index f9ec36b54a6c..184e41c728a2 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 5aedfb731b7c..aaf4877597a3 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index e3a7bb2f2183..2660087f11cb 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/under/civilian.dmi b/icons/obj/clothing/under/civilian.dmi index 770a8cd46796..774f95bf8684 100644 Binary files a/icons/obj/clothing/under/civilian.dmi and b/icons/obj/clothing/under/civilian.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index de549408ec30..ad01b97b5320 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 10287972d094..545769dc7741 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/food/frozen_treats.dmi b/icons/obj/food/frozen_treats.dmi new file mode 100644 index 000000000000..8bc389272a54 Binary files /dev/null and b/icons/obj/food/frozen_treats.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 05e713412ed1..13c552d4790b 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index 3ac46fc3384f..0d7d9a0930b2 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ diff --git a/icons/obj/robot_parts.dmi b/icons/obj/robot_parts.dmi index d87e4714339a..6007ec7b22be 100644 Binary files a/icons/obj/robot_parts.dmi and b/icons/obj/robot_parts.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 17f152fe280d..06c7aa560835 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/icons/obj/supermatter.dmi b/icons/obj/supermatter.dmi index aa161c55679b..4cc94097dcba 100644 Binary files a/icons/obj/supermatter.dmi and b/icons/obj/supermatter.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 95af0f67b584..f9b8b5bb7f39 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ diff --git a/interface/skin.dmf b/interface/skin.dmf index 54b7776255e4..4050124fb32e 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -83,13 +83,13 @@ menu "menu" command = ".winset \"paramapwindow.map.zoom-mode=distort\"" category = "&Масштабирование" can-check = true + is-checked = true group = "scale" elem "PS" name = "&Точечный отбор" command = ".winset \"paramapwindow.map.zoom-mode=normal\"" category = "&Масштабирование" can-check = true - is-checked = true group = "scale" elem "BL" name = "&Билинейное" diff --git a/modular_ss220/_defines220/_defines220.dme b/modular_ss220/_defines220/_defines220.dme index 65c29efd5930..898c1b3f08a8 100644 --- a/modular_ss220/_defines220/_defines220.dme +++ b/modular_ss220/_defines220/_defines220.dme @@ -12,3 +12,5 @@ #include "code/hud_ss220.dm" #include "code/layers_ss220.dm" #include "code/signals_atom.dm" +#include "code/jobs_defines.dm" +#include "code/donor.dm" diff --git a/modular_ss220/_defines220/code/donor.dm b/modular_ss220/_defines220/code/donor.dm new file mode 100644 index 000000000000..053c420212cf --- /dev/null +++ b/modular_ss220/_defines220/code/donor.dm @@ -0,0 +1,7 @@ +// Special tiers for ss220 staff +#define BIG_WORKER_TIER 220 +#define LITTLE_WORKER_TIER 110 + +// What TTS level does it give access to? +#define BIG_WORKER_TTS_LEVEL 3 +#define LITTLE_WORKER_TTS_LEVEL 1 diff --git a/modular_ss220/_defines220/code/jobs_defines.dm b/modular_ss220/_defines220/code/jobs_defines.dm new file mode 100644 index 000000000000..fed4ba8651fa --- /dev/null +++ b/modular_ss220/_defines220/code/jobs_defines.dm @@ -0,0 +1,11 @@ +#define NOVICE_JOB_MINUTES 120 +#define NOVICE_CADET_JOB_MINUTES 300 + +// JOBCAT_ENGSEC +#define JOB_TRAINEE (1<<15) +#define JOB_CADET (1<<16) + +// JOBCAT_MEDSCI +#define JOB_INTERN (1<<11) +#define JOB_STUDENT (1<<12) +// Если ОФФы добавят новую должность в отдел, то потребуется смещение diff --git a/modular_ss220/aesthetics/_aesthetics.dme b/modular_ss220/aesthetics/_aesthetics.dme index b5160cd386f8..08babc5851f3 100644 --- a/modular_ss220/aesthetics/_aesthetics.dme +++ b/modular_ss220/aesthetics/_aesthetics.dme @@ -8,6 +8,7 @@ #include "applicator\code\applicator.dm" #include "atm\code\atm.dm" #include "atmospherics\code\atmospherics.dm" +#include "basketball\code\basketball.dm" #include "better_ids\code\better_ids.dm" #include "blastdoor\code\blastdoor.dm" #include "boxes\code\boxes.dm" diff --git a/modular_ss220/aesthetics/basketball/code/basketball.dm b/modular_ss220/aesthetics/basketball/code/basketball.dm new file mode 100644 index 000000000000..c05a6802902f --- /dev/null +++ b/modular_ss220/aesthetics/basketball/code/basketball.dm @@ -0,0 +1,2 @@ +/obj/structure/holohoop + icon = 'modular_ss220/aesthetics/basketball/icons/basketball.dmi' diff --git a/modular_ss220/aesthetics/basketball/icons/basketball.dmi b/modular_ss220/aesthetics/basketball/icons/basketball.dmi new file mode 100644 index 000000000000..d069a905e44f Binary files /dev/null and b/modular_ss220/aesthetics/basketball/icons/basketball.dmi differ diff --git a/modular_ss220/aesthetics/floors/code/floors.dm b/modular_ss220/aesthetics/floors/code/floors.dm index f417708760d4..f6519bd50caa 100644 --- a/modular_ss220/aesthetics/floors/code/floors.dm +++ b/modular_ss220/aesthetics/floors/code/floors.dm @@ -1,7 +1,16 @@ /turf/simulated/floor icon = 'modular_ss220/aesthetics/floors/icons/floors.dmi' +/turf/simulated/floor/plasteel/dark + icon_state = "dark" + +/turf/simulated/floor/mech_bay_recharge_floor + icon = 'modular_ss220/aesthetics/floors/icons/floors.dmi' + // WOODEN FLOORS +/turf/simulated/floor/wood + icon = 'modular_ss220/aesthetics/floors/icons/wooden.dmi' + /turf/simulated/floor/wood/oak icon_state = "wood-oak" floor_tile = /obj/item/stack/tile/wood/oak diff --git a/modular_ss220/aesthetics/floors/code/tile_types.dm b/modular_ss220/aesthetics/floors/code/tile_types.dm index 4b60d308f8be..1ad11cb80325 100644 --- a/modular_ss220/aesthetics/floors/code/tile_types.dm +++ b/modular_ss220/aesthetics/floors/code/tile_types.dm @@ -1,8 +1,10 @@ +/obj/item/stack/tile + icon = 'modular_ss220/aesthetics/floors/icons/tiles.dmi' + // WOOD /obj/item/stack/tile/wood/oak name = "oak wood floor tiles" singular_name = "oak wood floor tile" - icon = 'modular_ss220/aesthetics/floors/icons/tiles.dmi' icon_state = "tile-wood-oak" turf_type = /turf/simulated/floor/wood/oak merge_type = /obj/item/stack/tile/wood/oak @@ -10,7 +12,6 @@ /obj/item/stack/tile/wood/birch name = "birch wood floor tiles" singular_name = "birch wood floor tile" - icon = 'modular_ss220/aesthetics/floors/icons/tiles.dmi' icon_state = "tile-wood-birch" turf_type = /turf/simulated/floor/wood/birch merge_type = /obj/item/stack/tile/wood/birch @@ -18,7 +19,6 @@ /obj/item/stack/tile/wood/cherry name = "cherry wood floor tiles" singular_name = "cherry wood floor tile" - icon = 'modular_ss220/aesthetics/floors/icons/tiles.dmi' icon_state = "tile-wood-cherry" turf_type = /turf/simulated/floor/wood/cherry merge_type = /obj/item/stack/tile/wood/cherry @@ -26,7 +26,6 @@ /obj/item/stack/tile/wood/fancy/oak name = "fancy oak wood floor tiles" singular_name = "fancy oak wood floor tile" - icon = 'modular_ss220/aesthetics/floors/icons/tiles.dmi' icon_state = "tile-wood-fancy-oak" turf_type = /turf/simulated/floor/wood/fancy/oak merge_type = /obj/item/stack/tile/wood/fancy/oak @@ -34,7 +33,6 @@ /obj/item/stack/tile/wood/fancy/birch name = "fancy birch wood floor tiles" singular_name = "fancy birch wood floor tile" - icon = 'modular_ss220/aesthetics/floors/icons/tiles.dmi' icon_state = "tile-wood-fancy-birch" turf_type = /turf/simulated/floor/wood/fancy/birch merge_type = /obj/item/stack/tile/wood/fancy/birch @@ -42,7 +40,6 @@ /obj/item/stack/tile/wood/fancy/cherry name = "fancy cherry wood floor tiles" singular_name = "fancy cherry wood floor tile" - icon = 'modular_ss220/aesthetics/floors/icons/tiles.dmi' icon_state = "tile-wood-fancy-cherry" turf_type = /turf/simulated/floor/wood/fancy/cherry merge_type = /obj/item/stack/tile/wood/fancy/cherry @@ -50,7 +47,6 @@ /obj/item/stack/tile/wood/fancy name = "fancy light oak wood floor tiles" singular_name = "fancy wood floor tile" - icon = 'modular_ss220/aesthetics/floors/icons/tiles.dmi' icon_state = "tile-wood-fancy" turf_type = /turf/simulated/floor/wood/fancy merge_type = /obj/item/stack/tile/wood/fancy @@ -58,7 +54,6 @@ /obj/item/stack/tile/wood/parquet name = "parquet wood floor tiles" singular_name = "wood parquet floor tile" - icon = 'modular_ss220/aesthetics/floors/icons/tiles.dmi' icon_state = "tile-wood-parquet" turf_type = /turf/simulated/floor/wood/parquet merge_type = /obj/item/stack/tile/wood/parquet @@ -66,7 +61,6 @@ /obj/item/stack/tile/wood/parquet/tile name = "tiled parquet wood floor tiles" singular_name = "wood tiled parquet floor tile" - icon = 'modular_ss220/aesthetics/floors/icons/tiles.dmi' icon_state = "tile-wood-tile" turf_type = /turf/simulated/floor/wood/parquet/tile merge_type = /obj/item/stack/tile/wood/parquet/tile diff --git a/modular_ss220/aesthetics/floors/icons/floors.dmi b/modular_ss220/aesthetics/floors/icons/floors.dmi index ed3de7c3b442..63c4f15f5b7d 100644 Binary files a/modular_ss220/aesthetics/floors/icons/floors.dmi and b/modular_ss220/aesthetics/floors/icons/floors.dmi differ diff --git a/modular_ss220/aesthetics/floors/icons/tiles.dmi b/modular_ss220/aesthetics/floors/icons/tiles.dmi index e479a733bccc..af7452ee3fde 100644 Binary files a/modular_ss220/aesthetics/floors/icons/tiles.dmi and b/modular_ss220/aesthetics/floors/icons/tiles.dmi differ diff --git a/modular_ss220/aesthetics/floors/icons/wooden.dmi b/modular_ss220/aesthetics/floors/icons/wooden.dmi new file mode 100644 index 000000000000..3f92d4bb644a Binary files /dev/null and b/modular_ss220/aesthetics/floors/icons/wooden.dmi differ diff --git a/modular_ss220/aesthetics/shutters/code/shutters.dm b/modular_ss220/aesthetics/shutters/code/shutters.dm index 382757908be3..4df2681f4fac 100644 --- a/modular_ss220/aesthetics/shutters/code/shutters.dm +++ b/modular_ss220/aesthetics/shutters/code/shutters.dm @@ -1,5 +1,6 @@ /obj/machinery/door/poddoor/shutters icon = 'modular_ss220/aesthetics/shutters/icons/shutters.dmi' + layer = CLOSED_BLASTDOOR_LAYER var/door_open_sound = 'modular_ss220/aesthetics/shutters/sound/shutters_open.ogg' var/door_close_sound = 'modular_ss220/aesthetics/shutters/sound/shutters_close.ogg' @@ -11,3 +12,15 @@ if("closing") flick("closing", src) playsound(src, door_close_sound, 30, TRUE) + +/obj/machinery/door/poddoor/shutters/window + name = "windowed shutters" + desc = "A shutter with a thick see-through polycarbonate window." + icon = 'modular_ss220/aesthetics/shutters/icons/shutters_glass.dmi' + icon_state = "closed" + opacity = FALSE + glass = TRUE + +/obj/machinery/door/poddoor/shutters/window/preopen + icon_state = "open" + density = FALSE diff --git a/modular_ss220/aesthetics/shutters/icons/shutters_glass.dmi b/modular_ss220/aesthetics/shutters/icons/shutters_glass.dmi new file mode 100644 index 000000000000..fcf8af5b94fd Binary files /dev/null and b/modular_ss220/aesthetics/shutters/icons/shutters_glass.dmi differ diff --git a/modular_ss220/clothing/_clothing.dme b/modular_ss220/clothing/_clothing.dme index e84178f0c88e..59210474bced 100644 --- a/modular_ss220/clothing/_clothing.dme +++ b/modular_ss220/clothing/_clothing.dme @@ -9,3 +9,4 @@ #include "code/cloaks.dm" #include "code/garment_bag.dm" #include "code/hev_suit.dm" +#include "code/wallets.dm" diff --git a/modular_ss220/clothing/code/hev_suit.dm b/modular_ss220/clothing/code/hev_suit.dm index 87fe284ba079..c92cae7db2dd 100644 --- a/modular_ss220/clothing/code/hev_suit.dm +++ b/modular_ss220/clothing/code/hev_suit.dm @@ -35,8 +35,6 @@ var/list/sound_queue = list() - var/emag_doses_left = 5 - var/mob/living/carbon/owner var/obj/item/geiger_counter/GC @@ -61,7 +59,7 @@ var/sound_file = sound_data[1] var/sound_delay = sound_data[2] - playsound(src, sound_file, 50) + playsound(owner, sound_file, 20) sound_queue.Cut(1,2) @@ -70,16 +68,6 @@ addtimer(CALLBACK(src, PROC_REF(process_sound_queue)), sound_delay) -/obj/item/clothing/suit/space/hev/emag_act(mob/user, obj/item/card/emag/emag_card) - if(flags & emagged) - return FALSE - if(owner) - to_chat(owner, span_warning("You need to take off \the [name] before emagging it.")) - return FALSE - flags |= emagged - do_sparks(8, FALSE, get_turf(src)) - return TRUE - /obj/item/clothing/suit/space/hev/proc/add_queue(desired_file, desired_delay, purge_queue=FALSE) var/was_empty_sound_queue = !length(sound_queue) @@ -100,12 +88,10 @@ if(slot == SLOT_HUD_OUTER_SUIT && iscarbon(M)) for(var/voice in funny_signals) RegisterSignal(M, voice, funny_signals[voice]) - add_queue('modular_ss220/aesthetics_sounds/sound/hev/blip.ogg', 2 SECONDS, purge_queue=TRUE) owner = M + add_queue('modular_ss220/aesthetics_sounds/sound/hev/blip.ogg', 2 SECONDS, purge_queue=TRUE) add_queue('modular_ss220/aesthetics_sounds/sound/hev/01_hev_logon.ogg', 11 SECONDS) - add_queue('modular_ss220/aesthetics_sounds/sound/hev/03_atmospherics_on.ogg', 6 SECONDS) - add_queue('modular_ss220/aesthetics_sounds/sound/hev/08_communications_on.ogg', 5 SECONDS) - add_queue('modular_ss220/aesthetics_sounds/sound/hev/04_vitalsigns_on.ogg', 5 SECONDS) + add_queue('modular_ss220/aesthetics_sounds/sound/hev/04_vitalsigns_on.ogg', 4 SECONDS) add_queue('modular_ss220/aesthetics_sounds/sound/hev/09_safe_day.ogg', 8 SECONDS) else for(var/voice in funny_signals) @@ -124,15 +110,14 @@ //Mute /obj/item/clothing/suit/space/hev/proc/handle_speech(datum/source, mob/speech_args) SIGNAL_HANDLER - if(!(flags & emagged)) - var/static/list/cancel_messages = list( - "Вам трудно говорить, когда костюм туго сдавливает ваше горло...", - "Ваши связки ощущаются сдавленными, что пресекает любую попытку выдавить хоть какой-то звук...", - "Вы пытаетесь что-то сказать, но костюм сдавливает вам гортань..." - ) - - speech_args[SPEECH_MESSAGE] = "..." - to_chat(source, span_warning(pick(cancel_messages))) + var/static/list/cancel_messages = list( + "Вам трудно говорить, когда костюм туго сдавливает ваше горло...", + "Ваши связки ощущаются сдавленными, что пресекает любую попытку выдавить хоть какой-то звук...", + "Вы пытаетесь что-то сказать, но костюм сдавливает вам гортань..." + ) + + speech_args[SPEECH_MESSAGE] = "..." + to_chat(source, span_warning(pick(cancel_messages))) //Fire /obj/item/clothing/suit/space/hev/proc/handle_ignite(mob/living) diff --git a/modular_ss220/clothing/code/mask.dm b/modular_ss220/clothing/code/mask.dm index 5ec1f736a7f7..bb564a5bc64b 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -54,6 +54,14 @@ /datum/outfit/job/chef mask = /obj/item/clothing/mask/fakemoustache/chef +/obj/item/clothing/mask/breath/red_gas + name = "ПРС-1" + desc = "Стильная дыхательная маска в виде противогаза, не скрывает лицо." + icon = 'modular_ss220/clothing/icons/object/masks.dmi' + icon_state = "red_gas" + icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi' + item_state = "red_gas" + /obj/item/clothing/mask/breath/breathscarf name = "шарф с системой дыхания" desc = "Стильный и инновационный шарф, который служит дыхательной маской в экстремальных ситуациях." diff --git a/modular_ss220/clothing/code/wallets.dm b/modular_ss220/clothing/code/wallets.dm new file mode 100644 index 000000000000..446912d266f0 --- /dev/null +++ b/modular_ss220/clothing/code/wallets.dm @@ -0,0 +1,30 @@ +/obj/item/storage/wallet + var/photo_overlay = "photo" + +/obj/item/storage/wallet/wallet_NT + name = "leather wallet NT" + desc = "Ваш кошелек настолько шикарен, что с ним вы выглядите просто потрясающе." + icon = 'modular_ss220/clothing/icons/object/wallets.dmi' + icon_state = "wallet_NT" + photo_overlay = "photo_NT" + +/obj/item/storage/wallet/wallet_USSP_1 + name = "leather wallet USSP" + desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." + icon = 'modular_ss220/clothing/icons/object/wallets.dmi' + icon_state = "wallet_USSP_1" + photo_overlay = "photo_USSP" + storage_slots = 5 + +/datum/prize_item/wallet_USSP_1 + name = "Настоящий кошелёк СССП!" + desc = "Красота" + typepath = /obj/item/storage/wallet/wallet_USSP_1 + cost = 35 + +/obj/item/storage/wallet/wallet_USSP_2 + name = "leather wallet USSP" + desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." + icon = 'modular_ss220/clothing/icons/object/wallets.dmi' + icon_state = "wallet_USSP_2" + photo_overlay = "photo_USSP" diff --git a/modular_ss220/clothing/icons/mob/mask.dmi b/modular_ss220/clothing/icons/mob/mask.dmi index a9c07931e17c..2362205420f4 100644 Binary files a/modular_ss220/clothing/icons/mob/mask.dmi and b/modular_ss220/clothing/icons/mob/mask.dmi differ diff --git a/modular_ss220/clothing/icons/object/masks.dmi b/modular_ss220/clothing/icons/object/masks.dmi index 72ab5940495c..9c82cc1ce066 100644 Binary files a/modular_ss220/clothing/icons/object/masks.dmi and b/modular_ss220/clothing/icons/object/masks.dmi differ diff --git a/modular_ss220/clothing/icons/object/wallets.dmi b/modular_ss220/clothing/icons/object/wallets.dmi new file mode 100644 index 000000000000..251d2b4733d1 Binary files /dev/null and b/modular_ss220/clothing/icons/object/wallets.dmi differ diff --git a/modular_ss220/devices/code/items/radio.dm b/modular_ss220/devices/code/items/radio.dm index 5e12a73a4daf..b31e99259ede 100644 --- a/modular_ss220/devices/code/items/radio.dm +++ b/modular_ss220/devices/code/items/radio.dm @@ -36,13 +36,13 @@ * Radio QoL improvement * So players can Alt+click to enable dynamic and Ctrl+Shift+click to enable speaker */ -/obj/item/radio/examine(mob/user) +/obj/item/radio/headset/examine(mob/user) . = ..() if(in_range(src, user) || loc == user) . += span_info("Alt-click on \the [name] to toggle broadcasting.") . += span_info("Ctrl-Shift-click on \the [src] to toggle speaker.") -/obj/item/radio/AltClick(mob/user) +/obj/item/radio/headset/AltClick(mob/user) if(!Adjacent(user)) return if(!iscarbon(usr) && !isrobot(usr)) @@ -53,7 +53,7 @@ broadcasting = !broadcasting to_chat(user, span_notice("You toggle broadcasting [broadcasting ? "on" : "off"].")) -/obj/item/radio/CtrlShiftClick(mob/user) +/obj/item/radio/headset/CtrlShiftClick(mob/user) if(!Adjacent(user)) return if(!iscarbon(usr) && !isrobot(usr)) diff --git a/modular_ss220/discord_link/code/discord.dm b/modular_ss220/discord_link/code/discord.dm index 43f8cd426908..7ad76fb9d8f6 100644 --- a/modular_ss220/discord_link/code/discord.dm +++ b/modular_ss220/discord_link/code/discord.dm @@ -41,7 +41,7 @@ return qdel(query_replace_token) - to_chat(usr, span_darkmblue("Для завершения, вставьте это:
") + span_boldannounce("/привязать token:[token]") + span_darkmblue("
В канал #дом-бота в Discord-сообществе!")) + to_chat(usr, span_darkmblue("Для завершения, вставьте это:
") + span_boldannounce("/привязать token:[token]") + span_darkmblue("
В канал #ss13-бот в Discord-сообществе!")) /mob/new_player/Topic(href, href_list) if(src != usr) diff --git a/modular_ss220/donor/code/client_procs.dm b/modular_ss220/donor/code/client_procs.dm index 97819cbc77b1..4088d6d80072 100644 --- a/modular_ss220/donor/code/client_procs.dm +++ b/modular_ss220/donor/code/client_procs.dm @@ -2,8 +2,10 @@ /datum/client_login_processor/donator_check/proc/CheckAutoDonatorLevel(client/C) + var/list/big_worker = list("Админ", "Старший Администратор", "Разработчик", "Бригадир мапперов", "Маппер") + if(C.holder) - C.donator_level = 2 + C.donator_level = (C.holder.rank in big_worker) ? BIG_WORKER_TIER : LITTLE_WORKER_TIER return var/is_wl = GLOB.configuration.overflow.reroute_cap == 0.5 ? TRUE : FALSE @@ -17,7 +19,7 @@ return while(rank_ckey_read.NextRow()) - C.donator_level = 2 + C.donator_level = (rank_ckey_read.item[1] in big_worker) ? BIG_WORKER_TIER : LITTLE_WORKER_TIER qdel(rank_ckey_read) @@ -42,7 +44,13 @@ if(10000 to INFINITY) donator_level = DONATOR_LEVEL_MAX - C.donator_level = max(donator_level, C.donator_level) + switch(C.donator_level) + if(LITTLE_WORKER_TIER) + C.donator_level = LITTLE_WORKER_TTS_LEVEL > donator_level ? C.donator_level : donator_level + if(BIG_WORKER_TIER) + C.donator_level = BIG_WORKER_TTS_LEVEL > donator_level ? C.donator_level : donator_level + else + C.donator_level = donator_level C.donor_loadout_points() @@ -77,6 +85,10 @@ prefs.max_gear_slots += 12 if(5) prefs.max_gear_slots += 16 + if(LITTLE_WORKER_TIER) + prefs.max_gear_slots += 1 + if(BIG_WORKER_TIER) + prefs.max_gear_slots += 5 /client/proc/donor_character_slots() if(!prefs) @@ -84,6 +96,12 @@ prefs.max_save_slots = MAX_SAVE_SLOTS_SS220 + 5 * donator_level + switch(donator_level) + if(LITTLE_WORKER_TIER) + prefs.max_save_slots = 7 + if(BIG_WORKER_TIER) + prefs.max_save_slots = 10 + prefs.character_saves.len = prefs.max_save_slots #undef MAX_SAVE_SLOTS_SS220 diff --git a/modular_ss220/emotes/code/emote_translations.dm b/modular_ss220/emotes/code/emote_translations.dm index 8d3033658ce4..eb6f3ce2bb5a 100644 --- a/modular_ss220/emotes/code/emote_translations.dm +++ b/modular_ss220/emotes/code/emote_translations.dm @@ -232,7 +232,7 @@ /datum/emote/living/carbon/yawn message = "зевает." muzzled_noises = list("устало", "медленно", "сонно") - emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH | EMOTE_SOUND + emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH /datum/emote/living/carbon/exhale message = "выдыхает." @@ -503,31 +503,31 @@ /// Brain Emotes /// /////////////////// -/datum/emote/living/carbon/brain/alarm +/datum/emote/living/brain/alarm message = "подает сигнал тревоги." self_message = "Вы подаете сигнал тревоги." -/datum/emote/living/carbon/brain/alert +/datum/emote/living/brain/alert message = "издаёт страдальческий звук." self_message = "Вы издаёте страдальческий звук." -/datum/emote/living/carbon/brain/notice +/datum/emote/living/brain/notice message = "воспроизводит громкий звук." self_message = "Вы воспроизводите громкий звук." -/datum/emote/living/carbon/brain/flash +/datum/emote/living/brain/flash message = "начинает быстро мигать лампочками!" -/datum/emote/living/carbon/brain/whistle +/datum/emote/living/brain/whistle message = "свистит." self_message = "Вы свистите." - emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH | EMOTE_SOUND + emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH sound = "modular_ss220/emotes/audio/whistle.ogg" -/datum/emote/living/carbon/brain/beep +/datum/emote/living/brain/beep message = "бипает." self_message = "Вы бипаете." -/datum/emote/living/carbon/brain/boop +/datum/emote/living/brain/boop message = "бупает." self_message = "вы бупаете." diff --git a/modular_ss220/gateway/_gateway.dme b/modular_ss220/gateway/_gateway.dme index a07e04caa1db..37a43303cb27 100644 --- a/modular_ss220/gateway/_gateway.dme +++ b/modular_ss220/gateway/_gateway.dme @@ -4,3 +4,4 @@ #include "code/gateway.dm" #include "code/gateway_config.dm" #include "code/gateway_initialize.dm" +#include "code/landmark.dm" diff --git a/modular_ss220/gateway/code/landmark.dm b/modular_ss220/gateway/code/landmark.dm new file mode 100644 index 000000000000..1ae8869fa663 --- /dev/null +++ b/modular_ss220/gateway/code/landmark.dm @@ -0,0 +1,10 @@ +/obj/effect/landmark/awaystart + name = "awaystart" + icon = 'icons/effects/spawner_icons.dmi' + icon_state = "Assistant" + +INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away missions break + +/obj/effect/landmark/awaystart/Initialize(mapload) + GLOB.awaydestinations.Add(src) + return ..() diff --git a/modular_ss220/jobs/_jobs.dm b/modular_ss220/jobs/_jobs.dm index 47f40207e7b0..803bc7f75729 100644 --- a/modular_ss220/jobs/_jobs.dm +++ b/modular_ss220/jobs/_jobs.dm @@ -2,3 +2,13 @@ name = "Работы" desc = "Новые джобки и изменения старых" author = "furior, PhantomRU" + +/datum/modpack/jobs/initialize() + . = ..() + + GLOB.security_positions |= GLOB.security_positions_ss220 + GLOB.active_security_positions |= GLOB.security_positions_ss220 + + GLOB.medical_positions |= GLOB.medical_positions_ss220 + GLOB.engineering_positions |= GLOB.engineering_positions_ss220 + GLOB.science_positions |= GLOB.science_positions_ss220 diff --git a/modular_ss220/jobs/_jobs.dme b/modular_ss220/jobs/_jobs.dme index 5d7beee17f91..7a0fc3422801 100644 --- a/modular_ss220/jobs/_jobs.dme +++ b/modular_ss220/jobs/_jobs.dme @@ -1,13 +1,24 @@ #include "_jobs.dm" #include "code/access.dm" -// #include "code/cards_ids.dm" -// #include "code/jobs.dm" -// #include "code/clothing/engineering_clothing.dm" -// #include "code/clothing/medical_clothing.dm" -// #include "code/clothing/science_clothing.dm" -// #include "code/clothing/security_clothing.dm" -// #include "code/job/engineering_jobs.dm" -// #include "code/job/medical_jobs.dm" -// #include "code/job/science_jobs.dm" -// #include "code/job/security_jobs.dm" +#include "code/card_computer.dm" +#include "code/card_id.dm" +#include "code/departaments.dm" +#include "code/jobs_global_list.dm" +#include "code/jobs_character.dm" +#include "code/jobs_gamemodes.dm" +#include "code/jobs.dm" +#include "code/clothing/engineering_clothing.dm" +#include "code/clothing/medical_clothing.dm" +#include "code/clothing/science_clothing.dm" +#include "code/clothing/security_clothing.dm" +#include "code/job/engineering_jobs.dm" +#include "code/job/medical_jobs.dm" +#include "code/job/science_jobs.dm" +#include "code/job/security_jobs.dm" +#include "code/objects/job_objects.dm" +#include "code/objects/engineering_job_objects.dm" +#include "code/objects/medical_job_objects.dm" +#include "code/objects/science_job_objects.dm" +#include "code/objects/security_job_objects.dm" +#include "code/objects/wardrobe_vendors.dm" diff --git a/modular_ss220/jobs/code/card_computer.dm b/modular_ss220/jobs/code/card_computer.dm new file mode 100644 index 000000000000..e9c9e834e77c --- /dev/null +++ b/modular_ss220/jobs/code/card_computer.dm @@ -0,0 +1,21 @@ +/obj/machinery/computer/card/ui_data(mob/user) + var/list/data = ..() + + if(mode == IDCOMPUTER_SCREEN_TRANSFER) // JOB TRANSFER + if(modify && scan && !target_dept) + data["card_skins"] |= format_card_skins(GLOB.card_skins_ss220) + + return data + +/obj/machinery/computer/card/ui_act(action, params) + . = ..() + switch(action) + if("skin") + if(!modify) + return FALSE + var/skin = params["skin_target"] + if(!skin || !(skin in GLOB.card_skins_ss220)) + return FALSE + + modify.icon_state = skin//get_card_skins_ss220(skin) + return TRUE diff --git a/modular_ss220/jobs/code/card_id.dm b/modular_ss220/jobs/code/card_id.dm new file mode 100644 index 000000000000..f00685c26674 --- /dev/null +++ b/modular_ss220/jobs/code/card_id.dm @@ -0,0 +1,56 @@ +/mob/living/carbon/human/sec_hud_set_ID() + var/image/holder = hud_list[ID_HUD] + holder.icon = 'icons/mob/hud/sechud.dmi' + if(wear_id && (wear_id.get_job_name() in GLOB.jobs_positions_ss220)) + holder.icon = 'modular_ss220/jobs/icons/hud.dmi' + . = ..() + +/obj/item/get_job_name() //Used in secHUD icon generation + var/assignmentName = get_ID_assignment(if_no_id = "Unknown") + var/rankName = get_ID_rank(if_no_id = "Unknown") + + var/list/titles = GLOB.jobs_positions_ss220 + + if(assignmentName in titles) //Check if the job has a hud icon + return assignmentName + if(rankName in titles) + return rankName + + . = ..() + +GLOBAL_LIST_INIT(card_skins_ss220, list( + "intern", "student", "trainee", "cadet", +)) + +/obj/item/card/id/medical/intern + name = "Intern ID" + registered_name = "Intern" + icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon_state = "intern" + item_state = "intern-id" + rank = "Intern" + +/obj/item/card/id/research/student + name = "Student ID" + registered_name = "Student" + icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon_state = "student" + item_state = "student-id" + +/obj/item/card/id/engineering/trainee + name = "Trainee ID" + registered_name = "Trainee" + icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon_state = "trainee" + item_state = "trainee-id" + +/obj/item/card/id/security/cadet + name = "Cadet ID" + registered_name = "Cadet" + icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon_state = "cadet" + item_state = "cadet-id" + +/obj/item/card/id/syndicate/Initialize() + . = ..() + appearances |= GLOB.card_skins_ss220 diff --git a/modular_ss220/jobs/code/cards_ids.dm b/modular_ss220/jobs/code/cards_ids.dm deleted file mode 100644 index 5eec7f64ea30..000000000000 --- a/modular_ss220/jobs/code/cards_ids.dm +++ /dev/null @@ -1,101 +0,0 @@ -// Для отрисовки ХУД'ов. -GLOBAL_LIST_INIT(Jobs_SS220, list("intern", "cadet", "trainee", "student")) -GLOBAL_LIST_INIT(Jobs_titles_SS220, list("Intern", "Security Cadet", "Trainee Engineer", "Student Scientist")) - -/proc/get_all_medical_novice_titles() - return list("Intern", "Medical Assistant", "Student Medical Doctor") - -/proc/get_all_security_novice_titles() - return list("Security Cadet", "Security Assistant", "Security Graduate") - -/proc/get_all_engineering_novice_titles() - return list("Trainee Engineer", "Engineer Assistant", "Technical Assistant", "Engineer Student", "Technical Student", "Technical Trainee") - -/proc/get_all_science_novice_titles() - return list("Student Scientist", "Scientist Assistant", "Scientist Pregraduate", "Scientist Graduate", "Scientist Postgraduate") - -/proc/get_all_novice_titles() - return get_all_medical_novice_titles() + get_all_security_novice_titles() + get_all_engineering_novice_titles() + get_all_science_novice_titles() - -/mob/living/carbon/human/sec_hud_set_ID() - var/image/holder = hud_list[ID_HUD] - holder.icon = 'icons/mob/hud/sechud.dmi' - if(wear_id && (wear_id.get_job_name() in GLOB.Jobs_SS220)) - holder.icon = 'modular_ss220/jobs/icons/hud.dmi' - . = ..() - -/obj/item/get_job_name() //Used in secHUD icon generation - var/assignmentName = get_ID_assignment(if_no_id = "Unknown") - var/rankName = get_ID_rank(if_no_id = "Unknown") - - var/novmed = get_all_medical_novice_titles() - var/novsec = get_all_security_novice_titles() - var/noveng = get_all_engineering_novice_titles() - var/novrnd = get_all_science_novice_titles() - - if((assignmentName in novmed) || (rankName in novmed)) - return "intern" - if((assignmentName in novsec) || (rankName in novsec)) - return "cadet" - if((assignmentName in noveng) || (rankName in noveng)) - return "trainee" - if((assignmentName in novrnd) || (rankName in novrnd)) - return "student" - - . = ..() - -/obj/machinery/computer/card/ui_data(mob/user) - var/list/data = ..() - - if(mode == IDCOMPUTER_SCREEN_TRANSFER) // JOB TRANSFER - if(modify && scan && !target_dept) - data["jobs_engineering"] |= "Trainee Engineer" - data["jobs_medical"] |= "Intern" - data["jobs_science"] |= "Student Scientist" - data["jobs_security"] |= "Security Cadet" - data["card_skins"] |= format_card_skins(GLOB.Jobs_SS220) // + format_card_skins(list("intern", "cadet", "trainee", "student")) - - return data - -/obj/machinery/computer/card/ui_act(action, params) - . = ..() - - switch(action) - if("skin") - if(!modify) - return FALSE - var/skin = params["skin_target"] - if(!skin || !(skin in GLOB.Jobs_SS220)) - return FALSE - - modify.icon_state = skin - return TRUE - -/obj/item/card/id/medical/intern - name = "Intern ID" - registered_name = "Intern" - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' - icon_state = "intern" - item_state = "intern-id" - rank = "Intern" - -/obj/item/card/id/research/student - name = "Student ID" - registered_name = "Student" - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' - icon_state = "student" - item_state = "student-id" - -/obj/item/card/id/engineering/trainee - name = "Trainee ID" - registered_name = "Trainee" - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' - icon_state = "trainee" - item_state = "trainee-id" - -/obj/item/card/id/security/cadet - name = "Cadet ID" - registered_name = "Cadet" - icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' - icon_state = "cadet" - item_state = "cadet-id" diff --git a/modular_ss220/jobs/code/clothing/engineering_clothing.dm b/modular_ss220/jobs/code/clothing/engineering_clothing.dm index 7e7078bec5c8..9d01c2a5f5d9 100644 --- a/modular_ss220/jobs/code/clothing/engineering_clothing.dm +++ b/modular_ss220/jobs/code/clothing/engineering_clothing.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/under/rank/engineer/trainee +/obj/item/clothing/under/rank/engineering/engineer/trainee name = "engineer trainee jumpsuit" icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi' icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi' @@ -8,18 +8,18 @@ item_color = "trainee" sprite_sheets = null -/obj/item/clothing/under/rank/engineer/trainee/skirt +/obj/item/clothing/under/rank/engineering/engineer/trainee/skirt name = "engineer trainee jumpskirt" icon_state = "traineef_s" item_color = "traineef" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/under/rank/engineer/trainee/assistant +/obj/item/clothing/under/rank/engineering/engineer/trainee/assistant name = "engineer assistant jumpsuit" icon_state = "eng_ass_s" item_color = "eng_ass" -/obj/item/clothing/under/rank/engineer/trainee/assistant/skirt +/obj/item/clothing/under/rank/engineering/engineer/trainee/assistant/skirt name = "engineer assistant jumpskirt" icon_state = "eng_ass_f_s" item_color = "eng_ass_f" diff --git a/modular_ss220/jobs/code/clothing/medical_clothing.dm b/modular_ss220/jobs/code/clothing/medical_clothing.dm index 43e99519aacf..f9ffc439ad70 100644 --- a/modular_ss220/jobs/code/clothing/medical_clothing.dm +++ b/modular_ss220/jobs/code/clothing/medical_clothing.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/under/rank/medical/intern +/obj/item/clothing/under/rank/medical/doctor/intern icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi' icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi' //lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi' @@ -9,18 +9,18 @@ icon_state = "intern_s" item_color = "intern" -/obj/item/clothing/under/rank/medical/intern/skirt +/obj/item/clothing/under/rank/medical/doctor/intern/skirt name = "intern jumpskirt" icon_state = "internf_s" item_color = "internf" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/under/rank/medical/intern/assistant +/obj/item/clothing/under/rank/medical/doctor/intern/assistant name = "medical assistant jumpsuit" icon_state = "med_ass_s" item_color = "med_ass" -/obj/item/clothing/under/rank/medical/intern/assistant/skirt +/obj/item/clothing/under/rank/medical/doctor/intern/assistant/skirt name = "medical assistant jumpskirt" icon_state = "med_ass_f_s" item_color = "med_ass_f" diff --git a/modular_ss220/jobs/code/clothing/science_clothing.dm b/modular_ss220/jobs/code/clothing/science_clothing.dm index d885bff41bbf..4f501916c7b3 100644 --- a/modular_ss220/jobs/code/clothing/science_clothing.dm +++ b/modular_ss220/jobs/code/clothing/science_clothing.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/under/rank/scientist/student +/obj/item/clothing/under/rank/rnd/scientist/student name = "scientist student jumpsuit" icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi' icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi' @@ -8,18 +8,18 @@ item_color = "student" sprite_sheets = null -/obj/item/clothing/under/rank/scientist/student/skirt +/obj/item/clothing/under/rank/rnd/scientist/student/skirt name = "scientist student jumpskirt" icon_state = "studentf_s" item_color = "studentf" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/under/rank/scientist/student/assistant +/obj/item/clothing/under/rank/rnd/scientist/student/assistant name = "scientist assistant jumpsuit" icon_state = "sci_ass_s" item_color = "sci_ass" -/obj/item/clothing/under/rank/scientist/student/assistant/skirt +/obj/item/clothing/under/rank/rnd/scientist/student/assistant/skirt name = "scientist assistant jumpskirt" icon_state = "sci_ass_f_s" item_color = "sci_ass_f" diff --git a/modular_ss220/jobs/code/clothing/security_clothing.dm b/modular_ss220/jobs/code/clothing/security_clothing.dm index 681b4581b9ef..a767485df6eb 100644 --- a/modular_ss220/jobs/code/clothing/security_clothing.dm +++ b/modular_ss220/jobs/code/clothing/security_clothing.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/under/rank/security/cadet +/obj/item/clothing/under/rank/security/officer/cadet name = "security cadet jumpsuit" icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi' icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi' @@ -7,19 +7,21 @@ icon_state = "cadet_s" item_color = "cadet" sprite_sheets = null + sensor_mode = SENSOR_COORDS + random_sensor = FALSE -/obj/item/clothing/under/rank/security/cadet/skirt +/obj/item/clothing/under/rank/security/officer/cadet/skirt name = "security cadet jumpskirt" icon_state = "cadetf_s" item_color = "cadetf" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/under/rank/security/cadet/assistant +/obj/item/clothing/under/rank/security/officer/cadet/assistant name = "security assistant jumpsuit" icon_state = "sec_ass_s" item_color = "sec_ass" -/obj/item/clothing/under/rank/security/cadet/assistant/skirt +/obj/item/clothing/under/rank/security/officer/cadet/assistant/skirt name = "security assistant jumpskirt" icon_state = "sec_ass_f_s" item_color = "sec_ass_f" diff --git a/modular_ss220/jobs/code/departaments.dm b/modular_ss220/jobs/code/departaments.dm new file mode 100644 index 000000000000..1624d0353f92 --- /dev/null +++ b/modular_ss220/jobs/code/departaments.dm @@ -0,0 +1,15 @@ +/datum/station_department/engineering/New() + . = ..() + department_roles |= GLOB.engineering_positions_ss220 + get_all_engineering_alt_titles_ss220() + +/datum/station_department/medical/New() + . = ..() + department_roles |= GLOB.medical_positions_ss220 + get_all_medical_alt_titles_ss220() + +/datum/station_department/science/New() + . = ..() + department_roles |= GLOB.science_positions_ss220 + get_all_science_alt_titles_ss220() + +/datum/station_department/security/New() + . = ..() + department_roles |= GLOB.security_positions_ss220 + get_all_security_alt_titles_ss220() diff --git a/modular_ss220/jobs/code/job/engineering_jobs.dm b/modular_ss220/jobs/code/job/engineering_jobs.dm index 8b472cde20cf..eb4c3c280f99 100644 --- a/modular_ss220/jobs/code/job/engineering_jobs.dm +++ b/modular_ss220/jobs/code/job/engineering_jobs.dm @@ -1,37 +1,56 @@ -/datum/job/engineer/New() - . = ..() - alt_titles |= get_all_engineering_novice_titles() +/datum/job/engineer/trainee + title = "Trainee Engineer" + flag = JOB_TRAINEE + total_positions = 0 + spawn_positions = 3 + //selection_color = "#dbd6c4" + alt_titles = list("Engineer Assistant", "Technical Assistant", "Engineer Student", "Technical Student", "Technical Trainee") + exp_map = list(EXP_TYPE_CREW = NOVICE_JOB_MINUTES) + outfit = /datum/outfit/job/engineer/trainee + important_information = "Ваша должность ограничена во всех взаимодействиях с рабочим имуществом отдела и экипажем станции, при отсутствии приставленного к нему квалифицированного сотрудника или полученного разрешения от вышестоящего начальства." -/datum/station_department/engineering/New() - . = ..() - department_roles |= get_all_engineering_novice_titles() +/datum/outfit/job/engineer/trainee + name = "Trainee Engineer" + jobtype = /datum/job/engineer/trainee -/datum/outfit/job/engineer/pre_equip(mob/living/carbon/human/H, visualsOnly) + uniform = /obj/item/clothing/under/rank/engineering/engineer/trainee + suit = /obj/item/clothing/suit/storage/hazardvest + belt = /obj/item/storage/belt/utility/full + shoes = /obj/item/clothing/shoes/workboots + gloves = /obj/item/clothing/gloves/color/orange + head = /obj/item/clothing/head/hardhat/orange + l_ear = /obj/item/radio/headset/headset_eng + id = /obj/item/card/id/engineering/trainee + l_pocket = /obj/item/t_scanner + pda = /obj/item/pda/engineering + + backpack = /obj/item/storage/backpack/industrial + satchel = /obj/item/storage/backpack/satchel_eng + dufflebag = /obj/item/storage/backpack/duffel/engineering + box = /obj/item/storage/box/engineer + +/datum/outfit/job/engineer/trainee/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() - if(H.mind && H.mind.role_alt_title) - if(H.mind.role_alt_title in get_all_engineering_novice_titles()) - uniform = /obj/item/clothing/under/rank/engineer/trainee - if(H.gender == FEMALE) - uniform = /obj/item/clothing/under/rank/engineer/trainee/skirt - id = /obj/item/card/id/engineering/trainee - gloves = /obj/item/clothing/gloves/color/orange - switch(H.mind.role_alt_title) - if("Engineer Assistant") - uniform = /obj/item/clothing/under/rank/engineer/trainee/assistant - if(H.gender == FEMALE) - uniform = /obj/item/clothing/under/rank/engineer/trainee/assistant/skirt - if("Technical Assistant") - uniform = /obj/item/clothing/under/rank/engineer/trainee/assistant - if(H.gender == FEMALE) - uniform = /obj/item/clothing/under/rank/engineer/trainee/assistant/skirt - head = /obj/item/clothing/head/soft/orange - if("Technical Student", "Technical Trainee") - head = /obj/item/clothing/head/soft/orange - if("Engineer Student") - head = /obj/item/clothing/head/beret/eng + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/engineering/engineer/trainee/skirt -// Identification jobs for console -/datum/job/engineer/trainee - title = "Trainee Engineer" - hidden_from_job_prefs = TRUE + switch(H.mind.role_alt_title) + if("Engineer Assistant") + uniform = /obj/item/clothing/under/rank/engineering/engineer/trainee/assistant + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/engineering/engineer/trainee/assistant/skirt + if("Technical Assistant") + uniform = /obj/item/clothing/under/rank/engineering/engineer/trainee/assistant + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/engineering/engineer/trainee/assistant/skirt + head = /obj/item/clothing/head/soft/orange + if("Technical Student", "Technical Trainee") + head = /obj/item/clothing/head/soft/orange + if("Engineer Student") + head = /obj/item/clothing/head/beret/eng + +/datum/outfit/job/engineer/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/engineering/engineer/skirt diff --git a/modular_ss220/jobs/code/job/medical_jobs.dm b/modular_ss220/jobs/code/job/medical_jobs.dm index c1f674bb28c7..1d3623e7f038 100644 --- a/modular_ss220/jobs/code/job/medical_jobs.dm +++ b/modular_ss220/jobs/code/job/medical_jobs.dm @@ -1,37 +1,49 @@ -/datum/job/doctor/New() - . = ..() - alt_titles |= get_all_medical_novice_titles() +/datum/job/doctor/intern + title = "Intern" + flag = JOB_INTERN + total_positions = 0 + spawn_positions = 3 + //selection_color = "#ebe2e3" + alt_titles = list("Medical Assistant", "Student Medical Doctor") + exp_map = list(EXP_TYPE_CREW = NOVICE_JOB_MINUTES) + outfit = /datum/outfit/job/doctor/intern + important_information = "Ваша должность ограничена во всех взаимодействиях с рабочим имуществом отдела и экипажем станции, при отсутствии приставленного к нему квалифицированного сотрудника или полученного разрешения от вышестоящего начальства." -/datum/station_department/medical/New() - . = ..() - department_roles |= get_all_medical_novice_titles() +/datum/outfit/job/doctor/intern + name = "Intern" + jobtype = /datum/job/doctor/intern -/datum/outfit/job/doctor/pre_equip(mob/living/carbon/human/H, visualsOnly) + uniform = /obj/item/clothing/under/rank/medical/doctor/intern + suit = /obj/item/clothing/suit/storage/labcoat + mask = /obj/item/clothing/mask/surgical + gloves = /obj/item/clothing/gloves/color/latex + shoes = /obj/item/clothing/shoes/white + l_ear = /obj/item/radio/headset/headset_med + id = /obj/item/card/id/medical/intern + suit_store = /obj/item/flashlight/pen + l_hand = /obj/item/storage/firstaid/o2 + pda = /obj/item/pda/medical + + backpack = /obj/item/storage/backpack/medic + satchel = /obj/item/storage/backpack/satchel_med + dufflebag = /obj/item/storage/backpack/duffel/medical + +/datum/outfit/job/doctor/intern/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() - if(H.mind && H.mind.role_alt_title) - if(H.mind.role_alt_title in get_all_medical_novice_titles()) - uniform = /obj/item/clothing/under/rank/medical/intern - if(H.gender == FEMALE) - uniform = /obj/item/clothing/under/rank/medical/intern/skirt - id = /obj/item/card/id/medical/intern - l_hand = /obj/item/storage/firstaid/o2 - mask = /obj/item/clothing/mask/surgical - gloves = /obj/item/clothing/gloves/color/latex - switch(H.mind.role_alt_title) - if("Intern") - uniform = /obj/item/clothing/under/rank/medical/intern - if(H.gender == FEMALE) - uniform = /obj/item/clothing/under/rank/medical/intern/skirt - if("Medical Assistant") - uniform = /obj/item/clothing/under/rank/medical/intern/assistant - if(H.gender == FEMALE) - uniform = /obj/item/clothing/under/rank/medical/intern/assistant/skirt - if("Student Medical Doctor") - head = /obj/item/clothing/head/surgery/green/light - uniform = /obj/item/clothing/under/rank/medical/scrubs/green/light + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/medical/doctor/intern/skirt -// Identification jobs for console -/datum/job/doctor/intern - title = "Intern" - hidden_from_job_prefs = TRUE + switch(H.mind.role_alt_title) + if("Medical Assistant") + uniform = /obj/item/clothing/under/rank/medical/doctor/intern/assistant + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/medical/doctor/intern/assistant/skirt + if("Student Medical Doctor") + head = /obj/item/clothing/head/surgery/green/light + uniform = /obj/item/clothing/under/rank/medical/scrubs/green/light + +/datum/outfit/job/doctor/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/medical/doctor/skirt diff --git a/modular_ss220/jobs/code/job/science_jobs.dm b/modular_ss220/jobs/code/job/science_jobs.dm index b3387f831acc..fc4cb90bb06c 100644 --- a/modular_ss220/jobs/code/job/science_jobs.dm +++ b/modular_ss220/jobs/code/job/science_jobs.dm @@ -1,27 +1,42 @@ -/datum/job/scientist/New() - . = ..() - alt_titles |= get_all_science_novice_titles() +/datum/job/scientist/student + title = "Student Scientist" + flag = JOB_STUDENT + total_positions = 0 + spawn_positions = 4 + //selection_color = "#ece5ec" + alt_titles = list("Scientist Assistant", "Scientist Pregraduate", "Scientist Graduate", "Scientist Postgraduate") + exp_map = list(EXP_TYPE_CREW = NOVICE_JOB_MINUTES) + outfit = /datum/outfit/job/scientist/student + important_information = "Ваша должность ограничена во всех взаимодействиях с рабочим имуществом отдела и экипажем станции, при отсутствии приставленного к нему квалифицированного сотрудника или полученного разрешения от вышестоящего начальства." -/datum/station_department/science/New() - . = ..() - department_roles |= get_all_science_novice_titles() +/datum/outfit/job/scientist/student + name = "Student Scientist" + jobtype = /datum/job/scientist/student -/datum/outfit/job/scientist/pre_equip(mob/living/carbon/human/H, visualsOnly) + uniform = /obj/item/clothing/under/rank/rnd/scientist/student + suit = /obj/item/clothing/suit/storage/labcoat/science + shoes = /obj/item/clothing/shoes/white + l_ear = /obj/item/radio/headset/headset_sci + id = /obj/item/card/id/research/student + pda = /obj/item/pda/toxins + + backpack = /obj/item/storage/backpack/science + satchel = /obj/item/storage/backpack/satchel_tox + dufflebag = /obj/item/storage/backpack/duffel/science + +/datum/outfit/job/scientist/student/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() - if(H.mind && H.mind.role_alt_title) - if(H.mind.role_alt_title in get_all_science_novice_titles()) - uniform = /obj/item/clothing/under/rank/scientist/student - if(H.gender == FEMALE) - uniform = /obj/item/clothing/under/rank/scientist/student/skirt - id = /obj/item/card/id/research/student - switch(H.mind.role_alt_title) - if("Scientist Assistant") - uniform = /obj/item/clothing/under/rank/scientist/student/assistant - if(H.gender == FEMALE) - uniform = /obj/item/clothing/under/rank/scientist/student/assistant/skirt + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/rnd/scientist/student/skirt -// Identification jobs for console -/datum/job/scientist/student - title = "Student Scientist" - hidden_from_job_prefs = TRUE + switch(H.mind.role_alt_title) + if("Scientist Assistant") + uniform = /obj/item/clothing/under/rank/rnd/scientist/student/assistant + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/rnd/scientist/student/assistant/skirt + +/datum/outfit/job/scientist/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/rnd/scientist/skirt diff --git a/modular_ss220/jobs/code/job/security_jobs.dm b/modular_ss220/jobs/code/job/security_jobs.dm index 6b5e68ba1cea..6cbf63cce39c 100644 --- a/modular_ss220/jobs/code/job/security_jobs.dm +++ b/modular_ss220/jobs/code/job/security_jobs.dm @@ -1,31 +1,51 @@ -/datum/job/officer/New() - . = ..() - alt_titles = get_all_security_novice_titles() // =, а не |=, т.к. отсутствуют альт. названия +/datum/job/officer/cadet + title = "Security Cadet" + flag = JOB_CADET + total_positions = 0 // miss add slots + spawn_positions = 2 + //selection_color = "#efe6e6" + alt_titles = list("Security Assistant", "Security Graduate") + exp_map = list(EXP_TYPE_CREW = NOVICE_CADET_JOB_MINUTES) + outfit = /datum/outfit/job/officer/cadet + important_information = "Космический закон это необходимость, а не рекомендация. Ваша должность ограничена во всех взаимодействиях с рабочим имуществом отдела и экипажем станции, при отсутствии приставленного к нему квалифицированного сотрудника или полученного разрешения от вышестоящего начальства." -/datum/station_department/security/New() - . = ..() - department_roles |= get_all_security_novice_titles() +/datum/outfit/job/officer/cadet + name = "Security Cadet" + jobtype = /datum/job/officer/cadet + uniform = /obj/item/clothing/under/rank/security/officer/cadet + suit = /obj/item/clothing/suit/armor/vest/security + gloves = /obj/item/clothing/gloves/color/black + shoes = /obj/item/clothing/shoes/jackboots + head = /obj/item/clothing/head/soft/sec + l_ear = /obj/item/radio/headset/headset_sec/alt + id = /obj/item/card/id/security/cadet + l_pocket = /obj/item/reagent_containers/spray/pepper + suit_store = /obj/item/gun/energy/disabler + pda = /obj/item/pda/security + backpack_contents = list( + /obj/item/restraints/handcuffs = 1 + ) + //box = /obj/item/storage/box/survival_security/cadet -/datum/outfit/job/officer/pre_equip(mob/living/carbon/human/H, visualsOnly) + +/datum/outfit/job/officer/cadet/pre_equip(mob/living/carbon/human/H, visualsOnly) . = ..() - if(H.mind && H.mind.role_alt_title) - if(H.mind.role_alt_title in get_all_security_novice_titles()) - uniform = /obj/item/clothing/under/rank/security/cadet + + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/security/officer/cadet/skirt + + switch(H.mind.role_alt_title) + if("Security Assistant") + uniform = /obj/item/clothing/under/rank/security/officer/cadet/assistant if(H.gender == FEMALE) - uniform = /obj/item/clothing/under/rank/security/cadet/skirt - head = /obj/item/clothing/head/soft/sec - id = /obj/item/card/id/security/cadet - l_pocket = /obj/item/reagent_containers/spray/pepper - //box = /obj/item/storage/box/survival_security/cadet - switch(H.mind.role_alt_title) - if("Security Assistant") - uniform = /obj/item/clothing/under/rank/security/cadet/assistant - if(H.gender == FEMALE) - uniform = /obj/item/clothing/under/rank/security/cadet/assistant/skirt - if("Security Graduate") - head = /obj/item/clothing/head/beret/sec + uniform = /obj/item/clothing/under/rank/security/officer/cadet/assistant/skirt + if("Security Graduate") + head = /obj/item/clothing/head/beret/sec -// Identification jobs for console -/datum/job/officer/cadet - title = "Security Cadet" - hidden_from_job_prefs = TRUE +/datum/job/officer + alt_titles = list("Security Trainer", "Junior Security Officer") + +/datum/outfit/job/officer/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/security/officer/skirt diff --git a/modular_ss220/jobs/code/jobs.dm b/modular_ss220/jobs/code/jobs.dm index 75e8d8db2f55..c1b8d290b371 100644 --- a/modular_ss220/jobs/code/jobs.dm +++ b/modular_ss220/jobs/code/jobs.dm @@ -1,24 +1,76 @@ /datum/nttc_configuration/New() . = ..() var/list/job_radio_dict = list() - - for(var/i in get_all_medical_novice_titles()) + for(var/i in (GLOB.medical_positions_ss220 + get_all_medical_alt_titles_ss220())) job_radio_dict.Add(list("[i]" = "medradio")) - for(var/i in get_all_security_novice_titles()) + for(var/i in (GLOB.security_positions_ss220 + get_all_security_alt_titles_ss220())) job_radio_dict.Add(list("[i]" = "secradio")) - for(var/i in get_all_engineering_novice_titles()) + for(var/i in (GLOB.engineering_positions_ss220 + get_all_engineering_alt_titles_ss220())) job_radio_dict.Add(list("[i]" = "engradio")) - for(var/i in get_all_science_novice_titles()) + for(var/i in (GLOB.science_positions_ss220 + get_all_science_alt_titles_ss220())) job_radio_dict.Add(list("[i]" = "scirradio")) all_jobs |= job_radio_dict + +// ======================================= +// relate jobs for relate job slots +// ======================================= +/datum/job/proc/try_relate_jobs() + return FALSE + +/datum/job + var/relate_job // for novice role and etc + +/datum/job/doctor + relate_job = "Intern" +/datum/job/doctor/intern + relate_job = "Medical Doctor" + +/datum/job/scientist + relate_job = "Student Scientist" +/datum/job/scientist/student + relate_job = "Scientist" + +/datum/job/engineer + relate_job = "Trainee Engineer" +/datum/job/engineer/trainee + relate_job = "Station Engineer" + +/datum/job/officer + relate_job = "Security Cadet" +/datum/job/officer/cadet + relate_job = "Security Officer" + /datum/job/is_position_available() - . = ..() + if(job_banned_gamemode) + return FALSE + if(check_hidden_from_job_prefs()) + return FALSE + + return relate_job ? check_relate_positions() : ..() + +/datum/job/proc/check_relate_positions() + var/datum/job/temp = SSjobs.GetJob(relate_job) + + var/current_count_positions = current_positions + temp.current_positions + var/total_count_positions = total_positions + temp.total_positions + + if(total_positions == -1) + total_count_positions = -1 + + return (current_count_positions < total_count_positions) || (total_count_positions == -1) + +/datum/job/proc/check_hidden_from_job_prefs() if(hidden_from_job_prefs) - for(var/job_title in GLOB.Jobs_titles_SS220) + for(var/job_title in GLOB.jobs_positions_ss220) if(job_title in alt_titles) - return FALSE - if(title in GLOB.Jobs_titles_SS220) - return FALSE + return TRUE + if(title in GLOB.jobs_positions_ss220) + return TRUE + return FALSE + +// OFFICIAL parameters: 17 / HOS, Bart / 400 / 700 +/datum/character_save/SetChoices(mob/user, limit = 18, list/splitJobs = list("Head of Security", "Bartender"), widthPerColumn = 450, height = 700) + . = ..() diff --git a/modular_ss220/jobs/code/jobs_character.dm b/modular_ss220/jobs/code/jobs_character.dm new file mode 100644 index 000000000000..4e526b4c4aa1 --- /dev/null +++ b/modular_ss220/jobs/code/jobs_character.dm @@ -0,0 +1,110 @@ +// Будь прокляты те кто вставлял списки прямо в код. Это не ТОГЭ. Поэтому оставь здравомыслие всяк сюда входящий. +/datum/species/plasmaman/before_equip_job(datum/job/J, mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + var/current_job = J.title + var/datum/outfit/plasmaman/O = new /datum/outfit/plasmaman + switch(current_job) + + if("Security Cadet") + O = new /datum/outfit/plasmaman/security + + if("Intern") + O = new /datum/outfit/plasmaman/medical + + if("Student Scientist") + O = new /datum/outfit/plasmaman/science + + if("Trainee Engineer") + O = new /datum/outfit/plasmaman/engineering + + H.equipOutfit(O, visualsOnly) + H.internal = H.r_hand + H.update_action_buttons_icon() + return FALSE + + +// это копипаст мерзопакости. Я не буду рефакторить это в модуле, я шо, ебанутый? +// Оно работает и ладно. И я не буду этот комментарий на английский переводить. +// Эту хуйню должен видеть каждый кто сюда зайдет и полезет посмотреть какой в родителе оригинальный код на 1000 строчек. +/datum/character_save/update_preview_icon(for_observer=0) + . = ..() + + // qdel(preview_icon_front) + // qdel(preview_icon_side) + // qdel(preview_icon) + + var/g = "" + if(gender == FEMALE) + g = "f" + + var/icon/clothes_s = null + + if(job_medsci_high) + switch(job_medsci_high) + if(JOB_STUDENT) + clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "student[g]_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY) + if(prob(1)) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "metroid"), ICON_OVERLAY) + switch(backbag) + if(2) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) + if(3) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-tox"), ICON_OVERLAY) + if(4) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) + + if(JOB_INTERN) + clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "intern[g]_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) + switch(backbag) + if(2) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) + if(3) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY) + if(4) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) + + else if(job_engsec_high) + switch(job_engsec_high) + if(JOB_CADET) + clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "cadet[g]_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + if(prob(1)) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "justice_up"), ICON_OVERLAY) + else + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "secsoft"), ICON_OVERLAY) + switch(backbag) + if(2) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY) + if(3) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY) + if(4) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) + + if(JOB_TRAINEE) + clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "trainee[g]_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hardhat0_orange"), ICON_OVERLAY) + if(prob(70)) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "orangegloves"), ICON_OVERLAY) + if(prob(70)) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "hazard"), ICON_OVERLAY) + switch(backbag) + if(2) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "engiepack"), ICON_OVERLAY) + if(3) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-eng"), ICON_OVERLAY) + if(4) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) + + if(clothes_s) + preview_icon.Blend(clothes_s, ICON_OVERLAY) + + preview_icon_front = new(preview_icon, dir = SOUTH) + preview_icon_side = new(preview_icon, dir = WEST) + + qdel(clothes_s) diff --git a/modular_ss220/jobs/code/jobs_gamemodes.dm b/modular_ss220/jobs/code/jobs_gamemodes.dm new file mode 100644 index 000000000000..4db68643f8f3 --- /dev/null +++ b/modular_ss220/jobs/code/jobs_gamemodes.dm @@ -0,0 +1,27 @@ +/datum/game_mode/changeling/New() + . = ..() + protected_jobs |= GLOB.security_positions_ss220 + +/datum/game_mode/cult/New() + . = ..() + restricted_jobs |= GLOB.security_positions_ss220 + +/datum/game_mode/revolution/New() + . = ..() + restricted_jobs |= GLOB.security_positions_ss220 + +/datum/game_mode/traitor/New() + . = ..() + protected_jobs |= GLOB.security_positions_ss220 + +/datum/game_mode/trifecta/New() + . = ..() + protected_jobs |= GLOB.security_positions_ss220 + +/datum/game_mode/traitor/vampire/New() + . = ..() + protected_jobs |= GLOB.security_positions_ss220 + +/datum/game_mode/vampire/New() + . = ..() + protected_jobs |= GLOB.security_positions_ss220 diff --git a/modular_ss220/jobs/code/jobs_global_list.dm b/modular_ss220/jobs/code/jobs_global_list.dm new file mode 100644 index 000000000000..3ae7787fba1f --- /dev/null +++ b/modular_ss220/jobs/code/jobs_global_list.dm @@ -0,0 +1,41 @@ +GLOBAL_LIST_INIT(medical_positions_ss220, list( + "Intern", +)) + +GLOBAL_LIST_INIT(science_positions_ss220, list( + "Student Scientist", +)) + +GLOBAL_LIST_INIT(engineering_positions_ss220, list( + "Trainee Engineer", +)) + +GLOBAL_LIST_INIT(security_positions_ss220, list( + "Security Cadet", +)) + +GLOBAL_LIST_INIT(jobs_positions_ss220, (list() + ( + medical_positions_ss220 + science_positions_ss220 + engineering_positions_ss220 + security_positions_ss220))) + +/proc/get_alt_titles(list/positions) + var/list/all_titles = list() + for(var/rank in positions) + var/datum/job/job = SSjobs.GetJob(rank) + if(length(job.alt_titles)) + all_titles |= job.alt_titles + return all_titles + +/proc/get_all_medical_alt_titles_ss220() + return get_alt_titles(GLOB.medical_positions_ss220) + +/proc/get_all_security_alt_titles_ss220() + return get_alt_titles(GLOB.security_positions_ss220) + +/proc/get_all_engineering_alt_titles_ss220() + return get_alt_titles(GLOB.engineering_positions_ss220) + +/proc/get_all_science_alt_titles_ss220() + return get_alt_titles(GLOB.science_positions_ss220) + +/proc/get_all_alt_titles_ss220() + return get_all_medical_alt_titles_ss220() + get_all_security_alt_titles_ss220() + get_all_engineering_alt_titles_ss220() + get_all_science_alt_titles_ss220() diff --git a/modular_ss220/jobs/code/objects/engineering_job_objects.dm b/modular_ss220/jobs/code/objects/engineering_job_objects.dm new file mode 100644 index 000000000000..907234ddf11b --- /dev/null +++ b/modular_ss220/jobs/code/objects/engineering_job_objects.dm @@ -0,0 +1,47 @@ +// others +/obj/item/envelope/engineering/Initialize(mapload) + . = ..() + job_list |= GLOB.engineering_positions_ss220 + +/datum/uplink_item/jobspecific/powergloves/New() + . = ..() + job |= GLOB.engineering_positions_ss220 + +/datum/theft_objective/supermatter_sliver/New() + . = ..() + protected_jobs |= GLOB.engineering_positions_ss220 + + +// loadout +/datum/gear/accessory/armband_job/engineering/New() + . = ..() + allowed_roles |= GLOB.engineering_positions_ss220 + +/datum/gear/mug/department/eng/New() + . = ..() + allowed_roles |= GLOB.engineering_positions_ss220 + +/datum/gear/hat/hhat_yellow/New() + . = ..() + allowed_roles |= GLOB.engineering_positions_ss220 + +/datum/gear/hat/hhat_orange/New() + . = ..() + allowed_roles |= GLOB.engineering_positions_ss220 + +/datum/gear/hat/hhat_blue/New() + . = ..() + allowed_roles |= GLOB.engineering_positions_ss220 + +/datum/gear/hat/beret_job/eng/New() + . = ..() + allowed_roles |= GLOB.engineering_positions_ss220 + +/datum/gear/suit/coat/job/engi/New() + . = ..() + allowed_roles |= GLOB.engineering_positions_ss220 + +/datum/gear/uniform/skirt/job/eng/New() + . = ..() + allowed_roles |= GLOB.engineering_positions_ss220 + diff --git a/modular_ss220/jobs/code/objects/job_objects.dm b/modular_ss220/jobs/code/objects/job_objects.dm new file mode 100644 index 000000000000..fe18b83d9c6a --- /dev/null +++ b/modular_ss220/jobs/code/objects/job_objects.dm @@ -0,0 +1,31 @@ +/obj/machinery/computer/arcade/recruiter/Initialize(mapload) + . = ..() + jobs |= GLOB.jobs_positions_ss220 + get_all_alt_titles_ss220() + incorrect_jobs |= list( + "Medical Sasistant", "Shitcurity Cadet", "Traneer Enginer", "Assistant Captain", "Engineer Cadet", + "Traine Engener", "Intarn", "Entern", "Student Directar", "Head of Scientest", "Junior Codet" + ) + +/obj/effect/mob_spawn/human/intern + name = "Intern" + mob_name = "Intern" + id_job = "Intern" + outfit = /datum/outfit/job/doctor/intern + +/obj/effect/mob_spawn/human/trainee + name = "Trainee Engineer" + mob_name = "Trainee Engineer" + id_job = "Trainee Engineer" + outfit = /datum/outfit/job/engineer/trainee + +/obj/effect/mob_spawn/human/student + name = "Student Scientist" + mob_name = "Student Scientist" + id_job = "Student Scientist" + outfit = /datum/outfit/job/scientist/student + +/obj/effect/mob_spawn/human/cadet + name = "Security Cadet" + mob_name = "Security Cadet" + id_job = "Security Cadet" + outfit = /datum/outfit/job/officer/cadet diff --git a/modular_ss220/jobs/code/objects/medical_job_objects.dm b/modular_ss220/jobs/code/objects/medical_job_objects.dm new file mode 100644 index 000000000000..253c25a5aa49 --- /dev/null +++ b/modular_ss220/jobs/code/objects/medical_job_objects.dm @@ -0,0 +1,58 @@ +// others +/obj/item/envelope/medical/Initialize(mapload) + . = ..() + job_list |= GLOB.medical_positions_ss220 + +/datum/uplink_item/jobspecific/viral_injector/New() + . = ..() + job |= GLOB.medical_positions_ss220 + + +// loadout +/datum/gear/accessory/stethoscope/New() + . = ..() + allowed_roles |= GLOB.medical_positions_ss220 + +/datum/gear/accessory/armband_job/medical/New() + . = ..() + allowed_roles |= GLOB.medical_positions_ss220 + +/datum/gear/glasses/goggles_job/medhudgoggles/New() + . = ..() + allowed_roles |= GLOB.medical_positions_ss220 + +/datum/gear/mug/department/med/New() + . = ..() + allowed_roles |= GLOB.medical_positions_ss220 + +/datum/gear/hat/beret_job/med/New() + . = ..() + allowed_roles |= GLOB.medical_positions_ss220 + +/datum/gear/hat/surgicalcap_purple/New() + . = ..() + allowed_roles |= GLOB.medical_positions_ss220 + +/datum/gear/hat/surgicalcap_green/New() + . = ..() + allowed_roles |= GLOB.medical_positions_ss220 + +/datum/gear/racial/taj/med/New() + . = ..() + allowed_roles |= GLOB.medical_positions_ss220 + +/datum/gear/suit/coat/job/med/New() + . = ..() + allowed_roles |= GLOB.medical_positions_ss220 + +/datum/gear/uniform/skirt/job/med/New() + . = ..() + allowed_roles |= GLOB.medical_positions_ss220 + +/datum/gear/uniform/medical/pscrubs/New() + . = ..() + allowed_roles |= GLOB.medical_positions_ss220 + +/datum/gear/uniform/medical/gscrubs/New() + . = ..() + allowed_roles |= GLOB.medical_positions_ss220 diff --git a/modular_ss220/jobs/code/objects/science_job_objects.dm b/modular_ss220/jobs/code/objects/science_job_objects.dm new file mode 100644 index 000000000000..861a8c1fabe4 --- /dev/null +++ b/modular_ss220/jobs/code/objects/science_job_objects.dm @@ -0,0 +1,35 @@ +// others +/obj/item/envelope/science/Initialize(mapload) + . = ..() + job_list |= GLOB.science_positions_ss220 + +/datum/uplink_item/jobspecific/stims/New() + . = ..() + job |= GLOB.science_positions_ss220 + +/datum/theft_objective/reactive/New() + . = ..() + protected_jobs |= GLOB.science_positions_ss220 + + +// loadout +/datum/gear/accessory/armband_job/sci/New() + . = ..() + allowed_roles |= GLOB.science_positions_ss220 + +/datum/gear/glasses/goggles_job/diaghudgoggles/New() + . = ..() + allowed_roles |= GLOB.science_positions_ss220 + +/datum/gear/mug/department/sci/New() + . = ..() + allowed_roles |= GLOB.science_positions_ss220 + +/datum/gear/hat/beret_job/sci/New() + . = ..() + allowed_roles |= GLOB.science_positions_ss220 + +/datum/gear/suit/coat/job/sci/New() + . = ..() + allowed_roles |= GLOB.science_positions_ss220 + diff --git a/modular_ss220/jobs/code/objects/security_job_objects.dm b/modular_ss220/jobs/code/objects/security_job_objects.dm new file mode 100644 index 000000000000..f25df87d296f --- /dev/null +++ b/modular_ss220/jobs/code/objects/security_job_objects.dm @@ -0,0 +1,75 @@ +/obj/item/envelope/security/Initialize(mapload) + . = ..() + job_list |= GLOB.security_positions_ss220 + +/datum/gear/accessory/holobadge/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/accessory/holobadge_n/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/accessory/armband_job/sec/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/glasses/sechud/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/glasses/goggles_job/sechudgoggles/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/mug/department/sec/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/hat/capcsec/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/hat/capsec/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/hat/beret_job/sec/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/racial/taj/sec/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/suit/coat/job/sec/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/suit/bomber/job/sec/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/suit/secjacket/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/uniform/skirt/job/security/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/uniform/sec/formal/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/uniform/sec/secorporate/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/uniform/sec/dispatch/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 + +/datum/gear/uniform/sec/casual/New() + . = ..() + allowed_roles |= GLOB.security_positions_ss220 diff --git a/modular_ss220/jobs/code/objects/wardrobe_vendors.dm b/modular_ss220/jobs/code/objects/wardrobe_vendors.dm new file mode 100644 index 000000000000..f508f3d87774 --- /dev/null +++ b/modular_ss220/jobs/code/objects/wardrobe_vendors.dm @@ -0,0 +1,40 @@ +/obj/machinery/economy/vending/medidrobe/Initialize(mapload) + . = ..() + products |= list( + /obj/item/clothing/under/rank/medical/doctor/intern = 5, + /obj/item/clothing/under/rank/medical/doctor/intern/skirt = 5, + /obj/item/clothing/under/rank/medical/doctor/intern/assistant = 5, + /obj/item/clothing/under/rank/medical/doctor/intern/assistant/skirt = 5, + /obj/item/clothing/head/surgery/green/light = 5, + /obj/item/clothing/under/rank/medical/scrubs/green/light = 5, + ) + + +/obj/machinery/economy/vending/secdrobe/Initialize(mapload) + . = ..() + products |= list( + /obj/item/clothing/under/rank/security/officer/cadet = 5, + /obj/item/clothing/under/rank/security/officer/cadet/skirt = 5, + /obj/item/clothing/under/rank/security/officer/cadet/assistant = 5, + /obj/item/clothing/under/rank/security/officer/cadet/assistant/skirt = 5, + ) + + +/obj/machinery/economy/vending/scidrobe/Initialize(mapload) + . = ..() + products |= list( + /obj/item/clothing/under/rank/rnd/scientist/student = 5, + /obj/item/clothing/under/rank/rnd/scientist/student/skirt = 5, + /obj/item/clothing/under/rank/rnd/scientist/student/assistant = 5, + /obj/item/clothing/under/rank/rnd/scientist/student/assistant/skirt = 5, + ) + + +/obj/machinery/economy/vending/engidrobe/Initialize(mapload) + . = ..() + products |= list( + /obj/item/clothing/under/rank/engineering/engineer/trainee = 5, + /obj/item/clothing/under/rank/engineering/engineer/trainee/skirt = 5, + /obj/item/clothing/under/rank/engineering/engineer/trainee/assistant = 5, + /obj/item/clothing/under/rank/engineering/engineer/trainee/assistant/skirt = 5, + ) diff --git a/modular_ss220/jobs/icons/hud.dmi b/modular_ss220/jobs/icons/hud.dmi index b2a80ca3a66d..cc08b6d4a546 100644 Binary files a/modular_ss220/jobs/icons/hud.dmi and b/modular_ss220/jobs/icons/hud.dmi differ diff --git a/modular_ss220/loadout/code/donor.dm b/modular_ss220/loadout/code/donor.dm index f77a9b5d3652..a91ab89928cf 100644 --- a/modular_ss220/loadout/code/donor.dm +++ b/modular_ss220/loadout/code/donor.dm @@ -63,6 +63,16 @@ path = /obj/item/storage/wallet cost = 12 +/datum/gear/donor/Wallet_NT + display_name = "Бумажник NT" + path = /obj/item/storage/wallet/wallet_NT + cost = 12 + +/datum/gear/donor/Wallet_USSP + display_name = "Бумажник СССП" + path = /obj/item/storage/wallet/wallet_USSP_2 + cost = 12 + /datum/gear/donor/firefirstaid display_name = "Набор первой медицинской помощи от премиальной страховки" path = /obj/item/storage/firstaid/regular/donor @@ -103,6 +113,17 @@ path = /obj/item/healthanalyzer cost = 2 +/datum/gear/donor/breathscarf + display_name = "Шарф с системой дыхания" + path = /obj/item/clothing/mask/breath/breathscarf + cost = 2 + +/datum/gear/donor/kitty_ears + display_name = "Кошачьи ушки" + path = /obj/item/clothing/head/kitty + donator_tier = 2 + cost = 1 + // ID Skins /datum/gear/donor/id_decal_colored display_name = "Наклейка на карту (Голографическая)" @@ -114,6 +135,16 @@ path = /obj/item/id_skin/donut cost = 2 +/datum/gear/donor/id_decal_business + display_name = "Бизнесменская наклейка на карту" + path = /obj/item/id_skin/business + cost = 2 + +/datum/gear/donor/id_decal_ussp + display_name = "Коммунистическая наклейка на карту" + path = /obj/item/id_skin/ussp + cost = 2 + /datum/gear/donor/id_decal_silver_colored display_name = "Серебрянная наклейка на карту (Голографическая)" path = /obj/item/id_skin/colored/silver @@ -132,24 +163,12 @@ donator_tier = 3 cost = 2 -/datum/gear/donor/id_decal_business - display_name = "Бизнесменская наклейка на карту" - path = /obj/item/id_skin/business - donator_tier = 3 - cost = 2 - /datum/gear/donor/id_decal_lifetime display_name = "Стильная наклейка на карту" path = /obj/item/id_skin/lifetime donator_tier = 3 cost = 2 -/datum/gear/donor/id_decal_ussp - display_name = "Коммунистическая наклейка на карту" - path = /obj/item/id_skin/ussp - donator_tier = 3 - cost = 2 - /datum/gear/donor/id_decal_clown display_name = "Клоунская наклейка на карту" path = /obj/item/id_skin/clown @@ -186,55 +205,72 @@ donator_tier = 3 cost = 2 -/datum/gear/donor/id_decal_rainbow - display_name = "Радужная наклейка на карту" - path = /obj/item/id_skin/rainbow - donator_tier = 4 - cost = 3 - -/datum/gear/donor/id_decal_space - display_name = "КОСМИЧЕСКАЯ наклейка на карту" - path = /obj/item/id_skin/space - donator_tier = 4 - cost = 3 - /datum/gear/donor/id_decal_kitty display_name = "Кото-клейка на карту" path = /obj/item/id_skin/kitty - donator_tier = 4 - cost = 3 + donator_tier = 3 + cost = 4 /datum/gear/donor/id_decal_kitty_colored display_name = "Кото-клейка на карту (Голографическая)" path = /obj/item/id_skin/colored/kitty - donator_tier = 4 - cost = 3 + donator_tier = 3 + cost = 4 /datum/gear/donor/id_decal_anime display_name = "Анимешная наклейка на карту" path = /obj/item/id_skin/cursedmiku + donator_tier = 3 + cost = 4 + +/datum/gear/donor/id_decal_jokerge + display_name = "Джокерге наклейка на карту" + path = /obj/item/id_skin/jokerge + donator_tier = 3 + cost = 4 + +/datum/gear/donor/id_decal_rainbow + display_name = "Радужная наклейка на карту" + path = /obj/item/id_skin/rainbow donator_tier = 4 - cost = 3 + cost = 4 + +/datum/gear/donor/id_decal_space + display_name = "КОСМИЧЕСКАЯ наклейка на карту" + path = /obj/item/id_skin/space + donator_tier = 4 + cost = 4 /datum/gear/donor/id_decal_snake display_name = "Бегущая наклейка на карту" path = /obj/item/id_skin/colored/snake donator_tier = 4 - cost = 3 + cost = 4 /datum/gear/donor/id_decal_magic display_name = "Магическая наклейка на карту" path = /obj/item/id_skin/magic donator_tier = 4 - cost = 3 + cost = 4 /datum/gear/donor/id_decal_terminal display_name = "Наклейка на карту в виде терминала" path = /obj/item/id_skin/terminal donator_tier = 4 - cost = 3 + cost = 4 /datum/gear/donor/breathscarf display_name = "Шарф с системой дыхания" path = /obj/item/clothing/mask/breath/breathscarf cost = 2 + +/datum/gear/donor/red_gas + display_name = "ПРС-1" + path = /obj/item/clothing/mask/breath/red_gas + donator_tier = 2 + +/datum/gear/donor/id_decal_boykisser + display_name = "BoyKisser наклейка на карту" + path = /obj/item/id_skin/boykisser + donator_tier = 4 + cost = 5 diff --git a/modular_ss220/maps220/_maps220.dme b/modular_ss220/maps220/_maps220.dme index 5b95af74ec3f..070df167bf47 100644 --- a/modular_ss220/maps220/_maps220.dme +++ b/modular_ss220/maps220/_maps220.dme @@ -8,6 +8,7 @@ #include "code/Station/cyberiad.dm" #include "code/Station/delta.dm" #include "code/Station/metastation.dm" +#include "code/Station/cerestation.dm" #include "code/corpses.dm" #include "code/directions.dm" #include "code/helpers.dm" diff --git a/modular_ss220/maps220/code/Station/cerestation.dm b/modular_ss220/maps220/code/Station/cerestation.dm new file mode 100644 index 000000000000..aa86c4387186 --- /dev/null +++ b/modular_ss220/maps220/code/Station/cerestation.dm @@ -0,0 +1,2 @@ +/datum/map/cerestation + voteable = FALSE diff --git a/modular_ss220/maps220/code/layers.dm b/modular_ss220/maps220/code/layers.dm index c382ce338c0e..91094d005b78 100644 --- a/modular_ss220/maps220/code/layers.dm +++ b/modular_ss220/maps220/code/layers.dm @@ -1,2 +1,10 @@ /obj/structure/barricade/wooden layer = ABOVE_OBJ_LAYER + +/obj/machinery/door/window + layer = CLOSED_DOOR_LAYER + closingLayer = CLOSED_DOOR_LAYER + +/obj/machinery/door/poddoor + layer = BLASTDOOR_LAYER + closingLayer = SHUTTER_LAYER diff --git a/modular_ss220/maps220/code/mobs.dm b/modular_ss220/maps220/code/mobs.dm index d57a98b1681d..b3e139f41fbe 100644 --- a/modular_ss220/maps220/code/mobs.dm +++ b/modular_ss220/maps220/code/mobs.dm @@ -662,11 +662,18 @@ var/alert_cooldown = 3 SECONDS var/alert_cooldown_time + +/mob/living/simple_animal/hostile/blackmesa/Initialize(mapload) + . = ..() + add_language("Sol Common") + default_language = GLOB.all_languages["Sol Common"] + /mob/living/simple_animal/hostile/blackmesa/Aggro() - if(alert_sounds) - if(!(world.time > alert_cooldown_time)) - playsound(src, pick(alert_sounds), 70) - alert_cooldown_time = world.time + alert_cooldown + if(!alert_sounds) + return + if(world.time > alert_cooldown_time) + playsound(src, pick(alert_sounds), 70) + alert_cooldown_time = world.time + alert_cooldown //Humans /mob/living/simple_animal/hostile/blackmesa/hecu name = "HECU Grunt" @@ -681,8 +688,8 @@ speed = 0 stat_attack = UNCONSCIOUS robust_searching = 1 - maxHealth = 110 - health = 110 + maxHealth = 90 + health = 90 harm_intent_damage = 5 melee_damage_lower = 10 melee_damage_upper = 15 @@ -741,8 +748,8 @@ turns_per_move = 5 speed = 0 robust_searching = 1 - maxHealth = 80 - health = 80 + maxHealth = 70 + health = 70 harm_intent_damage = 5 melee_damage_lower = 10 melee_damage_upper = 10 @@ -847,14 +854,15 @@ icon = 'modular_ss220/maps220/icons/simple_human.dmi' icon_state = "zombie" icon_living = "zombie" - maxHealth = 100 - health = 100 + maxHealth = 70 + health = 70 mob_biotypes = list(MOB_ORGANIC, MOB_BEAST) environment_smash = ENVIRONMENT_SMASH_STRUCTURES icon_dead = "zombie_dead" speak_chance = 1 speak_emote = list("growls") - speed = 1.8 + speed = 1 + move_to_delay = 3.8 emote_taunt = list("growls", "snarls", "grumbles") taunt_chance = 100 melee_damage_lower = 15 @@ -876,35 +884,32 @@ icon_state = "scientist_zombie" icon_living = "scientist_zombie" loot = list(/obj/effect/gibspawner/human) - del_on_death = TRUE /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/guard name = "zombified guard" desc = "About that brain I owed ya!" icon_state = "security_zombie" icon_living = "security_zombie" - maxHealth = 120 // Armor! - health = 120 + maxHealth = 100 // Armor! + health = 100 loot = list(/obj/effect/gibspawner/human) - del_on_death = TRUE /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/hecu name = "zombified marine" desc = "MY. ASS. IS. DEAD." icon_state = "hecu_zombie" icon_living = "hecu_zombie" - maxHealth = 150 // More armor! - health = 150 + maxHealth = 130 // More armor! + health = 130 loot = list(/obj/effect/gibspawner/human) - del_on_death = TRUE /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/hev name = "zombified hazardous environment specialist" desc = "User death... surpassed." icon_state = "hev_zombie" icon_living = "hev_zombie" - maxHealth = 200 - health = 200 + maxHealth = 160 + health = 160 alert_sounds = list( 'modular_ss220/aesthetics_sounds/sound/mobs/zombies/hzv1.ogg', 'modular_ss220/aesthetics_sounds/sound/mobs/zombies/hzv2.ogg', @@ -921,7 +926,7 @@ 'modular_ss220/aesthetics_sounds/sound/mobs/zombies/hzv13.ogg', 'modular_ss220/aesthetics_sounds/sound/mobs/zombies/hzv14.ogg', ) - del_on_death = TRUE + //Bullsquid /mob/living/simple_animal/hostile/blackmesa/xen/bullsquid @@ -945,6 +950,7 @@ melee_damage_lower = 15 melee_damage_upper = 15 ranged = TRUE + del_on_death = FALSE retreat_distance = 5 minimum_distance = 5 dodging = TRUE @@ -999,6 +1005,7 @@ melee_damage_lower = 20 melee_damage_upper = 20 rapid_melee = 2 + del_on_death = FALSE butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat = 3) attack_sound = 'sound/weapons/bite.ogg' gold_core_spawnable = HOSTILE_SPAWN @@ -1032,11 +1039,12 @@ ranged_message = "fires" taunt_chance = 100 turns_per_move = 3 - maxHealth = 100 - health = 100 + maxHealth = 80 + health = 80 speed = 2 ranged = TRUE dodging = TRUE + del_on_death = FALSE harm_intent_damage = 15 melee_damage_lower = 10 melee_damage_upper = 10 @@ -1070,8 +1078,8 @@ bound_height = 32 bound_width = 32 icon_dead = "bullsquid_dead" - maxHealth = 2500 - health = 2500 + maxHealth = 2000 + health = 2000 atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) universal_speak = TRUE projectilesound = 'sound/weapons/lasercannonfire.ogg' @@ -1086,7 +1094,6 @@ attacktext = "lathes" attack_sound = 'sound/weapons/punch1.ogg' status_flags = NONE - del_on_death = TRUE wander = TRUE loot = list(/obj/effect/gibspawner/xeno, /obj/item/stack/ore/bluespace_crystal/refined = 30, /obj/item/card/id/xen_key, /obj/item/gun/energy/wormhole_projector) flying = TRUE @@ -1114,11 +1121,11 @@ if(!(world.time > alert_cooldown_time)) alert_cooldown_time = world.time + alert_cooldown switch(health) - if(0 to 999) + if(0 to 499) playsound(src, pick(list('modular_ss220/aesthetics_sounds/sound/mobs/nihilanth/nihilanth_pain01.ogg', 'modular_ss220/aesthetics_sounds/sound/mobs/nihilanth/nihilanth_freeeemmaan01.ogg')), 100) - if(1000 to 1499) + if(500 to 999) playsound(src, pick(list('modular_ss220/aesthetics_sounds/sound/mobs/nihilanth/nihilanth_youalldie01.ogg', 'modular_ss220/aesthetics_sounds/sound/mobs/nihilanth/nihilanth_foryouhewaits01.ogg')), 100) - if(1500 to 1999) + if(1000 to 1999) playsound(src, pick(list('modular_ss220/aesthetics_sounds/sound/mobs/nihilanth/nihilanth_whathavedone01.ogg', 'modular_ss220/aesthetics_sounds/sound/mobs/nihilanth/nihilanth_deceiveyou01.ogg')), 100) else playsound(src, pick(list('modular_ss220/aesthetics_sounds/sound/mobs/nihilanth/nihilanth_thetruth01.ogg', 'modular_ss220/aesthetics_sounds/sound/mobs/nihilanth/nihilanth_iamthelast01.ogg')), 100) diff --git a/modular_ss220/maps220/code/objects.dm b/modular_ss220/maps220/code/objects.dm index 59aa172db275..a42859388653 100644 --- a/modular_ss220/maps220/code/objects.dm +++ b/modular_ss220/maps220/code/objects.dm @@ -582,6 +582,7 @@ faction = list("xen") tts_seed = "Vortiger" gold_core_spawnable = NO_SPAWN + del_on_death = TRUE /mob/living/simple_animal/hostile/blackmesa/xen/update_overlays() . = ..() @@ -627,7 +628,7 @@ if(!ismob(entered_atom)) return var/mob/living/simple_animal/hostile/blackmesa/xen/entered_xen_mob = entered_atom - if(!entered_xen_mob.can_be_shielded) + if(!entered_xen_mob) return register_mob(entered_xen_mob) @@ -645,6 +646,14 @@ RegisterSignal(created_beam, COMSIG_PARENT_QDELETING, PROC_REF(beam_died), override = TRUE) RegisterSignal(mob_to_register, COMSIG_PARENT_QDELETING, PROC_REF(mob_died), override = TRUE) +/obj/structure/xen_pylon/proc/beam_died(datum/beam/beam_to_kill) + SIGNAL_HANDLER + for(var/mob/living/simple_animal/hostile/blackmesa/xen/iterating_mob as anything in shielded_mobs) + // if(shielded_mobs[iterating_mob] == beam_to_kill) + iterating_mob.lose_shield() + shielded_mobs[iterating_mob] = null + shielded_mobs -= iterating_mob + /obj/structure/xen_pylon/proc/mob_died(atom/movable/source, force) SIGNAL_HANDLER var/datum/beam/beam = shielded_mobs[source] @@ -652,14 +661,6 @@ shielded_mobs[source] = null shielded_mobs -= source -/obj/structure/xen_pylon/proc/beam_died(datum/beam/beam_to_kill) - SIGNAL_HANDLER - for(var/mob/living/simple_animal/hostile/blackmesa/xen/iterating_mob as anything in shielded_mobs) - if(shielded_mobs[iterating_mob] == beam_to_kill) - iterating_mob.lose_shield() - shielded_mobs[iterating_mob] = null - shielded_mobs -= iterating_mob - /obj/structure/xen_pylon/Destroy() for(var/mob/living/simple_animal/hostile/blackmesa/xen/iterating_mob as anything in shielded_mobs) iterating_mob.lose_shield() diff --git a/modular_ss220/mobs/code/pet_carrier.dm b/modular_ss220/mobs/code/pet_carrier.dm index 2c9563653baa..453499dd4c88 100644 --- a/modular_ss220/mobs/code/pet_carrier.dm +++ b/modular_ss220/mobs/code/pet_carrier.dm @@ -68,6 +68,9 @@ if(target.mob_size > mob_size) to_chat(user, "Ваша переноска слишком мала!") return FALSE + if(!istype(target, /mob/living/simple_animal/pet)) + to_chat(user, "Это существо не очень похоже на ручное животное.") + return FALSE //if(target.mob_size < mob_size) // to_chat(user, "Ваша переноска слишком большая!") // return FALSE diff --git a/modular_ss220/mobs/code/simple_animal/pets/security_dogs.dm b/modular_ss220/mobs/code/simple_animal/pets/security_dogs.dm index 64deb877e871..a7ad0195f406 100644 --- a/modular_ss220/mobs/code/simple_animal/pets/security_dogs.dm +++ b/modular_ss220/mobs/code/simple_animal/pets/security_dogs.dm @@ -49,7 +49,16 @@ tts_seed = "Thrall" /mob/living/simple_animal/pet/dog/security/detective/show_inv(mob/user) - return + if(user.incapacitated() || !Adjacent(user)) + return + user.set_machine(src) + + var/dat = {"
Inventory of [name]

"} + dat += "
Collar: [pcollar]" : "add_inv=collar'>Nothing"]" + + var/datum/browser/popup = new(user, "mob[UID()]", "[src]", 440, 250) + popup.set_content(dat) + popup.open() /mob/living/simple_animal/pet/dog/security/show_inv(mob/user) if(user.incapacitated() || !Adjacent(user)) diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme index 55018b78a458..9596927f48f8 100644 --- a/modular_ss220/modular_ss220.dme +++ b/modular_ss220/modular_ss220.dme @@ -63,7 +63,6 @@ #include "logs/_logs.dme" #include "mobs/_mobs.dme" #include "pixel_shift/_pixel_shift.dme" -#include "radio_sound/radio_sound.dme" #include "screentip_change/_screentip_change.dme" #include "smart_equip_targeted/_smart_equip_targeted.dme" #include "sm_space_drop/sm_space_drop.dme" @@ -76,6 +75,7 @@ #include "mecha_skins/mecha_skins.dme" #include "queue/_queue.dme" #include "phrases/_phrases.dme" +#include "species_whitelist/_species_whitelist.dme" // --- PRIME --- // // #define MODPACK_MAIN_ONLY @@ -99,19 +99,3 @@ ---------------------------------------------------------------------*/ // #include "crit_rework/_crit_rework.dme" - -// in jobs modpack -/*------------------------------------------------------------------ - - #include "code/cards_ids.dm" - #include "code/jobs.dm" - #include "code/clothing/engineering_clothing.dm" - #include "code/clothing/medical_clothing.dm" - #include "code/clothing/science_clothing.dm" - #include "code/clothing/security_clothing.dm" - #include "code/job/engineering_jobs.dm" - #include "code/job/medical_jobs.dm" - #include "code/job/science_jobs.dm" - #include "code/job/security_jobs.dm" - - ---------------------------------------------------------------------*/ diff --git a/modular_ss220/objects/_objects.dme b/modular_ss220/objects/_objects.dme index 47cddc33abe2..b63c5556bbb0 100644 --- a/modular_ss220/objects/_objects.dme +++ b/modular_ss220/objects/_objects.dme @@ -17,3 +17,4 @@ #include "code/tribune.dm" #include "code/weapons.dm" #include "code/key.dm" +#include "code/musician.dm" diff --git a/modular_ss220/objects/code/card_skins.dm b/modular_ss220/objects/code/card_skins.dm index 961bd430af39..13e23126a197 100644 --- a/modular_ss220/objects/code/card_skins.dm +++ b/modular_ss220/objects/code/card_skins.dm @@ -279,6 +279,20 @@ pronoun_name = "наклейку в виде терминала" info = "Эта карта похожа на терминал." +/obj/item/id_skin/jokerge + name = "\improper джокерге наклейка на карту" + desc = "Jokerge." + icon_state = "jokerge" + pronoun_name = "наклейку в виде Джокерге" + info = "Jokerge." + +/obj/item/id_skin/boykisser + name = "\improper бойкиссерская наклейка на карту" + desc = "Наклеив её на карту, у вас с почти 100% вероятностью, появится желание целовать мальчиков." + icon_state = "boykisser" + pronoun_name = "наклейку в виде бойкиссера" + info = "Он любит целовать мальчиков." + // Supply Crate /datum/supply_packs/misc/randomised/id_skins name = "Наклейки на карточку" @@ -289,20 +303,20 @@ /obj/item/id_skin/colored, /obj/item/id_skin/colored, /obj/item/id_skin/colored, - /obj/item/id_skin/colored, - /obj/item/id_skin/donut, /obj/item/id_skin/donut, /obj/item/id_skin/donut, /obj/item/id_skin/donut, /obj/item/id_skin/donut, + /obj/item/id_skin/ussp, + /obj/item/id_skin/ussp, + /obj/item/id_skin/business, + /obj/item/id_skin/business, /obj/item/id_skin/colored/silver, /obj/item/id_skin/colored/silver, - /obj/item/id_skin/colored/silver, + /obj/item/id_skin/silver, /obj/item/id_skin/silver, /obj/item/id_skin/gold, - /obj/item/id_skin/business, /obj/item/id_skin/lifetime, - /obj/item/id_skin/ussp, /obj/item/id_skin/clown, /obj/item/id_skin/neon, /obj/item/id_skin/colored/neon, @@ -316,7 +330,9 @@ /obj/item/id_skin/cursedmiku, /obj/item/id_skin/colored/snake, /obj/item/id_skin/magic, - /obj/item/id_skin/terminal) + /obj/item/id_skin/terminal, + /obj/item/id_skin/jokerge, + /obj/item/id_skin/boykisser) cost = 2000 containername = "ящик с наклейками" @@ -327,13 +343,13 @@ icon_state = "ID_Random" result = list( /obj/item/id_skin/colored = 10, - /obj/item/id_skin/donut = 10, + /obj/item/id_skin/donut = 5, + /obj/item/id_skin/business = 5, + /obj/item/id_skin/ussp = 5, /obj/item/id_skin/colored/silver = 5, - /obj/item/id_skin/silver = 1, + /obj/item/id_skin/silver = 5, /obj/item/id_skin/gold = 1, - /obj/item/id_skin/business = 1, /obj/item/id_skin/lifetime = 1, - /obj/item/id_skin/ussp = 1, /obj/item/id_skin/clown = 1, /obj/item/id_skin/neon = 1, /obj/item/id_skin/colored/neon = 1, @@ -347,19 +363,21 @@ /obj/item/id_skin/cursedmiku = 1, /obj/item/id_skin/colored/snake = 1, /obj/item/id_skin/magic = 1, - /obj/item/id_skin/terminal = 1) + /obj/item/id_skin/terminal = 1, + /obj/item/id_skin/jokerge = 1, + /obj/item/id_skin/boykisser = 1) /obj/effect/spawner/random_spawners/id_skins/no_chance result = list( /datum/nothing = 80, /obj/item/id_skin/colored = 10, - /obj/item/id_skin/donut = 10, + /obj/item/id_skin/donut = 5, + /obj/item/id_skin/business = 5, + /obj/item/id_skin/ussp = 5, /obj/item/id_skin/colored/silver = 5, - /obj/item/id_skin/silver = 1, + /obj/item/id_skin/silver = 5, /obj/item/id_skin/gold = 1, - /obj/item/id_skin/business = 1, /obj/item/id_skin/lifetime = 1, - /obj/item/id_skin/ussp = 1, /obj/item/id_skin/clown = 1, /obj/item/id_skin/neon = 1, /obj/item/id_skin/colored/neon = 1, @@ -373,4 +391,6 @@ /obj/item/id_skin/cursedmiku = 1, /obj/item/id_skin/colored/snake = 1, /obj/item/id_skin/magic = 1, - /obj/item/id_skin/terminal = 1) + /obj/item/id_skin/terminal = 1, + /obj/item/id_skin/jokerge = 1, + /obj/item/id_skin/boykisser = 1) diff --git a/modular_ss220/objects/code/musician.dm b/modular_ss220/objects/code/musician.dm new file mode 100644 index 000000000000..067f88e19585 --- /dev/null +++ b/modular_ss220/objects/code/musician.dm @@ -0,0 +1,11 @@ +/obj/structure/musician/piano + allowed_instrument_ids = "crgrand1" + +/obj/item/instrument/guitar + allowed_instrument_ids = "csteelgt" + +/obj/item/instrument/trumpet + allowed_instrument_ids = "crtrumpet" + +/obj/item/instrument/trombone + allowed_instrument_ids = "crtrombone" diff --git a/modular_ss220/objects/code/posters.dm b/modular_ss220/objects/code/posters.dm index 0182282f99f6..f2afb7ad5b6a 100644 --- a/modular_ss220/objects/code/posters.dm +++ b/modular_ss220/objects/code/posters.dm @@ -26,6 +26,24 @@ icon = 'modular_ss220/objects/icons/posters.dmi' icon_state = "contraband4" +/obj/structure/sign/poster/contraband/soulless_figures + name = "Бездушные фигуры" + desc = "Плакат изображает множество безвольно слоняющихся тёмных фигур. Кажется они смотрят прямо на тебя, жуть..." + icon = 'modular_ss220/objects/icons/posters.dmi' + icon_state = "contraband5" + +/obj/structure/sign/poster/contraband/your_fate + name = "Твоя судьба" + desc = "На плакате изображается дом и ряд одинаковых домов уходящих вдаль, расположенных на кровавом полотне. Ниже можно разглядеть тень искореженной руки.\nНад домами возвышаются существа чертоватого вида, а надпись снизу гласит: \"Твоя судьба?\"" + icon = 'modular_ss220/objects/icons/posters.dmi' + icon_state = "contraband6" + +/obj/structure/sign/poster/contraband/watching_eye + name = "Всевидящее Око" + desc = "На плакате изображен глаз, излучающий свет. Текст на плакате гласит: \"Оно следит за\", \"Тобой\"." + icon = 'modular_ss220/objects/icons/posters.dmi' + icon_state = "contraband7" + // Legit /obj/structure/sign/poster/official/mars name = "Плакат Марса" diff --git a/modular_ss220/objects/icons/id_skins.dmi b/modular_ss220/objects/icons/id_skins.dmi index a014e9073b82..64662e5e46e0 100644 Binary files a/modular_ss220/objects/icons/id_skins.dmi and b/modular_ss220/objects/icons/id_skins.dmi differ diff --git a/modular_ss220/objects/icons/posters.dmi b/modular_ss220/objects/icons/posters.dmi index 7e4031b46fb5..0ba068450f0c 100644 Binary files a/modular_ss220/objects/icons/posters.dmi and b/modular_ss220/objects/icons/posters.dmi differ diff --git a/modular_ss220/pixel_shift/code/pixel_shift_mob.dm b/modular_ss220/pixel_shift/code/pixel_shift_mob.dm index 97d1b61f4592..1180d44cf9a4 100644 --- a/modular_ss220/pixel_shift/code/pixel_shift_mob.dm +++ b/modular_ss220/pixel_shift/code/pixel_shift_mob.dm @@ -6,3 +6,8 @@ /mob/living/silicon/ai/add_pixel_shift_component() return + +/datum/species/moth/spec_Process_Spacemove(mob/living/carbon/human/H) + . = ..() + if(has_gravity(H)) + return FALSE diff --git a/modular_ss220/radio_sound/code/radiosound.dm b/modular_ss220/radio_sound/code/radiosound.dm deleted file mode 100644 index a14449df95d7..000000000000 --- a/modular_ss220/radio_sound/code/radiosound.dm +++ /dev/null @@ -1,16 +0,0 @@ -/obj/item/radio/headset - var/radiosound = 'modular_ss220/radio_sound/sound/common.ogg' - -/obj/item/radio/headset/syndicate //disguised to look like a normal headset for stealth ops - radiosound = 'modular_ss220/radio_sound/sound/syndie.ogg' - -/obj/item/radio/headset/headset_sec - radiosound = 'modular_ss220/radio_sound/sound/security.ogg' - -/obj/item/radio/headset/talk_into(mob/living/M as mob, list/message_pieces, channel, verbage = "says") - if(!on) - return FALSE // the device has to be on - - if(radiosound && listening) - playsound(M, radiosound, rand(20, 30)) - . = ..() diff --git a/modular_ss220/radio_sound/radio_sound.dme b/modular_ss220/radio_sound/radio_sound.dme deleted file mode 100644 index f296671ade56..000000000000 --- a/modular_ss220/radio_sound/radio_sound.dme +++ /dev/null @@ -1,3 +0,0 @@ -// BEGIN INCLUDE -#include "code/radiosound.dm" -// END_INCLUDE diff --git a/modular_ss220/radio_sound/sound/common.ogg b/modular_ss220/radio_sound/sound/common.ogg deleted file mode 100644 index 20a1d1da0a06..000000000000 Binary files a/modular_ss220/radio_sound/sound/common.ogg and /dev/null differ diff --git a/modular_ss220/radio_sound/sound/security.ogg b/modular_ss220/radio_sound/sound/security.ogg deleted file mode 100644 index e905d018a81e..000000000000 Binary files a/modular_ss220/radio_sound/sound/security.ogg and /dev/null differ diff --git a/modular_ss220/radio_sound/sound/syndie.ogg b/modular_ss220/radio_sound/sound/syndie.ogg deleted file mode 100644 index 818ec11c1561..000000000000 Binary files a/modular_ss220/radio_sound/sound/syndie.ogg and /dev/null differ diff --git a/modular_ss220/species_whitelist/_species_whitelist.dm b/modular_ss220/species_whitelist/_species_whitelist.dm new file mode 100644 index 000000000000..308df37ef295 --- /dev/null +++ b/modular_ss220/species_whitelist/_species_whitelist.dm @@ -0,0 +1,4 @@ +/datum/modpack/discord_link + name = "Вайтлист на расы" + desc = "Добавление вайтлиста на расы" + author = "legendaxe" diff --git a/modular_ss220/species_whitelist/_species_whitelist.dme b/modular_ss220/species_whitelist/_species_whitelist.dme new file mode 100644 index 000000000000..4d322dfee0df --- /dev/null +++ b/modular_ss220/species_whitelist/_species_whitelist.dme @@ -0,0 +1,4 @@ +#include "_species_whitelist.dm" + +#include "code/species_whitelist_configuration.dm" +#include "code/species_whitelist_preferences.dm" diff --git a/modular_ss220/species_whitelist/code/species_whitelist_configuration.dm b/modular_ss220/species_whitelist/code/species_whitelist_configuration.dm new file mode 100644 index 000000000000..50bcfb171b4b --- /dev/null +++ b/modular_ss220/species_whitelist/code/species_whitelist_configuration.dm @@ -0,0 +1,14 @@ +/datum/server_configuration + /// Holder for the gateway configuration datum + var/datum/configuration_section/species_whitelist_configuration/species_whitelist + +/datum/server_configuration/load_all_sections() + . = ..() + species_whitelist = new() + safe_load(species_whitelist, "species_whitelist_configuration") + +/datum/configuration_section/species_whitelist_configuration + var/species_whitelist_enabled = FALSE + +/datum/configuration_section/species_whitelist_configuration/load_data(list/data) + CONFIG_LOAD_BOOL(species_whitelist_enabled, data["species_whitelist_enabled"]) diff --git a/modular_ss220/species_whitelist/code/species_whitelist_preferences.dm b/modular_ss220/species_whitelist/code/species_whitelist_preferences.dm new file mode 100644 index 000000000000..62a7ea75c89e --- /dev/null +++ b/modular_ss220/species_whitelist/code/species_whitelist_preferences.dm @@ -0,0 +1,30 @@ +/datum/preferences + var/species_whitelist + +/datum/preferences/proc/get_species_whitelist() + . = TRUE + + if(species_whitelist) + return + + var/datum/db_query/preferences_query = SSdbcore.NewQuery("SELECT species_whitelist FROM player WHERE ckey=:ckey", list( + "ckey" = parent.ckey + )) + + if(!preferences_query.warn_execute()) + qdel(preferences_query) + return FALSE + + while(preferences_query.NextRow()) + var/species_whitelist_json = preferences_query.item[1] + if(species_whitelist_json) + species_whitelist = json_decode(preferences_query.item[1]) + + qdel(preferences_query) + +/datum/preferences/load_preferences(datum/db_query/query) + . = ..() + if(!.) + return + + return get_species_whitelist() diff --git a/modular_ss220/text_to_speech/code/_defines.dm b/modular_ss220/text_to_speech/code/_defines.dm index 76aa786cfde3..b76348a641ac 100644 --- a/modular_ss220/text_to_speech/code/_defines.dm +++ b/modular_ss220/text_to_speech/code/_defines.dm @@ -34,6 +34,7 @@ #define TTS_CATEGORY_LEFT4DEAD "Left 4 Dead" #define TTS_CATEGORY_SPONGEBOB "SpongeBob" #define TTS_CATEGORY_TINYBUNNY "Tiny Bunny" +#define TTS_CATEGORY_BALDURS_GATE_3 "Baldur's gate 3" #define TTS_GENDER_ANY "Любой" #define TTS_GENDER_MALE "Мужской" diff --git a/modular_ss220/text_to_speech/code/seeds/silero.dm b/modular_ss220/text_to_speech/code/seeds/silero.dm index 538192ccd911..74567df75b9f 100644 --- a/modular_ss220/text_to_speech/code/seeds/silero.dm +++ b/modular_ss220/text_to_speech/code/seeds/silero.dm @@ -4327,3 +4327,94 @@ category = TTS_CATEGORY_WITCHER gender = TTS_GENDER_MALE required_donator_level = 1 + +/datum/tts_seed/silero/gale + name = "Gale" + value = "en_Gale" + category = TTS_CATEGORY_BALDURS_GATE_3 + gender = TTS_GENDER_MALE + required_donator_level = 1 + +/datum/tts_seed/silero/jaheira + name = "Jaheira" + value = "en_Jaheira" + category = TTS_CATEGORY_BALDURS_GATE_3 + gender = TTS_GENDER_FEMALE + required_donator_level = 1 + +/datum/tts_seed/silero/laezel + name = "Laezel" + value = "en_Laezel" + category = TTS_CATEGORY_BALDURS_GATE_3 + gender = TTS_GENDER_FEMALE + required_donator_level = 1 + +/datum/tts_seed/silero/karlach + name = "Karlach" + value = "en_Karlach" + category = TTS_CATEGORY_BALDURS_GATE_3 + gender = TTS_GENDER_FEMALE + required_donator_level = 1 + +/datum/tts_seed/silero/shadowheart + name = "Shadowheart" + value = "en_Shadowheart" + category = TTS_CATEGORY_BALDURS_GATE_3 + gender = TTS_GENDER_FEMALE + required_donator_level = 1 + +/datum/tts_seed/silero/wyll + name = "Wyll" + value = "en_Wyll" + category = TTS_CATEGORY_BALDURS_GATE_3 + gender = TTS_GENDER_MALE + required_donator_level = 1 + +/datum/tts_seed/silero/minthara + name = "Minthara" + value = "en_Minthara" + category = TTS_CATEGORY_BALDURS_GATE_3 + gender = TTS_GENDER_FEMALE + required_donator_level = 1 + +/datum/tts_seed/silero/minsc + name = "Minsc" + value = "en_Minsc" + category = TTS_CATEGORY_BALDURS_GATE_3 + gender = TTS_GENDER_MALE + required_donator_level = 1 + +/datum/tts_seed/silero/astarion + name = "Astarion" + value = "en_Astarion" + category = TTS_CATEGORY_BALDURS_GATE_3 + gender = TTS_GENDER_MALE + required_donator_level = 1 + +/datum/tts_seed/silero/halsin + name = "Halsin" + value = "en_Halsin" + category = TTS_CATEGORY_BALDURS_GATE_3 + gender = TTS_GENDER_MALE + required_donator_level = 1 + +/datum/tts_seed/silero/emperor_bg3 + name = "Emperor" + value = "en_Emperor" + category = TTS_CATEGORY_BALDURS_GATE_3 + gender = TTS_GENDER_MALE + required_donator_level = 1 + +/datum/tts_seed/silero/ketheric + name = "Ketheric" + value = "en_Ketheric" + category = TTS_CATEGORY_BALDURS_GATE_3 + gender = TTS_GENDER_MALE + required_donator_level = 1 + +/datum/tts_seed/silero/gortash + name = "Gortash" + value = "en_Gortash" + category = TTS_CATEGORY_BALDURS_GATE_3 + gender = TTS_GENDER_MALE + required_donator_level = 1 diff --git a/modular_ss220/text_to_speech/code/tts_preferences.dm b/modular_ss220/text_to_speech/code/tts_preferences.dm index 7e86aed414fb..c19f23b3d7c3 100644 --- a/modular_ss220/text_to_speech/code/tts_preferences.dm +++ b/modular_ss220/text_to_speech/code/tts_preferences.dm @@ -101,7 +101,16 @@ client.prefs.ShowChoices(src) return FALSE var/datum/tts_seed/seed = SStts220.tts_seeds[client.prefs.active_character.tts_seed] - if(client.donator_level < seed.required_donator_level) + + switch(client.donator_level) + if(LITTLE_WORKER_TIER) + if(LITTLE_WORKER_TTS_LEVEL >= seed.required_donator_level) + return TRUE + if(BIG_WORKER_TIER) + if(BIG_WORKER_TTS_LEVEL >= seed.required_donator_level) + return TRUE + + if(client.donator_level < seed.required_donator_level || client.donator_level > DONATOR_LEVEL_MAX) to_chat(usr, span_danger("Выбранный голос персонажа более недоступен на текущем уровне подписки!")) client.prefs.ShowChoices(src) return FALSE diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index 89406dd70316..d9f806aff8a5 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -21,7 +21,7 @@ else tts_seeds = SStts220.get_available_seeds(src) - var/new_tts_seed = tgui_input_list(user || src, "Выберите голос:", "Настройка персонажа", tts_seeds) + var/new_tts_seed = input(user || src, "Выберите голос:", "Настройка персонажа", tts_seed) as null|anything in tts_seeds if(!new_tts_seed) return null if(!silent_target && ismob(src) && src != user) diff --git a/modular_ss220/text_to_speech/code/tts_subsystem.dm b/modular_ss220/text_to_speech/code/tts_subsystem.dm index f6712b290cb7..e37caed029b5 100644 --- a/modular_ss220/text_to_speech/code/tts_subsystem.dm +++ b/modular_ss220/text_to_speech/code/tts_subsystem.dm @@ -114,6 +114,8 @@ SUBSYSTEM_DEF(tts220) "detective" = "Детектив", "forensic technician" = "Криминалист", "security officer" = "Офицер службы безопасности", + "security trainer" = "Тренер службы безопасности", + "junior security officer" = "Младший офицер службы безопасности", "security cadet" = "Кадет службы безопасности", "Security Assistant" = "Ассистент службы безопасности", "Security Graduate" = "Выпускник кадетской академии", diff --git a/modular_ss220/title_screen/_title_screen.dme b/modular_ss220/title_screen/_title_screen.dme index 3ce7fa5f8752..e7740ff637de 100644 --- a/modular_ss220/title_screen/_title_screen.dme +++ b/modular_ss220/title_screen/_title_screen.dme @@ -6,5 +6,4 @@ #include "code/mob.dm" #include "code/new_player.dm" #include "code/title_screen_controls.dm" -#include "code/title_screen_html.dm" #include "code/title_screen_subsystem.dm" diff --git a/modular_ss220/title_screen/code/_title_screen_defines.dm b/modular_ss220/title_screen/code/_title_screen_defines.dm index aadc5b919a68..02bb9871eb24 100644 --- a/modular_ss220/title_screen/code/_title_screen_defines.dm +++ b/modular_ss220/title_screen/code/_title_screen_defines.dm @@ -1,5 +1,4 @@ #define DEFAULT_TITLE_SCREEN_IMAGE 'modular_ss220/title_screen/icons/default.dmi' -#define DEFAULT_TITLE_LOADING_SCREEN 'modular_ss220/title_screen/icons/loading_screen.gif' #define DEFAULT_TITLE_HTML {" diff --git a/modular_ss220/title_screen/code/mob.dm b/modular_ss220/title_screen/code/mob.dm index 17f02d8b2b9f..316772269203 100644 --- a/modular_ss220/title_screen/code/mob.dm +++ b/modular_ss220/title_screen/code/mob.dm @@ -1,3 +1,5 @@ +#define TITLE_SCREEN_BG_FILE_NAME "bg_file_name" + /** * Shows the titlescreen to a new player. */ @@ -12,13 +14,31 @@ update_title_screen() +/** + * Get the HTML of title screen. + */ +/mob/proc/get_title_html() + var/dat = SStitle.title_html + dat += {""} + + if(SStitle.current_notice) + dat += {" +

+

[SStitle.current_notice]

+
+ "} + + dat += "" + + return dat + /** * Hard updates the title screen HTML, it causes visual glitches if used. */ /mob/proc/update_title_screen() var/dat = get_title_html() - src << browse(SStitle.current_title_screen, "file=loading_screen.gif;display=0") + src << browse(SStitle.current_title_screen, "file=[TITLE_SCREEN_BG_FILE_NAME];display=0") src << browse(dat, "window=title_browser") /datum/asset/simple/lobby @@ -33,3 +53,5 @@ if(client?.mob) winset(client, "title_browser", "is-disabled=true;is-visible=false") winset(client, "status_bar", "is-visible=true") + +#undef TITLE_SCREEN_BG_FILE_NAME diff --git a/modular_ss220/title_screen/code/new_player.dm b/modular_ss220/title_screen/code/new_player.dm index aeff79c5ae94..8dc07b7195a0 100644 --- a/modular_ss220/title_screen/code/new_player.dm +++ b/modular_ss220/title_screen/code/new_player.dm @@ -1,14 +1,3 @@ -GLOBAL_LIST_EMPTY(new_player_list) - -/mob/new_player/Initialize(mapload) - GLOB.new_player_list += src - show_title_screen() - . = ..() - -/mob/new_player/Destroy() - GLOB.new_player_list -= src - . = ..() - /mob/new_player/Login() . = ..() show_title_screen() diff --git a/modular_ss220/title_screen/code/title_screen_controls.dm b/modular_ss220/title_screen/code/title_screen_controls.dm index f2be6e8d47d8..579cba432ff5 100644 --- a/modular_ss220/title_screen/code/title_screen_controls.dm +++ b/modular_ss220/title_screen/code/title_screen_controls.dm @@ -39,7 +39,7 @@ SStitle.set_notice(new_notice) if(!new_notice) return - for(var/mob/new_player/new_player in GLOB.new_player_list) + for(var/mob/new_player/new_player in GLOB.player_list) to_chat(new_player, span_boldannounce("TITLE NOTICE UPDATED: [new_notice]")) SEND_SOUND(new_player, sound('sound/items/bikehorn.ogg')) diff --git a/modular_ss220/title_screen/code/title_screen_html.dm b/modular_ss220/title_screen/code/title_screen_html.dm deleted file mode 100644 index bde98fd53895..000000000000 --- a/modular_ss220/title_screen/code/title_screen_html.dm +++ /dev/null @@ -1,16 +0,0 @@ -// FOR MOR INFO ON HTML CUSTOMISATION, SEE: https://github.com/Skyrat-SS13/Skyrat-tg/pull/4783 - -/mob/proc/get_title_html() - var/dat = SStitle.title_html - dat += {""} - - if(SStitle.current_notice) - dat += {" -
-

[SStitle.current_notice]

-
- "} - - dat += "" - - return dat diff --git a/modular_ss220/title_screen/code/title_screen_subsystem.dm b/modular_ss220/title_screen/code/title_screen_subsystem.dm index 54fe207c2e01..bf3288137af6 100644 --- a/modular_ss220/title_screen/code/title_screen_subsystem.dm +++ b/modular_ss220/title_screen/code/title_screen_subsystem.dm @@ -1,9 +1,8 @@ +#define TITLE_SCREENS_LOCATION "config/title_screens/images/" + /datum/controller/subsystem/title flags = SS_NO_FIRE init_order = INIT_ORDER_TITLE - - var/file_path - /// The current title screen being displayed, as a file path text. var/current_title_screen /// The current notice text, or null. @@ -14,35 +13,26 @@ var/title_screens = list() /datum/controller/subsystem/title/Initialize() - var/dat if(!fexists("config/title_html.txt")) - to_chat(world, span_boldwarning("CRITICAL ERROR: Unable to read title_html.txt, reverting to backup title html, please check your server config and ensure this file exists.")) - dat = DEFAULT_TITLE_HTML + error(span_boldwarning("Unable to read title_html.txt, reverting to backup title html, please check your server config and ensure this file exists.")) + title_html = DEFAULT_TITLE_HTML else - dat = file2text("config/title_html.txt") - - title_html = dat + title_html = file2text("config/title_html.txt") - var/list/provisional_title_screens = flist("config/title_screens/images/") var/list/local_title_screens = list() - - for(var/screen in provisional_title_screens) - var/list/formatted_list = splittext(screen, "+") - if((LAZYLEN(formatted_list) == 1 && (formatted_list[1] != "exclude" && formatted_list[1] != "blank.png"))) + for(var/screen in flist(TITLE_SCREENS_LOCATION)) + var/list/screen_name_parts = splittext(screen, "+") + if((LAZYLEN(screen_name_parts) == 1 && (screen_name_parts[1] != "exclude" && screen_name_parts[1] != "blank.png"))) local_title_screens += screen - if(length(local_title_screens)) - for(var/i in local_title_screens) - var/file_path = "config/title_screens/images/[i]" - ASSERT(fexists(file_path)) - var/icon/title2use = new(fcopy_rsc(file_path)) - title_screens += title2use + for(var/title_screen in local_title_screens) + var/file_path = "[TITLE_SCREENS_LOCATION][title_screen]" + ASSERT(fexists(file_path)) + title_screens += fcopy_rsc(file_path) change_title_screen() /datum/controller/subsystem/title/Recover() - file_path = SStitle.file_path - current_title_screen = SStitle.current_title_screen current_notice = SStitle.current_notice title_html = SStitle.title_html @@ -52,7 +42,7 @@ * Show the title screen to all new players. */ /datum/controller/subsystem/title/proc/show_title_screen() - for(var/mob/new_player/new_player in GLOB.new_player_list) + for(var/mob/new_player/new_player in GLOB.player_list) INVOKE_ASYNC(new_player, TYPE_PROC_REF(/mob/new_player, show_title_screen)) /** @@ -75,3 +65,5 @@ current_title_screen = DEFAULT_TITLE_SCREEN_IMAGE show_title_screen() + +#undef TITLE_SCREENS_LOCATION diff --git a/modular_ss220/title_screen/icons/loading_screen.gif b/modular_ss220/title_screen/icons/loading_screen.gif deleted file mode 100644 index c8a2c487037b..000000000000 Binary files a/modular_ss220/title_screen/icons/loading_screen.gif and /dev/null differ diff --git a/modular_ss220/whitelist/code/whitelist.dm b/modular_ss220/whitelist/code/whitelist.dm index 95840bf37e51..b51b5c26067b 100644 --- a/modular_ss220/whitelist/code/whitelist.dm +++ b/modular_ss220/whitelist/code/whitelist.dm @@ -57,6 +57,6 @@ /world/IsBanned(key, address, computer_id, type, check_ipintel, check_2fa, check_guest, log_info, check_tos) var/ckey = ckey(key) if(GLOB.configuration.overflow.reroute_cap == 0.5 && ckey && !(ckey in GLOB.configuration.overflow.overflow_whitelist)) - return list("reason"="no-whitelist", "desc"="\nПричина: Вас ([key]) нет в вайтлисте этого сервера. Приобрести доступ возможно у одного из стримеров Банды за баллы канала.") + return list("reason"="no-whitelist", "desc"="\nПричина: Вас ([key]) нет в вайтлисте этого сервера. Приобрести доступ возможно у одного из стримеров Банды за баллы канала или записаться самостоятельно с помощью команды в дискорде, доступной сабам бусти, начиная со второго тира.") . = ..() diff --git a/paradise.dme b/paradise.dme index 438f05c686b1..fee71a46eb22 100644 --- a/paradise.dme +++ b/paradise.dme @@ -132,7 +132,6 @@ #include "code\__HELPERS\colour_helpers.dm" #include "code\__HELPERS\constants.dm" #include "code\__HELPERS\debugger.dm" -#include "code\__HELPERS\experimental.dm" #include "code\__HELPERS\files.dm" #include "code\__HELPERS\filters.dm" #include "code\__HELPERS\game.dm" @@ -1546,7 +1545,6 @@ #include "code\modules\client\preference\link_processing.dm" #include "code\modules\client\preference\preferences.dm" #include "code\modules\client\preference\preferences_mysql.dm" -#include "code\modules\client\preference\preferences_spawnpoints.dm" #include "code\modules\client\preference\preferences_toggles.dm" #include "code\modules\client\preference\preferences_volume_mixer.dm" #include "code\modules\client\preference\loadout\gear_tweaks.dm" @@ -1751,6 +1749,7 @@ #include "code\modules\food_and_drinks\food\foods\candy.dm" #include "code\modules\food_and_drinks\food\foods\desserts.dm" #include "code\modules\food_and_drinks\food\foods\ethnic.dm" +#include "code\modules\food_and_drinks\food\foods\frozen.dm" #include "code\modules\food_and_drinks\food\foods\ingredients.dm" #include "code\modules\food_and_drinks\food\foods\junkfood.dm" #include "code\modules\food_and_drinks\food\foods\meat.dm" @@ -2018,6 +2017,16 @@ #include "code\modules\mob\living\login.dm" #include "code\modules\mob\living\stat_states.dm" #include "code\modules\mob\living\taste.dm" +#include "code\modules\mob\living\brain\brain_death.dm" +#include "code\modules\mob\living\brain\brain_emote.dm" +#include "code\modules\mob\living\brain\brain_life.dm" +#include "code\modules\mob\living\brain\brain_login.dm" +#include "code\modules\mob\living\brain\brain_say.dm" +#include "code\modules\mob\living\brain\brain_update_status.dm" +#include "code\modules\mob\living\brain\living_brain.dm" +#include "code\modules\mob\living\brain\MMI.dm" +#include "code\modules\mob\living\brain\MMI_radio.dm" +#include "code\modules\mob\living\brain\robotic_brain.dm" #include "code\modules\mob\living\carbon\_defines.dm" #include "code\modules\mob\living\carbon\carbon.dm" #include "code\modules\mob\living\carbon\carbon_death.dm" @@ -2056,16 +2065,6 @@ #include "code\modules\mob\living\carbon\alien\larva\larva_update_icons.dm" #include "code\modules\mob\living\carbon\alien\special\alien_embryo.dm" #include "code\modules\mob\living\carbon\alien\special\facehugger.dm" -#include "code\modules\mob\living\carbon\brain\brain_death.dm" -#include "code\modules\mob\living\carbon\brain\brain_emote.dm" -#include "code\modules\mob\living\carbon\brain\brain_life.dm" -#include "code\modules\mob\living\carbon\brain\brain_login.dm" -#include "code\modules\mob\living\carbon\brain\brain_say.dm" -#include "code\modules\mob\living\carbon\brain\brain_update_status.dm" -#include "code\modules\mob\living\carbon\brain\carbon_brain.dm" -#include "code\modules\mob\living\carbon\brain\MMI.dm" -#include "code\modules\mob\living\carbon\brain\MMI_radio.dm" -#include "code\modules\mob\living\carbon\brain\robotic_brain.dm" #include "code\modules\mob\living\carbon\human\appearance.dm" #include "code\modules\mob\living\carbon\human\body_accessories.dm" #include "code\modules\mob\living\carbon\human\human_damage.dm" diff --git a/sound/effects/clingscream.ogg b/sound/effects/clingscream.ogg new file mode 100644 index 000000000000..6215a93f2520 Binary files /dev/null and b/sound/effects/clingscream.ogg differ diff --git a/sound/weapons/armblade.ogg b/sound/weapons/armblade.ogg new file mode 100644 index 000000000000..39a3248d2a9f Binary files /dev/null and b/sound/weapons/armblade.ogg differ diff --git a/tgui/packages/tgui/interfaces/ChemDispenser.js b/tgui/packages/tgui/interfaces/ChemDispenser.js index a6aa88352373..d819fec6e6d1 100644 --- a/tgui/packages/tgui/interfaces/ChemDispenser.js +++ b/tgui/packages/tgui/interfaces/ChemDispenser.js @@ -81,7 +81,7 @@ const ChemDispenserChemicals = (properties, context) => { return (
{ return (
diff --git a/tgui/packages/tgui/interfaces/Uplink.js b/tgui/packages/tgui/interfaces/Uplink.js index edd8c3c87207..1906c5403f76 100644 --- a/tgui/packages/tgui/interfaces/Uplink.js +++ b/tgui/packages/tgui/interfaces/Uplink.js @@ -246,11 +246,14 @@ const Advert = (_properties, context) => { } > - {lucky_numbers.map((number, index) => ( - - - - ))} + {lucky_numbers + .map((number) => cats[number.cat].items[number.item]) + .filter((item) => item !== undefined && item !== null) + .map((item, index) => ( + + + + ))}
); diff --git a/tgui/packages/tgui/public/tgui.bundle.js b/tgui/packages/tgui/public/tgui.bundle.js index 38d27b9145c4..027d32f5b224 100644 --- a/tgui/packages/tgui/public/tgui.bundle.js +++ b/tgui/packages/tgui/public/tgui.bundle.js @@ -1,5 +1,5 @@ -!function(e){var t={};function n(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(o,r,function(t){return e[t]}.bind(null,r));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=233)}([function(e,t,n){"use strict";t.__esModule=!0;var o=n(235);Object.keys(o).forEach((function(e){"default"!==e&&"__esModule"!==e&&(e in t&&t[e]===o[e]||(t[e]=o[e]))}))},function(e,t,n){"use strict";t.__esModule=!0,t.useSharedState=t.useLocalState=t.useBackend=t.deleteLocalState=t.backendUpdate=t.backendSetSharedState=t.backendReducer=t.backendDeleteSharedState=void 0;var o=n(32),r=n(43);t.backendUpdate=function(e){return{type:"backend/update",payload:e}};var a=function(e,t){return{type:"backend/setSharedState",payload:{key:e,nextState:t}}};t.backendSetSharedState=a;var c=function(e){return{type:"backend/deleteSharedState",payload:e}};t.backendDeleteSharedState=c;t.backendReducer=function(e,t){var n=t.type,o=t.payload;if("backend/update"===n){var a=Object.assign({},e.config,o.config),c=Object.assign({},e.data,o.static_data,o.data),i=Object.assign({},e.shared);if(o.shared)for(var l=0,d=Object.keys(o.shared);l1?n-1:0),r=1;rn?n:e};t.clamp01=function(e){return e<0?0:e>1?1:e};t.scale=function(e,t,n){return(e-t)/(n-t)};t.round=function(e,t){return!e||isNaN(e)?e:(t|=0,a=(e*=n=Math.pow(10,t))>0|-(e<0),r=Math.abs(e%1)>=.4999999999854481,o=Math.floor(e),r&&(e=o+(a>0)),(r?e:Math.round(e))/n);var n,o,r,a};t.toFixed=function(e,t){return void 0===t&&(t=0),Number(e).toFixed(Math.max(t,0))};var o=function(e,t){return t&&e>=t[0]&&e<=t[1]};t.inRange=o;t.keyOfMatchingRange=function(e,t){for(var n=0,r=Object.keys(t);n0&&(t.style=l),t};t.computeBoxProps=N;var b=function(e){var t=e.textColor||e.color,n=e.backgroundColor;return(0,o.classes)([u(t)&&"color-"+t,u(n)&&"color-bg-"+n])};t.computeBoxClassName=b;var V=function(e){var t=e.as,n=void 0===t?"div":t,o=e.className,c=e.children,l=function(e,t){if(null==e)return{};var n,o,r={},a=Object.keys(e);for(o=0;o=0||(r[n]=e[n]);return r}(e,i);if("function"==typeof c)return c(N(e));var d="string"==typeof o?o+" "+b(l):b(l),u=N(l);return(0,r.createVNode)(a.VNodeFlags.HtmlElement,n,d,c,a.ChildFlags.UnknownChildren,u)};t.Box=V,V.defaultHooks=o.pureComponentHooks},function(e,t,n){"use strict";function o(e,t){var n="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(n)return(n=n.call(e)).next.bind(n);if(Array.isArray(e)||(n=function(e,t){if(!e)return;if("string"==typeof e)return r(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return r(e,t)}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var o=0;return function(){return o>=e.length?{done:!0}:{done:!1,value:e[o++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function r(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n",apos:"'"};return e.replace(/
/gi,"\n").replace(/<\/?[a-z0-9-_]+[^>]*>/gi,"").replace(/&(nbsp|amp|quot|lt|gt|apos);/g,(function(e,n){return t[n]})).replace(/&#?([0-9]+);/gi,(function(e,t){var n=parseInt(t,10);return String.fromCharCode(n)})).replace(/&#x?([0-9a-f]+);/gi,(function(e,t){var n=parseInt(t,16);return String.fromCharCode(n)}))};t.buildQueryString=function(e){return Object.keys(e).map((function(t){return encodeURIComponent(t)+"="+encodeURIComponent(e[t])})).join("&")}},function(e,t,n){"use strict";var o=n(41);e.exports=function(e){return o(e.length)}},function(e,t,n){"use strict";var o=n(5),r=n(13),a=n(49),c=n(132),i=n(130);e.exports=function(e,t,n,l){var d=!!l&&!!l.unsafe,u=!!l&&!!l.enumerable,s=!!l&&!!l.noTargetGet,m=l&&l.name!==undefined?l.name:t;return r(n)&&c(n,m,l),e===o?(u?e[t]=n:i(t,n),e):(d?!s&&e[t]&&(u=!0):delete e[t],u?e[t]=n:a(e,t,n),e)}},function(e,t,n){"use strict";var o=n(60),r=n(7),a=n(85),c=n(19),i=n(23),l=n(91),d=r([].push),u=function(e){var t=1==e,n=2==e,r=3==e,u=4==e,s=6==e,m=7==e,p=5==e||s;return function(h,f,C,N){for(var b,V,g=c(h),v=a(g),y=o(f,C),_=i(v),x=0,k=N||l,L=t?k(h,_):n||m?k(h,0):undefined;_>x;x++)if((p||x in v)&&(V=y(b=v[x],x,g),e))if(t)L[x]=V;else if(V)switch(e){case 3:return!0;case 5:return b;case 6:return x;case 2:d(L,b)}else switch(e){case 4:return!1;case 7:d(L,b)}return s?-1:r||u?u:L}};e.exports={forEach:u(0),map:u(1),filter:u(2),some:u(3),every:u(4),find:u(5),findIndex:u(6),filterReject:u(7)}},function(e,t,n){"use strict";var o=n(8),r=n(15),a=n(102),c=n(64),i=n(30),l=n(56),d=n(18),u=n(174),s=Object.getOwnPropertyDescriptor;t.f=o?s:function(e,t){if(e=i(e),t=l(t),u)try{return s(e,t)}catch(n){}if(d(e,t))return c(!r(a.f,e,t),e[t])}},function(e,t,n){"use strict";var o=n(5),r=n(13),a=n(71),c=o.TypeError;e.exports=function(e){if(r(e))return e;throw c(a(e)+" is not a function")}},function(e,t,n){"use strict";t.__esModule=!0,t.modalRegisterBodyOverride=t.modalOpen=t.modalClose=t.modalAnswer=t.ComplexModal=void 0;var o=n(0),r=n(1),a=n(2),c={};t.modalOpen=function(e,t,n){var o=(0,r.useBackend)(e),a=o.act,c=o.data,i=Object.assign(c.modal?c.modal.args:{},n||{});a("modal_open",{id:t,arguments:JSON.stringify(i)})};t.modalRegisterBodyOverride=function(e,t){c[e]=t};var i=function(e,t,n,o){var a=(0,r.useBackend)(e),c=a.act,i=a.data;if(i.modal){var l=Object.assign(i.modal.args||{},o||{});c("modal_answer",{id:t,answer:n,arguments:JSON.stringify(l)})}};t.modalAnswer=i;var l=function(e,t){(0,(0,r.useBackend)(e).act)("modal_close",{id:t})};t.modalClose=l;t.ComplexModal=function(e,t){var n=(0,r.useBackend)(t).data;if(n.modal){var d,u,s=n.modal,m=s.id,p=s.text,h=s.type,f=(0,o.createComponentVNode)(2,a.Button,{icon:"arrow-left",content:"Cancel",color:"grey",onClick:function(){return l(t)}}),C="auto";if(c[m])u=c[m](n.modal,t);else if("input"===h){var N=n.modal.value;d=function(e){return i(t,m,N)},u=(0,o.createComponentVNode)(2,a.Input,{value:n.modal.value,placeholder:"ENTER to submit",width:"100%",my:"0.5rem",autofocus:!0,onChange:function(e,t){N=t}}),f=(0,o.createComponentVNode)(2,a.Box,{mt:"0.5rem",children:[(0,o.createComponentVNode)(2,a.Button,{icon:"arrow-left",content:"Cancel",color:"grey",onClick:function(){return l(t)}}),(0,o.createComponentVNode)(2,a.Button,{icon:"check",content:"Confirm",color:"good",float:"right",m:"0",onClick:function(){return i(t,m,N)}}),(0,o.createComponentVNode)(2,a.Box,{clear:"both"})]})}else if("choice"===h){var b="object"==typeof n.modal.choices?Object.values(n.modal.choices):n.modal.choices;u=(0,o.createComponentVNode)(2,a.Dropdown,{options:b,selected:n.modal.value,width:"100%",my:"0.5rem",onSelected:function(e){return i(t,m,e)}}),C="initial"}else"bento"===h?u=(0,o.createComponentVNode)(2,a.Flex,{spacingPrecise:"1",wrap:"wrap",my:"0.5rem",maxHeight:"1%",children:n.modal.choices.map((function(e,r){return(0,o.createComponentVNode)(2,a.Flex.Item,{flex:"1 1 auto",children:(0,o.createComponentVNode)(2,a.Button,{selected:r+1===parseInt(n.modal.value,10),onClick:function(){return i(t,m,r+1)},children:(0,o.createVNode)(1,"img",null,null,1,{src:e})})},r)}))}):"boolean"===h&&(f=(0,o.createComponentVNode)(2,a.Box,{mt:"0.5rem",children:[(0,o.createComponentVNode)(2,a.Button,{icon:"times",content:n.modal.no_text,color:"bad",float:"left",mb:"0",onClick:function(){return i(t,m,0)}}),(0,o.createComponentVNode)(2,a.Button,{icon:"check",content:n.modal.yes_text,color:"good",float:"right",m:"0",onClick:function(){return i(t,m,1)}}),(0,o.createComponentVNode)(2,a.Box,{clear:"both"})]}));return(0,o.createComponentVNode)(2,a.Modal,{maxWidth:e.maxWidth||window.innerWidth/2+"px",maxHeight:e.maxHeight||window.innerHeight/2+"px",onEnter:d,mx:"auto",overflowY:C,children:[(0,o.createComponentVNode)(2,a.Box,{display:"inline",children:p}),u,f]})}}},function(e,t,n){"use strict";var o=n(5),r=n(13),a=function(e){return r(e)?e:undefined};e.exports=function(e,t){return arguments.length<2?a(o[e]):o[e]&&o[e][t]}},function(e,t,n){"use strict";var o=n(85),r=n(31);e.exports=function(e){return o(r(e))}},function(e,t,n){"use strict";var o=n(5).TypeError;e.exports=function(e){if(e==undefined)throw o("Can't call method on "+e);return e}},function(e,t,n){"use strict";function o(e,t,n,o,r,a,c){try{var i=e[a](c),l=i.value}catch(d){return void n(d)}i.done?t(l):Promise.resolve(l).then(o,r)}t.__esModule=!0,t.winset=t.winget=t.runCommand=t.callByondAsync=t.callByond=t.IS_IE8=void 0;var r=window.Byond,a=function(){var e=navigator.userAgent.match(/Trident\/(\d+).+?;/i);if(!e)return null;var t=e[1];return t?parseInt(t,10):null}(),c=null!==a&&a<=6;t.IS_IE8=c;var i=function(e,t){void 0===t&&(t={}),r.call(e,t)};t.callByond=i;var l=function(e,t){void 0===t&&(t={}),window.__callbacks__=window.__callbacks__||[];var n=window.__callbacks__.length,o=new Promise((function(e){window.__callbacks__.push(e)}));return r.call(e,Object.assign({},t,{callback:"__callbacks__["+n+"]"})),o};t.callByondAsync=l;t.runCommand=function(e){return i("winset",{command:e})};var d=function(){var e,t=(e=regeneratorRuntime.mark((function n(e,t){var o;return regeneratorRuntime.wrap((function(n){for(;;)switch(n.prev=n.next){case 0:return n.next=2,l("winget",{id:e,property:t});case 2:return o=n.sent,n.abrupt("return",o[t]);case 4:case"end":return n.stop()}}),n)})),function(){var t=this,n=arguments;return new Promise((function(r,a){var c=e.apply(t,n);function i(e){o(c,r,a,i,l,"next",e)}function l(e){o(c,r,a,i,l,"throw",e)}i(undefined)}))});return function(e,n){return t.apply(this,arguments)}}();t.winget=d;t.winset=function(e,t,n){var o;return i("winset",((o={})[e+"."+t]=n,o))}},function(e,t,n){"use strict";t.__esModule=!0,t.zipWith=t.zip=t.uniqBy=t.toKeyedArray=t.toArray=t.sortBy=t.reduce=t.map=t.filter=void 0;t.toArray=function(e){if(Array.isArray(e))return e;if("object"==typeof e){var t=Object.prototype.hasOwnProperty,n=[];for(var o in e)t.call(e,o)&&n.push(e[o]);return n}return[]};t.toKeyedArray=function(e,t){return void 0===t&&(t="key"),o((function(e,n){var o;return Object.assign(((o={})[t]=n,o),e)}))(e)};t.filter=function(e){return function(t){if(null===t&&t===undefined)return t;if(Array.isArray(t)){for(var n=[],o=0;oi)return 1}return 0};t.sortBy=function(){for(var e=arguments.length,t=new Array(e),n=0;n"+l+""}},function(e,t,n){"use strict";var o=n(6);e.exports=function(e){return o((function(){var t=""[e]('"');return t!==t.toLowerCase()||t.split('"').length>3}))}},function(e,t,n){"use strict";t.__esModule=!0,t.computeFlexProps=t.computeFlexItemProps=t.FlexItem=t.Flex=void 0;var o=n(0),r=n(10),a=n(32),c=n(21),i=["className","direction","wrap","align","alignContent","justify","inline","spacing","spacingPrecise"],l=["className","grow","order","shrink","basis","align"];function d(e,t){if(null==e)return{};var n,o,r={},a=Object.keys(e);for(o=0;o=0||(r[n]=e[n]);return r}var u=function(e){var t=e.className,n=e.direction,o=e.wrap,c=e.align,l=e.alignContent,u=e.justify,s=e.inline,m=e.spacing,p=void 0===m?0:m,h=e.spacingPrecise,f=void 0===h?0:h,C=d(e,i);return Object.assign({className:(0,r.classes)(["Flex",a.IS_IE8&&("column"===n?"Flex--ie8--column":"Flex--ie8"),s&&"Flex--inline",p>0&&"Flex--spacing--"+p,f>0&&"Flex--spacingPrecise--"+f,t]),style:Object.assign({},C.style,{"flex-direction":n,"flex-wrap":o,"align-items":c,"align-content":l,"justify-content":u})},C)};t.computeFlexProps=u;var s=function(e){return(0,o.normalizeProps)((0,o.createComponentVNode)(2,c.Box,Object.assign({},u(e))))};t.Flex=s,s.defaultHooks=r.pureComponentHooks;var m=function(e){var t=e.className,n=e.grow,o=e.order,i=e.shrink,u=e.basis,s=void 0===u?e.width:u,m=e.align,p=d(e,l);return Object.assign({className:(0,r.classes)(["Flex__item",a.IS_IE8&&"Flex__item--ie8",t]),style:Object.assign({},p.style,{"flex-grow":n,"flex-shrink":i,"flex-basis":(0,c.unit)(s),order:o,"align-self":m})},p)};t.computeFlexItemProps=m;var p=function(e){return(0,o.normalizeProps)((0,o.createComponentVNode)(2,c.Box,Object.assign({},m(e))))};t.FlexItem=p,p.defaultHooks=r.pureComponentHooks,s.Item=p},function(e,t,n){"use strict";var o,r,a,c=n(176),i=n(5),l=n(7),d=n(11),u=n(49),s=n(18),m=n(129),p=n(104),h=n(87),f=i.TypeError,C=i.WeakMap;if(c||m.state){var N=m.state||(m.state=new C),b=l(N.get),V=l(N.has),g=l(N.set);o=function(e,t){if(V(N,e))throw new f("Object already initialized");return t.facade=e,g(N,e,t),t},r=function(e){return b(N,e)||{}},a=function(e){return V(N,e)}}else{var v=p("state");h[v]=!0,o=function(e,t){if(s(e,v))throw new f("Object already initialized");return t.facade=e,u(e,v,t),t},r=function(e){return s(e,v)?e[v]:{}},a=function(e){return s(e,v)}}e.exports={set:o,get:r,has:a,enforce:function(e){return a(e)?r(e):o(e,{})},getterFor:function(e){return function(t){var n;if(!d(t)||(n=r(t)).type!==e)throw f("Incompatible receiver, "+e+" required");return n}}}},function(e,t,n){"use strict";var o=Math.ceil,r=Math.floor;e.exports=function(e){var t=+e;return t!=t||0===t?0:(t>0?r:o)(t)}},function(e,t,n){"use strict";var o=n(40),r=Math.min;e.exports=function(e){return e>0?r(o(e),9007199254740991):0}},function(e,t,n){"use strict";var o=n(5),r=n(18),a=n(13),c=n(19),i=n(104),l=n(142),d=i("IE_PROTO"),u=o.Object,s=u.prototype;e.exports=l?u.getPrototypeOf:function(e){var t=c(e);if(r(t,d))return t[d];var n=t.constructor;return a(n)&&t instanceof n?n.prototype:t instanceof u?s:null}},function(e,t,n){"use strict";t.__esModule=!0,t.timeAgo=t.getGasLabel=t.getGasColor=t.UI_UPDATE=t.UI_INTERACTIVE=t.UI_DISABLED=t.UI_CLOSE=t.RADIO_CHANNELS=t.CSS_COLORS=t.COLORS=void 0;t.UI_INTERACTIVE=2;t.UI_UPDATE=1;t.UI_DISABLED=0;t.UI_CLOSE=-1;t.COLORS={department:{command:"#526aff",security:"#CF0000",medical:"#009190",science:"#993399",engineering:"#A66300",supply:"#9F8545",service:"#80A000",centcom:"#78789B",other:"#C38312"},damageType:{oxy:"#3498db",toxin:"#2ecc71",burn:"#e67e22",brute:"#e74c3c"}};t.CSS_COLORS=["black","white","red","orange","yellow","olive","green","teal","blue","violet","purple","pink","brown","grey","good","average","bad","label"];t.RADIO_CHANNELS=[{name:"Syndicate",freq:1213,color:"#a52a2a"},{name:"SyndTeam",freq:1244,color:"#a52a2a"},{name:"Red Team",freq:1215,color:"#ff4444"},{name:"Blue Team",freq:1217,color:"#3434fd"},{name:"Response Team",freq:1345,color:"#2681a5"},{name:"Special Ops",freq:1341,color:"#2681a5"},{name:"Supply",freq:1347,color:"#b88646"},{name:"Service",freq:1349,color:"#6ca729"},{name:"Science",freq:1351,color:"#c68cfa"},{name:"Command",freq:1353,color:"#5177ff"},{name:"Procedure",freq:1339,color:"#F70285"},{name:"Medical",freq:1355,color:"#57b8f0"},{name:"Medical(I)",freq:1485,color:"#57b8f0"},{name:"Engineering",freq:1357,color:"#f37746"},{name:"Security",freq:1359,color:"#dd3535"},{name:"Security(I)",freq:1475,color:"#dd3535"},{name:"AI Private",freq:1343,color:"#d65d95"},{name:"Common",freq:1459,color:"#1ecc43"}];var o=[{id:"o2",name:"Oxygen",label:"O\u2082",color:"blue"},{id:"n2",name:"Nitrogen",label:"N\u2082",color:"red"},{id:"co2",name:"Carbon Dioxide",label:"CO\u2082",color:"grey"},{id:"plasma",name:"Plasma",label:"Plasma",color:"pink"},{id:"water_vapor",name:"Water Vapor",label:"H\u2082O",color:"grey"},{id:"nob",name:"Hyper-noblium",label:"Hyper-nob",color:"teal"},{id:"n2o",name:"Nitrous Oxide",label:"N\u2082O",color:"red"},{id:"no2",name:"Nitryl",label:"NO\u2082",color:"brown"},{id:"tritium",name:"Tritium",label:"Tritium",color:"green"},{id:"bz",name:"BZ",label:"BZ",color:"purple"},{id:"stim",name:"Stimulum",label:"Stimulum",color:"purple"},{id:"pluox",name:"Pluoxium",label:"Pluoxium",color:"blue"},{id:"miasma",name:"Miasma",label:"Miasma",color:"olive"},{id:"hydrogen",name:"Hydrogen",label:"H\u2082",color:"white"},{id:"ab",name:"Agent B",label:"Agent B",color:"purple"}];t.getGasLabel=function(e,t){var n=String(e).toLowerCase(),r=o.find((function(e){return e.id===n||e.name.toLowerCase()===n}));return r&&r.label||t||e};t.getGasColor=function(e){var t=String(e).toLowerCase(),n=o.find((function(e){return e.id===t||e.name.toLowerCase()===t}));return n&&n.color};t.timeAgo=function(e,t){if(e>t)return"in the future";var n=(t/=10)-(e/=10);if(n>3600){var o=Math.round(n/3600);return o+" hour"+(1===o?"":"s")+" ago"}if(n>60){var r=Math.round(n/60);return r+" minute"+(1===r?"":"s")+" ago"}var a=Math.round(n);return a+" second"+(1===a?"":"s")+" ago"}},function(e,t,n){"use strict";t.__esModule=!0,t.LabeledListItem=t.LabeledListDivider=t.LabeledList=void 0;var o=n(0),r=n(10),a=n(21),c=n(222),i=["className","label","labelColor","color","textAlign","verticalAlign","buttons","content","children","noColon"];var l=function(e){var t=e.children;return(0,o.createVNode)(1,"table","LabeledList",t,0)};t.LabeledList=l,l.defaultHooks=r.pureComponentHooks;var d=function(e){var t=e.className,n=e.label,c=e.labelColor,l=void 0===c?"label":c,d=e.color,u=e.textAlign,s=e.verticalAlign,m=e.buttons,p=e.content,h=e.children,f=e.noColon,C=void 0!==f&&f,N=function(e,t){if(null==e)return{};var n,o,r={},a=Object.keys(e);for(o=0;o=0||(r[n]=e[n]);return r}(e,i),b=C?"":":";return(0,o.createVNode)(1,"tr",(0,r.classes)(["LabeledList__row",t]),[(0,o.createComponentVNode)(2,a.Box,{as:"td",color:l,verticalAlign:s,className:(0,r.classes)(["LabeledList__cell","LabeledList__label"]),children:n?n+b:null}),(0,o.normalizeProps)((0,o.createComponentVNode)(2,a.Box,Object.assign({as:"td",color:d,textAlign:u,verticalAlign:s,className:(0,r.classes)(["LabeledList__cell","LabeledList__content"]),colSpan:m?undefined:2},N,{children:[p,h]}))),m&&(0,o.createVNode)(1,"td","LabeledList__cell LabeledList__buttons",m,0)],0)};t.LabeledListItem=d,d.defaultHooks=r.pureComponentHooks;var u=function(e){var t=e.size?(0,a.unit)(Math.max(0,e.size-1)):0;return(0,o.createVNode)(1,"tr","LabeledList__row",(0,o.createVNode)(1,"td",null,(0,o.createComponentVNode)(2,c.Divider),2,{colSpan:3,style:{"padding-top":t,"padding-bottom":t}}),2)};t.LabeledListDivider=u,u.defaultHooks=r.pureComponentHooks,l.Item=d,l.Divider=u},function(e,t,n){"use strict";var o=n(7),r=o({}.toString),a=o("".slice);e.exports=function(e){return a(r(e),8,-1)}},function(e,t,n){"use strict";var o=n(7);e.exports=o({}.isPrototypeOf)},function(e,t,n){"use strict";var o=n(84),r=Function.prototype,a=r.apply,c=r.call;e.exports="object"==typeof Reflect&&Reflect.apply||(o?c.bind(a):function(){return c.apply(a,arguments)})},function(e,t,n){"use strict";var o=n(29);e.exports=o("navigator","userAgent")||""},function(e,t,n){"use strict";var o=n(8),r=n(17),a=n(64);e.exports=o?function(e,t,n){return r.f(e,t,a(1,n))}:function(e,t,n){return e[t]=n,e}},function(e,t,n){"use strict";var o=n(40),r=Math.max,a=Math.min;e.exports=function(e,t){var n=o(e);return n<0?r(n+t,0):a(n,t)}},function(e,t,n){"use strict";var o,r=n(9),a=n(136),c=n(134),i=n(87),l=n(179),d=n(131),u=n(104),s=u("IE_PROTO"),m=function(){},p=function(e){return"